nullbite/figura-protogen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix color handling in setExpression()

Browse Source
This commit is contained in:
NullBite 2022-03-29 10:07:14 -04:00
parent 7b51269f8b
commit fa7aab7f1d
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
script.lua
View File

@ -768,17 +768,20 @@ do
function setExpression(expression) function setExpression(expression)
current_expression=expression current_expression=expression
FACE.setUV(expruvm:getUV(current_expression)) FACE.setUV(expruvm:getUV(current_expression))
setColor(COLORS[current_expression]) -- This expression sticks, so do not set color explicitly
setColor()
end end
function changeExpression(expression, ticks) function changeExpression(expression, ticks)
FACE.setUV(expruvm:getUV(expression)) FACE.setUV(expruvm:getUV(expression))
-- This one is for more explicit "flashes" such as player hurt
-- animations, get color explicitly
setColor(COLORS[expression]) setColor(COLORS[expression])
namedWait(ticks, resetExpression, "resetExpression") namedWait(ticks, resetExpression, "resetExpression")
end end
function resetExpression() function resetExpression()
lock_color=false lock_color=false
FACE.setUV(expruvm:getUV(current_expression)) FACE.setUV(expruvm:getUV(current_expression))
setColor(getBestColor()) setColor()
end end
function hurt() function hurt()