small tweaks

7 files changed, 31 insertions, 24 deletions

diff --git a/levels/Apathetic Empathy/Hard/metadata.json b/levels/Apathetic Empathy/Hard/metadata.json
index 1aaa7a5..ef5c7bb 100644
--- a/levels/Apathetic Empathy/Hard/metadata.json
+++ b/levels/Apathetic Empathy/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":490,"title":"Medium","bpm":138.0}
\ No newline at end of file
+{"numBeats":490,"title":"Medium","priority":2,"bpm":138.0}
\ No newline at end of file
diff --git a/levels/Apathetic Empathy/Medium/metadata.json b/levels/Apathetic Empathy/Medium/metadata.json
index 613e3d1..93f5482 100644
--- a/levels/Apathetic Empathy/Medium/metadata.json
+++ b/levels/Apathetic Empathy/Medium/metadata.json
@@ -1 +1 @@
-{"numBeats":490,"title":"Easy","bpm":138.0}
\ No newline at end of file
+{"numBeats":490,"title":"Easy","priority":1,"bpm":138.0}
\ No newline at end of file
diff --git a/levels/Gas Gas Gas/Hard/metadata.json b/levels/Gas Gas Gas/Hard/metadata.json
index 71766f6..38aedf6 100644
--- a/levels/Gas Gas Gas/Hard/metadata.json
+++ b/levels/Gas Gas Gas/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":695,"title":"Hard","bpm":154.0}
\ No newline at end of file
+{"numBeats":695,"title":"Hard","priority":3,"bpm":154.0}
\ No newline at end of file
diff --git a/levels/PEPSI MAN/Hard/metadata.json b/levels/PEPSI MAN/Hard/metadata.json
index c0f1d82..15f60cb 100644
--- a/levels/PEPSI MAN/Hard/metadata.json
+++ b/levels/PEPSI MAN/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":650,"title":"Hard","bpm":158.0}
\ No newline at end of file
+{"numBeats":650,"title":"Hard","priority":3,"bpm":158.0}
\ No newline at end of file
diff --git a/levels/Skeleton Man/Hard/metadata.json b/levels/Skeleton Man/Hard/metadata.json
index 59dc82e..014d91d 100644
--- a/levels/Skeleton Man/Hard/metadata.json
+++ b/levels/Skeleton Man/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":430,"title":"Hard","bpm":170.0}
\ No newline at end of file
+{"numBeats":430,"title":"Hard","priority":3,"bpm":170.0}
\ No newline at end of file
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index a1a6b45..e4a8d82 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -150,23 +150,26 @@ public class SongPlayer extends Pane {
 			 * calls the checkNote() method for the corresponding lane
 			 */
 			//System.out.println(timer.time());
-			if (e.getCode() == KeyCode.D) {
-				checkNote(dLane, dButton);
-			}
-			if (e.getCode() == KeyCode.F) {
-				checkNote(fLane, fButton);
-			}
-			if (e.getCode() == KeyCode.SPACE) {
-				checkNote(spaceLane, sButton);
-			}
-			if (e.getCode() == KeyCode.J) {
-				checkNote(jLane, jButton);
-			}
-			if (e.getCode() == KeyCode.K) {
-				checkNote(kLane, kButton);
-			}
-			if (e.getCode() == KeyCode.Q) {
-				System.out.println("" + timer.time());
+			if (super.isVisible())
+			{
+				if (e.getCode() == KeyCode.D) {
+					checkNote(dLane, dButton);
+				}
+				if (e.getCode() == KeyCode.F) {
+					checkNote(fLane, fButton);
+				}
+				if (e.getCode() == KeyCode.SPACE) {
+					checkNote(spaceLane, sButton);
+				}
+				if (e.getCode() == KeyCode.J) {
+					checkNote(jLane, jButton);
+				}
+				if (e.getCode() == KeyCode.K) {
+					checkNote(kLane, kButton);
+				}
+				if (e.getCode() == KeyCode.Q) {
+					System.out.println("" + timer.time());
+				}
 			}
 			//prints the user's current score and combo, for debugging purposes
 			//System.out.println("Score: " + scoreCounter.getScore() + "\nCombo: " + scoreCounter.getCombo() + "\n");
@@ -318,7 +321,7 @@ public class SongPlayer extends Pane {
 	 * @return 2 for a perfect hit, 1 for a good hit, 0 for a miss, and -1 if there are no notes to hit
 	 */
 	private int checkNote(ArrayList<Block> lane, Target button) {
-		if (lane.size() != 0)
+		if (lane.size() != 0 && super.isVisible())
 		{
 			double distance = distanceToGoal(lane.get(getClosestNote(lane)));
 			if (lane.size() > 0 && distance < super.getHeight() / 3) {
diff --git a/src/gui/style.css b/src/gui/style.css
index 09e164e..dd1de55 100644
--- a/src/gui/style.css
+++ b/src/gui/style.css
@@ -92,6 +92,11 @@ TableView:focused .list-cell:focused {
     /* -fx-border-color: rgb(255, 255, 255); */
 }
 
+.table-view .corner {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
 .table-row-cell:selected {
     -fx-background-color: rgb(255, 255, 255);
     -fx-text-background-color: rgb(0, 0, 0);
@@ -229,4 +234,3 @@ Slider:focused .thumb{
     /* -fx-border-width: 20; */
 }
 
-