Compare commits

..

No commits in common. "2ea036680dce8425aef7ce2ed5436391c8957b2e" and "31253ccc85d892d4fa05985e257d164f9ce9e175" have entirely different histories.

View File

@ -643,7 +643,7 @@ end
function animateMTail(val, delta) function animateMTail(val, delta)
local chest_rot = 3 local chest_rot = 3
local period=3*math.pi local period=3*math.pi
local amplitude_multiplier=1 local amplitude_multiplier=0.8
local curve=0 local curve=0
-- TODO vanilla model manipulation broke, add chestplate model -- TODO vanilla model manipulation broke, add chestplate model
-- armor_model.CHESTPLATE:setRot(vec( -wave(val, period, math.rad(3)), 0, 0 )) -- armor_model.CHESTPLATE:setRot(vec( -wave(val, period, math.rad(3)), 0, 0 ))
@ -660,14 +660,7 @@ function animateMTail(val, delta)
amplitude_multiplier=0.33 amplitude_multiplier=0.33
TAIL_BONES[1]:setRot(vec(80,0,0)) TAIL_BONES[1]:setRot(vec(80,0,0))
else else
local pose=player:getPose() curve=curveMTail(delta)
if pose ~= "SWIMMING" and pose ~= "SLEEPING" then
curve=curveMTail(delta)
end
if pose == "SLEEPING" then
period=6*math.pi
amplitude_multiplier=0.3
end
resetAngles(model.Body) resetAngles(model.Body)
model.Body:setRot(vec( wave(val, period, 3*amplitude_multiplier), 0, 0 )) model.Body:setRot(vec( wave(val, period, 3*amplitude_multiplier), 0, 0 ))
model.Body.LeggingsTopTrimF:setRot(vec( wave(val-1, period, 4*amplitude_multiplier), 0, 0 )) model.Body.LeggingsTopTrimF:setRot(vec( wave(val-1, period, 4*amplitude_multiplier), 0, 0 ))