From be8d4b2d6e5c6f59dec9bfaa0d5752eefccaf518 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Mon, 9 Dec 2024 03:39:24 +0100 Subject: [PATCH] made turbo flag work with only one flag --- .../src/main/java/pp/mdga/client/gamestate/GameStates.java | 1 + .../main/java/pp/mdga/client/gamestate/SpectatorState.java | 1 + .../main/java/pp/mdga/client/gamestate/WaitingState.java | 1 + .../pp/mdga/client/gamestate/turnstate/RollDiceState.java | 7 ------- .../gamestate/turnstate/choosepiecestate/NoPieceState.java | 1 + .../turnstate/choosepiecestate/SelectPieceState.java | 2 +- .../turnstate/choosepiecestate/StartPieceState.java | 2 +- .../turnstate/choosepiecestate/WaitingPieceState.java | 2 +- 8 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java index 98165adc..ccc1734b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java @@ -27,6 +27,7 @@ public GameStates(ClientState parent, ClientGameLogic logic) { protected void handlePowerCard(PlayCardMessage msg) { if (msg.getCard().getCard().equals(BonusCard.TURBO)) { + logic.getGame().setTurboFlag(true); logic.getGame().setDiceModifier(msg.getDiceModifier()); } else if (msg.getCard().getCard().equals(BonusCard.SHIELD)) { handleShield(msg.getPieces().get(0).getUuid()); diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java index 39602bed..d0ae32c9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java @@ -94,6 +94,7 @@ public void received(MoveMessage msg) { //set new node logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece); } + logic.getGame().setTurboFlag(false); parent.setState(parent.getAnimation()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java index dbb95455..e849048b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java @@ -111,6 +111,7 @@ public void received(MoveMessage msg) { //set new node logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece); } + logic.getGame().setTurboFlag(false); parent.setState(parent.getAnimation()); } } 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 f2820fbd..19c631ef 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 @@ -24,13 +24,6 @@ public RollDiceState(ClientState parent, ClientGameLogic logic) { @Override public void enter() { logic.addNotification(new DiceNowNotification()); - if (logic.getGame().getTurboFlag()){ - if (parent.isCanChangeTurbo()){ - logic.getGame().setTurboFlag(false); - } else { - parent.setCanChangeTurbo(true); - } - } } @Override diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java index cad3dc6f..f43beea9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java @@ -72,6 +72,7 @@ public void received(StartPieceMessage msg){ @Override public void received(NoTurnMessage msg){ + logic.getGame().setTurboFlag(false); parent.getParent().getParent().setState(parent.getParent().getParent().getWaiting()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java index 1ff2824b..b85899b5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java @@ -71,7 +71,7 @@ public void received(MoveMessage msg) { //set new node logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece); } - + logic.getGame().setTurboFlag(false); parent.getParent().setState(parent.getParent().getMovePiece()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java index 7f601630..9594e356 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java @@ -65,7 +65,7 @@ public void received(MoveMessage msg){ targetNode.setOccupant(msg.getPiece()); logic.addNotification(new MovePieceNotification(msg.getPiece().getUuid(), oldIndex, targetIndex)); - + logic.getGame().setTurboFlag(false); parent.getParent().setState(parent.getParent().getMovePiece()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java index 86bcc509..b7c43fa0 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java @@ -49,7 +49,7 @@ public void received(MoveMessage msg){ logic.addNotification(new MovePieceNotification(pieceToMove.getUuid(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true)); logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(msg.getPiece()); - + logic.getGame().setTurboFlag(false); pieceToMove.setState(PieceState.ACTIVE); parent.getParent().setState(parent.getParent().getMovePiece()); }