cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-25 13:45:49 +00:00
Code Issues Releases Wiki Activity

Fix issue where difficulty names wouldn't show up properly sometimes.

Browse source
This commit is contained in:
EliteMasterEric 2024-09-10 17:30:33 -04:00
parent 5021b49915
commit c678cabbf2
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -349,6 +349,7 @@ class FreeplayState extends MusicBeatSubState
var displayedVariations = song.getVariationsByCharacter(currentCharacter); var displayedVariations = song.getVariationsByCharacter(currentCharacter);
trace('Displayed Variations (${songId}): $displayedVariations'); trace('Displayed Variations (${songId}): $displayedVariations');
var availableDifficultiesForSong:Array<String> = song.listSuffixedDifficulties(displayedVariations, false, false); var availableDifficultiesForSong:Array<String> = song.listSuffixedDifficulties(displayedVariations, false, false);
var unsuffixedDifficulties = song.listDifficulties(displayedVariations, false, false);
trace('Available Difficulties: $availableDifficultiesForSong'); trace('Available Difficulties: $availableDifficultiesForSong');
if (availableDifficultiesForSong.length == 0) continue; if (availableDifficultiesForSong.length == 0) continue;
@ -357,6 +358,10 @@ class FreeplayState extends MusicBeatSubState
{ {
diffIdsTotal.pushUnique(difficulty); diffIdsTotal.pushUnique(difficulty);
} }
for (difficulty in unsuffixedDifficulties)
{
diffIdsTotal.pushUnique(difficulty);
}
} }
} }
@ -2414,10 +2419,13 @@ class DifficultySprite extends FlxSprite
// Remove the last suffix of the difficulty id until we find an asset or there are no more suffixes. // Remove the last suffix of the difficulty id until we find an asset or there are no more suffixes.
var assetDiffIdParts:Array<String> = assetDiffId.split('-'); var assetDiffIdParts:Array<String> = assetDiffId.split('-');
assetDiffIdParts.pop(); assetDiffIdParts.pop();
if (assetDiffIdParts.length == 0) break; if (assetDiffIdParts.length == 0)
{
trace('Could not find difficulty asset: freeplay/freeplay${diffId} (from ${diffId})');
return;
};
assetDiffId = assetDiffIdParts.join('-'); assetDiffId = assetDiffIdParts.join('-');
} }
trace('Found difficulty asset: freeplay/freeplay${assetDiffId}');
// Check for an XML to use an animation instead of an image. // Check for an XML to use an animation instead of an image.
if (Assets.exists(Paths.file('images/freeplay/freeplay${assetDiffId}.xml'))) if (Assets.exists(Paths.file('images/freeplay/freeplay${assetDiffId}.xml')))
@ -2429,6 +2437,7 @@ class DifficultySprite extends FlxSprite
else else
{ {
this.loadGraphic(Paths.image('freeplay/freeplay' + assetDiffId)); this.loadGraphic(Paths.image('freeplay/freeplay' + assetDiffId));
trace('Loaded difficulty asset: freeplay/freeplay${assetDiffId} (from ${diffId})');
} }
} }
} }