diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java index 41692841..a1df6b46 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -60,7 +60,7 @@ public class MdgaApp extends SimpleApplication { private ServerConnection networkConnection; - private MdgaApp() { + public MdgaApp() { networkConnection = new NetworkSupport(this); this.clientGameLogic = new ClientGameLogic(networkConnection); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java index dcbe16f2..fb838357 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java @@ -63,9 +63,9 @@ public void selectUnready(){ @Override public void selectStart(){ - if(logic.isHost() && logic.getGame().allReady()){ + if(logic.isHost() && logic.getGame().areAllReady()){ logic.send(new StartGameMessage(false)); - } else if(logic.isHost() && !logic.getGame().allReady()) { + } else if(logic.isHost() && !logic.getGame().areAllReady()) { logic.send(new StartGameMessage(true)); } else { LOGGER.log(System.Logger.Level.ERROR, "You are not the host"); diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index 167992c2..2f97e9c9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -145,16 +145,6 @@ public void received(LobbyReadyMessage msg, int from) { return; } } - - this.logic.getGame().setAllReady(true); - if (this.logic.getGame().allReady()) { - this.logic.getServerSender().broadcast(new StartBriefingMessage(this.logic.getGame().getBoard())); - this.initializeGame(); - for (Map.Entry entry : logic.getGame().getBoard().getPlayerData().entrySet()) { - this.logic.getServerSender().broadcast(new PlayerDataMessage(entry.getValue(), entry.getKey())); - } - this.logic.getServerSender().broadcast(new ServerStartGameMessage()); - } } /** diff --git a/Projekte/mdga/model/src/main/resources/mdga.properties b/Projekte/mdga/model/src/main/resources/mdga.properties index e69de29b..0e2c35be 100644 --- a/Projekte/mdga/model/src/main/resources/mdga.properties +++ b/Projekte/mdga/model/src/main/resources/mdga.properties @@ -0,0 +1,18 @@ +incorrect.request.0= +incorrect.request.1= +incorrect.request.2= +incorrect.request.3= +incorrect.request.4= +incorrect.request.5= +incorrect.request.6= +incorrect.request.7= +incorrect.request.8= +incorrect.request.9= +incorrect.request.10= +incorrect.request.11= +incorrect.request.12= +incorrect.request.13= +incorrect.request.14= + + + diff --git a/Projekte/mdga/model/src/main/resources/mdga_de.properties b/Projekte/mdga/model/src/main/resources/mdga_de.properties index e69de29b..cdad81cc 100644 --- a/Projekte/mdga/model/src/main/resources/mdga_de.properties +++ b/Projekte/mdga/model/src/main/resources/mdga_de.properties @@ -0,0 +1,14 @@ +incorrect.request.1=Die ausgewählte TSK ist bereits belegt. +incorrect.request.2=Es gibt keine freie TSK mehr, welche ausgewählt werden kann. +incorrect.request.3= +incorrect.request.4= +incorrect.request.5= +incorrect.request.6= +incorrect.request.7= +incorrect.request.8= +incorrect.request.9= +incorrect.request.10= +incorrect.request.11= +incorrect.request.12= +incorrect.request.13= +incorrect.request.14=