mirror of
https://github.com/JonnyBro/beatrun.git
synced 2024-12-29 21:33:02 +05:00
Unscrew the JumpAnim.lua file
This commit is contained in:
parent
edcb849324
commit
57a9e4c57b
1 changed files with 8 additions and 34 deletions
|
@ -1,5 +1,3 @@
|
||||||
local OldAnims = CreateClientConVar("Beatrun_OldAnims", "0", true, false, "")
|
|
||||||
|
|
||||||
local animtable = {
|
local animtable = {
|
||||||
lockang = false,
|
lockang = false,
|
||||||
allowmove = true,
|
allowmove = true,
|
||||||
|
@ -10,7 +8,7 @@ local animtable = {
|
||||||
BodyLimitX = 90,
|
BodyLimitX = 90,
|
||||||
AnimString = "jumpslow",
|
AnimString = "jumpslow",
|
||||||
CamIgnoreAng = true,
|
CamIgnoreAng = true,
|
||||||
animmodelstring = "new_climbanim",
|
animmodelstring = "climbanim",
|
||||||
BodyLimitY = 180,
|
BodyLimitY = 180,
|
||||||
usefullbody = 2
|
usefullbody = 2
|
||||||
}
|
}
|
||||||
|
@ -1349,7 +1347,10 @@ end)
|
||||||
|
|
||||||
local function JumpAnim(event, ply)
|
local function JumpAnim(event, ply)
|
||||||
if !animsetchange then animsetchange = false end
|
if !animsetchange then animsetchange = false end
|
||||||
|
print("-------------")
|
||||||
|
print("JumpAnim called -- " .. engine.TickCount())
|
||||||
if animsetchange != UseOldAnims:GetBool() then
|
if animsetchange != UseOldAnims:GetBool() then
|
||||||
|
print("---- BodyAnim removed -- " .. engine.TickCount())
|
||||||
RemoveBodyAnim()
|
RemoveBodyAnim()
|
||||||
end
|
end
|
||||||
if animsetchange != UseOldAnims:GetBool() then
|
if animsetchange != UseOldAnims:GetBool() then
|
||||||
|
@ -1359,6 +1360,7 @@ local function JumpAnim(event, ply)
|
||||||
animtable.animmodelstring = "climbanim"
|
animtable.animmodelstring = "climbanim"
|
||||||
end
|
end
|
||||||
StartBodyAnim(animtable)
|
StartBodyAnim(animtable)
|
||||||
|
print("---- BodyAnim recreated -- " .. engine.TickCount())
|
||||||
|
|
||||||
if not IsValid(BodyAnim) then return end
|
if not IsValid(BodyAnim) then return end
|
||||||
|
|
||||||
|
@ -1379,6 +1381,7 @@ local function JumpAnim(event, ply)
|
||||||
hook.Add("PostDrawOpaqueRenderables", "JumpArmDraw", JumpArmDraw)
|
hook.Add("PostDrawOpaqueRenderables", "JumpArmDraw", JumpArmDraw)
|
||||||
end
|
end
|
||||||
if events[event] then
|
if events[event] then
|
||||||
|
print("-- JumpAnim in event -- " .. engine.TickCount())
|
||||||
local wasjumpanim = fbanims[BodyAnimString] and IsValid(BodyAnim)
|
local wasjumpanim = fbanims[BodyAnimString] and IsValid(BodyAnim)
|
||||||
|
|
||||||
if changedanimset then
|
if changedanimset then
|
||||||
|
@ -1386,6 +1389,7 @@ local function JumpAnim(event, ply)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not wasjumpanim then
|
if not wasjumpanim then
|
||||||
|
print("---- BodyAnim removed -- " .. engine.TickCount())
|
||||||
RemoveBodyAnim()
|
RemoveBodyAnim()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1420,6 +1424,7 @@ local function JumpAnim(event, ply)
|
||||||
animtable.animmodelstring = "climbanim"
|
animtable.animmodelstring = "climbanim"
|
||||||
end
|
end
|
||||||
StartBodyAnim(animtable)
|
StartBodyAnim(animtable)
|
||||||
|
print("---- BodyAnim recreated -- " .. engine.TickCount())
|
||||||
|
|
||||||
if not IsValid(BodyAnim) then return end
|
if not IsValid(BodyAnim) then return end
|
||||||
|
|
||||||
|
@ -1445,37 +1450,6 @@ local function JumpAnim(event, ply)
|
||||||
animsetchange = UseOldAnims:GetBool()
|
animsetchange = UseOldAnims:GetBool()
|
||||||
end
|
end
|
||||||
|
|
||||||
function CheckAnims()
|
|
||||||
RemoveBodyAnim()
|
|
||||||
|
|
||||||
if OldAnims:GetBool() then
|
|
||||||
animtable.animmodelstring = "old_climbanim"
|
|
||||||
else
|
|
||||||
animtable.animmodelstring = "new_climbanim"
|
|
||||||
end
|
|
||||||
|
|
||||||
StartBodyAnim(animtable)
|
|
||||||
|
|
||||||
if not IsValid(BodyAnim) then return end
|
|
||||||
|
|
||||||
CreateBodyAnimArmCopy()
|
|
||||||
|
|
||||||
if not LocalPlayer():ShouldDrawLocalPlayer() or CurTime() < 10 then
|
|
||||||
for k, v in ipairs(playermodelbones) do
|
|
||||||
local b = BodyAnim:LookupBone(v)
|
|
||||||
|
|
||||||
if b then
|
|
||||||
BodyAnim:ManipulateBonePosition(b, Vector(0, 0, 100 * (k == 1 and -1 or 1)))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
cvars.AddChangeCallback("Beatrun_OldAnims", function(cvar, vOld, vNew)
|
|
||||||
CheckAnims()
|
|
||||||
end)
|
|
||||||
|
|
||||||
hook.Add("PlayerInitialSpawn", "CheckAnims", CheckAnims)
|
|
||||||
hook.Add("OnParkour", "JumpAnim", JumpAnim)
|
hook.Add("OnParkour", "JumpAnim", JumpAnim)
|
||||||
|
|
||||||
function ArmInterrupt(anim)
|
function ArmInterrupt(anim)
|
||||||
|
|
Loading…
Reference in a new issue