Combo actions for better macro quality

2023-07-13 12:08:17 +02:00
parent 49b84e966e
commit 7787ae32d5
11 changed files with 210 additions and 10 deletions
@@ -19,6 +19,10 @@ public sealed class Simulator : SimulatorNoRandom

    public static readonly ActionType[] AcceptedActions = new[]
    {
+        ActionType.StandardTouchCombo,
+        ActionType.AdvancedTouchCombo,
+        ActionType.FocusedTouchCombo,
+        ActionType.FocusedSynthesisCombo,
        ActionType.TrainedFinesse,
        ActionType.PrudentSynthesis,
        ActionType.Groundwork,
@@ -101,6 +105,11 @@ public sealed class Simulator : SimulatorNoRandom
                CP > 10)
                return false;

+            // don't allow combo actions if the combo is already in progress
+            if (ActionStates.TouchComboIdx != 0 &&
+                (action == ActionType.StandardTouchCombo || action == ActionType.AdvancedTouchCombo))
+                return false;
+
            // don't allow pure quality moves under Veneration
            if (HasEffect(EffectType.Veneration) &&
                !baseAction.IncreasesProgress &&