Reverted the EvaluationNextScreen() function back into 1 since we're …

…not pursuing the Extra Stage for now, and added in a safety mechanism in case someone does manage to reload the final stage, cross over into the Extra Stage, and then Pass the song. Rather than move on to ExtraStage2, they will get thrown into the name entry screen as if they played their Final song.

Themes/itg3/Scripts/Branches.lua

@@ -25,22 +25,16 @@ function GetUpdateScreen()
 	return "ScreenArcadePatch"
 end
 
-function EvaluationNextScreenExit()
+function EvaluationNextScreen()
 	Trace( "GetGameplayNextScreen: " )
 	Trace( " AllFailed = "..tostring(AllFailed()) )
 	Trace( " IsEventMode = "..tostring(GAMESTATE:IsEventMode()) )
 	Trace( " IsFinalStage = "..tostring(IsFinalStage()) )
 	if GAMESTATE:IsEventMode() then return NewSongScreen() end
-	if AllFailed() or IsFinalStage() then return "ScreenNameEntryTraditional" end
+	if AllFailed() or IsFinalStage() or GAMESTATE:IsExtraStage() then return "ScreenNameEntryTraditional" end
 	return NewSongScreen();
 end
 
-function EvaluationNextScreen()
-	if( IsNetSMOnline() ) then return "ScreenNetRoom" end
-	if( IsNetConnected() ) then return "ScreenNetSelectMusic" end
-	return NewSongScreen()
-end
-
 function ScreenCleaning()
 	if GetCleanScreen() == true then
 		if Hour() >= GetCleanStartTime() and Hour() < GetCleanEndTime() then

Themes/itg3/metrics.ini

@@ -1054,9 +1054,9 @@ TimerOffCommand=accelerate,.5;addy,-200
 OverlayY=0
 
 [ScreenEvaluationStage]
-EndScreen=@EvaluationNextScreenExit()
+EndScreen=@EvaluationNextScreen()
 NextScreen=@EvaluationNextScreen()
-FailedScreen=@EvaluationNextScreenExit()
+FailedScreen=@EvaluationNextScreen()
 Class=ScreenEvaluation
 Fallback=ScreenEvaluation
 ColorizeLifeGraph=1
@@ -1465,7 +1465,7 @@ MaxComboNumberP2OnCommand=hidden,1
 
 [ScreenEvaluationRave]
 Fallback=ScreenEvaluationStage
-FailedScreen=@EvaluationNextScreenExit()
+FailedScreen=@EvaluationNextScreen()
 LargeBannerFrameOnCommand=diffusealpha,0;sleep,3;linear,0.5;diffusealpha,1
 LargeBannerFrameOffCommand=stoptweening;linear,0.2;diffusealpha,0
 ShowBannerArea=1