From a86a1460912739ba050385004f8dbb5e41c784a7 Mon Sep 17 00:00:00 2001 From: Benjamin Feyer Date: Tue, 10 Dec 2024 11:52:05 +0100 Subject: [PATCH] added logger for swap-card --- .../turnstate/powercardstate/SwapState.java | 1 + .../src/main/java/pp/mdga/game/Game.java | 2 +- .../pp/mdga/server/automaton/LobbyState.java | 31 +++++++++++++++++++ .../game/turn/powercard/SwapCardState.java | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java index 8ee5b4c3..9b9754aa 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java @@ -65,6 +65,7 @@ public void selectPiece(Piece piece){ ArrayList temp = new ArrayList<>(); temp.add(selectedOwnPiece); temp.add(selectedEnemyPiece); + System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1)); logic.send(new SelectedPiecesMessage(temp)); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index 1a151a0f..f80de30d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -87,7 +87,7 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(1,4); + die = new Die(1,4,5); } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index d0c2995c..4b5988ca 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -87,6 +87,37 @@ public void initializeGame() { player.addHandCard(new SwapCard()); player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + + + + + + + + + Piece piece = player.getPieces()[0]; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/SwapCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/SwapCardState.java index ab297dc8..aa8e09cf 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/SwapCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/powercard/SwapCardState.java @@ -58,6 +58,7 @@ public void received(SelectedPiecesMessage msg, int from) { if (msg.getPieces().size() == 2) { Piece selOwn = msg.getPieces().get(0); Piece selEnemy = msg.getPieces().get(1); + System.out.println("Server: Swapcard: ownPiece: "+selOwn+ " enemyPiece: "+selEnemy); List ownPieces = this.powerCardAutomaton.getVisitor().getSwapOwnPieces(); List enemyPieces = this.powerCardAutomaton.getVisitor().getSwapOtherPieces();