From f0fafbaee8d90313418d07f03198c7bba0ef596b Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 31 Oct 2020 21:55:00 -0700 Subject: [PATCH] almost releaaaase --- art/build-Itch-WINDOWS.bat | 8 ++++---- assets/data/bopeebo/bopeebo-easy.json | 1 + assets/data/bopeebo/bopeebo-hard.json | 1 + source/FreeplayState.hx | 2 +- source/StoryMenuState.hx | 6 ++++-- source/TitleState.hx | 4 +++- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 assets/data/bopeebo/bopeebo-easy.json create mode 100644 assets/data/bopeebo/bopeebo-hard.json diff --git a/art/build-Itch-WINDOWS.bat b/art/build-Itch-WINDOWS.bat index f5dd696d6..b2a074484 100644 --- a/art/build-Itch-WINDOWS.bat +++ b/art/build-Itch-WINDOWS.bat @@ -3,12 +3,12 @@ color 0a cd .. @echo on echo BUILDING GAME -lime build hl -debug +lime build windows -release echo UPLOADING 64 BIT VERSION TO ITCH -butler push ./export/debug/hl/bin ninja-muffin24/funkin:windows-64bit -lime build hl -debug -32 +butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-64bit +lime build windows -release -32 echo UPLOADING 32 BIT VERSION TO ITCH -butler push ./export/debug/hl/bin ninja-muffin24/funkin:windows-32bit +butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-32bit butler status ninja-muffin24/funkin:windows-32bit butler status ninja-muffin24/funkin:windows-64bit echo ITCH SHIT UPDATED LMAOOOOO diff --git a/assets/data/bopeebo/bopeebo-easy.json b/assets/data/bopeebo/bopeebo-easy.json new file mode 100644 index 000000000..02ee15fd0 --- /dev/null +++ b/assets/data/bopeebo/bopeebo-easy.json @@ -0,0 +1 @@ +{"song":{"player2":"dad","player1":"bf","speed":1,"needsVoices":true,"sectionLengths":[],"song":"Bopeebo","notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,2,0],[600,3,450],[1050,3,600]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2400,2,0],[3000,3,450],[3450,3,600]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4800,1,300],[5400,0,300],[6000,3,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[7200,1,300],[7800,0,300],[8400,3,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[9600,1,150],[10200,3,0],[10500,0,0],[10800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12000,1,150],[12600,3,0],[12900,0,0],[13200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14400,3,0],[14700,1,0],[15300,0,0],[15600,2,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16800,3,0],[17100,1,0],[17700,0,0],[18000,2,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[19200,0,0],[19500,3,0],[19800,1,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21600,0,0],[21900,3,0],[22200,1,750]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,1,0],[24300,3,0],[24600,0,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26700,3,0],[27000,0,750],[26400,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28800,2,0],[29100,3,0],[29400,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[31200,2,0],[31500,3,0],[31800,0,1050]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33600,0,0],[33900,3,0],[34500,2,0],[34800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36000,0,0],[36300,3,0],[36900,2,0],[37200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38400,2,450],[39000,3,300],[39600,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40800,2,450],[41400,3,300],[42000,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43200,1,0],[43800,2,0],[44400,1,0],[44550,1,0],[44700,1,0],[45000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45600,1,0],[46200,2,0],[46800,1,0],[46950,1,0],[47100,1,0],[47400,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48000,2,450],[48600,3,300],[49200,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50400,2,450],[51000,3,300],[51600,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52800,3,1650]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55200,3,1650],[55650,4,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[57600,2,0],[57900,3,0],[58200,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,2,0],[60300,3,0],[60600,0,1050],[62100,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62400,0,0],[62700,3,0],[63300,2,0],[63600,1,450],[64500,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64800,0,0],[65100,3,0],[65700,2,0],[66000,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[67200,2,0],[67500,3,0],[67800,0,0],[68100,2,0],[68400,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69600,2,0],[69900,3,0],[70200,0,0],[70500,2,0],[70800,1,450],[71700,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,0,0],[72300,3,0],[72900,2,0],[73200,1,450],[74100,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74400,0,0],[74700,3,0],[75300,2,0],[75600,1,450]]},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":100,"sections":0},"bpm":100,"sections":33,"notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,2,0],[600,3,450],[1050,3,600]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2400,2,0],[3000,3,450],[3450,3,600]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4800,1,300],[5400,0,300],[6000,3,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[7200,1,300],[7800,0,300],[8400,3,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[9600,1,150],[10200,3,0],[10500,0,0],[10800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12000,1,150],[12600,3,0],[12900,0,0],[13200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14400,3,0],[14700,1,0],[15300,0,0],[15600,2,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16800,3,0],[17100,1,0],[17700,0,0],[18000,2,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[19200,0,0],[19500,3,0],[19800,1,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21600,0,0],[21900,3,0],[22200,1,750]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,1,0],[24300,3,0],[24600,0,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26700,3,0],[27000,0,750],[26400,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28800,2,0],[29100,3,0],[29400,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[31200,2,0],[31500,3,0],[31800,0,1050]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33600,0,0],[33900,3,0],[34500,2,0],[34800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36000,0,0],[36300,3,0],[36900,2,0],[37200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38400,2,450],[39000,3,300],[39600,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40800,2,450],[41400,3,300],[42000,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43200,1,0],[43800,2,0],[44400,1,0],[44550,1,0],[44700,1,0],[45000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45600,1,0],[46200,2,0],[46800,1,0],[46950,1,0],[47100,1,0],[47400,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48000,2,450],[48600,3,300],[49200,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50400,2,450],[51000,3,300],[51600,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52800,3,1650]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55200,3,1650],[55650,4,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[57600,2,0],[57900,3,0],[58200,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,2,0],[60300,3,0],[60600,0,1050],[62100,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62400,0,0],[62700,3,0],[63300,2,0],[63600,1,450],[64500,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64800,0,0],[65100,3,0],[65700,2,0],[66000,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[67200,2,0],[67500,3,0],[67800,0,0],[68100,2,0],[68400,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69600,2,0],[69900,3,0],[70200,0,0],[70500,2,0],[70800,1,450],[71700,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,0,0],[72300,3,0],[72900,2,0],[73200,1,450],[74100,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74400,0,0],[74700,3,0],[75300,2,0],[75600,1,450]]},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]} \ No newline at end of file diff --git a/assets/data/bopeebo/bopeebo-hard.json b/assets/data/bopeebo/bopeebo-hard.json new file mode 100644 index 000000000..7c3d942d3 --- /dev/null +++ b/assets/data/bopeebo/bopeebo-hard.json @@ -0,0 +1 @@ +{"song":{"player2":"dad","player1":"bf","speed":1.6,"needsVoices":true,"sectionLengths":[],"song":"Bopeebo","notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,2,0],[600,3,450],[1050,3,600]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2400,2,0],[3000,3,450],[3450,3,600]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4800,1,300],[5400,0,300],[6000,3,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[7200,1,300],[7800,0,300],[8400,3,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[9600,1,150],[10200,3,0],[10500,0,0],[10800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12000,1,150],[12600,3,0],[12900,0,0],[13200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14400,3,0],[14700,1,0],[15300,0,0],[15600,2,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16800,3,0],[17100,1,0],[17700,0,0],[18000,2,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[19200,0,0],[19500,3,0],[19800,1,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21600,0,0],[21900,3,0],[22200,1,750]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,1,0],[24300,3,0],[24600,0,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26700,3,0],[27000,0,750],[26400,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28800,2,0],[29100,3,0],[29400,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[31200,2,0],[31500,3,0],[31800,0,1050]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33600,0,0],[33900,3,0],[34500,2,0],[34800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36000,0,0],[36300,3,0],[36900,2,0],[37200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38400,2,450],[39000,3,300],[39600,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40800,2,450],[41400,3,300],[42000,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43200,1,0],[43800,2,0],[44400,1,0],[44550,1,0],[44700,1,0],[45000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45600,1,0],[46200,2,0],[46800,1,0],[46950,1,0],[47100,1,0],[47400,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48000,2,450],[48600,3,300],[49200,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50400,2,450],[51000,3,300],[51600,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52800,3,1650]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55200,3,1650],[55650,4,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[57600,2,0],[57900,3,0],[58200,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,2,0],[60300,3,0],[60600,0,1050],[62100,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62400,0,0],[62700,3,0],[63300,2,0],[63600,1,450],[64500,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64800,0,0],[65100,3,0],[65700,2,0],[66000,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[67200,2,0],[67500,3,0],[67800,0,0],[68100,2,0],[68400,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69600,2,0],[69900,3,0],[70200,0,0],[70500,2,0],[70800,1,450],[71700,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,0,0],[72300,3,0],[72900,2,0],[73200,1,450],[74100,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74400,0,0],[74700,3,0],[75300,2,0],[75600,1,450]]},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":100,"sections":0},"bpm":100,"sections":33,"notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,2,0],[600,3,450],[1050,3,600]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2400,2,0],[3000,3,450],[3450,3,600]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4800,1,300],[5400,0,300],[6000,3,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[7200,1,300],[7800,0,300],[8400,3,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[9600,1,150],[10200,3,0],[10500,0,0],[10800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12000,1,150],[12600,3,0],[12900,0,0],[13200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14400,3,0],[14700,1,0],[15300,0,0],[15600,2,300]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16800,3,0],[17100,1,0],[17700,0,0],[18000,2,300]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[19200,0,0],[19500,3,0],[19800,1,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21600,0,0],[21900,3,0],[22200,1,750]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,1,0],[24300,3,0],[24600,0,750]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26700,3,0],[27000,0,750],[26400,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28800,2,0],[29100,3,0],[29400,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[31200,2,0],[31500,3,0],[31800,0,1050]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33600,0,0],[33900,3,0],[34500,2,0],[34800,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36000,0,0],[36300,3,0],[36900,2,0],[37200,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38400,2,450],[39000,3,300],[39600,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40800,2,450],[41400,3,300],[42000,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43200,1,0],[43800,2,0],[44400,1,0],[44550,1,0],[44700,1,0],[45000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45600,1,0],[46200,2,0],[46800,1,0],[46950,1,0],[47100,1,0],[47400,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48000,2,450],[48600,3,300],[49200,0,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50400,2,450],[51000,3,300],[51600,0,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52800,3,1650]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55200,3,1650],[55650,4,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[57600,2,0],[57900,3,0],[58200,0,1050]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,2,0],[60300,3,0],[60600,0,1050],[62100,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62400,0,0],[62700,3,0],[63300,2,0],[63600,1,450],[64500,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64800,0,0],[65100,3,0],[65700,2,0],[66000,1,450]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[67200,2,0],[67500,3,0],[67800,0,0],[68100,2,0],[68400,1,450]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69600,2,0],[69900,3,0],[70200,0,0],[70500,2,0],[70800,1,450],[71700,6,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,0,0],[72300,3,0],[72900,2,0],[73200,1,450],[74100,6,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74400,0,0],[74700,3,0],[75300,2,0],[75600,1,450]]},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]} \ No newline at end of file diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 7835132ce..6fa3f6357 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -77,7 +77,7 @@ class FreeplayState extends MusicBeatState if (controls.BACK) { - FlxG.switchState(new StoryMenuState()); + FlxG.switchState(new MainMenuState()); } if (accepted) diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index b0fbb5e34..0677c4e42 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -275,9 +275,11 @@ class StoryMenuState extends MusicBeatState } sprDifficulty.alpha = 0; - sprDifficulty.y -= 15; - FlxTween.tween(sprDifficulty, {y: sprDifficulty.y + 15, alpha: 1}, 0.07); + // USING THESE WEIRD VALUES SO THAT IT DOESNT FLOAT UP + sprDifficulty.y = leftArrow.y - 15; + + FlxTween.tween(sprDifficulty, {y: leftArrow.y + 15, alpha: 1}, 0.07); } function changeWeek(change:Int = 0):Void diff --git a/source/TitleState.hx b/source/TitleState.hx index c8f98ccaf..23dbdfd9d 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -120,12 +120,14 @@ class TitleState extends MusicBeatState gfDance.antialiasing = true; add(gfDance); - titleText = new FlxSprite(); + titleText = new FlxSprite(100, FlxG.height * 0.8); titleText.frames = FlxAtlasFrames.fromSparrow(AssetPaths.titleEnter__png, AssetPaths.titleEnter__xml); titleText.animation.addByPrefix('idle', "Press Enter to Begin", 24); titleText.animation.addByPrefix('press', "ENTER PRESSED", 24); titleText.antialiasing = true; titleText.animation.play('idle'); + titleText.updateHitbox(); + // titleText.screenCenter(X); add(titleText); var logo:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.logo__png);