diff --git a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua index 78e5cb1..6d19214 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua @@ -146,7 +146,7 @@ function SWEP:Think() local injump = curseq == 13 or curseq == 14 or curseq == 17 or curseq == -1 or curseq == 1 infall = curseq == 19 - --[[ what a piece of shit, send help + --[[ TODO: 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 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 (math.floor(ply:LocalEyeAngles().y) <= -145 and math.floor(ply:LocalEyeAngles().y) >= -175) then if CLIENT then diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua index 05da52b..e774848 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua @@ -49,7 +49,9 @@ local incompatible = { ["2824714462"] = true, -- [TFA] Screen Shake ["3037375111"] = true, -- Quick Slide With Legs ["748422181"] = true, -- FOV Changer - ["2930331275"] = true -- Realistic Fragmentation System + ["2930331275"] = true, -- Realistic Fragmentation System + ["112806637"] = true, -- Gmod Legs 3 + ["678037029"] = true -- Enhanced Camera } local warnpanel = { diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua index 7905721..9a77cac 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua @@ -468,13 +468,14 @@ local function ClimbingCheck(ply, mv, cmd) if trout.Entity and trout.Entity.IsNPC and (trout.Entity:IsNPC() or trout.Entity:IsPlayer()) then return false end - -- local fraction = trout.Fraction local detectionlen = 60 if trout.Fraction <= 0 or trout.Fraction >= 0.5 then tr.start = mv:GetOrigin() + wallang:Forward() * 20 + upvalue tr.endpos = tr.start - Vector(0, 0, 90) + -- debugoverlay.Line(tr.start, tr.endpos, 5, Color(0, 0, 255), true) + util.TraceLine(tr) if trout.Fraction <= 0 or trout.Fraction >= 0.5 then return end @@ -525,6 +526,15 @@ local function ClimbingCheck(ply, mv, cmd) util.TraceLine(tr) if trout.Hit then return end + -- local h1 = trout.HitPos + -- local h2 = tr.start - wallang:Forward() - Vector(100, 0, 0) + -- local hit = util.QuickTrace(h1, h2, ply) + + -- debugoverlay.Line(h1, h2, 5, Color(255, 200, 100), true) + + -- print(hit.Hit) + -- print(hit.HitPos) + -- end tr.start = startpos + Vector(0, 0, 77) tr.endpos = tr.start + wallang:Forward() * detectionlen * 0.5