Fix grapples not working in courses when Beatrun_DisableGrapple is set to 1

This commit is contained in:
Jonny_Bro (Nikita) 2023-08-08 18:40:55 +05:00
parent 0c9f5852e9
commit 6de6e9f3c3
No known key found for this signature in database
GPG key ID: 28B0D27F8DD5A4C9
2 changed files with 7 additions and 3 deletions

View file

@ -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). 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 ## 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.<br> 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).<br>
Installer source can be found [here](/BeatrunAnimInstaller/) Installer source can be found [here](/BeatrunAnimInstaller/)
# Installation # Installation
@ -17,12 +17,16 @@ Installer source can be found [here](/BeatrunAnimInstaller/)
* [Custom online courses database](https://courses.beatrun.ru), it's free 🤯! * [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!\ * 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. 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`. * Allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`.
* Toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`. * Toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`.
* Change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`. * Change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`.
* Allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`. * Allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`.
* Disable grapple ability - `Beatrun_DisableGrapple`. * 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. * Small camera punch when diving.
* Ability to remove ziplines that created with *Zipline Gun* - RMB. * Ability to remove ziplines that created with *Zipline Gun* - RMB.
* Removed your SteamID from right corner, because I can. * Removed your SteamID from right corner, because I can.

View file

@ -55,8 +55,8 @@ end
local zpunchstart = Angle(2, 0, 0) local zpunchstart = Angle(2, 0, 0)
hook.Add("SetupMove", "Grapple", function(ply, mv, cmd) 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: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 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 if GetGlobalBool(GM_INFECTION) or GetGlobalBool(GM_DATATHEFT) and not ply:GetNW2Entity("Swingrope"):IsValid() then return end