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

change capsuleOptionsMenu -> instSelectMenu in FreeplayState

Browse Source
This commit is contained in:
Cameron Taylor
2025-12-12 08:16:37 -05:00
committed by Hundrec
parent ca7891e5cb
commit e1e49bb19b
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
+1 -1
View File
@@ -121,7 +121,7 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
if (leftArrow.moveShitDownTimer != null) leftArrow.moveShitDownTimer.cancel();
if (rightArrow.moveShitDownTimer != null) rightArrow.moveShitDownTimer.cancel();
capsuleMenuBG.animation.onFinish.add(function(_) {
parent.cleanupCapsuleOptionsMenu();
parent.cleanupInstSelectMenu();
queueDestroy = true;
});
}
source/funkin/ui/freeplay/FreeplayState.hx
+16 -16
View File
@@ -2553,12 +2553,12 @@ class FreeplayState extends MusicBeatSubState
var instrumentalChoices:Array<String> = ['default', 'random'];
#if !mobile
capsuleOptionsMenu = new CapsuleOptionsMenu(this, randomCapsule.targetPos.x + 175, randomCapsule.targetPos.y + 115, instrumentalChoices);
capsuleOptionsMenu.cameras = [funnyCam];
capsuleOptionsMenu.zIndex = 10000;
add(capsuleOptionsMenu);
instSelectMenu = new CapsuleOptionsMenu(this, randomCapsule.targetPos.x + 175, randomCapsule.targetPos.y + 115, instrumentalChoices);
instSelectMenu.cameras = [funnyCam];
instSelectMenu.zIndex = 10000;
add(instSelectMenu);
capsuleOptionsMenu.onConfirm = function(instChoice:String) {
instSelectMenu.onConfirm = function(instChoice:String) {
capsuleOnConfirmRandom(availableSongCapsules, instChoice);
}
#else
@@ -2571,7 +2571,7 @@ class FreeplayState extends MusicBeatSubState
*/
function capsuleOnConfirmRandom(availableSongCapsules:Array<SongMenuItem>, instChoice:String):Void
{
cleanupCapsuleOptionsMenu();
cleanupInstSelectMenu();
var targetSongCap:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
// Seeing if I can do an animation...
@@ -2677,26 +2677,26 @@ class FreeplayState extends MusicBeatSubState
{
uiStateMachine.transition(Interacting);
capsuleOptionsMenu = new CapsuleOptionsMenu(this, cap.targetPos.x + 175, cap.targetPos.y + 115, instrumentalIds);
capsuleOptionsMenu.cameras = [funnyCam];
capsuleOptionsMenu.zIndex = 10000;
add(capsuleOptionsMenu);
instSelectMenu = new CapsuleOptionsMenu(this, cap.targetPos.x + 175, cap.targetPos.y + 115, instrumentalIds);
instSelectMenu.cameras = [funnyCam];
instSelectMenu.zIndex = 10000;
add(instSelectMenu);
capsuleOptionsMenu.onConfirm = function(targetInstId:String) {
instSelectMenu.onConfirm = function(targetInstId:String) {
capsuleOnConfirmDefault(cap, targetInstId);
};
}
var capsuleOptionsMenu:Null<CapsuleOptionsMenu> = null;
var instSelectMenu:Null<CapsuleOptionsMenu> = null;
public function cleanupCapsuleOptionsMenu():Void
public function cleanupInstSelectMenu():Void
{
uiStateMachine.transition(Idle);
if (capsuleOptionsMenu != null)
if (instSelectMenu != null)
{
remove(capsuleOptionsMenu);
capsuleOptionsMenu = null;
remove(instSelectMenu);
instSelectMenu = null;
}
}