From bbba49139bd429f6a79873e0d364e5e157a21d92 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 2 Nov 2020 14:40:12 -0800 Subject: [PATCH] we out here --- Project.xml | 4 ++-- source/ChartingState.hx | 2 +- source/Song.hx | 1 + source/TitleState.hx | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Project.xml b/Project.xml index 566ccbcc8..f729f5bf7 100644 --- a/Project.xml +++ b/Project.xml @@ -94,6 +94,6 @@ - - + + diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 3ebeb10f9..070d55597 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -758,7 +758,7 @@ class ChartingState extends MusicBeatState function loadJson(song:String):Void { - PlayState.SONG = Song.loadFromJson(song); + PlayState.SONG = Song.loadFromJson(song.toLowerCase(), song.toLowerCase()); FlxG.resetState(); } diff --git a/source/Song.hx b/source/Song.hx index aa75d3951..08eae4921 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -49,6 +49,7 @@ class Song public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong { + // var rawJson = Assets.getText('assets/data/ridge/ridge.json').trim(); var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim(); while (!rawJson.endsWith("}")) diff --git a/source/TitleState.hx b/source/TitleState.hx index 12faa41c1..aa7c2ffc2 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -40,6 +40,8 @@ class TitleState extends MusicBeatState var curWacky:Array = []; + var wackyImage:FlxSprite; + override public function create():Void { #if (!web) @@ -59,7 +61,7 @@ class TitleState extends MusicBeatState #end #if SKIP_TO_PLAYSTATE - FlxG.switchState(new StoryMenuState()); + FlxG.switchState(new ChartingState()); #else startIntro(); #end