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 0ae281c7..7a0e6f9b 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("Testx") &&isPressed){ + if(name.equals("Test") &&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 29ee28ca..b2c397ac 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.MAIN); + enter(MdgaState.GAME); } /** 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 447bddb4..fae8f487 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 @@ -113,9 +113,16 @@ public void playSound(MdgaSound sound) { assets.add(new SoundAssetDelayVolume(SoundAsset.JET, 1.0f, 0.0f)); break; case EXPLOSION: - assets.add(new SoundAssetDelayVolume(SoundAsset.EXP, 1.0f, 4f)); + assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 4f)); + assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_2, 1.0f, 4f)); assets.add(new SoundAssetDelayVolume(SoundAsset.THUNDER, 1.0f, 4f)); break; + case LOSE: + assets.add(new SoundAssetDelayVolume(SoundAsset.LOSE, 1.0f, 0.0f)); + break; + case BONUS: + assets.add(new SoundAssetDelayVolume(SoundAsset.BONUS, 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 9bdfb54b..857954ad 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 @@ -33,4 +33,6 @@ public enum MdgaSound { LEAVE, JET, EXPLOSION, + LOSE, + BONUS, } 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 ce90d750..71e4f20a 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 @@ -29,8 +29,12 @@ enum SoundAsset { ROBOT_READY("robotReady.wav"), UNIT_READY("unitReady.wav"), JET("jet-overhead.wav"), - EXP("exp.ogg"), + EXPLOSION_1("exp.ogg"), + EXPLOSION_2("exp2.ogg"), THUNDER("thunder.ogg"), + UI90("ui90.ogg"), + BONUS("bonus.ogg"), + LOSE("lose.ogg"), CONNECTED("connected.wav"); private final String path; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index a63db8ec..318932e8 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -9,6 +9,7 @@ import com.jme3.scene.control.AbstractControl; import pp.mdga.client.Asset; import pp.mdga.client.MdgaApp; +import pp.mdga.client.acoustic.MdgaSound; import pp.mdga.client.animation.MoveControl; import pp.mdga.client.animation.JetAnimation; import pp.mdga.client.gui.DiceControl; @@ -443,6 +444,7 @@ private void throwPiece(UUID uuid){ // Synchronisation oder Animation pieceControl.rotateInit(); + app.getAcousticHandler().playSound(MdgaSound.LOSE); app.getModelSynchronize().animationEnd(); } diff --git a/Projekte/mdga/client/src/main/resources/Sounds/bonus.ogg b/Projekte/mdga/client/src/main/resources/Sounds/bonus.ogg new file mode 100644 index 00000000..63a5db34 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/bonus.ogg differ diff --git a/Projekte/mdga/client/src/main/resources/Sounds/exp2.ogg b/Projekte/mdga/client/src/main/resources/Sounds/exp2.ogg new file mode 100644 index 00000000..4b04e8c4 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/exp2.ogg differ diff --git a/Projekte/mdga/client/src/main/resources/Sounds/lose.ogg b/Projekte/mdga/client/src/main/resources/Sounds/lose.ogg new file mode 100644 index 00000000..9fdc99e5 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/lose.ogg differ diff --git a/Projekte/mdga/client/src/main/resources/Sounds/ui90.ogg b/Projekte/mdga/client/src/main/resources/Sounds/ui90.ogg new file mode 100644 index 00000000..7a04ef60 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/ui90.ogg differ