cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-30 10:44:37 +00:00
Code Issues Releases Wiki Activity

RELEASE SHIIIT

Browse source
This commit is contained in:
Cameron Taylor 2020-11-01 00:58:20 -07:00
parent 55d0d25c87
commit cb11c78c26
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/FreeplayState.hx
View file

@ -17,6 +17,9 @@ class FreeplayState extends MusicBeatState
override function create() override function create()
{ {
if (!FlxG.sound.music.playing)
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
if (StoryMenuState.weekUnlocked[1]) if (StoryMenuState.weekUnlocked[1])
{ {
songs.push('Spookeez'); songs.push('Spookeez');

12
source/GameOverSubstate.hx
View file

@ -39,11 +39,21 @@ class GameOverSubstate extends MusicBeatSubstate
{ {
super.update(elapsed); super.update(elapsed);
if (FlxG.keys.justPressed.ENTER) if (controls.ACCEPT)
{ {
endBullshit(); endBullshit();
} }
if (controls.BACK)
{
FlxG.sound.music.stop();
if (PlayState.isStoryMode)
FlxG.switchState(new StoryMenuState());
else
FlxG.switchState(new FreeplayState());
}
if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12) if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12)
{ {
FlxG.camera.follow(camFollow, LOCKON, 0.01); FlxG.camera.follow(camFollow, LOCKON, 0.01);

3
source/StoryMenuState.hx
View file

@ -38,6 +38,9 @@ class StoryMenuState extends MusicBeatState
override function create() override function create()
{ {
if (!FlxG.sound.music.playing)
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
persistentUpdate = persistentDraw = true; persistentUpdate = persistentDraw = true;
scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36); scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36);

2
source/TitleState.hx
View file

@ -162,6 +162,8 @@ class TitleState extends MusicBeatState
FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG}); FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
FlxG.mouse.visible = false;
if (initialized) if (initialized)
skipIntro(); skipIntro();
else else