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

small bool cleanings, and maybe fixes

Browse source
This commit is contained in:
Cameron Taylor 2024-06-01 20:36:14 -04:00
parent b96fa51045
commit 8248cffbaf
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -1121,12 +1121,6 @@ class FreeplayState extends MusicBeatSubState
new FlxTimer().start(2, _ -> { new FlxTimer().start(2, _ -> {
// dj.fistPump(); // dj.fistPump();
prepForNewRank = false; prepForNewRank = false;
FunkinSound.playMusic('freakyMenu',
{
overrideExisting: true,
restartTrack: false
});
FlxG.sound.music.fadeIn(4.0, 0.0, 1.0);
}); });
} }
@ -1527,6 +1521,7 @@ class FreeplayState extends MusicBeatSubState
overrideExisting: true, overrideExisting: true,
restartTrack: false restartTrack: false
}); });
FlxG.sound.music.fadeIn(4.0, 0.0, 1.0);
close(); close();
} }
else else
@ -1842,13 +1837,13 @@ class FreeplayState extends MusicBeatSubState
{ {
startingVolume: 0.0, startingVolume: 0.0,
overrideExisting: true, overrideExisting: true,
restartTrack: true restartTrack: false
}); });
FlxG.sound.music.fadeIn(2, 0, 0.8); FlxG.sound.music.fadeIn(2, 0, 0.8);
} }
else else
{ {
if (prepForNewRank == false) if (!prepForNewRank)
{ {
var potentiallyErect:String = (currentDifficulty == "erect") || (currentDifficulty == "nightmare") ? "-erect" : ""; var potentiallyErect:String = (currentDifficulty == "erect") || (currentDifficulty == "nightmare") ? "-erect" : "";
// TODO: Stream the instrumental of the selected song? // TODO: Stream the instrumental of the selected song?
@ -1882,14 +1877,9 @@ class FreeplayState extends MusicBeatSubState
public static function build(?params:FreeplayStateParams, ?stickers:StickerSubState):MusicBeatState public static function build(?params:FreeplayStateParams, ?stickers:StickerSubState):MusicBeatState
{ {
var result:MainMenuState; var result:MainMenuState;
if (params?.fromResults.playRankAnim == true) if (params?.fromResults.playRankAnim) result = new MainMenuState(true);
{
result = new MainMenuState(true);
}
else else
{
result = new MainMenuState(false); result = new MainMenuState(false);
}
result.openSubState(new FreeplayState(params, stickers)); result.openSubState(new FreeplayState(params, stickers));
result.persistentUpdate = false; result.persistentUpdate = false;