Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
This commit is contained in:
@@ -81,7 +81,6 @@ public class Event {
|
|||||||
|
|
||||||
String raceXMLFile = "mock/mockXML/raceTest.xml";
|
String raceXMLFile = "mock/mockXML/raceTest.xml";
|
||||||
String boatsXMLFile = "mock/mockXML/boatTest.xml";
|
String boatsXMLFile = "mock/mockXML/boatTest.xml";
|
||||||
//String boatsXMLFile = "mock/mockXML/boatsSinglePlayer.xml";
|
|
||||||
String regattaXMLFile = "mock/mockXML/regattaTest.xml";
|
String regattaXMLFile = "mock/mockXML/regattaTest.xml";
|
||||||
|
|
||||||
if (singlePlayer) {
|
if (singlePlayer) {
|
||||||
|
|||||||
+8
-2
@@ -1,5 +1,6 @@
|
|||||||
package visualiser.Commands.VisualiserRaceCommands;
|
package visualiser.Commands.VisualiserRaceCommands;
|
||||||
|
|
||||||
|
import javafx.scene.media.AudioClip;
|
||||||
import mock.model.commandFactory.Command;
|
import mock.model.commandFactory.Command;
|
||||||
import network.Messages.YachtEvent;
|
import network.Messages.YachtEvent;
|
||||||
import visualiser.model.VisualiserRaceState;
|
import visualiser.model.VisualiserRaceState;
|
||||||
@@ -23,9 +24,14 @@ public class BoatCollisionCommand implements Command {
|
|||||||
public void execute() {
|
public void execute() {
|
||||||
|
|
||||||
if(visualiserRace.getPlayerBoatID()==yachtEvent.getSourceID()){
|
if(visualiserRace.getPlayerBoatID()==yachtEvent.getSourceID()){
|
||||||
System.out.println("Someone else crashed!");
|
|
||||||
} else {
|
|
||||||
System.out.println("I crashed!");
|
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!");
|
//System.out.println("Collision command executed!");
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user