From 0ac514ae6d0955ec07a7969777a8aa5f40a5daac Mon Sep 17 00:00:00 2001 From: Per Eric Trapnes Date: Thu, 14 May 2026 16:59:03 +0200 Subject: [PATCH 1/2] fix bugs with the switch to sunday, halfway implimentet --- .claude/worktrees/nostalgic-liskov-9129de | 1 + .../idi/idatt2003/gruppe42/Controller/GameController.java | 2 +- .../gruppe42/Controller/TimeAndWeatherController.java | 4 ++++ .../Controller/ViewControllers/DesktopViewController.java | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 .claude/worktrees/nostalgic-liskov-9129de diff --git a/.claude/worktrees/nostalgic-liskov-9129de b/.claude/worktrees/nostalgic-liskov-9129de new file mode 160000 index 0000000..6064d35 --- /dev/null +++ b/.claude/worktrees/nostalgic-liskov-9129de @@ -0,0 +1 @@ +Subproject commit 6064d35b7a76e13c2733d65f3152f2433881bb17 diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java index 1388ee7..b864f66 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java @@ -52,7 +52,7 @@ public void setGameState(GameState gameState) { public void startGame() { timer = new Timer(true); final int delay = 0; - final int period = 1000; //TODO: This has to be 1000 (1 second) on release + final int period = 10; //TODO: This has to be 1000 (1 second) on release timer.scheduleAtFixedRate( new TimerTask() { diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java index 89554bb..3aabfb7 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java @@ -116,4 +116,8 @@ public void updateGameState() { } gameController.setGameState(GameState.WORKDAY); } + + public void setDay(Day day){ + dayIndex.set(day.ordinal()); + } } diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java index f128e56..03cff12 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java @@ -10,6 +10,7 @@ import edu.ntnu.idi.idatt2003.gruppe42.Controller.PopupsController; import edu.ntnu.idi.idatt2003.gruppe42.Controller.TimeAndWeatherController; import edu.ntnu.idi.idatt2003.gruppe42.Model.App; +import edu.ntnu.idi.idatt2003.gruppe42.Model.Day; import edu.ntnu.idi.idatt2003.gruppe42.Model.Player; import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Purchase; import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Sale; @@ -164,6 +165,7 @@ private void wireWeekendRapport() { weekendRapportApp.getContinueButton().setOnAction(event -> { weekendRapportApp.getRoot().setVisible(false); desktopView.exitLayer(ModalLayer.RAPPORT); + timeAndWeatherController.setDay(Day.SUN); }); } From 5a40c1a4f4e78c6548d727ef3e756b1229dc7758 Mon Sep 17 00:00:00 2001 From: Per Eric Trapnes Date: Thu, 14 May 2026 17:09:11 +0200 Subject: [PATCH 2/2] fix the continue to sunday --- .../gruppe42/Controller/TimeAndWeatherController.java | 5 +++-- .../Controller/ViewControllers/DesktopViewController.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java index 3aabfb7..8a3bb15 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java @@ -117,7 +117,8 @@ public void updateGameState() { gameController.setGameState(GameState.WORKDAY); } - public void setDay(Day day){ - dayIndex.set(day.ordinal()); + public void setDay(int index) { + dayIndex.set(index); + updateGameState(); } } diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java index 03cff12..53dc07d 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java @@ -165,7 +165,7 @@ private void wireWeekendRapport() { weekendRapportApp.getContinueButton().setOnAction(event -> { weekendRapportApp.getRoot().setVisible(false); desktopView.exitLayer(ModalLayer.RAPPORT); - timeAndWeatherController.setDay(Day.SUN); + timeAndWeatherController.setDay(0); }); }