diff --git a/OgGhostWinners.txt b/OgGhostWinners.txt index 473f560..cf77d1f 100644 --- a/OgGhostWinners.txt +++ b/OgGhostWinners.txt @@ -3,3 +3,5 @@ serai serai Jonas of Istanbul serai +serai +serai diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/BudaLogConfig.java b/src/main/java/ch/unibas/dmi/dbis/cs108/BudaLogConfig.java index dc9f6c1..2da3348 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/BudaLogConfig.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/BudaLogConfig.java @@ -19,7 +19,7 @@ public class BudaLogConfig { LoggerContext ctx = (LoggerContext) LogManager.getContext(false); Configuration config = ctx.getConfiguration(); LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); - loggerConfig.setLevel(Level.DEBUG); // change level here + loggerConfig.setLevel(Level.ERROR); // change level here ctx.updateLoggers(); // This causes all Loggers to refetch information from their LoggerConfig. } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java index 5ab41fa..5056abc 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java @@ -6,6 +6,7 @@ import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.GUI; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.GameStateModel; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ChatApp; +import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.Sprites; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.chat.ChatController; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.game.GameController; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeApp; @@ -350,12 +351,16 @@ public class Client { case GuiParameters.night: //ClientGameInfoHandler; gameStateModel.setDayClone(false); LOGGER.debug("----------------Night, Your role is:" + gameStateModel.getYourRole() + gameStateModel); + Sprites.setNightSprites(gameStateModel.getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); + chatApp.getGameController().updateGameSprites(); chatApp.getGameController().setNoiseButtonInvisible(); chatApp.getGameController().setVoteButtonVisibilityNight(gameStateModel); break; case GuiParameters.day: //ClientGameInfoHandler gameStateModel.setDayClone(true); LOGGER.debug("----------------Day, Your role is:" + gameStateModel.getYourRole()+ gameStateModel); + Sprites.setDaySprites(gameStateModel.getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); + chatApp.getGameController().updateGameSprites(); chatApp.getGameController().setNoiseButtonVisible(); chatApp.getGameController().setVoteButtonVisibilityDay(gameStateModel); break; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java index 335a8bc..16e89cc 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java @@ -9,7 +9,6 @@ import javafx.util.Duration; public class BGAnimation extends Transition { ImageView imageView; - private static final Image bgFull = new Image("ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/BG_small.jpg"); int index; int lastIndex; @@ -19,7 +18,7 @@ public class BGAnimation extends Transition { this.imageView = imageView; imageView.setFitHeight(1950); imageView.setFitWidth(6667.968); - imageView.setImage(bgFull); + imageView.setImage(Sprites.getBg()); setCycleDuration(duration); setInterpolator(Interpolator.DISCRETE); @@ -27,6 +26,7 @@ public class BGAnimation extends Transition { @Override protected void interpolate(double frac) { + imageView.setImage(Sprites.getBg()); if(index == lastIndex) { index = 0; imageView.setX(0); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java index 0252665..dd2d860 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java @@ -157,6 +157,9 @@ public class ChatApp extends Application { this.setGameC(gameController); gameC.setClient(cModel); gameC.setGameStateModel(GameController.getGameStateModel()); + Sprites.setDaySprites(GameController.getGameStateModel().getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); + SpritesDay.setBells(); + SpritesDay.setWheels(); try { URL chatResource = ChatApp.class.getResource("chat/ChatView.fxml"); URL gameResource = ChatApp.class.getResource("game/GameDayAll.fxml"); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java index 1a0a399..fb92397 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java @@ -68,10 +68,14 @@ public class GameStateModel { * @param yourRole the role to set this role to */ public void setYourRole(String yourRole) { - if(yourRole.equals("h") || yourRole.equals("g") || yourRole.equals("s")) { - this.yourRole = yourRole; - } else { - this.yourRole = "h"; + try { + if (yourRole.equals("h") || yourRole.equals("g") || yourRole.equals("s")) { + this.yourRole = yourRole; + } else { + this.yourRole = "h"; + } + } catch (Exception e) { + LOGGER.warn("YourRole:" + e.getMessage()); } } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java index 0f2ac83..aca4fd5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java @@ -4,6 +4,7 @@ import static javafx.scene.AccessibleRole.PARENT; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ChatApp; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.GameStateModel; +import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.Sprites; import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.GuiParameters; import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel; @@ -37,24 +38,10 @@ public class GameController implements Initializable { private static GameStateModel gameStateModel; - Image[] bells = new Image[17]; + Image[] bells = Sprites.getBells(); public GameController() { super(); - try { - for (int i = 1; i <= 17; i++) { - String url; - if (i < 10) { - url = - "ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Bell/Image000" + i + ".png"; - } else { - url = "ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Bell/Image00" + i + ".png"; - } - bells[i-1] = new Image(url); - } - } catch (Exception e) { - e.printStackTrace(); - } } //TODO(Seraina, Sebi): Same issue as ChatController? do with setters? @@ -139,6 +126,23 @@ public class GameController implements Initializable { @FXML private AnchorPane chatAreaGame; + public void updateGameSprites(){ + Platform.runLater(new Runnable() { + @Override + public void run() { + try{ + room0ImageView.setImage(Sprites.getARoom(0)); + room1ImageView.setImage(Sprites.getARoom(1)); + room2ImageView.setImage(Sprites.getARoom(2)); + room3ImageView.setImage(Sprites.getARoom(3)); + room4ImageView.setImage(Sprites.getARoom(4)); + room5ImageView.setImage(Sprites.getARoom(5)); + } catch (Exception e) { + LOGGER.info(e.getMessage()); + } + } + }); + } public void addToChatArea(Node n) { chatAreaGame.getChildren().add(n); @@ -538,15 +542,6 @@ public class GameController implements Initializable { }); } - /** - * loads the notification Bell from resource - * @return the Image node containing the BellImage - */ - public Image loadBellImage() { - Image bell = new Image("ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/DayOpen/bell.png"); - return bell; - } - /** * Adds an image of a bell on top of button0 */ @@ -561,7 +556,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); + e.printStackTrace(); } } }); @@ -582,7 +577,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); + e.printStackTrace(); } } }); @@ -602,8 +597,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); - ; + e.printStackTrace(); } } }); @@ -623,7 +617,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); + e.printStackTrace(); } } }); @@ -643,7 +637,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); + e.printStackTrace(); } } }); @@ -663,7 +657,7 @@ public class GameController implements Initializable { bell.play(); } } catch (Exception e) { - LOGGER.debug(e.getMessage()); + e.printStackTrace(); } } }); diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room1_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room1_Spectator.png new file mode 100644 index 0000000..a277b59 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room1_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room2_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room2_Spectator.png new file mode 100644 index 0000000..3c623d1 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room2_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room3_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room3_Spectator.png new file mode 100644 index 0000000..5b96f9f Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room3_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room4_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room4_Spectator.png new file mode 100644 index 0000000..f103d62 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room4_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room5_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room5_Spectator.png new file mode 100644 index 0000000..9cbf02d Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room5_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room6_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room6_Spectator.png new file mode 100644 index 0000000..86faa00 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Day/Room6_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room1_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room1_Spectator.png new file mode 100644 index 0000000..a277b59 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room1_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room2_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room2_Spectator.png new file mode 100644 index 0000000..3c623d1 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room2_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room3_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room3_Spectator.png new file mode 100644 index 0000000..5b96f9f Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room3_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room4_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room4_Spectator.png new file mode 100644 index 0000000..f103d62 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room4_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room5_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room5_Spectator.png new file mode 100644 index 0000000..9cbf02d Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room5_Spectator.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room6_Spectator.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room6_Spectator.png new file mode 100644 index 0000000..86faa00 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/Night/Room6_Spectator.png differ