Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret

Browse source
This commit is contained in:
Cameron Taylor 2021-04-11 19:08:46 -04:00
commit 605c9066c1
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/GameOverSubstate.hx
View file

@ -23,10 +23,7 @@ class GameOverSubstate extends MusicBeatSubstate
var daBf:String = ''; var daBf:String = '';
switch (daStage) switch (daStage)
{ {
case 'school': case 'school' | 'schoolEvil':
stageSuffix = '-pixel';
daBf = 'bf-pixel-dead';
case 'schoolEvil':
stageSuffix = '-pixel'; stageSuffix = '-pixel';
daBf = 'bf-pixel-dead'; daBf = 'bf-pixel-dead';
default: default:
@ -92,6 +89,11 @@ class GameOverSubstate extends MusicBeatSubstate
FlxG.switchState(new FreeplayState()); FlxG.switchState(new FreeplayState());
} }
#if debug
if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new AnimationDebug(bf.curCharacter));
#end
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);

19
source/PlayState.hx
View file

@ -931,6 +931,8 @@ class PlayState extends MusicBeatState
function ughIntro() function ughIntro()
{ {
inCutscene = true;
FlxG.sound.playMusic(Paths.music('DISTORTO'), 0); FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
FlxG.sound.music.fadeIn(5, 0, 0.5); FlxG.sound.music.fadeIn(5, 0, 0.5);
@ -960,7 +962,9 @@ class PlayState extends MusicBeatState
{ {
boyfriend.playAnim('singUP'); boyfriend.playAnim('singUP');
// play sound // play sound
FlxG.sound.play(Paths.sound('bfBeep')); FlxG.sound.play(Paths.sound('bfBeep'), function() {
boyfriend.playAnim('idle');
});
}); });
new FlxTimer().start(3, function(swaggy:FlxTimer) new FlxTimer().start(3, function(swaggy:FlxTimer)
@ -993,6 +997,8 @@ class PlayState extends MusicBeatState
function gunsIntro() function gunsIntro()
{ {
inCutscene = true;
camFollow.setPosition(camPos.x, camPos.y); camFollow.setPosition(camPos.x, camPos.y);
camHUD.visible = false; camHUD.visible = false;
@ -1051,6 +1057,8 @@ class PlayState extends MusicBeatState
function stressIntro() function stressIntro()
{ {
inCutscene = true;
// for story mode shit // for story mode shit
camFollow.setPosition(camPos.x, camPos.y); camFollow.setPosition(camPos.x, camPos.y);
@ -1402,8 +1410,6 @@ class PlayState extends MusicBeatState
function startCountdown():Void function startCountdown():Void
{ {
gf.visible = true;
inCutscene = false; inCutscene = false;
generateStaticArrows(0); generateStaticArrows(0);
@ -1996,7 +2002,12 @@ class PlayState extends MusicBeatState
#if debug #if debug
if (FlxG.keys.justPressed.EIGHT) if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new AnimationDebug(SONG.player2)); {
if (FlxG.keys.pressed.SHIFT)
FlxG.switchState(new AnimationDebug(SONG.player1));
else
FlxG.switchState(new AnimationDebug(SONG.player2));
}
#end #end
if (generatedMusic && SONG.notes[Std.int(curStep / 16)] != null) if (generatedMusic && SONG.notes[Std.int(curStep / 16)] != null)