From fa7aab7f1d7e29597cdff4873ecf770ff85539a6 Mon Sep 17 00:00:00 2001 From: NullBite Date: Tue, 29 Mar 2022 10:07:14 -0400 Subject: [PATCH] Fix color handling in setExpression() --- script.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script.lua b/script.lua index b8c670c..e9a85d2 100644 --- a/script.lua +++ b/script.lua @@ -768,17 +768,20 @@ do function setExpression(expression) current_expression=expression FACE.setUV(expruvm:getUV(current_expression)) - setColor(COLORS[current_expression]) + -- This expression sticks, so do not set color explicitly + setColor() end function changeExpression(expression, ticks) FACE.setUV(expruvm:getUV(expression)) + -- This one is for more explicit "flashes" such as player hurt + -- animations, get color explicitly setColor(COLORS[expression]) namedWait(ticks, resetExpression, "resetExpression") end function resetExpression() lock_color=false FACE.setUV(expruvm:getUV(current_expression)) - setColor(getBestColor()) + setColor() end function hurt()