mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2025-03-13 16:43:57 -04:00
eggnog > winter-horrorland transiton FIX
This commit is contained in:
parent
7b2b77f681
commit
5cc9f5532b
1 changed files with 18 additions and 11 deletions
|
@ -2296,6 +2296,12 @@ class PlayState extends MusicBeatState
|
|||
trace('LOADING NEXT SONG');
|
||||
trace(storyPlaylist[0].toLowerCase() + difficulty);
|
||||
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
FlxTransitionableState.skipNextTransOut = true;
|
||||
|
||||
FlxG.sound.music.stop();
|
||||
vocals.stop();
|
||||
|
||||
if (SONG.song.toLowerCase() == 'eggnog')
|
||||
{
|
||||
var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom,
|
||||
|
@ -2303,18 +2309,21 @@ class PlayState extends MusicBeatState
|
|||
blackShit.scrollFactor.set();
|
||||
add(blackShit);
|
||||
camHUD.visible = false;
|
||||
inCutscene = true;
|
||||
|
||||
FlxG.sound.play(Paths.sound('Lights_Shut_off'));
|
||||
FlxG.sound.play(Paths.sound('Lights_Shut_off'), function(){
|
||||
// no camFollow so it centers on horror tree
|
||||
SONG = Song.loadFromJson(storyPlaylist[0].toLowerCase() + difficulty, storyPlaylist[0]);
|
||||
LoadingState.loadAndSwitchState(new PlayState());
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
prevCamFollow = camFollow;
|
||||
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
FlxTransitionableState.skipNextTransOut = true;
|
||||
prevCamFollow = camFollow;
|
||||
|
||||
SONG = Song.loadFromJson(storyPlaylist[0].toLowerCase() + difficulty, storyPlaylist[0]);
|
||||
FlxG.sound.music.stop();
|
||||
|
||||
LoadingState.loadAndSwitchState(new PlayState());
|
||||
SONG = Song.loadFromJson(storyPlaylist[0].toLowerCase() + difficulty, storyPlaylist[0]);
|
||||
LoadingState.loadAndSwitchState(new PlayState());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -2325,8 +2334,6 @@ class PlayState extends MusicBeatState
|
|||
}
|
||||
}
|
||||
|
||||
var endingSong:Bool = false;
|
||||
|
||||
private function popUpScore(strumtime:Float, daNote:Note):Void
|
||||
{
|
||||
var noteDiff:Float = Math.abs(strumtime - Conductor.songPosition);
|
||||
|
|
Loading…
Reference in a new issue