diff --git a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx index 36844e2..f2ce3cc 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx index 7e1af14..d3b3698 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.mdl b/beatrun/Beatrun Reanimated/climbanim.mdl index e576576..60479c6 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.mdl and b/beatrun/Beatrun Reanimated/climbanim.mdl differ diff --git a/beatrun/Beatrun Reanimated/climbanim.sw.vtx b/beatrun/Beatrun Reanimated/climbanim.sw.vtx index aa3661d..7732099 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.sw.vtx and b/beatrun/Beatrun Reanimated/climbanim.sw.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.vvd b/beatrun/Beatrun Reanimated/climbanim.vvd index f878004..4ec5dba 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.vvd and b/beatrun/Beatrun Reanimated/climbanim.vvd differ diff --git a/beatrun/Original Animations/climbanim.dx80.vtx b/beatrun/Original Animations/climbanim.dx80.vtx index fadb0df..739bfdb 100644 Binary files a/beatrun/Original Animations/climbanim.dx80.vtx and b/beatrun/Original Animations/climbanim.dx80.vtx differ diff --git a/beatrun/Original Animations/climbanim.dx90.vtx b/beatrun/Original Animations/climbanim.dx90.vtx index 7fed0f8..64b3292 100644 Binary files a/beatrun/Original Animations/climbanim.dx90.vtx and b/beatrun/Original Animations/climbanim.dx90.vtx differ diff --git a/beatrun/Original Animations/climbanim.mdl b/beatrun/Original Animations/climbanim.mdl index 4877dce..9d472b1 100644 Binary files a/beatrun/Original Animations/climbanim.mdl and b/beatrun/Original Animations/climbanim.mdl differ diff --git a/beatrun/Original Animations/climbanim.sw.vtx b/beatrun/Original Animations/climbanim.sw.vtx index e2fbcc8..5453bcb 100644 Binary files a/beatrun/Original Animations/climbanim.sw.vtx and b/beatrun/Original Animations/climbanim.sw.vtx differ diff --git a/beatrun/Original Animations/climbanim.vvd b/beatrun/Original Animations/climbanim.vvd index 2cedb42..4a81267 100644 Binary files a/beatrun/Original Animations/climbanim.vvd and b/beatrun/Original Animations/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx index 36844e2..f2ce3cc 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx index 7e1af14..d3b3698 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl index e576576..60479c6 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl and b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx index aa3661d..7732099 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd index f878004..4ec5dba 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd and b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua index b52a31a..97cc632 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua @@ -147,7 +147,7 @@ function SWEP:Think() infall = curseq == 19 -- what a piece of shit, send help - if vel:Length() == 0 and util.QuickTrace(ply:GetShootPos(), ply:GetAimVector() * 30, ply).Hit and ply:GetMoveType() ~= MOVETYPE_NOCLIP and not ply:Crouching() and ply:WaterLevel() == 0 then + if vel:Length() == 0 and util.QuickTrace(ply:GetShootPos(), ply:GetAimVector() * 30, ply).Hit and ply:GetMoveType() ~= MOVETYPE_NOCLIP and not ply:Crouching() and ply:WaterLevel() == 0 and ply:GetWallrun() == 0 then if (math.floor(ply:LocalEyeAngles().y) <= 35 and math.floor(ply:LocalEyeAngles().y) >= 5) or (math.floor(ply:LocalEyeAngles().y) <= 125 and math.floor(ply:LocalEyeAngles().y) >= 95) or (math.floor(ply:LocalEyeAngles().y) <= -55 and math.floor(ply:LocalEyeAngles().y) >= -85) or diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua index 8655dee..f9b3091 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua @@ -280,7 +280,10 @@ local armfollowanims = { diestandlong = true, diveslidestart = true, vaultoverhigh = true, - walkfwd = true + walkfwd = true, + crouchstill = true, + crouchfwd = true, + crouchbwd = true } local armlock = { @@ -425,7 +428,10 @@ local nospinebend = { ladderclimbuprighthand = true, ladderclimbhangstart = true, vaultontohigh = true, - snatchscar = true + snatchscar = true, + crouchstill = true, + crouchfwd = true, + crouchbwd = true } local worldarm = { @@ -524,9 +530,9 @@ local customarmoffset = { ladderexittoprighthand = Vector(5, 0, 0), ladderclimbhangstart = Vector(-5, 0, 0), ladderenterbottom = Vector(-7.5, 0, 0), - crouchstill = Vector(-4, 0, -5), - crouchfwd = Vector(-4, 0, -5), - crouchbwd = Vector(0, 0, 0), + crouchstill = Vector(-4, 0, -2), + crouchfwd = Vector(-4, 0, -2), + crouchbwd = Vector(-4, 0, -2), walkfwd = Vector(10, 0, -10), runbwd = Vector(0, 0, 3), stand = Vector(10, 0, -10), @@ -549,9 +555,9 @@ local customcamoffset = { hangstrafeleft = Vector(-2.5, 0, 0), hangstraferight = Vector(-2.5, 0, 0), snatchscar = snatchscarcam1, - crouchstill = Vector(0, 0, 2.5), - crouchfwd = Vector(0, 0, 2.5), - crouchbwd = Vector(0, 0, 2.5) + crouchstill = Vector(2, 0, 2.5), + crouchfwd = Vector(2, 0, 2.5), + crouchbwd = Vector(2, 0, 2.5) } local transitionchecks = { diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua index 125708f..5d404da 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua @@ -13,12 +13,6 @@ local function SafetyRollThink(ply, mv, cmd) mv:SetButtons(bit.band(mv:GetButtons(), bit.bnot(IN_DUCK))) end - if ply:Alive() and CLIENT and ply:GetActiveWeapon():IsValid() and CurTime() > ply:GetSafetyRollTime() then - if weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then - RunConsoleCommand("mgbase_debug_vmrender", "1") - end - end - if CurTime() < ply:GetSafetyRollTime() then ply.FootstepLand = false @@ -41,6 +35,12 @@ local function SafetyRollThink(ply, mv, cmd) mv:SetVelocity(vector_origin) end end + + if ply:Alive() and ply:GetActiveWeapon():IsValid() and CurTime() > ply:GetSafetyRollTime() then + if weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then + RunConsoleCommand("mgbase_debug_vmrender", "1") + end + end end hook.Add("SetupMove", "SafetyRoll", SafetyRollThink) @@ -78,9 +78,9 @@ end) hook.Add("SetupMove", "EvadeRoll", function(ply, mv, cmd) if ply:GetJumpTurn() and ply:OnGround() and mv:KeyPressed(IN_BACK) then - if ply:Alive() and CLIENT and ply:GetActiveWeapon():IsValid() then + if ply:Alive() and ply:GetActiveWeapon():IsValid() then if weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then - RunConsoleCommand("mgbase_debug_vmrender", "1") + RunConsoleCommand("mgbase_debug_vmrender", "0") end end @@ -118,12 +118,6 @@ hook.Add("SetupMove", "EvadeRoll", function(ply, mv, cmd) net.WriteBool(true) net.Send(ply) end - - if ply:Alive() and CLIENT and ply:GetActiveWeapon():IsValid() then - if weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then - RunConsoleCommand("mgbase_debug_vmrender", "0") - end - end end end) @@ -144,7 +138,7 @@ hook.Add("OnPlayerHitGround", "SafetyRoll", function(ply, water, floater, speed) ParkourEvent("roll", ply) - if ply:Alive() and CLIENT and ply:GetActiveWeapon():IsValid() then + if ply:Alive() and ply:GetActiveWeapon():IsValid() then if weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then RunConsoleCommand("mgbase_debug_vmrender", "0") end