cleanup, overlay to decorations

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua

@@ -1,15 +1,15 @@
-local p1x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1X' )
-local p1y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1Y' )
-local p2x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2X' )
-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);
-	};
-}
+local p1x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1X' )
+local p1y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1Y' )
+local p2x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2X' )
+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);
+	};
+}

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua

@@ -1,21 +1,21 @@
-local Player = ...
-assert( Player );
-
-local t = Def.ActorFrame {
-	Def.GraphDisplay {
-		OnCommand=function(self)
-			local Stats = STATSMAN:GetCurStageStats();
-			self:LoadFromStats( Stats, Stats:GetPlayerStageStats(Player) )
-		end,
-		Texture = LoadActor("LifeGraph p1") .. {
-			InitCommand=cmd(ztest,1;diffusealpha,0),
-			OnCommand=cmd(linear,0.5;diffusealpha,1),
-			OffCommand=cmd(linear,0.5;diffusealpha,0),
-		},
-		Line = Def.GraphLine { InitCommand=cmd(visible,false) },
-		Body = Def.GraphBody { InitCommand=cmd(zwrite,1;blend,"BlendMode_NoEffect") },
-		SongBoundary = Def.Actor { InitCommand=cmd(visible,false) },
-		Barely = Def.Actor { InitCommand=cmd(visible,false) },
-	}
-}
-return t
+local Player = ...
+assert( Player );
+
+local t = Def.ActorFrame {
+	Def.GraphDisplay {
+		OnCommand=function(self)
+			local Stats = STATSMAN:GetCurStageStats();
+			self:LoadFromStats( Stats, Stats:GetPlayerStageStats(Player) )
+		end,
+		Texture = LoadActor("life filling") .. {
+			InitCommand=cmd(ztest,1;diffusealpha,0),
+			OnCommand=cmd(linear,0.5;diffusealpha,1),
+			OffCommand=cmd(linear,0.5;diffusealpha,0),
+		},
+		Line = Def.GraphLine { InitCommand=cmd(visible,false) },
+		Body = Def.GraphBody { InitCommand=cmd(zwrite,1;blend,"BlendMode_NoEffect") },
+		SongBoundary = Def.Actor { InitCommand=cmd(visible,false) },
+		Barely = Def.Actor { InitCommand=cmd(visible,false) },
+	}
+}
+return t

stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua

@@ -13,5 +13,24 @@ t[#t+1] = LoadActor("_warning") .. {
 	};
 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] = 
+	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 {
+		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);
+		OffCommand=cmd(linear,0.5;zoomy,0);
+	};
+
 
 return t;

stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua

