From 1b8c503712802c40b02c92a72e0f87854ff2433d Mon Sep 17 00:00:00 2001 From: William Muir Date: Mon, 11 Sep 2017 15:29:08 +1200 Subject: [PATCH 1/4] fixed bug #story[1250] --- src/main/java/seng302/gameServer/GameState.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index 0bfab598..c14cc0c0 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -403,7 +403,6 @@ public class GameState implements Runnable { serverYacht.setLocation( calculateBounceBack(serverYacht, originalLocation, BOUNCE_DISTANCE_YACHT) ); - System.out.println("DID BOUNCE BACK"); serverYacht.setCurrentVelocity( serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY ); @@ -424,7 +423,6 @@ public class GameState implements Runnable { calculateBounceBack(serverYacht, collidedMark, BOUNCE_DISTANCE_MARK) ); - System.out.println("DID BOUNCE BACK2"); serverYacht.setCurrentVelocity( serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY ); @@ -440,7 +438,6 @@ public class GameState implements Runnable { BOUNCE_DISTANCE_YACHT) ); - System.out.println("DID BOUNCE BACK3"); serverYacht.setCurrentVelocity( serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY ); From 58512fdbdfaa05d99f56a83fd7ca2a1057d9ae7f Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Mon, 11 Sep 2017 15:40:13 +1200 Subject: [PATCH 2/4] Replaced hover sound to work in .jar. #story[1249] --- src/main/java/seng302/utilities/Sounds.java | 15 +++++++++++++-- .../resources/sounds/Error-sound-effect.mp3 | Bin 0 -> 21315 bytes src/main/resources/sounds/sound-over.wav | Bin 4784 -> 0 bytes 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/sounds/Error-sound-effect.mp3 delete mode 100644 src/main/resources/sounds/sound-over.wav diff --git a/src/main/java/seng302/utilities/Sounds.java b/src/main/java/seng302/utilities/Sounds.java index 0678369c..b929205d 100644 --- a/src/main/java/seng302/utilities/Sounds.java +++ b/src/main/java/seng302/utilities/Sounds.java @@ -14,8 +14,9 @@ public class Sounds { private static MediaPlayer musicPlayer; private static MediaPlayer soundEffect; private static MediaPlayer soundPlayer; - private static AudioClip hoverSoundPlayer = new AudioClip(Sounds.class.getClassLoader().getResource("sounds/sound-over.wav").toExternalForm());; + private static MediaPlayer hoverSoundPlayer; + private static boolean hoverInitialized = false; private static boolean musicMuted = false; private static boolean soundEffectsMuted = false; @@ -168,7 +169,17 @@ public class Sounds { public static void playHoverSound() { if (!soundEffectsMuted) { - hoverSoundPlayer.setVolume(2.5); + if (!hoverInitialized) { + Media crashSound = new Media( + Sounds.class.getClassLoader().getResource("sounds/Error-sound-effect.mp3") + .toString()); + hoverSoundPlayer = new MediaPlayer(crashSound); + hoverInitialized = true; + } + hoverSoundPlayer.setVolume(0.5); + if (hoverSoundPlayer != null) { + hoverSoundPlayer.stop(); + } hoverSoundPlayer.play(); } } diff --git a/src/main/resources/sounds/Error-sound-effect.mp3 b/src/main/resources/sounds/Error-sound-effect.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..e27176ffe262931b20792a847bee703aa21b4a2c GIT binary patch literal 21315 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 From ab35e3506dba771a1c0919e2fdd4e995150ee7b2 Mon Sep 17 00:00:00 2001 From: William Muir Date: Mon, 11 Sep 2017 15:54:16 +1200 Subject: [PATCH 3/4] fixed bug #story[1250] --- .../sounds/Coin-pick-up-sound-effect.mp3 | Bin 0 -> 18808 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/sounds/Coin-pick-up-sound-effect.mp3 diff --git a/src/main/resources/sounds/Coin-pick-up-sound-effect.mp3 b/src/main/resources/sounds/Coin-pick-up-sound-effect.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..0846c28601fa7ab8de012f5be552128912e0f066 GIT binary patch literal 18808 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 literal 0 HcmV?d00001 From fdfb5959fa3e1d0ff813b4aa92fc56888bb890e3 Mon Sep 17 00:00:00 2001 From: William Muir Date: Mon, 11 Sep 2017 16:53:12 +1200 Subject: [PATCH 4/4] Minor change so that boats still are checked for collision after passing the finish line #story[1250] --- src/main/java/seng302/gameServer/GameState.java | 2 +- src/main/java/seng302/gameServer/MainServerThread.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index c14cc0c0..120fb170 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -322,8 +322,8 @@ public class GameState implements Runnable { checkPowerUpTimeout(yacht); yacht.runAutoPilot(); yacht.updateLocation(timeInterval); + checkCollision(yacht); if (yacht.getBoatStatus() != BoatStatus.FINISHED) { - checkCollision(yacht); checkForLegProgression(yacht); raceFinished = false; } diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java index 3c305f90..0b7e6433 100644 --- a/src/main/java/seng302/gameServer/MainServerThread.java +++ b/src/main/java/seng302/gameServer/MainServerThread.java @@ -191,7 +191,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate { GameState.spawnNewToken(); broadcastMessage(MessageFactory.getRaceXML()); } - }, 0, 60000); + }, 10000, 60000); } /**