From 6de6e9f3c3270980b8394de3553a6f1f5f0028af Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Tue, 8 Aug 2023 18:40:55 +0500 Subject: [PATCH] Fix grapples not working in courses when Beatrun_DisableGrapple is set to 1 --- README.md | 8 ++++++-- beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a1c1f0f..e32d206 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ There are lua modules, they are for Discord Rich Presence and Steam Presence to This version should works on any version of the game (Base version is known good, Chromium has some issues and I don't have time to fix them). ## Animations -You can use *Beatrun Animations Installer* if you want to change your animations, there are new ones (from Beatrun Reanimated project) and OG (but fixed) ones, OG is default.
+You can use *Beatrun Animations Installer* if you want to change your animations, there are new ones (from Beatrun Reanimated project) and OG (but fixed) ones, OG is default. Just press a key on your keyboard with the number of the animations you want to install (If it doesn't change animations, run installer as admin).
Installer source can be found [here](/BeatrunAnimInstaller/) # Installation @@ -17,12 +17,16 @@ Installer source can be found [here](/BeatrunAnimInstaller/) * [Custom online courses database](https://courses.beatrun.ru), it's free 🤯! * Configurations menu - You can find it in the tool menu, in the *Beatrun* Category!\ All of the settings below can be changed in the configuration menu. +* Getting off of ladders (don't work on x64, idk). +* Jumping while walking. +* Various tweaks to Time Trials Menu (F4). +* Arrow that shows the next checkpoint. * Allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`. * Toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`. * Change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`. * Allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`. * Disable grapple ability - `Beatrun_DisableGrapple`. -* Discord Rich Presence (extract `lua` folder to `garrysmod`, along side with `addons` folder). +* Discord Rich Presence (See step 3). * Small camera punch when diving. * Ability to remove ziplines that created with *Zipline Gun* - RMB. * Removed your SteamID from right corner, because I can. diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua index 1f2ceaa..95c54b7 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua @@ -55,8 +55,8 @@ end local zpunchstart = Angle(2, 0, 0) hook.Add("SetupMove", "Grapple", function(ply, mv, cmd) - if ply:GetInfoNum("Beatrun_DisableGrapple", 0) == 1 then return end if ply:GetMantle() ~= 0 or ply:GetClimbing() ~= 0 then return end + if ply:GetInfoNum("Beatrun_DisableGrapple", 0) == 1 and Course_Name == "" then return end if not ply:Alive() or Course_Name ~= "" and ply:GetNW2Int("CPNum", 1) ~= -1 and not ply:GetNW2Entity("Swingrope"):IsValid() then return end if GetGlobalBool(GM_INFECTION) or GetGlobalBool(GM_DATATHEFT) and not ply:GetNW2Entity("Swingrope"):IsValid() then return end