Merge pull request #43 from FFXIV-CombatReborn/abilityremain-timing

Abilityremain timing and attempt 2 at true north fix
FFXIV-CombatReborn · Apr 1, 2024 · 5029c3a · 5029c3a
2 parents f2264dd + 28df9ae
commit 5029c3a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -206,19 +206,19 @@ public static float GCDTime(uint gcdCount = 0, float offset = 0)
     /// </summary>
     public static unsafe float ActionRemain => ActionManagerHelper.GetCurrentAnimationLock();
 
-    public static float AbilityRemain
-    {
-        get
-        {
-            var gcdRemain = WeaponRemain;
-            // Check if we should account for the animation lock and ping.
-            if (gcdRemain - MinAnimationLock - Ping <= ActionRemain)
-            {
-                return gcdRemain + MinAnimationLock + Ping;
-            }
-            return ActionRemain;
-        }
-    }
+    public static float AbilityRemain => ActionManagerHelper.GetCurrentAnimationLock();
+    //{
+     //   get
+     //   {
+     //       var gcdRemain = WeaponRemain;
+     //       // Check if we should account for the animation lock and ping.
+     //       if (gcdRemain - MinAnimationLock - Ping <= ActionRemain)
+     //       {
+     //           return gcdRemain + MinAnimationLock + Ping;
+     //       }
+     //       return ActionRemain;
+     //   }
+    //}
 
     // Update the property to conditionally use AbilityRemain based on the NoPingCheck setting.
     public static float NextAbilityToNextGCD => WeaponRemain - ActionRemain;

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -44,7 +44,7 @@ private bool Ability(IAction nextGCD, out IAction? act)
 
         if (DataCenter.MergedStatus.HasFlag(AutoStatus.Positional))
         {
-            if (TrueNorthPvE.CanUse(out act, onLastAbility: true)) return true;
+            if (TrueNorthPvE.CanUse(out act)) return true;
         }
 
         IBaseAction.TargetOverride = TargetType.Heal;