From 6ecf5a66bf04bc2a790ad2f89c80938a06153a73 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Mon, 9 Dec 2024 02:30:15 +0100 Subject: [PATCH] added animation end in playCardNotification --- .../main/java/pp/mdga/client/NotificationSynchronizer.java | 4 ++-- Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f07679eb..7ae04de1 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 @@ -174,11 +174,11 @@ private void handleGame(Notification notification) { } else if (notification instanceof PlayCardNotification n) { if(n.getCard() == BonusCard.TURBO) { guiHandler.turbo(); - app.getModelSynchronize().animationEnd(); } - if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard()); else guiHandler.playCardEnemy(n.getColor(), n.getCard()); + + app.getModelSynchronize().animationEnd(); } else if (notification instanceof PlayerInGameNotification n) { boardHandler.addPlayer(n.getColor(),n.getPiecesList()); guiHandler.addPlayer(n.getColor(),n.getName()); 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 88292f25..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 @@ -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); }