diff --git a/assets/data/fresh/fresh.json b/assets/data/fresh/fresh.json index 6720ca1..7ab87a5 100644 --- a/assets/data/fresh/fresh.json +++ b/assets/data/fresh/fresh.json @@ -1,5 +1 @@ -{ - "song": "Fresh", - "bpm": 120, - "sections": 16 -} \ No newline at end of file +{"song":{"player2":"dad","player1":"bf","speed":1.3000000000000003,"needsVoices":true,"sectionLengths":[],"song":"Fresh","notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,1,0],[250,1,0],[500,3,0],[875,3,0],[1125,1,0],[1250,0,0],[1375,2,0],[1625,1,0],[1750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2000,1,0],[2250,1,0],[2500,3,0],[2875,3,0],[3125,1,0],[3250,0,0],[3375,2,0],[3625,1,0],[3750,0,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4000,1,0],[4250,1,0],[4500,3,0],[4875,3,0],[5125,1,0],[5250,0,0],[5500,2,0],[5750,0,0],[5875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[6250,1,0],[6500,3,0],[6875,3,0],[7125,1,0],[7250,0,0],[7750,3,225],[6000,1,0],[7375,2,0],[7625,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[8250,0,0],[8500,1,0],[9000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[10250,0,0],[10500,1,0],[11000,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12250,0,0],[12500,2,0],[12750,3,0],[13000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14250,0,0],[14500,2,0],[14750,3,0],[15000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16250,0,0],[16750,3,0],[17000,0,0],[16500,1,0],[17500,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18250,0,0],[18750,3,0],[19000,0,0],[18500,1,0],[19500,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20000,3,0],[20250,1,0],[20875,2,0],[21125,3,0],[21375,1,0],[21750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[22000,3,0],[22250,1,0],[22875,2,0],[23125,3,0],[23375,1,0],[23750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,3,0],[24500,0,0],[25000,1,0],[25250,1,0],[25500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26000,1,0],[26250,2,0],[26500,3,0],[26750,0,0],[27000,2,0],[27250,3,0],[27500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28000,3,0],[28500,0,0],[29000,1,0],[29250,1,0],[29500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30000,1,0],[30250,2,0],[30500,3,0],[30750,0,0],[31000,2,0],[31250,3,0],[31500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32500,0,0],[32750,3,0],[33000,1,0],[33250,3,0],[33500,1,0],[33750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34500,3,0],[34250,0,0],[34750,0,0],[35125,2,250],[35500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36500,0,0],[36750,3,0],[37000,1,0],[37250,3,0],[37500,1,0],[37750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38500,3,0],[38250,0,0],[38750,0,0],[39125,2,250],[39500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40250,0,0],[40500,1,0],[41000,2,0],[41500,2,0],[41750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42250,0,0],[42500,1,0],[43000,2,0],[43500,2,0],[43750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44250,0,0],[44500,2,0],[44750,3,0],[45000,0,0],[45750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46250,0,0],[46500,2,0],[46750,3,0],[47000,0,0],[47750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48250,0,0],[48500,1,0],[48750,3,0],[49000,0,0],[49750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50250,0,0],[50500,1,0],[50750,3,0],[51000,0,0],[51750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52000,3,0],[52250,1,0],[52500,1,0],[52750,2,0],[53000,3,0],[53250,1,0],[53750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[54000,3,0],[54250,1,0],[54500,1,0],[54750,2,0],[55000,3,0],[55250,1,0],[55750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56000,3,0],[56500,0,0],[57000,1,0],[57250,1,0],[57500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58000,1,0],[58250,2,0],[58500,3,0],[58750,0,0],[59000,2,0],[59250,3,0],[59500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,3,0],[60500,0,0],[61000,1,0],[61250,1,0],[61500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62000,1,0],[62250,2,0],[62500,3,0],[62750,0,0],[63000,2,0],[63250,3,0],[63500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64500,0,0],[64750,3,0],[65000,1,0],[65250,3,0],[65500,1,0],[65750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66500,3,0],[66250,0,0],[66750,0,0],[67125,2,250],[67500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68500,0,0],[68750,3,0],[69000,1,0],[69250,3,0],[69500,1,0],[69750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[70500,3,0],[70250,0,0],[70750,0,0],[71125,2,250],[71500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,1,0],[72250,1,0],[72500,3,0],[72875,3,0],[73125,1,0],[73250,0,0],[73375,2,0],[73625,1,0],[73750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74000,1,0],[74250,1,0],[74500,3,0],[74875,3,0],[75125,1,0],[75250,0,0],[75500,2,0],[75750,0,0],[75875,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[76000,1,0],[76250,1,0],[76500,3,0],[76875,3,0],[77125,1,0],[77250,0,0],[77500,2,0],[77750,0,0],[77875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78250,1,0],[78500,3,0],[78875,3,0],[79125,1,0],[79250,0,0],[78000,1,0],[79375,2,0],[79625,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]}],"bpm":120,"sections":0},"bpm":120,"sections":42,"notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,1,0],[250,1,0],[500,3,0],[875,3,0],[1125,1,0],[1250,0,0],[1375,2,0],[1625,1,0],[1750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2000,1,0],[2250,1,0],[2500,3,0],[2875,3,0],[3125,1,0],[3250,0,0],[3375,2,0],[3625,1,0],[3750,0,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4000,1,0],[4250,1,0],[4500,3,0],[4875,3,0],[5125,1,0],[5250,0,0],[5500,2,0],[5750,0,0],[5875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[6250,1,0],[6500,3,0],[6875,3,0],[7125,1,0],[7250,0,0],[7750,3,225],[6000,1,0],[7375,2,0],[7625,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[8250,0,0],[8500,1,0],[9000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[10250,0,0],[10500,1,0],[11000,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12250,0,0],[12500,2,0],[12750,3,0],[13000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14250,0,0],[14500,2,0],[14750,3,0],[15000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16250,0,0],[16750,3,0],[17000,0,0],[16500,1,0],[17500,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18250,0,0],[18750,3,0],[19000,0,0],[18500,1,0],[19500,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20000,3,0],[20250,1,0],[20875,2,0],[21125,3,0],[21375,1,0],[21750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[22000,3,0],[22250,1,0],[22875,2,0],[23125,3,0],[23375,1,0],[23750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,3,0],[24500,0,0],[25000,1,0],[25250,1,0],[25500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26000,1,0],[26250,2,0],[26500,3,0],[26750,0,0],[27000,2,0],[27250,3,0],[27500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28000,3,0],[28500,0,0],[29000,1,0],[29250,1,0],[29500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30000,1,0],[30250,2,0],[30500,3,0],[30750,0,0],[31000,2,0],[31250,3,0],[31500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32500,0,0],[32750,3,0],[33000,1,0],[33250,3,0],[33500,1,0],[33750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34500,3,0],[34250,0,0],[34750,0,0],[35125,2,250],[35500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36500,0,0],[36750,3,0],[37000,1,0],[37250,3,0],[37500,1,0],[37750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38500,3,0],[38250,0,0],[38750,0,0],[39125,2,250],[39500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40250,0,0],[40500,1,0],[41000,2,0],[41500,2,0],[41750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42250,0,0],[42500,1,0],[43000,2,0],[43500,2,0],[43750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44250,0,0],[44500,2,0],[44750,3,0],[45000,0,0],[45750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46250,0,0],[46500,2,0],[46750,3,0],[47000,0,0],[47750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48250,0,0],[48500,1,0],[48750,3,0],[49000,0,0],[49750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50250,0,0],[50500,1,0],[50750,3,0],[51000,0,0],[51750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52000,3,0],[52250,1,0],[52500,1,0],[52750,2,0],[53000,3,0],[53250,1,0],[53750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[54000,3,0],[54250,1,0],[54500,1,0],[54750,2,0],[55000,3,0],[55250,1,0],[55750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56000,3,0],[56500,0,0],[57000,1,0],[57250,1,0],[57500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58000,1,0],[58250,2,0],[58500,3,0],[58750,0,0],[59000,2,0],[59250,3,0],[59500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,3,0],[60500,0,0],[61000,1,0],[61250,1,0],[61500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62000,1,0],[62250,2,0],[62500,3,0],[62750,0,0],[63000,2,0],[63250,3,0],[63500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64500,0,0],[64750,3,0],[65000,1,0],[65250,3,0],[65500,1,0],[65750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66500,3,0],[66250,0,0],[66750,0,0],[67125,2,250],[67500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68500,0,0],[68750,3,0],[69000,1,0],[69250,3,0],[69500,1,0],[69750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[70500,3,0],[70250,0,0],[70750,0,0],[71125,2,250],[71500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72000,1,0],[72250,1,0],[72500,3,0],[72875,3,0],[73125,1,0],[73250,0,0],[73375,2,0],[73625,1,0],[73750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74000,1,0],[74250,1,0],[74500,3,0],[74875,3,0],[75125,1,0],[75250,0,0],[75500,2,0],[75750,0,0],[75875,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[76000,1,0],[76250,1,0],[76500,3,0],[76875,3,0],[77125,1,0],[77250,0,0],[77500,2,0],[77750,0,0],[77875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78250,1,0],[78500,3,0],[78875,3,0],[79125,1,0],[79250,0,0],[78000,1,0],[79375,2,0],[79625,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]}]} \ No newline at end of file diff --git a/assets/data/fresh/fresh_section1.png b/assets/data/fresh/fresh_section1.png deleted file mode 100644 index aa2f82b..0000000 Binary files a/assets/data/fresh/fresh_section1.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section10.png b/assets/data/fresh/fresh_section10.png deleted file mode 100644 index 68c928f..0000000 Binary files a/assets/data/fresh/fresh_section10.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section11.png b/assets/data/fresh/fresh_section11.png deleted file mode 100644 index ae0b467..0000000 Binary files a/assets/data/fresh/fresh_section11.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section12.png b/assets/data/fresh/fresh_section12.png deleted file mode 100644 index c08230e..0000000 Binary files a/assets/data/fresh/fresh_section12.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section13.png b/assets/data/fresh/fresh_section13.png deleted file mode 100644 index 820079b..0000000 Binary files a/assets/data/fresh/fresh_section13.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section14.png b/assets/data/fresh/fresh_section14.png deleted file mode 100644 index 575497f..0000000 Binary files a/assets/data/fresh/fresh_section14.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section15.png b/assets/data/fresh/fresh_section15.png deleted file mode 100644 index aa2f82b..0000000 Binary files a/assets/data/fresh/fresh_section15.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section16.png b/assets/data/fresh/fresh_section16.png deleted file mode 100644 index 1e9c205..0000000 Binary files a/assets/data/fresh/fresh_section16.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section2.png b/assets/data/fresh/fresh_section2.png deleted file mode 100644 index 1e9c205..0000000 Binary files a/assets/data/fresh/fresh_section2.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section3.png b/assets/data/fresh/fresh_section3.png deleted file mode 100644 index bc5b667..0000000 Binary files a/assets/data/fresh/fresh_section3.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section4.png b/assets/data/fresh/fresh_section4.png deleted file mode 100644 index 2c8b0b5..0000000 Binary files a/assets/data/fresh/fresh_section4.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section5.png b/assets/data/fresh/fresh_section5.png deleted file mode 100644 index fb5b868..0000000 Binary files a/assets/data/fresh/fresh_section5.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section6.png b/assets/data/fresh/fresh_section6.png deleted file mode 100644 index 9e0a555..0000000 Binary files a/assets/data/fresh/fresh_section6.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section7.png b/assets/data/fresh/fresh_section7.png deleted file mode 100644 index 820079b..0000000 Binary files a/assets/data/fresh/fresh_section7.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section8.png b/assets/data/fresh/fresh_section8.png deleted file mode 100644 index 575497f..0000000 Binary files a/assets/data/fresh/fresh_section8.png and /dev/null differ diff --git a/assets/data/fresh/fresh_section9.png b/assets/data/fresh/fresh_section9.png deleted file mode 100644 index 7479ee9..0000000 Binary files a/assets/data/fresh/fresh_section9.png and /dev/null differ diff --git a/assets/data/specialThanks.txt b/assets/data/specialThanks.txt index c7ff5a8..4b77fe1 100644 --- a/assets/data/specialThanks.txt +++ b/assets/data/specialThanks.txt @@ -5,4 +5,6 @@ HenryEYES Clone Hero Tom Fulp StuffedWombat -mmatt_ugh \ No newline at end of file +mmatt_ugh +Squidly +Luis \ No newline at end of file diff --git a/assets/music/Fresh.mp3 b/assets/music/Fresh.mp3 index 14a91b8..c9e6ae2 100644 Binary files a/assets/music/Fresh.mp3 and b/assets/music/Fresh.mp3 differ diff --git a/assets/music/Fresh.ogg b/assets/music/Fresh.ogg index 011ca81..d5843b8 100644 Binary files a/assets/music/Fresh.ogg and b/assets/music/Fresh.ogg differ diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx new file mode 100644 index 0000000..1cd5e1d --- /dev/null +++ b/source/FreeplayState.hx @@ -0,0 +1,54 @@ +package; + +import flixel.FlxG; +import flixel.FlxSprite; +import flixel.text.FlxText; + +class FreeplayState extends MusicBeatState +{ + var songs:Array = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"]; + + var selector:FlxText; + var curSelected:Int = 0; + + override function create() + { + // LOAD MUSIC + + // LOAD CHARACTERS + + for (i in 0...songs.length) + { + var songText:FlxText = new FlxText(10, (26 * i) + 30, 0, songs[i], 24); + add(songText); + } + + selector = new FlxText(); + selector.size = 24; + selector.text = ">"; + add(selector); + + super.create(); + } + + override function update(elapsed:Float) + { + if (FlxG.keys.justPressed.UP) + { + curSelected -= 1; + } + if (FlxG.keys.justPressed.DOWN) + { + curSelected += 1; + } + + if (curSelected < 0) + curSelected = songs.length - 1; + if (curSelected >= songs.length) + curSelected = 0; + + selector.y = (26 * curSelected) + 30; + + super.update(elapsed); + } +} diff --git a/source/Main.hx b/source/Main.hx index 13376db..d4bd9a4 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -9,7 +9,7 @@ class Main extends Sprite public function new() { super(); - addChild(new FlxGame(0, 0, TitleState)); + addChild(new FlxGame(0, 0, ChartingState)); #if !mobile addChild(new FPS(10, 3, 0xFFFFFF)); diff --git a/source/NoteMeta.hx b/source/NoteMeta.hx deleted file mode 100644 index a681aad..0000000 --- a/source/NoteMeta.hx +++ /dev/null @@ -1,15 +0,0 @@ -package; - -class NoteMeta -{ - public var strumTime:Float = 0; - public var noteData:Int = 0; - public var sustainLength:Float = 0; - - public function new(strumTime:Float, noteData:Int, sustain:Float) - { - this.strumTime = strumTime; - this.noteData = noteData; - sustainLength = sustain; - } -} diff --git a/source/TitleState.hx b/source/TitleState.hx index 057aff8..b575df4 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -113,7 +113,12 @@ class TitleState extends MusicBeatState pressedEnter = true; } - if (pressedEnter && !transitioning) + if (pressedEnter && !skippedIntro) + { + skipIntro(); + } + + if (pressedEnter && !transitioning && skippedIntro) { FlxG.camera.flash(FlxColor.WHITE, 1); @@ -170,8 +175,18 @@ class TitleState extends MusicBeatState credTextShit.text += '\nFunkin'; case 16: - FlxG.camera.flash(FlxColor.WHITE, 4); - remove(credGroup); + skipIntro(); + } + } + + var skippedIntro:Bool = false; + + function skipIntro():Void + { + if (!skippedIntro) + { + FlxG.camera.flash(FlxColor.WHITE, 4); + remove(credGroup); } } }