reomve old "children" nodes
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
local children =
|
||||
{
|
||||
LoadFont("blaster")..{
|
||||
local t = Def.ActorFrame {
|
||||
LoadFont("blaster") .. {
|
||||
Text="CAUTION!";
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP+60;diffuse,1,0,0,1;zoom,1.5;diffusebottomedge,0.25,0,0,1;shadowlength,0);
|
||||
};
|
||||
|
||||
LoadFont("_zeroesthree")..{
|
||||
LoadFont("_zeroesthree") .. {
|
||||
Text="For safety purposes, play with the lights on\nand keep the dance platform a safe distance\nfrom your TV or monitor as well as any other\nfurniture at all times.\nDo not allow pets, children, or other spectators\non the dance platform during gameplay.\nBe aware of the platform\'s position at all times.";
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;horizalign,center;shadowlength,0);
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;horizalign,center;shadowlength,0);
|
||||
};
|
||||
};
|
||||
|
||||
return Def.ActorFrame{ children=children };
|
||||
return t;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local children = {
|
||||
local t = Def.ActorFrame {
|
||||
LoadActor( THEME:GetPathS("", "_swoosh normal") ) .. {
|
||||
StartTransitioningCommand=cmd(play);
|
||||
};
|
||||
@@ -15,53 +15,49 @@ local children = {
|
||||
-- Cleared
|
||||
Def.ActorFrame {
|
||||
Condition=GAMESTATE:GetPlayMode() ~= PLAY_MODE_BATTLE and GAMESTATE:GetPlayMode() ~= PLAY_MODE_RAVE;
|
||||
children = {
|
||||
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);
|
||||
};
|
||||
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;
|
||||
children = {
|
||||
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);
|
||||
};
|
||||
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 WrapInActorFrame( children );
|
||||
return t;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local children = {
|
||||
local t = Def.ActorFrame {
|
||||
LoadActor( THEME:GetPathS("", "_swoosh") ) .. { StartTransitioningCommand=cmd(play); };
|
||||
LoadActor("_moveon") .. {
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
||||
@@ -6,5 +6,5 @@ local children = {
|
||||
};
|
||||
};
|
||||
|
||||
return Def.ActorFrame { children=children };
|
||||
return t;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local children = {
|
||||
local t = Def.ActorFrame {
|
||||
LoadSongBackground() .. {
|
||||
Condition=not GAMESTATE:IsCourseMode();
|
||||
OnCommand=cmd(diffusealpha,1;sleep,.5;linear,.5;diffusealpha,0);
|
||||
@@ -6,7 +6,7 @@ local children = {
|
||||
};
|
||||
local OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+180;diffusealpha,.75;sleep,0.5;linear,0.5;diffusealpha,0);
|
||||
local function AddChild( name )
|
||||
children[#children+1] = LoadActor( "ScreenStage overlay/" .. name .. ".png" ) .. {
|
||||
t[#t+1] = LoadActor( "ScreenStage overlay/" .. name .. ".png" ) .. {
|
||||
OnCommand=OnCommand;
|
||||
Condition=GAMESTATE:GetCurrentStage() == "Stage_" .. name;
|
||||
};
|
||||
@@ -21,4 +21,5 @@ AddChild( "Event" );
|
||||
AddChild( "Nonstop" );
|
||||
AddChild( "Oni" );
|
||||
AddChild( "Endless" );
|
||||
return Def.ActorFrame { children=children };
|
||||
return t;
|
||||
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
local time = THEME:GetMetric( "ScreenMusicScroll", "TimerSeconds" )
|
||||
local num = time * 2
|
||||
local fontPath = THEME:GetPathF( "ScreenMusicScroll", "titles" )
|
||||
local children = {}
|
||||
|
||||
local t = Def.ActorScroller {
|
||||
NumItemsToDraw = 6;
|
||||
SecondsPerItem = time / num;
|
||||
TransformFunction = function( self, offset, itemIndex, numItems )
|
||||
self:y( offset*80 )
|
||||
end;
|
||||
BeginCommand = cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scrollwithpadding,3,3);
|
||||
}
|
||||
|
||||
for i=1,num do
|
||||
local song = SONGMAN:GetRandomSong()
|
||||
local color = SONGMAN:GetSongColor( song )
|
||||
@@ -12,15 +21,7 @@ for i=1,num do
|
||||
OnCommand = cmd(zoom,0.7;diffuse,color);
|
||||
}
|
||||
|
||||
table.insert( children, WrapInActorFrame({t}) )
|
||||
table.insert( t, WrapInActorFrame({t}) )
|
||||
end
|
||||
|
||||
return Def.ActorScroller {
|
||||
NumItemsToDraw = 6;
|
||||
SecondsPerItem = time / num;
|
||||
TransformFunction = function( self, offset, itemIndex, numItems )
|
||||
self:y( offset*80 )
|
||||
end;
|
||||
BeginCommand = cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scrollwithpadding,3,3);
|
||||
children = children;
|
||||
}
|
||||
return t;
|
||||
|
||||
@@ -4,38 +4,36 @@ if PREFSMAN:GetPreference( "ShowSongOptions" ) ~= "Maybe_Ask" then
|
||||
end
|
||||
|
||||
local t = Def.ActorFrame {
|
||||
children = {
|
||||
LoadActor( THEME:GetPathB("", "_fade out with sound") );
|
||||
LoadActor( THEME:GetPathB("", "_fade out with sound") );
|
||||
|
||||
LoadActor( THEME:GetPathG(Var "LoadingScreen", "ask options") ) .. {
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
|
||||
AskForGoToOptionsCommand=cmd(
|
||||
visible,true;
|
||||
diffusealpha,0;
|
||||
linear,0.15;
|
||||
zoomy,1;
|
||||
diffusealpha,1;
|
||||
sleep,1;
|
||||
linear,0.15;
|
||||
diffusealpha,0;
|
||||
zoomy,0;
|
||||
);
|
||||
GoToOptionsCommand=cmd(visible,false);
|
||||
};
|
||||
LoadActor( THEME:GetPathG(Var "LoadingScreen", "entering options") ) .. {
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
|
||||
AskForGoToOptionsCommand=cmd(
|
||||
visible,false;
|
||||
linear,0.15;
|
||||
zoomy,1;
|
||||
diffusealpha,1;
|
||||
sleep,1;
|
||||
linear,0.15;
|
||||
diffusealpha,0;
|
||||
zoomy,0;
|
||||
);
|
||||
GoToOptionsCommand=cmd(visible,true);
|
||||
};
|
||||
LoadActor( THEME:GetPathG(Var "LoadingScreen", "ask options") ) .. {
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
|
||||
AskForGoToOptionsCommand=cmd(
|
||||
visible,true;
|
||||
diffusealpha,0;
|
||||
linear,0.15;
|
||||
zoomy,1;
|
||||
diffusealpha,1;
|
||||
sleep,1;
|
||||
linear,0.15;
|
||||
diffusealpha,0;
|
||||
zoomy,0;
|
||||
);
|
||||
GoToOptionsCommand=cmd(visible,false);
|
||||
};
|
||||
LoadActor( THEME:GetPathG(Var "LoadingScreen", "entering options") ) .. {
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
|
||||
AskForGoToOptionsCommand=cmd(
|
||||
visible,false;
|
||||
linear,0.15;
|
||||
zoomy,1;
|
||||
diffusealpha,1;
|
||||
sleep,1;
|
||||
linear,0.15;
|
||||
diffusealpha,0;
|
||||
zoomy,0;
|
||||
);
|
||||
GoToOptionsCommand=cmd(visible,true);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local children = {
|
||||
local t = Def.ActorFrame {
|
||||
LoadFont("Common", "normal") .. {
|
||||
Text=ProductVersion();
|
||||
OnCommand=cmd(x,SCREEN_RIGHT-20;y,SCREEN_TOP+20;horizalign,right;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2);
|
||||
@@ -21,4 +21,4 @@ local children = {
|
||||
};
|
||||
}
|
||||
|
||||
return Def.ActorFrame { children = children };
|
||||
return t;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
local children = { };
|
||||
|
||||
local function MakeHelpDisplay()
|
||||
local X = ScreenMetric("HelpX");
|
||||
local Y = ScreenMetric("HelpY");
|
||||
@@ -27,8 +25,7 @@ local function MakeHelpDisplay()
|
||||
return t;
|
||||
end
|
||||
|
||||
children[#children+1] = MakeHelpDisplay();
|
||||
return Def.ActorFrame {
|
||||
children = children;
|
||||
};
|
||||
local t = Def.ActorFrame { };
|
||||
t[#t+1] = MakeHelpDisplay();
|
||||
return t;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user