Menu
▾
▴
[Stepmania-cvs] r27244 - trunk/stepmania/Themes/default: BGAnimations/ScreenGameplay decorations/default.lua BGAnimations/ScreenLogo underlay.lua BGAnimations/ScreenSelectMusic decorations/default.lua BGAnimations/ScreenSelectPlayMode overlay.redir BGAnimations/ScreenSelectStyle2 overlay.redir BGAnimations/ScreenWithMenuElements decorations/default.lua BGAnimations/ScreenWithMenuElements underlay.lua BGAnimations/ScreenWithMenuElements underlay.redir BGAnimations/ScreenWithMenuElements2 decorations/arrow (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/bar (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/default.lua BGAnimations/ScreenWithMenuElements2 decorations/ring (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_TwoPlayersTwoSides.png BGAnimations/ScreenWithMenuElements2 decorations/top (doubleres).png BGAnimations/_frame files 3x1/headers 3x1.png BGAnimations/_menu overlay with player notifications/default.lua BGAnimations/_menu overlay with player notifications/notify (doubleres).png BGAnimations/_standard decoration optional.lua BGAnimations/_standard decoration required.lua BGAnimations/_standard decoration.lua Graphics/ScreenProfileLoad header.redir Graphics/ScreenSelectGroup header.png Graphics/ScreenSelectMusic header.lua Graphics/ScreenSelectPlayMode header.redir Graphics/ScreenSelectPlayer header.png Graphics/ScreenSelectStyle2 header.redir Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerOneSide 2x1.png Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerTwoSides 2x1.png Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersSharedSides 2x1.png Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersTwoSides 2x1.png Graphics/ScreenWithMenuElements StyleIcon/default.lua Graphics/ScreenWithMenuElements footer/default.lua Graphics/ScreenWithMenuElements footer/notify (doubleres).png Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png Graphics/ScreenWithMenuElements2 header/bar (doubleres).png Graphics/ScreenWithMenuElements2 header/default.lua Graphics/ScreenWithMenuElements2 header/ring (doubleres).png Graphics/ScreenWithMenuElements2 header/top (doubleres).png Graphics/ScreenWithMenuElementsBlank LeftFrame.redir Graphics/ScreenWithMenuElementsBlank RightFrame.redir Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png Graphics/_header.lua Scripts/Other.lua metrics.ini
Added:
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.redir
trunk/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua
trunk/stepmania/Themes/default/BGAnimations/_standard decoration required.lua
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/notify (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank LeftFrame.redir
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir
trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png (contents, props changed)
trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png (contents, props changed)
Removed:
trunk/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode overlay.redir
trunk/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 overlay.redir
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/arrow (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/bar (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/ring (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_TwoPlayersTwoSides.png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/top (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 overlay/
trunk/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png
trunk/stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/default.lua
trunk/stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/notify (doubleres).png
trunk/stepmania/Themes/default/BGAnimations/_standard decoration.lua
trunk/stepmania/Themes/default/Graphics/ScreenProfileLoad header.redir
trunk/stepmania/Themes/default/Graphics/ScreenSelectGroup header.png
trunk/stepmania/Themes/default/Graphics/ScreenSelectMusic header.lua
trunk/stepmania/Themes/default/Graphics/ScreenSelectPlayMode header.redir
trunk/stepmania/Themes/default/Graphics/ScreenSelectPlayer header.png
trunk/stepmania/Themes/default/Graphics/ScreenSelectStyle2 header.redir
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerOneSide 2x1.png
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerTwoSides 2x1.png
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersSharedSides 2x1.png
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersTwoSides 2x1.png
trunk/stepmania/Themes/default/Graphics/_header.lua
Modified:
trunk/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
trunk/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua
trunk/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua
trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua
trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua
trunk/stepmania/Themes/default/Scripts/Other.lua
trunk/stepmania/Themes/default/metrics.ini
Log:
theme cleanup
Modified: trunk/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
==============================================================================
--- trunk/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua (original)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua Mon Mar 31 04:49:26 2008
@@ -1,6 +1,6 @@
-local t = LoadActor( THEME:GetPathB("ScreenWithMenuElements","decorations") );
+local t = LoadFallbackB( "decorations" );
-t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "StageFrame", "StageFrame" );
t[#t+1] = LoadActor("_warning") .. {
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;
@@ -11,21 +11,20 @@ t[#t+1] = LoadActor("_warning") .. {
ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1);
HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0);
};
-t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
-t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
-t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "LeftFrame", "LeftFrame" );
-t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "RightFrame", "RightFrame" );
+
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LifeFrame", "LifeFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "ScoreFrame", "ScoreFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
-t[#t+1] =
- Def.OptionIconRow {
+t[#t+1] = Def.OptionIconRow {
Condition=GAMESTATE:IsHumanPlayer(PLAYER_1);
InitCommand=cmd(z,SCREEN_CENTER_X-200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
-t[#t+1] =
- Def.OptionIconRow {
+t[#t+1] = Def.OptionIconRow {
Condition=GAMESTATE:IsHumanPlayer(PLAYER_2);
InitCommand=cmd(z,SCREEN_CENTER_X+200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
Modified: trunk/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua
==============================================================================
--- trunk/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua (original)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua Mon Mar 31 04:49:26 2008
@@ -1,3 +1,3 @@
return Def.ActorFrame {
- LoadActor( THEME:GetPathB('','_standard decoration'), "Logo", GAMESTATE:GetCurrentGame():GetName() );
+ LoadActor( THEME:GetPathB('','_standard decoration required'), "Logo", GAMESTATE:GetCurrentGame():GetName() );
};
\ No newline at end of file
Modified: trunk/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
==============================================================================
--- trunk/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua (original)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua Mon Mar 31 04:49:26 2008
@@ -62,12 +62,7 @@ local function OptionsArea(pn)
end
-local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback');
-local element = "decorations";
-local fallback_path = THEME:GetPathB(fallback_screen,element);
---Trace('fallback_path ' .. fallback_path );
-
-local t = LoadActor( fallback_path );
+local t = LoadFallbackB( "decorations" );
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X+140;y,SCREEN_CENTER_Y-10);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
Modified: trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua
==============================================================================
--- trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua (original)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua Mon Mar 31 04:49:26 2008
@@ -1,2 +1,10 @@
-- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table.
-return Def.ActorFrame {};
+return Def.ActorFrame {
+ LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" );
+ LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
+ LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" );
+ LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" );
+ LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" );
+ LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" );
+
+};
Added: trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.redir
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.redir Mon Mar 31 04:49:26 2008
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
Modified: trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua
==============================================================================
--- trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua (original)
+++ trunk/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua Mon Mar 31 04:49:26 2008
@@ -1,43 +1,4 @@
local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. {
- LoadActor( THEME:GetPathB('','_standard decoration'), "LeftFrame", "LeftFrame" );
- LoadActor( THEME:GetPathB('','_standard decoration'), "RightFrame", "RightFrame" );
-
- LoadActor( "top" ) .. {
- InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP;vertalign,top);
- };
- Def.ActorFrame {
- InitCommand=cmd(x,SCREEN_CENTER_X-284;y,SCREEN_TOP+30);
- LoadActor( "bar" ) .. {
- InitCommand=cmd(horizalign,left;y,4);
- };
- LoadFont( "_sf sports night ns upright 52" ) .. {
- InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,"Select Style";skewx,-0.15);
- };
- LoadFont( "_venacti 24" ) .. {
- InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,"I can't wait to see your next moves!");
- };
- LoadActor( "arrow" ) .. {
- };
- LoadActor( "ring" ) .. {
- InitCommand=cmd(x,-1.5);
- };
- };
};
-local style = GAMESTATE:GetCurrentStyle();
-if style then
- local master_pn = GAMESTATE:GetMasterPlayerNumber();
- local st = style:GetStyleType();
- local pad_file = "";
- if st == "StyleType_OnePlayerOneSide" or st == "StyleType_OnePlayerTwoSides" then
- pad_file = st .. " " .. master_pn;
- elseif st == "StyleType_TwoPlayersTwoSides" then
- pad_file = st;
- end
-
- t[#t+1] = LoadActor( "style " .. pad_file ) .. {
- InitCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y-202;);
- };
-end
-
return t;
\ No newline at end of file
Added: trunk/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua Mon Mar 31 04:49:26 2008
@@ -0,0 +1,6 @@
+local MetricsName, FileName = ...;
+if THEME:GetMetric(Var "LoadingScreen","Show"..MetricsName) then
+ return LoadActor( THEME:GetPathB("","_standard decoration required"), MetricsName, FileName );
+else
+ return Def.Actor {};
+end
Added: trunk/stepmania/Themes/default/BGAnimations/_standard decoration required.lua
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/BGAnimations/_standard decoration required.lua Mon Mar 31 04:49:26 2008
@@ -0,0 +1,15 @@
+local MetricsName, FileName = ...;
+local t = LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) );
+if type(t) == "table" then
+ t = t .. {
+ InitCommand=function(self)
+ local x1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X");
+ if x1 then self:x(x1); end
+ local y1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y");
+ if y1 then self:y(y1); end
+ end;
+ OnCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OnCommand");
+ OffCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OffCommand");
+ };
+end
+return t;
Modified: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua
==============================================================================
--- trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua (original)
+++ trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua Mon Mar 31 04:49:26 2008
@@ -1,12 +1,17 @@
-local style = GAMESTATE:GetCurrentStyle();
-if not style then return Def.Actor {}; end
-
-local s = style:GetStyleType();
-local Reverse = PlayerNumber:Reverse();
-s = string.gsub(s, "StyleType_", "");
+local t = {};
-local t = LoadActor("_icon " .. s) .. {
- InitCommand = cmd(pause;setstate,Reverse[GAMESTATE:GetMasterPlayerNumber()]);
-};
+local style = GAMESTATE:GetCurrentStyle();
+if style then
+ local master_pn = GAMESTATE:GetMasterPlayerNumber();
+ local st = style:GetStyleType();
+ local pad_file = "";
+ if st == "StyleType_OnePlayerOneSide" or st == "StyleType_OnePlayerTwoSides" then
+ pad_file = st .. " " .. master_pn;
+ elseif st == "StyleType_TwoPlayersTwoSides" then
+ pad_file = st;
+ end
-return t;
+ return LoadActor( THEME:GetPathG("","_StyleIcon " .. pad_file ) ) .. {};
+else
+ return Def.Actor {};
+end
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua Mon Mar 31 04:49:26 2008
@@ -0,0 +1,20 @@
+return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. {
+ Def.ActorFrame {
+ InitCommand=cmd(x,-200;);
+ LoadActor( "notify" ) .. {
+ OnCommand=cmd();
+ };
+ LoadFont( "_venacti bold 30" ) .. {
+ InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;);
+ };
+ };
+ Def.ActorFrame {
+ InitCommand=cmd(x,200;);
+ LoadActor( "notify" ) .. {
+ OnCommand=cmd(zoomx,-1);
+ };
+ LoadFont( "_venacti bold 30" ) .. {
+ InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;);
+ };
+ };
+};
\ No newline at end of file
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/notify (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua Mon Mar 31 04:49:26 2008
@@ -0,0 +1,22 @@
+return Def.ActorFrame {
+ LoadActor( "top" ) .. {
+ InitCommand=cmd();
+ };
+ Def.ActorFrame {
+ InitCommand=cmd(x,-284;y,-6;);
+ LoadActor( "bar" ) .. {
+ InitCommand=cmd(horizalign,left;y,4);
+ };
+ LoadFont( "_sf sports night ns upright 52" ) .. {
+ InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,"Select Style";skewx,-0.15);
+ };
+ LoadFont( "_venacti 24" ) .. {
+ InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,"I can't wait to see your next moves!");
+ };
+ LoadActor( "arrow" ) .. {
+ };
+ LoadActor( "ring" ) .. {
+ InitCommand=cmd(x,-1.5);
+ };
+ };
+};
\ No newline at end of file
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank LeftFrame.redir
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank LeftFrame.redir Mon Mar 31 04:49:26 2008
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
Added: trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir
==============================================================================
--- (empty file)
+++ trunk/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir Mon Mar 31 04:49:26 2008
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
Added: trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png
==============================================================================
Binary file. No diff available.
Added: trunk/stepmania/Themes/default/Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png
==============================================================================
Binary file. No diff available.
Modified: trunk/stepmania/Themes/default/Scripts/Other.lua
==============================================================================
--- trunk/stepmania/Themes/default/Scripts/Other.lua (original)
+++ trunk/stepmania/Themes/default/Scripts/Other.lua Mon Mar 31 04:49:26 2008
@@ -1,3 +1,11 @@
+function LoadFallbackB( element )
+ -- TODO: Remove element parameter and make it a LuaThreadVar
+ local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback');
+ local fallback_path = THEME:GetPathB(fallback_screen,element);
+ --Trace('fallback_path ' .. fallback_path );
+ return LoadActor( fallback_path );
+end
+
function FormatNumSongsPlayed( num )
local s = num
if s == 1 then
Modified: trunk/stepmania/Themes/default/metrics.ini
==============================================================================
--- trunk/stepmania/Themes/default/metrics.ini (original)
+++ trunk/stepmania/Themes/default/metrics.ini Mon Mar 31 04:49:26 2008
@@ -112,7 +112,7 @@ ScrollerY=SCREEN_CENTER_Y+40
ScrollerOnCommand=
ScrollerOffCommand=
TimerSeconds=-1
-StyleIcon=false
+ShowStyleIcon=false
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-20
HelpOnCommand=zoom,0.5
@@ -164,7 +164,7 @@ JoinMessageP2X=SCREEN_CENTER_X+200
JoinMessageP2Y=SCREEN_CENTER_Y+96
TimerSeconds=40
TimerStealth=false
-StyleIcon=true
+ShowStyleIcon=true
NextScreen=ScreenSelectGroupBranch()
PrevScreen=ScreenTitleBranch()
SilentWait=true
@@ -173,14 +173,6 @@ FoldOnJoin=true
[ScreenWithMenuElements2]
Fallback="ScreenWithMenuElements"
-LeftFrameX=SCREEN_CENTER_X-320
-LeftFrameY=SCREEN_CENTER_Y
-LeftFrameOnCommand=
-LeftFrameOffCommand=
-RightFrameX=SCREEN_CENTER_X+320
-RightFrameY=SCREEN_CENTER_Y
-RightFrameOnCommand=
-RightFrameOffCommand=
[ScreenSelectStyle2]
Fallback="ScreenWithMenuElements2"
@@ -296,7 +288,7 @@ Choice3="Style,couple;name,couple;screen
Choice4="Style,double;name,double;screen,ScreenSelectDifficulty"
Choice5="Style,solo;name,solo;screen,ScreenSelectDifficulty"
TimerSeconds=40
-StyleIcon=true
+ShowStyleIcon=true
IdleCommentSeconds=15
IdleTimeoutSeconds=0
PrevScreen=ScreenTitleBranch()
@@ -370,7 +362,7 @@ GuideX=SCREEN_CENTER_X+0
GuideY=SCREEN_CENTER_Y+134
TimerSeconds=30
TimerStealth=false
-StyleIcon=true
+ShowStyleIcon=true
NextScreen=ScreenSelectGroupBranch()
ScrollingListX=SCREEN_CENTER_X+0
ScrollingListY=SCREEN_CENTER_Y+10
@@ -408,7 +400,7 @@ Choice7="PlayMode,endless;name,endless;s
Choice8="PlayMode,rave;name,rave;screen,"..GetScreenInstructions()
NumChoicesOnPage1=4
TimerSeconds=40
-StyleIcon=true
+ShowStyleIcon=true
IdleCommentSeconds=15
IdleTimeoutSeconds=0
PrevScreen=ScreenTitleBranch()
@@ -551,7 +543,7 @@ MusicListOnCommand=
MusicListOffCommand=
SleepAfterTweenOffSeconds=0.8
TimerSeconds=40
-StyleIcon=true
+ShowStyleIcon=true
[GroupList]
StartX=0
@@ -588,7 +580,7 @@ Fallback="ScreenWithMenuElements"
NextScreen="ScreenSelectCharacter"
PrevScreen=ScreenTitleBranch()
TimerSeconds=15
-StyleIcon=true
+ShowStyleIcon=true
[ScreenSelectMusic]
Class="ScreenSelectMusic"
@@ -641,7 +633,7 @@ MusicWheelY=SCREEN_CENTER_Y-2
MusicWheelOnCommand=draworder,-100
MusicWheelOffCommand=
TimerSeconds=60
-StyleIcon=true
+ShowStyleIcon=true
SampleMusicDelay=0.25
DoRouletteOnMenuTimer=true
AlignMusicBeat=false
@@ -689,7 +681,7 @@ Class="ScreenSMOnlineLogin"
Fallback="ScreenOptionsServiceChild"
NextScreen=SMOnlineScreen()
PrevScreen=ScreenTitleBranch()
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
[ScreenNetRoom]
@@ -816,7 +808,7 @@ ChatTextInputWidth=605
NumStylesShow=1
NumSongsShow=4
NumGroupsShow=3
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=
PrevScreen=ScreenTitleBranch()
NextScreen="ScreenStage"
@@ -878,7 +870,7 @@ NextScreen="ScreenStage"
NextOptionsScreen=SelectFirstOptionsScreen()
TimerSeconds=60
TimerStealth=false
-StyleIcon=false
+ShowStyleIcon=false
[ScreenSplash]
Class="ScreenSplash"
@@ -1177,7 +1169,7 @@ Summary=false
TimerSeconds=15
PlayerOptionsSeparator=","
MaxComboNumDigits=4
-StyleIcon=true
+ShowStyleIcon=true
ShowBannerArea=true
ShowJudgmentLabels=true
ShowW1=true
@@ -1769,7 +1761,7 @@ ExplanationOnCommand=wrapwidthpixels,900
NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
NumStepsLoadedFromProfileY=SCREEN_TOP+42
NumStepsLoadedFromProfileOnCommand=visible,false
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
[ScreenJukeboxMenu]
@@ -1777,7 +1769,7 @@ Class="ScreenOptionsMaster"
Fallback="ScreenOptions"
NextScreen="ScreenJukebox"
PrevScreen=ScreenTitleBranch()
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
InputMode="together"
ForceAllPlayers=true
@@ -2052,19 +2044,19 @@ ShowStepsType=false
[ScreenWithMenuElements]
Fallback="Screen"
AllowDisabledPlayerInput=false
-StyleIcon=true
+ShowStyleIcon=true
ShowStageDisplay=false
StageDisplayStageToShow=GAMESTATE:GetCurrentStage()
StageDisplayStageIndex=GAMESTATE:GetStageIndex()
MemoryCardIcons=true
CancelTransitionsOut=false
-HeaderX=SCREEN_LEFT+(SCREEN_WIDTH/4.25)
-HeaderY=SCREEN_TOP-11
+HeaderX=SCREEN_CENTER_X
+HeaderY=SCREEN_TOP+35
HeaderOnCommand=draworder,95;linear,0.25;addy,33
HeaderOffCommand=linear,0.25;addy,-44;
FooterX=SCREEN_CENTER_X
-FooterY=SCREEN_BOTTOM
-FooterOnCommand=vertalign,bottom
+FooterY=SCREEN_BOTTOM-34
+FooterOnCommand=
FooterOffCommand=
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-24
@@ -2091,6 +2083,18 @@ FirstUpdateCommand=
PlayMusic=true
StopMusicOnBack=true
WaitForChildrenBeforeTweeningOut=false
+LeftFrameX=SCREEN_CENTER_X-320
+LeftFrameY=SCREEN_CENTER_Y
+LeftFrameOnCommand=
+LeftFrameOffCommand=
+RightFrameX=SCREEN_CENTER_X+320
+RightFrameY=SCREEN_CENTER_Y
+RightFrameOnCommand=
+RightFrameOffCommand=
+StyleIconX=SCREEN_CENTER_X+170
+StyleIconY=SCREEN_CENTER_Y-202
+StyleIconOnCommand=
+StyleIconOffCommand=
[MenuTimer]
WarningStart=6
@@ -2349,7 +2353,7 @@ DownloadStatusX=SCREEN_WIDTH*4.0/7.0
DownloadStatusOnCommand=diffusealpha,0.0;linear,1.0;diffusealpha,1.0
DownloadStatusOffCommand=diffusealpha,1.0;linear,0.6;diffusealpha,0.0
CanDL=true
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=
PrevScreen=ScreenTitleBranch()
NextScreen="ScreenStage"
@@ -2904,7 +2908,7 @@ FooterX=
FooterY=
FooterOnCommand=visible,false
FooterOffCommand=
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=6
TimerStealth=true
ForceTimer=true
@@ -2912,6 +2916,7 @@ TimerX=
TimerY=
TimerOnCommand=visible,false
TimerOffCommand=
+ShowStyleIcon=false
[ScreenSelectBlank]
Fallback="ScreenWithMenuElementsBlank"
@@ -2931,7 +2936,7 @@ ScrollerSecondsPerItem=0
ScrollerNumItemsToDraw=20
ScrollerTransform=function(self,offset,itemIndex,numItems) end
ScrollerSubdivisions=1
-StyleIcon=true
+ShowStyleIcon=true
OverrideSleepAfterTweenOffSeconds=false
SleepAfterTweenOffSeconds=0
NumCodes=0
@@ -3260,7 +3265,7 @@ FakeBeatsPerSec=2.5
ForceTimer=true
TimerSeconds=24
TimerStealth=false
-StyleIcon=false
+ShowStyleIcon=false
MaxRankingNameLength=4
NextScreen="ScreenProfileSave"
PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X-160
@@ -3313,7 +3318,7 @@ TitleLoseFocusCommand=stopeffect
NavigationMode="menu"
ForceAllPlayers=true
InputMode="together"
-StyleIcon=false
+ShowStyleIcon=false
[ScreenOptionsService]
Class="ScreenOptionsMaster"
@@ -3331,7 +3336,7 @@ PrevScreen=ScreenTitleBranch()
IconsOnCommand=x,-30
TimerOnCommand=visible,false
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
AllowOperatorMenuButton=false
@@ -3363,7 +3368,7 @@ NavigationMode="normal"
InputMode="together"
IconsOnCommand=x,-30
TimerOnCommand=visible,false
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
AllowOperatorMenuButton=false
ForceAllPlayers=true
@@ -3408,7 +3413,7 @@ PrevScreen=SongSelectionScreen()
NextScreen=ScreenPlayerOptionsNext()
PlayMusic=false
TimerSeconds=30
-StyleIcon=false
+ShowStyleIcon=false
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15"
Line1="list,Speed"
Line2="list,Accel"
@@ -3432,7 +3437,7 @@ Class="ScreenOptionsMaster"
PrevScreen="ScreenSelectMusic"
NextScreen="ScreenStage"
TimerSeconds=30
-StyleIcon=false
+ShowStyleIcon=false
LineNames="1,2,3,4,5"
Line1="list,Speed"
Line2="list,Scroll"
@@ -3447,7 +3452,7 @@ PrevScreen=SelectFirstOptionsScreen()
NextScreen="ScreenStage"
Game=Change the current game type with this option.
TimerSeconds=30
-StyleIcon=false
+ShowStyleIcon=false
PlayMusic=false
LineNames="1,2,3,4,5,6,7,8,9"
Line1="list,LifeType"
@@ -3523,7 +3528,7 @@ IconsP2OnCommand=addx,SCREEN_WIDTH*0.6;b
IconsP2OffCommand=sleep,0.2;bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
SleepAfterTweenOffSeconds=0.8
TimerSeconds=40
-StyleIcon=true
+ShowStyleIcon=true
PrevScreen=ScreenTitleBranch()
NextScreen=SongSelectionScreen()
@@ -3807,7 +3812,7 @@ EmptyName="STEP"
[ScreenSetTime]
Class="ScreenSetTime"
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
TimerOnCommand=visible,false
Fallback="ScreenWithMenuElements"
@@ -3830,7 +3835,7 @@ NextScreen="ScreenEditMenu"
PrevScreen="ScreenEditMenu"
AllowOperatorMenuButton=false
ShowCoinsAndCredits=false
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
EditModifiers=""
EditHelpX=SCREEN_LEFT+4
@@ -3851,7 +3856,7 @@ PrevScreen="none"
CancelTransitionsOut=true
PlayMusic=false
TimerSeconds=-1
-StyleIcon=false
+ShowStyleIcon=false
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16"
Line1="list,Speed"
Line2="list,Accel"
@@ -3941,7 +3946,7 @@ FrameOnCommand=
FrameOffCommand=
NumRowsShown=30
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:y( SCREEN_CENTER_Y + indexOffset * 20 ); end
-StyleIcon=false
+ShowStyleIcon=false
HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP+40
HeaderOnCommand=
@@ -4008,7 +4013,7 @@ Class="ScreenTextEntry"
Fallback="ScreenWithMenuElements"
PrevScreen=
TimerSeconds=-1
-StyleIcon=false
+ShowStyleIcon=false
RowStartX=SCREEN_LEFT+100
RowStartY=SCREEN_CENTER_Y-30
RowEndX=SCREEN_RIGHT-100
@@ -4163,7 +4168,7 @@ NextScreen="ScreenOptionsService"
PrepareScreens="ScreenMiniMenuContext"
GroupedScreens="ScreenMiniMenuContext"
PersistScreens="ScreenMiniMenuContext"
-StyleIcon=false
+ShowStyleIcon=false
TimerSeconds=-1
[ScreenOptionsEditProfile]
|