From 5a9f7a8118e0f89e482487d1b4d4dfa1122cd09e Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Fri, 6 Dec 2024 18:45:14 +0100 Subject: [PATCH] added AnimationEndMessages to 'RollDiceState', 'MovePieceState' and 'PlayPowerCardState' --- .../pp/mdga/client/gamestate/turnstate/MovePieceState.java | 2 +- .../mdga/client/gamestate/turnstate/PlayPowerCardState.java | 2 +- .../pp/mdga/client/gamestate/turnstate/RollDiceState.java | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java index 8a098dbb..22da0555 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java @@ -46,7 +46,7 @@ public void received(SpectatorMessage msg){ } @Override - public void received(DiceAgainMessage msg){ + public void received(DiceNowMessage msg){ parent.setState(parent.getRollDice()); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java index 5f95a2ca..1ecae283 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java @@ -35,7 +35,7 @@ public void setPlayCard(PlayCardMessage playCardMessage) { @Override public void selectAnimationEnd(){ - parent.setState(parent.getRollDice()); logic.send(new AnimationEndMessage()); + parent.setState(parent.getRollDice()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java index e94d1783..9b160ec2 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java @@ -3,6 +3,7 @@ import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; import pp.mdga.client.gamestate.TurnState; +import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.client.RequestDieMessage; import pp.mdga.message.server.DieMessage; import pp.mdga.message.server.NoTurnMessage; @@ -43,6 +44,11 @@ public void received(DieMessage msg){ logic.addNotification(new RollDiceNotification(logic.getGame().getPlayerById(logic.getOwnPlayerId()).getColor(), msg.getDiceEye(),false)); } + @Override + public void selectAnimationEnd(){ + logic.send(new AnimationEndMessage()); + } + // @Override // public void received(ChoosePieceStateMessage msg){ // parent.setState(parent.getChoosePiece());