From 49ccb5c20aa84501c1ed6b534bfa00a4a9dc5902 Mon Sep 17 00:00:00 2001
From: Aidan Ross <aross02@fairport.org>
Date: Tue, 6 Jun 2023 09:21:33 -0400
Subject: Miss sound is muted if not in songplayer

---
 src/gameplay/SongPlayer.java  | 9 ++++++---
 src/main/ScoreController.java | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index e4a8d82..d06535f 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -46,6 +46,7 @@ public class SongPlayer extends Pane {
 
 	private File song;
 	private boolean songIsPlaying = false;
+	private boolean missMute = false;
 
 	private main.Level level;
 	private Difficulty difficulty;
@@ -221,7 +222,7 @@ public class SongPlayer extends Pane {
 
 			anim.setOnFinished(e -> {
 				if (super.getChildren().removeAll(anim.getNode())){
-					scoreCounter.miss();
+					scoreCounter.miss(missMute);
 					FillTransition ft = new FillTransition(Duration.millis(500), button.rect);
 					ft.setFromValue(Color.RED);
 					ft.setToValue(button.getFillColor());
@@ -265,6 +266,8 @@ public class SongPlayer extends Pane {
 				songIsPlaying = true;
 				Driver.soundController.playSong(song);
 			}
+			if (!SongPlayer.super.isVisible());
+				missMute = true;
 		}
 	};
 
@@ -331,7 +334,7 @@ public class SongPlayer extends Pane {
 
 				super.getChildren().removeAll(lane.get(getClosestNote(lane)));
 				lane.remove(lane.get(getClosestNote(lane)));
-				if (distance < super.getHeight() / 16) {
+				if (distance < super.getHeight() / 12) {
 					ft.setFromValue(Color.WHITE);
 					ft.play();
 					scoreCounter.perfect();
@@ -345,7 +348,7 @@ public class SongPlayer extends Pane {
 				}
 				ft.setFromValue(Color.RED);
 				ft.play();
-				scoreCounter.miss();
+				scoreCounter.miss(false);
 				return 0;
 			}
 		}	
diff --git a/src/main/ScoreController.java b/src/main/ScoreController.java
index 2b76217..066a0d1 100644
--- a/src/main/ScoreController.java
+++ b/src/main/ScoreController.java
@@ -37,8 +37,10 @@ public class ScoreController{
     /**
      * Called when the user misses a note
      */
-    public void miss() {
-        Driver.soundController.playSfx("miss");
+    public void miss(boolean muted) {
+        if (!muted) {
+            Driver.soundController.playSfx("miss");
+        }
         combo = 0;
         comboMultiplier = 1;
         scoreProperty.setValue(score+"");
-- 
cgit v1.2.3