cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity

lil bullshit

Browse source
This commit is contained in:
Cameron Taylor 2020-10-30 19:33:28 -07:00
parent 5bd30ded11
commit f59c22a9ff
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/data/dadbattle/dadbattle.json
View file

File diff suppressed because one or more lines are too long

1
source/FreeplayState.hx
View file

@ -69,6 +69,7 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase()); PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase());
PlayState.isStoryMode = false;
FlxG.switchState(new PlayState()); FlxG.switchState(new PlayState());
FlxG.sound.music.stop(); FlxG.sound.music.stop();
} }

4
source/PlayState.hx
View file

@ -735,6 +735,10 @@ class PlayState extends MusicBeatState
FlxG.switchState(new PlayState()); FlxG.switchState(new PlayState());
} }
} }
else
{
FlxG.switchState(new FreeplayState());
}
} }
var endingSong:Bool = false; var endingSong:Bool = false;

2
source/StoryMenuState.hx
View file

@ -30,6 +30,8 @@ class StoryMenuState extends MusicBeatState
override function create() override function create()
{ {
persistentUpdate = persistentDraw = true;
scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36); scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36);
scoreText.setFormat("VCR OSD Mono", 32); scoreText.setFormat("VCR OSD Mono", 32);

4
source/TitleState.hx
View file

@ -41,7 +41,7 @@ class TitleState extends MusicBeatState
super.create(); super.create();
#if SKIP_TO_PLAYSTATE #if SKIP_TO_PLAYSTATE
FlxG.switchState(new StoryMenuState()); FlxG.switchState(new FreeplayState());
#else #else
startIntro(); startIntro();
#end #end
@ -143,7 +143,7 @@ class TitleState extends MusicBeatState
new FlxTimer().start(2, function(tmr:FlxTimer) new FlxTimer().start(2, function(tmr:FlxTimer)
{ {
FlxG.switchState(new FreeplayState()); FlxG.switchState(new StoryMenuState());
}); });
FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7); FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7);
} }