From dfd361d8be3f5849745469f2ee85ff0af14a9bc9 Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Mon, 9 Dec 2024 14:14:15 +0100
Subject: [PATCH] added isStart + (DU)

---
 .../src/main/java/pp/mdga/client/gui/PlayerNameHandler.java | 2 +-
 .../src/main/java/pp/mdga/client/gamestate/GameStates.java  | 6 +++++-
 Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java    | 4 ++--
 Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java    | 4 ++++
 .../mdga/model/src/main/java/pp/mdga/game/StartNode.java    | 5 +++++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
index 014c00a9..083319e6 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
@@ -128,7 +128,7 @@ private BitmapText createName(String name, boolean first, boolean own){
         //renderedSize = 45
         hudText.setSize(TEXT_SIZE);
         hudText.setColor(first ? ACTIVE_COLOR : own ? OWN_COLOR : NORMAL_COLOR);
-        hudText.setText(name);
+        hudText.setText(own ? name + " (Du)" : name);
         hudText.setLocalTranslation(PADDING_LEFT,hudText.getHeight()/2, 0);
         return hudText;
     }
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 ccc1734b..049820b0 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
@@ -47,8 +47,12 @@ protected void throwPiece(Piece piece) {
     }
 
     private void handleShield(UUID uuid) {
-        if (logic.getGame().getBoard().getInfieldIndexOfPiece(logic.getGame().getPieceThroughUUID(uuid)) % 10 != 0) {
+        Board board = logic.getGame().getBoard();
+        Piece piece = logic.getGame().getPieceThroughUUID(uuid);
+        Node node =  board.getInfield()[board.getInfieldIndexOfPiece(piece)];
+        if (node.isStart()) {
             logic.getGame().getPieceThroughUUID(uuid).setShield(ShieldState.SUPPRESSED);
+            logic.addNotification(new ShieldActiveNotification(uuid));
             logic.addNotification(new ShieldSuppressedNotification(uuid));
         } else {
             logic.getGame().getPieceThroughUUID(uuid).setShield(ShieldState.ACTIVE);
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 e7e06348..5e297189 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
@@ -95,8 +95,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/game/Node.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java
index 0dc1d98a..a06df7f7 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
@@ -99,4 +99,8 @@ public boolean isOccupied() {
     public boolean isOccupied(Color color) {
         return isOccupied() && this.occupant.getColor() == color;
     }
+
+    public boolean isStart() {
+        return false;
+    }
 }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java
index 0033738f..5a62eaba 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java
@@ -47,4 +47,9 @@ public Color getColor() {
     public void setColor(Color color) {
         this.color = color;
     }
+
+    @Override
+    public boolean isStart() {
+        return true;
+    }
 }