Broke the EvaluationNextScreen() function up into 2 seperate ones so …

…that we could actually get to the Extra Stage legitimately instead of just forcing it on every time for testing.

Themes/itg3/Scripts/Branches.lua

@@ -25,16 +25,22 @@ function GetUpdateScreen()
 	return "ScreenArcadePatch"
 end
 
-function EvaluationNextScreen()
+function EvaluationNextScreenExit()
 	Trace( "GetGameplayNextScreen: " )
 	Trace( " AllFailed = "..tostring(AllFailed()) )
 	Trace( " IsEventMode = "..tostring(GAMESTATE:IsEventMode()) )
 	Trace( " IsFinalStage = "..tostring(IsFinalStage()) )
 	if GAMESTATE:IsEventMode() then return NewSongScreen() end
-	if AllFailed() then return "ScreenNameEntryTraditional" end
+	if AllFailed() or IsFinalStage() 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=@EvaluationNextScreen()
+EndScreen=@EvaluationNextScreenExit()
 NextScreen=@EvaluationNextScreen()
-FailedScreen=@EvaluationNextScreen()
+FailedScreen=@EvaluationNextScreenExit()
 Class=ScreenEvaluation
 Fallback=ScreenEvaluation
 ColorizeLifeGraph=1
@@ -1465,7 +1465,7 @@ MaxComboNumberP2OnCommand=hidden,1
 
 [ScreenEvaluationRave]
 Fallback=ScreenEvaluationStage
-FailedScreen=@EvaluationNextScreen()
+FailedScreen=@EvaluationNextScreenExit()
 LargeBannerFrameOnCommand=diffusealpha,0;sleep,3;linear,0.5;diffusealpha,1
 LargeBannerFrameOffCommand=stoptweening;linear,0.2;diffusealpha,0
 ShowBannerArea=1