From 0e959008564d2719b96ded4a09ce2d95793f2254 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 4 Apr 2008 15:39:28 +0000 Subject: [PATCH] eval cleanup --- .../ScreenEvaluationStage background.redir | 1 - .../banner frame (doubleres).png | Bin 5925 -> 0 bytes .../default.lua | 17 +++--- .../grade frame (doubleres).png | Bin 5530 -> 0 bytes .../BGAnimations/ScreenEvaluationStage in.lua | 49 +----------------- .../Themes/default/BGAnimations/_black.lua | 1 - 6 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png delete mode 100644 stepmania/Themes/default/BGAnimations/_black.lua diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir deleted file mode 100644 index e80b2145da..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir +++ /dev/null @@ -1 +0,0 @@ -_shared background fade in \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png deleted file mode 100644 index 4678cec17ca7f05439cea9292d3b527485a2efae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5925 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 diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index f815a7632c..91006d3165 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -1,3 +1,5 @@ +local t = LoadFallbackB( "decorations" ); + local p1x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1X' ) local p1y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1Y' ) local p2x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2X' ) @@ -5,11 +7,10 @@ local p2y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2Y' ) p1y = p1y + 75 -- It starts 75 pixels down from the top of the Bonus frame. p2y = p2y + 75 -return Def.ActorFrame { - LoadActor("life graph", PLAYER_1) .. { - InitCommand = cmd(x,p1x;y,p1y); - }; - LoadActor("life graph", PLAYER_2) .. { - InitCommand = cmd(x,p2x;y,p2y); - }; -} +t[#t+1] = LoadActor("life graph", PLAYER_1) .. { + InitCommand = cmd(x,p1x;y,p1y); +}; +t[#t+1] = LoadActor("life graph", PLAYER_2) .. { + InitCommand = cmd(x,p2x;y,p2y); +}; +return t; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png deleted file mode 100644 index 85337b4f58b00492e637233e3f17da4b8aaba09d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5530 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 fe{Y%W3- diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua index b1e6eaecb2..a2c8787338 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua @@ -7,57 +7,10 @@ local t = Def.ActorFrame { Condition=not STATSMAN:GetCurStageStats():AllFailed(); OnCommand=cmd(diffusealpha,1;linear,0.4;diffusealpha,0); }; - LoadActor( "_black.png" ) .. { + LoadActor( "_black" ) .. { Condition=STATSMAN:GetCurStageStats():AllFailed(); InitCommand=cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM); OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0); }; - -- Cleared - Def.ActorFrame { - Condition=GAMESTATE:GetPlayMode() ~= PLAY_MODE_BATTLE and GAMESTATE:GetPlayMode() ~= PLAY_MODE_RAVE; - LoadActor( "ScreenGameplay out/_extra1.png" ) .. { - Condition=GAMESTATE:IsExtraStage(); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,not GAMESTATE:HasEarnedExtraStage()); - OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0); - }; - LoadActor( "ScreenGameplay out/_extra2.png" ) .. { - Condition=GAMESTATE:IsExtraStage2(); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,not GAMESTATE:HasEarnedExtraStage()); - OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0); - }; - LoadActor( "ScreenGameplay failed/failed.png" ) .. { - Condition=STATSMAN:GetCurStageStats():AllFailed(); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0); - }; - LoadActor( "ScreenGameplay out/cleared.png" ) .. { - Condition=not STATSMAN:GetCurStageStats():AllFailed(); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,GAMESTATE:HasEarnedExtraStage()); - OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0); - }; - }; - -- Winner - Def.ActorFrame { - Condition=GAMESTATE:GetPlayMode() == PLAY_MODE_BATTLE or GAMESTATE:GetPlayMode() == PLAY_MODE_RAVE; - LoadActor( "ScreenGameplay out/p1 win.png" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_1)); - OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0); - }; - LoadActor("ScreenGameplay out/p2 win.png" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_2)); - OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0); - }; - LoadActor( "ScreenGameplay out/draw.png" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsDraw()); - OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0); - }; - }; - }; return t; diff --git a/stepmania/Themes/default/BGAnimations/_black.lua b/stepmania/Themes/default/BGAnimations/_black.lua deleted file mode 100644 index ee46c8fb45..0000000000 --- a/stepmania/Themes/default/BGAnimations/_black.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadActor("_black.png");