Merge pull request #807 from FFXIV-CombatReborn/movecastcheckFix

Experimental solution to cast cancelling with BMR movement AI

Author: LTS-FFXIV

BasicRotations/Ranged/BRD_Default.cs

@@ -255,7 +255,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             return true;
         }
 
-        if (PitchPerfectPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true, skipComboCheck: true))
+        if (PitchPerfectPvE.CanUse(out act, skipAoeCheck: true, skipComboCheck: true))
         {
             if (SongEndAfter(3) && Repertoire > 0)
             {

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -177,6 +177,11 @@ internal readonly bool BasicCheck(bool skipStatusProvideCheck, bool skipComboChe
             return false;
         }
 
+        if (NeedsCasting(!skipCastingCheck) && DataCenter.IsMoving && Service.Config.BmrLock)
+        {
+            return false;
+        }
+
         if (!IsActionEnabled() || !IsOnSlot)
         {
             return false;
@@ -264,9 +269,25 @@ private bool IsRotationCheckValid()
 
     private bool NeedsCasting(bool skipCastingCheck)
     {
-        return CastTime > 0 && !Player.Object.HasStatus(true, [StatusID.Swiftcast, StatusID.Triplecast, StatusID.Dualcast]) && !ActionsNoNeedCasting.Contains(ID) &&
-               (DataCenter.SpecialType == SpecialCommandType.NoCasting || (DateTime.Now > DataCenter.KnockbackStart && DateTime.Now < DataCenter.KnockbackFinished) ||
-                (DataCenter.NoPoslock && DataCenter.IsMoving && !skipCastingCheck));
+        // Must have a cast time
+        if (CastTime <= 0)
+            return false;
+
+        // Must not have a instant cast status
+        if (!Player.Object.WillStatusEnd(0, true, StatusHelper.SwiftcastStatus))
+            return false;
+
+        // Must not be in the no-cast list
+        if (ActionsNoNeedCasting.Contains(ID))
+            return false;
+
+        // Must be in a state where casting is not possible
+        if (DataCenter.SpecialType == SpecialCommandType.NoCasting ||
+            (DateTime.Now > DataCenter.KnockbackStart && DateTime.Now < DataCenter.KnockbackFinished) ||
+            (DataCenter.NoPoslock && DataCenter.IsMoving && !skipCastingCheck))
+            return true;
+
+        return false;
     }
 
     private bool IsStatusProvidedDuringGCD()

RotationSolver.Basic/Configuration/Configs.cs

@@ -103,6 +103,10 @@ public const string
     Filter = Extra)]
     private static readonly bool _poslockCasting = false;
 
+    [ConditionBool, UI("(Experimental) Attempt to mitigate cast cancelling with movement tech in BMR).",
+    Filter = Extra)]
+    private static readonly bool _bmrLock = false;
+
     [UI("", Action = ActionID.PassageOfArmsPvE, Parent = nameof(PoslockCasting))]
     public bool PosPassageOfArms { get; set; } = false;
 

RotationSolver.Basic/DataCenter.cs

@@ -267,7 +267,7 @@ public static TargetingType TargetingType
         }
     }
 
-    public static bool IsMoving { get; internal set; }
+    public static bool IsMoving => Player.IsMoving;
 
     internal static float StopMovingRaw { get; set; }
 

RotationSolver/Updaters/ActionUpdater.cs

@@ -134,17 +134,16 @@ private static unsafe void UpdateSlots()
         }
     }
 
+    private static bool _lastIsMoving = false;
     private static DateTime _startMovingTime = DateTime.MinValue;
     private static DateTime _stopMovingTime = DateTime.MinValue;
     private static void UpdateMoving(DateTime now)
     {
-        bool last = DataCenter.IsMoving;
-        DataCenter.IsMoving = Player.IsMoving;
-        if (last && !DataCenter.IsMoving)
+        if (_lastIsMoving && !DataCenter.IsMoving)
         {
             _stopMovingTime = now;
         }
-        else if (DataCenter.IsMoving && !last)
+        else if (DataCenter.IsMoving && !_lastIsMoving)
         {
             _startMovingTime = now;
         }
@@ -156,6 +155,8 @@ private static void UpdateMoving(DateTime now)
         DataCenter.MovingRaw = DataCenter.IsMoving
             ? Math.Min(10, (float)(now - _startMovingTime).TotalSeconds)
             : 0;
+
+        _lastIsMoving = DataCenter.IsMoving;
     }
 
     private static DateTime _startDeadTime = DateTime.MinValue;