@@ -0,0 +1,461 @@
+local function DifficultyDisplay(pn)
+	local function set(self, player)
+		self:SetFromGameState( player );
+	end
+
+	local t = Def.DifficultyDisplay {
+		InitCommand=cmd(Load,"DifficultyDisplay",GAMESTATE:GetPlayerState(pn););
+	};
+
+	if pn == PLAYER_1 then
+		t.CurrentStepsP1ChangedMessageCommand=function(self) set(self, pn); end;
+		t.CurrentTrailP1ChangedMessageCommand=function(self) set(self, pn); end;
+	else
+		t.CurrentStepsP2ChangedMessageCommand=function(self) set(self, pn); end;
+		t.CurrentTrailP2ChangedMessageCommand=function(self) set(self, pn); end;
+	end
+
+	return t;
+end
+
+local function Radar()
+	local function set(self,player)
+		local Selection = GAMESTATE:GetCurrentSteps(player) or GAMESTATE:GetCurrentTrail(player)
+		if not Selection then
+			self:SetEmpty( player );
+			return
+		end
+		self:SetFromRadarValues( player, Selection:GetRadarValues(player) );
+
+	end
+
+	local t = Def.GrooveRadar {
+		OnCommand=cmd(tweenonscreen);
+		OffCommand=cmd(tweenoffscreen);
+
+		CurrentStepsP1ChangedMessageCommand=function(self) set(self, PLAYER_1); end;
+		CurrentStepsP2ChangedMessageCommand=function(self) set(self, PLAYER_2); end;
+		CurrentTrailP1ChangedMessageCommand=function(self) set(self, PLAYER_1); end;
+		CurrentTrailP2ChangedMessageCommand=function(self) set(self, PLAYER_2); end;
+	};
+
+	return t;
+end
+
+local function OptionsArea(pn)
+	local t = Def.ActorFrame {};
+	t[#t+1] = Def.ActorFrame {
+		InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingY"););
+		LoadActor( "option icon header" ) .. {
+		
+		};
+		LoadFont("_terminator two 32" ) .. {
+			InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
+		};
+	};
+	t[#t+1] = Def.OptionIconRow {
+		InitCommand=cmd(Load,"OptionIconRowSelectMusic",pn;);
+		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;);
+		OffCommand=cmd(linear,0.5;zoomy,0;);
+	};
+	return t;
+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 );
+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);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+	LoadActor( "_banner mask" ) .. {
+		InitCommand=cmd(y,-74;zwrite,1;z,1;blend,"BlendMode_NoEffect");
+	};
+	Def.ActorProxy {
+		BeginCommand=function(self) local banner = SCREENMAN:GetTopScreen():GetChild('Banner'); self:SetTarget(banner); end;
+		InitCommand=cmd(y,-74;);
+	};
+	LoadActor( "_banner frame" ) .. {
+	};
+};
+
+t[#t+1] = LoadFont("Common", "normal") .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+94;playcommand,"Set");
+	OnCommand=cmd(zoom,0.5;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1);
+	OffCommand=cmd(linear,0.5;diffusealpha,0);
+
+	SetCommand=function(self)
+		local sText = GAMESTATE:GetSongOptionsString()
+		sText = string.gsub(sText, ", ", "\n")
+		self:settext( sText )
+		if GAMESTATE:IsAnExtraStage() then
+			self:diffuseblink()
+		end
+	end;
+	SongOptionsChangedMessageCommand=cmd(playcommand,"Set");
+};
+	
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y);
+	LoadActor( "wheel cursor glow" ) .. {
+		InitCommand=cmd(blend,"BlendMode_Add";);
+	};
+	LoadActor( "wheel cursor normal" ) .. {
+	
+	};
+};
+	
+t[#t+1] = OptionsArea( "PlayerNumber_P1" ) .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+136);
+};
+t[#t+1] = OptionsArea( "PlayerNumber_P2" ) .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+154);	
+};
+
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(x,SCREEN_CENTER_X-120;y,SCREEN_CENTER_Y-170);
+	OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+	LoadActor( THEME:GetPathG("MusicSortDisplay","frame") ) .. {
+	
+	};
+	LoadFont( "_sf square head bold 28" ) .. {
+		InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800"););
+		SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) ));
+		SortOrderChangedMessageCommand=cmd(playcommand,"Set");
+	};
+};
+
+t[#t+1] = LoadActor( THEME:GetPathG(Var 'LoadingScreen','options message 1x2') ) .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;pause);
+	OnCommand=cmd(hidden,1);
+	ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0;
+		faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3);
+	ShowEnteringOptionsCommand=cmd(finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions");
+	HidePressStartForOptionsCommand=cmd(linear,0.4;cropleft,1.3);
+};
+
+t[#t+1] = Def.PaneDisplay {
+	MetricsGroup="PaneDisplay";
+	PlayerNumber=PLAYER_1;
+	InitCommand=cmd(player,PLAYER_1;playcommand,"Set";x,SCREEN_CENTER_X-180;y,SCREEN_CENTER_Y+194);
+	
+	SetCommand=function(self) self:SetFromGameState() end;
+	CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
+	SortOrderChangedMessageCommand=cmd(playcommand,"Set");
+};
+
+t[#t+1] = Def.PaneDisplay {
+	MetricsGroup="PaneDisplay";
+	PlayerNumber=PLAYER_2;
+	InitCommand=cmd(player,PLAYER_2;playcommand,"Set";x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y+194);
+	
+	SetCommand=function(self) self:SetFromGameState() end;
+	CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
+	SortOrderChangedMessageCommand=cmd(playcommand,"Set");
+};
+
+t[#t+1] = Def.BPMDisplay {
+	File=THEME:GetPathF("BPMDisplay", "bpm");
+	Name="BPMDisplay";
+	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;);
+	OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+	SetCommand=function(self) self:SetFromGameState() end;
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+t[#t+1] = LoadActor( "_bpm label" ) .. {
+	InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X+280;y,SCREEN_CENTER_Y);
+	OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+};
+t[#t+1] = LoadActor( "bpm meter" ) .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-12);
+	OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+};
+t[#t+1] = LoadActor( "stop icon" ) .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y+6);
+	OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+	SetCommand=function(self) 
+			local b = false;
+			local song = GAMESTATE:GetCurrentSong();
+			if song then
+				b = song:GetTimingData():HasStops(); 
+			end;
+			self:visible( b );
+		end;
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+	
+t[#t+1] = LoadFont("_regra 32 bold") .. {
+	InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;zoom,0.5;settext,"/Senser";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360);
+	SetCommand=function(self) 
+			local s = "---";
+			local song = GAMESTATE:GetCurrentSong(); 
+			if song then
+				local s2 = song:GetDisplayArtist(); 
+				if s2 ~= "" then 
+					s = "/" .. s2; 
+				end;
+			end; 
+			self:settext( s );
+		end;
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+t[#t+1] = LoadFont("_regra 32 bold") .. {
+	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;zoom,0.5;settext,"_Hardcore Techno";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
+	SetCommand=function(self) 
+			local s = "---";
+			local song = GAMESTATE:GetCurrentSong(); 
+			if song then
+				local s2 = song:GetGenre(); 
+				if s2 ~= "" then 
+						s = "_" .. s2; 
+				end;
+			end; 
+			self:settext( s );
+		end;
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(x,SCREEN_CENTER_X+26;y,SCREEN_CENTER_Y+5;);
+	LoadActor("star full") .. { InitCommand=cmd(x,16*-2); };
+	LoadActor("star full") .. { InitCommand=cmd(x,16*-1); };
+	LoadActor("star full") .. { InitCommand=cmd(x,16*0); };
+	LoadActor("star empty") .. { InitCommand=cmd(x,16*1); };
+	LoadActor("star empty") .. { InitCommand=cmd(x,16*2); };
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+
+t[#t+1] = Def.CourseContentsList {
+	MaxSongs = 5;
+
+	InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+96);
+	OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1);
+	OffCommand=cmd(zoomy,1;bouncebegin,0.3;zoomy,0);
+	ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
+	HideCommand=cmd(linear,0.3;zoomy,0);
+	SetCommand=function(self)
+		self:SetFromGameState();
+		self:setsecondsperitem(0.7);
+		self:SetSecondsPauseBetweenItems(0.7);
+		self:scrollwithpadding(0, 0);
+	end;
+	CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
+	CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
+
+	Display = Def.ActorFrame { 
+		InitCommand=cmd(setsize,270,44);
+
+		LoadActor("_CourseEntryDisplay bar");
+
+		Def.TextBanner {
+			ArtistPrependString="/";
+			SetCommand=TextBannerSet;
+			InitCommand=cmd(SetFromString,"", "", "", "", "", "");
+			Title = LoadFont("TextBanner","text") .. {
+				Name="Title";
+				OnCommand=cmd(shadowlength,0);
+			};
+			Subtitle = LoadFont("TextBanner","text") .. {
+				Name="Subtitle";
+				OnCommand=cmd(shadowlength,0);
+			};
+			Artist = LoadFont("TextBanner","text") .. {
+				Name="Artist";
+				OnCommand=cmd(shadowlength,0);
+			};
+			SetSongCommand=function(self, params)
+				if params.Song then
+					self:SetFromSong( params.Song );
+					self:diffuse( SONGMAN:GetSongColor(params.Song) );
+				else
+					self:SetFromString( "??????????", "??????????", "", "", "", "" );
+					self:diffuse( color("#FFFFFF") );
+				end
+			end;
+		};
+
+		LoadFont("CourseEntryDisplay","number") .. {
+			OnCommand=cmd(x,-118;shadowlength,0);
+			SetSongCommand=function(self, params) self:settext(string.format("%i", params.Number)); end;
+		};
+
+		LoadFont("Common","normal") .. {
+			OnCommand=cmd(x,SCREEN_CENTER_X-200;y,-8;zoom,0.7;shadowlength,0);
+			DifficultyChangedCommand=function(self, params)
+				if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end
+				self:settext( params.Meter );
+				self:diffuse( CourseDifficutlyToColor(params.Difficulty) );
+			end;
+		};
+
+		LoadFont("Common","normal") .. {
+			OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;zoom,0.5;shadowlength,0);
+			SetSongCommand=function(self, params) self:settext(params.Modifiers); end;
+		};
+
+		LoadFont("CourseEntryDisplay","difficulty") .. {
+			OnCommand=cmd(x,SCREEN_CENTER_X-222;y,-8;shadowlength,0;settext,"1");
+			DifficultyChangedCommand=function(self, params)
+				if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end
+				self:diffuse( CourseDifficutlyToColor(params.Difficulty) );
+			end;
+		};
+	};
+};
+
+t[#t+1] = DifficultyDisplay(PLAYER_1) .. {
+	BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20);
+	OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+	OffCommand=cmd(linear,0.5;zoomy,0);
+};
+t[#t+1] = DifficultyDisplay(PLAYER_2) .. {
+	BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20);
+	OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+	OffCommand=cmd(linear,0.5;zoomy,0);
+};
+
+t[#t+1] = Def.ActorFrame{
+	InitCommand=cmd(x,SCREEN_CENTER_X-190;y,SCREEN_CENTER_Y-32);
+	ShowCommand=cmd(linear,0.2;diffusealpha,1);
+	HideCommand=cmd(linear,0.2;diffusealpha,0);
+	
+	LoadActor("long balloon");
+	LoadFont("_terminator two 32")..{
+		Name="SongLength";
+		InitCommand=cmd(x,-56;y,-10;shadowlength,0;diffuse,color("#E2E2E2");diffusebottomedge,color("#CECECE");strokecolor,color("#00000000"));
+		SetCommand=function(self)
+			local Song = GAMESTATE:GetCurrentSong();
+			local time = Song:MusicLengthSeconds();
+			time = SecondsToMSSMsMs(time);
+			time = string.sub(time, 0, string.len(time)-3);
+			self:settext( time );
+		end;
+	};
+	LoadFont("_venacti 24")..{
+		Name="NumStages";
+		InitCommand=cmd(x,32;y,-4;shadowlength,0;zoom,0.5;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000"));
+		SetCommand=function(self)
+			local Song = GAMESTATE:GetCurrentSong();
+			local postfix = " STAGES";
+			if Song:IsLong() then self:settext("2"..postfix);
+			elseif Song:IsMarathon() then self:settext("3"..postfix);
+			end;
+		end;
+	};
+	
+	SetCommand=function(self)
+		local Song = GAMESTATE:GetCurrentSong();
+		self:playcommand( (Song and (Song:IsLong() or Song:IsMarathon())) and "Show" or "Hide" );
+	end;
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+};
+
+t[#t+1] = LoadFont("_numbers2") .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X+262;y,SCREEN_CENTER_Y);
+	OnCommand=cmd(shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH);
+	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH);
+
+	SetCommand=function(self)
+		local Course = GAMESTATE:GetCurrentCourse()
+		if not Course then
+			self:hidden(1)
+			return
+		end
+
+		self:hidden(0)
+		self:settext( Course:GetEstimatedNumStages() );
+	end;
+
+	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+};
+--t[#t+1] = LoadActor( "difficulties" ) .. {
+--	InitCommand=cmd(x,SCREEN_CENTER_X-35;y,SCREEN_CENTER_Y-134);
+--	OnCommand=cmd(finishtweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
+--	OffCommand=cmd(finishtweening;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
+--};
+
+
+if not GAMESTATE:IsCourseMode() then
+	t[#t+1] = Def.DifficultyList {
+		Name="DifficultyList";
+		OnCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y+40);
+		CursorP1 = Def.ActorFrame {
+			InitCommand=cmd(x,-150;bounce;effectmagnitude,-5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
+			BeginCommand=cmd(visible,true);
+			StepsSelectedMessageCommand=function( self, param ) 
+				if param.Player ~= "PlayerNumber_P1" then return end;
+				self:visible(false);
+			end;
+			children={
+				LoadActor( "DifficultyList cursor p1" ) .. {
+					BeginCommand=cmd(player,"PlayerNumber_P1";);
+					PlayerJoinedMessageCommand=function(self,param )
+						if param.Player ~= "PlayerNumber_P1" then return end;
+						self:visible( true );
+					end;
+				};
+				LoadFont( "_terminator two 32" ) .. {
+					InitCommand=cmd(x,-4;y,-3;settext,"P1";zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
+					BeginCommand=cmd(player,"PlayerNumber_P1";);
+					PlayerJoinedMessageCommand=function(self,param )
+						if param.Player ~= "PlayerNumber_P1" then return end;
+						self:visible( true );
+					end;
+				};
+			}
+		};
+		CursorP2 = Def.ActorFrame {
+			InitCommand=cmd(x,130;bounce;effectmagnitude,5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
+			BeginCommand=cmd(visible,true);
+			StepsSelectedMessageCommand=function( self, param ) 
+				if param.Player ~= "PlayerNumber_P2" then return end;
+				self:visible(false);
+			end;
+			children={
+				LoadActor( "DifficultyList cursor p2" ) .. {
+					BeginCommand=cmd(player,"PlayerNumber_P2";);
+					PlayerJoinedMessageCommand=function(self,param )
+						if param.Player ~= "PlayerNumber_P2" then return end;
+						self:visible( true );
+					end;
+				};
+				LoadFont( "_terminator two 32" ) .. {
+					InitCommand=cmd(x,4;y,-3;settext,"P2";zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000"););
+					BeginCommand=cmd(player,"PlayerNumber_P2";);
+					PlayerJoinedMessageCommand=function(self,param )
+						if param.Player ~= "PlayerNumber_P2" then return end;
+						self:visible( true );
+					end;
+				};
+			}
+		};
+		CursorP1Frame = LoadActor( "DifficultyList frame p1" ) .. {
+			InitCommand=cmd(bounce;effectmagnitude,-10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
+		};
+		CursorP2Frame = LoadActor( "DifficultyList frame p2" ) .. {
+			InitCommand=cmd(bounce;effectmagnitude,10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
+		};
+	};
+end
+-- fade out
+t[#t+1] = Def.Quad {
+		InitCommand=cmd(FullScreen;diffuse,color("#000000");diffusealpha,0);
+		OffCommand=cmd(linear,0.3;diffusealpha,1);
+};
+return t;

stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/difficulties.lua

@@ -1,22 +1,22 @@
-local t = Def.ActorFrame {
-};
-for idx, diff in pairs(Difficulty) do -- 0, Difficulty_Beginner
-	t[#t+1] = LoadActor( "_Difficulty icons 6x1" ) .. {
-		InitCommand=cmd(pause;setstate,Difficulty:Reverse()[diff]);
-		ShowCommand=cmd(stoptweening;linear,0.1;diffusealpha,1);
-		HideCommand=cmd(stoptweening;linear,0.1;diffusealpha,0);
-		BeginCommand=cmd(y,16*idx);
-
-		SetCommand=function(self)
-			local song = GAMESTATE:GetCurrentSong()
-			local st = GAMESTATE:GetCurrentStyle():GetStepsType()
-			local bHasStepsTypeAndDifficulty =
-				song and song:HasStepsTypeAndDifficulty( st, diff );
-
-			self:playcommand( bHasStepsTypeAndDifficulty and "Show" or "Hide" );
-		end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-	};
-end
-
-return t;
+local t = Def.ActorFrame {
+};
+for idx, diff in pairs(Difficulty) do -- 0, Difficulty_Beginner
+	t[#t+1] = LoadActor( "_Difficulty icons 6x1" ) .. {
+		InitCommand=cmd(pause;setstate,Difficulty:Reverse()[diff]);
+		ShowCommand=cmd(stoptweening;linear,0.1;diffusealpha,1);
+		HideCommand=cmd(stoptweening;linear,0.1;diffusealpha,0);
+		BeginCommand=cmd(y,16*idx);
+
+		SetCommand=function(self)
+			local song = GAMESTATE:GetCurrentSong()
+			local st = GAMESTATE:GetCurrentStyle():GetStepsType()
+			local bHasStepsTypeAndDifficulty =
+				song and song:HasStepsTypeAndDifficulty( st, diff );
+
+			self:playcommand( bHasStepsTypeAndDifficulty and "Show" or "Hide" );
+		end;
+		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+	};
+end
+
+return t;

stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua

@@ -1,507 +0,0 @@
-local function Autogen(pn)
-	local function set(self, player)
-		if player and player ~= pn then return end
-		local Selection = GAMESTATE:GetCurrentSteps(pn) or GAMESTATE:GetCurrentCourse()
-		local bIsAutogen = Selection and Selection:IsAutogen();
-		self:hidden( bIsAutogen and 0 or 1 );
-	end
-
-	local t = LoadActor( "_autogen" ) .. {
-		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
-		OffCommand=cmd(linear,0.5;zoomy,0);
-		CurrentStepsP1ChangedMessageCommand=function(self) set(self, PLAYER_1); end;
-		CurrentStepsP2ChangedMessageCommand=function(self) set(self, PLAYER_2); end;
-		CurrentCourseChangedMessageCommand=function(self) set(self); end;
-	};
-	return t;
-end
-
-local function DifficultyDisplay(pn)
-	local function set(self, player)
-		self:SetFromGameState( player );
-	end
-
-	local t = Def.DifficultyDisplay {
-		InitCommand=cmd(Load,"DifficultyDisplay",GAMESTATE:GetPlayerState(pn););
-	};
-
-	if pn == PLAYER_1 then
-		t.CurrentStepsP1ChangedMessageCommand=function(self) set(self, pn); end;
-		t.CurrentTrailP1ChangedMessageCommand=function(self) set(self, pn); end;
-	else
-		t.CurrentStepsP2ChangedMessageCommand=function(self) set(self, pn); end;
-		t.CurrentTrailP2ChangedMessageCommand=function(self) set(self, pn); end;
-	end
-
-	return t;
-end
-
-local function Radar()
-	local function set(self,player)
-		local Selection = GAMESTATE:GetCurrentSteps(player) or GAMESTATE:GetCurrentTrail(player)
-		if not Selection then
-			self:SetEmpty( player );
-			return
-		end
-		self:SetFromRadarValues( player, Selection:GetRadarValues(player) );
-
-	end
-
-	local t = Def.GrooveRadar {
-		OnCommand=cmd(tweenonscreen);
-		OffCommand=cmd(tweenoffscreen);
-
-		CurrentStepsP1ChangedMessageCommand=function(self) set(self, PLAYER_1); end;
-		CurrentStepsP2ChangedMessageCommand=function(self) set(self, PLAYER_2); end;
-		CurrentTrailP1ChangedMessageCommand=function(self) set(self, PLAYER_1); end;
-		CurrentTrailP2ChangedMessageCommand=function(self) set(self, PLAYER_2); end;
-	};
-
-	return t;
-end
-
-
-local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback');
-local element = "overlay";
-local fallback_path = THEME:GetPathB(fallback_screen,element);
-Trace('fallback_path ' .. fallback_path );
-
-local t = Def.ActorFrame {
-	LoadActor( fallback_path );
-	
-	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);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-		LoadActor( "_banner mask" ) .. {
-			InitCommand=cmd(y,-74;zwrite,1;z,1;blend,"BlendMode_NoEffect");
-		};
-		Def.ActorProxy {
-			BeginCommand=function(self) local banner = SCREENMAN:GetTopScreen():GetChild('Banner'); self:SetTarget(banner); end;
-			InitCommand=cmd(y,-74;);
-		};
-		LoadActor( "_banner frame" ) .. {
-		};
-	};
-
-	LoadFont("Common", "normal") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+94;playcommand,"Set");
-		OnCommand=cmd(zoom,0.5;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1);
-		OffCommand=cmd(linear,0.5;diffusealpha,0);
-
-		SetCommand=function(self)
-			local sText = GAMESTATE:GetSongOptionsString()
-			sText = string.gsub(sText, ", ", "\n")
-			self:settext( sText )
-			if GAMESTATE:IsAnExtraStage() then
-				self:diffuseblink()
-			end
-		end;
-		SongOptionsChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y);
-		LoadActor( "wheel cursor glow" ) .. {
-			InitCommand=cmd(blend,"BlendMode_Add";);
-		};
-		LoadActor( "wheel cursor normal" ) .. {
-		
-		};
-	};
-		
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+136);
-		Def.ActorFrame {
-			InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRow","SpacingX");y,-1*THEME:GetMetric("OptionIconRow","SpacingY"););
-			LoadActor( "option icon header" ) .. {
-			
-			};
-			LoadFont("_terminator two 32" ) .. {
-				InitCommand=cmd(y,-4;settext,"P1";zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
-			};
-		};
-		Def.OptionIconRow {
-			Condition=GAMESTATE:IsHumanPlayer(PLAYER_1);
-			InitCommand=cmd(set,PLAYER_1);
-			OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
-			OffCommand=cmd(linear,0.5;zoomy,0);
-			PlayerOptionsChangedP1MessageCommand=cmd(set,PLAYER_1);
-		};
-	};
-
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+154);
-		Def.ActorFrame {
-			InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRow","SpacingX");y,-1*THEME:GetMetric("OptionIconRow","SpacingY"););
-			LoadActor( "option icon header" ) .. {
-			
-			};
-			LoadFont("_terminator two 32") .. {
-				InitCommand=cmd(y,-4;settext,"P2";zoom,0.5;zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000"););
-			};
-		};
-		Def.OptionIconRow {
-			Condition=GAMESTATE:IsHumanPlayer(PLAYER_2);
-			InitCommand=cmd(set,PLAYER_2);
-			OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
-			OffCommand=cmd(linear,0.5;zoomy,0);
-			PlayerOptionsChangedP2MessageCommand=cmd(set,PLAYER_2);
-		};
-	};
-
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X-120;y,SCREEN_CENTER_Y-170);
-		OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-		LoadActor( THEME:GetPathG("MusicSortDisplay","frame") ) .. {
-		
-		};
-		LoadFont( "_sf square head bold stroke 28" ) .. {
-			InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#696800"););
-			SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) ));
-			SortOrderChangedMessageCommand=cmd(playcommand,"Set");
-		};
-		LoadFont( "_sf square head bold 28" ) .. {
-			InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57"););
-			SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) ));
-			SortOrderChangedMessageCommand=cmd(playcommand,"Set");
-		};
-	};
-	
-	LoadActor( THEME:GetPathG(Var 'LoadingScreen','options message 1x2') ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;pause);
-		OnCommand=cmd(hidden,1);
-		ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0;
-			faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3);
-		ShowEnteringOptionsCommand=cmd(finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions");
-		HidePressStartForOptionsCommand=cmd(linear,0.4;cropleft,1.3);
-	};
-	
-	Def.PaneDisplay {
-		MetricsGroup="PaneDisplay";
-		PlayerNumber=PLAYER_1;
-		InitCommand=cmd(player,PLAYER_1;playcommand,"Set";x,SCREEN_CENTER_X-180;y,SCREEN_CENTER_Y+194);
-		
-		SetCommand=function(self) self:SetFromGameState() end;
-		CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
-		SortOrderChangedMessageCommand=cmd(playcommand,"Set");
-	};
-
-	Def.PaneDisplay {
-		MetricsGroup="PaneDisplay";
-		PlayerNumber=PLAYER_2;
-		InitCommand=cmd(player,PLAYER_2;playcommand,"Set";x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y+194);
-		
-		SetCommand=function(self) self:SetFromGameState() end;
-		CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
-		SortOrderChangedMessageCommand=cmd(playcommand,"Set");
-	};
-
-	Def.BPMDisplay {
-		File=THEME:GetPathF("BPMDisplay", "bpm");
-		Name="BPMDisplay";
-		InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;);
-		OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-		SetCommand=function(self) self:SetFromGameState() end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	LoadActor( "_bpm label" ) .. {
-		InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X+280;y,SCREEN_CENTER_Y);
-		OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-	};
-	LoadActor( "bpm meter" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-12);
-		OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-	};
-	LoadActor( "stop icon" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y+6);
-		OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-		SetCommand=function(self) 
-				local b = false;
-				local song = GAMESTATE:GetCurrentSong();
-				if song then
-					b = song:GetTimingData():HasStops(); 
-				end;
-				self:visible( b );
-			end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	
-	LoadFont("_regra 32 bold") .. {
-		InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;zoom,0.5;settext,"/Senser";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360);
-		SetCommand=function(self) 
-				local s = "---";
-				local song = GAMESTATE:GetCurrentSong(); 
-				if song then
-					local s2 = song:GetDisplayArtist(); 
-					if s2 ~= "" then 
-						s = "/" .. s2; 
-					end;
-				end; 
-				self:settext( s );
-			end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	LoadFont("_regra 32 bold") .. {
-		InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;zoom,0.5;settext,"_Hardcore Techno";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
-		SetCommand=function(self) 
-				local s = "---";
-				local song = GAMESTATE:GetCurrentSong(); 
-				if song then
-					local s2 = song:GetGenre(); 
-					if s2 ~= "" then 
-						 s = "_" .. s2; 
-					end;
-				end; 
-				self:settext( s );
-			end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X+26;y,SCREEN_CENTER_Y+5;);
-		LoadActor("star full") .. { InitCommand=cmd(x,16*-2); };
-		LoadActor("star full") .. { InitCommand=cmd(x,16*-1); };
-		LoadActor("star full") .. { InitCommand=cmd(x,16*0); };
-		LoadActor("star empty") .. { InitCommand=cmd(x,16*1); };
-		LoadActor("star empty") .. { InitCommand=cmd(x,16*2); };
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	
-	Def.CourseContentsList {
-		MaxSongs = 5;
-
-		InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+96);
-		OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1);
-		OffCommand=cmd(zoomy,1;bouncebegin,0.3;zoomy,0);
-		ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
-		HideCommand=cmd(linear,0.3;zoomy,0);
-		SetCommand=function(self)
-			self:SetFromGameState();
-			self:setsecondsperitem(0.7);
-			self:SetSecondsPauseBetweenItems(0.7);
-			self:scrollwithpadding(0, 0);
-		end;
-		CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
-		CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
-
-		Display = Def.ActorFrame { 
-			InitCommand=cmd(setsize,270,44);
-
-			LoadActor("_CourseEntryDisplay bar");
-
-			Def.TextBanner {
-				ArtistPrependString="/";
-				SetCommand=TextBannerSet;
-				InitCommand=cmd(LoadFromString,"", "", "", "", "", "");
-				Title = LoadFont("TextBanner","text") .. {
-					Name="Title";
-					OnCommand=cmd(shadowlength,0);
-				};
-				Subtitle = LoadFont("TextBanner","text") .. {
-					Name="Subtitle";
-					OnCommand=cmd(shadowlength,0);
-				};
-				Artist = LoadFont("TextBanner","text") .. {
-					Name="Artist";
-					OnCommand=cmd(shadowlength,0);
-				};
-				SetSongCommand=function(self, params)
-					if params.Song then
-						self:LoadFromSong( params.Song );
-						self:diffuse( SONGMAN:GetSongColor(params.Song) );
-					else
-						self:LoadFromString( "??????????", "??????????", "", "", "", "" );
-						self:diffuse( color("#FFFFFF") );
-					end
-				end;
-			};
-
-			LoadFont("CourseEntryDisplay","number") .. {
-				OnCommand=cmd(x,-118;shadowlength,0);
-				SetSongCommand=function(self, params) self:settext(string.format("%i", params.Number)); end;
-			};
-
-			LoadFont("Common","normal") .. {
-				OnCommand=cmd(x,SCREEN_CENTER_X-200;y,-8;zoom,0.7;shadowlength,0);
-				DifficultyChangedCommand=function(self, params)
-					if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end
-					self:settext( params.Meter );
-					self:diffuse( CourseDifficutlyToColor(params.Difficulty) );
-				end;
-			};
-
-			LoadFont("Common","normal") .. {
-				OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;zoom,0.5;shadowlength,0);
-				SetSongCommand=function(self, params) self:settext(params.Modifiers); end;
-			};
-
-			LoadFont("CourseEntryDisplay","difficulty") .. {
-				OnCommand=cmd(x,SCREEN_CENTER_X-222;y,-8;shadowlength,0;settext,"1");
-				DifficultyChangedCommand=function(self, params)
-					if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end
-					self:diffuse( CourseDifficutlyToColor(params.Difficulty) );
-				end;
-			};
-		};
-	};
-
-	Autogen(PLAYER_1) .. {
-		BeginCommand=cmd(x,SCREEN_CENTER_X-290;y,SCREEN_CENTER_Y-15);
-	};
-	Autogen(PLAYER_2) .. {
-		BeginCommand=cmd(x,SCREEN_CENTER_X-68;y,SCREEN_CENTER_Y-15);
-	};
-	
-	DifficultyDisplay(PLAYER_1) .. {
-		BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20);
-		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
-		OffCommand=cmd(linear,0.5;zoomy,0);
-	};
-	DifficultyDisplay(PLAYER_2) .. {
-		BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20);
-		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
-		OffCommand=cmd(linear,0.5;zoomy,0);
-	};
-
-	Def.ActorFrame{
-		InitCommand=cmd(x,SCREEN_CENTER_X-190;y,SCREEN_CENTER_Y-32);
-		ShowCommand=cmd(linear,0.2;diffusealpha,1);
-		HideCommand=cmd(linear,0.2;diffusealpha,0);
-		
-		LoadActor("long balloon");
-		LoadFont("_terminator two 32")..{
-			Name="SongLength";
-			InitCommand=cmd(x,-56;y,-10;shadowlength,0;diffuse,color("#E2E2E2");diffusebottomedge,color("#CECECE");strokecolor,color("#00000000"));
-			SetCommand=function(self)
-				local Song = GAMESTATE:GetCurrentSong();
-				local time = Song:MusicLengthSeconds();
-				time = SecondsToMSSMsMs(time);
-				time = string.sub(time, 0, string.len(time)-3);
-				self:settext( time );
-			end;
-		};
-		LoadFont("_venacti 24")..{
-			Name="NumStages";
-			InitCommand=cmd(x,32;y,-4;shadowlength,0;zoom,0.5;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000"));
-			SetCommand=function(self)
-				local Song = GAMESTATE:GetCurrentSong();
-				local postfix = " STAGES";
-				if Song:IsLong() then self:settext("2"..postfix);
-				elseif Song:IsMarathon() then self:settext("3"..postfix);
-				end;
-			end;
-		};
-		
-		SetCommand=function(self)
-			local Song = GAMESTATE:GetCurrentSong();
-			self:playcommand( (Song and (Song:IsLong() or Song:IsMarathon())) and "Show" or "Hide" );
-		end;
-		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-	};
-
-	LoadFont("_numbers2") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+262;y,SCREEN_CENTER_Y);
-		OnCommand=cmd(shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH);
-		OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH);
-
-		SetCommand=function(self)
-			local Course = GAMESTATE:GetCurrentCourse()
-			if not Course then
-				self:hidden(1)
-				return
-			end
-
-			self:hidden(0)
-			self:settext( Course:GetEstimatedNumStages() );
-		end;
-
-		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-	};
-	--LoadActor( "difficulties" ) .. {
-	--	InitCommand=cmd(x,SCREEN_CENTER_X-35;y,SCREEN_CENTER_Y-134);
-	--	OnCommand=cmd(finishtweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
-	--	OffCommand=cmd(finishtweening;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
-	--};
-};
-
-if not GAMESTATE:IsCourseMode() then
-	t[#t+1] = Def.DifficultyList {
-		Name="DifficultyList";
-		OnCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y+40);
-		CursorP1 = Def.ActorFrame {
-			InitCommand=cmd(x,-150;bounce;effectmagnitude,-5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
-			BeginCommand=cmd(visible,true);
-			StepsSelectedMessageCommand=function( self, param ) 
-				if param.Player ~= "PlayerNumber_P1" then return end;
-				self:visible(false);
-			end;
-			children={
-				LoadActor( "DifficultyList cursor p1" ) .. {
-					BeginCommand=cmd(player,"PlayerNumber_P1";);
-					PlayerJoinedMessageCommand=function(self,param )
-						if param.Player ~= "PlayerNumber_P1" then return end;
-						self:visible( true );
-					end;
-				};
-				LoadFont( "_terminator two 32" ) .. {
-					InitCommand=cmd(x,-4;y,-3;settext,"P1";zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
-					BeginCommand=cmd(player,"PlayerNumber_P1";);
-					PlayerJoinedMessageCommand=function(self,param )
-						if param.Player ~= "PlayerNumber_P1" then return end;
-						self:visible( true );
-					end;
-				};
-			}
-		};
-		CursorP2 = Def.ActorFrame {
-			InitCommand=cmd(x,130;bounce;effectmagnitude,5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
-			BeginCommand=cmd(visible,true);
-			StepsSelectedMessageCommand=function( self, param ) 
-				if param.Player ~= "PlayerNumber_P2" then return end;
-				self:visible(false);
-			end;
-			children={
-				LoadActor( "DifficultyList cursor p2" ) .. {
-					BeginCommand=cmd(player,"PlayerNumber_P2";);
-					PlayerJoinedMessageCommand=function(self,param )
-						if param.Player ~= "PlayerNumber_P2" then return end;
-						self:visible( true );
-					end;
-				};
-				LoadFont( "_terminator two 32" ) .. {
-					InitCommand=cmd(x,4;y,-3;settext,"P2";zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000"););
-					BeginCommand=cmd(player,"PlayerNumber_P2";);
-					PlayerJoinedMessageCommand=function(self,param )
-						if param.Player ~= "PlayerNumber_P2" then return end;
-						self:visible( true );
-					end;
-				};
-			}
-		};
-		CursorP1Frame = LoadActor( "DifficultyList frame p1" ) .. {
-			InitCommand=cmd(bounce;effectmagnitude,-10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
-		};
-		CursorP2Frame = LoadActor( "DifficultyList frame p2" ) .. {
-			InitCommand=cmd(bounce;effectmagnitude,10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
-		};
-	};
-end
--- fade out
-t[#t+1] = Def.Quad {
-		InitCommand=cmd(FullScreen;diffuse,color("#000000");diffusealpha,0);
-		OffCommand=cmd(linear,0.3;diffusealpha,1);
-};
-return t;

stepmania/Themes/default/BGAnimations/ScreenSelectMusic underlay/default.lua

@@ -1,17 +0,0 @@
---local OnCommand = cmd(diffusealpha,0;linear,0.5;diffusealpha,1)
---local OffCommand = cmd(linear,0.5;diffusealpha,0)
---local t = Def.ActorFrame {
---	LoadActor( '_difficulty frame p1' ) .. {
---		InitCommand = cmd(player,PLAYER_1;x,SCREEN_CENTER_X-275;y,SCREEN_CENTER_Y-15);
---		OnCommand = OnCommand;
---		OffCommand = OffCommand;
---	};
---	LoadActor( '_difficulty frame p2' ) .. {
---		InitCommand = cmd(player,PLAYER_2;x,SCREEN_CENTER_X-82;y,SCREEN_CENTER_Y-15);
---		OnCommand = OnCommand;
---		OffCommand = OffCommand;
---	};
---}
---return t
-
-return Def.Actor {};

stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua

@@ -1,15 +1,12 @@
 local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. {
-	LoadActor( "bumper" ) .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X-320;y,SCREEN_CENTER_Y);
-	};
-	LoadActor( "bumper" ) .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X+320;y,SCREEN_CENTER_Y;zoomx,-1);
-	};
+	LoadActor( THEME:GetPathB('','_standard decoration'), "LeftFrame", "LeftFrame" );
+	LoadActor( THEME:GetPathB('','_standard decoration'), "RightFrame", "RightFrame" );
+	
 	LoadActor( "top" ) .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP;vertalign,top);
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP;vertalign,top);
 	};
 	Def.ActorFrame {
-		OnCommand=cmd(x,SCREEN_CENTER_X-284;y,SCREEN_TOP+30);
+		InitCommand=cmd(x,SCREEN_CENTER_X-284;y,SCREEN_TOP+30);
 		LoadActor( "bar" ) .. {
 			InitCommand=cmd(horizalign,left;y,4);
 		};
@@ -25,9 +22,6 @@ local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) ..
 			InitCommand=cmd(x,-1.5);
 		};
 	};
