eval cleanup

This commit is contained in:
Chris Danford
2008-04-04 15:39:28 +00:00
parent 5069eab0c2
commit 0e95900856
6 changed files with 10 additions and 58 deletions
@@ -1 +0,0 @@
_shared background fade in
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

@@ -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;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

@@ -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;
@@ -1 +0,0 @@
return LoadActor("_black.png");