diff --git a/stepmania/NoteSkins/common/common/Fallback Explosion.lua b/stepmania/NoteSkins/common/common/Fallback Explosion.lua index 688c085555..a9084bf368 100644 --- a/stepmania/NoteSkins/common/common/Fallback Explosion.lua +++ b/stepmania/NoteSkins/common/common/Fallback Explosion.lua @@ -1,38 +1,36 @@ local t = Def.ActorFrame { - children = { - NOTESKIN:LoadActor( Var "Button", "Hold Explosion" ) .. { - HoldingOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOnCommand"); - HoldingOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOffCommand"); - InitCommand=cmd(playcommand,"HoldingOff";finishtweening); - }; - NOTESKIN:LoadActor( Var "Button", "Tap Explosion Dim" ) .. { - InitCommand=cmd(diffusealpha,0); - W5Command=NOTESKIN:GetMetricA("GhostArrowDim", "W5Command"); - W4Command=NOTESKIN:GetMetricA("GhostArrowDim", "W4Command"); - W3Command=NOTESKIN:GetMetricA("GhostArrowDim", "W3Command"); - W2Command=NOTESKIN:GetMetricA("GhostArrowDim", "W2Command"); - W1Command=NOTESKIN:GetMetricA("GhostArrowDim", "W1Command"); - HeldCommand=NOTESKIN:GetMetricA("GhostArrowDim", "HeldCommand"); - JudgmentCommand=cmd(finishtweening); - BrightCommand=cmd(hidden,1); - DimCommand=cmd(hidden,0); - }; - NOTESKIN:LoadActor( Var "Button", "Tap Explosion Bright" ) .. { - InitCommand=cmd(diffusealpha,0); - W5Command=NOTESKIN:GetMetricA("GhostArrowBright", "W5Command"); - W4Command=NOTESKIN:GetMetricA("GhostArrowBright", "W4Command"); - W3Command=NOTESKIN:GetMetricA("GhostArrowBright", "W3Command"); - W2Command=NOTESKIN:GetMetricA("GhostArrowBright", "W2Command"); - W1Command=NOTESKIN:GetMetricA("GhostArrowBright", "W1Command"); - HeldCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HeldCommand"); - JudgmentCommand=cmd(finishtweening); - BrightCommand=cmd(hidden,0); - DimCommand=cmd(hidden,1); - }; - NOTESKIN:LoadActor( Var "Button", "HitMine Explosion" ) .. { - InitCommand=cmd(blend,"BlendMode_Add";diffusealpha,0); - HitMineCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HitMineCommand"); - }; - } + NOTESKIN:LoadActor( Var "Button", "Hold Explosion" ) .. { + HoldingOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOnCommand"); + HoldingOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOffCommand"); + InitCommand=cmd(playcommand,"HoldingOff";finishtweening); + }; + NOTESKIN:LoadActor( Var "Button", "Tap Explosion Dim" ) .. { + InitCommand=cmd(diffusealpha,0); + W5Command=NOTESKIN:GetMetricA("GhostArrowDim", "W5Command"); + W4Command=NOTESKIN:GetMetricA("GhostArrowDim", "W4Command"); + W3Command=NOTESKIN:GetMetricA("GhostArrowDim", "W3Command"); + W2Command=NOTESKIN:GetMetricA("GhostArrowDim", "W2Command"); + W1Command=NOTESKIN:GetMetricA("GhostArrowDim", "W1Command"); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowDim", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(hidden,1); + DimCommand=cmd(hidden,0); + }; + NOTESKIN:LoadActor( Var "Button", "Tap Explosion Bright" ) .. { + InitCommand=cmd(diffusealpha,0); + W5Command=NOTESKIN:GetMetricA("GhostArrowBright", "W5Command"); + W4Command=NOTESKIN:GetMetricA("GhostArrowBright", "W4Command"); + W3Command=NOTESKIN:GetMetricA("GhostArrowBright", "W3Command"); + W2Command=NOTESKIN:GetMetricA("GhostArrowBright", "W2Command"); + W1Command=NOTESKIN:GetMetricA("GhostArrowBright", "W1Command"); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(hidden,0); + DimCommand=cmd(hidden,1); + }; + NOTESKIN:LoadActor( Var "Button", "HitMine Explosion" ) .. { + InitCommand=cmd(blend,"BlendMode_Add";diffusealpha,0); + HitMineCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HitMineCommand"); + }; } return t; diff --git a/stepmania/NoteSkins/common/common/_Tap Lead-in Receptor.lua b/stepmania/NoteSkins/common/common/_Tap Lead-in Receptor.lua index 3d6149d014..67bc5e8958 100644 --- a/stepmania/NoteSkins/common/common/_Tap Lead-in Receptor.lua +++ b/stepmania/NoteSkins/common/common/_Tap Lead-in Receptor.lua @@ -1,25 +1,23 @@ return Def.ActorFrame { - children = { - LoadActor( "_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Ready Receptor") ) .. { - Frame0000=2; - Delay0000=1; + LoadActor( "_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Ready Receptor") ) .. { + Frame0000=2; + Delay0000=1; - InitCommand=cmd(playcommand, "Set"); - GameplayLeadInChangedMessageCommand=cmd(playcommand,"Set"); - SetCommand=cmd(visible,GAMESTATE:GetGameplayLeadIn()); - }; + InitCommand=cmd(playcommand, "Set"); + GameplayLeadInChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=cmd(visible,GAMESTATE:GetGameplayLeadIn()); + }; - LoadActor( "_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Go Receptor") ) .. { - Frame0000=0; - Delay0000=0.1; - Frame0001=1; - Delay0001=0.8; - Frame0002=0; - Delay0002=0.1; - - InitCommand=cmd(playcommand, "Set"); - GameplayLeadInChangedMessageCommand=cmd(playcommand,"Set"); - SetCommand=cmd(visible,not GAMESTATE:GetGameplayLeadIn()); - }; - } + LoadActor( "_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Go Receptor") ) .. { + Frame0000=0; + Delay0000=0.1; + Frame0001=1; + Delay0001=0.8; + Frame0002=0; + Delay0002=0.1; + + InitCommand=cmd(playcommand, "Set"); + GameplayLeadInChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=cmd(visible,not GAMESTATE:GetGameplayLeadIn()); + }; }