From 2255bfd648e5eadd6b74fa16dac68eb5afcdf2cd Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Thu, 5 Dec 2024 18:00:04 +0100 Subject: [PATCH] Remove test binding --- .../client/src/main/java/pp/mdga/client/InputSynchronizer.java | 2 +- Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java | 2 +- .../src/main/java/pp/mdga/client/NotificationSynchronizer.java | 2 ++ .../src/main/java/pp/mdga/client/acoustic/AcousticHandler.java | 3 +++ .../src/main/java/pp/mdga/client/acoustic/MdgaSound.java | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java index 7a0e6f9b..eb920305 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java @@ -149,7 +149,7 @@ else if(boardSelect != null) { if (name.equals("Right")) { isRotateRight = !isRotateRight; } - if(name.equals("Test") &&isPressed){ + if(name.equals("Test2") &&isPressed){ if(app.getView() instanceof GameView gameView){ if(p == null) { 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 b2c397ac..29ee28ca 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 @@ -128,7 +128,7 @@ public void simpleInitApp() { gameView = new GameView(this); ceremonyView = new CeremonyView(this); - enter(MdgaState.GAME); + enter(MdgaState.MAIN); } /** 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 04b9483f..26d0e769 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 @@ -1,5 +1,6 @@ package pp.mdga.client; +import pp.mdga.client.acoustic.MdgaSound; import pp.mdga.client.board.BoardHandler; import pp.mdga.client.gui.GuiHandler; import pp.mdga.client.view.CeremonyView; @@ -91,6 +92,7 @@ private void handleGame(Notification notification) { } else if (notification instanceof ActivePlayerNotification n) { gameView.getGuiHandler().setActivePlayer(n.getColor()); boardHandler.showDice(n.getColor()); + app.getAcousticHandler().playSound(MdgaSound.UI90); } else if (notification instanceof CeremonyNotification ceremonyNotification) { app.enter(MdgaState.CEREMONY); CeremonyView ceremonyView = (CeremonyView) app.getView(); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java index fae8f487..0e69412a 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java @@ -123,6 +123,9 @@ public void playSound(MdgaSound sound) { case BONUS: assets.add(new SoundAssetDelayVolume(SoundAsset.BONUS, 1.0f, 0.0f)); break; + case UI90: + assets.add(new SoundAssetDelayVolume(SoundAsset.UI90, 1.0f, 0.0f)); + break; default: break; } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java index 857954ad..a3f9ba9f 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java @@ -35,4 +35,5 @@ public enum MdgaSound { EXPLOSION, LOSE, BONUS, + UI90, }