Merge pull request #597 from FFXIV-CombatReborn/daboodeedabooda

BLU Base3.0 mostly filled out
FFXIV-CombatReborn · Jan 21, 2025 · e83f76a · e83f76a
2 parents 6293fb2 + f6a131c
commit e83f76a
Show file tree

Hide file tree

Showing 2 changed files with 762 additions and 51 deletions.
diff --git a/BasicRotations/Limited Jobs/BLU_Default.cs b/BasicRotations/Limited Jobs/BLU_Default.cs
@@ -19,7 +19,8 @@ public sealed class Blue_Default : BlueMageRotation
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
         act = null;
-
+        if (nextGCD.IsTheSameTo(true, AngelWhisperPvE) && SwiftcastPvE.CanUse(out act)) return true;
+        if (nextGCD.IsTheSameTo(true, TheRoseOfDestructionPvE) && OffguardPvE.CanUse(out act)) return true;
         return base.EmergencyAbility(nextGCD, out act);
     }
     #endregion
@@ -80,9 +81,11 @@ protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
     protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     {
         act = null;
+        if (SurpanakhaPvE.CanUse(out act)) return true;
+        if (PhantomFlurryPvE.CanUse(out act)) return true;
         if (JKickPvE.CanUse(out act)) return true;
         if (BeingMortalPvE.CanUse(out act)) return true;
-        if (NightbloomPvE.CanUse(out act)) return true;
+        if (NightbloomPvE.CanUse(out act, skipStatusProvideCheck: true)) return true;
         if (FeatherRainPvE.CanUse(out act)) return true;
         if (ShockStrikePvE.CanUse(out act)) return true;
 
@@ -103,7 +106,7 @@ protected override bool GeneralAbility(IAction nextGCD, out IAction? act)
     protected override bool EmergencyGCD(out IAction? act)
     {
         act = null;
-
+        
         return base.EmergencyGCD(out act);
     }
 
@@ -116,6 +119,7 @@ protected override bool MyInterruptGCD(out IAction? act)
     protected override bool DefenseAreaGCD(out IAction? act)
     {
         if (ColdFogPvE.CanUse(out act)) return true;
+        if (GobskinPvE.CanUse(out act)) return true;
         return base.DefenseAreaGCD(out act);
     }
 
@@ -128,13 +132,14 @@ protected override bool DefenseSingleGCD(out IAction? act)
 
     protected override bool HealAreaGCD(out IAction? act)
     {
-        if (WhiteWindPvE.CanUse(out act)) return true;
+        if (Player.GetHealthRatio() > 0.5 && WhiteWindPvE.CanUse(out act)) return true;
+        if (StotramPvE.CanUse(out act)) return true;
         return base.HealAreaGCD(out act);
     }
 
     protected override bool HealSingleGCD(out IAction? act)
     {
-        if (WhiteWindPvE.CanUse(out act)) return true;
+        if (PomCurePvE.CanUse(out act)) return true;
         return base.HealSingleGCD(out act);
     }
 
@@ -160,6 +165,8 @@ protected override bool RaiseGCD(out IAction? act)
 
     protected override bool GeneralGCD(out IAction? act)
     {
+        if (MightyGuardPvE.CanUse(out act)) return true;
+        if (BasicInstinctPvE.CanUse(out act)) return true;
         if (WhiteDeathPvE.CanUse(out act)) return true;
 
         if (BreathOfMagicPvE.CanUse(out act) && (BreathOfMagicPvE.Target.Target?.WillStatusEnd(2, true, BreathOfMagicPvE.Setting.TargetStatusProvide ?? []) ?? false)) return true;
@@ -168,10 +175,6 @@ protected override bool GeneralGCD(out IAction? act)
         if (MatraMagicPvE.CanUse(out act)) return true;
         if (TheRoseOfDestructionPvE.CanUse(out act)) return true;
 
-        if (TinglePvE.CanUse(out act) && TripleTridentPvE.Cooldown.WillHaveOneChargeGCD(2) && !Player.HasStatus(true, StatusID.Tingling) && !IsLastGCD(ActionID.TinglePvE)) return true;
-        if (WhistlePvE.CanUse(out act) && Player.HasStatus(true, StatusID.Tingling)) return true;
-        if (TripleTridentPvE.CanUse(out act) && IsLastGCD(ActionID.WhistlePvE) && Player.HasStatus(true, StatusID.Tingling)) return true;
-
         if (SonicBoomPvE.CanUse(out act)) return true;
         if (FlyingSardinePvE.CanUse(out act)) return true;
         return base.GeneralGCD(out act);