jonny_bro/beatrun
1
0
Fork 0
mirror of https://github.com/JonnyBro/beatrun.git synced 2024-12-29 21:33:02 +05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: jonny_bro:56ae651697ddf27b083a55e3417bb574718c1a5c
Branches Tags
jonny_bro:main
jonny_bro:dev
...
compare: jonny_bro:3c89bdf04163110b417a28c10856b4f3fb0a63de
Branches Tags
jonny_bro:main
jonny_bro:dev

4 commits
56ae651697 ... 3c89bdf041

Author SHA1 Message Date
sokilopersonal
3c89bdf041
Merge 74a9f6de4c into fa800eb51f 2024-06-07 01:35:27 -07:00
shen
74a9f6de4c CrouchJump will not work if noclip is activated, so no more camera locks in build mode! 2024-06-07 11:35:12 +03:00
shen
7e44199ce9 I've changed my mind 2024-06-07 10:56:52 +03:00
shen
70aebef783 Fixed "ground" roll. Enabled "Lose speed on roll" will reduce your speed based on the speed limit 2024-06-07 10:43:00 +03:00
2 changed files with 10 additions and 4 deletions
Show stats Expand all files Collapse all files

8
beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua
View file

@ -8,6 +8,10 @@ elseif CLIENT and game.SinglePlayer() then
net.Receive("CrouchJumpSP", function()
local ply = LocalPlayer()
if ply:GetMoveType() == MOVETYPE_NOCLIP then
return
end
if BodyAnimArmCopy then
BodyAnimCycle = 0
BodyAnimCrouchLerp = 0
@ -29,6 +33,10 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd)
ply:SetCrouchJumpBlocked(false)
end
if ply:GetMoveType() == MOVETYPE_NOCLIP then
return
end
local activewep = ply:GetActiveWeapon()
if ply:Alive() and not ply:GetCrouchJumpBlocked() and not IsValid(ply:GetZipline()) and not IsValid(ply:GetLadder()) and ply:GetClimbing() == 0 and not ply:GetJumpTurn() and ply:GetMantle() == 0 and not ply:OnGround() and ply:GetVelocity().z > -350 and ply:GetCrouchJumpTime() < CurTime() and ply:GetWallrun() == 0 and mv:KeyPressed(IN_DUCK) then

6
beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua
View file

@ -39,11 +39,11 @@ local function SafetyRollThink(ply, mv, cmd)
vel.y = 0
local con = GetConVar("Beatrun_LoseSpeedOnRoll")
local speedLimit = GetConVar("Beatrun_SpeedLimit"):GetFloat()
if (con:GetBool()) then
mv:SetVelocity(ang:Forward() * 225 + vel)
mv:SetVelocity(ang:Forward() * 250 + vel)
else
local speedLimit = GetConVar("Beatrun_SpeedLimit"):GetFloat()
local max = math.max(250, math.Clamp(lastGroundSpeed, 200, speedLimit + 50))
mv:SetVelocity(ang:Forward() * (max + 40))
end
@ -128,8 +128,6 @@ hook.Add("SetupMove", "EvadeRoll", function(ply, mv, cmd)
ply:EmitSound("Land.Concrete")
end
BodyAnim:SetAngles(Angle(0, ply:EyeAngles().y, 0))
if CLIENT and IsFirstTimePredicted() then
CacheBodyAnim()
RemoveBodyAnim()