Add option to pause the practice timer while the pause menu is open

psyGamer · Mar 6, 2024 · 02f7236 · 02f7236
1 parent b3783ff
commit 02f7236
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Content/Text/English.json b/Content/Text/English.json
@@ -28,7 +28,8 @@
         "SpeedrunUtils_OptionsTitle": "SpeedrunUtils Options",
         "SpeedrunUtils_PauseOptions": "SpeedrunUtils Options",
         "SpeedrunUtils_RecollectItems": "Recollect Collectibles",
-        "SpeedrunUtils_PracticeTimer": "Practice Timer"
+        "SpeedrunUtils_PracticeTimer": "Practice Timer",
+        "SpeedrunUtils_PracticeTimer_PauseInMenu": "Pause the timer while the menu is open"
 	},
 	"Dialog":
 	{

diff --git a/Source/Data/Save.cs b/Source/Data/Save.cs
@@ -84,6 +84,9 @@ public void ResetSpeedrunPracticeTime()
 	/// </summary>
 	public bool SpeedrunPracticeTimer { get; set; } = false;
 
+	// If the Speedrun Timer should be paused when it is in "practice" mode and the pause menu is open
+	public bool SpeedrunPracticeTimerPauseInMenu { get; set; } = false;
+
 	/// <summary>
 	/// 0-10 Music volume level
 	/// </summary>
@@ -179,6 +182,11 @@ public void ToggleSpeedrunPracticeTime()
 		SpeedrunPracticeTimer = !SpeedrunPracticeTimer;
 	}
 
+	public void ToggleSpeedrunPracticeTimerPauseInMenu()
+	{
+		SpeedrunPracticeTimerPauseInMenu = !SpeedrunPracticeTimerPauseInMenu;
+	}
+
 	public TimeSpan GetCurrentDisplayTime()
 	{
 		return SpeedrunPracticeTimer 

diff --git a/Source/Scenes/World.cs b/Source/Scenes/World.cs
@@ -97,6 +97,7 @@ public World(EntryInfo entry)
             speedrunMenu.Title = Loc.Str("SpeedrunUtils_OptionsTitle");
             speedrunMenu.Add(new Menu.Toggle(Loc.Str("SpeedrunUtils_RecollectItems"), Save.Instance.ToggleSpeedrunRecollectItems, () => Save.Instance.SpeedrunRecollectItems));
             speedrunMenu.Add(new Menu.Toggle(Loc.Str("SpeedrunUtils_PracticeTimer"), Save.Instance.ToggleSpeedrunPracticeTime, () => Save.Instance.SpeedrunPracticeTimer));
+            speedrunMenu.Add(new Menu.Toggle(Loc.Str("SpeedrunUtils_PracticeTimer_PauseInMenu"), Save.Instance.ToggleSpeedrunPracticeTimerPauseInMenu, () => Save.Instance.SpeedrunPracticeTimerPauseInMenu));
 
 			pauseMenu.Title = Loc.Str("PauseTitle");
             pauseMenu.Add(new Menu.Option(Loc.Str("PauseResume"), () => SetPaused(false)));
@@ -300,7 +301,7 @@ public override void Update()
 		}
 
 		// increment practice timer (if not in the ending area)
-		if (IsPlayerActive && !IsInEndingArea)
+		if (IsPlayerActive && !IsInEndingArea && !(Save.Instance.SpeedrunPracticeTimerPauseInMenu && Paused))
 		{
 			Save.CurrentRecord.SpeedrunPracticeTime += TimeSpan.FromSeconds(Time.Delta);
 		}