From d79f99475e1d9a328c50fdde785cb43a89124364 Mon Sep 17 00:00:00 2001 From: MoonDroid <81515012+moondroidcoder@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:31:46 +0700 Subject: [PATCH 1/2] Remove swipe right to exit on Freeplay --- source/funkin/ui/freeplay/FreeplayState.hx | 45 +++++++++++----------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 6c89a6dd0..b15fa9771 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -1883,30 +1883,31 @@ class FreeplayState extends MusicBeatSubState { if (fnfFreeplay == null || freeplayTxtBg == null || freeplayArrow == null) return; - if (TouchUtil.justPressed && (TouchUtil.overlaps(fnfFreeplay) || TouchUtil.overlaps(freeplayTxtBg))) - { - _dragOffset = fnfFreeplay.x - TouchUtil.touch.x; - _pressedOnFreeplay = true; - } + // Commenting this out for now, since it doesn't work properly with the new touch controls. - Zack + // if (TouchUtil.justPressed && (TouchUtil.overlaps(fnfFreeplay) || TouchUtil.overlaps(freeplayTxtBg))) + // { + // _dragOffset = fnfFreeplay.x - TouchUtil.touch.x; + // _pressedOnFreeplay = true; + // } - if (_pressedOnFreeplay && TouchUtil.pressed) - { - final dragX:Float = TouchUtil.touch.x + _dragOffset; - fnfFreeplay.x = dragX; - freeplayTxtBg.x = dragX - 8; + // if (_pressedOnFreeplay && TouchUtil.pressed) + // { + // final dragX:Float = TouchUtil.touch.x + _dragOffset; + // fnfFreeplay.x = dragX; + // freeplayTxtBg.x = dragX - 8; - if (diffSelRight != null && freeplayArrow.x + 160 < fnfFreeplay.x) - { - _pressedOnFreeplay = false; - goBack(); - } - } - else - { - fnfFreeplay.x = Math.max(FullScreenScaleMode.gameNotchSize.x, 8); - freeplayTxtBg.x = FullScreenScaleMode.gameNotchSize.x; - _pressedOnFreeplay = false; - } + // if (diffSelRight != null && freeplayArrow.x + 160 < fnfFreeplay.x) + // { + // _pressedOnFreeplay = false; + // goBack(); + // } + // } + // else + // { + fnfFreeplay.x = Math.max(FullScreenScaleMode.gameNotchSize.x, 8); + freeplayTxtBg.x = FullScreenScaleMode.gameNotchSize.x; + _pressedOnFreeplay = false; + // } } #end From 738bd8b7c7b1638c776bd012eb64cedf31bf48bd Mon Sep 17 00:00:00 2001 From: MoonDroid <81515012+moondroidcoder@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:32:15 +0700 Subject: [PATCH 2/2] Increase arrows touch hitbox for Freeplay --- source/funkin/ui/freeplay/FreeplayState.hx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index b15fa9771..eed78cec0 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -2785,6 +2785,13 @@ class DifficultySelector extends FlxSprite pressed = press; } + + override function updateHitbox() + { + super.updateHitbox(); + width *= 1.5; + height *= 1.5; + } #end function moveShitDown():Void