From ea25f66dae27bbd67d4add57480564639f9d9c76 Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Wed, 11 Dec 2024 13:34:38 +0100 Subject: [PATCH 1/2] wrote getter for ceremonyview in mdga app --- .../mdga/client/src/main/java/pp/mdga/client/MdgaApp.java | 6 +++++- .../main/java/pp/mdga/client/NotificationSynchronizer.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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 1487a306..1e1570c6 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 @@ -88,7 +88,7 @@ public class MdgaApp extends SimpleApplication { private final TimerManager timerManager = new TimerManager(); - public static final int DEBUG_MULTIPLIER = 1; + public static final int DEBUG_MULTIPLIER = 0; public MdgaApp() { networkConnection = new NetworkSupport(this); @@ -351,5 +351,9 @@ public GameView getGameView() { public TimerManager getTimerManager() { return timerManager; } + + public CeremonyView getCeremonyView() { + return ceremonyView; + } } 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 c4d366ee..8f4c7082 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 @@ -133,7 +133,7 @@ private void handleGame(Notification notification) { app.getAcousticHandler().playSound(MdgaSound.UI90); delay = STANDARD_DELAY; } else if (notification instanceof CeremonyNotification ceremonyNotification) { - CeremonyView ceremonyView = app.ceremonyView; + CeremonyView ceremonyView = app.getCeremonyView(); int size = ceremonyNotification.getNames().size(); if (ceremonyNotification.getPiecesThrown().size() != size || From 5854609b125d0442b22cfaa9d2bf23ed9e431986 Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Wed, 11 Dec 2024 13:43:15 +0100 Subject: [PATCH 2/2] added notification to change to startdialog state when calling next in statitics state --- .../main/java/pp/mdga/client/ceremonystate/StatisticsState.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java index 2d3bc943..f8cf6b64 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java @@ -2,6 +2,7 @@ import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; +import pp.mdga.notification.StartDialogNotification; public class StatisticsState extends CeremonyStates { @@ -36,6 +37,7 @@ public void exit() { */ @Override public void selectNext() { + logic.addNotification(new StartDialogNotification()); logic.setState(logic.getDialogs()); } }