title screen cleanup

stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua

@@ -1,20 +1,15 @@
 return Def.ActorFrame {
+	InitCommand=cmd(fov,90;);
 	LoadActor( "bg sky" ) .. {
 		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
 	};
-	LoadActor( "bg ring" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-	};
 	LoadActor( "bg rainbow" ) .. {
-		InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;horizalign,left;vertalign,bottom;);
+		InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;horizalign,left;vertalign,bottom;blend,"BlendMode_Add";diffusealpha,0.4;);
 	};
-	LoadActor( "cursor frame" ) .. {
+	LoadActor( "ring orange" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
+		InitCommand=cmd(x,SCREEN_CENTER_X+50;y,SCREEN_CENTER_Y;diffusealpha,0.5;spin;rotationx,-20;rotationy,28;rotationz,20;effectmagnitude,0,0,5;);
 	};
-	LoadActor( "help pane" ) .. {
+	LoadActor( "ring blue" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+200;y,SCREEN_BOTTOM;vertalign,bottom;);
+		InitCommand=cmd(x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y+50;diffusealpha,0.5;spin;rotationx,-60;rotationy,-20;rotationz,-50;effectmagnitude,0,0,-5;);
 	};
-	LoadActor( "settings pane" ) .. {
+};
-		InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;);
-	};
-}

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

@@ -1,3 +1,3 @@
-return LoadActor( THEME:GetPathG('ScreenTitleMenu',GAMESTATE:GetCurrentGame():GetName()) ) .. {
+return Def.ActorFrame {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3);
+	LoadActor( THEME:GetPathB('','_standard decoration'), "Logo", GAMESTATE:GetCurrentGame():GetName() );
 };

stepmania/Themes/default/Languages/de.ini

@@ -1502,7 +1502,8 @@ Space=Leerzeichen
 HelpText=START drücken um anzufangen
 
 [ScreenTitleMenu]
-%d songs in %d groups, %d courses in %d groups=%d Lieder in %d Gruppen, %d Kurse in %d Gruppen
+%d songs in %d groups=%d Lieder in %d Gruppen
+%d courses in %d groups=%d Kurse in %d Gruppen
 Announcer=Kommentator
 Credits=Mitwirkende
 Play Online=Het Spel van het netwerk

stepmania/Themes/default/Languages/en.ini

@@ -1481,7 +1481,10 @@ Space=Space
 HelpText=Press START to begin
 
 [ScreenTitleMenu]
-%d songs in %d groups, %d courses in %d groups=%d songs in %d groups, %d courses in %d groups
+%d songs in %d groups=%d songs in %d groups
+%d courses in %d groups=%d courses in %d groups
+Current gametype:=Current gametype:
+Difficulty:=Difficulty:
 Announcer=Announcer
 Play Online=Network Play
 Edit Courses=Edit Courses

stepmania/Themes/default/Languages/es.ini

@@ -1462,7 +1462,8 @@ HelpText=Presione START para comenzar
 
 [ScreenTitleMenu]
 Options=Opciones
-%d songs in %d groups, %d courses in %d groups=las canciones %d en los grupos %d, los courses %d en los grupos %d
+%d songs in %d groups=las canciones %d en los grupos %d
+%d courses in %d groups=los courses %d en los grupos %d
 Announcer=Presentador
 Edit Courses=Editar Grupos
 Edit/Sync Songs=Editar/ Canciones sync

stepmania/Themes/default/Languages/fr.ini

@@ -1481,7 +1481,8 @@ HelpText=Appuyez sur DEMARRER pour commencer
 
 [ScreenTitleMenu]
 Play Online=Jeu De Réseau
-%d songs in %d groups, %d courses in %d groups=%d chansons dans %d groupes, %d courses dans %d groupes
+%d songs in %d groups=%d chansons dans %d groupes
+%d courses in %d groups=%d courses dans %d groupes
 Announcer=Annonceur
 Credits=Crédits
 Edit Courses=Editer courses

stepmania/Themes/default/Languages/it.ini

@@ -1476,7 +1476,8 @@ HelpText=Premi AVVIA per iniziare
 [ScreenTitleMenu]
 Play Online=Gioco Della Rete
 Options=Opzioni
-%d songs in %d groups, %d courses in %d groups=%d canzoni in %d gruppi, %d percorsi in %d gruppi
+%d songs in %d groups=%d canzoni in %d gruppi
+%d courses in %d groups=%d percorsi in %d gruppi
 Announcer=Annunciatore
 Credits=Titoli
 Edit Courses=Edita corse

stepmania/Themes/default/metrics.ini

@@ -3103,6 +3103,10 @@ Class="ScreenAttract"
 Fallback="ScreenAttract"
 NextScreen="ScreenHowToPlay"
 PrevScreen="ScreenCompany"
+LogoX=SCREEN_CENTER_X
+LogoY=SCREEN_CENTER_Y-100
+LogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3
+LogoOffCommand=
 
 [ScreenHowToPlay]
 Class="ScreenHowToPlay"

stepmania/src/ScreenGameplay.cpp

@@ -500,7 +500,7 @@ void ScreenGameplay::Init()
 	LOAD_ALL_COMMANDS_AND_SET_XY( m_sprLifeFrame );
 	this->AddChild( m_sprLifeFrame );
 
-	m_sprStageFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni stage frame":"stage frame") );
+	m_sprStageFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni StageFrame":"StageFrame") );
 	m_sprStageFrame->SetName( "StageFrame" );
 	LOAD_ALL_COMMANDS_AND_SET_XY( m_sprStageFrame );
 	this->AddChild( m_sprStageFrame );