From f3bc2ec111c4c74063261c324f39304c291b9f4c Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Sat, 3 Jun 2023 01:58:06 -0400 Subject: I just realized my syncing fix broke the editor so that's fixed now ft. Ed Sheeran --- levels/Galway Girl/Easy/leaderboard.json | 1 + levels/Galway Girl/Easy/metadata.json | 1 + levels/Galway Girl/Easy/notes.txt | 77 ++++++++++++++++++++++++++++++++ levels/Galway Girl/metadata.json | 1 + src/gameplay/Timer.java | 4 +- 5 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 levels/Galway Girl/Easy/leaderboard.json create mode 100644 levels/Galway Girl/Easy/metadata.json create mode 100644 levels/Galway Girl/Easy/notes.txt create mode 100644 levels/Galway Girl/metadata.json diff --git a/levels/Galway Girl/Easy/leaderboard.json b/levels/Galway Girl/Easy/leaderboard.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/levels/Galway Girl/Easy/leaderboard.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/levels/Galway Girl/Easy/metadata.json b/levels/Galway Girl/Easy/metadata.json new file mode 100644 index 0000000..ea70004 --- /dev/null +++ b/levels/Galway Girl/Easy/metadata.json @@ -0,0 +1 @@ +{"numBeats":50,"title":"Easy","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 new file mode 100644 index 0000000..5b3de0c --- /dev/null +++ b/levels/Galway Girl/Easy/notes.txt @@ -0,0 +1,77 @@ +s4.0 +s5.5 +j6.7 +f7.2 +s7.6 +k8.1 +d8.1 +s9.1 +k9.6 +d9.7 +s10.7 +j11.2 +s12.2 +j12.6 +f13.1 +s13.6 +s14.6 +k15.1 +d15.1 +s16.1 +s16.5 +s17.1 +s17.5 +s18.1 +d19.1 +k19.1 +s20.1 +j20.8 +f21.1 +s21.6 +k22.6 +d23.1 +s24.1 +j24.9 +f25.2 +s25.7 +k26.6 +d27.1 +s28.1 +j28.9 +f29.1 +s29.6 +k30.7 +d31.1 +s32.2 +s34.6 +k35.1 +d35.1 +j36.1 +f36.1 +d37.1 +k37.1 +s37.6 +s38.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 +f45.6 +s46.1 +k47.2 +s48.1 +s48.6 +s49.2 +s49.6 +s50.1 +s50.6 +s51.1 +s51.6 diff --git a/levels/Galway Girl/metadata.json b/levels/Galway Girl/metadata.json new file mode 100644 index 0000000..b8d2120 --- /dev/null +++ b/levels/Galway Girl/metadata.json @@ -0,0 +1 @@ +{"color1":"0x6680e6ff","color2":"0x334db3ff","artist":"Ed Sheeran","title":"Galway Girl","color5":"0x6680e6ff","color3":"0x4d4d4dff","desc":"Fred Shmeeran Returns","color4":"0x334db3ff"} \ No newline at end of file diff --git a/src/gameplay/Timer.java b/src/gameplay/Timer.java index bf07683..96a6c30 100644 --- a/src/gameplay/Timer.java +++ b/src/gameplay/Timer.java @@ -22,7 +22,7 @@ public class Timer return ((double)(System.currentTimeMillis()-timeStart)-2000)*(bpm/60000.0); } - public String toString() { - return ""+((double)(System.currentTimeMillis()-timeStart)-2000)*(bpm/60000.0); + public String toString() { + return ""+((Math.round(10*(((double)(System.currentTimeMillis()-timeStart))*(bpm/60000.0))))/10.0); } } -- cgit v1.2.3