climb.lua changes and sliding loop fadeout

Author: tarantik7

gamemodes/beatrun/gamemode/sh/Climb.lua

@@ -245,8 +245,8 @@ local function ClimbingThink(ply, mv, cmd)
 					ply.FootstepLand = false
 					ParkourEvent("climbheave", ply)
 
-					timer.Simple(0.6, function() ply:PlayStepSound(1) end)
-					timer.Simple(1, function() ply:PlayStepSound(1) end)
+					timer.Simple(0.55, function() ply:PlayStepSound(1) end)
+					timer.Simple(0.95, function() ply:PlayStepSound(1) end)
 				end
 			end
 		end
@@ -649,9 +649,6 @@ local function ClimbingCheck(ply, mv, cmd)
 		timer.Simple(0.025, function()
 			ply:EmitSound("WallrunRelease.Concrete")
 		end)
-		timer.Simple(0.9, function()
-		    ply:EmitSound("Handsteps." .. handstepsoft)
-		end)
 	end
 
 	local climbvalue = 1
@@ -703,20 +700,47 @@ local function ClimbingCheck(ply, mv, cmd)
 	if folded then
 		ply:SetClimbing(5)
 		ply:SetClimbingDelay(CurTime() + 0.8)
+		local dmg
+		local info = DamageInfo()
 
 		ParkourEvent("hangfoldedstart", ply)
+		if lastvel.z < -800 then
+			timer.Simple(0.1, function() ply:FaithVO("Faith.ImpactHard") end)			
+			dmg = ply:Health() * 0.4
+			info:SetDamage(dmg)
+			info:SetDamageType(DMG_FALL)
+			info:SetAttacker(game.GetWorld())
+			info:SetInflictor(game.GetWorld())
+			ply:TakeDamageInfo(info)
+		else
+			timer.Simple(0.1, function() ply:FaithVO("Faith.Impact") end)
+			if lastvel.z < -500 then
+				dmg = ply:Health() * 0.1
+				info:SetDamage(dmg)
+				info:SetDamageType(DMG_FALL)
+				info:SetAttacker(game.GetWorld())
+				info:SetInflictor(game.GetWorld())
+				ply:TakeDamageInfo(info)
+			end
+		end
+		timer.Simple(0.12, function() ply:EmitSound("Handsteps." .. handstepsoft) end)
 
 	else
 		local event = "climbhard"
 
 		if wr == 1 then
 			event = "climb"
+			timer.Simple(0.95, function()			
+				if ply:GetClimbing() == 1 or ply:GetClimbing() == 2 then
+					ply:EmitSound("Handsteps." .. handstepsoft)
+				end
+			end)
 			wallangc.x = -30
 		elseif lastvel.z < -200 then
 			event = "climbhard2"
 			timer.Simple(0.05, function() ply:EmitSound("Handsteps." .. handstephard) end)
 			timer.Simple(0.7, function() ply:EmitSound("Handsteps." .. handstepsoft) end)
-
+			
 			if lastvel.z < -250 then
 			    ply:FaithVO("Faith.Impact")
 			else

gamemodes/beatrun/gamemode/sh/FreerunSysAll.lua

@@ -1,9 +1,9 @@
-local quakejump = CreateConVar("Beatrun_QuakeJump", 1, { FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY })
-local sidestep = CreateConVar("Beatrun_SideStep", 1, { FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY })
-local speedLimit = CreateConVar("Beatrun_SpeedLimit", 325, { FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY })
+local quakejump = CreateConVar("Beatrun_QuakeJump", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY})
+local sidestep = CreateConVar("Beatrun_SideStep", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY})
+local speedLimit = CreateConVar("Beatrun_SpeedLimit", 325, {FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY})
 
-CreateConVar("Beatrun_Disarm", 1, { FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY }, "", 0, 1)
-CreateConVar("Beatrun_AllowOverdriveInMultiplayer", 0, { FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY })
+CreateConVar("Beatrun_Disarm", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY}, "", 0, 1)
+CreateConVar("Beatrun_AllowOverdriveInMultiplayer", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE, FCVAR_NOTIFY})
 
 local function Hardland(jt)
 	local ply = LocalPlayer()
@@ -84,7 +84,7 @@ hook.Add("PlayerStepSoundTime", "MEStepTime", function(ply, step, walking)
 	end
 
 	if ply:KeyDown(IN_WALK) then
-		steptime = steptime * 1.45
+		steptime = steptime * 1.5
 	end
 
 	if ply:InOverdrive() then
@@ -108,7 +108,7 @@ hook.Add("PlayerFootstep", "MEStepSound", function(ply, pos, foot, sound, volume
 
 	if mat == "player/footsteps/ladder" then return end
 
-	ply.LastStepMat = newsound or walksound
+	ply.LastStepMat = newsound or walksound or releasesound
 	if game.SinglePlayer() then ply:SetNW2String("LastStepMat", newsound) end
 
 	ply.FootstepReleaseLand = true
@@ -230,13 +230,13 @@ end)
 
 hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 	local usingrh = ply:UsingRH()
-	local ismoving = (mv:KeyDown(IN_FORWARD) or not ply:OnGround() or ply:Crouching()) and ply:Alive() and (mv:GetVelocity():Length() > 50 or ply:GetMantle() ~= 0 or ply:Crouching())
+	local ismoving = (mv:KeyDown(IN_FORWARD) or not ply:OnGround() or ply:Crouching()) and ply:Alive() and (mv:GetVelocity():Length() > 145 or ply:GetMantle() ~= 0 or ply:Crouching())
 
 	if (CLIENT or game.SinglePlayer()) and CurTime() > (ply:GetStepRelease() or 0) and ply.FootstepReleaseLand then
 		local newsound = FOOTSTEPS_RELEASE_LUT[ply.LastFootstepSound] or "Concrete"
 
 		if ply:GetVelocity():Length() > 150 or newsound == "Gantry" or newsound == "Duct" then
-			ply:EmitSound("Release." .. newsound)
+			ply:EmitSound("Release." .. newsound)		
 		elseif ply:WaterLevel() > 0 then
 			ply:EmitSound("Release.Water")
 		end

gamemodes/beatrun/gamemode/sh/Sliding.lua

@@ -518,7 +518,7 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd)
 		ply:SetSlidingDelay(CT + 0.1)
 
 		if SERVER and ply.SlideLoopSound then
-			ply.SlideLoopSound:Stop()
+			ply.SlideLoopSound:FadeOut(0.5)
 		end
 
 		ply:ConCommand("-duck")
@@ -661,7 +661,7 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd)
 			ply:SetSlidingDelay(CT + 0.1)
 
 			if SERVER then
-				ply.SlideLoopSound:Stop()
+				ply.SlideLoopSound:FadeOut(0.5)
 			end
 
 			ply.DiveSliding = false