Merge pull request #954 from FFXIV-CombatReborn/TimeMageFix2

Better fix for Time Mage, promotion of testing to release

Author: LTS-FFXIV

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -284,12 +284,6 @@ private bool NeedsCasting(bool skipCastingCheck)
         if (!Player.Object.WillStatusEnd(0, true, StatusHelper.SwiftcastStatus))
             return false;
 
-        if (!Player.Object.WillStatusEnd(0, false, StatusID.OccultQuick))
-            return false;
-
-        if (!Player.Object.WillStatusEnd(0, true, StatusID.OccultQuick))
-            return false;
-
         // Must not be in the no-cast list
         if (ActionsNoNeedCasting.Contains(ID))
             return false;

RotationSolver.Basic/Helpers/StatusHelper.cs

@@ -112,7 +112,8 @@ public static class StatusHelper
     [
         StatusID.Swiftcast,
         StatusID.Triplecast,
-        StatusID.Dualcast
+        StatusID.Dualcast,
+        StatusID.OccultQuick
     ];
 
     /// <summary>

RotationSolver.Basic/Rotations/CustomRotation_Actions.cs

@@ -32,7 +32,7 @@ static partial void ModifyAddlePvE(ref ActionSetting setting)
 
     static partial void ModifySwiftcastPvE(ref ActionSetting setting)
     {
-        // setting.StatusProvide = StatusHelper.SwiftcastStatus;
+        setting.StatusProvide = StatusHelper.SwiftcastStatus;
     }
 
     static partial void ModifyEsunaPvE(ref ActionSetting setting)

RotationSolver.Basic/Rotations/Duties/PhantomRotation.cs

@@ -370,7 +370,7 @@ static partial void ModifyOccultQuickPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => TimeMageLevel >= 5;
         setting.TargetType = TargetType.Self;
-        setting.StatusProvide = [StatusID.OccultQuick, StatusID.OccultSwift];
+        setting.StatusProvide = StatusHelper.SwiftcastStatus;
     }
     #endregion
 

RotationSolver/RebornRotations/Duty/PhantomDefault.cs

@@ -604,7 +604,7 @@ public override bool GeneralGCD(out IAction? act)
             }
         }
 
-        if (InCombat && OccultQuickPvE.CanUse(out act))
+        if (InCombat && OccultQuickPvE.CanUse(out act) && !Player.HasStatus(true, StatusID.Manafication) && !Player.HasStatus(true, StatusID.Embolden) && !Player.HasStatus(true, StatusID.MagickedSwordplay) && !Player.HasStatus(true, StatusID.GrandImpactReady))
         {
             return true;
         }
@@ -694,11 +694,19 @@ public override bool GeneralGCD(out IAction? act)
 
         if (OccultCometPvE.CanUse(out act)) // Adding this to general swiftcast check is slightly more expensive for the many operations it will never be valid in
         {
-            if (!IsRDM && !IsPLD && !IsBLM)
+            if (IsBLM && HasSwift)
+            {
+                return true;
+            }
+            if (IsRDM && HasSwift)
             {
                 return true;
             }
-            if (((IsRDM || IsBLM) && HasSwift) || (IsPLD && Player.HasStatus(true, StatusID.Requiescat)))
+            if (IsPLD && (Player.HasStatus(true, StatusID.Requiescat) || HasSwift))
+            {
+                return true;
+            }
+            if (!IsRDM && !IsPLD && !IsBLM)
             {
                 return true;
             }