split ScreenHighScores from ScreenRanking. These two things lived in the same file and shared enums, but shared almost no code

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

@@ -32,7 +32,7 @@ end
 
 return Def.ActorFrame {
 	LoadActor("how to play") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;zoom,6;sleep,0.0;linear,0.3;diffusealpha,1;zoom,2;sleep,1.7;linear,0.3;zoom,1;addx,160;addy,-150;draworder,1;);
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;zoom,4;sleep,0.0;linear,0.5;diffusealpha,1;zoom,1.5;sleep,1.7;linear,0.5;zoom,1;addx,160;addy,-150;draworder,1;);
 	};
 
 	ExplanationText( "When the arrows rise to this point, step on the matching panels.", 5, 9 );

stepmania/Themes/default/Fonts/_terminator two 13px.ini

@@ -5,6 +5,7 @@ LineSpacing=13
 DrawExtraPixelsLeft=1
 DrawExtraPixelsRight=1
 AdvanceExtraPixels=0
+DefaultStrokeColor=#FFFFFF00
 
 [main]
 Line  0= !"#$%&'()*+,-.

stepmania/Themes/default/Languages/de.ini

@@ -1267,9 +1267,6 @@ No=NEIN
 OK=OK
 Yes=JA
 
-[ScreenRanking]
-NoScoreName=SCHRITT
-
 [ScreenSMOnlineLogin]
 Each player needs a unique Profile.=Jeder Spieler braucht ein individuelles Profil.
 Enter your password.=Passwort eingeben.

stepmania/Themes/default/Languages/en.ini

@@ -1271,7 +1271,6 @@ Yes=YES
 Cancel=CANCEL
 
 [ScreenRanking]
-NoScoreName=STEP
 
 [ScreenSMOnlineLogin]
 Each player needs a unique Profile.=Each player needs a unique Profile.

stepmania/Themes/default/Languages/es.ini

@@ -1224,9 +1224,6 @@ No=NO
 OK=OK
 Yes=SÍ
 
-[ScreenRanking]
-NoScoreName=PASO
-
 [ScreenSMOnlineLogin]
 Each player needs a unique Profile.=Cada jugador necesita un único perfil.
 Enter your password.=Introduce tu contraseña.

stepmania/Themes/default/Languages/fr.ini

@@ -1243,9 +1243,6 @@ No=NON
 OK=OK
 Yes=OUI
 
-[ScreenRanking]
-NoScoreName=STEP
-
 [ScreenSMOnlineLogin]
 Each player needs a unique Profile.=Chaque joueur doit avoir un Profil unique.
 Enter your password.=Entrez votre mot de passe.

stepmania/Themes/default/Languages/it.ini

@@ -1237,9 +1237,6 @@ No=NO
 OK=OK
 Yes=SI'
 
-[ScreenRanking]
-NoScoreName=PASSI
-
 [ScreenSMOnlineLogin]
 Each player needs a unique Profile.=Ciascun giocatore deve avere un profilo personale.
 Enter your password.=Inserisci la tua password.

stepmania/Themes/default/Scripts/Other.lua

@@ -112,27 +112,14 @@ function TextBannerAfterSet(self,param)
 	--local Artist=self:GetChild("Artist"); 
 	local edge_x = 120;
 	if Subtitle:GetText() == "" then 
-		(cmd(maxwidth,300;x,edge_x;y,0))(Title);
+		(cmd(maxwidth,300;x,edge_x;y,0;zoom,1.1;))(Title);
 		(cmd(visible,false))(Subtitle);
 		--(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist);
 	else
-		local one_line_title_zoom = 1;
+		-- subtitle below
-		local one_line_sub_zoom = 0.6;
+		(cmd(zoom,1;x,edge_x;y,-6;zoom,1.0;))(Title);
-		local title_width = Title:GetWidth() * one_line_title_zoom;
+		(cmd(visible,true;zoom,0.6;x,edge_x;y,7))(Subtitle); 
-		local sub_width = Subtitle:GetWidth() * one_line_sub_zoom;
+		--(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,9))(Artist); 
-		local spacing = 4;
-		local max_one_line_width = 200;
-		if title_width + spacing + sub_width < max_one_line_width then
-			-- subtitle to the side
-			(cmd(zoom,1;x,edge_x-sub_width-spacing;y,0))(Title);
-			(cmd(visible,true;zoom,one_line_sub_zoom;x,edge_x;y,2))(Subtitle); 
-			--(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist); 
-		else
-			-- subtitle below
-			(cmd(zoom,1;x,edge_x;y,-6;))(Title);
-			(cmd(visible,true;zoom,0.6;x,edge_x;y,7))(Subtitle); 
-			--(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,9))(Artist); 
-		end
 	end
 end
 

stepmania/Themes/default/metrics.ini

@@ -5,8 +5,8 @@ IsBaseTheme=1
 AutoSetStyle=false
 ColorP1Command=diffuse,PlayerColor(PLAYER_1)
 ColorP2Command=diffuse,PlayerColor(PLAYER_2)
