From 421231aa12779cfe4b6a96cee97dbfca2ac0b6e0 Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Thu, 5 Dec 2024 22:46:48 +0100 Subject: [PATCH] made BonusCard Serializable and added the method calls to display handcards during the intro --- .../src/main/java/pp/mdga/client/server/MdgaServer.java | 1 + .../client/gamestate/determinestartplayerstate/Intro.java | 6 ++++-- .../mdga/model/src/main/java/pp/mdga/game/BonusCard.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java index 28e9d6e5..19c517e5 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java @@ -149,6 +149,7 @@ private void initializeSerializables() { Serializer.registerClass(Color.class, new EnumSerializer()); Serializer.registerClass(PieceState.class, new EnumSerializer()); Serializer.registerClass(ShieldState.class, new EnumSerializer()); + Serializer.registerClass(BonusCard.class, new EnumSerializer()); } private void registerListeners() { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java index f9873e16..963f5d5b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java @@ -5,7 +5,9 @@ import pp.mdga.client.gamestate.DetermineStartPlayerState; import pp.mdga.game.Player; import pp.mdga.message.client.AnimationEndMessage; +import pp.mdga.notification.AcquireCardNotification; import pp.mdga.notification.ActivePlayerNotification; +import pp.mdga.notification.DrawCardNotification; import pp.mdga.notification.MovePieceNotification; import java.util.Map; @@ -47,9 +49,9 @@ public void enter() { logic.getGame().getBoard().getInfield()[entry.getValue().getStartNodeIndex()].setOccupant(entry.getValue().getPieces()[0]); animationCounter++; if(entry.getKey() == logic.getOwnPlayerId()){ - //logic.addNotification(new AcquireCardNotification(entry.getValue().getHandCards().get(0))); + logic.addNotification(new AcquireCardNotification(entry.getValue().getHandCards().get(0))); } else { - //logic.addNotification(new DrawCardNotification(entry.getValue().getColor(), entry.getValue().getHandCards().get(0))); + logic.addNotification(new DrawCardNotification(entry.getValue().getColor(), entry.getValue().getHandCards().get(0))); } } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java index cce4fd98..0a4d408e 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java @@ -1,8 +1,11 @@ package pp.mdga.game; +import com.jme3.network.serializing.Serializable; + /** * Enum representing the different types of bonus cards. */ +@Serializable public enum BonusCard { /** * The hidden bonus card.