diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java index c90838de..a51e0f9b 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java @@ -172,8 +172,8 @@ private void handleGame(Notification notification) { } else if (notification instanceof ThrowPieceNotification n) { boardHandler.throwPiece(n.getPieceId(), n.getThrowColor()); waitForAnimation = true; - } else if (notification instanceof NoShieldNotification n) { - boardHandler.unshieldPiece(n.getPieceId()); + } else if (notification instanceof RemoveShieldNotification n) { + boardHandler.unshieldPiece(n.getPieceUuid()); } else if (notification instanceof PlayCardNotification n) { if(n.getCard() == BonusCard.TURBO) { guiHandler.turbo(); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index 0cb0c76a..04d0e5bb 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -529,7 +529,6 @@ private void throwPiece(UUID uuid){ * @param uuid the UUID of the piece to shield */ public void shieldPiece(UUID uuid){ - pieces.get(uuid).activateShield(); } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java index 87da54ee..8db0b9b1 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java @@ -113,6 +113,7 @@ public Vector3f getLocation(){ protected void controlUpdate(float delta) { if(shieldRing != null){ shieldRing.rotate(0, 0, delta * SHIELD_SPEED); + shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0,0,SHIELD_Z))); } } 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 acf023bf..17b57254 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 @@ -87,6 +87,7 @@ public void selectCard(BonusCard card){ @Override public void received(PlayCardMessage msg){ if(msg.getCard().getCard().equals(BonusCard.TURBO)){ + logic.getGame().setDiceModifier(msg.getDiceModifier()); parent.getParent().getPlayPowerCard().setPlayCard(msg); parent.getParent().setState(parent.getParent().getPlayPowerCard()); } 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 c7859758..88292f25 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 @@ -92,9 +92,9 @@ public Game() { * This method initializes the draw pile with the predefined number of bonus cards. */ private void initializeDrawPile() { -// this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS); + 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 ShieldCard(), AMOUNT_OF_SHIELD_CARDS); Collections.shuffle(this.drawPile); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java deleted file mode 100644 index 8c7fa970..00000000 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java +++ /dev/null @@ -1,29 +0,0 @@ -package pp.mdga.notification; - -import java.util.UUID; - -/** - * Notification that a piece has no shield. - */ -public class NoShieldNotification extends Notification{ - /** - * The id of the piece that has no shield. - */ - private final UUID pieceId; - - /** - * Constructor. - * @param pieceId the id of the piece that has no shield. - */ - public NoShieldNotification(UUID pieceId) { - this.pieceId = pieceId; - } - - /** - * Get the id of the piece that has no shield. - * @return the id of the piece that has no shield. - */ - public UUID getPieceId() { - return pieceId; - } -}