Merge pull request #524 from FFXIV-CombatReborn/SGEPLD

Update SGE and PLD classes; remove ConfiteorPvEActionId
FFXIV-CombatReborn · Jan 4, 2025 · 38ad9c2 · 38ad9c2
2 parents da9022e + eeed592
commit 38ad9c2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/BasicRotations/Healer/SGE_Default.cs b/BasicRotations/Healer/SGE_Default.cs
@@ -339,6 +339,21 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (HasSwift && SwiftLogic && EgeiroPvE.CanUse(out _)) return false;
 
+        if (EukrasianDiagnosisPvE.CanUse(out act) && MergedStatus.HasFlag(AutoStatus.DefenseSingle))
+        {
+            if (EukrasianDiagnosisPvE.Target.Target?.HasStatus(true,
+                StatusID.EukrasianDiagnosis,
+                StatusID.DifferentialDiagnosis,
+                StatusID.EukrasianPrognosis,
+                StatusID.Galvanize
+            ) ?? false) return false;
+
+            if (EukrasiaPvE.CanUse(out act)) return true;
+
+            act = EukrasianDiagnosisPvE;
+            return true;
+        }
+
         if (!InCombat && !Player.HasStatus(true, StatusID.Eukrasia) && EukrasiaPvE.CanUse(out act)) return true;
 
         if (HostileTarget?.IsBossFromTTK() ?? false)
@@ -390,7 +405,7 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (DyskrasiaPvE.CanUse(out _))
         {
-            if (EukrasianDyskrasiaPvE.EnoughLevel && (EukrasianDyskrasiaPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDyskrasiaPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat)
+            if (EukrasianDyskrasiaPvE.EnoughLevel && (EukrasianDyskrasiaPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDyskrasiaPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat && (!MergedStatus.HasFlag(AutoStatus.DefenseArea) || !MergedStatus.HasFlag(AutoStatus.DefenseSingle)))
             {
                 StatusHelper.StatusOff(StatusID.Eukrasia);
             }
@@ -412,7 +427,7 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (DosisPvE.CanUse(out _))
         {
-            if ((EukrasianDosisPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDosisPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat)
+            if ((EukrasianDosisPvE.Target.Target?.WillStatusEnd(3, true, EukrasianDosisPvE.Setting.TargetStatusProvide ?? []) ?? false) && InCombat && (!MergedStatus.HasFlag(AutoStatus.DefenseArea) || !MergedStatus.HasFlag(AutoStatus.DefenseSingle)))
             {
                 StatusHelper.StatusOff(StatusID.Eukrasia);
             }

diff --git a/BasicRotations/Tank/PLD_Beta.cs b/BasicRotations/Tank/PLD_Beta.cs
@@ -36,6 +36,9 @@ public sealed class PLD_Beta : PaladinRotation
     private const ActionID ConfiteorPvEActionId = (ActionID)16459;
     private new readonly IBaseAction ConfiteorPvE = new BaseAction(ConfiteorPvEActionId);
 
+    private const ActionID ImperatorPvEActionId = (ActionID)36921;
+    private new readonly IBaseAction ImperatorPvE = new BaseAction(ImperatorPvEActionId);
+
     #region Countdown Logic
     protected override IAction? CountDownAction(float remainTime)
     {
@@ -147,8 +150,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         if (!SwordOathTrait.EnoughLevel && nextGCD.IsTheSameTo(true, RoyalAuthorityPvE) && FightOrFlightPvE.CanUse(out act)) return true;
         if (SwordOathTrait.EnoughLevel && Player.HasStatus(true, StatusID.AtonementReady) && FightOrFlightPvE.CanUse(out act)) return true;
 
-        if (IsLastAbility(true, FightOrFlightPvE) && ImperatorPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        if (IsLastAbility(true, FightOrFlightPvE) && RequiescatPvE.CanUse(out act)) return true;
+        if (IsLastAbility(true, FightOrFlightPvE) && ImperatorPvE.CanUse(out act, skipAoeCheck: true, usedUp: true)) return true;
+        if (IsLastAbility(true, FightOrFlightPvE) && RequiescatPvE.CanUse(out act, skipAoeCheck: true, usedUp: true)) return true;
 
         if (FightOrFlightPvE.Cooldown.IsCoolingDown && CircleOfScornPvE.CanUse(out act, skipAoeCheck: true)) return true;
         if (FightOrFlightPvE.Cooldown.IsCoolingDown && ExpiacionPvE.CanUse(out act, skipAoeCheck: true)) return true;

diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs b/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs
@@ -5,8 +5,6 @@ partial class PaladinRotation
     /// <inheritdoc/>
     public override MedicineType MedicineType => MedicineType.Strength;
 
-    private const ActionID ConfiteorPvEActionId = (ActionID)16459;
-
     /// <summary>
     /// 
     /// </summary>