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

some cute guard clauses

Browse Source
This commit is contained in:
Cameron Taylor
2025-07-06 15:23:18 +07:00
committed by MoonDroid
parent 6591fd8f2a
commit 125aa0a438
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/FreeplayState.hx
+38 -38
View File
@@ -1664,52 +1664,52 @@ class FreeplayState extends MusicBeatSubState
function handleDebugKeys():Void
{
#if FEATURE_CHART_EDITOR
if (controls.DEBUG_CHART && !busy)
if (busy) return;
if (!controls.DEBUG_CHART) return;
busy = true;
var targetSongID = grpCapsules.members[curSelected]?.freeplayData?.data.id ?? 'unknown';
if (targetSongID == 'unknown')
{
busy = true;
var targetSongID = grpCapsules.members[curSelected]?.freeplayData?.data.id ?? 'unknown';
if (targetSongID == 'unknown')
{
trace('CHART RANDOM SONG');
letterSort.inputEnabled = false;
letterSort.inputEnabled = false;
var availableSongCapsules:Array<SongMenuItem> = grpCapsules.members.filter(function(cap:SongMenuItem) {
// Dead capsules are ones which were removed from the list when changing filters.
return cap.alive && cap.freeplayData != null;
});
var availableSongCapsules:Array<SongMenuItem> = grpCapsules.members.filter(function(cap:SongMenuItem) {
// Dead capsules are ones which were removed from the list when changing filters.
return cap.alive && cap.freeplayData != null;
});
trace('Available songs: ${availableSongCapsules.map(function(cap) {
trace('Available songs: ${availableSongCapsules.map(function(cap) {
return cap?.freeplayData?.data.songName;
})}');
if (availableSongCapsules.length == 0)
{
trace('No songs available!');
busy = false;
letterSort.inputEnabled = true;
FunkinSound.playOnce(Paths.sound('cancelMenu'));
return;
}
var targetSong:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
// Seeing if I can do an animation...
curSelected = grpCapsules.members.indexOf(targetSong);
changeSelection(0);
targetSongID = grpCapsules.members[curSelected]?.freeplayData?.data.id ?? 'unknown';
if (availableSongCapsules.length == 0)
{
trace('No songs available!');
busy = false;
letterSort.inputEnabled = true;
FunkinSound.playOnce(Paths.sound('cancelMenu'));
return;
}
// Play the confirm animation so the user knows they actually did something.
FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm();
new FlxTimer().start(styleData?.getStartDelay(), function(tmr:FlxTimer) {
FlxG.switchState(() -> new ChartEditorState(
{
targetSongId: targetSongID,
targetSongDifficulty: currentDifficulty,
targetSongVariation: currentVariation,
}));
});
var targetSong:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
// Seeing if I can do an animation...
curSelected = grpCapsules.members.indexOf(targetSong);
changeSelection(0);
targetSongID = grpCapsules.members[curSelected]?.freeplayData?.data.id ?? 'unknown';
}
// Play the confirm animation so the user knows they actually did something.
FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm();
new FlxTimer().start(styleData?.getStartDelay(), function(tmr:FlxTimer) {
FlxG.switchState(() -> new ChartEditorState(
{
targetSongId: targetSongID,
targetSongDifficulty: currentDifficulty,
targetSongVariation: currentVariation,
}));
});
#end
}