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

selecting random can choose a random available instrumental

Browse Source
This commit is contained in:
VioletSnowLeopard
2025-09-03 18:28:19 +07:00
committed by MoonDroid
parent db67a6928c
commit 0d5c6ac963
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/FreeplayState.hx
+29 -3
View File
@@ -2434,10 +2434,36 @@ class FreeplayState extends MusicBeatSubState
return;
}
var targetSong:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
var targetSongCap:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
var targetSongId:String = targetSongCap?.freeplayData?.data.id ?? 'unknown';
var targetSongNullable:Null<Song> = SongRegistry.instance.fetchEntry(targetSongId);
if (targetSongNullable == null)
{
FlxG.log.warn('WARN: could not find song with id (${targetSongId})');
return;
}
var targetSong:Song = targetSongNullable;
var targetDifficultyId:String = currentDifficulty;
var targetVariation:Null<String> = currentVariation;
trace('target song: ${targetSongId} (${targetVariation})');
var targetDifficulty:Null<SongDifficulty> = targetSong.getDifficulty(targetDifficultyId, targetVariation);
if (targetDifficulty == null)
{
FlxG.log.warn('WARN: could not find difficulty with id (${targetDifficultyId})');
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(targetSong);
curSelected = grpCapsules.members.indexOf(targetSongCap);
changeSelection(0); // Trigger an update.
controls.active = false;
#if NO_FEATURE_TOUCH_CONTROLS
@@ -2445,7 +2471,7 @@ class FreeplayState extends MusicBeatSubState
#end
// Act like we hit Confirm on that song.
capsuleOnConfirmDefault(targetSong);
capsuleOnConfirmDefault(targetSongCap, targetInstrumentalId);
}
/**