-	LoadFont( "_venacti 80 bold" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+276;y,SCREEN_TOP+24;shadowlength,0;zoom,0.5;settext,"45");
-	};
 };
 
 local style = GAMESTATE:GetCurrentStyle();

stepmania/Themes/default/Fonts/MenuTimer numbers.redir

@@ -1 +1 @@
-Combo numbers
+_venacti 80 bold timer

stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir

@@ -0,0 +1 @@
+_sf square head 32

stepmania/Themes/default/Fonts/_euromode stroke 44.ini

@@ -1,408 +0,0 @@
-[main]
-Baseline=44
-Top=10
-LineSpacing=54
-DrawExtraPixelsLeft=3
-DrawExtraPixelsRight=0
-AdvanceExtraPixels=0
-0=24
-1=24
-2=24
-3=24
-4=24
-5=24
-6=24
-7=24
-8=24
-9=24
-10=24
-11=24
-12=24
-13=24
-14=24
-15=24
-16=24
-17=24
-18=24
-19=24
-20=24
-21=24
-22=24
-23=24
-24=24
-25=24
-26=24
-27=24
-28=24
-29=24
-30=24
-31=24
-32=15
-33=14
-34=21
-35=31
-36=31
-37=40
-38=34
-39=10
-40=15
-41=15
-42=31
-43=26
-44=15
-45=12
-46=15
-47=30
-48=31
-49=31
-50=31
-51=31
-52=31
-53=31
-54=31
-55=31
-56=31
-57=31
-58=15
-59=15
-60=26
-61=26
-62=26
-63=26
-64=43
-65=31
-66=32
-67=31
-68=33
-69=27
-70=26
-71=32
-72=34
-73=12
-74=26
-75=31
-76=25
-77=44
-78=36
-79=31
-80=30
-81=34
-82=32
-83=30
-84=26
-85=33
-86=30
-87=49
-88=30
-89=29
-90=29
-91=15
-92=12
-93=15
-94=26
-95=22
-96=16
-97=26
-98=26
-99=24
-100=26
-101=25
-102=15
-103=26
-104=26
-105=10
-106=10
-107=24
-108=11
-109=41
-110=26
-111=26
-112=26
-113=26
-114=21
-115=25
-116=19
-117=26
-118=22
-119=35
-120=22
-121=21
-122=21
-123=17
-124=12
-125=17
-126=26
-127=24
-128=73
-129=24
-130=33
-131=31
-132=19
-133=44
-134=31
-135=31
-136=22
-137=57
-138=26
-139=14
-140=49
-141=24
-142=117
-143=24
-144=24
-145=10
-146=10
-147=19
-148=19
-149=23
-150=22
-151=44
-152=24
-153=44
-154=22
-155=14
-156=41
-157=78
-158=24
-159=26
-160=12
-161=14
-162=31
-163=31
-164=31
-165=31
-166=9
-167=31
-168=20
-169=35
-170=19
-171=23
-172=26
-173=33
-174=35
-175=33
-176=33
-177=26
-178=19
-179=19
-180=16
-181=26
-182=31
-183=33
-184=14
-185=19
-186=19
-187=23
-188=47
-189=47
-190=47
-191=26
-192=31
-193=31
-194=31
-195=31
-196=31
-197=31
-198=47
-199=31
-200=27
-201=27
-202=27
-203=27
-204=12
-205=12
-206=12
-207=12
-208=33
-209=36
-210=31
-211=31
-212=31
-213=31
-214=31
-215=33
-216=33
-217=33
-218=33
-219=33
-220=33
-221=29
-222=30
-223=27
-224=26
-225=26
-226=26
-227=26
-228=26
-229=26
-230=40
-231=24
-232=25
-233=25
-234=25
-235=25
-236=10
-237=10
-238=10
-239=10
-240=26
-241=26
-242=26
-243=26
-244=26
-245=26
-246=26
-247=33
-248=26
-249=26
-250=26
-251=26
-252=26
-253=21
-254=26
-255=21
-[alt]
-0=24
-1=24
-2=24
-3=24
-4=24
-5=24
-6=24
-7=24
-8=24
-9=24
-10=24
-11=24
-12=24
-13=24
-14=24
-15=24
-16=24
-17=24
-18=24
-19=24
-20=24
-21=24
-22=24
-23=24
-24=24
-25=24
-26=24
-27=24
-28=24
-29=24
-30=24
-31=24
-32=12
-33=102
-34=21
-35=154
-36=31
-37=102
-38=102
-39=31
-40=20
-41=26
-42=102
-43=102
-44=102
-45=33
-46=117
-47=102
-48=33
-49=102
-50=33
-51=56
-52=16
-53=102
-54=102
-55=33
-56=14
-57=22
-58=102
-59=102
-60=102
-61=23
-62=78
-63=102
-64=102
-65=31
-66=31
-67=102
-68=31
-69=102
-70=102
-71=31
-72=102
-73=27
-74=102
-75=27
-76=102
-77=12
-78=12
-79=102
-80=102
-81=102
-82=102
-83=31
-84=31
-85=102
-86=31
-87=33
-88=102
-89=102
-90=33
-91=102
-92=33
-93=29
-94=102
-95=27
-96=102
-97=26
-98=26
-99=102
-100=26
-101=102
-102=102
-103=24
-104=102
-105=25
-106=102
-107=25
-108=102
-109=10
-110=10
-111=102
-112=102
-113=102
-114=102
-115=26
-116=26
-117=102
-118=26
-119=33
-120=102
-121=102
-122=26
-123=102
-124=26
-125=21
-126=102
-127=33
-[numbers]
-0=31
-1=31
-2=31
-3=31
-4=31
-5=31
-6=31
-7=31
-8=31
-9=31
-10=40
-11=15
-12=15
-13=15
-14=22

