Compare commits

..

2 Commits

Author SHA1 Message Date
2ea036680d
Fix amplitude multiplier for mermaid tail 2023-10-21 04:39:29 -04:00
e50074c916
Add overrides to mermaid tail animation 2023-10-21 04:39:06 -04:00

View File

@ -643,7 +643,7 @@ end
function animateMTail(val, delta)
local chest_rot = 3
local period=3*math.pi
local amplitude_multiplier=0.8
local amplitude_multiplier=1
local curve=0
-- TODO vanilla model manipulation broke, add chestplate model
-- armor_model.CHESTPLATE:setRot(vec( -wave(val, period, math.rad(3)), 0, 0 ))
@ -660,7 +660,14 @@ function animateMTail(val, delta)
amplitude_multiplier=0.33
TAIL_BONES[1]:setRot(vec(80,0,0))
else
curve=curveMTail(delta)
local pose=player:getPose()
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)
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 ))