From 1c82de21d4fd3833c5b46245e182f53016403d3b Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Sat, 3 Jun 2023 02:54:48 -0400 Subject: Background switching for songs, and a little bit of testing with the level editor --- levels/Galway Girl/Easy/metadata.json | 2 +- levels/Galway Girl/Easy/notes.txt | 302 +++++++++++++++++++++++++------ levels/Galway Girl/Hard/leaderboard.json | 1 + levels/Galway Girl/Hard/metadata.json | 1 + levels/Galway Girl/Hard/notes.txt | 106 +++++++++++ levels/Galway Girl/background.png | Bin 0 -> 106521 bytes src/assets/Hitsound.wav | Bin 34820 -> 34820 bytes src/gameplay/SongPlayer.java | 8 +- 8 files changed, 364 insertions(+), 56 deletions(-) create mode 100644 levels/Galway Girl/Hard/leaderboard.json create mode 100644 levels/Galway Girl/Hard/metadata.json create mode 100644 levels/Galway Girl/Hard/notes.txt create mode 100644 levels/Galway Girl/background.png diff --git a/levels/Galway Girl/Easy/metadata.json b/levels/Galway Girl/Easy/metadata.json index ea70004..d6ad106 100644 --- a/levels/Galway Girl/Easy/metadata.json +++ b/levels/Galway Girl/Easy/metadata.json @@ -1 +1 @@ -{"numBeats":50,"title":"Easy","bpm":100.0} \ No newline at end of file +{"numBeats":150,"title":"Medium","bpm":100.0} \ No newline at end of file diff --git a/levels/Galway Girl/Easy/notes.txt b/levels/Galway Girl/Easy/notes.txt index 5b3de0c..475f2fd 100644 --- a/levels/Galway Girl/Easy/notes.txt +++ b/levels/Galway Girl/Easy/notes.txt @@ -1,77 +1,271 @@ -s4.0 -s5.5 -j6.7 -f7.2 -s7.6 -k8.1 -d8.1 -s9.1 -k9.6 -d9.7 +s4.1 +f5.6 +s6.7 +j7.2 +k8.2 +d8.7 +j9.2 +f9.6 s10.7 -j11.2 +s11.2 s12.2 -j12.6 -f13.1 -s13.6 -s14.6 -k15.1 -d15.1 +d13.2 +k13.2 +s13.7 +f15.2 +j15.2 s16.1 -s16.5 +s16.6 s17.1 -s17.5 -s18.1 -d19.1 -k19.1 +k17.6 +d17.6 +f18.1 +j18.1 +s19.1 s20.1 -j20.8 +j20.9 f21.1 s21.6 k22.6 d23.1 -s24.1 -j24.9 -f25.2 -s25.7 +j24.1 +j24.8 +d25.1 +f25.6 +s26.1 k26.6 d27.1 s28.1 j28.9 f29.1 s29.6 -k30.7 -d31.1 -s32.2 +j30.7 +f31.2 +s32.1 s34.6 k35.1 d35.1 -j36.1 -f36.1 -d37.1 -k37.1 -s37.6 -s38.6 +s36.1 +s36.9 +j37.1 +f37.7 +s38.1 +d38.6 +k38.6 d39.1 k39.1 -j40.1 -f40.6 -k41.1 -d41.6 -s42.1 -k42.6 -d43.1 -k44.1 -d44.6 -k45.1 +s40.1 +k41.7 +d41.9 +j42.2 +f42.7 +s43.1 +s43.7 +s44.2 +j45.1 f45.6 s46.1 -k47.2 -s48.1 -s48.6 -s49.2 -s49.6 -s50.1 -s50.6 +j46.6 +f47.1 +s47.7 +j48.7 +f48.7 +j49.2 +f49.2 +s49.7 +f50.2 +j50.2 +j50.6 +f50.6 s51.1 -s51.6 +k52.1 +d52.1 +s53.2 +f54.6 +j54.6 +s55.1 +k56.1 +d56.1 +s57.1 +j57.6 +f58.1 +s59.1 +j60.6 +f60.7 +s61.1 +d61.6 +k61.6 +s62.1 +f62.6 +j62.6 +s63.1 +j64.0 +f64.0 +d64.5 +k64.5 +j65.6 +f65.9 +k66.1 +j68.2 +f68.7 +k69.2 +d69.6 +s70.1 +j70.6 +j71.0 +d71.6 +s72.1 +j73.6 +j73.9 +d74.1 +s74.6 +k75.1 +f75.6 +s76.1 +s76.9 +j77.2 +f77.4 +s77.7 +j78.7 +f79.1 +s79.6 +d80.1 +k80.1 +d81.1 +k81.1 +s81.6 +j82.6 +f82.6 +f83.1 +j83.1 +s84.1 +f85.1 +j85.1 +s85.6 +s86.7 +j87.2 +f87.2 +d88.1 +k88.1 +s89.1 +s90.6 +d91.1 +k91.1 +j92.6 +f92.9 +k93.1 +d93.6 +s94.1 +s94.6 +s95.1 +f96.1 +j96.1 +s98.6 +d99.1 +k99.1 +s100.1 +s100.9 +j101.1 +f101.6 +s102.1 +j102.5 +f103.1 +j103.7 +f103.8 +k104.1 +j104.6 +d105.1 +j105.6 +j106.7 +f107.1 +j107.6 +s108.1 +d109.1 +k109.1 +s109.6 +s110.6 +f111.1 +j111.1 +s112.1 +s112.6 +d113.1 +k113.1 +s113.6 +s114.1 +k114.6 +d114.6 +s115.1 +d115.6 +k115.6 +s116.1 +s116.9 +j117.1 +f117.6 +s118.1 +k118.6 +d119.1 +j120.1 +j120.8 +d121.0 +k121.5 +j122.0 +f122.3 +k122.6 +j123.0 +s123.6 +j124.1 +s124.9 +d125.1 +j125.6 +s126.1 +k126.6 +f127.1 +j127.6 +s128.1 +d128.6 +k128.9 +j129.1 +s129.7 +s130.7 +s131.1 +d132.1 +k132.1 +d132.8 +k132.9 +s133.1 +f133.6 +j133.6 +f134.6 +j134.6 +s135.1 +k136.1 +d136.1 +k136.8 +d136.8 +s137.1 +j137.6 +f137.6 +f138.5 +j138.5 +f139.0 +j139.0 +s140.1 +k140.8 +d141.0 +j141.6 +f142.1 +s142.6 +k143.1 +d143.1 +j144.1 +f144.6 +k144.9 +j145.1 +d145.6 +f146.1 +s147.0 +k148.1 +d148.1 +s149.1 +d149.6 +k149.6 \ No newline at end of file diff --git a/levels/Galway Girl/Hard/leaderboard.json b/levels/Galway Girl/Hard/leaderboard.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/levels/Galway Girl/Hard/leaderboard.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/levels/Galway Girl/Hard/metadata.json b/levels/Galway Girl/Hard/metadata.json new file mode 100644 index 0000000..3dc4ed3 --- /dev/null +++ b/levels/Galway Girl/Hard/metadata.json @@ -0,0 +1 @@ +{"numBeats":55,"title":"Hard","bpm":100.0} \ No newline at end of file diff --git a/levels/Galway Girl/Hard/notes.txt b/levels/Galway Girl/Hard/notes.txt new file mode 100644 index 0000000..3bb3876 --- /dev/null +++ b/levels/Galway Girl/Hard/notes.txt @@ -0,0 +1,106 @@ +s4.1 +f5.6 +j5.6 +s6.6 +j7.1 +f7.7 +j7.9 +s8.1 +k8.7 +d9.2 +j9.7 +j10.2 +f10.5 +k10.7 +d11.2 +j11.2 +s12.2 +k12.8 +f12.8 +s13.7 +d14.2 +j14.2 +s15.2 +d15.6 +k15.6 +s16.6 +j16.9 +f17.1 +k17.3 +s17.6 +j18.1 +d18.1 +s19.2 +j20.6 +f20.6 +d21.1 +k21.1 +s21.6 +j21.9 +f22.1 +s22.6 +k23.1 +d23.1 +s24.1 +j24.4 +f24.6 +s24.9 +k25.1 +s25.6 +j26.2 +s26.7 +d27.2 +s28.1 +f28.6 +j28.6 +s29.6 +f30.1 +j30.1 +s30.6 +f30.9 +j31.2 +s31.6 +d32.1 +k32.1 +k32.6 +d32.6 +s33.6 +d34.1 +k34.1 +s36.1 +j36.4 +f36.6 +s36.9 +j37.1 +f37.6 +k38.1 +d38.7 +j39.1 +j40.1 +d40.3 +k40.6 +f40.9 +j41.1 +s41.6 +f42.1 +j42.1 +j42.6 +f42.6 +f43.2 +j43.2 +s44.1 +d45.1 +j45.1 +s45.6 +j46.7 +f46.7 +k47.2 +j48.7 +d49.0 +j49.2 +s49.7 +f49.7 +j50.2 +s50.6 +d51.2 +j51.2 diff --git a/levels/Galway Girl/background.png b/levels/Galway Girl/background.png new file mode 100644 index 0000000..f32b475 Binary files /dev/null and b/levels/Galway Girl/background.png differ diff --git a/src/assets/Hitsound.wav b/src/assets/Hitsound.wav index 3dd280d..b9463a2 100644 Binary files a/src/assets/Hitsound.wav and b/src/assets/Hitsound.wav differ diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java index ccd34ea..985e5fb 100644 --- a/src/gameplay/SongPlayer.java +++ b/src/gameplay/SongPlayer.java @@ -12,6 +12,7 @@ import java.util.Scanner; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.UnsupportedAudioFileException; +import gui.Driver; import gui.GameOver; import javafx.geometry.Pos; import javafx.scene.input.KeyCode; @@ -120,6 +121,9 @@ public class SongPlayer extends Pane { new MediaView(gui.Driver.mediaPlayer); + if (lvl.background != null) { + Driver.setBackground(lvl.background.getUrl()); + } bpm = d.bpm; //Reads the song's bpm from a metadata file level = lvl; difficulty = d; @@ -153,6 +157,7 @@ public class SongPlayer extends Pane { * The keyboard detection for the game: when a key is pressed it * calls the checkNote() method for the corresponding lane */ + System.out.println(timer.time()); if (e.getCode() == KeyCode.D) { checkNote(dLane, dButton); } @@ -239,7 +244,7 @@ public class SongPlayer extends Pane { button.widthProperty().bind(super.widthProperty().divide(8)); button.arcHeightProperty().bind(super.widthProperty().divide(25)); button.arcWidthProperty().bind(super.widthProperty().divide(25)); - button.setStrokeWidth(3); + button.strokeWidthProperty().bind(super.widthProperty().divide(120)); } /** @@ -277,6 +282,7 @@ public class SongPlayer extends Pane { * @throws UnsupportedAudioFileException */ public void cancel() { + gui.Driver.setBackground("assets/forest.png"); gameLoop.stop(); gui.Driver.mediaPlayer.stop(); Media song = new Media(Paths.get("src/assets/MenuMusicPlaceholder.wav").toUri().toString()); -- cgit v1.2.3