diff --git a/Sound/hit.mp3 b/Sound/hit.mp3 new file mode 100644 index 0000000..2854416 Binary files /dev/null and b/Sound/hit.mp3 differ diff --git a/Sound/plop.mp3 b/Sound/plop.mp3 new file mode 100644 index 0000000..421dd01 Binary files /dev/null and b/Sound/plop.mp3 differ diff --git a/Sound/shipdestroyed.mp3 b/Sound/shipdestroyed.mp3 new file mode 100644 index 0000000..a9f1545 Binary files /dev/null and b/Sound/shipdestroyed.mp3 differ diff --git a/src/BoardDisplay.java b/src/BoardDisplay.java index 4afa8c4..dc0dcd6 100644 --- a/src/BoardDisplay.java +++ b/src/BoardDisplay.java @@ -102,6 +102,7 @@ public class BoardDisplay extends JPanel { } else if (SwingUtilities.isLeftMouseButton(e)) { Point o = new Point(x, y); handleFieldClick(o); + SoundHandler.playSound("plop"); } } }); @@ -222,13 +223,16 @@ public class BoardDisplay extends JPanel { switch (hit.getType()) { case HIT: fields[i][j].setBackground(Color.ORANGE); + SoundHandler.playSound("hit"); break; case SUNK: case VICTORY: + SoundHandler.playSound("destroyed"); fields[i][j].setBackground(Color.RED); break; case MISS: if (this.enemyBoard) { + SoundHandler.playSound("miss"); fields[i][j].setBackground(Color.BLUE); } else { fields[i][j].setBackground(Color.CYAN); diff --git a/src/HalloSchiffeVersenken.java b/src/HalloSchiffeVersenken.java index 066890e..eb60e78 100644 --- a/src/HalloSchiffeVersenken.java +++ b/src/HalloSchiffeVersenken.java @@ -7,8 +7,8 @@ public class HalloSchiffeVersenken { System.out.println("HelloSchiffeVersenekn"); - System.out.println("sound"); - SoundHandler.playSound("hit"); + //System.out.println("sound"); + //SoundHandler.playSound("hit"); Thread.sleep(10000); diff --git a/src/JoinGame.java b/src/JoinGame.java index d33d4d6..76ad2c7 100644 --- a/src/JoinGame.java +++ b/src/JoinGame.java @@ -8,8 +8,6 @@ import java.net.InetSocketAddress; /** * Das JoinGame Panel dient zum setzten des Ports/IP-Adresse. * Anschließend kann das Verbinden Panel gezeigt werden. - * 51525 - * ssh.lgc.sh */ public class JoinGame extends JPanel { // Grafiken diff --git a/src/SoundHandler.java b/src/SoundHandler.java index ade013e..7bb256c 100644 --- a/src/SoundHandler.java +++ b/src/SoundHandler.java @@ -16,7 +16,10 @@ public class SoundHandler { // Wenn fehler beim erstellen von .jar mit sound hier gucken private static HashMap sounds = new HashMap(Map.of( - "hit", "./Sound/water-drip.mp3" + "miss", "./Sound/water-drip.mp3", + "hit", "./Sound/hit.mp3", + "destroyed", "./Sound/hit.mp3", + "plop", "./Sound/plop.mp3" )); public static void playSound(String soundName) {