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 78aad7a1..067cbf6a 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 4c379be2..518feb52 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/acoustic/AcousticHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java index c15f8026..f8130345 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 @@ -129,6 +129,9 @@ public void playSound(MdgaSound sound) { case MISSILE: assets.add(new SoundAssetDelayVolume(SoundAsset.MISSILE, 1.0f, 0.0f)); break; + case MATRIX: + assets.add(new SoundAssetDelayVolume(SoundAsset.MATRIX, 1.0f, 0.0f)); + break; default: break; } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java index 5b86e19a..f0c7fd00 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java @@ -36,6 +36,7 @@ enum SoundAsset { BONUS("bonus.ogg"), LOSE("lose.ogg"), MISSILE("missile.ogg"), + MATRIX("matrix.wav"), CONNECTED("connected.wav"); private final String path; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MissileAnimation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MissileAnimation.java index 12a8ec51..33c97f18 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MissileAnimation.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MissileAnimation.java @@ -56,9 +56,8 @@ public MissileAnimation(MdgaApp app, Node rootNode, UUID uuid, Vector3f target, */ public void start() { loadMissile(); - animateMissile(); - app.getAcousticHandler().playSound(MdgaSound.MISSILE); + animateMissile(); } /** diff --git a/Projekte/mdga/client/src/main/resources/Sounds/matrix.wav b/Projekte/mdga/client/src/main/resources/Sounds/matrix.wav new file mode 100644 index 00000000..224ecd2c Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/matrix.wav differ