jonny_bro/beatrun
1
0
Fork 0
mirror of https://github.com/JonnyBro/beatrun.git synced 2025-04-04 09:56:33 +05:00
Code Issues Projects Releases Packages Wiki Activity

Auto hand switching cleanup

Browse source
This commit is contained in:
Globalsl 2025-02-13 13:49:32 +02:00
parent a5337cd4d9
commit a1cffad491
1 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
View file

@ -1,44 +1,12 @@
local OldAnims = CreateClientConVar("Beatrun_OldAnims", "0", true, false, "")
---------------------------------------------------------------------------------------
CreateClientConVar("Beatrun_AutoHandSwitching", "1", true, false)
local requires_arms = { -- animations that uses arms
local requires_arms = { -- animations that use arms for auto hand switching
hang = true,
hanghardstartvertical = true,
hangheaveup = true,
}
local using_hands = false
hook.Add( "Think", "switch_hands_auto", function()
if GetConVar("Beatrun_AutoHandSwitching"):GetInt() == 0 then return end
local ply = LocalPlayer()
if !ply:Alive() then return end -- prevents errors
if ply:GetWallrun() > 0 or ply:GetMantle()>0 or requires_arms[BodyAnimString] then
if using_hands == false then
weapon_before_hands = (ply:GetActiveWeapon())
input.SelectWeapon(ply:GetWeapon("runnerhands"))
using_hands = true
if ply:GetWallrun() == 1 then -- 1 = verticaL
BodyAnim:SetSequence("wallrunverticalstart")
end
if ply:GetMantle() == 2 then
BodyAnim:SetSequence("vaultover")
elseif ply:GetMantle() == 3 then
BodyAnim:SetSequence("vaultkong")
end
end
end
if ply:GetWallrun() == 0 and not requires_arms[BodyAnimString] and ply:GetMantle() == 0 and using_hands and ply:UsingRH() then
if weapon_before_hands ~= nil then -- safe guard
input.SelectWeapon(weapon_before_hands)
end
using_hands = false
end
end)
---------------------------------------------------------------------------------------
local animtable = {
lockang = false,
allowmove = true,
@ -1543,8 +1511,37 @@ end)
local animtr, animtr_result = nil, nil
local oldnewang = Angle()
--auto hand switching variables
local using_hands = false
local weapon_before_hands
local function JumpThink()
-- auto hand switching code
local ply = LocalPlayer()
if GetConVar("Beatrun_AutoHandSwitching"):GetInt() == 1 and ply:Alive() then
if (ply:GetWallrun() > 0 or ply:GetMantle() > 0 or requires_arms[BodyAnimString]) and not using_hands then
weapon_before_hands = (ply:GetActiveWeapon())
input.SelectWeapon(ply:GetWeapon("runnerhands"))
using_hands = true
if ply:GetWallrun() == 1 then -- 1 = verticaL
BodyAnim:SetSequence("wallrunverticalstart")
end
if ply:GetMantle() == 2 then
BodyAnim:SetSequence("vaultover")
elseif ply:GetMantle() == 3 then
BodyAnim:SetSequence("vaultkong")
end
end
if ply:GetWallrun() == 0 and not requires_arms[BodyAnimString] and ply:GetMantle() == 0 and using_hands and ply:UsingRH() then
if weapon_before_hands ~= nil then -- safe guard
input.SelectWeapon(weapon_before_hands)
end
using_hands = false
end
end
if IsValid(BodyAnim) then
if not animtr then
animtr = {}
@ -1865,4 +1862,4 @@ local function JumpThink()
end
end
hook.Add("Think", "JumpThink", JumpThink)
hook.Add("Think", "JumpThink", JumpThink)