diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java index 0fd2ff4b..6c1852d0 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -70,7 +70,7 @@ public class MdgaApp extends SimpleApplication { private final TimerManager timerManager = new TimerManager(); - public static final int DEBUG_MULTIPLIER = 0; + public static final int DEBUG_MULTIPLIER = 1; public MdgaApp() { networkConnection = new NetworkSupport(this); 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 3b3d03b1..32c3b6ab 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 @@ -120,12 +120,15 @@ private void handleGame(Notification notification) { app.getAcousticHandler().playSound(MdgaSound.BONUS); delay = STANDARD_DELAY; } else if(notification instanceof RankingResponceNotification n) { + guiHandler.hideText(); n.getRankingResults().forEach((c, i) -> { guiHandler.rollRankingResult(c, i); }); + delay = STANDARD_DELAY; } else if (notification instanceof ActivePlayerNotification n) { - gameView.getGuiHandler().setActivePlayer(n.getColor()); + guiHandler.hideText(); boardHandler.hideDice(); + gameView.getGuiHandler().setActivePlayer(n.getColor()); if(n.getColor() != ownColor) boardHandler.showDice(n.getColor()); app.getAcousticHandler().playSound(MdgaSound.UI90); delay = STANDARD_DELAY; @@ -157,6 +160,7 @@ private void handleGame(Notification notification) { ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6); } } else if (notification instanceof DiceNowNotification) { + guiHandler.hideText(); guiHandler.showDice(); } else if (notification instanceof DrawCardNotification n) { guiHandler.drawCard(n.getColor()); 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 c442c6c3..b1dfcd02 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 @@ -87,8 +87,8 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(1,2, - 1,1,6,1,6 + die = new Die( + //TODO ); } @@ -97,8 +97,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/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index f5cce066..34074ecc 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -56,54 +56,6 @@ public void initializeGame() { for (var player : this.logic.getGame().getPlayers().values()) { player.initialize(); player.addHandCard(this.logic.getGame().draw()); - //TODO - player.addHandCard(new ShieldCard()); - player.addHandCard(new ShieldCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - player.addHandCard(new TurboCard()); - - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - player.addHandCard(new SwapCard()); - Piece piece = player.getPieces()[0]; player.getWaitingArea()[0] = null;