jump through fewer hoops with ScreenStage

stepmania/Themes/default/Scripts/Branches.lua

@@ -1,3 +1,8 @@
+function SelectGameplayScreen()
+	if IsExtraStage() or IsExtraStage2() then return "ScreenGameplay" end
+	return "ScreenGameplay"
+end
+
 function SelectEvaluationScreen()
 	if IsNetConnected() then return "ScreenNetEvaluation" end
 	Mode = PlayModeName()

stepmania/Themes/default/metrics.ini

@@ -692,7 +692,7 @@ StyleIcon=1
 MemoryCardIcons=1
 SampleMusicDelay=0.25
 PrevScreen=ScreenTitleBranch
-NextScreen=ScreenBranchGameplay
+NextScreen=ScreenStage
 NextOptionsScreen=ScreenBranchFirstOptions
 DoRouletteOnMenuTimer=1
 AlignMusicBeat=0
@@ -1033,23 +1033,15 @@ DifficultyRatingOrientation=0
 DifficultyRatingSpacing=40.0
 PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all, 3 = play music as select, press twice to confirm, 4 = static menu music plays, no confirm
 PrevScreen=ScreenTitleBranch
-NextScreen=ScreenBranchGameplay
+NextScreen=ScreenStage
 NextOptionsScreen=ScreenBranchFirstOptions
 TimerSeconds=60
 TimerStealth=0
 StyleIcon=0
 MemoryCardIcons=0
 
-[ScreenBranchGameplay]
-Class=ScreenBranch
-Choices=1,2
-Condition1=IsExtraStage() or IsExtraStage2()
-Condition2=true
-NextScreen1=screen,ScreenStageExtra
-NextScreen2=screen,ScreenStage
-
 [ScreenStage]
-NextScreen=ScreenGameplay
+NextScreen=@SelectGameplayScreen()
 PrevScreen=ScreenBranchSelectSongOrCourse
 // This is the minimum delay after the "in" transition before the
 // "out" transition will begin.  (NextScreen is loaded during this
@@ -1081,11 +1073,6 @@ BackgroundOffCommand=
 OverlayOnCommand=
 OverlayOffCommand=
 
-[ScreenStageExtra]
-Class=ScreenStage
-Fallback=ScreenStage
-NextScreen=ScreenGameplayExtra
-
 [ScreenGameplay]
 ShowEvaluationOnFail=0
 StaticBGY=SCREEN_CENTER_Y+0
@@ -3635,7 +3622,7 @@ CancelAllP2ShowCommand=
 Fallback=ScreenOptions
 Class=ScreenOptionsMaster
 PrevScreen=ScreenSelectMusic
-NextScreen=ScreenBranchGameplay
+NextScreen=ScreenStage
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
@@ -3659,7 +3646,7 @@ NextScreen2=screen,ScreenPlayerOptions
 [ScreenSongOptions]
 Fallback=ScreenOptions
 PrevScreen=ScreenBranchFirstOptions
-NextScreen=ScreenBranchGameplay
+NextScreen=ScreenStage
 Game=Change the current game type with this option.
 TimerSeconds=30
 StyleIcon=0