From 82aa9f6a5154a92f44c7bce41a0514e8e46d9d86 Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Sat, 14 Dec 2024 10:13:46 +0100 Subject: [PATCH] fixed double copunting of played cards and now calculating correct travled nodes --- .../mdga/server/automaton/game/turn/PlayPowerCardState.java | 4 ++-- .../automaton/game/turn/choosepiece/SelectPieceState.java | 4 ++-- .../automaton/game/turn/choosepiece/StartPieceState.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PlayPowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PlayPowerCardState.java index d0cc6a23..f123b47d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PlayPowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PlayPowerCardState.java @@ -55,11 +55,11 @@ public void exit() { */ @Override public void received(AnimationEndMessage msg, int from) { - logic.getGame().getActivePlayer().getPlayerStatistic().increaseCardsPlayed(); - logic.getGame().getGameStatistics().increaseCardsPlayed(); this.messageReceived.add(from); if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) { this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage()); + logic.getGame().getActivePlayer().getPlayerStatistic().increaseCardsPlayed(); + logic.getGame().getGameStatistics().increaseCardsPlayed(); this.turnAutomaton.setCurrentState(this.turnAutomaton.getRollDiceState()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java index 7d3f3116..01781652 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java @@ -67,8 +67,8 @@ public void received(RequestMoveMessage msg, int from) { int indexOfPiece = moveablePieces.indexOf(msg.getPiece()); int steps = logic.getGame().getDiceModifier() * logic.getGame().getDiceEyes(); Piece piece = moveablePieces.get(indexOfPiece); - logic.getGame().getActivePlayer().getPlayerStatistic().increaseTraveledNodes(calculateTargetIndex(piece)); - logic.getGame().getGameStatistics().increaseTraveledNodes(calculateTargetIndex(piece)); + logic.getGame().getActivePlayer().getPlayerStatistic().increaseTraveledNodes(logic.getGame().getDiceEyes() * logic.getGame().getDiceModifier()); + logic.getGame().getGameStatistics().increaseTraveledNodes(logic.getGame().getDiceEyes() * logic.getGame().getDiceModifier()); if (canPieceMoveInHome(piece, steps)) { if (piece.getState().equals(PieceState.HOME)) { //gets the oldNode diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java index 719b5c9a..5e5e1a38 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java @@ -47,8 +47,8 @@ public void received(RequestMoveMessage msg, int from) { if (piece.equals(msg.getPiece())) { int targetIndex = calculateTargetIndex(piece); Node targetNode = logic.getGame().getBoard().getInfield()[targetIndex]; - logic.getGame().getActivePlayer().getPlayerStatistic().increaseTraveledNodes(calculateTargetIndex(piece)); - logic.getGame().getGameStatistics().increaseTraveledNodes(calculateTargetIndex(piece)); + logic.getGame().getActivePlayer().getPlayerStatistic().increaseTraveledNodes(logic.getGame().getDiceEyes() * logic.getGame().getDiceModifier()); + logic.getGame().getGameStatistics().increaseTraveledNodes(logic.getGame().getDiceEyes() * logic.getGame().getDiceModifier()); //send MoveMessage logic.getServerSender().broadcast(new MoveMessage(piece, false, targetIndex));