From 4a671d8f218f20ddf5e2869f9002d1f3de6db9f4 Mon Sep 17 00:00:00 2001 From: NullBite Date: Sat, 21 Oct 2023 02:48:28 -0400 Subject: [PATCH] Add curve to mermaid tail dependant on seat --- script.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/script.lua b/script.lua index cc75344..6ca5ed0 100644 --- a/script.lua +++ b/script.lua @@ -608,13 +608,18 @@ function animateMTail(val) local chest_rot = 3 local period=2*math.pi 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 )) -- this makes it work with partial vanilla -- vanilla_model.BODY:setRot(vec( -wave(val, period, math.rad(3)), 0, 0 )) -- vanilla_model.JACKET:setRot(vec( -wave(val, period, math.rad(3)), 0, 0 )) - if player:getVehicle() then + local vehicle = player:getVehicle() + if vehicle then + if vehicle:getType() ~= "create:seat" then + curve=22 + end period=4*math.pi amplitude_multiplier=0.33 TAIL_BONES[1]:setRot(vec(85,0,0)) @@ -626,9 +631,9 @@ function animateMTail(val) TAIL_BONES[1]:setRot(vec( wave(val-1, period, 7*amplitude_multiplier), 0, 0 )) end - TAIL_BONES[2]:setRot(vec( wave(val-2, period, 8*amplitude_multiplier), 0, 0 )) - TAIL_BONES[3]:setRot(vec( wave(val-3, period, 12*amplitude_multiplier), 0, 0 )) - TAIL_BONES[4]:setRot(vec( wave(val-4, period, 15*amplitude_multiplier), 0, 0 )) + TAIL_BONES[2]:setRot(vec( wave(val-2, period, 8*amplitude_multiplier) + curve, 0, 0 )) + TAIL_BONES[3]:setRot(vec( wave(val-3, period, 12*amplitude_multiplier) + curve, 0, 0 )) + TAIL_BONES[4]:setRot(vec( wave(val-4, period, 15*amplitude_multiplier) + curve, 0, 0 )) end tail_original_rot={} for k, v in ipairs(REG_TAIL_BONES) do