-InitialScreen="ScreenHowToPlay"
+InitialScreen="ScreenHighScores"
-FirstAttractScreen="ScreenHowToPlay"
+FirstAttractScreen="ScreenHighScores"
 DefaultModifiers="default;1.5x"
 DefaultCpuModifiers=""
 DefaultNoteSkinName="default"
@@ -19,6 +19,7 @@ OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDeb
 MaxCourseEntriesBeforeShowVarious=6
 AllStepsTypeInOneList=false
 PercentScoreDecimalPlaces=2
+NoScoreName="STEP"
 
 [Gameplay]
 ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
@@ -91,7 +92,7 @@ DefaultChoice="1"
 NumChoicesOnPage1=100
 WrapCursor=true
 AllowRepeatingInput=true
-Choice1="ApplyDefaultOptions;screen,ScreenProfileLoad;text,Game Start"
+Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
 Choice3="screen,ScreenSelectGame;text,Select Game"
 Choice4="screen,ScreenOptionsService;text,Options"
@@ -113,6 +114,7 @@ TimerSeconds=-1
 ShowStyleIcon=false
 ShowHelp=true
 HelpText=ScreenString("HelpTextOptionsSimple")
+HelpOnCommand=%function(self,param) local fn = THEME:GetMetric("ScreenWithMenuElements","HelpOnCommand"); fn(self); self:finishtweening(); end
 IdleCommentSeconds=12
 IdleTimeoutSeconds=30
 IdleTimeoutScreen=THEME:GetMetric("Common","FirstAttractScreen")
@@ -1738,7 +1740,7 @@ NumberOnCommandFunction=
 Class="ScreenCredits"
 Fallback="ScreenCredits"
 Announce="music scroll"
-NextScreen="ScreenRanking"
+NextScreen="ScreenHighScores"
 StartScreen=ScreenTitleBranch()
 
 [EditMenu]
@@ -3165,21 +3167,39 @@ Unlock0020X=SCREEN_CENTER_X-70
 Unlock0020Y=SCREEN_CENTER_Y+85
 DancePointsZoom=2
 
-[ScreenRanking]
+[ScreenHighScores]
-Class="ScreenRankingLines"
 Fallback="ScreenAttract"
+Class="ScreenHighScores"
+TimerSeconds=-1
 NextScreen="ScreenUnlockStatus"
 PrevScreen="ScreenHowToPlay"
-ResetGameState=false
+HighScoresType="HighScoresType_AllSteps"
+MaxItemsToShow=50
+NumColumns=5
+ColumnDifficulty1="Difficulty_Beginner"
+ColumnDifficulty2="Difficulty_Easy"
+ColumnDifficulty3="Difficulty_Medium"
+ColumnDifficulty4="Difficulty_Hard"
+ColumnDifficulty5="Difficulty_Challenge"
+ColumnStepsType1=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType2=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType3=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType4=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType5=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ScrollerItemsToDraw=9
+ScrollerSecondsPerItem=0.4
+ManualScrolling=false
+ScrollerOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+200;SetMask,608,40
+ScrollerItemTransformFunction=function(self,offset,itemIndex,numItems) self:y(44*offset) end
+
+[ScreenRanking]
+Fallback="ScreenAttract"
+Class="ScreenRanking"
 TimerSeconds=-1
 StepsTypesToHide="dance-couple,dance-solo,dance-routine,pump-halfdouble,pump-couple"
-RankingPageType="Category"
-CoursesToShow=GetCoursesToShowRanking()
-ShowOnlyMostRecentScores=false
-NumMostRecentScoresToShow=10
-DifficultiesToShow="easy,medium,hard,challenge"
-SecondsPerPage=5
 PageFadeSeconds=1.0
+CoursesToShow=GetCoursesToShowRanking()
+SecondsPerPage=5
 
 RowSpacingX=0
 RowSpacingY=60
@@ -3190,9 +3210,7 @@ StepsTypeColor2=color("1,0.3,0.3,1")
 StepsTypeColor3=color("0.3,1,0.3,1")
 StepsTypeColor4=color("1.0,1,1.0,1")
 StepsTypeColor5=color("1.0,1,1.0,1")
-SongScoreRowsToDraw=6
 SongScoreSecondsPerRow=0.4
-ManualScrolling=false
 ShowSurvivalTime=false
 
 BannerOnCommand=x,SCREEN_CENTER_X+197;y,SCREEN_CENTER_Y-196;diffusealpha,1;scaletoclipped,220,58;addx,SCREEN_WIDTH;sleep,0.0;bounceend,1;addx,-SCREEN_WIDTH
@@ -3338,7 +3356,7 @@ NumMisses=6
 Fallback="ScreenGameplay"
 Class="ScreenDemonstration"
 SecondsToShow=30
-NextScreen="ScreenRanking"
+NextScreen="ScreenHighScores"
 LightsMode="LightsMode_Demonstration"
 DifficultiesToShow="easy,medium"
 StartScreen=ScreenTitleBranch()
@@ -3592,7 +3610,7 @@ Class="ScreenCredits"
 Fallback="ScreenAttract"
 Announce="credits"
 TimerSeconds=58
-NextScreen="ScreenRanking"
+NextScreen="ScreenHighScores"
 
 [ScreenGameOver]
 Class="ScreenAttract"