reomve old "children" nodes
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
local children =
|
local t = Def.ActorFrame {
|
||||||
{
|
|
||||||
LoadFont("blaster") .. {
|
LoadFont("blaster") .. {
|
||||||
Text="CAUTION!";
|
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);
|
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);
|
||||||
@@ -11,4 +10,4 @@ local children =
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
return Def.ActorFrame{ children=children };
|
return t;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
local children = {
|
local t = Def.ActorFrame {
|
||||||
LoadActor( THEME:GetPathS("", "_swoosh normal") ) .. {
|
LoadActor( THEME:GetPathS("", "_swoosh normal") ) .. {
|
||||||
StartTransitioningCommand=cmd(play);
|
StartTransitioningCommand=cmd(play);
|
||||||
};
|
};
|
||||||
@@ -15,7 +15,6 @@ local children = {
|
|||||||
-- Cleared
|
-- Cleared
|
||||||
Def.ActorFrame {
|
Def.ActorFrame {
|
||||||
Condition=GAMESTATE:GetPlayMode() ~= PLAY_MODE_BATTLE and GAMESTATE:GetPlayMode() ~= PLAY_MODE_RAVE;
|
Condition=GAMESTATE:GetPlayMode() ~= PLAY_MODE_BATTLE and GAMESTATE:GetPlayMode() ~= PLAY_MODE_RAVE;
|
||||||
children = {
|
|
||||||
LoadActor( "ScreenGameplay out/_extra1.png" ) .. {
|
LoadActor( "ScreenGameplay out/_extra1.png" ) .. {
|
||||||
Condition=GAMESTATE:IsExtraStage();
|
Condition=GAMESTATE:IsExtraStage();
|
||||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
||||||
@@ -40,11 +39,9 @@ local children = {
|
|||||||
OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
|
OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
-- Winner
|
-- Winner
|
||||||
Def.ActorFrame {
|
Def.ActorFrame {
|
||||||
Condition=GAMESTATE:GetPlayMode() == PLAY_MODE_BATTLE or GAMESTATE:GetPlayMode() == PLAY_MODE_RAVE;
|
Condition=GAMESTATE:GetPlayMode() == PLAY_MODE_BATTLE or GAMESTATE:GetPlayMode() == PLAY_MODE_RAVE;
|
||||||
children = {
|
|
||||||
LoadActor( "ScreenGameplay out/p1 win.png" ) .. {
|
LoadActor( "ScreenGameplay out/p1 win.png" ) .. {
|
||||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
||||||
StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_1));
|
StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_1));
|
||||||
@@ -61,7 +58,6 @@ local children = {
|
|||||||
OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
|
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( THEME:GetPathS("", "_swoosh") ) .. { StartTransitioningCommand=cmd(play); };
|
||||||
LoadActor("_moveon") .. {
|
LoadActor("_moveon") .. {
|
||||||
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
|
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() .. {
|
LoadSongBackground() .. {
|
||||||
Condition=not GAMESTATE:IsCourseMode();
|
Condition=not GAMESTATE:IsCourseMode();
|
||||||
OnCommand=cmd(diffusealpha,1;sleep,.5;linear,.5;diffusealpha,0);
|
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 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 )
|
local function AddChild( name )
|
||||||
children[#children+1] = LoadActor( "ScreenStage overlay/" .. name .. ".png" ) .. {
|
t[#t+1] = LoadActor( "ScreenStage overlay/" .. name .. ".png" ) .. {
|
||||||
OnCommand=OnCommand;
|
OnCommand=OnCommand;
|
||||||
Condition=GAMESTATE:GetCurrentStage() == "Stage_" .. name;
|
Condition=GAMESTATE:GetCurrentStage() == "Stage_" .. name;
|
||||||
};
|
};
|
||||||
@@ -21,4 +21,5 @@ AddChild( "Event" );
|
|||||||
AddChild( "Nonstop" );
|
AddChild( "Nonstop" );
|
||||||
AddChild( "Oni" );
|
AddChild( "Oni" );
|
||||||
AddChild( "Endless" );
|
AddChild( "Endless" );
|
||||||
return Def.ActorFrame { children=children };
|
return t;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,16 @@
|
|||||||
local time = THEME:GetMetric( "ScreenMusicScroll", "TimerSeconds" )
|
local time = THEME:GetMetric( "ScreenMusicScroll", "TimerSeconds" )
|
||||||
local num = time * 2
|
local num = time * 2
|
||||||
local fontPath = THEME:GetPathF( "ScreenMusicScroll", "titles" )
|
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
|
for i=1,num do
|
||||||
local song = SONGMAN:GetRandomSong()
|
local song = SONGMAN:GetRandomSong()
|
||||||
local color = SONGMAN:GetSongColor( song )
|
local color = SONGMAN:GetSongColor( song )
|
||||||
@@ -12,15 +21,7 @@ for i=1,num do
|
|||||||
OnCommand = cmd(zoom,0.7;diffuse,color);
|
OnCommand = cmd(zoom,0.7;diffuse,color);
|
||||||
}
|
}
|
||||||
|
|
||||||
table.insert( children, WrapInActorFrame({t}) )
|
table.insert( t, WrapInActorFrame({t}) )
|
||||||
end
|
end
|
||||||
|
|
||||||
return Def.ActorScroller {
|
return t;
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ if PREFSMAN:GetPreference( "ShowSongOptions" ) ~= "Maybe_Ask" then
|
|||||||
end
|
end
|
||||||
|
|
||||||
local t = Def.ActorFrame {
|
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") ) .. {
|
LoadActor( THEME:GetPathG(Var "LoadingScreen", "ask options") ) .. {
|
||||||
@@ -37,7 +36,6 @@ local t = Def.ActorFrame {
|
|||||||
GoToOptionsCommand=cmd(visible,true);
|
GoToOptionsCommand=cmd(visible,true);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
return t;
|
return t;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
local children = {
|
local t = Def.ActorFrame {
|
||||||
LoadFont("Common", "normal") .. {
|
LoadFont("Common", "normal") .. {
|
||||||
Text=ProductVersion();
|
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);
|
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 function MakeHelpDisplay()
|
||||||
local X = ScreenMetric("HelpX");
|
local X = ScreenMetric("HelpX");
|
||||||
local Y = ScreenMetric("HelpY");
|
local Y = ScreenMetric("HelpY");
|
||||||
@@ -27,8 +25,7 @@ local function MakeHelpDisplay()
|
|||||||
return t;
|
return t;
|
||||||
end
|
end
|
||||||
|
|
||||||
children[#children+1] = MakeHelpDisplay();
|
local t = Def.ActorFrame { };
|
||||||
return Def.ActorFrame {
|
t[#t+1] = MakeHelpDisplay();
|
||||||
children = children;
|
return t;
|
||||||
};
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user