stepmania/Themes/default/Fonts/_venacti 80 bold timer.ini

@@ -1,11 +1,12 @@
-[common]
+[main]
 Baseline=64
 Top=16
 LineSpacing=96
 DrawExtraPixelsLeft=8
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
-[main]
+FontBaseZoom=0.5
+
 0=0
 1=0
 2=0

stepmania/Themes/default/Graphics/OptionIconRowGameplay icon empty.redir

@@ -0,0 +1 @@
+_blank

stepmania/Themes/default/Graphics/ScreenEvaluation StageDisplay.lua

@@ -1,7 +0,0 @@
-local t = LoadActor("ScreenWithMenuElements stage/stage" ) .. {
-	BeginCommand=cmd(playcommand,"Set", {
-		StageToShow = SCREENMAN:GetTopScreen():GetStageStats():GetStage();
-		StageNumber = SCREENMAN:GetTopScreen():GetStageStats():GetStageIndex();
-	} );
-};
-return t;

stepmania/Themes/default/Graphics/ScreenGameplay LeftFrame.redir

@@ -0,0 +1 @@
+_bumper

stepmania/Themes/default/Graphics/ScreenGameplay RightFrame.lua

@@ -0,0 +1,3 @@
+return LoadActor("ScreenGameplay LeftFrame") .. {
+	InitCommand=cmd(zoomx,-1;);
+};

stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua

@@ -29,11 +29,8 @@ local t = Def.ActorFrame {
 		LoadFont( "_terminator two 92" ) .. {
 			InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.7;zoomtowidth,300;rotationz,-90;diffuse,c;shadowlengthx,4;shadowlengthy,0;);
 		};
-		LoadFont( "_euromode stroke 44" ) .. {
-			InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlength,0;zoom,0.5;maxwidth,500;diffuse,color("#000000");diffusealpha,0.35);
-		};
 		LoadFont( "_euromode 44" ) .. {
-			InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;zoom,0.5;maxwidth,500;diffuse,c;);
+			InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;zoom,0.5;maxwidth,500;diffuse,c;strokecolor,color("#000000"););
 		};
 	};
 	Def.ActorFrame {

stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua

@@ -0,0 +1,39 @@
+local stages = Def.ActorFrame {
+	BeginCommand=cmd(playcommand,"Set";);
+	CurrentSongChangedMessageCommand=cmd(playcommand,"Set";);
+};
+
+local ScreenName = Var "LoadingScreen";
+
+function MakeBitmapTest()
+	return LoadFont(ScreenName,"StageDisplay") .. {
+		InitCommand=cmd(shadowlength,0;uppercase,true;);
+	};
+end
+
+for _, s in ipairs(Stage) do
+	if s == "Stage_Next" then
+		stages[#stages+1] = MakeBitmapTest() .. {
+			SetCommand=function(self, params)
+				local StageToShow = THEME:GetMetric( ScreenName, "StageDisplayStageToShow" );
+				local StageIndex = THEME:GetMetric( ScreenName, "StageDisplayStageIndex" );
+				self:visible( StageToShow == s );
+				self:settext( string.upper(FormatNumberAndSuffix(StageIndex+1)) );
+				self:diffuse( StageToColor(s) );
+				self:strokecolor( StageToStrokeColor(s) );
+			end;
+		};
+	else
+		stages[#stages+1] = MakeBitmapTest() .. {
+			SetCommand=function(self, params)
+				local StageToShow = THEME:GetMetric( ScreenName, "StageDisplayStageToShow" );
+				self:visible( StageToShow == s );
+				self:settext( StageToLocalizedString(StageToShow) );
+				self:diffuse( StageToColor(s) );
+				self:strokecolor( StageToStrokeColor(s) );
+			end;
+		}
+	end
+end
+
+return stages;

stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay/default.lua

@@ -1,11 +0,0 @@
-local t = LoadActor("stage" ) .. {
-	BeginCommand=cmd(playcommand,"Update");
-	CurrentSongChangedMessageCommand=cmd(playcommand,"Update");
-	UpdateCommand=cmd(playcommand,"Set", {
-		StageToShow = GAMESTATE:GetCurrentStage();
-		StageIndex = GAMESTATE:GetStageIndex();
-	} );
-};
-
-return t;
-

stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay/stage.lua

@@ -1,31 +0,0 @@
-local stages = Def.ActorFrame {};
-
-function MakeBitmapTest()
-	return LoadFont(Var "LoadingScreen","StageDisplay") .. {
-		InitCommand=cmd(shadowlength,0;uppercase,true;);
-	};
-end
-
-for _, s in ipairs(Stage) do
-	if s == "Stage_Next" then
-		stages[#stages+1] = MakeBitmapTest() .. {
-			SetCommand=function(self, params)
-				self:visible( params.StageToShow == s );
-				self:settext( string.upper(FormatNumberAndSuffix(params.StageIndex+1)) );
-				self:diffuse( StageToColor(s) );
-				self:strokecolor( StageToStrokeColor(s) );
-			end;
-		};
-	else
-		stages[#stages+1] = MakeBitmapTest() .. {
-			SetCommand=function(self, params)
-				self:visible( params.StageToShow == s );
-				self:settext( StageToLocalizedString(params.StageToShow) );
-				self:diffuse( StageToColor(s) );
-				self:strokecolor( StageToStrokeColor(s) );
-			end;
-		}
-	end
-end
-
-return stages;

stepmania/Themes/default/Graphics/ScreenWithMenuElements2 LeftFrame.redir

@@ -0,0 +1 @@
+_bumper

stepmania/Themes/default/Graphics/ScreenWithMenuElements2 RightFrame.lua

@@ -0,0 +1,3 @@
+return LoadActor("ScreenWithMenuElements2 LeftFrame") .. {
+	InitCommand=cmd(zoomx,-1;);
+};

stepmania/Themes/default/Graphics/_shared options header.lua

@@ -1,7 +0,0 @@
-return Def.ActorFrame{
-	-- timer background
-	LoadActor(THEME:GetPathB("","_frame 3x1"), "headers", 48)..{
-		--InitCommand=cmd( x,SCREEN_CENTER_X+(SCREEN_WIDTH/5.35) );
-		InitCommand=cmd( x,SCREEN_RIGHT-(SCREEN_WIDTH/3.1825) );
-	};
-};

stepmania/Themes/default/Scripts/Colors.lua

@@ -76,7 +76,7 @@ function StageToColor( stage )
 end
 
 function StageToStrokeColor( stage )
-	local c = StageToColor(ddt);
+	local c = StageToColor(stage);
 	return { c[1]/2, c[2]/2, c[3]/2, c[4] };
 end
 

stepmania/Themes/default/Scripts/StageMods.lua

@@ -48,7 +48,7 @@ function ScreenSelectMusic:setupmusicstagemods()
 			GAMESTATE:SetCurrentSteps( pn, steps )
 			GAMESTATE:GetPlayerState(pn):SetPlayerOptions( "ModsLevel_Stage", po )
 			GAMESTATE:SetPreferredDifficulty( pn, difficulty )
-			MESSAGEMAN:Broadcast( "PlayerOptionsChangedP" .. (Reverse[pn]+1) )
+			MESSAGEMAN:Broadcast( "PlayerOptionsChanged", {PlayerNumber = pn} )
 		end
 
 		GAMESTATE:SetSongOptions( "ModsLevel_Stage", so )
@@ -68,7 +68,7 @@ function ScreenSelectMusic:setupcoursestagemods()
 
 		for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
 			GAMESTATE:GetPlayerState(pn):SetPlayerOptions( "ModsLevel_Stage", po )
-			MESSAGEMAN:Broadcast( "PlayerOptionsChangedP" .. (Reverse[pn]+1) )
+			MESSAGEMAN:Broadcast( "PlayerOptionsChanged", {PlayerNumber = pn} )
 		end
 
 		GAMESTATE:SetSongOptions( "ModsLevel_Stage", so )

stepmania/Themes/default/metrics.ini

@@ -139,12 +139,11 @@ Choice1="screen,ScreenSelectStyle2"
 
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
-Fallback="ScreenWithMenuElements"
+Fallback="ScreenWithMenuElementsBlank"
 NextScreen=ScreenCautionBranch()
 PrevScreen=ScreenTitleBranch()
 TimerSeconds=-1
 LoadEdits=true
-FooterOnCommand=visible,false
 
 [ScreenProfileSave]
 Class="ScreenProfileSave"
@@ -174,6 +173,14 @@ 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"
@@ -982,6 +989,14 @@ SecondaryScoreP2X=SCREEN_CENTER_X+20
 SecondaryScoreP2Y=SCREEN_CENTER_Y+0
 SecondaryScoreP2OnCommand=
 SecondaryScoreP2OffCommand=
+LeftFrameX=SCREEN_CENTER_X-320
+LeftFrameY=SCREEN_CENTER_Y
+LeftFrameOnCommand=
+LeftFrameOffCommand=
+RightFrameX=SCREEN_CENTER_X+320
+RightFrameY=SCREEN_CENTER_Y
+RightFrameOnCommand=
+RightFrameOffCommand=
 PlayerOptionsP1X=SCREEN_CENTER_X+0
 PlayerOptionsP1Y=SCREEN_CENTER_Y+194
 PlayerOptionsP1OnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100
@@ -1156,6 +1171,8 @@ PlayerType="PlayerShared"
 [ScreenEvaluation]
 Fallback="ScreenWithMenuElements"
 Class="ScreenEvaluation"
+StageDisplayStageIndex=SCREENMAN:GetTopScreen():GetStageStats():GetStageIndex()
+StageDisplayStageToShow=SCREENMAN:GetTopScreen():GetStageStats():GetStage()
 Summary=false
 TimerSeconds=15
 PlayerOptionsSeparator=","
@@ -2037,6 +2054,8 @@ Fallback="Screen"
 AllowDisabledPlayerInput=false
 StyleIcon=true
 ShowStageDisplay=false
+StageDisplayStageToShow=GAMESTATE:GetCurrentStage()
+StageDisplayStageIndex=GAMESTATE:GetStageIndex()
 MemoryCardIcons=true
 CancelTransitionsOut=false
 HeaderX=SCREEN_LEFT+(SCREEN_WIDTH/4.25)
@@ -2062,8 +2081,7 @@ MemoryCardDisplayP2OnCommand=draworder,97;
 MemoryCardDisplayP2OffCommand=
 //MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,25;
 TimerMetricsGroup="MenuTimer"
-//TimerX=SCREEN_CENTER_X+270
-TimerX=SCREEN_RIGHT-60
+TimerX=SCREEN_CENTER_X+270
 TimerY=SCREEN_TOP-11
 TimerOnCommand=draworder,97;linear,0.25;addy,33
 TimerOffCommand=linear,0.25;addy,-44;
@@ -2554,9 +2572,20 @@ TextZoom=0.5
 Uppercase=false
 
 [OptionIconRow]
+NumOptionIcons=6
+
+[OptionIconRowSelectMusic]
+Fallback="OptionIconRow"
 SpacingX=46
 SpacingY=0
-NumOptionIcons=6
+
+[OptionIconRowGameplay]
+Fallback="OptionIconRow"
+SpacingX=0
+SpacingY=30
+
+[OptionIconRowEvaluation]
+Fallback="OptionIconRowGameplay"
 
 [TransitionOniFade]
 BannerWidth=512