Merge pull request #147 from einaskoi/per/exe

Per/exe
einaskoi · May 26, 2026 · 53df9e9 · 53df9e9
2 parents 1a14ad5 + 71ae696
commit 53df9e9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/Millions-1.1.0-installer.exe b/Millions-1.1.0-installer.exe
diff --git a/Millions.exe b/Millions.exe
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
@@ -43,13 +43,13 @@ public void addAppController(final AppController appController) {
   public void setGameState(final GameState gameState) {
     this.gameState = gameState;
 
-    if (gameState == GameState.WORKDAY && !workMusicPlaying) {
+    if (!isWeekend() && !workMusicPlaying) {
       audioManager.playBgMusic(Audio.WORK_THEME);
       workMusicPlaying = true;
       weekendMusicPlaying = false;
     }
 
-    if (gameState == GameState.FREEDAY && !weekendMusicPlaying) {
+    if (isWeekend() && !weekendMusicPlaying) {
       audioManager.playBgMusic(Audio.WEEKEND_THEME);
       weekendMusicPlaying = true;
       workMusicPlaying = false;
@@ -64,7 +64,7 @@ public void setGameState(final GameState gameState) {
   public void startGame() {
     timer = new Timer(true);
     final int delay = 0;
-    final int period = 1000;
+    final int period = 10;
 
     timer.scheduleAtFixedRate(new TimerTask() {
       @Override

diff --git a/...n/java/edu/ntnu/idi/idatt2003/gruppe42/controller/viewcontrollers/DesktopInitializer.java b/...n/java/edu/ntnu/idi/idatt2003/gruppe42/controller/viewcontrollers/DesktopInitializer.java
@@ -99,6 +99,8 @@ public DesktopInitializer(
           News news = new News(event.company(), event.trend());
           mailController.createMessage(news.generateAuthor(), "BREAKING NEWS", news.generateNews());
         }));
+
+
   }
 
   /**

diff --git a/src/main/resources/images/app_icon.ico b/src/main/resources/images/app_icon.ico
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,6 +99,8 @@ public DesktopInitializer( @@
               News news = new News(event.company(), event.trend());
               mailController.createMessage(news.generateAuthor(), "BREAKING NEWS", news.generateNews());
             }));
       }
       /**
@@ Expand Down @@