diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java index 14bd71b..b5f3f40 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java @@ -95,7 +95,7 @@ public class Game implements Runnable { passenger.send(GuiParameters.updateGameState, getGame()); } try { - Thread.sleep(2000); //TODO: Is this a good intervall? + Thread.sleep(1000); //TODO: Is this a good intervall? } catch (InterruptedException e) { e.printStackTrace(); } @@ -120,7 +120,7 @@ public class Game implements Runnable { Passenger[] passengerTrain = gameState.getPassengerTrain(); - LOGGER.info(gameState.toString()); + LOGGER.info(gameState.toGhostString()); for (ClientHandler client : lobbyClients) {//begins filling the train with clients int index = order[i]; if (passengerTrain[index].getIsGhost()) { //if there is a ghost @@ -146,7 +146,7 @@ public class Game implements Runnable { } i++; } - LOGGER.info(gameState.toString()); + LOGGER.info(gameState.toGhostString()); gameStateModelUpdater(); //TODO: does that work? for(Passenger passenger : gameState.getPassengerTrain()) { passenger.send(Protocol.positionOfClient + "$" + passenger.getPosition(), this); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/GameState.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/GameState.java index f93005c..0d524f2 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/GameState.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/GameState.java @@ -157,7 +157,7 @@ public class GameState { * where one can see who is a ghost and who is a human, who is a player and who an NPC * @return a String that displays passengerTrain */ - public String toString() { + public String toGhostString() { Passenger[] array = passengerTrain; StringBuilder stringBuilder = new StringBuilder(); String[] print = new String[6]; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/ServerGameInfoHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/ServerGameInfoHandler.java index 9c2cccd..05535c7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/ServerGameInfoHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/ServerGameInfoHandler.java @@ -67,7 +67,7 @@ public class ServerGameInfoHandler { msg = Protocol.printToClientConsole + "$Humans are voting"; break; case GuiParameters.updateGameState: - msg = Protocol.printToGUI + "$" + GuiParameters.updateGameState + game.getGameState().toString(); + msg = Protocol.printToGUI + "$" + GuiParameters.updateGameState + game.getGameState().toGhostString(); break; default: if(!msg.contains("$")) { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java index e7a7a0a..b12b960 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java @@ -78,7 +78,7 @@ public class VoteHandler { if (!passengers[newGhostPosition].getIsSpectator()) { passengers[newGhostPosition].send( ClientGameInfoHandler.youGotGhostyfied, game); - passengers[newGhostPosition].send(game.gameState.toString(), game); + passengers[newGhostPosition].send(GuiParameters.updateGameState, game); } /* notify passengers the ghosts passed by - for each ghost that ghostified a player, an instance of NoiseHandler diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/GhostPlayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/GhostPlayer.java index 5e7a66e..271ea9d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/GhostPlayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/GhostPlayer.java @@ -47,7 +47,7 @@ public class GhostPlayer extends Ghost { public void send(String msg, Game game) { String formattedMsg; if (msg.equals(GuiParameters.updateGameState)) { - formattedMsg = Protocol.printToGUI + "$" + GuiParameters.updateGameState + game.getGameState().toString(); + formattedMsg = Protocol.printToGUI + "$" + GuiParameters.updateGameState + game.getGameState().toGhostString(); } else { formattedMsg = ServerGameInfoHandler.format(msg, this, game); } 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 3996abf..e3641d1 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 @@ -101,11 +101,17 @@ public class GameStateModel { } public String getYourRoleFromPosition(int position) { - return passengerTrainClone[1][position]; + try { + return passengerTrainClone[1][position]; + } catch (Exception e) { + LOGGER.info(e.getMessage()); + } + return ""; } public int getNrOfPlayers() { - return nrOfPlayers; + return + nrOfPlayers; } public void setDayClone(boolean dayClone) { 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 31d1c4b..96080f9 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 @@ -396,11 +396,21 @@ public class GameController implements Initializable { } public void setNoiseButtonInvisible() { - noiseButton.setVisible(false); + Platform.runLater(new Runnable() { + @Override + public void run() { + noiseButton.setVisible(false); + } + }); } public void setNoiseButtonVisible() { - noiseButton.setVisible(true); + Platform.runLater(new Runnable() { + @Override + public void run() { + noiseButton.setVisible(true); + } + }); } /** diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css index 6d10800..df006ca 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css @@ -18,10 +18,11 @@ -.text-field{ +.textField{ -fx-text-fill: white; -fx-background-color: transparent; -fx-effect: null; + -fx-highlight-text-fill: black; -fx-animated: null; }