From 666d96ea5753107eea65a74d02b7218fe0e01f5e Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 16:44:43 -0700 Subject: [PATCH 01/17] fixed up some jack things --- source/PlayState.hx | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 9c24a1d..3c8a088 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2872,36 +2872,43 @@ class PlayState extends MusicBeatState var possibleNotes:Array = []; // notes that can be hit var directionList:Array = []; // directions that can be hit var dumbNotes:Array = []; // notes to kill later - + var directionsAccounted:Array = [false,false,false,false]; // we don't want to do judgments for more than one presses + notes.forEachAlive(function(daNote:Note) { if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate && !daNote.wasGoodHit) { - if (directionList.contains(daNote.noteData)) + if (!directionsAccounted[daNote.noteData]) { - for (coolNote in possibleNotes) + if (directionList.contains(daNote.noteData)) { - if (coolNote.noteData == daNote.noteData && Math.abs(daNote.strumTime - coolNote.strumTime) < 10) - { // if it's the same note twice at < 10ms distance, just delete it - // EXCEPT u cant delete it in this loop cuz it fucks with the collection lol - dumbNotes.push(daNote); - break; - } - else if (coolNote.noteData == daNote.noteData && daNote.strumTime < coolNote.strumTime) - { // if daNote is earlier than existing note (coolNote), replace - possibleNotes.remove(coolNote); - possibleNotes.push(daNote); - break; + directionsAccounted[daNote.noteData] = true; + for (coolNote in possibleNotes) + { + if (coolNote.noteData == daNote.noteData && Math.abs(daNote.strumTime - coolNote.strumTime) < 10) + { // if it's the same note twice at < 10ms distance, just delete it + // EXCEPT u cant delete it in this loop cuz it fucks with the collection lol + dumbNotes.push(daNote); + break; + } + else if (coolNote.noteData == daNote.noteData && daNote.strumTime < coolNote.strumTime) + { // if daNote is earlier than existing note (coolNote), replace + possibleNotes.remove(coolNote); + possibleNotes.push(daNote); + break; + } } } - } - else - { - possibleNotes.push(daNote); - directionList.push(daNote.noteData); + else + { + possibleNotes.push(daNote); + directionList.push(daNote.noteData); + } } } }); + + trace('\nCURRENT LINE:\n' + directionsAccounted); for (note in dumbNotes) { From f6ef24c3028917ffa32a2a5bcd9d7690d0a7556c Mon Sep 17 00:00:00 2001 From: Leo40Git <7997354+Leo40Git@users.noreply.github.com> Date: Sun, 6 Jun 2021 17:25:00 +0300 Subject: [PATCH 02/17] Fix combo counter for 0-9 combos --- source/PlayState.hx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 9c24a1d..6895c89 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2729,8 +2729,14 @@ class PlayState extends MusicBeatState var comboSplit:Array = (combo + "").split(''); - if (comboSplit.length == 2) - seperatedScore.push(0); // make sure theres a 0 in front or it looks weird lol! + // make sure we have 3 digits to display (looks weird otherwise lol) + if (comboSplit.length == 1) + { + seperatedScore.push(0); + seperatedScore.push(0); + } + else if (comboSplit.length == 2) + seperatedScore.push(0); for(i in 0...comboSplit.length) { @@ -2762,8 +2768,7 @@ class PlayState extends MusicBeatState numScore.velocity.y -= FlxG.random.int(140, 160); numScore.velocity.x = FlxG.random.float(-5, 5); - if (combo >= 10 || combo == 0) - add(numScore); + add(numScore); FlxTween.tween(numScore, {alpha: 0}, 0.2, { onComplete: function(tween:FlxTween) From 3a5898273ed19b5e230e590a340aa38b311d3d0f Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:43:13 +0200 Subject: [PATCH 03/17] fixed Philly being called Philly Nice --- source/StoryMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 501cf2b..e244647 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -27,7 +27,7 @@ class StoryMenuState extends MusicBeatState ['Tutorial'], ['Bopeebo', 'Fresh', 'Dad Battle'], ['Spookeez', 'South', "Monster"], - ['Pico', 'Philly Nice', "Blammed"], + ['Pico', 'Philly', "Blammed"], ['Satin Panties', "High", "Milf"], ['Cocoa', 'Eggnog', 'Winter Horrorland'], ['Senpai', 'Roses', 'Thorns'] From 26248082d6a9abaa519cc652a30f95fd1f5a6fb8 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Mon, 7 Jun 2021 00:04:31 +0200 Subject: [PATCH 04/17] fixed Philly Nice to be Philly in story mode + fixed story mode song loading with spaces --- source/Song.hx | 4 ++-- source/StoryMenuState.hx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Song.hx b/source/Song.hx index d7bf608..78c47dd 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -46,9 +46,9 @@ class Song public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong { - trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase()); + trace('loading ' + StringTools.replace(folder," ", "-").toLowerCase() + '/' + StringTools.replace(jsonInput," ", "-").toLowerCase()); - var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim(); + var rawJson = Assets.getText(Paths.json(StringTools.replace(folder," ", "-").toLowerCase() + '/' + StringTools.replace(jsonInput," ", "-").toLowerCase())).trim(); while (!rawJson.endsWith("}")) { diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 501cf2b..e244647 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -27,7 +27,7 @@ class StoryMenuState extends MusicBeatState ['Tutorial'], ['Bopeebo', 'Fresh', 'Dad Battle'], ['Spookeez', 'South', "Monster"], - ['Pico', 'Philly Nice', "Blammed"], + ['Pico', 'Philly', "Blammed"], ['Satin Panties', "High", "Milf"], ['Cocoa', 'Eggnog', 'Winter Horrorland'], ['Senpai', 'Roses', 'Thorns'] From 1d0399e995ed51de3d235950d484860711b1b691 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Mon, 7 Jun 2021 05:42:18 +0200 Subject: [PATCH 05/17] fixed Winter Horrorland transition not working --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index ba28441..c715ede 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -998,7 +998,7 @@ class PlayState extends MusicBeatState if (isStoryMode) { - switch (curSong.toLowerCase()) + switch (StringTools.replace(curSong," ", "-").toLowerCase()) { case "winter-horrorland": var blackScreen:FlxSprite = new FlxSprite(0, 0).makeGraphic(Std.int(FlxG.width * 2), Std.int(FlxG.height * 2), FlxColor.BLACK); From 93fc1ab70a5ff77131016ec03f14f245b4d07b16 Mon Sep 17 00:00:00 2001 From: craftersshaft Date: Mon, 7 Jun 2021 21:14:13 -0400 Subject: [PATCH 06/17] we movin --- docs/modchart.md | 48 +++++++++++++++++++++++++++++++++++++++++ source/ModchartState.hx | 26 +++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/docs/modchart.md b/docs/modchart.md index 3dc8309..e1fae25 100644 --- a/docs/modchart.md +++ b/docs/modchart.md @@ -109,6 +109,30 @@ for i = 4, 7 do -- go to the center end ``` +Jumping Arrows Example +```lua +function stepHit (step) + if step == 1 then + setActorAccelerationY(100, 4) + end + if step == 3 then + setActorAccelerationY(100, 5) + end + if step == 5 then + setActorAccelerationY(100, 6) + end + if step == 7 then + setActorAccelerationY(100, 7) + end + for i=4,7 do + if getActorY(i) >= 100 then + setActorY(100, i) + setActorVelocityY(-100, i) + end + end +end +``` + ### Available Hooks @@ -376,10 +400,34 @@ Returns the angle for the sprite id Set's the x position for the sprite id +##### setActorAccelerationX(int x, string/int id) + +Sets the x acceleration for the sprite id + +##### setActorDragX(int x, string/int id) + +Sets the x drag for the sprite id + +##### setActorVelocityX(int x, string/int id) + +Sets the x velocity for the sprite id + ##### setActorY(int y, string/int id) Set's the y position for the sprite id +##### setActorAccelerationY(int y, string/int id) + +Sets the y acceleration for the sprite id + +##### setActorDragY(int y, string/int id) + +Sets the y drag for the sprite id + +##### setActorVelocityY(int y, string/int id) + +Sets the y velocity for the sprite id + ##### setActorAlpha(float alpha, string/int id) Set's the alpha for the sprite id diff --git a/source/ModchartState.hx b/source/ModchartState.hx index c5e3ca3..1203ea5 100644 --- a/source/ModchartState.hx +++ b/source/ModchartState.hx @@ -564,6 +564,18 @@ class ModchartState getActorByName(id).x = x; }); + Lua_helper.add_callback(lua,"setActorAccelerationX", function(x:Int,id:String) { + getActorByName(id).acceleration.x = x; + }); + + Lua_helper.add_callback(lua,"setActorDragX", function(x:Int,id:String) { + getActorByName(id).drag.x = x; + }); + + Lua_helper.add_callback(lua,"setActorVelocityX", function(x:Int,id:String) { + getActorByName(id).velocity.x = x; + }); + Lua_helper.add_callback(lua,"playActorAnimation", function(id:String,anim:String,force:Bool = false,reverse:Bool = false) { getActorByName(id).playAnim(anim, force, reverse); }); @@ -575,7 +587,19 @@ class ModchartState Lua_helper.add_callback(lua,"setActorY", function(y:Int,id:String) { getActorByName(id).y = y; }); - + + Lua_helper.add_callback(lua,"setActorAccelerationY", function(y:Int,id:String) { + getActorByName(id).acceleration.y = y; + }); + + Lua_helper.add_callback(lua,"setActorDragY", function(y:Int,id:String) { + getActorByName(id).drag.y = y; + }); + + Lua_helper.add_callback(lua,"setActorVelocityY", function(y:Int,id:String) { + getActorByName(id).velocity.y = y; + }); + Lua_helper.add_callback(lua,"setActorAngle", function(angle:Int,id:String) { getActorByName(id).angle = angle; }); From 8ac6249e2bb1f14bc74785d1d362593252a36270 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Tue, 8 Jun 2021 07:13:33 +0200 Subject: [PATCH 07/17] compatibility changes for dadbattle + philly 'Dad Battle' is now called 'Dad Battle' in game and uses 'dadbattle' as files 'Philly' is now called 'Philly Nice' in game and uses 'philly' as files --- .../data/{dad-battle => dadbattle}/0.offset | 0 .../dadbattle-easy.json} | 0 .../dadbattle-hard.json} | 0 .../dadbattle.json} | 0 assets/preload/data/freeplaySonglist.txt | 2 +- assets/preload/data/philly/philly-easy.json | 2 +- assets/preload/data/philly/philly-hard.json | 2 +- assets/preload/data/philly/philly.json | 2 +- .../songs/{dad-battle => dadbattle}/Inst.mp3 | Bin .../songs/{dad-battle => dadbattle}/Inst.ogg | Bin .../{dad-battle => dadbattle}/Voices.mp3 | Bin .../{dad-battle => dadbattle}/Voices.ogg | Bin source/FreeplayState.hx | 19 ++++- source/Paths.hx | 24 +++++- source/PlayState.hx | 78 +++++++++++++++--- source/Song.hx | 20 ++++- source/StoryMenuState.hx | 2 +- 17 files changed, 122 insertions(+), 29 deletions(-) rename assets/preload/data/{dad-battle => dadbattle}/0.offset (100%) rename assets/preload/data/{dad-battle/dad-battle-easy.json => dadbattle/dadbattle-easy.json} (100%) rename assets/preload/data/{dad-battle/dad-battle-hard.json => dadbattle/dadbattle-hard.json} (100%) rename assets/preload/data/{dad-battle/dad-battle.json => dadbattle/dadbattle.json} (100%) rename assets/songs/{dad-battle => dadbattle}/Inst.mp3 (100%) rename assets/songs/{dad-battle => dadbattle}/Inst.ogg (100%) rename assets/songs/{dad-battle => dadbattle}/Voices.mp3 (100%) rename assets/songs/{dad-battle => dadbattle}/Voices.ogg (100%) diff --git a/assets/preload/data/dad-battle/0.offset b/assets/preload/data/dadbattle/0.offset similarity index 100% rename from assets/preload/data/dad-battle/0.offset rename to assets/preload/data/dadbattle/0.offset diff --git a/assets/preload/data/dad-battle/dad-battle-easy.json b/assets/preload/data/dadbattle/dadbattle-easy.json similarity index 100% rename from assets/preload/data/dad-battle/dad-battle-easy.json rename to assets/preload/data/dadbattle/dadbattle-easy.json diff --git a/assets/preload/data/dad-battle/dad-battle-hard.json b/assets/preload/data/dadbattle/dadbattle-hard.json similarity index 100% rename from assets/preload/data/dad-battle/dad-battle-hard.json rename to assets/preload/data/dadbattle/dadbattle-hard.json diff --git a/assets/preload/data/dad-battle/dad-battle.json b/assets/preload/data/dadbattle/dadbattle.json similarity index 100% rename from assets/preload/data/dad-battle/dad-battle.json rename to assets/preload/data/dadbattle/dadbattle.json diff --git a/assets/preload/data/freeplaySonglist.txt b/assets/preload/data/freeplaySonglist.txt index dd50762..a5939ad 100644 --- a/assets/preload/data/freeplaySonglist.txt +++ b/assets/preload/data/freeplaySonglist.txt @@ -6,7 +6,7 @@ Spookeez:spooky:2 South:spooky:2 Monster:monster:2 Pico:pico:3 -Philly:pico:3 +Philly Nice:pico:3 Blammed:pico:3 Satin Panties:mom:4 High:mom:4 diff --git a/assets/preload/data/philly/philly-easy.json b/assets/preload/data/philly/philly-easy.json index ba3e4e9..6ad3bbb 100644 --- a/assets/preload/data/philly/philly-easy.json +++ b/assets/preload/data/philly/philly-easy.json @@ -1 +1 @@ -{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7200,2,0],[7542.857,2,0],[7885.71436,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[14057.1426,2,0],[14400,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15428.5713,3,0],[15771.4287,2,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16800,3,0],[17142.8574,0,0],[17485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18171.4277,1,0],[18514.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19542.8574,2,0],[19885.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20914.2852,3,0],[21257.1426,2,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22285.7148,3,0],[22628.57,0,0],[22971.4277,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23657.1426,1,0],[24000,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[25371.4277,0,0],[25714.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26400,3,0],[26742.8574,2,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27771.4277,3,0],[28114.2852,0,0],[28457.1426,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[29142.8574,1,0],[29485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30857.1426,0,0],[31200,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31885.7148,3,0],[32228.57,2,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33257.14,3,0],[33600,0,0],[33942.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34628.57,1,0],[34971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[36342.8555,2,0],[36685.7148,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37714.2852,2,0],[38057.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[39085.7148,2,0],[39428.57,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[40457.14,2,0],[40800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41828.57,2,0],[42171.43,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[43200,2,0],[43542.8555,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44571.43,2,0],[44914.2852,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45942.8555,2,0],[46285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[47314.2852,2,0],[47657.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48685.7148,2,0],[49028.57,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[50057.14,2,0],[50400,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,3,0],[51428.57,2,0],[51771.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52800,2,0],[53142.8555,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[54171.43,2,0],[54514.2852,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55542.8555,2,0],[55885.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,3,0],[56914.2852,2,0],[57257.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[58285.7148,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59314.2852,3,0],[59657.14,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[61028.57,2,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[62057.14,0,0],[62400,2,0],[62742.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63771.43,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64800,3,0],[65142.8555,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66514.28,2,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67542.86,0,0],[67885.71,2,0],[68228.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[69257.14,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70628.57,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[72000,2,0],[72342.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[73371.43,2,0],[73714.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74742.86,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[76114.28,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[77485.71,2,0],[77828.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78857.14,2,0],[79200,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[80228.57,2,0],[80571.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81600,2,0],[81942.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82971.43,2,0],[83314.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,3,0],[84342.86,2,0],[84685.71,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85714.28,2,0],[86057.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[87085.71,2,0],[87428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[88457.14,2,0],[88800,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,3,0],[89828.57,2,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":1}} \ No newline at end of file +{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7200,2,0],[7542.857,2,0],[7885.71436,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[14057.1426,2,0],[14400,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15428.5713,3,0],[15771.4287,2,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16800,3,0],[17142.8574,0,0],[17485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18171.4277,1,0],[18514.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19542.8574,2,0],[19885.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20914.2852,3,0],[21257.1426,2,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22285.7148,3,0],[22628.57,0,0],[22971.4277,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23657.1426,1,0],[24000,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[25371.4277,0,0],[25714.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26400,3,0],[26742.8574,2,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27771.4277,3,0],[28114.2852,0,0],[28457.1426,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[29142.8574,1,0],[29485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30857.1426,0,0],[31200,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31885.7148,3,0],[32228.57,2,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33257.14,3,0],[33600,0,0],[33942.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34628.57,1,0],[34971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[36342.8555,2,0],[36685.7148,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37714.2852,2,0],[38057.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[39085.7148,2,0],[39428.57,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[40457.14,2,0],[40800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41828.57,2,0],[42171.43,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[43200,2,0],[43542.8555,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44571.43,2,0],[44914.2852,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45942.8555,2,0],[46285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[47314.2852,2,0],[47657.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48685.7148,2,0],[49028.57,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[50057.14,2,0],[50400,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,3,0],[51428.57,2,0],[51771.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52800,2,0],[53142.8555,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[54171.43,2,0],[54514.2852,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55542.8555,2,0],[55885.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,3,0],[56914.2852,2,0],[57257.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[58285.7148,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59314.2852,3,0],[59657.14,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[61028.57,2,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[62057.14,0,0],[62400,2,0],[62742.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63771.43,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64800,3,0],[65142.8555,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66514.28,2,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67542.86,0,0],[67885.71,2,0],[68228.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[69257.14,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70628.57,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[72000,2,0],[72342.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[73371.43,2,0],[73714.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74742.86,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[76114.28,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[77485.71,2,0],[77828.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78857.14,2,0],[79200,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[80228.57,2,0],[80571.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81600,2,0],[81942.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82971.43,2,0],[83314.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,3,0],[84342.86,2,0],[84685.71,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85714.28,2,0],[86057.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[87085.71,2,0],[87428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[88457.14,2,0],[88800,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,3,0],[89828.57,2,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly Nice","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":1}} \ No newline at end of file diff --git a/assets/preload/data/philly/philly-hard.json b/assets/preload/data/philly/philly-hard.json index 2f35dff..5dcf8f2 100644 --- a/assets/preload/data/philly/philly-hard.json +++ b/assets/preload/data/philly/philly-hard.json @@ -1 +1 @@ -{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3085.71436,0,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4457.14258,0,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[5828.57129,0,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7028.57129,3,0],[7200,2,0],[7542.857,2,0],[7885.71436,0,0],[8057.14258,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8571.429,0,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[9942.857,0,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11314.2852,0,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12514.2852,3,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[13885.7139,2,0],[14057.1426,0,0],[14400,0,0],[14742.8574,3,0],[14914.2852,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15257.1426,3,0],[15428.5713,0,0],[15771.4287,2,0],[16114.2852,0,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16628.57,0,0],[16800,1,0],[16971.4277,3,0],[17142.8574,1,0],[17314.2852,0,0],[17485.7148,1,0],[17657.1426,3,0],[17742.8574,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18000,3,0],[18171.4277,1,0],[18514.2852,2,0],[18857.1426,2,0],[19028.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19371.4277,2,0],[19542.8574,0,0],[19885.7148,0,0],[20228.57,3,0],[20400,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20742.8574,3,0],[20914.2852,0,0],[21257.1426,2,0],[21600,0,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22114.2852,0,0],[22285.7148,1,0],[22457.1426,3,0],[22628.57,1,0],[22800,0,0],[22971.4277,1,0],[23142.8574,3,0],[23228.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23485.7148,3,0],[23657.1426,1,0],[24000,2,0],[24342.8574,2,0],[24514.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[24857.1426,2,0],[25028.57,0,0],[25371.4277,0,0],[25714.2852,3,0],[25885.7148,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26228.57,3,0],[26400,0,0],[26742.8574,2,0],[27085.7148,0,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27600,0,0],[27771.4277,1,0],[27942.8574,3,0],[28114.2852,1,0],[28285.7148,0,0],[28457.1426,1,0],[28628.57,3,0],[28714.2852,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[28971.4277,3,0],[29142.8574,1,0],[29485.7148,2,0],[29828.57,2,0],[30000,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30342.8574,2,0],[30514.2852,0,0],[30857.1426,0,0],[31200,3,0],[31371.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31714.2852,3,0],[31885.7148,0,0],[32228.57,2,0],[32571.4277,0,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33085.7148,0,0],[33257.14,1,0],[33428.57,3,0],[33600,1,0],[33771.43,0,0],[33942.8555,1,0],[34114.2852,3,0],[34200,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34457.14,3,0],[34628.57,1,0],[34971.43,2,0],[35314.2852,2,0],[35485.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[35828.57,3,0],[36000,1,0],[36171.43,0,0],[36342.8555,2,0],[36514.2852,3,0],[36685.7148,0,0],[36857.14,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37200,3,0],[37371.43,2,0],[37542.8555,0,0],[37714.2852,2,0],[37885.7148,3,0],[38057.14,0,0],[38228.57,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[38571.43,3,0],[38742.8555,1,0],[38914.2852,0,0],[39085.7148,2,0],[39257.14,3,0],[39428.57,0,0],[39600,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[39942.8555,3,0],[40114.2852,2,0],[40285.7148,0,0],[40457.14,2,0],[40628.57,3,0],[40800,0,0],[40971.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41314.2852,3,0],[41485.7148,1,0],[41657.14,0,0],[41828.57,2,0],[42000,3,0],[42171.43,0,0],[42342.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[42685.7148,3,0],[42857.14,2,0],[43028.57,0,0],[43200,2,0],[43371.43,3,0],[43542.8555,0,0],[43714.2852,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44057.14,3,0],[44228.57,1,0],[44400,0,0],[44571.43,2,0],[44742.8555,3,0],[44914.2852,0,0],[45085.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45428.57,3,0],[45600,2,0],[45771.43,0,0],[45942.8555,2,0],[46114.2852,3,0],[46285.7148,0,0],[46457.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[46800,3,0],[46971.43,1,0],[47142.8555,0,0],[47314.2852,2,0],[47485.7148,3,0],[47657.14,0,0],[47828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48171.43,3,0],[48342.8555,2,0],[48514.2852,0,0],[48685.7148,2,0],[48857.14,3,0],[49028.57,0,0],[49200,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[49542.8555,3,0],[49714.2852,1,0],[49885.7148,0,0],[50057.14,2,0],[50228.57,3,0],[50400,0,0],[50571.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,2,0],[50914.2852,3,0],[51085.7148,2,0],[51257.14,0,0],[51428.57,2,0],[51600,3,0],[51771.43,0,0],[51942.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52285.7148,3,0],[52457.14,1,0],[52628.57,0,0],[52800,2,0],[52971.43,3,0],[53142.8555,0,0],[53314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[53657.14,3,0],[53828.57,2,0],[54000,0,0],[54171.43,2,0],[54342.8555,3,0],[54514.2852,0,0],[54685.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55028.57,3,0],[55200,1,0],[55371.43,0,0],[55542.8555,2,0],[55714.2852,3,0],[55885.7148,0,0],[56057.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,2,0],[56400,3,0],[56571.43,2,0],[56742.8555,0,0],[56914.2852,2,0],[57085.7148,3,0],[57257.14,0,0],[57428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[57771.43,3,0],[57942.8555,1,0],[58114.2852,1,0],[58285.7148,2,0],[58457.14,2,0],[58800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59142.8555,3,0],[59228.57,0,0],[59314.2852,3,0],[59485.7148,3,0],[59657.14,2,0],[59828.57,0,0],[60000,0,0],[60171.43,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[60514.2852,3,0],[60600,0,0],[60685.7148,3,0],[60857.14,1,0],[61028.57,2,0],[61200,2,0],[61371.43,0,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[61885.7148,3,0],[62057.14,0,0],[62228.57,3,0],[62400,2,0],[62742.8555,1,0],[62914.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63257.14,3,0],[63428.57,1,0],[63600,1,0],[63771.43,2,0],[63942.8555,2,0],[64285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64628.57,3,0],[64714.2852,0,0],[64800,3,0],[64971.43,3,0],[65142.8555,2,0],[65314.2852,0,0],[65485.7148,0,0],[65657.14,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66000,3,0],[66085.71,0,0],[66171.43,3,0],[66342.86,1,0],[66514.28,2,0],[66685.71,2,0],[66857.14,0,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67371.43,3,0],[67542.86,0,0],[67714.28,3,0],[67885.71,2,0],[68228.57,1,0],[68400,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[68914.28,1,0],[69085.71,3,0],[69257.14,2,0],[69600,1,0],[69771.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70114.28,3,0],[70285.71,1,0],[70457.14,3,0],[70628.57,2,0],[70971.43,2,0],[71142.86,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[71485.71,1,0],[71657.14,0,0],[71828.57,3,0],[72000,2,0],[72342.86,0,0],[72514.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[72857.14,3,0],[73028.57,2,0],[73200,0,0],[73371.43,2,0],[73542.86,3,0],[73714.28,0,0],[73885.71,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74400,1,0],[74571.43,3,0],[74742.86,2,0],[75085.71,1,0],[75257.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[75600,3,0],[75771.43,1,0],[75942.86,3,0],[76114.28,2,0],[76457.14,2,0],[76628.57,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[76971.43,1,0],[77142.86,0,0],[77314.28,3,0],[77485.71,2,0],[77828.57,0,0],[78000,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78342.86,3,0],[78514.28,2,0],[78685.71,0,0],[78857.14,2,0],[79028.57,3,0],[79200,0,0],[79371.43,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[79714.28,3,0],[79885.71,1,0],[80057.14,0,0],[80228.57,2,0],[80400,3,0],[80571.43,0,0],[80742.86,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81085.71,3,0],[81257.14,2,0],[81428.57,0,0],[81600,2,0],[81771.43,3,0],[81942.86,0,0],[82114.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82457.14,3,0],[82628.57,1,0],[82800,0,0],[82971.43,2,0],[83142.86,3,0],[83314.28,0,0],[83485.71,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,2,0],[83828.57,3,0],[84000,2,0],[84171.43,0,0],[84342.86,2,0],[84514.28,3,0],[84685.71,0,0],[84857.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85200,3,0],[85371.43,1,0],[85542.86,0,0],[85714.28,2,0],[85885.71,3,0],[86057.14,0,0],[86228.57,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[86571.43,3,0],[86742.86,2,0],[86914.28,0,0],[87085.71,2,0],[87257.14,3,0],[87428.57,0,0],[87600,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[87942.86,3,0],[88114.28,1,0],[88285.71,0,0],[88457.14,2,0],[88628.57,3,0],[88800,0,0],[88971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,2,0],[89314.28,3,0],[89485.71,2,0],[89657.14,0,0],[89828.57,2,0],[90000,3,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":2}} \ No newline at end of file +{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3085.71436,0,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4457.14258,0,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[5828.57129,0,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7028.57129,3,0],[7200,2,0],[7542.857,2,0],[7885.71436,0,0],[8057.14258,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8571.429,0,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[9942.857,0,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11314.2852,0,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12514.2852,3,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[13885.7139,2,0],[14057.1426,0,0],[14400,0,0],[14742.8574,3,0],[14914.2852,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15257.1426,3,0],[15428.5713,0,0],[15771.4287,2,0],[16114.2852,0,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16628.57,0,0],[16800,1,0],[16971.4277,3,0],[17142.8574,1,0],[17314.2852,0,0],[17485.7148,1,0],[17657.1426,3,0],[17742.8574,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18000,3,0],[18171.4277,1,0],[18514.2852,2,0],[18857.1426,2,0],[19028.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19371.4277,2,0],[19542.8574,0,0],[19885.7148,0,0],[20228.57,3,0],[20400,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20742.8574,3,0],[20914.2852,0,0],[21257.1426,2,0],[21600,0,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22114.2852,0,0],[22285.7148,1,0],[22457.1426,3,0],[22628.57,1,0],[22800,0,0],[22971.4277,1,0],[23142.8574,3,0],[23228.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23485.7148,3,0],[23657.1426,1,0],[24000,2,0],[24342.8574,2,0],[24514.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[24857.1426,2,0],[25028.57,0,0],[25371.4277,0,0],[25714.2852,3,0],[25885.7148,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26228.57,3,0],[26400,0,0],[26742.8574,2,0],[27085.7148,0,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27600,0,0],[27771.4277,1,0],[27942.8574,3,0],[28114.2852,1,0],[28285.7148,0,0],[28457.1426,1,0],[28628.57,3,0],[28714.2852,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[28971.4277,3,0],[29142.8574,1,0],[29485.7148,2,0],[29828.57,2,0],[30000,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30342.8574,2,0],[30514.2852,0,0],[30857.1426,0,0],[31200,3,0],[31371.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31714.2852,3,0],[31885.7148,0,0],[32228.57,2,0],[32571.4277,0,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33085.7148,0,0],[33257.14,1,0],[33428.57,3,0],[33600,1,0],[33771.43,0,0],[33942.8555,1,0],[34114.2852,3,0],[34200,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34457.14,3,0],[34628.57,1,0],[34971.43,2,0],[35314.2852,2,0],[35485.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[35828.57,3,0],[36000,1,0],[36171.43,0,0],[36342.8555,2,0],[36514.2852,3,0],[36685.7148,0,0],[36857.14,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37200,3,0],[37371.43,2,0],[37542.8555,0,0],[37714.2852,2,0],[37885.7148,3,0],[38057.14,0,0],[38228.57,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[38571.43,3,0],[38742.8555,1,0],[38914.2852,0,0],[39085.7148,2,0],[39257.14,3,0],[39428.57,0,0],[39600,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[39942.8555,3,0],[40114.2852,2,0],[40285.7148,0,0],[40457.14,2,0],[40628.57,3,0],[40800,0,0],[40971.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41314.2852,3,0],[41485.7148,1,0],[41657.14,0,0],[41828.57,2,0],[42000,3,0],[42171.43,0,0],[42342.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[42685.7148,3,0],[42857.14,2,0],[43028.57,0,0],[43200,2,0],[43371.43,3,0],[43542.8555,0,0],[43714.2852,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44057.14,3,0],[44228.57,1,0],[44400,0,0],[44571.43,2,0],[44742.8555,3,0],[44914.2852,0,0],[45085.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45428.57,3,0],[45600,2,0],[45771.43,0,0],[45942.8555,2,0],[46114.2852,3,0],[46285.7148,0,0],[46457.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[46800,3,0],[46971.43,1,0],[47142.8555,0,0],[47314.2852,2,0],[47485.7148,3,0],[47657.14,0,0],[47828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48171.43,3,0],[48342.8555,2,0],[48514.2852,0,0],[48685.7148,2,0],[48857.14,3,0],[49028.57,0,0],[49200,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[49542.8555,3,0],[49714.2852,1,0],[49885.7148,0,0],[50057.14,2,0],[50228.57,3,0],[50400,0,0],[50571.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,2,0],[50914.2852,3,0],[51085.7148,2,0],[51257.14,0,0],[51428.57,2,0],[51600,3,0],[51771.43,0,0],[51942.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52285.7148,3,0],[52457.14,1,0],[52628.57,0,0],[52800,2,0],[52971.43,3,0],[53142.8555,0,0],[53314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[53657.14,3,0],[53828.57,2,0],[54000,0,0],[54171.43,2,0],[54342.8555,3,0],[54514.2852,0,0],[54685.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55028.57,3,0],[55200,1,0],[55371.43,0,0],[55542.8555,2,0],[55714.2852,3,0],[55885.7148,0,0],[56057.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,2,0],[56400,3,0],[56571.43,2,0],[56742.8555,0,0],[56914.2852,2,0],[57085.7148,3,0],[57257.14,0,0],[57428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[57771.43,3,0],[57942.8555,1,0],[58114.2852,1,0],[58285.7148,2,0],[58457.14,2,0],[58800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59142.8555,3,0],[59228.57,0,0],[59314.2852,3,0],[59485.7148,3,0],[59657.14,2,0],[59828.57,0,0],[60000,0,0],[60171.43,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[60514.2852,3,0],[60600,0,0],[60685.7148,3,0],[60857.14,1,0],[61028.57,2,0],[61200,2,0],[61371.43,0,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[61885.7148,3,0],[62057.14,0,0],[62228.57,3,0],[62400,2,0],[62742.8555,1,0],[62914.2852,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63257.14,3,0],[63428.57,1,0],[63600,1,0],[63771.43,2,0],[63942.8555,2,0],[64285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64628.57,3,0],[64714.2852,0,0],[64800,3,0],[64971.43,3,0],[65142.8555,2,0],[65314.2852,0,0],[65485.7148,0,0],[65657.14,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66000,3,0],[66085.71,0,0],[66171.43,3,0],[66342.86,1,0],[66514.28,2,0],[66685.71,2,0],[66857.14,0,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67371.43,3,0],[67542.86,0,0],[67714.28,3,0],[67885.71,2,0],[68228.57,1,0],[68400,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[68914.28,1,0],[69085.71,3,0],[69257.14,2,0],[69600,1,0],[69771.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70114.28,3,0],[70285.71,1,0],[70457.14,3,0],[70628.57,2,0],[70971.43,2,0],[71142.86,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[71485.71,1,0],[71657.14,0,0],[71828.57,3,0],[72000,2,0],[72342.86,0,0],[72514.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[72857.14,3,0],[73028.57,2,0],[73200,0,0],[73371.43,2,0],[73542.86,3,0],[73714.28,0,0],[73885.71,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74400,1,0],[74571.43,3,0],[74742.86,2,0],[75085.71,1,0],[75257.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[75600,3,0],[75771.43,1,0],[75942.86,3,0],[76114.28,2,0],[76457.14,2,0],[76628.57,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[76971.43,1,0],[77142.86,0,0],[77314.28,3,0],[77485.71,2,0],[77828.57,0,0],[78000,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78342.86,3,0],[78514.28,2,0],[78685.71,0,0],[78857.14,2,0],[79028.57,3,0],[79200,0,0],[79371.43,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[79714.28,3,0],[79885.71,1,0],[80057.14,0,0],[80228.57,2,0],[80400,3,0],[80571.43,0,0],[80742.86,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81085.71,3,0],[81257.14,2,0],[81428.57,0,0],[81600,2,0],[81771.43,3,0],[81942.86,0,0],[82114.28,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82457.14,3,0],[82628.57,1,0],[82800,0,0],[82971.43,2,0],[83142.86,3,0],[83314.28,0,0],[83485.71,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,2,0],[83828.57,3,0],[84000,2,0],[84171.43,0,0],[84342.86,2,0],[84514.28,3,0],[84685.71,0,0],[84857.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85200,3,0],[85371.43,1,0],[85542.86,0,0],[85714.28,2,0],[85885.71,3,0],[86057.14,0,0],[86228.57,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[86571.43,3,0],[86742.86,2,0],[86914.28,0,0],[87085.71,2,0],[87257.14,3,0],[87428.57,0,0],[87600,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[87942.86,3,0],[88114.28,1,0],[88285.71,0,0],[88457.14,2,0],[88628.57,3,0],[88800,0,0],[88971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,2,0],[89314.28,3,0],[89485.71,2,0],[89657.14,0,0],[89828.57,2,0],[90000,3,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly Nice","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":2}} \ No newline at end of file diff --git a/assets/preload/data/philly/philly.json b/assets/preload/data/philly/philly.json index 9d9d05c..a201a1e 100644 --- a/assets/preload/data/philly/philly.json +++ b/assets/preload/data/philly/philly.json @@ -1 +1 @@ -{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7542.857,2,0],[7885.71436,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[14057.1426,2,0],[14400,0,0],[14742.8574,3,0],[14914.2852,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15428.5713,3,0],[15771.4287,2,0],[16114.2852,0,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16628.57,0,0],[16800,3,0],[17142.8574,0,0],[17485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18171.4277,1,0],[18514.2852,2,0],[18857.1426,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19542.8574,2,0],[19885.7148,0,0],[20228.57,3,0],[20400,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20914.2852,3,0],[21257.1426,2,0],[21600,0,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22114.2852,0,0],[22285.7148,3,0],[22628.57,0,0],[22971.4277,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23657.1426,1,0],[24000,2,0],[24342.8574,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[24857.1426,2,0],[25028.57,2,0],[25371.4277,0,0],[25714.2852,3,0],[25885.7148,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26400,3,0],[26742.8574,2,0],[27085.7148,0,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27600,0,0],[27771.4277,3,0],[27942.8574,3,0],[28114.2852,0,0],[28285.7148,0,0],[28457.1426,3,0],[28628.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[29142.8574,1,0],[29485.7148,2,0],[29828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30342.8574,2,0],[30514.2852,2,0],[30857.1426,0,0],[31200,3,0],[31371.4277,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31885.7148,3,0],[32228.57,2,0],[32571.4277,0,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33085.7148,0,0],[33257.14,3,0],[33428.57,3,0],[33600,0,0],[33771.43,0,0],[33942.8555,3,0],[34114.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34628.57,1,0],[34971.43,2,0],[35314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[36342.8555,2,0],[36514.2852,3,0],[36685.7148,0,0],[36857.14,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37714.2852,2,0],[37885.7148,3,0],[38057.14,0,0],[38228.57,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[39085.7148,2,0],[39257.14,3,0],[39428.57,0,0],[39600,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[40457.14,2,0],[40628.57,3,0],[40800,0,0],[40971.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41828.57,2,0],[42000,3,0],[42171.43,0,0],[42342.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[43200,2,0],[43371.43,3,0],[43542.8555,0,0],[43714.2852,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44571.43,2,0],[44742.8555,3,0],[44914.2852,0,0],[45085.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45942.8555,2,0],[46114.2852,3,0],[46285.7148,0,0],[46457.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[46971.43,1,0],[47314.2852,2,0],[47485.7148,3,0],[47657.14,0,0],[47828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48342.8555,2,0],[48685.7148,2,0],[48857.14,3,0],[49028.57,0,0],[49200,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[49714.2852,1,0],[50057.14,2,0],[50228.57,3,0],[50400,0,0],[50571.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,2,0],[51085.7148,2,0],[51428.57,2,0],[51600,3,0],[51771.43,0,0],[51942.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52457.14,1,0],[52800,2,0],[52971.43,3,0],[53142.8555,0,0],[53314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[53828.57,2,0],[54171.43,2,0],[54342.8555,3,0],[54514.2852,0,0],[54685.7148,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55200,1,0],[55542.8555,2,0],[55714.2852,3,0],[55885.7148,0,0],[56057.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,2,0],[56571.43,2,0],[56914.2852,2,0],[57085.7148,3,0],[57257.14,0,0],[57428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[57942.8555,1,0],[58285.7148,2,0],[58800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59314.2852,3,0],[59657.14,2,0],[60171.43,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[60685.7148,1,0],[61028.57,2,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[62057.14,0,0],[62400,2,0],[62742.8555,0,0],[62914.2852,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63428.57,1,0],[63771.43,2,0],[64285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64800,3,0],[65142.8555,2,0],[65657.14,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66171.43,1,0],[66514.28,2,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67542.86,0,0],[67885.71,2,0],[68228.57,0,0],[68400,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[68914.28,1,0],[69257.14,2,0],[69600,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70285.71,1,0],[70628.57,2,0],[70971.43,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[71657.14,0,0],[72000,2,0],[72342.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[73028.57,2,0],[73371.43,2,0],[73542.86,3,0],[73714.28,0,0],[73885.71,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74400,1,0],[74742.86,2,0],[75085.71,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[75771.43,1,0],[76114.28,2,0],[76457.14,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[77142.86,0,0],[77485.71,2,0],[77828.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78514.28,2,0],[78857.14,2,0],[79028.57,3,0],[79200,0,0],[79371.43,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[79885.71,1,0],[80228.57,2,0],[80400,3,0],[80571.43,0,0],[80742.86,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81257.14,2,0],[81600,2,0],[81771.43,3,0],[81942.86,0,0],[82114.28,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82628.57,1,0],[82971.43,2,0],[83142.86,3,0],[83314.28,0,0],[83485.71,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,2,0],[84000,2,0],[84342.86,2,0],[84514.28,3,0],[84685.71,0,0],[84857.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85371.43,1,0],[85714.28,2,0],[85885.71,3,0],[86057.14,0,0],[86228.57,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[86742.86,2,0],[87085.71,2,0],[87257.14,3,0],[87428.57,0,0],[87600,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[88114.28,1,0],[88457.14,2,0],[88628.57,3,0],[88800,0,0],[88971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,2,0],[89485.71,2,0],[89828.57,2,0],[90000,3,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":1.3}} \ No newline at end of file +{"song":{"player1":"bf","notes":[{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[2914.28564,2,0],[3428.57129,1,257.142853],[3771.42847,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4285.71436,2,0],[4800,1,257.142853],[5142.857,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[5657.14258,2,0],[6171.42871,1,257.142853],[6514.28564,3,171.428574]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[6857.14258,0,0],[7542.857,2,0],[7885.71436,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[8400,2,0],[8914.285,1,257.142853],[9257.143,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[9771.429,2,0],[10285.7139,1,257.142853],[10628.5713,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[11142.8574,2,0],[11657.1426,1,257.142853],[12000,3,171.428574]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12342.8574,0,0],[12685.7139,2,0],[13028.5713,2,0],[13371.4287,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[14057.1426,2,0],[14400,0,0],[14742.8574,3,0],[14914.2852,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[15428.5713,3,0],[15771.4287,2,0],[16114.2852,0,0],[16285.7139,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[16628.57,0,0],[16800,3,0],[17142.8574,0,0],[17485.7148,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[17828.57,3,0],[18171.4277,1,0],[18514.2852,2,0],[18857.1426,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[19542.8574,2,0],[19885.7148,0,0],[20228.57,3,0],[20400,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[20914.2852,3,0],[21257.1426,2,0],[21600,0,0],[21771.4277,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[22114.2852,0,0],[22285.7148,3,0],[22628.57,0,0],[22971.4277,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[23314.2852,3,0],[23657.1426,1,0],[24000,2,0],[24342.8574,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[24685.7148,2,0],[24857.1426,2,0],[25028.57,2,0],[25371.4277,0,0],[25714.2852,3,0],[25885.7148,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[26400,3,0],[26742.8574,2,0],[27085.7148,0,0],[27257.1426,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[27600,0,0],[27771.4277,3,0],[27942.8574,3,0],[28114.2852,0,0],[28285.7148,0,0],[28457.1426,3,0],[28628.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,3,0],[29142.8574,1,0],[29485.7148,2,0],[29828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[30171.4277,2,0],[30342.8574,2,0],[30514.2852,2,0],[30857.1426,0,0],[31200,3,0],[31371.4277,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[31885.7148,3,0],[32228.57,2,0],[32571.4277,0,0],[32742.8574,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33085.7148,0,0],[33257.14,3,0],[33428.57,3,0],[33600,0,0],[33771.43,0,0],[33942.8555,3,0],[34114.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[34285.7148,3,0],[34628.57,1,0],[34971.43,2,0],[35314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[35657.14,2,0],[36342.8555,2,0],[36514.2852,3,0],[36685.7148,0,0],[36857.14,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[37028.57,2,0],[37714.2852,2,0],[37885.7148,3,0],[38057.14,0,0],[38228.57,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[38400,2,0],[39085.7148,2,0],[39257.14,3,0],[39428.57,0,0],[39600,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[39771.43,2,0],[40457.14,2,0],[40628.57,3,0],[40800,0,0],[40971.43,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[41142.8555,2,0],[41828.57,2,0],[42000,3,0],[42171.43,0,0],[42342.8555,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[42514.2852,2,0],[43200,2,0],[43371.43,3,0],[43542.8555,0,0],[43714.2852,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[43885.7148,2,0],[44571.43,2,0],[44742.8555,3,0],[44914.2852,0,0],[45085.7148,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[45257.14,2,0],[45942.8555,2,0],[46114.2852,3,0],[46285.7148,0,0],[46457.14,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[46628.57,2,0],[46971.43,1,0],[47314.2852,2,0],[47485.7148,3,0],[47657.14,0,0],[47828.57,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48000,2,0],[48342.8555,2,0],[48685.7148,2,0],[48857.14,3,0],[49028.57,0,0],[49200,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[49371.43,2,0],[49714.2852,1,0],[50057.14,2,0],[50228.57,3,0],[50400,0,0],[50571.43,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[50742.8555,2,0],[51085.7148,2,0],[51428.57,2,0],[51600,3,0],[51771.43,0,0],[51942.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[52114.2852,2,0],[52457.14,1,0],[52800,2,0],[52971.43,3,0],[53142.8555,0,0],[53314.2852,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[53485.7148,2,0],[53828.57,2,0],[54171.43,2,0],[54342.8555,3,0],[54514.2852,0,0],[54685.7148,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[54857.14,2,0],[55200,1,0],[55542.8555,2,0],[55714.2852,3,0],[55885.7148,0,0],[56057.14,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[56228.57,2,0],[56571.43,2,0],[56914.2852,2,0],[57085.7148,3,0],[57257.14,0,0],[57428.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[57600,3,0],[57942.8555,1,0],[58285.7148,2,0],[58800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[58971.43,2,0],[59314.2852,3,0],[59657.14,2,0],[60171.43,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[60342.8555,3,0],[60685.7148,1,0],[61028.57,2,0],[61542.8555,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[61714.2852,2,0],[62057.14,0,0],[62400,2,0],[62742.8555,0,0],[62914.2852,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[63085.7148,3,0],[63428.57,1,0],[63771.43,2,0],[64285.7148,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[64457.14,2,0],[64800,3,0],[65142.8555,2,0],[65657.14,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[65828.57,3,0],[66171.43,1,0],[66514.28,2,0],[67028.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[67200,2,0],[67542.86,0,0],[67885.71,2,0],[68228.57,0,0],[68400,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[68571.43,2,0],[68914.28,1,0],[69257.14,2,0],[69600,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[69942.86,0,0],[70285.71,1,0],[70628.57,2,0],[70971.43,2,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[71314.28,3,0],[71657.14,0,0],[72000,2,0],[72342.86,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[72685.71,3,0],[73028.57,2,0],[73371.43,2,0],[73542.86,3,0],[73714.28,0,0],[73885.71,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[74057.14,2,0],[74400,1,0],[74742.86,2,0],[75085.71,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[75428.57,0,0],[75771.43,1,0],[76114.28,2,0],[76457.14,2,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,3,0],[77142.86,0,0],[77485.71,2,0],[77828.57,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[78171.43,3,0],[78514.28,2,0],[78857.14,2,0],[79028.57,3,0],[79200,0,0],[79371.43,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[79542.86,2,0],[79885.71,1,0],[80228.57,2,0],[80400,3,0],[80571.43,0,0],[80742.86,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[80914.28,2,0],[81257.14,2,0],[81600,2,0],[81771.43,3,0],[81942.86,0,0],[82114.28,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[82285.71,2,0],[82628.57,1,0],[82971.43,2,0],[83142.86,3,0],[83314.28,0,0],[83485.71,3,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[83657.14,2,0],[84000,2,0],[84342.86,2,0],[84514.28,3,0],[84685.71,0,0],[84857.14,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[85028.57,2,0],[85371.43,1,0],[85714.28,2,0],[85885.71,3,0],[86057.14,0,0],[86228.57,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[86400,2,0],[86742.86,2,0],[87085.71,2,0],[87257.14,3,0],[87428.57,0,0],[87600,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[87771.43,2,0],[88114.28,1,0],[88457.14,2,0],[88628.57,3,0],[88800,0,0],[88971.43,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[89142.86,2,0],[89485.71,2,0],[89828.57,2,0],[90000,3,0],[90171.43,0,0],[90342.86,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[90514.28,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":175,"changeBPM":false,"mustHitSection":true}],"player2":"pico","song":"Philly Nice","stage":"philly","needsVoices":true,"validScore":true,"bpm":175,"speed":1.3}} \ No newline at end of file diff --git a/assets/songs/dad-battle/Inst.mp3 b/assets/songs/dadbattle/Inst.mp3 similarity index 100% rename from assets/songs/dad-battle/Inst.mp3 rename to assets/songs/dadbattle/Inst.mp3 diff --git a/assets/songs/dad-battle/Inst.ogg b/assets/songs/dadbattle/Inst.ogg similarity index 100% rename from assets/songs/dad-battle/Inst.ogg rename to assets/songs/dadbattle/Inst.ogg diff --git a/assets/songs/dad-battle/Voices.mp3 b/assets/songs/dadbattle/Voices.mp3 similarity index 100% rename from assets/songs/dad-battle/Voices.mp3 rename to assets/songs/dadbattle/Voices.mp3 diff --git a/assets/songs/dad-battle/Voices.ogg b/assets/songs/dadbattle/Voices.ogg similarity index 100% rename from assets/songs/dad-battle/Voices.ogg rename to assets/songs/dadbattle/Voices.ogg diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index c330edc..deb6099 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -202,13 +202,24 @@ class FreeplayState extends MusicBeatState if (accepted) { - trace(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase()); + // pre lowercasing the song name + var songLowercase = switch (songs[curSelected].songName) + { + case 'Dad Battle': + StringTools.replace(songs[curSelected].songName," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(songs[curSelected].songName," Nice", "").toLowerCase(); + default: + StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(); + } + + trace(songLowercase); - var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty); + var poop:String = Highscore.formatSong(songLowercase, curDifficulty); trace(poop); - - PlayState.SONG = Song.loadFromJson(poop, StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase()); + + PlayState.SONG = Song.loadFromJson(poop, songLowercase); PlayState.isStoryMode = false; PlayState.storyDifficulty = curDifficulty; PlayState.storyWeek = songs[curSelected].week; diff --git a/source/Paths.hx b/source/Paths.hx index 27cd3e4..9489d97 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -97,14 +97,30 @@ class Paths inline static public function voices(song:String) { - song = StringTools.replace(song," ", "-"); - return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT'; + var songLowercase = switch (song) + { + case 'Dad Battle': + StringTools.replace(song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(song," Nice", "").toLowerCase(); + default: + StringTools.replace(song," ", "-").toLowerCase(); + } + return 'songs:assets/songs/${songLowercase}/Voices.$SOUND_EXT'; } inline static public function inst(song:String) { - song = StringTools.replace(song," ", "-"); - return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT'; + var songLowercase = switch (song) + { + case 'Dad Battle': + StringTools.replace(song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(song," Nice", "").toLowerCase(); + default: + StringTools.replace(song," ", "-").toLowerCase(); + } + return 'songs:assets/songs/${songLowercase}/Inst.$SOUND_EXT'; } inline static public function image(key:String, ?library:String) diff --git a/source/PlayState.hx b/source/PlayState.hx index c715ede..0a71c71 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -236,14 +236,25 @@ class PlayState extends MusicBeatState repPresses = 0; repReleases = 0; + // pre lowercasing the song name (create) + var songLowercase = switch (PlayState.SONG.song) + { + case 'Dad Battle': + StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); + default: + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + } + #if windows - executeModchart = FileSystem.exists(Paths.lua(PlayState.SONG.song.toLowerCase() + "/modchart")); + executeModchart = FileSystem.exists(Paths.lua(songLowercase + "/modchart")); #end #if !cpp executeModchart = false; // FORCE disable for non cpp targets #end - trace('Mod chart: ' + executeModchart + " - " + Paths.lua(PlayState.SONG.song.toLowerCase() + "/modchart")); + trace('Mod chart: ' + executeModchart + " - " + Paths.lua(songLowercase + "/modchart")); #if windows // Making difficulty text for Discord Rich Presence. @@ -310,7 +321,7 @@ class PlayState extends MusicBeatState trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + Conductor.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: ' + Conductor.timeScale + '\nBotPlay : ' + FlxG.save.data.botplay); //dialogue shit - switch (SONG.song.toLowerCase()) + switch (songLowercase) { case 'tutorial': dialogue = ["Hey you're pretty cute.", 'Use the arrow keys to keep up \nwith me singing.']; @@ -323,7 +334,7 @@ class PlayState extends MusicBeatState ]; case 'fresh': dialogue = ["Not too shabby boy.", ""]; - case 'dad battle': + case 'dadbattle': dialogue = [ "gah you think you're hot stuff?", "If you can beat me here...", @@ -592,7 +603,7 @@ class PlayState extends MusicBeatState bgGirls = new BackgroundGirls(-100, 190); bgGirls.scrollFactor.set(0.9, 0.9); - if (SONG.song.toLowerCase() == 'roses') + if (songLowercase == 'roses') { if(FlxG.save.data.distractions){ bgGirls.getScared(); @@ -1071,11 +1082,21 @@ class PlayState extends MusicBeatState senpaiEvil.updateHitbox(); senpaiEvil.screenCenter(); - if (SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns') + // pre lowercasing the song name (schoolIntro) + var songLowercase = switch (PlayState.SONG.song) + { + case 'Dad Battle': + StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); + default: + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + } + if (songLowercase == 'roses' || songLowercase == 'thorns') { remove(black); - if (SONG.song.toLowerCase() == 'thorns') + if (songLowercase == 'thorns') { add(red); } @@ -1095,7 +1116,7 @@ class PlayState extends MusicBeatState { inCutscene = true; - if (SONG.song.toLowerCase() == 'thorns') + if (songLowercase == 'thorns') { add(senpaiEvil); senpaiEvil.alpha = 0; @@ -1328,7 +1349,7 @@ class PlayState extends MusicBeatState // Song check real quick switch(curSong) { - case 'Bopeebo' | 'Philly' | 'Blammed' | 'Cocoa' | 'Eggnog': allowedToHeadbang = true; + case 'Bopeebo' | 'Philly Nice' | 'Blammed' | 'Cocoa' | 'Eggnog': allowedToHeadbang = true; default: allowedToHeadbang = false; } @@ -1368,9 +1389,20 @@ class PlayState extends MusicBeatState var playerCounter:Int = 0; + // pre lowercasing the song name (generateSong) + var songLowercase = switch (PlayState.SONG.song) + { + case 'Dad Battle': + StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); + default: + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + } // Per song offset check #if windows - var songPath = 'assets/data/' + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase() + '/'; + var songPath = 'assets/data/' + songLowercase + '/'; + for(file in sys.FileSystem.readDirectory(songPath)) { var path = haxe.io.Path.join([songPath, file]); @@ -1935,7 +1967,7 @@ class PlayState extends MusicBeatState // Per song treatment since some songs will only have the 'Hey' at certain times switch(curSong) { - case 'Philly': + case 'Philly Nice': { // General duration of the song if(curBeat < 250) @@ -2498,9 +2530,29 @@ class PlayState extends MusicBeatState difficulty = '-hard'; trace('LOADING NEXT SONG'); - trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty); + // pre lowercasing the next story song name + var nextSongLowercase = switch (PlayState.storyPlaylist[0]) + { + case 'Dad Battle': + StringTools.replace(PlayState.storyPlaylist[0]," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(PlayState.storyPlaylist[0]," Nice", "").toLowerCase(); + default: + StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase(); + } + trace(nextSongLowercase + difficulty); - if (SONG.song.toLowerCase() == 'eggnog') + // pre lowercasing the song name (endSong) + var songLowercase = switch (PlayState.SONG.song) + { + case 'Dad Battle': + StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); + default: + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + } + if (songLowercase == 'eggnog') { var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom, -FlxG.height * FlxG.camera.zoom).makeGraphic(FlxG.width * 3, FlxG.height * 3, FlxColor.BLACK); diff --git a/source/Song.hx b/source/Song.hx index 78c47dd..b78ffa8 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -46,9 +46,23 @@ class Song public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong { - trace('loading ' + StringTools.replace(folder," ", "-").toLowerCase() + '/' + StringTools.replace(jsonInput," ", "-").toLowerCase()); - - var rawJson = Assets.getText(Paths.json(StringTools.replace(folder," ", "-").toLowerCase() + '/' + StringTools.replace(jsonInput," ", "-").toLowerCase())).trim(); + trace(jsonInput); + // pre lowercasing the folder name + var folderLowercase = switch (folder) + { + case 'Dad Battle': + StringTools.replace(folder," ", "").toLowerCase(); + case 'Philly Nice': + StringTools.replace(folder," Nice", "").toLowerCase(); + default: + StringTools.replace(folder," ", "-").toLowerCase(); + } + // pre lowercasing the jsonInput name + var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase(); + + trace('loading ' + folderLowercase + '/' + jsonInputLowercase); + + var rawJson = Assets.getText(Paths.json(folderLowercase + '/' + jsonInputLowercase)).trim(); while (!rawJson.endsWith("}")) { diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index e244647..501cf2b 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -27,7 +27,7 @@ class StoryMenuState extends MusicBeatState ['Tutorial'], ['Bopeebo', 'Fresh', 'Dad Battle'], ['Spookeez', 'South', "Monster"], - ['Pico', 'Philly', "Blammed"], + ['Pico', 'Philly Nice', "Blammed"], ['Satin Panties', "High", "Milf"], ['Cocoa', 'Eggnog', 'Winter Horrorland'], ['Senpai', 'Roses', 'Thorns'] From e0620e8c126fbde347a986158abf6c6eda89e121 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:01:42 +0200 Subject: [PATCH 08/17] cleaned up code "This switch case is hella wack you're repeating code and changing like one argument" --- source/FreeplayState.hx | 12 +++----- source/Paths.hx | 24 ++++++---------- source/PlayState.hx | 62 ++++++++++++++--------------------------- source/Song.hx | 14 ++++------ 4 files changed, 38 insertions(+), 74 deletions(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index deb6099..7d15acf 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -203,14 +203,10 @@ class FreeplayState extends MusicBeatState if (accepted) { // pre lowercasing the song name - var songLowercase = switch (songs[curSelected].songName) - { - case 'Dad Battle': - StringTools.replace(songs[curSelected].songName," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(songs[curSelected].songName," Nice", "").toLowerCase(); - default: - StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } trace(songLowercase); diff --git a/source/Paths.hx b/source/Paths.hx index 9489d97..3698dd8 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -97,28 +97,20 @@ class Paths inline static public function voices(song:String) { - var songLowercase = switch (song) - { - case 'Dad Battle': - StringTools.replace(song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(song," Nice", "").toLowerCase(); - default: - StringTools.replace(song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } return 'songs:assets/songs/${songLowercase}/Voices.$SOUND_EXT'; } inline static public function inst(song:String) { - var songLowercase = switch (song) - { - case 'Dad Battle': - StringTools.replace(song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(song," Nice", "").toLowerCase(); - default: - StringTools.replace(song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } return 'songs:assets/songs/${songLowercase}/Inst.$SOUND_EXT'; } diff --git a/source/PlayState.hx b/source/PlayState.hx index 0a71c71..559071c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -237,14 +237,10 @@ class PlayState extends MusicBeatState repReleases = 0; // pre lowercasing the song name (create) - var songLowercase = switch (PlayState.SONG.song) - { - case 'Dad Battle': - StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); - default: - StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } #if windows @@ -1083,14 +1079,10 @@ class PlayState extends MusicBeatState senpaiEvil.screenCenter(); // pre lowercasing the song name (schoolIntro) - var songLowercase = switch (PlayState.SONG.song) - { - case 'Dad Battle': - StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); - default: - StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } if (songLowercase == 'roses' || songLowercase == 'thorns') { @@ -1390,14 +1382,10 @@ class PlayState extends MusicBeatState var playerCounter:Int = 0; // pre lowercasing the song name (generateSong) - var songLowercase = switch (PlayState.SONG.song) - { - case 'Dad Battle': - StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); - default: - StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } // Per song offset check #if windows @@ -2531,26 +2519,18 @@ class PlayState extends MusicBeatState trace('LOADING NEXT SONG'); // pre lowercasing the next story song name - var nextSongLowercase = switch (PlayState.storyPlaylist[0]) - { - case 'Dad Battle': - StringTools.replace(PlayState.storyPlaylist[0]," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(PlayState.storyPlaylist[0]," Nice", "").toLowerCase(); - default: - StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase(); - } + var songLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; + } trace(nextSongLowercase + difficulty); // pre lowercasing the song name (endSong) - var songLowercase = switch (PlayState.SONG.song) - { - case 'Dad Battle': - StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase(); - default: - StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase(); + var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + switch (songLowercase) { + case 'dad-battle': songLowercase = 'dadbattle'; + case 'philly-nice': songLowercase = 'philly'; } if (songLowercase == 'eggnog') { diff --git a/source/Song.hx b/source/Song.hx index b78ffa8..13205e5 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -48,15 +48,11 @@ class Song { trace(jsonInput); // pre lowercasing the folder name - var folderLowercase = switch (folder) - { - case 'Dad Battle': - StringTools.replace(folder," ", "").toLowerCase(); - case 'Philly Nice': - StringTools.replace(folder," Nice", "").toLowerCase(); - default: - StringTools.replace(folder," ", "-").toLowerCase(); - } + var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase(); + switch (folderLowercase) { + case 'dad-battle': folderLowercase = 'dadbattle'; + case 'philly-nice': folderLowercase = 'philly'; + } // pre lowercasing the jsonInput name var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase(); From e12bf0bf67615a09ceab18df5365e9da907364ab Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:04:06 +0200 Subject: [PATCH 09/17] copy-pasted too much --- source/PlayState.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 559071c..54afc54 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2519,10 +2519,10 @@ class PlayState extends MusicBeatState trace('LOADING NEXT SONG'); // pre lowercasing the next story song name - var songLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase(); - switch (songLowercase) { - case 'dad-battle': songLowercase = 'dadbattle'; - case 'philly-nice': songLowercase = 'philly'; + var nextSongLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase(); + switch (nextSongLowercase) { + case 'dad-battle': nextSongLowercase = 'dadbattle'; + case 'philly-nice': nextSongLowercase = 'philly'; } trace(nextSongLowercase + difficulty); From 0c8799dd83839e6a8cefc9d46ff37d7a32ae3bcd Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Tue, 8 Jun 2021 15:23:53 +0200 Subject: [PATCH 10/17] fixed Freeplay --- source/FreeplayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 7d15acf..8ebd89d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -203,7 +203,7 @@ class FreeplayState extends MusicBeatState if (accepted) { // pre lowercasing the song name - var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + var songLowercase = StringTools.replace(songs[curSelected], " ", "-").toLowerCase(); switch (songLowercase) { case 'dad-battle': songLowercase = 'dadbattle'; case 'philly-nice': songLowercase = 'philly'; From 2d4637cca11ca0f688d43a3d45430c40f14874f1 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Tue, 8 Jun 2021 16:21:55 +0200 Subject: [PATCH 11/17] forgot to call the song name --- source/FreeplayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 8ebd89d..2de5ff2 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -203,7 +203,7 @@ class FreeplayState extends MusicBeatState if (accepted) { // pre lowercasing the song name - var songLowercase = StringTools.replace(songs[curSelected], " ", "-").toLowerCase(); + var songLowercase = StringTools.replace(songs[curSelected].songName, " ", "-").toLowerCase(); switch (songLowercase) { case 'dad-battle': songLowercase = 'dadbattle'; case 'philly-nice': songLowercase = 'philly'; From fab3e8ecb480a92289290a242b456d81b94deaff Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 00:36:28 +0200 Subject: [PATCH 12/17] fixed everything highscore would be compatible if the package wasn't changed to KadeDev's own --- source/FreeplayState.hx | 30 ++++++++++++++++++++++++++---- source/Paths.hx | 4 ++-- source/PlayState.hx | 12 ++++++++++-- source/Song.hx | 14 +++----------- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 2de5ff2..6f7388d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -202,16 +202,23 @@ class FreeplayState extends MusicBeatState if (accepted) { - // pre lowercasing the song name + // pre lowercasing the song name (update) var songLowercase = StringTools.replace(songs[curSelected].songName, " ", "-").toLowerCase(); switch (songLowercase) { case 'dad-battle': songLowercase = 'dadbattle'; case 'philly-nice': songLowercase = 'philly'; } + // adjusting the highscore song name to be compatible (update) + // would read original scores if we didn't change packages + var songHighscore = StringTools.replace(songs[curSelected].songName, " ", "-"); + switch (songHighscore) { + case 'Dad-Battle': songHighscore = 'Dadbattle'; + case 'Philly-Nice': songHighscore = 'Philly'; + } trace(songLowercase); - var poop:String = Highscore.formatSong(songLowercase, curDifficulty); + var poop:String = Highscore.formatSong(songHighscore, curDifficulty); trace(poop); @@ -233,8 +240,15 @@ class FreeplayState extends MusicBeatState if (curDifficulty > 2) curDifficulty = 0; + // adjusting the highscore song name to be compatible (changeDiff) + var songHighscore = StringTools.replace(songs[curSelected].songName, " ", "-"); + switch (songHighscore) { + case 'Dad-Battle': songHighscore = 'Dadbattle'; + case 'Philly-Nice': songHighscore = 'Philly'; + } + #if !switch - intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); + intendedScore = Highscore.getScore(songHighscore, curDifficulty); #end switch (curDifficulty) @@ -265,9 +279,17 @@ class FreeplayState extends MusicBeatState curSelected = 0; // selector.y = (70 * curSelected) + 30; + + // adjusting the highscore song name to be compatible (changeSelection) + // would read original scores if we didn't change packages + var songHighscore = StringTools.replace(songs[curSelected].songName, " ", "-"); + switch (songHighscore) { + case 'Dad-Battle': songHighscore = 'Dadbattle'; + case 'Philly-Nice': songHighscore = 'Philly'; + } #if !switch - intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); + intendedScore = Highscore.getScore(songHighscore, curDifficulty); // lerpScore = 0; #end diff --git a/source/Paths.hx b/source/Paths.hx index 3698dd8..075adbd 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -97,7 +97,7 @@ class Paths inline static public function voices(song:String) { - var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + var songLowercase = StringTools.replace(song, " ", "-").toLowerCase(); switch (songLowercase) { case 'dad-battle': songLowercase = 'dadbattle'; case 'philly-nice': songLowercase = 'philly'; @@ -107,7 +107,7 @@ class Paths inline static public function inst(song:String) { - var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase(); + var songLowercase = StringTools.replace(song, " ", "-").toLowerCase(); switch (songLowercase) { case 'dad-battle': songLowercase = 'dadbattle'; case 'philly-nice': songLowercase = 'philly'; diff --git a/source/PlayState.hx b/source/PlayState.hx index 54afc54..b5107eb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2458,8 +2458,16 @@ class PlayState extends MusicBeatState vocals.volume = 0; if (SONG.validScore) { + // adjusting the highscore song name to be compatible + // would read original scores if we didn't change packages + var songHighscore = StringTools.replace(PlayState.SONG.song, " ", "-"); + switch (songHighscore) { + case 'Dad-Battle': songHighscore = 'Dadbattle'; + case 'Philly-Nice': songHighscore = 'Philly'; + } + #if !switch - Highscore.saveScore(SONG.song, Math.round(songScore), storyDifficulty); + Highscore.saveScore(songHighscore, Math.round(songScore), storyDifficulty); #end } @@ -2547,7 +2555,7 @@ class PlayState extends MusicBeatState FlxTransitionableState.skipNextTransOut = true; prevCamFollow = camFollow; - PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]); + PlayState.SONG = Song.loadFromJson(nextSongLowercase + difficulty, PlayState.storyPlaylist[0]); FlxG.sound.music.stop(); LoadingState.loadAndSwitchState(new PlayState()); diff --git a/source/Song.hx b/source/Song.hx index 13205e5..2b9a130 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -47,18 +47,10 @@ class Song public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong { trace(jsonInput); - // pre lowercasing the folder name - var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase(); - switch (folderLowercase) { - case 'dad-battle': folderLowercase = 'dadbattle'; - case 'philly-nice': folderLowercase = 'philly'; - } - // pre lowercasing the jsonInput name - var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase(); - - trace('loading ' + folderLowercase + '/' + jsonInputLowercase); - var rawJson = Assets.getText(Paths.json(folderLowercase + '/' + jsonInputLowercase)).trim(); + trace('loading ' + folder + '/' + jsonInput.toLowerCase()); + + var rawJson = Assets.getText(Paths.json(folder + '/' + jsonInput.toLowerCase())).trim(); while (!rawJson.endsWith("}")) { From 6cb3768fdb08eaa5018189819814ae7687c9da46 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 03:20:18 +0200 Subject: [PATCH 13/17] it's wierd, sometime it works sometimes not --- source/Song.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Song.hx b/source/Song.hx index 2b9a130..3ce884d 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -48,7 +48,7 @@ class Song { trace(jsonInput); - trace('loading ' + folder + '/' + jsonInput.toLowerCase()); + trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase()); var rawJson = Assets.getText(Paths.json(folder + '/' + jsonInput.toLowerCase())).trim(); From a519ca8b9a09572c77c079f17232e440fede2c4a Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 03:21:14 +0200 Subject: [PATCH 14/17] f... me --- source/Song.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Song.hx b/source/Song.hx index 3ce884d..97d8ee2 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -50,7 +50,7 @@ class Song trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase()); - var rawJson = Assets.getText(Paths.json(folder + '/' + jsonInput.toLowerCase())).trim(); + var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim(); while (!rawJson.endsWith("}")) { From d9b64ea72fb84bfb41e2483bdc3bc970d6fb9356 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 03:42:42 +0200 Subject: [PATCH 15/17] will it stop crashing now? --- source/Song.hx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/source/Song.hx b/source/Song.hx index 97d8ee2..00d8e94 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -48,9 +48,16 @@ class Song { trace(jsonInput); - trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase()); + // pre lowercasing the song name (update) + var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase(); + switch (folderLowercase) { + case 'dad-battle': folderLowercase = 'dadbattle'; + case 'philly-nice': folderLowercase = 'philly'; + } + + trace('loading ' + folderLowercase + '/' + jsonInput.toLowerCase()); - var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim(); + var rawJson = Assets.getText(Paths.json(folderLowercase + '/' + jsonInput.toLowerCase())).trim(); while (!rawJson.endsWith("}")) { From a28ed62ee0b45a7b89d18c6f92ad76176458b703 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 14:59:36 +0200 Subject: [PATCH 16/17] fixed Tutorial having zooms on story mode --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index b5107eb..e60cdda 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2299,7 +2299,7 @@ class PlayState extends MusicBeatState if (!daNote.mustPress && daNote.wasGoodHit) { - if (SONG.song != 'Tutorial') + if (SONG.song != 'Tutorial' && SONG.song != 'tutorial') camZooming = true; var altAnim:String = ""; From 5d5a7afb5b42b1beeee0535fc5c5e6b7843e242d Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Wed, 9 Jun 2021 14:59:36 +0200 Subject: [PATCH 17/17] Revert "fixed Tutorial having zooms on story mode" This reverts commit a28ed62ee0b45a7b89d18c6f92ad76176458b703. --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index e60cdda..b5107eb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2299,7 +2299,7 @@ class PlayState extends MusicBeatState if (!daNote.mustPress && daNote.wasGoodHit) { - if (SONG.song != 'Tutorial' && SONG.song != 'tutorial') + if (SONG.song != 'Tutorial') camZooming = true; var altAnim:String = "";