Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FreeplayState loading all songs after exiting Erect/Nightmare songs fix #4088

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion source/funkin/ui/freeplay/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ class FreeplayState extends MusicBeatSubState
// Gets all available difficulties for our character, via our available variations
var difficultiesAvailable:Array<String> = song.data.listDifficulties(null, characterVariations);

return difficultiesAvailable.contains(currentDifficulty);
return difficultiesAvailable.contains(rememberedDifficulty);
});

if (onlyIfChanged)
Expand Down Expand Up @@ -1148,6 +1148,9 @@ class FreeplayState extends MusicBeatSubState
// Get this character's transition delay, with a reasonable default.
var transitionDelay:Float = currentCharacter.getFreeplayDJData()?.getCharSelectTransitionDelay() ?? 0.25;

// Some characters don't have higher difficulties for their songs
rememberedDifficulty = Constants.DEFAULT_DIFFICULTY;

new FlxTimer().start(transitionDelay, _ -> {
transitionToCharSelect();
});
Expand Down