From daa7d31bdddc1bc5b310ab8e0563064ff07cd964 Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Mon, 9 Dec 2024 01:42:59 +0100
Subject: [PATCH] working on shield

---
 .../turnstate/powercardstate/ChoosePowerCardState.java      | 3 +++
 Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java    | 4 ++--
 .../java/pp/mdga/message/client/RequestPlayCardMessage.java | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java
index 1a90cda8..acf023bf 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java
@@ -4,6 +4,7 @@
 import pp.mdga.client.ClientState;
 import pp.mdga.client.gamestate.turnstate.PowerCardState;
 import pp.mdga.game.BonusCard;
+import pp.mdga.game.Piece;
 import pp.mdga.game.card.*;
 import pp.mdga.message.client.NoPowerCardMessage;
 import pp.mdga.message.client.SelectCardMessage;
@@ -12,6 +13,7 @@
 import pp.mdga.message.server.PossibleCardsMessage;
 import pp.mdga.message.server.PossiblePieceMessage;
 import pp.mdga.notification.SelectableCardsNotification;
+import pp.mdga.notification.SelectableShieldNotification;
 
 import java.util.ArrayList;
 import java.util.stream.Collectors;
@@ -108,6 +110,7 @@ public void received(PossiblePieceMessage msg){
         if (msg.getEnemyPossiblePieces().isEmpty()){
             parent.getShield().setPossiblePieces(msg.getOwnPossiblePieces().stream().map(piece -> logic.getGame().getPieceThroughUUID(piece.getUuid())).collect(Collectors.toCollection(ArrayList::new)));
             parent.setState(parent.getShield());
+            logic.addNotification(new SelectableShieldNotification(msg.getOwnPossiblePieces().stream().map(Piece::getUuid).toList()));
         } else {
             System.out.println("Should enter Swap State");
             parent.getSwap().setPossibleOwnPieces(msg.getOwnPossiblePieces().stream().map(piece -> logic.getGame().getPieceThroughUUID(piece.getUuid())).collect(Collectors.toCollection(ArrayList::new)));
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 eaa43c13..c7859758 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
@@ -93,8 +93,8 @@ public Game() {
      */
     private void initializeDrawPile() {
 //        this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
-        this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
-//        this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
+//        this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
+        this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
         Collections.shuffle(this.drawPile);
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java
index f9cc057b..f97f2fee 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java
@@ -41,9 +41,9 @@ public RequestPlayCardMessage(BonusCard card, UUID ownPieceIdentifier, UUID enem
      * Default constructor for serialization purposes.
      */
     private RequestPlayCardMessage() {
-        card = null;
-        ownPieceIdentifier = null;
-        enemyPieceIdentifier = null;
+        card = BonusCard.HIDDEN;
+        ownPieceIdentifier = UUID.randomUUID();
+        enemyPieceIdentifier = UUID.randomUUID();
     }
 
     /**