From d6e44c2d29ec18c3dc5d65d3f9cc0c3ea7fcb1d0 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Sun, 8 Dec 2024 16:44:28 +0100 Subject: [PATCH] added logger --- .../mdga/client/gamestate/AnimationState.java | 1 - .../gamestate/DetermineStartPlayerState.java | 1 + .../mdga/client/gamestate/SpectatorState.java | 1 - .../pp/mdga/client/gamestate/TurnState.java | 1 + .../gamestate/turnstate/ChoosePieceState.java | 1 + .../gamestate/turnstate/PowerCardState.java | 2 + .../src/main/java/pp/mdga/game/Node.java | 20 ++++---- .../game/turn/choosepiece/NoPieceState.java | 1 - .../turn/choosepiece/SelectPieceState.java | 46 +++++++++++-------- 9 files changed, 43 insertions(+), 31 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java index 33d266cb..7f006cbc 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java @@ -18,7 +18,6 @@ public AnimationState(ClientState parent, ClientGameLogic logic) { @Override public void enter() { - LOGGER.log(System.Logger.Level.INFO, "Entering AnimationState"); } @Override diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java index 95e77f4f..c749ffbc 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java @@ -55,6 +55,7 @@ public void exit() { } public void setState(DetermineStartPlayerStates state) { + System.out.println("CLIENT STATE old: " + this.state + " new: " + state); if(this.state != null){ this.state.exit(); } 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 1b999ef8..fa3a2239 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 @@ -21,7 +21,6 @@ public SpectatorState(ClientState parent, ClientGameLogic logic) { @Override public void enter() { - } @Override diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java index fddbb07e..03a9b4ff 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java @@ -40,6 +40,7 @@ public void exit() { } public void setState(TurnStates state){ + System.out.println("CLIENT STATE old: " + this.state + " new: " + state); if(this.state != null){ this.state.exit(); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java index 71fce397..57b7f257 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java @@ -34,6 +34,7 @@ public void exit() { } public void setState(ChoosePieceStates state){ + System.out.println("CLIENT STATE old: " + this.currentState + " new: " + state); if(currentState != null){ currentState.exit(); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java index 1a8a05a7..d4892549 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java @@ -40,6 +40,8 @@ public void exit() { } public void setState(PowerCardStates state) { + System.out.println("CLIENT STATE old: " + this.state + " new: " + state); + if(this.state != null){ this.state.exit(); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java index 23a58ccb..c9482b30 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java @@ -57,15 +57,17 @@ public void setOccupant(Piece occupant) { * @return the old occupant of the node */ public Piece moveOccupant(Piece newOccupant) { - if (occupant == null) { - setOccupant(newOccupant); - return null; - } else { - occupant.setShield(ShieldState.NONE); - occupant.setState(PieceState.WAITING); - setOccupant(newOccupant); - return occupant; - } + throw new RuntimeException("BÖSE METHODE !!!!"); + +// if (occupant == null) { +// setOccupant(newOccupant); +// return null; +// } else { +// occupant.setShield(ShieldState.NONE); +// occupant.setState(PieceState.WAITING); +// setOccupant(newOccupant); +// return occupant; +// } } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java index 9ba29805..f32446d0 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java @@ -64,7 +64,6 @@ private void checkSelectPiece(Player activePlayer){ } else { this.choosePieceAutomaton.getSelectPieceState().setMoveablePieces(moveablePieces); this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getSelectPieceState()); - } } 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 d8e68b7e..bbc69c26 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 @@ -1,5 +1,6 @@ package pp.mdga.server.automaton.game.turn.choosepiece; +import pp.mdga.game.Node; import pp.mdga.game.Piece; import pp.mdga.game.PieceState; import pp.mdga.game.ShieldState; @@ -57,26 +58,33 @@ public void enter() { @Override public void received(RequestMoveMessage msg, int from){ - if (moveablePieces.contains(msg.getPiece())) { - int indexOfPiece = moveablePieces.indexOf(msg.getPiece()); - logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(moveablePieces.get(indexOfPiece))].clearOccupant(); - if (isHomeMove.get(indexOfPiece)) { - logic.getGame().getPlayerByColor(msg.getPiece().getColor()).setPieceInHome(targetIndex.get(indexOfPiece), logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid())); - if (logic.getGame().getPlayerByColor(msg.getPiece().getColor()).isHomeFinished(logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()))) { - logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setState(PieceState.HOMEFINISHED); - } else { - logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setState(PieceState.HOME); - } - logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setShield(ShieldState.NONE); - } else { - Piece occ = logic.getGame().getBoard().getInfield()[targetIndex.get(indexOfPiece)].moveOccupant(moveablePieces.get(indexOfPiece)); - if (occ != null) { - logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ); - } - } - logic.getServerSender().broadcast(new MoveMessage(moveablePieces.get(indexOfPiece), isHomeMove.get(indexOfPiece), targetIndex.get(indexOfPiece))); - this.choosePieceAutomaton.getTurnAutomaton().setCurrentState(this.choosePieceAutomaton.getTurnAutomaton().getMovePieceState()); + if(!moveablePieces.contains(msg.getPiece())){ + throw new RuntimeException("invalid Piece"); } + + int indexOfPiece = moveablePieces.indexOf(msg.getPiece()); + logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(moveablePieces.get(indexOfPiece))].clearOccupant(); + if (isHomeMove.get(indexOfPiece)) { + logic.getGame().getPlayerByColor(msg.getPiece().getColor()).setPieceInHome(targetIndex.get(indexOfPiece), logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid())); + if (logic.getGame().getPlayerByColor(msg.getPiece().getColor()).isHomeFinished(logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()))) { + logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setState(PieceState.HOMEFINISHED); + } else { + logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setState(PieceState.HOME); + } + logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid()).setShield(ShieldState.NONE); + } else { + Node targetNode = logic.getGame().getBoard().getInfield()[targetIndex.get(indexOfPiece)]; + Piece occ = targetNode.getOccupant(); +// Piece occ = logic.getGame().getBoard().getInfield()[targetIndex.get(indexOfPiece)].moveOccupant(moveablePieces.get(indexOfPiece)); + if (occ != null) { + logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ); + } + + targetNode.setOccupant(msg.getPiece()); + } + logic.getServerSender().broadcast(new MoveMessage(moveablePieces.get(indexOfPiece), isHomeMove.get(indexOfPiece), targetIndex.get(indexOfPiece))); + this.choosePieceAutomaton.getTurnAutomaton().setCurrentState(this.choosePieceAutomaton.getTurnAutomaton().getMovePieceState()); + } /**