Merge pull request #951 from FFXIV-CombatReborn/TimeMageWhiteMage

Time Mage occult quick hotfix for casters, WHM ThinAir adjustment

Author: LTS-FFXIV

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -284,6 +284,12 @@ 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;
@@ -319,7 +325,7 @@ public bool HasEnoughMP()
 
         if (Player.Job == Job.WHM)
         {
-            if (Player.Object.HasStatus(true, StatusID.ThinAir))
+            if (Player.Object.HasStatus(true, StatusID.ThinAir) || CustomRotation.IsLastAction(ActionID.ThinAirPvE))
             {
                 return true;
             }

RotationSolver.Basic/Rotations/Basic/WhiteMageRotation.cs

@@ -17,6 +17,16 @@ public override bool IsBursting()
         return false;
     }
 
+    /// <inheritdoc/>
+    public static bool ThinAirState()
+    {
+        if (HasThinAir || IsLastAction(ActionID.ThinAirPvE))
+        {
+            return true;
+        }
+        return false;
+    }
+
     #region Job Gauge
     /// <summary>
     /// Represents the number of Lily stacks.
@@ -120,8 +130,7 @@ static partial void ModifyMedicaPvE(ref ActionSetting setting)
 
     static partial void ModifyRaisePvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Player.CurrentMp >= RaiseMPMinimum || HasThinAir;
-        setting.MPOverride = () => HasThinAir ? 0 : (uint)2400;
+        setting.ActionCheck = () => Player.CurrentMp >= RaiseMPMinimum || ThinAirState();
     }
 
     static partial void ModifyStoneIiPvE(ref ActionSetting setting)

RotationSolver/RebornRotations/Healer/WHM_Reborn.cs

@@ -102,7 +102,7 @@ public enum ThinAirUsageStrategy : byte
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
         bool useLastThinAirCharge = ThinAirLastChargeUsage == ThinAirUsageStrategy.UseAllCharges || (ThinAirLastChargeUsage == ThinAirUsageStrategy.ReserveLastChargeForRaise && nextGCD == RaisePvE);
-        if (((nextGCD is IBaseAction action && action.Info.MPNeed >= ThinAirNeed) || (MergedStatus.HasFlag(AutoStatus.Raise) && Player.CurrentMp > 2400 && IsLastAction() == IsLastGCD())) &&
+        if (((nextGCD is IBaseAction action && action.Info.MPNeed >= ThinAirNeed && IsLastAction() == IsLastGCD()) || ((MergedStatus.HasFlag(AutoStatus.Raise) || (nextGCD == RaisePvE)) && IsLastAction() == IsLastGCD())) &&
             ThinAirPvE.CanUse(out act, usedUp: useLastThinAirCharge))
         {
             return true;