Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development

Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyState.java

@@ -18,7 +18,7 @@ public CeremonyState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        currentState = podiumState;
+        setState(podiumState);
         logic.addNotification(createCeremonyNotification());
     }
 
@@ -28,7 +28,9 @@ public void exit() {
     }
 
     public void setState(CeremonyStates state){
+        if(this.currentState != null){
             this.currentState.exit();
+        }
         state.enter();
         currentState = state;
     }

Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java

@@ -30,13 +30,15 @@ public void exit(){
 
     @Override
     public void enter(){
-        currentState = startDialogState;
+        setState(startDialogState);
         ownPlayerID = 0;
         ownPlayerName = null;
     }
 
     public void setState(DialogStates newState){
+        if(currentState != null){
             currentState.exit();
+        }
         newState.enter();
         currentState = newState;
     }
@@ -69,11 +71,6 @@ public StartDialogState getStartDialog() {
         return startDialogState;
     }
 
-    public void startGame(){
-        exit();
-        logic.setState(logic.getGameState());
-    }
-
     @Override
     public void selectLeave(){
         currentState.selectLeave();

Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java

@@ -27,7 +27,6 @@ public class GameState extends ClientState {
      */
     public GameState(ClientState parent, ClientGameLogic logic) {
         super(parent, logic);
-        state = determineStartPlayerState;
     }
 
     /**
@@ -35,7 +34,7 @@ public GameState(ClientState parent, ClientGameLogic logic) {
      */
     @Override
     public void enter() {
-
+        this.setState(this.determineStartPlayerState);
     }
 
     /**
@@ -52,8 +51,10 @@ public void exit() {
      * @param newState the state to be set
      */
     public void setState(GameStates newState){
-        state.exit();
+        if(this.state != null){
-        state.enter();
+            this.state.exit();
+        }
+        newState.enter();
         state = newState;
     }
 

Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java

@@ -95,7 +95,7 @@ public void received(ServerStartGameMessage msg){
             }
             logic.addNotification(new PlayerInGameNotification(entry.getKey(), pieceList , logic.getGame().getPlayerByColor(entry.getKey()).getName()));
         }
-        parent.startGame();
+        logic.setState(logic.getGameState());
     }
 
     @Override

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayerState.java

@@ -34,7 +34,9 @@ public void exit() {
     }
 
     public void setState(DetermineStartPlayerStates state) {
+        if(this.state != null){
             this.state.exit();
+        }
         state.enter();
         this.state = state;
     }

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/TurnState.java

@@ -31,7 +31,7 @@ public TurnState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        state = powerCardState;
+        this.setState(this.powerCardState);
     }
 
     @Override
@@ -40,7 +40,9 @@ public void exit() {
     }
 
     public void setState(TurnStates state){
+        if(this.state != null){
             this.state.exit();
+        }
         state.enter();
         this.state = state;
     }

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDiceState.java

@@ -6,6 +6,7 @@
 import pp.mdga.message.client.RequestDieMessage;
 import pp.mdga.message.server.DieMessage;
 import pp.mdga.notification.DiceNowNotification;
+import pp.mdga.notification.RollDiceNotification;
 
 public class RollRankingDiceState extends DetermineStartPlayerStates {
 
@@ -23,16 +24,17 @@ public void enter() {
 
     @Override
     public void exit() {
-
     }
 
     @Override
     public void selectDice(){
+        System.out.println("selectDice");
         logic.send(new RequestDieMessage());
     }
 
     @Override
     public void received(DieMessage msg){
+        logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getDialogs().getOwnPlayerId()).getColor(), msg.getDiceEye(),true));
         parent.setState(parent.getWaitRanking());
     }
 }

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/ChoosePieceState.java

@@ -24,7 +24,7 @@ public ChoosePieceState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        currentState = noPieceState;
+        this.setState(this.noPieceState);
     }
 
     @Override
@@ -34,9 +34,11 @@ public void exit() {
     }
 
     public void setState(ChoosePieceStates state){
+        if(currentState != null){
             currentState.exit();
+        }
+        state.enter();
         currentState = state;
-        currentState.enter();
     }
 
     @Override

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PowerCardState.java

@@ -31,7 +31,7 @@ public PowerCardState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        state = choosePowerCardState;
+        this.setState(this.choosePowerCardState);
     }
 
     public void exit() {
@@ -40,7 +40,9 @@ public void exit() {
     }
 
     public void setState(PowerCardStates state) {
+        if(this.state != null){
             this.state.exit();
+        }
         state.enter();
         this.state = state;
     }