revised the basic structure for timer button

UQcsse3200 · Oct 14, 2023 · 0e14689 · 0e14689
1 parent f48ed14
commit 0e14689
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/maingame/UIElementsDisplay.java b/source/core/src/main/com/csse3200/game/components/maingame/UIElementsDisplay.java
@@ -196,11 +196,18 @@ public void createTimerButton() {
      * This method updates the text for timer button.
      */
     public void updateTimerButton() {
-        int totalSecs = (int) (timer - (ServiceLocator.getTimeSource().getTime() / 1000));
+        int totalSecs = (int) ((ServiceLocator.getWaveService().getNextWaveTime()
+                - ServiceLocator.getTimeSource().getTime()) / 1000);
         int seconds = totalSecs % 60;
         int minutes = (totalSecs % 3600) / 60;
         String finalTime = String.format("%02d:%02d", minutes, seconds);
-        timerButton.setText("Next wave in:" + finalTime);
+        if (ServiceLocator.getTimeSource().getTime() < ServiceLocator.getWaveService().getNextWaveTime()) {
+            timerButton.setText("Next wave in: " + finalTime);
+        } else {
+            buttonTable.removeActor(timerButton);
+            stage.act();
+            stage.draw();
+        }
     }
 
     @Override