Make a way to access GameplayPractice & GameplayReplay

replace the gameplay branch with a "solid" fallback

Author: poco0317

Themes/Til Death/Scripts/02 Branches.lua

@@ -185,9 +185,6 @@ Branch = {
 			return "ScreenStageInformation"
 		end
 	end,
-	GameplayScreen = function()
-		return "ScreenGameplay"
-	end,
 	AfterGameplay = function()
 		return "ScreenEvaluationNormal"
 	end,

Themes/_fallback/Scripts/02 Branches.lua

@@ -32,6 +32,16 @@ function GameOverOrContinue()
 	end
 end
 
+function ToGameplay()
+	if GAMESTATE:IsPracticeMode() then
+		return "ScreenGameplayPractice"
+	elseif GAMESTATE:IsReplayMode() then
+		return "ScreenGameplayReplay"
+	else
+		return "ScreenGameplay"
+	end
+end
+
 Branch = {
 	Init = function()
 		return "ScreenInit"
@@ -189,9 +199,6 @@ Branch = {
 			return "ScreenStageInformation"
 		end
 	end,
-	GameplayScreen = function()
-		return "ScreenGameplay"
-	end,
 	AfterGameplay = function()
 		return "ScreenEvaluationNormal"
 	end,

Themes/_fallback/metrics.ini

@@ -1552,7 +1552,7 @@ Fallback="StepsDisplay"
 [ScreenStageInformation]
 Class="ScreenSplash"
 Fallback="ScreenSplash"
-NextScreen=Branch.GameplayScreen()
+NextScreen=ToGameplay()
 PrevScreen=Branch.BackOutOfStageInformation()
 PrepareScreen="ScreenGameplay"
 #
@@ -2550,6 +2550,19 @@ PrepareScreen=
 Class="ScreenExit"
 Fallback="ScreenWithMenuElements"
 AllowOperatorMenuButton=false
+
+[ScreenGameplayPractice]
+Fallback="ScreenGameplay"
+Class="ScreenGameplayPractice"
+NextScreen=Branch.AfterGameplay()
+PrevScreen=Branch.BackOutOfStageInformation()
+
+[ScreenGameplayReplay]
+Fallback="ScreenGameplay"
+Class="ScreenGameplayReplay"
+NextScreen=Branch.AfterGameplay()
+PrevScreen=Branch.BackOutOfStageInformation()
+
 [ScreenNetGameplay]
 Fallback="ScreenGameplay"
 Class="ScreenGameplayNormal"

src/Etterna/Singletons/GameState.cpp

@@ -1862,6 +1862,8 @@ class LunaGameState : public Luna<GameState>
 		GamePreferences::m_AutoPlay.Set(p->m_pPlayerState->m_PlayerController);
 		return 0;
 	}
+	DEFINE_METHOD(IsPracticeMode, IsPracticeMode())
+	DEFINE_METHOD(IsReplayMode, IsReplayMode())
 
 	DEFINE_METHOD(GetEtternaVersion, GetEtternaVersion())
 	LunaGameState()
@@ -1954,6 +1956,8 @@ class LunaGameState : public Luna<GameState>
 		ADD_METHOD(UpdateDiscordMenu);
 		ADD_METHOD(UpdateDiscordPresence);
 		ADD_METHOD(IsPaused);
+		ADD_METHOD(IsPracticeMode);
+		ADD_METHOD(IsReplayMode);
 	}
 };
 

src/Etterna/Singletons/GameState.h

@@ -314,6 +314,13 @@ class GameState
 	Profile* GetEditLocalProfile();
 	bool m_bIsChartPreviewActive;
 
+	// is the game in a practice state
+	bool m_practice = false;
+	// is the game in a replay state
+	bool m_replay = false;
+	bool IsPracticeMode() { return m_practice; }
+	bool IsReplayMode() { return m_replay; }
+
 	// Discord Rich Presence
 	void discordInit();
 	void updateDiscordPresence(const RString& largeImageText,