gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix target variation

Browse Source 
Also no need to do instrumental stuff if not random
This commit is contained in:
Lasercar
2025-09-03 18:28:19 +07:00
committed by MoonDroid
parent 811b9e3343
commit 95aba09cd6
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/FreeplayState.hx
+11 -8
View File
@@ -2461,6 +2461,10 @@ class FreeplayState extends MusicBeatSubState
letterSort.inputEnabled = false;
var targetSongCap:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
// Seeing if I can do an animation...
curSelected = grpCapsules.members.indexOf(targetSongCap);
changeSelection(); // Trigger an update. This will also fix the target variation.
var targetSongId:String = targetSongCap?.freeplayData?.data.id ?? 'unknown';
var targetSongNullable:Null<Song> = SongRegistry.instance.fetchEntry(targetSongId);
if (targetSongNullable == null)
@@ -2483,14 +2487,6 @@ class FreeplayState extends MusicBeatSubState
return;
}
var baseInstrumentalId:String = targetSong.getBaseInstrumentalId(targetDifficultyId, targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? '';
var altInstrumentalIds:Array<String> = targetSong.listAltInstrumentalIds(targetDifficultyId,
targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? [];
// Choose a random instrumental
var instrumentalIds:Array<String> = [baseInstrumentalId].concat(altInstrumentalIds);
var targetInstrumentalId:String = FlxG.random.getObject(instrumentalIds);
// Seeing if I can do an animation...
curSelected = grpCapsules.members.indexOf(targetSongCap);
changeSelection(0); // Trigger an update.
@@ -2501,6 +2497,13 @@ class FreeplayState extends MusicBeatSubState
if (instChoice == 'random')
{
var baseInstrumentalId:String = targetSong.getBaseInstrumentalId(targetDifficultyId, targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? '';
var altInstrumentalIds:Array<String> = targetSong.listAltInstrumentalIds(targetDifficultyId,
targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? [];
// Choose a random instrumental
var instrumentalIds:Array<String> = [baseInstrumentalId].concat(altInstrumentalIds);
var targetInstrumentalId:String = FlxG.random.getObject(instrumentalIds);
// Hit Confirm on that song with random instrumental
capsuleOnConfirmDefault(targetSongCap, targetInstrumentalId);
}