Skip to content

fixed bugs #110

Merged
merged 3 commits into from
May 14, 2026
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .claude/worktrees/nostalgic-liskov-9129de
Submodule nostalgic-liskov-9129de added at 6064d3
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,9 @@ public void updateGameState() {
}
gameController.setGameState(GameState.WORKDAY);
}

public void setDay(int index) {
dayIndex.set(index);
updateGameState();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -164,6 +165,7 @@ private void wireWeekendRapport() {
weekendRapportApp.getContinueButton().setOnAction(event -> {
weekendRapportApp.getRoot().setVisible(false);
desktopView.exitLayer(ModalLayer.RAPPORT);
timeAndWeatherController.setDay(0);
});
}

Expand Down