diff --git a/Millions-1.1.0-installer.exe b/Millions-1.1.0-installer.exe new file mode 100644 index 0000000..192a42e Binary files /dev/null and b/Millions-1.1.0-installer.exe differ diff --git a/Millions.exe b/Millions.exe new file mode 100644 index 0000000..065600d Binary files /dev/null and b/Millions.exe differ 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 b36ef66..cfc5eaf 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 @@ -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/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/viewcontrollers/DesktopInitializer.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/viewcontrollers/DesktopInitializer.java index f2e3ca8..b8c9f5b 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/viewcontrollers/DesktopInitializer.java +++ b/src/main/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 new file mode 100644 index 0000000..383a56d Binary files /dev/null and b/src/main/resources/images/app_icon.ico differ