diff --git a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java index 3f92757d..add1a3dd 100644 --- a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java +++ b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java @@ -178,7 +178,7 @@ public class RaceStatusCommand implements Command { visualiserRace.getLegCompletionOrder().get(boat.getCurrentLeg()).add(boat); //play sound - AudioClip sound = new AudioClip(getClass().getResource("/visualiser/sounds/buttonpress.mp3").toExternalForm()); + AudioClip sound = new AudioClip(getClass().getResource("/visualiser/sounds/passmark.wav").toExternalForm()); sound.play(); //Update boat. diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java index 1609e700..86a13920 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java @@ -3,6 +3,7 @@ package visualiser.Controllers; import javafx.fxml.FXML; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; +import javafx.scene.media.AudioClip; import mock.app.Event; import org.xml.sax.SAXException; import mock.exceptions.EventConstructionException; @@ -85,6 +86,8 @@ public class HostController extends Controller { } public void menuBtnPressed(){ + AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); + sound.play(); hostWrapper.setVisible(false); parent.enterTitle(); } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java index 07af2b49..0524f2ad 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java @@ -8,6 +8,7 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; +import javafx.scene.media.AudioClip; import visualiser.model.RaceConnection; import java.io.IOException; @@ -39,6 +40,8 @@ public class LobbyController extends Controller { private ObservableList connections; + private AudioClip sound; + @Override public void initialize(URL location, ResourceBundle resources) { @@ -66,6 +69,8 @@ public class LobbyController extends Controller { * Refreshes the connections in the lobby */ public void refreshBtnPressed(){ + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); + sound.play(); for(RaceConnection connection: connections) { connection.check(); } @@ -93,6 +98,8 @@ public class LobbyController extends Controller { } public void menuBtnPressed(){ + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); + sound.play(); lobbyWrapper.setVisible(false); parent.enterTitle(); } @@ -101,6 +108,8 @@ public class LobbyController extends Controller { * adds a new connection */ public void addConnectionPressed(){ + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); + sound.play(); String hostName = addressFld.getText(); String portString = portFld.getText(); try{ diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java index 77cf1b64..220a7f19 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java @@ -56,7 +56,7 @@ public class MainController extends Controller { * @param isHost is connection a host */ public void enterLobby(Socket socket, Boolean isHost) { - sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.mp3").toExternalForm()); + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); sound.play(); startController.enterLobby(socket, isHost); } @@ -80,7 +80,7 @@ public class MainController extends Controller { * Transitions into lobby screen */ public void enterLobby(){ - sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.mp3").toExternalForm()); + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); sound.play(); lobbyController.enterLobby(); } @@ -88,7 +88,7 @@ public class MainController extends Controller { * Transitions into host game screen */ public void hostGame(){ - sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.mp3").toExternalForm()); + sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); sound.play(); hostController.hostGame(); } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index f70030b7..b8ec3af7 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -94,6 +94,8 @@ public class TitleController extends Controller { * Called when control button is pressed. New pop up window displaying controls */ public void controlBtnPressed(){ + AudioClip sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm()); + sound.play(); FXMLLoader loader = new FXMLLoader(); loader.setLocation(getClass().getResource("/visualiser/scenes/controls.fxml")); Parent layout; diff --git a/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.mp3 b/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.mp3 deleted file mode 100644 index 8cb077ff..00000000 Binary files a/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.mp3 and /dev/null differ diff --git a/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.wav b/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.wav new file mode 100644 index 00000000..a32482e0 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/sounds/buttonpress.wav differ diff --git a/racevisionGame/src/main/resources/visualiser/sounds/collision.wav b/racevisionGame/src/main/resources/visualiser/sounds/collision.wav new file mode 100644 index 00000000..0195375d Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/sounds/collision.wav differ diff --git a/racevisionGame/src/main/resources/visualiser/sounds/collision2.wav b/racevisionGame/src/main/resources/visualiser/sounds/collision2.wav new file mode 100644 index 00000000..9e295636 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/sounds/collision2.wav differ diff --git a/racevisionGame/src/main/resources/visualiser/sounds/passmark.wav b/racevisionGame/src/main/resources/visualiser/sounds/passmark.wav new file mode 100644 index 00000000..be0be83b Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/sounds/passmark.wav differ