diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index c9ef3d5b..c054e2fb 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -81,7 +81,6 @@ public class Event { String raceXMLFile = "mock/mockXML/raceTest.xml"; String boatsXMLFile = "mock/mockXML/boatTest.xml"; - //String boatsXMLFile = "mock/mockXML/boatsSinglePlayer.xml"; String regattaXMLFile = "mock/mockXML/regattaTest.xml"; if (singlePlayer) { diff --git a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatCollisionCommand.java b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatCollisionCommand.java index 7e2047d7..c3046d18 100644 --- a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatCollisionCommand.java +++ b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatCollisionCommand.java @@ -1,5 +1,6 @@ package visualiser.Commands.VisualiserRaceCommands; +import javafx.scene.media.AudioClip; import mock.model.commandFactory.Command; import network.Messages.YachtEvent; import visualiser.model.VisualiserRaceState; @@ -23,9 +24,14 @@ public class BoatCollisionCommand implements Command { public void execute() { if(visualiserRace.getPlayerBoatID()==yachtEvent.getSourceID()){ - System.out.println("Someone else crashed!"); - } else { System.out.println("I crashed!"); + AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/collision.wav").toExternalForm()); + sound.play(); + + } else { + System.out.println("Someone else crashed!"); + AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/quietcollision.wav").toExternalForm()); + sound.play(); } //System.out.println("Collision command executed!"); diff --git a/racevisionGame/src/main/resources/visualiser/sounds/quietcollision.wav b/racevisionGame/src/main/resources/visualiser/sounds/quietcollision.wav new file mode 100644 index 00000000..d1c8a01e Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/sounds/quietcollision.wav differ