From 84b2f07c1d23ca08bd3f3ce34d62d069708a320a Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Sun, 8 Jan 2023 22:04:06 +0100 Subject: [PATCH] songs asset management (waiting for poll to end) --- assets/data/charts/ridge/normal.json | 1 - assets/data/charts/smash/normal.json | 1 - assets/songs/blammed/{ => audio}/Inst.mp3 | Bin assets/songs/blammed/{ => audio}/Inst.ogg | Bin assets/songs/blammed/{ => audio}/Voices.mp3 | Bin assets/songs/blammed/{ => audio}/Voices.ogg | Bin .../blammed/charts}/easy.json | 0 .../blammed/charts}/hard.json | 0 .../blammed/charts}/normal.json | 0 assets/songs/bopeebo/{ => audio}/Inst.mp3 | Bin assets/songs/bopeebo/{ => audio}/Inst.ogg | Bin assets/songs/bopeebo/{ => audio}/Voices.mp3 | Bin assets/songs/bopeebo/{ => audio}/Voices.ogg | Bin .../bopeebo/charts}/easy.json | 0 .../bopeebo/charts}/hard.json | 0 .../bopeebo/charts}/normal.json | 0 .../bopeebo => songs/bopeebo/scripts}/hey.hx | 0 assets/songs/cocoa/{ => audio}/Inst.mp3 | Bin assets/songs/cocoa/{ => audio}/Inst.ogg | Bin assets/songs/cocoa/{ => audio}/Voices.mp3 | Bin assets/songs/cocoa/{ => audio}/Voices.ogg | Bin .../cocoa => songs/cocoa/charts}/easy.json | 0 .../cocoa => songs/cocoa/charts}/hard.json | 0 .../cocoa => songs/cocoa/charts}/normal.json | 0 .../cocoa => songs/cocoa/scripts}/week5.hx | 0 assets/songs/dadbattle/{ => audio}/Inst.mp3 | Bin assets/songs/dadbattle/{ => audio}/Inst.ogg | Bin assets/songs/dadbattle/{ => audio}/Voices.mp3 | Bin assets/songs/dadbattle/{ => audio}/Voices.ogg | Bin .../dadbattle/charts}/easy.json | 0 .../dadbattle/charts}/hard.json | 0 .../dadbattle/charts}/normal.json | 0 assets/songs/eggnog/{ => audio}/Inst.mp3 | Bin assets/songs/eggnog/{ => audio}/Inst.ogg | Bin assets/songs/eggnog/{ => audio}/Voices.mp3 | Bin assets/songs/eggnog/{ => audio}/Voices.ogg | Bin .../eggnog => songs/eggnog/charts}/easy.json | 0 .../eggnog => songs/eggnog/charts}/hard.json | 0 .../eggnog/charts}/normal.json | 0 .../eggnog/end-cutscene.hx} | 0 .../eggnog => songs/eggnog/scripts}/week5.hx | 0 assets/songs/fresh/{ => audio}/Inst.mp3 | Bin assets/songs/fresh/{ => audio}/Inst.ogg | Bin assets/songs/fresh/{ => audio}/Voices.mp3 | Bin assets/songs/fresh/{ => audio}/Voices.ogg | Bin .../fresh => songs/fresh/charts}/easy.json | 0 .../fresh => songs/fresh/charts}/hard.json | 0 .../fresh => songs/fresh/charts}/normal.json | 0 .../fresh => songs/fresh/scripts}/gf-speed.hx | 0 assets/songs/guns/{ => audio}/Inst.mp3 | Bin assets/songs/guns/{ => audio}/Inst.ogg | Bin assets/songs/guns/{ => audio}/Voices.mp3 | Bin assets/songs/guns/{ => audio}/Voices.ogg | Bin .../guns => songs/guns/charts}/easy.json | 0 .../guns => songs/guns/charts}/hard.json | 0 .../guns => songs/guns/charts}/normal.json | 0 assets/songs/high/{ => audio}/Inst.mp3 | Bin assets/songs/high/{ => audio}/Inst.ogg | Bin assets/songs/high/{ => audio}/Voices.mp3 | Bin assets/songs/high/{ => audio}/Voices.ogg | Bin .../high => songs/high/charts}/easy.json | 0 .../high => songs/high/charts}/hard.json | 0 .../high => songs/high/charts}/normal.json | 0 assets/songs/milf/{ => audio}/Inst.mp3 | Bin assets/songs/milf/{ => audio}/Inst.ogg | Bin assets/songs/milf/{ => audio}/Voices.mp3 | Bin assets/songs/milf/{ => audio}/Voices.ogg | Bin .../milf => songs/milf/charts}/easy.json | 0 .../milf => songs/milf/charts}/hard.json | 0 .../milf => songs/milf/charts}/normal.json | 0 .../milf => songs/milf/scripts}/bump.hx | 0 assets/songs/monster/{ => audio}/Inst.mp3 | Bin assets/songs/monster/{ => audio}/Inst.ogg | Bin assets/songs/monster/{ => audio}/Voices.mp3 | Bin assets/songs/monster/{ => audio}/Voices.ogg | Bin .../monster/charts}/easy.json | 0 .../monster/charts}/hard.json | 0 .../monster/charts}/normal.json | 0 assets/songs/philly nice/{ => audio}/Inst.mp3 | Bin assets/songs/philly nice/{ => audio}/Inst.ogg | Bin .../songs/philly nice/{ => audio}/Voices.mp3 | Bin .../songs/philly nice/{ => audio}/Voices.ogg | Bin .../philly nice/charts}/easy.json | 0 .../philly nice/charts}/hard.json | 0 .../philly nice/charts}/normal.json | 0 assets/songs/pico/{ => audio}/Inst.mp3 | Bin assets/songs/pico/{ => audio}/Inst.ogg | Bin assets/songs/pico/{ => audio}/Voices.mp3 | Bin assets/songs/pico/{ => audio}/Voices.ogg | Bin .../pico => songs/pico/charts}/easy.json | 0 .../pico => songs/pico/charts}/hard.json | 0 .../pico => songs/pico/charts}/normal.json | 0 assets/songs/roses/{ => audio}/Inst.mp3 | Bin assets/songs/roses/{ => audio}/Inst.ogg | Bin assets/songs/roses/{ => audio}/Voices.mp3 | Bin assets/songs/roses/{ => audio}/Voices.ogg | Bin .../roses => songs/roses/charts}/easy.json | 0 .../roses => songs/roses/charts}/hard.json | 0 .../roses => songs/roses/charts}/normal.json | 0 .../songs/satin panties/{ => audio}/Inst.mp3 | Bin .../songs/satin panties/{ => audio}/Inst.ogg | Bin .../satin panties/{ => audio}/Voices.mp3 | Bin .../satin panties/{ => audio}/Voices.ogg | Bin .../satin panties/charts}/easy.json | 0 .../satin panties/charts}/hard.json | 0 .../satin panties/charts}/normal.json | 0 assets/songs/senpai/{ => audio}/Inst.mp3 | Bin assets/songs/senpai/{ => audio}/Inst.ogg | Bin assets/songs/senpai/{ => audio}/Voices.mp3 | Bin assets/songs/senpai/{ => audio}/Voices.ogg | Bin .../senpai => songs/senpai/charts}/easy.json | 0 .../senpai => songs/senpai/charts}/hard.json | 0 .../senpai/charts}/normal.json | 0 assets/songs/south/{ => audio}/Inst.mp3 | Bin assets/songs/south/{ => audio}/Inst.ogg | Bin assets/songs/south/{ => audio}/Voices.mp3 | Bin assets/songs/south/{ => audio}/Voices.ogg | Bin .../south => songs/south/charts}/easy.json | 0 .../south => songs/south/charts}/hard.json | 0 .../south => songs/south/charts}/normal.json | 0 assets/songs/spookeez/{ => audio}/Inst.mp3 | Bin assets/songs/spookeez/{ => audio}/Inst.ogg | Bin assets/songs/spookeez/{ => audio}/Voices.mp3 | Bin assets/songs/spookeez/{ => audio}/Voices.ogg | Bin .../spookeez/charts}/easy.json | 0 .../spookeez/charts}/hard.json | 0 .../spookeez/charts}/normal.json | 0 assets/songs/stress/{ => audio}/Inst.mp3 | Bin assets/songs/stress/{ => audio}/Inst.ogg | Bin assets/songs/stress/{ => audio}/Voices.mp3 | Bin assets/songs/stress/{ => audio}/Voices.ogg | Bin .../stress => songs/stress/charts}/easy.json | 0 .../stress => songs/stress/charts}/hard.json | 0 .../stress/charts}/normal.json | 0 .../charts => songs}/stress/picospeaker.json | 0 .../stress => songs/stress/scripts}/chart.hx | 0 assets/songs/test/{ => audio}/Inst.mp3 | Bin assets/songs/test/{ => audio}/Inst.ogg | Bin assets/songs/test/{ => audio}/Voices.mp3 | Bin assets/songs/test/{ => audio}/Voices.ogg | Bin .../test => songs/test/charts}/normal.json | 0 .../test => songs/test/scripts}/modchart.hx | 0 assets/songs/thorns/{ => audio}/Inst.mp3 | Bin assets/songs/thorns/{ => audio}/Inst.ogg | Bin assets/songs/thorns/{ => audio}/Voices.mp3 | Bin assets/songs/thorns/{ => audio}/Voices.ogg | Bin .../thorns => songs/thorns/charts}/easy.json | 0 .../thorns => songs/thorns/charts}/hard.json | 0 .../thorns/charts}/normal.json | 0 assets/songs/tutorial/{ => audio}/Inst.mp3 | Bin assets/songs/tutorial/{ => audio}/Inst.ogg | Bin .../tutorial/charts}/easy.json | 0 .../tutorial/charts}/hard.json | 0 .../tutorial/charts}/normal.json | 0 assets/songs/ugh/{ => audio}/Inst.mp3 | Bin assets/songs/ugh/{ => audio}/Inst.ogg | Bin assets/songs/ugh/{ => audio}/Voices.mp3 | Bin assets/songs/ugh/{ => audio}/Voices.ogg | Bin .../charts/ugh => songs/ugh/charts}/easy.json | 0 .../charts/ugh => songs/ugh/charts}/hard.json | 0 .../ugh => songs/ugh/charts}/normal.json | 0 .../winter horrorland/{ => audio}/Inst.mp3 | Bin .../winter horrorland/{ => audio}/Inst.ogg | Bin .../winter horrorland/{ => audio}/Voices.mp3 | Bin .../winter horrorland/{ => audio}/Voices.ogg | Bin .../winter horrorland/charts}/easy.json | 0 .../winter horrorland/charts}/hard.json | 0 .../winter horrorland/charts}/normal.json | 0 buildnumber.txt | 2 +- source/funkin/game/PlayState.hx | 7 +++--- source/funkin/menus/FreeplayState.hx | 2 +- source/funkin/system/Paths.hx | 20 +++++++----------- 172 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 assets/data/charts/ridge/normal.json delete mode 100644 assets/data/charts/smash/normal.json rename assets/songs/blammed/{ => audio}/Inst.mp3 (100%) rename assets/songs/blammed/{ => audio}/Inst.ogg (100%) rename assets/songs/blammed/{ => audio}/Voices.mp3 (100%) rename assets/songs/blammed/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/blammed => songs/blammed/charts}/easy.json (100%) rename assets/{data/charts/blammed => songs/blammed/charts}/hard.json (100%) rename assets/{data/charts/blammed => songs/blammed/charts}/normal.json (100%) rename assets/songs/bopeebo/{ => audio}/Inst.mp3 (100%) rename assets/songs/bopeebo/{ => audio}/Inst.ogg (100%) rename assets/songs/bopeebo/{ => audio}/Voices.mp3 (100%) rename assets/songs/bopeebo/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/bopeebo => songs/bopeebo/charts}/easy.json (100%) rename assets/{data/charts/bopeebo => songs/bopeebo/charts}/hard.json (100%) rename assets/{data/charts/bopeebo => songs/bopeebo/charts}/normal.json (100%) rename assets/{data/charts/bopeebo => songs/bopeebo/scripts}/hey.hx (100%) rename assets/songs/cocoa/{ => audio}/Inst.mp3 (100%) rename assets/songs/cocoa/{ => audio}/Inst.ogg (100%) rename assets/songs/cocoa/{ => audio}/Voices.mp3 (100%) rename assets/songs/cocoa/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/cocoa => songs/cocoa/charts}/easy.json (100%) rename assets/{data/charts/cocoa => songs/cocoa/charts}/hard.json (100%) rename assets/{data/charts/cocoa => songs/cocoa/charts}/normal.json (100%) rename assets/{data/charts/cocoa => songs/cocoa/scripts}/week5.hx (100%) rename assets/songs/dadbattle/{ => audio}/Inst.mp3 (100%) rename assets/songs/dadbattle/{ => audio}/Inst.ogg (100%) rename assets/songs/dadbattle/{ => audio}/Voices.mp3 (100%) rename assets/songs/dadbattle/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/dadbattle => songs/dadbattle/charts}/easy.json (100%) rename assets/{data/charts/dadbattle => songs/dadbattle/charts}/hard.json (100%) rename assets/{data/charts/dadbattle => songs/dadbattle/charts}/normal.json (100%) rename assets/songs/eggnog/{ => audio}/Inst.mp3 (100%) rename assets/songs/eggnog/{ => audio}/Inst.ogg (100%) rename assets/songs/eggnog/{ => audio}/Voices.mp3 (100%) rename assets/songs/eggnog/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/eggnog => songs/eggnog/charts}/easy.json (100%) rename assets/{data/charts/eggnog => songs/eggnog/charts}/hard.json (100%) rename assets/{data/charts/eggnog => songs/eggnog/charts}/normal.json (100%) rename assets/{data/cutscenes/eggnog-end.hx => songs/eggnog/end-cutscene.hx} (100%) rename assets/{data/charts/eggnog => songs/eggnog/scripts}/week5.hx (100%) rename assets/songs/fresh/{ => audio}/Inst.mp3 (100%) rename assets/songs/fresh/{ => audio}/Inst.ogg (100%) rename assets/songs/fresh/{ => audio}/Voices.mp3 (100%) rename assets/songs/fresh/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/fresh => songs/fresh/charts}/easy.json (100%) rename assets/{data/charts/fresh => songs/fresh/charts}/hard.json (100%) rename assets/{data/charts/fresh => songs/fresh/charts}/normal.json (100%) rename assets/{data/charts/fresh => songs/fresh/scripts}/gf-speed.hx (100%) rename assets/songs/guns/{ => audio}/Inst.mp3 (100%) rename assets/songs/guns/{ => audio}/Inst.ogg (100%) rename assets/songs/guns/{ => audio}/Voices.mp3 (100%) rename assets/songs/guns/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/guns => songs/guns/charts}/easy.json (100%) rename assets/{data/charts/guns => songs/guns/charts}/hard.json (100%) rename assets/{data/charts/guns => songs/guns/charts}/normal.json (100%) rename assets/songs/high/{ => audio}/Inst.mp3 (100%) rename assets/songs/high/{ => audio}/Inst.ogg (100%) rename assets/songs/high/{ => audio}/Voices.mp3 (100%) rename assets/songs/high/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/high => songs/high/charts}/easy.json (100%) rename assets/{data/charts/high => songs/high/charts}/hard.json (100%) rename assets/{data/charts/high => songs/high/charts}/normal.json (100%) rename assets/songs/milf/{ => audio}/Inst.mp3 (100%) rename assets/songs/milf/{ => audio}/Inst.ogg (100%) rename assets/songs/milf/{ => audio}/Voices.mp3 (100%) rename assets/songs/milf/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/milf => songs/milf/charts}/easy.json (100%) rename assets/{data/charts/milf => songs/milf/charts}/hard.json (100%) rename assets/{data/charts/milf => songs/milf/charts}/normal.json (100%) rename assets/{data/charts/milf => songs/milf/scripts}/bump.hx (100%) rename assets/songs/monster/{ => audio}/Inst.mp3 (100%) rename assets/songs/monster/{ => audio}/Inst.ogg (100%) rename assets/songs/monster/{ => audio}/Voices.mp3 (100%) rename assets/songs/monster/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/monster => songs/monster/charts}/easy.json (100%) rename assets/{data/charts/monster => songs/monster/charts}/hard.json (100%) rename assets/{data/charts/monster => songs/monster/charts}/normal.json (100%) rename assets/songs/philly nice/{ => audio}/Inst.mp3 (100%) rename assets/songs/philly nice/{ => audio}/Inst.ogg (100%) rename assets/songs/philly nice/{ => audio}/Voices.mp3 (100%) rename assets/songs/philly nice/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/philly nice => songs/philly nice/charts}/easy.json (100%) rename assets/{data/charts/philly nice => songs/philly nice/charts}/hard.json (100%) rename assets/{data/charts/philly nice => songs/philly nice/charts}/normal.json (100%) rename assets/songs/pico/{ => audio}/Inst.mp3 (100%) rename assets/songs/pico/{ => audio}/Inst.ogg (100%) rename assets/songs/pico/{ => audio}/Voices.mp3 (100%) rename assets/songs/pico/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/pico => songs/pico/charts}/easy.json (100%) rename assets/{data/charts/pico => songs/pico/charts}/hard.json (100%) rename assets/{data/charts/pico => songs/pico/charts}/normal.json (100%) rename assets/songs/roses/{ => audio}/Inst.mp3 (100%) rename assets/songs/roses/{ => audio}/Inst.ogg (100%) rename assets/songs/roses/{ => audio}/Voices.mp3 (100%) rename assets/songs/roses/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/roses => songs/roses/charts}/easy.json (100%) rename assets/{data/charts/roses => songs/roses/charts}/hard.json (100%) rename assets/{data/charts/roses => songs/roses/charts}/normal.json (100%) rename assets/songs/satin panties/{ => audio}/Inst.mp3 (100%) rename assets/songs/satin panties/{ => audio}/Inst.ogg (100%) rename assets/songs/satin panties/{ => audio}/Voices.mp3 (100%) rename assets/songs/satin panties/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/satin panties => songs/satin panties/charts}/easy.json (100%) rename assets/{data/charts/satin panties => songs/satin panties/charts}/hard.json (100%) rename assets/{data/charts/satin panties => songs/satin panties/charts}/normal.json (100%) rename assets/songs/senpai/{ => audio}/Inst.mp3 (100%) rename assets/songs/senpai/{ => audio}/Inst.ogg (100%) rename assets/songs/senpai/{ => audio}/Voices.mp3 (100%) rename assets/songs/senpai/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/senpai => songs/senpai/charts}/easy.json (100%) rename assets/{data/charts/senpai => songs/senpai/charts}/hard.json (100%) rename assets/{data/charts/senpai => songs/senpai/charts}/normal.json (100%) rename assets/songs/south/{ => audio}/Inst.mp3 (100%) rename assets/songs/south/{ => audio}/Inst.ogg (100%) rename assets/songs/south/{ => audio}/Voices.mp3 (100%) rename assets/songs/south/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/south => songs/south/charts}/easy.json (100%) rename assets/{data/charts/south => songs/south/charts}/hard.json (100%) rename assets/{data/charts/south => songs/south/charts}/normal.json (100%) rename assets/songs/spookeez/{ => audio}/Inst.mp3 (100%) rename assets/songs/spookeez/{ => audio}/Inst.ogg (100%) rename assets/songs/spookeez/{ => audio}/Voices.mp3 (100%) rename assets/songs/spookeez/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/spookeez => songs/spookeez/charts}/easy.json (100%) rename assets/{data/charts/spookeez => songs/spookeez/charts}/hard.json (100%) rename assets/{data/charts/spookeez => songs/spookeez/charts}/normal.json (100%) rename assets/songs/stress/{ => audio}/Inst.mp3 (100%) rename assets/songs/stress/{ => audio}/Inst.ogg (100%) rename assets/songs/stress/{ => audio}/Voices.mp3 (100%) rename assets/songs/stress/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/stress => songs/stress/charts}/easy.json (100%) rename assets/{data/charts/stress => songs/stress/charts}/hard.json (100%) rename assets/{data/charts/stress => songs/stress/charts}/normal.json (100%) rename assets/{data/charts => songs}/stress/picospeaker.json (100%) rename assets/{data/charts/stress => songs/stress/scripts}/chart.hx (100%) rename assets/songs/test/{ => audio}/Inst.mp3 (100%) rename assets/songs/test/{ => audio}/Inst.ogg (100%) rename assets/songs/test/{ => audio}/Voices.mp3 (100%) rename assets/songs/test/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/test => songs/test/charts}/normal.json (100%) rename assets/{data/charts/test => songs/test/scripts}/modchart.hx (100%) rename assets/songs/thorns/{ => audio}/Inst.mp3 (100%) rename assets/songs/thorns/{ => audio}/Inst.ogg (100%) rename assets/songs/thorns/{ => audio}/Voices.mp3 (100%) rename assets/songs/thorns/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/thorns => songs/thorns/charts}/easy.json (100%) rename assets/{data/charts/thorns => songs/thorns/charts}/hard.json (100%) rename assets/{data/charts/thorns => songs/thorns/charts}/normal.json (100%) rename assets/songs/tutorial/{ => audio}/Inst.mp3 (100%) rename assets/songs/tutorial/{ => audio}/Inst.ogg (100%) rename assets/{data/charts/tutorial => songs/tutorial/charts}/easy.json (100%) rename assets/{data/charts/tutorial => songs/tutorial/charts}/hard.json (100%) rename assets/{data/charts/tutorial => songs/tutorial/charts}/normal.json (100%) rename assets/songs/ugh/{ => audio}/Inst.mp3 (100%) rename assets/songs/ugh/{ => audio}/Inst.ogg (100%) rename assets/songs/ugh/{ => audio}/Voices.mp3 (100%) rename assets/songs/ugh/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/ugh => songs/ugh/charts}/easy.json (100%) rename assets/{data/charts/ugh => songs/ugh/charts}/hard.json (100%) rename assets/{data/charts/ugh => songs/ugh/charts}/normal.json (100%) rename assets/songs/winter horrorland/{ => audio}/Inst.mp3 (100%) rename assets/songs/winter horrorland/{ => audio}/Inst.ogg (100%) rename assets/songs/winter horrorland/{ => audio}/Voices.mp3 (100%) rename assets/songs/winter horrorland/{ => audio}/Voices.ogg (100%) rename assets/{data/charts/winter horrorland => songs/winter horrorland/charts}/easy.json (100%) rename assets/{data/charts/winter horrorland => songs/winter horrorland/charts}/hard.json (100%) rename assets/{data/charts/winter horrorland => songs/winter horrorland/charts}/normal.json (100%) diff --git a/assets/data/charts/ridge/normal.json b/assets/data/charts/ridge/normal.json deleted file mode 100644 index 33537a61..00000000 --- a/assets/data/charts/ridge/normal.json +++ /dev/null @@ -1 +0,0 @@ -{"song":{"song":"Ridge","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[7138,0,0],[7345,2,0],[7552,3,0],[7759,0,0],[7862,3,315.7894736842105]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[8793,1,0],[8897,3,0],[9103,3,0],[9310,2,0],[9517,3,0],[9724,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[9936,3,1578.947368421053]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[11897,1,517.2413793103449],[12310,3,0],[12517,1,310.3448275862069],[12828,0,0],[13034,1,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[13862,1,0],[14069,3,0],[14276,0,0],[14379,1,0],[14586,3,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[15517,1,0],[15621,3,0],[15828,0,0],[16034,0,0],[16241,3,0],[16448,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[16655,2,413.7931034482759],[17172,1,103.44827586206898],[17379,0,1344.8275862068967]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[18517,1,0],[18724,2,620.689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[20483,0,0],[20483,4,0],[20586,3,0],[20586,7,0],[20793,2,0],[20793,6,0],[21000,3,0],[21000,7,0],[21207,0,0],[21207,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[22138,2,0],[22345,3,0],[22345,7,0],[22138,6,0],[22552,3,0],[22552,7,0],[22759,1,0],[22759,5,0],[22966,0,0],[22966,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[23185,1,0],[23188,5,0],[23483,7,310.3448275862069],[23483,3,310.3448275862069],[23793,1,0],[24000,2,0],[24000,6,0],[24207,2,0],[24207,6,0],[24414,4,310.3448275862069],[24414,0,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[25655,0,0],[26069,3,0],[26276,2,310.3448275862069],[26172,1,0],[25862,1,103.44827586206897]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26793,3,0],[27207,0,0],[27310,1,1137.931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[29172,2,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[37138,3,0],[37241,1,0],[37448,0,0],[37655,0,0],[37862,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[38087,3,0],[38379,2,310.3448275862069],[38793,1,206.89655172413794],[39103,2,1086.2068965517246]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[40345,3,0],[40448,2,724.137931034483],[41276,2,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[42103,0,0],[42103,4,0],[42310,7,0],[42310,3,0],[42517,5,0],[42517,1,0],[42724,3,0],[42724,7,0],[42828,6,0],[42828,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[45517,0,0],[45724,3,0],[45517,4,0],[45724,7,0],[45931,5,0],[45931,1,0],[46138,6,0],[46138,2,0],[46034,7,0],[46034,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[47172,1,0],[47172,5,0],[47379,7,0],[47379,3,0],[47483,2,0],[47483,6,0],[47690,2,0],[47690,6,0],[47897,0,0],[47897,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[48008,1,0],[48008,5,0],[48414,3,0],[48414,7,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[51828,2,0],[52448,0,0],[52655,3,0],[52138,1,0],[52862,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[53172,2,413.7931034482759],[53690,0,206.89655172413794],[54414,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[54621,3,0],[54828,0,517.2413793103449],[55448,1,1189.6551724137935]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[57000,3,0],[57000,7,0],[57207,1,0],[57207,5,0],[57414,7,0],[57414,3,0],[57621,2,0],[57621,6,0],[57828,0,413.7931034482759],[57828,4,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[58448,2,206.89655172413794],[58759,3,206.89655172413794],[59172,0,206.89655172413794],[59483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[59690,1,0],[59897,2,517.2413793103449],[60517,0,206.89655172413794],[61138,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[61345,1,0],[61552,2,517.2413793103449],[62172,0,982.7586206896557]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[63621,2,0],[63828,3,0],[64034,0,0],[64138,3,0],[64345,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[65172,2,0],[65483,3,0],[65897,3,0],[66103,0,0],[64552,5,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[66310,1,0],[66517,2,465.51724137931035],[67138,0,568.9655172413794],[67759,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[67965.1724137931,1,0],[68172.1724137931,2,465.51724137931035],[68793.1724137931,0,568.9655172413794]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[70345,0,0],[70345,7,0],[70552,3,0],[70552,4,0],[70759,0,0],[70759,7,0],[70862,1,0],[70862,5,0],[71069,6,0],[71069,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[71276,0,0],[71276,7,0],[71689.37931034483,2,206.89655172413794],[72000.37931034483,3,206.89655172413794],[72413.37931034483,0,206.89655172413794],[72724.37931034483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[72931.37931034483,1,0],[73138.37931034483,2,517.2413793103449],[73758.37931034483,0,206.89655172413794],[74379.37931034483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[74586.37931034483,1,0],[74793.37931034483,2,517.2413793103449],[75413.37931034483,0,982.7586206896557]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[76552,3,0],[76655,0,672.4137931034485],[77379,2,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[78310,0,0],[78310,4,0],[78517,7,0],[78517,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[79456,2,568.9655172413794],[80069,1,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[81116,6,517.2413793103449],[81724,0,0],[81931,7,0],[81724,4,0],[81931,3,0],[81109,2,517.2413793103449],[82345,5,0],[82552,6,362.0689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[82862,3,0],[83069,0,258.62068965517244],[83379,1,0],[83586,3,413.7931034482759],[84000,4,0],[84103,5,0],[84207,6,0],[84310,7,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[84414,3,0],[84621,2,0],[84828,1,0],[85034,0,0],[85241,0,0],[85448,2,1655.1724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[90724,2,0],[90931,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[91192,1,0],[91552,3,0],[91966,3,0],[92172,0,0],[92379,2,775.8620689655176]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[93000,1,0],[93103,2,620.689655172414],[94241,7,0],[94138,6,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[94345,0,0],[94552,1,0],[94759,3,0],[94966,1,0],[95172,0,0],[95379,2,0],[95586,3,0],[95793,0,672.4137931034485]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[96517,2,0],[96724,1,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[97663,2,310.344827586207],[98586,4,0],[98897,7,0],[99103,4,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[100345,0,0],[100655,3,0],[100862,0,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[101379,2,0],[101586,0,362.0689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[103448,0,0],[103862,3,0],[104172,2,568.9655172413794]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[104897,3,0],[105000,2,724.137931034483]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[106138,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":145,"sections":0,"needsVoices":true,"player1":"bf","player2":"dad","sectionLengths":[],"speed":1.3000000000000003},"bpm":145,"sections":66,"notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[7138,0,0],[7345,2,0],[7552,3,0],[7759,0,0],[7862,3,315.7894736842105]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[8793,1,0],[8897,3,0],[9103,3,0],[9310,2,0],[9517,3,0],[9724,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[9936,3,1578.947368421053]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[11897,1,517.2413793103449],[12310,3,0],[12517,1,310.3448275862069],[12828,0,0],[13034,1,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[13862,1,0],[14069,3,0],[14276,0,0],[14379,1,0],[14586,3,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[15517,1,0],[15621,3,0],[15828,0,0],[16034,0,0],[16241,3,0],[16448,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[16655,2,413.7931034482759],[17172,1,103.44827586206898],[17379,0,1344.8275862068967]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[18517,1,0],[18724,2,620.689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[20483,0,0],[20483,4,0],[20586,3,0],[20586,7,0],[20793,2,0],[20793,6,0],[21000,3,0],[21000,7,0],[21207,0,0],[21207,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[22138,2,0],[22345,3,0],[22345,7,0],[22138,6,0],[22552,3,0],[22552,7,0],[22759,1,0],[22759,5,0],[22966,0,0],[22966,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[23185,1,0],[23188,5,0],[23483,7,310.3448275862069],[23483,3,310.3448275862069],[23793,1,0],[24000,2,0],[24000,6,0],[24207,2,0],[24207,6,0],[24414,4,310.3448275862069],[24414,0,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[25655,0,0],[26069,3,0],[26276,2,310.3448275862069],[26172,1,0],[25862,1,103.44827586206897]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26793,3,0],[27207,0,0],[27310,1,1137.931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[29172,2,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[37138,3,0],[37241,1,0],[37448,0,0],[37655,0,0],[37862,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[38087,3,0],[38379,2,310.3448275862069],[38793,1,206.89655172413794],[39103,2,1086.2068965517246]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[40345,3,0],[40448,2,724.137931034483],[41276,2,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[42103,0,0],[42103,4,0],[42310,7,0],[42310,3,0],[42517,5,0],[42517,1,0],[42724,3,0],[42724,7,0],[42828,6,0],[42828,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[45517,0,0],[45724,3,0],[45517,4,0],[45724,7,0],[45931,5,0],[45931,1,0],[46138,6,0],[46138,2,0],[46034,7,0],[46034,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[47172,1,0],[47172,5,0],[47379,7,0],[47379,3,0],[47483,2,0],[47483,6,0],[47690,2,0],[47690,6,0],[47897,0,0],[47897,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[48008,1,0],[48008,5,0],[48414,3,0],[48414,7,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[51828,2,0],[52448,0,0],[52655,3,0],[52138,1,0],[52862,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[53172,2,413.7931034482759],[53690,0,206.89655172413794],[54414,4,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[54621,3,0],[54828,0,517.2413793103449],[55448,1,1189.6551724137935]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[57000,3,0],[57000,7,0],[57207,1,0],[57207,5,0],[57414,7,0],[57414,3,0],[57621,2,0],[57621,6,0],[57828,0,413.7931034482759],[57828,4,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[58448,2,206.89655172413794],[58759,3,206.89655172413794],[59172,0,206.89655172413794],[59483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[59690,1,0],[59897,2,517.2413793103449],[60517,0,206.89655172413794],[61138,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[61345,1,0],[61552,2,517.2413793103449],[62172,0,982.7586206896557]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[63621,2,0],[63828,3,0],[64034,0,0],[64138,3,0],[64345,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[65172,2,0],[65483,3,0],[65897,3,0],[66103,0,0],[64552,5,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[66310,1,0],[66517,2,465.51724137931035],[67138,0,568.9655172413794],[67759,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[67965.1724137931,1,0],[68172.1724137931,2,465.51724137931035],[68793.1724137931,0,568.9655172413794]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[70345,0,0],[70345,7,0],[70552,3,0],[70552,4,0],[70759,0,0],[70759,7,0],[70862,1,0],[70862,5,0],[71069,6,0],[71069,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[71276,0,0],[71276,7,0],[71689.37931034483,2,206.89655172413794],[72000.37931034483,3,206.89655172413794],[72413.37931034483,0,206.89655172413794],[72724.37931034483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[72931.37931034483,1,0],[73138.37931034483,2,517.2413793103449],[73758.37931034483,0,206.89655172413794],[74379.37931034483,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[74586.37931034483,1,0],[74793.37931034483,2,517.2413793103449],[75413.37931034483,0,982.7586206896557]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[76552,3,0],[76655,0,672.4137931034485],[77379,2,310.3448275862069]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[78310,0,0],[78310,4,0],[78517,7,0],[78517,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[79456,2,568.9655172413794],[80069,1,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[81116,6,517.2413793103449],[81724,0,0],[81931,7,0],[81724,4,0],[81931,3,0],[81109,2,517.2413793103449],[82345,5,0],[82552,6,362.0689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[82862,3,0],[83069,0,258.62068965517244],[83379,1,0],[83586,3,413.7931034482759],[84000,4,0],[84103,5,0],[84207,6,0],[84310,7,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[84414,3,0],[84621,2,0],[84828,1,0],[85034,0,0],[85241,0,0],[85448,2,1655.1724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[90724,2,0],[90931,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[91192,1,0],[91552,3,0],[91966,3,0],[92172,0,0],[92379,2,775.8620689655176]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[93000,1,0],[93103,2,620.689655172414],[94241,7,0],[94138,6,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[94345,0,0],[94552,1,0],[94759,3,0],[94966,1,0],[95172,0,0],[95379,2,0],[95586,3,0],[95793,0,672.4137931034485]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[96517,2,0],[96724,1,465.51724137931035]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[97663,2,310.344827586207],[98586,4,0],[98897,7,0],[99103,4,258.62068965517244]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[100345,0,0],[100655,3,0],[100862,0,413.7931034482759]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[101379,2,0],[101586,0,362.0689655172414]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[103448,0,0],[103862,3,0],[104172,2,568.9655172413794]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[104897,3,0],[105000,2,724.137931034483]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[106138,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":145,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]} \ No newline at end of file diff --git a/assets/data/charts/smash/normal.json b/assets/data/charts/smash/normal.json deleted file mode 100644 index 76c3f608..00000000 --- a/assets/data/charts/smash/normal.json +++ /dev/null @@ -1 +0,0 @@ -{"song":"Smash","bpm":144,"sections":1,"notes":[{"lengthInSteps":16,"notes":[[0,0],[313,1],[729,3]]}]} \ No newline at end of file diff --git a/assets/songs/blammed/Inst.mp3 b/assets/songs/blammed/audio/Inst.mp3 similarity index 100% rename from assets/songs/blammed/Inst.mp3 rename to assets/songs/blammed/audio/Inst.mp3 diff --git a/assets/songs/blammed/Inst.ogg b/assets/songs/blammed/audio/Inst.ogg similarity index 100% rename from assets/songs/blammed/Inst.ogg rename to assets/songs/blammed/audio/Inst.ogg diff --git a/assets/songs/blammed/Voices.mp3 b/assets/songs/blammed/audio/Voices.mp3 similarity index 100% rename from assets/songs/blammed/Voices.mp3 rename to assets/songs/blammed/audio/Voices.mp3 diff --git a/assets/songs/blammed/Voices.ogg b/assets/songs/blammed/audio/Voices.ogg similarity index 100% rename from assets/songs/blammed/Voices.ogg rename to assets/songs/blammed/audio/Voices.ogg diff --git a/assets/data/charts/blammed/easy.json b/assets/songs/blammed/charts/easy.json similarity index 100% rename from assets/data/charts/blammed/easy.json rename to assets/songs/blammed/charts/easy.json diff --git a/assets/data/charts/blammed/hard.json b/assets/songs/blammed/charts/hard.json similarity index 100% rename from assets/data/charts/blammed/hard.json rename to assets/songs/blammed/charts/hard.json diff --git a/assets/data/charts/blammed/normal.json b/assets/songs/blammed/charts/normal.json similarity index 100% rename from assets/data/charts/blammed/normal.json rename to assets/songs/blammed/charts/normal.json diff --git a/assets/songs/bopeebo/Inst.mp3 b/assets/songs/bopeebo/audio/Inst.mp3 similarity index 100% rename from assets/songs/bopeebo/Inst.mp3 rename to assets/songs/bopeebo/audio/Inst.mp3 diff --git a/assets/songs/bopeebo/Inst.ogg b/assets/songs/bopeebo/audio/Inst.ogg similarity index 100% rename from assets/songs/bopeebo/Inst.ogg rename to assets/songs/bopeebo/audio/Inst.ogg diff --git a/assets/songs/bopeebo/Voices.mp3 b/assets/songs/bopeebo/audio/Voices.mp3 similarity index 100% rename from assets/songs/bopeebo/Voices.mp3 rename to assets/songs/bopeebo/audio/Voices.mp3 diff --git a/assets/songs/bopeebo/Voices.ogg b/assets/songs/bopeebo/audio/Voices.ogg similarity index 100% rename from assets/songs/bopeebo/Voices.ogg rename to assets/songs/bopeebo/audio/Voices.ogg diff --git a/assets/data/charts/bopeebo/easy.json b/assets/songs/bopeebo/charts/easy.json similarity index 100% rename from assets/data/charts/bopeebo/easy.json rename to assets/songs/bopeebo/charts/easy.json diff --git a/assets/data/charts/bopeebo/hard.json b/assets/songs/bopeebo/charts/hard.json similarity index 100% rename from assets/data/charts/bopeebo/hard.json rename to assets/songs/bopeebo/charts/hard.json diff --git a/assets/data/charts/bopeebo/normal.json b/assets/songs/bopeebo/charts/normal.json similarity index 100% rename from assets/data/charts/bopeebo/normal.json rename to assets/songs/bopeebo/charts/normal.json diff --git a/assets/data/charts/bopeebo/hey.hx b/assets/songs/bopeebo/scripts/hey.hx similarity index 100% rename from assets/data/charts/bopeebo/hey.hx rename to assets/songs/bopeebo/scripts/hey.hx diff --git a/assets/songs/cocoa/Inst.mp3 b/assets/songs/cocoa/audio/Inst.mp3 similarity index 100% rename from assets/songs/cocoa/Inst.mp3 rename to assets/songs/cocoa/audio/Inst.mp3 diff --git a/assets/songs/cocoa/Inst.ogg b/assets/songs/cocoa/audio/Inst.ogg similarity index 100% rename from assets/songs/cocoa/Inst.ogg rename to assets/songs/cocoa/audio/Inst.ogg diff --git a/assets/songs/cocoa/Voices.mp3 b/assets/songs/cocoa/audio/Voices.mp3 similarity index 100% rename from assets/songs/cocoa/Voices.mp3 rename to assets/songs/cocoa/audio/Voices.mp3 diff --git a/assets/songs/cocoa/Voices.ogg b/assets/songs/cocoa/audio/Voices.ogg similarity index 100% rename from assets/songs/cocoa/Voices.ogg rename to assets/songs/cocoa/audio/Voices.ogg diff --git a/assets/data/charts/cocoa/easy.json b/assets/songs/cocoa/charts/easy.json similarity index 100% rename from assets/data/charts/cocoa/easy.json rename to assets/songs/cocoa/charts/easy.json diff --git a/assets/data/charts/cocoa/hard.json b/assets/songs/cocoa/charts/hard.json similarity index 100% rename from assets/data/charts/cocoa/hard.json rename to assets/songs/cocoa/charts/hard.json diff --git a/assets/data/charts/cocoa/normal.json b/assets/songs/cocoa/charts/normal.json similarity index 100% rename from assets/data/charts/cocoa/normal.json rename to assets/songs/cocoa/charts/normal.json diff --git a/assets/data/charts/cocoa/week5.hx b/assets/songs/cocoa/scripts/week5.hx similarity index 100% rename from assets/data/charts/cocoa/week5.hx rename to assets/songs/cocoa/scripts/week5.hx diff --git a/assets/songs/dadbattle/Inst.mp3 b/assets/songs/dadbattle/audio/Inst.mp3 similarity index 100% rename from assets/songs/dadbattle/Inst.mp3 rename to assets/songs/dadbattle/audio/Inst.mp3 diff --git a/assets/songs/dadbattle/Inst.ogg b/assets/songs/dadbattle/audio/Inst.ogg similarity index 100% rename from assets/songs/dadbattle/Inst.ogg rename to assets/songs/dadbattle/audio/Inst.ogg diff --git a/assets/songs/dadbattle/Voices.mp3 b/assets/songs/dadbattle/audio/Voices.mp3 similarity index 100% rename from assets/songs/dadbattle/Voices.mp3 rename to assets/songs/dadbattle/audio/Voices.mp3 diff --git a/assets/songs/dadbattle/Voices.ogg b/assets/songs/dadbattle/audio/Voices.ogg similarity index 100% rename from assets/songs/dadbattle/Voices.ogg rename to assets/songs/dadbattle/audio/Voices.ogg diff --git a/assets/data/charts/dadbattle/easy.json b/assets/songs/dadbattle/charts/easy.json similarity index 100% rename from assets/data/charts/dadbattle/easy.json rename to assets/songs/dadbattle/charts/easy.json diff --git a/assets/data/charts/dadbattle/hard.json b/assets/songs/dadbattle/charts/hard.json similarity index 100% rename from assets/data/charts/dadbattle/hard.json rename to assets/songs/dadbattle/charts/hard.json diff --git a/assets/data/charts/dadbattle/normal.json b/assets/songs/dadbattle/charts/normal.json similarity index 100% rename from assets/data/charts/dadbattle/normal.json rename to assets/songs/dadbattle/charts/normal.json diff --git a/assets/songs/eggnog/Inst.mp3 b/assets/songs/eggnog/audio/Inst.mp3 similarity index 100% rename from assets/songs/eggnog/Inst.mp3 rename to assets/songs/eggnog/audio/Inst.mp3 diff --git a/assets/songs/eggnog/Inst.ogg b/assets/songs/eggnog/audio/Inst.ogg similarity index 100% rename from assets/songs/eggnog/Inst.ogg rename to assets/songs/eggnog/audio/Inst.ogg diff --git a/assets/songs/eggnog/Voices.mp3 b/assets/songs/eggnog/audio/Voices.mp3 similarity index 100% rename from assets/songs/eggnog/Voices.mp3 rename to assets/songs/eggnog/audio/Voices.mp3 diff --git a/assets/songs/eggnog/Voices.ogg b/assets/songs/eggnog/audio/Voices.ogg similarity index 100% rename from assets/songs/eggnog/Voices.ogg rename to assets/songs/eggnog/audio/Voices.ogg diff --git a/assets/data/charts/eggnog/easy.json b/assets/songs/eggnog/charts/easy.json similarity index 100% rename from assets/data/charts/eggnog/easy.json rename to assets/songs/eggnog/charts/easy.json diff --git a/assets/data/charts/eggnog/hard.json b/assets/songs/eggnog/charts/hard.json similarity index 100% rename from assets/data/charts/eggnog/hard.json rename to assets/songs/eggnog/charts/hard.json diff --git a/assets/data/charts/eggnog/normal.json b/assets/songs/eggnog/charts/normal.json similarity index 100% rename from assets/data/charts/eggnog/normal.json rename to assets/songs/eggnog/charts/normal.json diff --git a/assets/data/cutscenes/eggnog-end.hx b/assets/songs/eggnog/end-cutscene.hx similarity index 100% rename from assets/data/cutscenes/eggnog-end.hx rename to assets/songs/eggnog/end-cutscene.hx diff --git a/assets/data/charts/eggnog/week5.hx b/assets/songs/eggnog/scripts/week5.hx similarity index 100% rename from assets/data/charts/eggnog/week5.hx rename to assets/songs/eggnog/scripts/week5.hx diff --git a/assets/songs/fresh/Inst.mp3 b/assets/songs/fresh/audio/Inst.mp3 similarity index 100% rename from assets/songs/fresh/Inst.mp3 rename to assets/songs/fresh/audio/Inst.mp3 diff --git a/assets/songs/fresh/Inst.ogg b/assets/songs/fresh/audio/Inst.ogg similarity index 100% rename from assets/songs/fresh/Inst.ogg rename to assets/songs/fresh/audio/Inst.ogg diff --git a/assets/songs/fresh/Voices.mp3 b/assets/songs/fresh/audio/Voices.mp3 similarity index 100% rename from assets/songs/fresh/Voices.mp3 rename to assets/songs/fresh/audio/Voices.mp3 diff --git a/assets/songs/fresh/Voices.ogg b/assets/songs/fresh/audio/Voices.ogg similarity index 100% rename from assets/songs/fresh/Voices.ogg rename to assets/songs/fresh/audio/Voices.ogg diff --git a/assets/data/charts/fresh/easy.json b/assets/songs/fresh/charts/easy.json similarity index 100% rename from assets/data/charts/fresh/easy.json rename to assets/songs/fresh/charts/easy.json diff --git a/assets/data/charts/fresh/hard.json b/assets/songs/fresh/charts/hard.json similarity index 100% rename from assets/data/charts/fresh/hard.json rename to assets/songs/fresh/charts/hard.json diff --git a/assets/data/charts/fresh/normal.json b/assets/songs/fresh/charts/normal.json similarity index 100% rename from assets/data/charts/fresh/normal.json rename to assets/songs/fresh/charts/normal.json diff --git a/assets/data/charts/fresh/gf-speed.hx b/assets/songs/fresh/scripts/gf-speed.hx similarity index 100% rename from assets/data/charts/fresh/gf-speed.hx rename to assets/songs/fresh/scripts/gf-speed.hx diff --git a/assets/songs/guns/Inst.mp3 b/assets/songs/guns/audio/Inst.mp3 similarity index 100% rename from assets/songs/guns/Inst.mp3 rename to assets/songs/guns/audio/Inst.mp3 diff --git a/assets/songs/guns/Inst.ogg b/assets/songs/guns/audio/Inst.ogg similarity index 100% rename from assets/songs/guns/Inst.ogg rename to assets/songs/guns/audio/Inst.ogg diff --git a/assets/songs/guns/Voices.mp3 b/assets/songs/guns/audio/Voices.mp3 similarity index 100% rename from assets/songs/guns/Voices.mp3 rename to assets/songs/guns/audio/Voices.mp3 diff --git a/assets/songs/guns/Voices.ogg b/assets/songs/guns/audio/Voices.ogg similarity index 100% rename from assets/songs/guns/Voices.ogg rename to assets/songs/guns/audio/Voices.ogg diff --git a/assets/data/charts/guns/easy.json b/assets/songs/guns/charts/easy.json similarity index 100% rename from assets/data/charts/guns/easy.json rename to assets/songs/guns/charts/easy.json diff --git a/assets/data/charts/guns/hard.json b/assets/songs/guns/charts/hard.json similarity index 100% rename from assets/data/charts/guns/hard.json rename to assets/songs/guns/charts/hard.json diff --git a/assets/data/charts/guns/normal.json b/assets/songs/guns/charts/normal.json similarity index 100% rename from assets/data/charts/guns/normal.json rename to assets/songs/guns/charts/normal.json diff --git a/assets/songs/high/Inst.mp3 b/assets/songs/high/audio/Inst.mp3 similarity index 100% rename from assets/songs/high/Inst.mp3 rename to assets/songs/high/audio/Inst.mp3 diff --git a/assets/songs/high/Inst.ogg b/assets/songs/high/audio/Inst.ogg similarity index 100% rename from assets/songs/high/Inst.ogg rename to assets/songs/high/audio/Inst.ogg diff --git a/assets/songs/high/Voices.mp3 b/assets/songs/high/audio/Voices.mp3 similarity index 100% rename from assets/songs/high/Voices.mp3 rename to assets/songs/high/audio/Voices.mp3 diff --git a/assets/songs/high/Voices.ogg b/assets/songs/high/audio/Voices.ogg similarity index 100% rename from assets/songs/high/Voices.ogg rename to assets/songs/high/audio/Voices.ogg diff --git a/assets/data/charts/high/easy.json b/assets/songs/high/charts/easy.json similarity index 100% rename from assets/data/charts/high/easy.json rename to assets/songs/high/charts/easy.json diff --git a/assets/data/charts/high/hard.json b/assets/songs/high/charts/hard.json similarity index 100% rename from assets/data/charts/high/hard.json rename to assets/songs/high/charts/hard.json diff --git a/assets/data/charts/high/normal.json b/assets/songs/high/charts/normal.json similarity index 100% rename from assets/data/charts/high/normal.json rename to assets/songs/high/charts/normal.json diff --git a/assets/songs/milf/Inst.mp3 b/assets/songs/milf/audio/Inst.mp3 similarity index 100% rename from assets/songs/milf/Inst.mp3 rename to assets/songs/milf/audio/Inst.mp3 diff --git a/assets/songs/milf/Inst.ogg b/assets/songs/milf/audio/Inst.ogg similarity index 100% rename from assets/songs/milf/Inst.ogg rename to assets/songs/milf/audio/Inst.ogg diff --git a/assets/songs/milf/Voices.mp3 b/assets/songs/milf/audio/Voices.mp3 similarity index 100% rename from assets/songs/milf/Voices.mp3 rename to assets/songs/milf/audio/Voices.mp3 diff --git a/assets/songs/milf/Voices.ogg b/assets/songs/milf/audio/Voices.ogg similarity index 100% rename from assets/songs/milf/Voices.ogg rename to assets/songs/milf/audio/Voices.ogg diff --git a/assets/data/charts/milf/easy.json b/assets/songs/milf/charts/easy.json similarity index 100% rename from assets/data/charts/milf/easy.json rename to assets/songs/milf/charts/easy.json diff --git a/assets/data/charts/milf/hard.json b/assets/songs/milf/charts/hard.json similarity index 100% rename from assets/data/charts/milf/hard.json rename to assets/songs/milf/charts/hard.json diff --git a/assets/data/charts/milf/normal.json b/assets/songs/milf/charts/normal.json similarity index 100% rename from assets/data/charts/milf/normal.json rename to assets/songs/milf/charts/normal.json diff --git a/assets/data/charts/milf/bump.hx b/assets/songs/milf/scripts/bump.hx similarity index 100% rename from assets/data/charts/milf/bump.hx rename to assets/songs/milf/scripts/bump.hx diff --git a/assets/songs/monster/Inst.mp3 b/assets/songs/monster/audio/Inst.mp3 similarity index 100% rename from assets/songs/monster/Inst.mp3 rename to assets/songs/monster/audio/Inst.mp3 diff --git a/assets/songs/monster/Inst.ogg b/assets/songs/monster/audio/Inst.ogg similarity index 100% rename from assets/songs/monster/Inst.ogg rename to assets/songs/monster/audio/Inst.ogg diff --git a/assets/songs/monster/Voices.mp3 b/assets/songs/monster/audio/Voices.mp3 similarity index 100% rename from assets/songs/monster/Voices.mp3 rename to assets/songs/monster/audio/Voices.mp3 diff --git a/assets/songs/monster/Voices.ogg b/assets/songs/monster/audio/Voices.ogg similarity index 100% rename from assets/songs/monster/Voices.ogg rename to assets/songs/monster/audio/Voices.ogg diff --git a/assets/data/charts/monster/easy.json b/assets/songs/monster/charts/easy.json similarity index 100% rename from assets/data/charts/monster/easy.json rename to assets/songs/monster/charts/easy.json diff --git a/assets/data/charts/monster/hard.json b/assets/songs/monster/charts/hard.json similarity index 100% rename from assets/data/charts/monster/hard.json rename to assets/songs/monster/charts/hard.json diff --git a/assets/data/charts/monster/normal.json b/assets/songs/monster/charts/normal.json similarity index 100% rename from assets/data/charts/monster/normal.json rename to assets/songs/monster/charts/normal.json diff --git a/assets/songs/philly nice/Inst.mp3 b/assets/songs/philly nice/audio/Inst.mp3 similarity index 100% rename from assets/songs/philly nice/Inst.mp3 rename to assets/songs/philly nice/audio/Inst.mp3 diff --git a/assets/songs/philly nice/Inst.ogg b/assets/songs/philly nice/audio/Inst.ogg similarity index 100% rename from assets/songs/philly nice/Inst.ogg rename to assets/songs/philly nice/audio/Inst.ogg diff --git a/assets/songs/philly nice/Voices.mp3 b/assets/songs/philly nice/audio/Voices.mp3 similarity index 100% rename from assets/songs/philly nice/Voices.mp3 rename to assets/songs/philly nice/audio/Voices.mp3 diff --git a/assets/songs/philly nice/Voices.ogg b/assets/songs/philly nice/audio/Voices.ogg similarity index 100% rename from assets/songs/philly nice/Voices.ogg rename to assets/songs/philly nice/audio/Voices.ogg diff --git a/assets/data/charts/philly nice/easy.json b/assets/songs/philly nice/charts/easy.json similarity index 100% rename from assets/data/charts/philly nice/easy.json rename to assets/songs/philly nice/charts/easy.json diff --git a/assets/data/charts/philly nice/hard.json b/assets/songs/philly nice/charts/hard.json similarity index 100% rename from assets/data/charts/philly nice/hard.json rename to assets/songs/philly nice/charts/hard.json diff --git a/assets/data/charts/philly nice/normal.json b/assets/songs/philly nice/charts/normal.json similarity index 100% rename from assets/data/charts/philly nice/normal.json rename to assets/songs/philly nice/charts/normal.json diff --git a/assets/songs/pico/Inst.mp3 b/assets/songs/pico/audio/Inst.mp3 similarity index 100% rename from assets/songs/pico/Inst.mp3 rename to assets/songs/pico/audio/Inst.mp3 diff --git a/assets/songs/pico/Inst.ogg b/assets/songs/pico/audio/Inst.ogg similarity index 100% rename from assets/songs/pico/Inst.ogg rename to assets/songs/pico/audio/Inst.ogg diff --git a/assets/songs/pico/Voices.mp3 b/assets/songs/pico/audio/Voices.mp3 similarity index 100% rename from assets/songs/pico/Voices.mp3 rename to assets/songs/pico/audio/Voices.mp3 diff --git a/assets/songs/pico/Voices.ogg b/assets/songs/pico/audio/Voices.ogg similarity index 100% rename from assets/songs/pico/Voices.ogg rename to assets/songs/pico/audio/Voices.ogg diff --git a/assets/data/charts/pico/easy.json b/assets/songs/pico/charts/easy.json similarity index 100% rename from assets/data/charts/pico/easy.json rename to assets/songs/pico/charts/easy.json diff --git a/assets/data/charts/pico/hard.json b/assets/songs/pico/charts/hard.json similarity index 100% rename from assets/data/charts/pico/hard.json rename to assets/songs/pico/charts/hard.json diff --git a/assets/data/charts/pico/normal.json b/assets/songs/pico/charts/normal.json similarity index 100% rename from assets/data/charts/pico/normal.json rename to assets/songs/pico/charts/normal.json diff --git a/assets/songs/roses/Inst.mp3 b/assets/songs/roses/audio/Inst.mp3 similarity index 100% rename from assets/songs/roses/Inst.mp3 rename to assets/songs/roses/audio/Inst.mp3 diff --git a/assets/songs/roses/Inst.ogg b/assets/songs/roses/audio/Inst.ogg similarity index 100% rename from assets/songs/roses/Inst.ogg rename to assets/songs/roses/audio/Inst.ogg diff --git a/assets/songs/roses/Voices.mp3 b/assets/songs/roses/audio/Voices.mp3 similarity index 100% rename from assets/songs/roses/Voices.mp3 rename to assets/songs/roses/audio/Voices.mp3 diff --git a/assets/songs/roses/Voices.ogg b/assets/songs/roses/audio/Voices.ogg similarity index 100% rename from assets/songs/roses/Voices.ogg rename to assets/songs/roses/audio/Voices.ogg diff --git a/assets/data/charts/roses/easy.json b/assets/songs/roses/charts/easy.json similarity index 100% rename from assets/data/charts/roses/easy.json rename to assets/songs/roses/charts/easy.json diff --git a/assets/data/charts/roses/hard.json b/assets/songs/roses/charts/hard.json similarity index 100% rename from assets/data/charts/roses/hard.json rename to assets/songs/roses/charts/hard.json diff --git a/assets/data/charts/roses/normal.json b/assets/songs/roses/charts/normal.json similarity index 100% rename from assets/data/charts/roses/normal.json rename to assets/songs/roses/charts/normal.json diff --git a/assets/songs/satin panties/Inst.mp3 b/assets/songs/satin panties/audio/Inst.mp3 similarity index 100% rename from assets/songs/satin panties/Inst.mp3 rename to assets/songs/satin panties/audio/Inst.mp3 diff --git a/assets/songs/satin panties/Inst.ogg b/assets/songs/satin panties/audio/Inst.ogg similarity index 100% rename from assets/songs/satin panties/Inst.ogg rename to assets/songs/satin panties/audio/Inst.ogg diff --git a/assets/songs/satin panties/Voices.mp3 b/assets/songs/satin panties/audio/Voices.mp3 similarity index 100% rename from assets/songs/satin panties/Voices.mp3 rename to assets/songs/satin panties/audio/Voices.mp3 diff --git a/assets/songs/satin panties/Voices.ogg b/assets/songs/satin panties/audio/Voices.ogg similarity index 100% rename from assets/songs/satin panties/Voices.ogg rename to assets/songs/satin panties/audio/Voices.ogg diff --git a/assets/data/charts/satin panties/easy.json b/assets/songs/satin panties/charts/easy.json similarity index 100% rename from assets/data/charts/satin panties/easy.json rename to assets/songs/satin panties/charts/easy.json diff --git a/assets/data/charts/satin panties/hard.json b/assets/songs/satin panties/charts/hard.json similarity index 100% rename from assets/data/charts/satin panties/hard.json rename to assets/songs/satin panties/charts/hard.json diff --git a/assets/data/charts/satin panties/normal.json b/assets/songs/satin panties/charts/normal.json similarity index 100% rename from assets/data/charts/satin panties/normal.json rename to assets/songs/satin panties/charts/normal.json diff --git a/assets/songs/senpai/Inst.mp3 b/assets/songs/senpai/audio/Inst.mp3 similarity index 100% rename from assets/songs/senpai/Inst.mp3 rename to assets/songs/senpai/audio/Inst.mp3 diff --git a/assets/songs/senpai/Inst.ogg b/assets/songs/senpai/audio/Inst.ogg similarity index 100% rename from assets/songs/senpai/Inst.ogg rename to assets/songs/senpai/audio/Inst.ogg diff --git a/assets/songs/senpai/Voices.mp3 b/assets/songs/senpai/audio/Voices.mp3 similarity index 100% rename from assets/songs/senpai/Voices.mp3 rename to assets/songs/senpai/audio/Voices.mp3 diff --git a/assets/songs/senpai/Voices.ogg b/assets/songs/senpai/audio/Voices.ogg similarity index 100% rename from assets/songs/senpai/Voices.ogg rename to assets/songs/senpai/audio/Voices.ogg diff --git a/assets/data/charts/senpai/easy.json b/assets/songs/senpai/charts/easy.json similarity index 100% rename from assets/data/charts/senpai/easy.json rename to assets/songs/senpai/charts/easy.json diff --git a/assets/data/charts/senpai/hard.json b/assets/songs/senpai/charts/hard.json similarity index 100% rename from assets/data/charts/senpai/hard.json rename to assets/songs/senpai/charts/hard.json diff --git a/assets/data/charts/senpai/normal.json b/assets/songs/senpai/charts/normal.json similarity index 100% rename from assets/data/charts/senpai/normal.json rename to assets/songs/senpai/charts/normal.json diff --git a/assets/songs/south/Inst.mp3 b/assets/songs/south/audio/Inst.mp3 similarity index 100% rename from assets/songs/south/Inst.mp3 rename to assets/songs/south/audio/Inst.mp3 diff --git a/assets/songs/south/Inst.ogg b/assets/songs/south/audio/Inst.ogg similarity index 100% rename from assets/songs/south/Inst.ogg rename to assets/songs/south/audio/Inst.ogg diff --git a/assets/songs/south/Voices.mp3 b/assets/songs/south/audio/Voices.mp3 similarity index 100% rename from assets/songs/south/Voices.mp3 rename to assets/songs/south/audio/Voices.mp3 diff --git a/assets/songs/south/Voices.ogg b/assets/songs/south/audio/Voices.ogg similarity index 100% rename from assets/songs/south/Voices.ogg rename to assets/songs/south/audio/Voices.ogg diff --git a/assets/data/charts/south/easy.json b/assets/songs/south/charts/easy.json similarity index 100% rename from assets/data/charts/south/easy.json rename to assets/songs/south/charts/easy.json diff --git a/assets/data/charts/south/hard.json b/assets/songs/south/charts/hard.json similarity index 100% rename from assets/data/charts/south/hard.json rename to assets/songs/south/charts/hard.json diff --git a/assets/data/charts/south/normal.json b/assets/songs/south/charts/normal.json similarity index 100% rename from assets/data/charts/south/normal.json rename to assets/songs/south/charts/normal.json diff --git a/assets/songs/spookeez/Inst.mp3 b/assets/songs/spookeez/audio/Inst.mp3 similarity index 100% rename from assets/songs/spookeez/Inst.mp3 rename to assets/songs/spookeez/audio/Inst.mp3 diff --git a/assets/songs/spookeez/Inst.ogg b/assets/songs/spookeez/audio/Inst.ogg similarity index 100% rename from assets/songs/spookeez/Inst.ogg rename to assets/songs/spookeez/audio/Inst.ogg diff --git a/assets/songs/spookeez/Voices.mp3 b/assets/songs/spookeez/audio/Voices.mp3 similarity index 100% rename from assets/songs/spookeez/Voices.mp3 rename to assets/songs/spookeez/audio/Voices.mp3 diff --git a/assets/songs/spookeez/Voices.ogg b/assets/songs/spookeez/audio/Voices.ogg similarity index 100% rename from assets/songs/spookeez/Voices.ogg rename to assets/songs/spookeez/audio/Voices.ogg diff --git a/assets/data/charts/spookeez/easy.json b/assets/songs/spookeez/charts/easy.json similarity index 100% rename from assets/data/charts/spookeez/easy.json rename to assets/songs/spookeez/charts/easy.json diff --git a/assets/data/charts/spookeez/hard.json b/assets/songs/spookeez/charts/hard.json similarity index 100% rename from assets/data/charts/spookeez/hard.json rename to assets/songs/spookeez/charts/hard.json diff --git a/assets/data/charts/spookeez/normal.json b/assets/songs/spookeez/charts/normal.json similarity index 100% rename from assets/data/charts/spookeez/normal.json rename to assets/songs/spookeez/charts/normal.json diff --git a/assets/songs/stress/Inst.mp3 b/assets/songs/stress/audio/Inst.mp3 similarity index 100% rename from assets/songs/stress/Inst.mp3 rename to assets/songs/stress/audio/Inst.mp3 diff --git a/assets/songs/stress/Inst.ogg b/assets/songs/stress/audio/Inst.ogg similarity index 100% rename from assets/songs/stress/Inst.ogg rename to assets/songs/stress/audio/Inst.ogg diff --git a/assets/songs/stress/Voices.mp3 b/assets/songs/stress/audio/Voices.mp3 similarity index 100% rename from assets/songs/stress/Voices.mp3 rename to assets/songs/stress/audio/Voices.mp3 diff --git a/assets/songs/stress/Voices.ogg b/assets/songs/stress/audio/Voices.ogg similarity index 100% rename from assets/songs/stress/Voices.ogg rename to assets/songs/stress/audio/Voices.ogg diff --git a/assets/data/charts/stress/easy.json b/assets/songs/stress/charts/easy.json similarity index 100% rename from assets/data/charts/stress/easy.json rename to assets/songs/stress/charts/easy.json diff --git a/assets/data/charts/stress/hard.json b/assets/songs/stress/charts/hard.json similarity index 100% rename from assets/data/charts/stress/hard.json rename to assets/songs/stress/charts/hard.json diff --git a/assets/data/charts/stress/normal.json b/assets/songs/stress/charts/normal.json similarity index 100% rename from assets/data/charts/stress/normal.json rename to assets/songs/stress/charts/normal.json diff --git a/assets/data/charts/stress/picospeaker.json b/assets/songs/stress/picospeaker.json similarity index 100% rename from assets/data/charts/stress/picospeaker.json rename to assets/songs/stress/picospeaker.json diff --git a/assets/data/charts/stress/chart.hx b/assets/songs/stress/scripts/chart.hx similarity index 100% rename from assets/data/charts/stress/chart.hx rename to assets/songs/stress/scripts/chart.hx diff --git a/assets/songs/test/Inst.mp3 b/assets/songs/test/audio/Inst.mp3 similarity index 100% rename from assets/songs/test/Inst.mp3 rename to assets/songs/test/audio/Inst.mp3 diff --git a/assets/songs/test/Inst.ogg b/assets/songs/test/audio/Inst.ogg similarity index 100% rename from assets/songs/test/Inst.ogg rename to assets/songs/test/audio/Inst.ogg diff --git a/assets/songs/test/Voices.mp3 b/assets/songs/test/audio/Voices.mp3 similarity index 100% rename from assets/songs/test/Voices.mp3 rename to assets/songs/test/audio/Voices.mp3 diff --git a/assets/songs/test/Voices.ogg b/assets/songs/test/audio/Voices.ogg similarity index 100% rename from assets/songs/test/Voices.ogg rename to assets/songs/test/audio/Voices.ogg diff --git a/assets/data/charts/test/normal.json b/assets/songs/test/charts/normal.json similarity index 100% rename from assets/data/charts/test/normal.json rename to assets/songs/test/charts/normal.json diff --git a/assets/data/charts/test/modchart.hx b/assets/songs/test/scripts/modchart.hx similarity index 100% rename from assets/data/charts/test/modchart.hx rename to assets/songs/test/scripts/modchart.hx diff --git a/assets/songs/thorns/Inst.mp3 b/assets/songs/thorns/audio/Inst.mp3 similarity index 100% rename from assets/songs/thorns/Inst.mp3 rename to assets/songs/thorns/audio/Inst.mp3 diff --git a/assets/songs/thorns/Inst.ogg b/assets/songs/thorns/audio/Inst.ogg similarity index 100% rename from assets/songs/thorns/Inst.ogg rename to assets/songs/thorns/audio/Inst.ogg diff --git a/assets/songs/thorns/Voices.mp3 b/assets/songs/thorns/audio/Voices.mp3 similarity index 100% rename from assets/songs/thorns/Voices.mp3 rename to assets/songs/thorns/audio/Voices.mp3 diff --git a/assets/songs/thorns/Voices.ogg b/assets/songs/thorns/audio/Voices.ogg similarity index 100% rename from assets/songs/thorns/Voices.ogg rename to assets/songs/thorns/audio/Voices.ogg diff --git a/assets/data/charts/thorns/easy.json b/assets/songs/thorns/charts/easy.json similarity index 100% rename from assets/data/charts/thorns/easy.json rename to assets/songs/thorns/charts/easy.json diff --git a/assets/data/charts/thorns/hard.json b/assets/songs/thorns/charts/hard.json similarity index 100% rename from assets/data/charts/thorns/hard.json rename to assets/songs/thorns/charts/hard.json diff --git a/assets/data/charts/thorns/normal.json b/assets/songs/thorns/charts/normal.json similarity index 100% rename from assets/data/charts/thorns/normal.json rename to assets/songs/thorns/charts/normal.json diff --git a/assets/songs/tutorial/Inst.mp3 b/assets/songs/tutorial/audio/Inst.mp3 similarity index 100% rename from assets/songs/tutorial/Inst.mp3 rename to assets/songs/tutorial/audio/Inst.mp3 diff --git a/assets/songs/tutorial/Inst.ogg b/assets/songs/tutorial/audio/Inst.ogg similarity index 100% rename from assets/songs/tutorial/Inst.ogg rename to assets/songs/tutorial/audio/Inst.ogg diff --git a/assets/data/charts/tutorial/easy.json b/assets/songs/tutorial/charts/easy.json similarity index 100% rename from assets/data/charts/tutorial/easy.json rename to assets/songs/tutorial/charts/easy.json diff --git a/assets/data/charts/tutorial/hard.json b/assets/songs/tutorial/charts/hard.json similarity index 100% rename from assets/data/charts/tutorial/hard.json rename to assets/songs/tutorial/charts/hard.json diff --git a/assets/data/charts/tutorial/normal.json b/assets/songs/tutorial/charts/normal.json similarity index 100% rename from assets/data/charts/tutorial/normal.json rename to assets/songs/tutorial/charts/normal.json diff --git a/assets/songs/ugh/Inst.mp3 b/assets/songs/ugh/audio/Inst.mp3 similarity index 100% rename from assets/songs/ugh/Inst.mp3 rename to assets/songs/ugh/audio/Inst.mp3 diff --git a/assets/songs/ugh/Inst.ogg b/assets/songs/ugh/audio/Inst.ogg similarity index 100% rename from assets/songs/ugh/Inst.ogg rename to assets/songs/ugh/audio/Inst.ogg diff --git a/assets/songs/ugh/Voices.mp3 b/assets/songs/ugh/audio/Voices.mp3 similarity index 100% rename from assets/songs/ugh/Voices.mp3 rename to assets/songs/ugh/audio/Voices.mp3 diff --git a/assets/songs/ugh/Voices.ogg b/assets/songs/ugh/audio/Voices.ogg similarity index 100% rename from assets/songs/ugh/Voices.ogg rename to assets/songs/ugh/audio/Voices.ogg diff --git a/assets/data/charts/ugh/easy.json b/assets/songs/ugh/charts/easy.json similarity index 100% rename from assets/data/charts/ugh/easy.json rename to assets/songs/ugh/charts/easy.json diff --git a/assets/data/charts/ugh/hard.json b/assets/songs/ugh/charts/hard.json similarity index 100% rename from assets/data/charts/ugh/hard.json rename to assets/songs/ugh/charts/hard.json diff --git a/assets/data/charts/ugh/normal.json b/assets/songs/ugh/charts/normal.json similarity index 100% rename from assets/data/charts/ugh/normal.json rename to assets/songs/ugh/charts/normal.json diff --git a/assets/songs/winter horrorland/Inst.mp3 b/assets/songs/winter horrorland/audio/Inst.mp3 similarity index 100% rename from assets/songs/winter horrorland/Inst.mp3 rename to assets/songs/winter horrorland/audio/Inst.mp3 diff --git a/assets/songs/winter horrorland/Inst.ogg b/assets/songs/winter horrorland/audio/Inst.ogg similarity index 100% rename from assets/songs/winter horrorland/Inst.ogg rename to assets/songs/winter horrorland/audio/Inst.ogg diff --git a/assets/songs/winter horrorland/Voices.mp3 b/assets/songs/winter horrorland/audio/Voices.mp3 similarity index 100% rename from assets/songs/winter horrorland/Voices.mp3 rename to assets/songs/winter horrorland/audio/Voices.mp3 diff --git a/assets/songs/winter horrorland/Voices.ogg b/assets/songs/winter horrorland/audio/Voices.ogg similarity index 100% rename from assets/songs/winter horrorland/Voices.ogg rename to assets/songs/winter horrorland/audio/Voices.ogg diff --git a/assets/data/charts/winter horrorland/easy.json b/assets/songs/winter horrorland/charts/easy.json similarity index 100% rename from assets/data/charts/winter horrorland/easy.json rename to assets/songs/winter horrorland/charts/easy.json diff --git a/assets/data/charts/winter horrorland/hard.json b/assets/songs/winter horrorland/charts/hard.json similarity index 100% rename from assets/data/charts/winter horrorland/hard.json rename to assets/songs/winter horrorland/charts/hard.json diff --git a/assets/data/charts/winter horrorland/normal.json b/assets/songs/winter horrorland/charts/normal.json similarity index 100% rename from assets/data/charts/winter horrorland/normal.json rename to assets/songs/winter horrorland/charts/normal.json diff --git a/buildnumber.txt b/buildnumber.txt index 102ca05b..7411188d 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1951 \ No newline at end of file +1954 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index c65535ba..9298a01a 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -505,8 +505,8 @@ class PlayState extends MusicBeatState detailsText = isStoryMode ? ("Story Mode: " + storyWeek.name) : "Freeplay"; // Checks if cutscene files exists - var cutscenePath = Paths.script('data/cutscenes/${SONG.song.toLowerCase()}'); - var endCutscenePath = Paths.script('data/cutscenes/${SONG.song.toLowerCase()}-end'); + var cutscenePath = Paths.script('songs/${SONG.song.toLowerCase()}/cutscene'); + var endCutscenePath = Paths.script('songs/${SONG.song.toLowerCase()}/cutscene-end'); if (Assets.exists(cutscenePath)) cutscene = cutscenePath; if (Assets.exists(endCutscenePath)) endCutscene = endCutscenePath; @@ -549,7 +549,7 @@ class PlayState extends MusicBeatState // ADD YOUR HARDCODED SCRIPTS HERE! default: for(content in [ - Paths.getFolderContent('data/charts/${SONG.song.toLowerCase()}/', false, true, !fromMods), + Paths.getFolderContent('songs/${SONG.song.toLowerCase()}/scripts', false, true, !fromMods), Paths.getFolderContent('data/charts/', false, true, !fromMods)]) { for(file in content) { var ext = Path.extension(file).toLowerCase(); @@ -662,6 +662,7 @@ class PlayState extends MusicBeatState public function startCutscene() { if (playCutscenes) { var videoCutscene = Paths.video('${PlayState.SONG.song.toLowerCase()}-cutscene'); + var videoCutsceneAlt = Paths.video('${PlayState.SONG.song.toLowerCase()}-cutscene'); persistentUpdate = false; if (cutscene != null) { openSubState(new ScriptedCutscene(cutscene, function() { diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index ebae2697..2c901407 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -300,7 +300,7 @@ class SongMetadata if (difficulties != null && difficulties.length > 0) { this.difficulties = difficulties; } else { - this.difficulties = difficulties = [for(f in Paths.getFolderContent('data/charts/${song.toLowerCase()}/', false, false, fromSource)) if (Path.extension(f = f.toUpperCase()) == "JSON") Path.withoutExtension(f)]; + this.difficulties = difficulties = [for(f in Paths.getFolderContent('songs/${song.toLowerCase()}/charts/', false, false, fromSource)) if (Path.extension(f = f.toUpperCase()) == "JSON") Path.withoutExtension(f)]; if (difficulties.length == 3) { var hasHard = false, hasNormal = false, hasEasy = false; for(d in difficulties) { diff --git a/source/funkin/system/Paths.hx b/source/funkin/system/Paths.hx index 9e186787..2ce1c482 100644 --- a/source/funkin/system/Paths.hx +++ b/source/funkin/system/Paths.hx @@ -110,14 +110,14 @@ class Paths inline static public function voices(song:String, difficulty:String = "normal") { - var diff = getPath('songs/${song.toLowerCase()}/Voices-$difficulty.$SOUND_EXT', MUSIC, null); - return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/Voices.$SOUND_EXT', MUSIC, null); + var diff = getPath('songs/${song.toLowerCase()}/audio/Voices-$difficulty.$SOUND_EXT', MUSIC, null); + return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/audio/Voices.$SOUND_EXT', MUSIC, null); } inline static public function inst(song:String, difficulty:String = "normal") { - var diff = getPath('songs/${song.toLowerCase()}/Inst-$difficulty.$SOUND_EXT', MUSIC, null); - return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/Inst.$SOUND_EXT', MUSIC, null); + var diff = getPath('songs/${song.toLowerCase()}/audio/Inst-$difficulty.$SOUND_EXT', MUSIC, null); + return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/audio/Inst.$SOUND_EXT', MUSIC, null); } inline static public function image(key:String, ?library:String, checkForAtlas:Bool = false) @@ -148,18 +148,14 @@ class Paths var difficultyEnd = (difficulty == "normal") ? "" : '-$difficulty'; + // songs/your-song/charts/hard.json + var p = getPath('songs/$song/charts/$difficulty.json', TEXT, null); + if (OpenFlAssets.exists(p)) return p; + // data/charts/your-song/hard.json var p = json('charts/$song/$difficulty'); if (OpenFlAssets.exists(p)) return p; - // data/charts/your-song/your-song-hard.json - var p2 = json('charts/$song/$song$difficultyEnd'); - if (OpenFlAssets.exists(p2)) return p2; - - // data/your-song/your-song-hard.json (default old format) - p2 = json('$song/$song$difficultyEnd'); - if (OpenFlAssets.exists(p2)) return p2; - return p; // returns the normal one so that it shows the correct path in the error message. }