Merge pull request #839 from FFXIV-CombatReborn/MNKRework

Monk Rework, SGE hotfix for Zoe, wording fix for healer configs

Author: LTS-FFXIV

BasicRotations/Healer/AST_Default.cs

@@ -14,7 +14,7 @@ public sealed class AST_Default : AstrologianRotation
     [RotationConfig(CombatType.PvE, Name = "Use both stacks of Lightspeed while moving")]
     public bool LightspeedMove { get; set; } = true;
 
-    [RotationConfig(CombatType.PvE, Name = "Use spells with cast times to heal. (Ignored if you are the only healer in party)")]
+    [RotationConfig(CombatType.PvE, Name = "Use GCDs to heal. (Ignored if you are the only healer in party)")]
     public bool GCDHeal { get; set; } = false;
 
     [RotationConfig(CombatType.PvE, Name = "Prevent actions while you have the bubble mit up")]

BasicRotations/Healer/SCH_Default.cs

@@ -60,7 +60,7 @@ public sealed class SCH_Default : ScholarRotation
     [RotationConfig(CombatType.PvE, Name = "Enable Swiftcast restriction: only allow Raise while Swiftcast is active")]
     public bool SwiftLogic { get; set; } = true;
 
-    [RotationConfig(CombatType.PvE, Name = "Allow use of cast-time spells for healing (ignored if solo healer)")]
+    [RotationConfig(CombatType.PvE, Name = "Use GCDs to heal. (Ignored if you are the only healer in party)")]
     public bool GCDHeal { get; set; } = true;
 
     [RotationConfig(CombatType.PvE, Name = "Use Recitation during the countdown opener")]

BasicRotations/Healer/SGE_Default.cs

@@ -17,7 +17,7 @@ public sealed class SGE_Default : SageRotation
     [RotationConfig(CombatType.PvE, Name = "Use Rhizomata when out of combat")]
     public bool OOCRhizomata { get; set; } = false;
 
-    [RotationConfig(CombatType.PvE, Name = "Use spells with cast times to heal. (Ignored if you are the only healer in party)")]
+    [RotationConfig(CombatType.PvE, Name = "Use GCDs to heal. (Ignored if you are the only healer in party)")]
     public bool GCDHeal { get; set; } = false;
 
     [RotationConfig(CombatType.PvE, Name = "Enable Swiftcast Restriction Logic to attempt to prevent actions other than Raise when you have swiftcast")]
@@ -125,7 +125,30 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
             return true;
         }
 
-        //if (base.EmergencyAbility(nextGCD, out act)) return true;
+        if (ZoePvE.EnoughLevel && !ZoePvE.Cooldown.IsCoolingDown)
+        {
+            if (nextGCD.IsTheSameTo(false, PneumaPvE))
+            {
+                if (ZoePvE.CanUse(out act))
+                {
+                    return true;
+                }
+            }
+
+            if (nextGCD.IsTheSameTo(false, EukrasiaPvE))
+            {
+                if (_EukrasiaActionAim == EukrasianPrognosisPvE
+                    || _EukrasiaActionAim == EukrasianPrognosisIiPvE
+                    || _EukrasiaActionAim == EukrasianDiagnosisPvE)
+                {
+                    if (ZoePvE.CanUse(out act))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+
 
         return base.EmergencyAbility(nextGCD, out act);
     }
@@ -251,21 +274,6 @@ protected override bool HealSingleAbility(IAction nextGCD, out IAction? act)
         IEnumerable<IBattleChara> tankEnum = PartyMembers.GetJobCategory(JobRole.Tank);
         List<IBattleChara> tank = [.. tankEnum];
 
-        if (nextGCD.IsTheSameTo(false, PneumaPvE, EukrasianPrognosisPvE, EukrasianPrognosisIiPvE))
-        {
-            for (int i = 0; i < tank.Count; i++)
-            {
-                IBattleChara t = tank[i];
-                if (t.GetHealthRatio() < ZoeHeal)
-                {
-                    if (ZoePvE.CanUse(out act))
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
         if (nextGCD.IsTheSameTo(false, PneumaPvE, EukrasianDiagnosisPvE, DiagnosisPvE, PrognosisPvE))
         {
             for (int i = 0; i < tank.Count; i++)

BasicRotations/Healer/WHM_Default.cs

@@ -15,8 +15,8 @@ public sealed class WHM_Default : WhiteMageRotation
     [RotationConfig(CombatType.PvE, Name = "Enable Swiftcast Restriction Logic to attempt to prevent actions other than Raise when you have swiftcast")]
     public bool SwiftLogic { get; set; } = true;
 
-    [RotationConfig(CombatType.PvE, Name = "Use spells with cast times to heal. (Ignored if you are the only healer in party)")]
-    public bool GCDHeal { get; set; } = false;
+    [RotationConfig(CombatType.PvE, Name = "Use GCDs to heal. (Ignored if you are the only healer in party)")]
+    public bool GCDHeal { get; set; } = true;
 
     [RotationConfig(CombatType.PvE, Name = "Use DOT while moving even if it does not need refresh (disabling is a damage down)")]
     public bool DOTUpkeep { get; set; } = true;