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 22516631..3c4d5a22 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 @@ -178,7 +178,12 @@ private void handleGame(Notification notification) { boardHandler.unshieldPiece(n.getPieceUuid()); } else if (notification instanceof PlayCardNotification n) { if(n.getCard() == BonusCard.TURBO) { + app.getAcousticHandler().playSound(MdgaSound.TURBO); guiHandler.turbo(); + } else if(n.getCard() == BonusCard.SHIELD) { + app.getAcousticHandler().playSound(MdgaSound.SHIELD); + } else if(n.getCard() == BonusCard.SWAP) { + app.getAcousticHandler().playSound(MdgaSound.SWAP); } if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard()); else guiHandler.playCardEnemy(n.getColor(), n.getCard()); 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 5867a4c3..fa67fc0e 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 @@ -147,6 +147,15 @@ public void playSound(MdgaSound sound) { case TANK_EXPLOSION: assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 0f)); break; + case SHIELD: + assets.add(new SoundAssetDelayVolume(SoundAsset.SHIELD, 1.0f, 0f)); + break; + case TURBO: + assets.add(new SoundAssetDelayVolume(SoundAsset.SPEED, 1.0f, 0f)); + break; + case SWAP: + assets.add(new SoundAssetDelayVolume(SoundAsset.SWAP, 1.0f, 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 d7f93bae..db6a819f 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 @@ -40,5 +40,8 @@ public enum MdgaSound { MATRIX, TURRET_ROTATE, TANK_SHOOT, - TANK_EXPLOSION + TANK_EXPLOSION, + SHIELD, + TURBO, + SWAP, } 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 09671259..f2d232c0 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 @@ -39,7 +39,10 @@ enum SoundAsset { MATRIX("matrix.wav"), CONNECTED("connected.wav"), TURRET_ROTATE("turret_rotate.ogg"), - TANK_SHOOT("tank_shoot.ogg") + TANK_SHOOT("tank_shoot.ogg"), + SHIELD("shield.ogg"), + SPEED("speed.ogg"), + SWAP("swap.ogg"), ; diff --git a/Projekte/mdga/client/src/main/resources/Sounds/shield.ogg b/Projekte/mdga/client/src/main/resources/Sounds/shield.ogg new file mode 100644 index 00000000..57d06f0b Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/shield.ogg differ diff --git a/Projekte/mdga/client/src/main/resources/Sounds/speed.ogg b/Projekte/mdga/client/src/main/resources/Sounds/speed.ogg new file mode 100644 index 00000000..dd3ea7e4 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/speed.ogg differ diff --git a/Projekte/mdga/client/src/main/resources/Sounds/swap.ogg b/Projekte/mdga/client/src/main/resources/Sounds/swap.ogg new file mode 100644 index 00000000..3cea5d03 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Sounds/swap.ogg differ