Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-28 02:25:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: picos songs properly load on freeplay

Browse source
This commit is contained in:
Cameron Taylor 2024-10-01 00:45:56 -04:00
parent a4ed55721f
commit 1d2bd61119
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,6 +270,13 @@ class FreeplayState extends MusicBeatSubState
fromResultsParams = params?.fromResults; fromResultsParams = params?.fromResults;
// bf songs have no suffix, but we need to initalize the difficulty
// in case we begin playing as pico
if (currentCharacterId != 'bf')
{
currentSuffixedDifficulty = Constants.DEFAULT_DIFFICULTY + '-$currentCharacterId';
}
if (fromResultsParams?.playRankAnim == true) if (fromResultsParams?.playRankAnim == true)
{ {
prepForNewRank = true; prepForNewRank = true;
@ -783,7 +790,7 @@ class FreeplayState extends MusicBeatSubState
{ {
tempSongs = tempSongs.filter(song -> { tempSongs = tempSongs.filter(song -> {
if (song == null) return true; // Random if (song == null) return true; // Random
return song.suffixedSongDifficulties.contains(currentSuffixedDifficulty); return (song.suffixedSongDifficulties.contains(currentSuffixedDifficulty) || song.songCharacter == currentCharacterId);
}); });
} }
@ -1797,6 +1804,7 @@ class FreeplayState extends MusicBeatSubState
currentSuffixedDifficulty = suffixedDiffIdsCurrent[currentDifficultyIndex]; currentSuffixedDifficulty = suffixedDiffIdsCurrent[currentDifficultyIndex];
trace('Switching to difficulty: ${currentSuffixedDifficulty}'); trace('Switching to difficulty: ${currentSuffixedDifficulty}');
trace(suffixedDiffIdsCurrent);
var daSong:Null<FreeplaySongData> = grpCapsules.members[curSelected].songData; var daSong:Null<FreeplaySongData> = grpCapsules.members[curSelected].songData;
if (daSong != null) if (daSong != null)
@ -2382,6 +2390,7 @@ class FreeplaySongData
this.isFav = Save.instance.isSongFavorited(songId); this.isFav = Save.instance.isSongFavorited(songId);
this.currentCharacter = currentCharacter; this.currentCharacter = currentCharacter;
if (displayedVariations != null) this.displayedVariations = displayedVariations; if (displayedVariations != null) this.displayedVariations = displayedVariations;
updateValues(displayedVariations); updateValues(displayedVariations);
@ -2407,6 +2416,7 @@ class FreeplaySongData
function updateValues(variations:Array<String>):Void function updateValues(variations:Array<String>):Void
{ {
trace('variations: ${variations}');
this.songDifficulties = song.listDifficulties(null, variations, false, false); this.songDifficulties = song.listDifficulties(null, variations, false, false);
this.suffixedSongDifficulties = song.listSuffixedDifficulties(variations, false, false); this.suffixedSongDifficulties = song.listSuffixedDifficulties(variations, false, false);
if (!this.songDifficulties.contains(currentUnsuffixedDifficulty)) if (!this.songDifficulties.contains(currentUnsuffixedDifficulty))