From 7a3e0362d2b13cec83d94e48d6150e2882779639 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Sat, 3 Jun 2023 20:53:33 +0500 Subject: [PATCH] Cleaning and spawnmenu settings started --- README.md | 1 + .../beatrun/gamemode/cl/SpawnMenuSettings.lua | 10 ++++++++++ .../gamemode/player_class/player_beatrun.lua | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 beatrun/gamemodes/beatrun/gamemode/cl/SpawnMenuSettings.lua diff --git a/README.md b/README.md index e7c4b83..4cdea13 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ This version of the beatrun works on any version of the game (Chromium or not). - [ ] Gamemodes menu ## Fixes and changes from previous version +* Hacky fix for weapon damage. * Proper Kick Glitch (Like in original ME: https://www.youtube.com/watch?v=zK5y3NBUStc) * Grapple fixes. Now it moves with entity it attached to and other players can see it. * More reliable grappling. diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/SpawnMenuSettings.lua b/beatrun/gamemodes/beatrun/gamemode/cl/SpawnMenuSettings.lua new file mode 100644 index 0000000..290b821 --- /dev/null +++ b/beatrun/gamemodes/beatrun/gamemode/cl/SpawnMenuSettings.lua @@ -0,0 +1,10 @@ +hook.Add("AddToolMenuCategories", "Beatrun_Category", function() + spawnmenu.AddToolCategory("Beatrun", "beatrun_category", "Beatrun Settings") +end) + +hook.Add("PopulateToolMenu", "CustomMenuSettings", function() + spawnmenu.AddToolMenuOption("Utilities", "Beatrun Settings", "Custom_Menu", "#My Custom Menu", "", "", function(panel) + panel:ClearControls() + panel:NumSlider("Gravity", "sv_gravity", 0, 600) + end) +end) \ No newline at end of file diff --git a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua index 081759c..f5af4a1 100644 --- a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua +++ b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua @@ -302,12 +302,9 @@ end) hook.Add("ShouldCollide", "NoPlayerCollisions", function(ent1, ent2) if ent1:IsPlayer() and (ent2:IsPlayer() or ent2.NoPlayerCollisions) then - if ent2.BRCollisionFunc then - return ent2:BRCollisionFunc(ent1) + if ent2.BRCollisionFunc then return ent2:BRCollisionFunc(ent1) else - if ent1.br_Fired or ent2.br_Fired then - return true - end + if ent1.br_Fired or ent2.br_Fired then return true end return false end @@ -316,10 +313,15 @@ hook.Add("ShouldCollide", "NoPlayerCollisions", function(ent1, ent2) if ent2:IsPlayer() and ent1:IsNPC() then return true end end) -// i was forced -hook.Add("EntityFireBullets", "thisengineismadebyacrackhead", function(ent, data) +-- i was forced +hook.Add("EntityFireBullets", "thisengineismadebyacrackhead", function(ent, data) ent.br_Fired = true - timer.Simple(engine.TickInterval()*2, function() if IsValid(ent) then ent.br_Fired = false end end) + + timer.Simple(engine.TickInterval() * 2, function() + if IsValid(ent) then + ent.br_Fired = false + end + end) end) hook.Add("PhysgunPickup", "AllowPlayerPickup", function(ply, ent)