cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

we out here

This commit is contained in:
Cameron Taylor 2020-11-02 14:40:12 -08:00
parent 94fdf69173
commit 732df7c208
7 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Project.xml
View File

@ -94,6 +94,6 @@
<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
<icon path="art/icon.png"/>
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
<haxedef name="NG_LOGIN" />
<haxedef name="SKIP_TO_PLAYSTATE" if="debug" />
<!-- <haxedef name="NG_LOGIN" /> -->
</project>

1
assets/data/ridge/ridge.json Normal file
View File

File diff suppressed because one or more lines are too long

2
assets/data/south/south.json
View File

File diff suppressed because one or more lines are too long

BIN
assets/images/ape_FNF.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 KiB

2
source/ChartingState.hx
View File

@ -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();
}

1
source/Song.hx
View File

@ -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("}"))

4
source/TitleState.hx
View File

@ -40,6 +40,8 @@ class TitleState extends MusicBeatState
var curWacky:Array<String> = [];
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