remove unnecessary ScreenWithMenuElements2

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

@@ -43,7 +43,7 @@ t[#t+1] = Def.ActorFrame {
        LoadActor( "stepmania logo" ) .. {
        };
        LoadFont( "common normal" ) .. {
-               InitCommand=cmd(y,-25;settext,ProductVersion();diffuse,color("#000000");shadowlength,0;);
+               InitCommand=cmd(y,-25;settext,ProductID() .. " " .. ProductVersion();diffuse,color("#000000");shadowlength,0;);
        };
 };
 

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

@@ -1,4 +0,0 @@
-local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. {
-};
-
-return t;

stepmania/Themes/default/Graphics/ControllerStateDisplay Center.lua

@@ -0,0 +1,3 @@
+return Def.Quad {
+	InitCommand=cmd(zoomtowidth,8;zoomtoheight,8;diffuse,color("#ffa944"));
+};

stepmania/Themes/default/Graphics/ControllerStateDisplay DownLeft.lua

@@ -0,0 +1,3 @@
+return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. {
+	InitCommand=cmd(x,-8;y,8);
+};

stepmania/Themes/default/Graphics/ControllerStateDisplay DownRight.lua

@@ -0,0 +1,3 @@
+return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. {
+	InitCommand=cmd(x,8;y,8);
+};

stepmania/Themes/default/Graphics/ControllerStateDisplay UpLeft.lua

@@ -0,0 +1,3 @@
+return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. {
+	InitCommand=cmd(x,-8;y,-8);
+};

stepmania/Themes/default/Graphics/ControllerStateDisplay UpRight.lua

@@ -0,0 +1,3 @@
+return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. {
+	InitCommand=cmd(x,8;y,-8);
+};

stepmania/Themes/default/Graphics/ScreenSelectGame header.redir

@@ -1 +1 @@
-ScreenWithMenuElements2 header
+ScreenWithMenuElements header

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

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

stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/default.lua

@@ -0,0 +1,20 @@
+return LoadActor( THEME:GetPathB("ScreenWithMenuElements","overlay") ) .. {
+	Def.ActorFrame {
+		InitCommand=cmd(x,-200;);
+		LoadActor( "notify" ) .. {
+			OnCommand=cmd();
+		};
+		LoadFont( "_venacti bold 15px" ) .. {
+			InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;);
+		};
+	};
+	Def.ActorFrame {
+		InitCommand=cmd(x,200;);
+		LoadActor( "notify" ) .. {
+			OnCommand=cmd(zoomx,-1);
+		};
+		LoadFont( "_venacti bold 15px" ) .. {
+			InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;);
+		};
+	};
+};

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

@@ -0,0 +1,37 @@
+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 26px header text" ) .. {
+			InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15;zoomx,1.2;maxwidth,250;);
+			OnCommand=cmd(faderight,1;cropright,1;linear,.32;faderight,0;cropright,0);
+			OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1);
+			Name="HeaderText";
+		};
+		LoadFont( "_venacti 10px header subtext" ) .. {
+			InitCommand=cmd(x,64;y,11;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");zoomx,1.2;);
+			OnCommand=cmd(zoomy,.5;faderight,1;cropright,1;linear,.32;faderight,0;cropright,0;zoomy,1);
+			OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1);
+			Name="HeaderSubText";
+		};
+		LoadActor( "arrow" ) .. {
+		};
+		LoadActor( "ring shadow" ) .. {
+			InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;);
+		};
+		LoadActor( "ring diffuse" ) .. {
+			InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,10;);
+		};
+		UpdateScreenHeaderMessageCommand=function(self,params)
+			local header = self:GetChild("HeaderText");
+			local subHeader = self:GetChild("HeaderSubText");
+			header:settext( params.Header );
+			subHeader:settext( params.Subheader );
+		end
+	};
+};

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

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

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

@@ -1,4 +1,4 @@
-return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. {
+return LoadActor( THEME:GetPathB("ScreenWithMenuElements","overlay") ) .. {
 	Def.ActorFrame {
 		InitCommand=cmd(x,-200;);
 		LoadActor( "notify" ) .. {

stepmania/Themes/default/Sounds/_common menu music.redir

@@ -1 +0,0 @@
-_skavenger

stepmania/Themes/default/metrics.ini

@@ -156,11 +156,8 @@ PrevScreen=ScreenTitleBranch()
 TimerSeconds=-1
 ShowHelp=false
 
-[ScreenWithMenuElements2]
-Fallback="ScreenWithMenuElements"
-
 [ScreenSelectStyle2]
-Fallback="ScreenWithMenuElements2"
+Fallback="ScreenWithMenuElements"
 Class="ScreenSelectMaster"
 HelpText=ScreenString("HelpTextNormal")
 IdleCommentSeconds=0
@@ -213,7 +210,7 @@ HeaderOnCommand=
 HeaderOffCommand=
 
 [ScreenSelectPlayMode]
-Fallback="ScreenWithMenuElements2"
+Fallback="ScreenWithMenuElements"
 Class="ScreenSelectMaster"
 HelpText=ScreenString("HelpTextNormal")
 IdleCommentSeconds=0
@@ -343,7 +340,7 @@ ShowStyleIcon=true
 
 [ScreenSelectMusic]
 Class="ScreenSelectMusic"
-Fallback="ScreenWithMenuElements2"
+Fallback="ScreenWithMenuElements"
 NextScreen=GetSelectMusicNext()
 PrevScreen=ScreenTitleBranch()
 MusicWheelType="MusicWheel"
@@ -494,6 +491,8 @@ RoomSelectScreen="ScreenNetRoom"
 Fallback="ScreenNetSelectMusic"
 
 [ScreenNetSelectMusic]
+Fallback="ScreenWithMenuElements"
+Class="ScreenNetSelectMusic"
 BannerWidth=0 // These dont do anything but prevent crashes
 BannerHeight=0
 MusicWheelX=SCREEN_CENTER_X+160
@@ -576,8 +575,6 @@ TimerSeconds=
 PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenStage"
 NoSongsScreen=ScreenTitleBranch()
-Class="ScreenNetSelectMusic"
-Fallback="ScreenWithMenuElements2"
 DifficultyIconP1OnCommand=visible,false
 DifficultyIconP1OffCommand=
 DifficultyIconP2OnCommand=visible,false
@@ -874,7 +871,7 @@ Fallback="ScreenGameplay"
 PlayerType="PlayerShared"
 
 [ScreenEvaluation]
-Fallback="ScreenWithMenuElements2"
+Fallback="ScreenWithMenuElements"
 Class="ScreenEvaluation"
 LightsMode="LightsMode_MenuStartOnly"
 HelpText=ScreenString("HelpTextEvaluation")
@@ -1951,7 +1948,7 @@ FrameY=6
 FrameOnCommand=
 
 [ScreenOptions]
-Fallback="ScreenWithMenuElements2"
+Fallback="ScreenWithMenuElements"
 NavigationMode="normal"
 InputMode="individual"
 ForceAllPlayers=false