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

Fix an issue where base inst wouldn't be chosen properly on remixes

Browse source
This commit is contained in:
EliteMasterEric 2024-09-10 01:33:15 -04:00
parent 06389cb5cd
commit f6bd203786
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1985,6 +1985,12 @@ class FreeplayState extends MusicBeatSubState
return; return;
} }
if (targetInstId == null)
{
var baseInstrumentalId:String = targetSong?.getBaseInstrumentalId(targetDifficultyId, targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? '';
targetInstId = baseInstrumentalId;
}
// Visual and audio effects. // Visual and audio effects.
FunkinSound.playOnce(Paths.sound('confirmMenu')); FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm(); if (dj != null) dj.confirm();
@ -2409,6 +2415,7 @@ class DifficultySprite extends FlxSprite
if (assetDiffIdParts.length == 0) break; if (assetDiffIdParts.length == 0) break;
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')))