Merge pull request #965 from TheDeadCode/more-ast-changes

Fix Heal cancellation when there is nothing to do.

Author: LTS-FFXIV

RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs

@@ -99,7 +99,7 @@ public partial class AstrologianRotation
     public static bool HasEarthlyDominance => Player.HasStatus(true, StatusID.EarthlyDominance);
 
     /// <summary>
-    /// Has Macrocosmos.
+    /// Has Synastry.
     /// </summary>
     public static bool HasSynastry => Player.HasStatus(true, StatusID.Synastry);
     #endregion

RotationSolver.Basic/Rotations/CustomRotation_GCD.cs

@@ -2,6 +2,12 @@
 
 public partial class CustomRotation
 {
+    /// <summary>
+    /// Whether the player is currently doing nothing (and healing).
+    /// </summary>
+    public static bool HealingWhileDoingNothing =>
+        _nextTimeToHeal + TimeSpan.FromSeconds(DataCenter.DefaultGCDTotal) > DateTime.Now;
+    
     private static DateTime _nextTimeToHeal = DateTime.MinValue;
     private static readonly Random _random = new();
 

RotationSolver/RebornRotations/Healer/AST_Reborn.cs

@@ -151,37 +151,11 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
 
         if (SynastryPvE.CanUse(out act))
         {
-            if (nextGCD.IsTheSameTo(false, AspectedBeneficPvE))
+            if (CanCastSynastry(AspectedBeneficPvE, SynastryPvE, SynastryHeal, nextGCD) ||
+                CanCastSynastry(BeneficIiPvE, SynastryPvE, SynastryHeal, nextGCD) ||
+                CanCastSynastry(BeneficPvE, SynastryPvE, SynastryHeal, nextGCD))
             {
-                if (SynastryPvE.Target.Target == AspectedBeneficPvE.Target.Target)
-                {
-                    if (SynastryPvE.Target.Target.GetHealthRatio() < SynastryHeal)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            if (nextGCD.IsTheSameTo(false, BeneficIiPvE))
-            {
-                if (SynastryPvE.Target.Target == BeneficIiPvE.Target.Target)
-                {
-                    if (SynastryPvE.Target.Target.GetHealthRatio() < SynastryHeal)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            if (nextGCD.IsTheSameTo(false, BeneficPvE))
-            {
-                if (SynastryPvE.Target.Target == BeneficPvE.Target.Target)
-                {
-                    if (SynastryPvE.Target.Target.GetHealthRatio() < SynastryHeal)
-                    {
-                        return true;
-                    }
-                }
+                return true;
             }
         }
 
@@ -196,6 +170,11 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
         }
 
         return base.EmergencyAbility(nextGCD, out act);
+
+        static bool CanCastSynastry(IBaseAction actionCheck, IBaseAction synastry, float synastryHp, IAction next)
+            => next.IsTheSameTo(false, actionCheck) &&
+               synastry.Target.Target == actionCheck.Target.Target &&
+               synastry.Target.Target.GetHealthRatio() < synastryHp;
     }
 
     [RotationDesc(ActionID.ExaltationPvE, ActionID.TheArrowPvE, ActionID.TheSpirePvE, ActionID.TheBolePvE, ActionID.TheEwerPvE)]
@@ -566,30 +545,6 @@ protected override bool HealSingleGCD(out IAction? act)
             return base.HealSingleGCD(out act);
         }
 
-        if (AspectedBeneficPvE.CanUse(out act) && (IsMoving || AspectedBeneficPvE.Target.Target?.GetHealthRatio() < AspectedBeneficHeal))
-        {
-            if (AspectedBeneficPvE.Target.Target.HasStatus(true, StatusID.Synastry_846))
-            {
-                return true;
-            }
-        }
-
-        if (BeneficIiPvE.CanUse(out act))
-        {
-            if (BeneficIiPvE.Target.Target.HasStatus(true, StatusID.Synastry_846))
-            {
-                return true;
-            }
-        }
-
-        if (BeneficPvE.CanUse(out act))
-        {
-            if (BeneficPvE.Target.Target.HasStatus(true, StatusID.Synastry_846))
-            {
-                return true;
-            }
-        }
-
         if (AspectedBeneficPvE.CanUse(out act) && (IsMoving || AspectedBeneficPvE.Target.Target?.GetHealthRatio() < AspectedBeneficHeal))
         {
             return true;

RotationSolver/Updaters/MiscUpdater.cs

@@ -218,6 +218,7 @@ private static unsafe void UpdateCancelCast()
         bool stopDueStatus = statusTimes.Length > 0 && minStatusTime > Player.Object.TotalCastTime - Player.Object.CurrentCastTime && minStatusTime < 5;
 
         bool shouldStopHealing = Service.Config.StopHealingAfterThresholdExperimental && DataCenter.InCombat &&
+                                 !CustomRotation.HealingWhileDoingNothing &&
                                  DataCenter.CommandNextAction?.AdjustedID != Player.Object.CastActionId &&
                                  ((ActionID)Player.Object.CastActionId).GetActionFromID(true, RotationUpdater.CurrentRotationActions) is IBaseAction {Setting.IsFriendly: true} && 
                                  (DataCenter.MergedStatus & (AutoStatus.HealAreaSpell | AutoStatus.HealSingleSpell)) == 0;