Adjust for conflict fix

AdamLearns · Aug 24, 2024 · 6a0a681 · 6a0a681
1 parent 18c24a4
commit 6a0a681
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/JumpRoyale/src/TimerOverlay.cs b/JumpRoyale/src/TimerOverlay.cs
@@ -13,10 +13,6 @@ public partial class TimerOverlay : VFlowContainer
 
     private const float ColorAlpha = 0.75f;
 
-    private static readonly int GameLength = GameOverlay.GameLength;
-
-    private int _timerSeconds = GameLength;
-
     private Color _defaultColor = new(1, 1, 1, ColorAlpha);
     private Color _flashColor = new(1, 0, 0, ColorAlpha);
 
@@ -27,6 +23,8 @@ public partial class TimerOverlay : VFlowContainer
     [Signal]
     public delegate void TimerDoneEventHandler();
 
+    public int TimerSeconds { get; private set; } = GameOverlay.GameLength;
+
     public override void _Ready()
     {
         _timerLabel = GetNode<Label>(TimerNodeName);
@@ -46,7 +44,7 @@ public async Task StartTimer()
 
         UpdateTimer();
 
-        if (_timerSeconds <= 0)
+        if (TimerSeconds <= 0)
         {
             EmitSignal(SignalName.TimerDone);
 
@@ -58,14 +56,14 @@ public async Task StartTimer()
 
     private void UpdateTimer()
     {
-        _timerSeconds--;
+        TimerSeconds--;
 
-        int seconds = _timerSeconds % 60;
-        int minutes = _timerSeconds / 60;
+        int seconds = TimerSeconds % 60;
+        int minutes = TimerSeconds / 60;
 
         _timerLabel.Text = $"{minutes}:{seconds:00}";
 
-        if (_timerSeconds > FinalCountdown)
+        if (TimerSeconds > FinalCountdown)
         {
             _sprite.Modulate = _defaultColor;