Skip to content

[+] TouchHold judgment support in non-C areas #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clansty merged 4 commits into from
Jul 17, 2025
Merged

[+] TouchHold judgment support in non-C areas #45

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e703541
[+] TouchHold judgment support in non-C areas
ERR0RPR0MPT Jul 15, 2025
d62c7fa
[-] wrong config migration
ERR0RPR0MPT Jul 17, 2025
ad6b69e
[+] Fix.FixJudgeTouchHoldInNormalArea
ERR0RPR0MPT Jul 17, 2025
bf2fca0
Update ConfigMigration_V1_0_V2_0.cs
clansty Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
262 changes: 262 additions & 0 deletions AquaMai.Mods/Fix/FixJudgeTouchHoldInNormalArea.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
using AquaMai.Config.Attributes;
using AquaMai.Core.Attributes;
using HarmonyLib;
using Manager;
using MelonLoader;
using Monitor;

namespace AquaMai.Mods.Fix;

[ConfigSection(exampleHidden: true, defaultOn: true)]
[EnableGameVersion(maxVersion: 25699)]
public class FixJudgeTouchHoldInNormalArea
{
// This patch fixes the issue in GameVersion <= 1.56 where Touch Hold could appear in any zone but were only judged in C zone
// This bug occurred because SBGA's NoteCheck implementation only handled judgment logic for C zone Touch Hold

private static TouchHoldC _currentInstance;

[HarmonyPatch(typeof(TouchHoldC), "NoteCheck")]
[HarmonyTranspiler]
public static IEnumerable<CodeInstruction> NoteCheckTranspiler(IEnumerable<CodeInstruction> instructions)
{
var codes = new List<CodeInstruction>(instructions);

try
{
var setCurrentInstanceMethod =
AccessTools.Method(typeof(FixJudgeTouchHoldInNormalArea), nameof(SetCurrentInstance));

codes.Insert(0, new CodeInstruction(OpCodes.Ldarg_0));
codes.Insert(1, new CodeInstruction(OpCodes.Call, setCurrentInstanceMethod));

// 获取方法引用
var cDownMethod =
AccessTools.Method(typeof(InputManager), "InGameTouchPanelArea_C_Down", [typeof(int)]);
var cPushMethod =
AccessTools.Method(typeof(InputManager), "InGameTouchPanelArea_C_Push", [typeof(int)]);

var customDownMethod = AccessTools.Method(typeof(FixJudgeTouchHoldInNormalArea), nameof(CustomTouchDown));
var customPushMethod = AccessTools.Method(typeof(FixJudgeTouchHoldInNormalArea), nameof(CustomTouchPush));

if (cDownMethod == null || cPushMethod == null || customDownMethod == null || customPushMethod == null)
{
MelonLogger.Error("Failed to find required methods");
return codes;
}

// 替换方法调用
int replacedCount = 0;
for (int i = 0; i < codes.Count; i++)
{
if (codes[i].opcode == OpCodes.Call && codes[i].operand is MethodInfo method)
{
if (method == cDownMethod)
{
codes[i] = new CodeInstruction(OpCodes.Call, customDownMethod);
replacedCount++;
// MelonLogger.Msg($"Replaced C_Down method call at index {i}");
}
else if (method == cPushMethod)
{
codes[i] = new CodeInstruction(OpCodes.Call, customPushMethod);
replacedCount++;
// MelonLogger.Msg($"Replaced C_Push method call at index {i}");
}
}
}

// MelonLogger.Msg($"Replaced {replacedCount} method calls");
return codes;
}
catch (Exception ex)
{
MelonLogger.Error($"Error in NoteCheckTranspiler: {ex}");
return codes;
}
}

public static void SetCurrentInstance(TouchHoldC instance)
{
_currentInstance = instance;
}

private static int GetTouchAreaValue(TouchHoldC instance)
{
try
{
var field = AccessTools.Field(typeof(TouchHoldC), "TouchArea");
if (field != null)
{
var value = field.GetValue(instance);
if (value != null)
{
// MelonLogger.Msg($"TouchArea value: {value}");
return (int)value;
}
}

MelonLogger.Error("Could not find TouchArea field");
return 1; // 默认返回C区域
}
catch (Exception ex)
{
MelonLogger.Error($"Error in GetTouchAreaValue: {ex}");
return 1; // 默认返回C区域
}
}

public static bool CustomTouchDown(int monitorId)
{
try
{
if (_currentInstance == null)
{
MelonLogger.Warning("currentInstance is null, fallback to C_Down");
return InputManager.InGameTouchPanelArea_C_Down(monitorId);
}

var touchAreaValue = GetTouchAreaValue(_currentInstance);
var buttonIdProp = AccessTools.PropertyGetter(typeof(TouchHoldC), "ButtonId");
var buttonId = (InputManager.ButtonSetting)buttonIdProp.Invoke(_currentInstance, null);

// MelonLogger.Msg($"TouchArea: {touchAreaValue}, ButtonId: {buttonId}, MonitorId: {monitorId}");

// 检查是否在AutoPlay模式
if (GameManager.IsAutoPlay())
{
// MelonLogger.Msg("Auto play mode, returning false");
return false;
}

bool touchDown;

switch (touchAreaValue)
{
case 0: // TouchSensorType.B
touchDown = InputManager.InGameTouchPanelArea_B_Down(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.B - TouchDown: {touchDown}");
break;
case 1: // TouchSensorType.C
touchDown = InputManager.InGameTouchPanelArea_C_Down(monitorId);
// MelonLogger.Msg($"TouchSensorType.C - TouchDown: {touchDown}");
break;
case 2: // TouchSensorType.E
touchDown = InputManager.InGameTouchPanelArea_E_Down(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.E - TouchDown: {touchDown}");
break;
case 3: // TouchSensorType.A
touchDown = InputManager.InGameTouchPanelAreaDown(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.A - TouchDown: {touchDown}");
break;
case 4: // TouchSensorType.D
touchDown = InputManager.InGameTouchPanelArea_D_Down(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.D - TouchDown: {touchDown}");
break;
default:
touchDown = InputManager.InGameTouchPanelArea_C_Down(monitorId);
// MelonLogger.Msg($"Default TouchSensorType - TouchDown: {touchDown}");
break;
}

if (!touchDown)
{
// MelonLogger.Msg("Touch not down, returning false");
return false;
}

// 根据TouchArea类型计算正确的TouchPanelArea枚举值
InputManager.TouchPanelArea targetTouchPanelArea = GetTouchPanelAreaFromButtonId(buttonId, touchAreaValue);
bool isUsed = InputManager.IsUsedThisFrame(monitorId, targetTouchPanelArea);
// MelonLogger.Msg($"IsUsedThisFrame check for {targetTouchPanelArea}: {isUsed}");

return !isUsed;
}
catch (Exception ex)
{
MelonLogger.Error($"Error in CustomTouchDown: {ex}");
return InputManager.InGameTouchPanelArea_C_Down(monitorId);
}
}

// 根据ButtonId和TouchArea计算正确的TouchPanelArea枚举值
private static InputManager.TouchPanelArea GetTouchPanelAreaFromButtonId(InputManager.ButtonSetting buttonId,
int touchAreaValue)
{
switch (touchAreaValue)
{
case 0: // TouchSensorType.B
return InputManager.TouchPanelArea.B1 + (int)buttonId;
case 1: // TouchSensorType.C
return InputManager.TouchPanelArea.C1 + (int)buttonId;
case 2: // TouchSensorType.E
return InputManager.TouchPanelArea.E1 + (int)buttonId;
case 3: // TouchSensorType.A
return InputManager.TouchPanelArea.A1 + (int)buttonId;
case 4: // TouchSensorType.D
return InputManager.TouchPanelArea.D1 + (int)buttonId;
default:
return InputManager.TouchPanelArea.C1 + (int)buttonId;
}
}

public static bool CustomTouchPush(int monitorId)
{
try
{
if (_currentInstance == null)
{
MelonLogger.Warning("currentInstance is null, fallback to C_Push");
return InputManager.InGameTouchPanelArea_C_Push(monitorId);
}

var touchAreaValue = GetTouchAreaValue(_currentInstance);
var buttonIdProp = AccessTools.PropertyGetter(typeof(TouchHoldC), "ButtonId");
var buttonId = (InputManager.ButtonSetting)buttonIdProp.Invoke(_currentInstance, null);

// MelonLogger.Msg($"Push - TouchArea: {touchAreaValue}, ButtonId: {buttonId}, MonitorId: {monitorId}");

bool touchPush;

switch (touchAreaValue)
{
case 0: // TouchSensorType.B
touchPush = InputManager.InGameTouchPanelArea_B_Push(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.B - TouchPush: {touchPush}");
break;
case 1: // TouchSensorType.C
touchPush = InputManager.InGameTouchPanelArea_C_Push(monitorId);
// MelonLogger.Msg($"TouchSensorType.C - TouchPush: {touchPush}");
break;
case 2: // TouchSensorType.E
touchPush = InputManager.InGameTouchPanelArea_E_Push(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.E - TouchPush: {touchPush}");
break;
case 3: // TouchSensorType.A
touchPush = InputManager.InGameTouchPanelAreaPush(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.A - TouchPush: {touchPush}");
break;
case 4: // TouchSensorType.D
touchPush = InputManager.InGameTouchPanelArea_D_Push(monitorId, buttonId);
// MelonLogger.Msg($"TouchSensorType.D - TouchPush: {touchPush}");
break;
default:
touchPush = InputManager.InGameTouchPanelArea_C_Push(monitorId);
// MelonLogger.Msg($"Default TouchSensorType - TouchPush: {touchPush}");
break;
}

// MelonLogger.Msg($"Final TouchPush result: {touchPush}");
return touchPush;
}
catch (Exception ex)
{
MelonLogger.Error($"Error in CustomTouchPush: {ex}");
return InputManager.InGameTouchPanelArea_C_Push(monitorId);
}
}
}