aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--levels/Apathetic Empathy/Hard/metadata.json2
-rw-r--r--levels/Apathetic Empathy/Medium/metadata.json2
-rw-r--r--levels/Book Betrayal/Easy/metadata.json2
-rw-r--r--levels/Galway Girl/Easy/metadata.json2
-rw-r--r--levels/Galway Girl/Hard/metadata.json2
-rw-r--r--levels/Take On Me/Medium/metadata.json2
-rw-r--r--levels/intoMyArms/Medium/metadata.json2
-rw-r--r--levels/testLevel/easy/metadata.json2
-rw-r--r--levels/testLevel/hard/metadata.json2
-rw-r--r--levels/testLevel/medium/metadata.json2
-rw-r--r--levels/testLevel2/easy/metadata.json2
-rw-r--r--levels/testLevel2/hard/metadata.json2
-rw-r--r--levels/testLevel2/medium/metadata.json2
-rw-r--r--src/gameplay/SongPlayer.java4
14 files changed, 15 insertions, 15 deletions
diff --git a/levels/Apathetic Empathy/Hard/metadata.json b/levels/Apathetic Empathy/Hard/metadata.json
index 2a756c2..c503e71 100644
--- a/levels/Apathetic Empathy/Hard/metadata.json
+++ b/levels/Apathetic Empathy/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":490,"title":"Hard","bpm":138.0} \ No newline at end of file
+{"numBeats":490,"title":"Hard","priority":3,"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 1aaa7a5..ef5c7bb 100644
--- a/levels/Apathetic Empathy/Medium/metadata.json
+++ b/levels/Apathetic Empathy/Medium/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/Book Betrayal/Easy/metadata.json b/levels/Book Betrayal/Easy/metadata.json
index a0369fd..41b9e61 100644
--- a/levels/Book Betrayal/Easy/metadata.json
+++ b/levels/Book Betrayal/Easy/metadata.json
@@ -1 +1 @@
-{"numBeats":652,"title":"Medium","bpm":166.0} \ No newline at end of file
+{"numBeats":652,"title":"Medium","priority":2,"bpm":166.0} \ No newline at end of file
diff --git a/levels/Galway Girl/Easy/metadata.json b/levels/Galway Girl/Easy/metadata.json
index d6ad106..b6b0973 100644
--- a/levels/Galway Girl/Easy/metadata.json
+++ b/levels/Galway Girl/Easy/metadata.json
@@ -1 +1 @@
-{"numBeats":150,"title":"Medium","bpm":100.0} \ No newline at end of file
+{"numBeats":150,"title":"Medium","priority":2,"bpm":100.0} \ No newline at end of file
diff --git a/levels/Galway Girl/Hard/metadata.json b/levels/Galway Girl/Hard/metadata.json
index 3dc4ed3..984d821 100644
--- a/levels/Galway Girl/Hard/metadata.json
+++ b/levels/Galway Girl/Hard/metadata.json
@@ -1 +1 @@
-{"numBeats":55,"title":"Hard","bpm":100.0} \ No newline at end of file
+{"numBeats":55,"title":"Hard","priority":3,"bpm":100.0} \ No newline at end of file
diff --git a/levels/Take On Me/Medium/metadata.json b/levels/Take On Me/Medium/metadata.json
index 3a4a1f0..68df9ad 100644
--- a/levels/Take On Me/Medium/metadata.json
+++ b/levels/Take On Me/Medium/metadata.json
@@ -1 +1 @@
-{"numBeats":75,"title":"Medium","bpm":170.0} \ No newline at end of file
+{"numBeats":75,"title":"Medium","priority":2,"bpm":170.0} \ No newline at end of file
diff --git a/levels/intoMyArms/Medium/metadata.json b/levels/intoMyArms/Medium/metadata.json
index fe3e406..b116d97 100644
--- a/levels/intoMyArms/Medium/metadata.json
+++ b/levels/intoMyArms/Medium/metadata.json
@@ -1 +1 @@
-{"numBeats":0,"title":"Medium","bpm":175} \ No newline at end of file
+{"numBeats":0,"title":"Medium","priority":2,"bpm":175.0} \ No newline at end of file
diff --git a/levels/testLevel/easy/metadata.json b/levels/testLevel/easy/metadata.json
index 8bd53e2..d7f94d6 100644
--- a/levels/testLevel/easy/metadata.json
+++ b/levels/testLevel/easy/metadata.json
@@ -1 +1 @@
-{"numBeats":28,"title":"Easy","bpm":120.0} \ No newline at end of file
+{"numBeats":28,"title":"Easy","priority":1,"bpm":120.0} \ No newline at end of file
diff --git a/levels/testLevel/hard/metadata.json b/levels/testLevel/hard/metadata.json
index 7776a02..ab1912f 100644
--- a/levels/testLevel/hard/metadata.json
+++ b/levels/testLevel/hard/metadata.json
@@ -1 +1 @@
-{"numBeats":15,"title":"Hard","bpm":60} \ No newline at end of file
+{"numBeats":15,"title":"Hard","priority":3,"bpm":60.0} \ No newline at end of file
diff --git a/levels/testLevel/medium/metadata.json b/levels/testLevel/medium/metadata.json
index 1622b89..fad4f36 100644
--- a/levels/testLevel/medium/metadata.json
+++ b/levels/testLevel/medium/metadata.json
@@ -1 +1 @@
-{"numBeats":6,"title":"Medium","bpm":60} \ No newline at end of file
+{"numBeats":6,"title":"Medium","priority":2,"bpm":60.0} \ No newline at end of file
diff --git a/levels/testLevel2/easy/metadata.json b/levels/testLevel2/easy/metadata.json
index c76ea5b..1b68a6d 100644
--- a/levels/testLevel2/easy/metadata.json
+++ b/levels/testLevel2/easy/metadata.json
@@ -1 +1 @@
-{"numBeats":28,"title":"Easy","bpm":85.0} \ No newline at end of file
+{"numBeats":28,"title":"Easy","priority":1,"bpm":85.0} \ No newline at end of file
diff --git a/levels/testLevel2/hard/metadata.json b/levels/testLevel2/hard/metadata.json
index c16f6c2..9a86e48 100644
--- a/levels/testLevel2/hard/metadata.json
+++ b/levels/testLevel2/hard/metadata.json
@@ -1 +1 @@
-{"numBeats":0,"title":"Hard","bpm":50} \ No newline at end of file
+{"numBeats":0,"title":"Hard","priority":3,"bpm":50.0} \ No newline at end of file
diff --git a/levels/testLevel2/medium/metadata.json b/levels/testLevel2/medium/metadata.json
index 530398b..6f3d410 100644
--- a/levels/testLevel2/medium/metadata.json
+++ b/levels/testLevel2/medium/metadata.json
@@ -1 +1 @@
-{"numBeats":0,"title":"Medium","bpm":0} \ No newline at end of file
+{"numBeats":0,"title":"Medium","priority":2,"bpm":0.0} \ No newline at end of file
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index 436c336..3d3fe7d 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -256,7 +256,7 @@ public class SongPlayer extends Pane {
sendNote(kSends, kLane, kButton);
if (timer.time() > songLength) {
gui.Driver.setMenu(new GameOver(level, difficulty, pane, scoreCounter.getScore()));
- cancel();
+ cancel();
}
if (!songIsPlaying && timer.time() > 0.0) {
songIsPlaying = true;
@@ -278,10 +278,10 @@ public class SongPlayer extends Pane {
* @throws UnsupportedAudioFileException
*/
public void cancel() {
+ Driver.soundController.endSong();
Driver.soundController.playMenuSong();
gui.Driver.setBackground("assets/mountains.png");
gameLoop.stop();
- Driver.soundController.endSong();
}
/**