Merge pull request #634 from aventurescence/espiritopti

Enhanced Dancer Logic •⩊•

Author: LTS-FFXIV

BasicRotations/Ranged/DNC_Default.cs

@@ -196,11 +196,10 @@ private bool AttackGCD(out IAction? act, bool burst)
         act = null;
 
         if (IsDancing) return false;
+        // Use Dance of the Dawn immediately if available
+        if (burst && Esprit > 50 && DanceOfTheDawnPvE.CanUse(out act)) return true;
 
-        if (!DevilmentPvE.CanUse(out _, skipComboCheck: true))
-        {
-            if (TillanaPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        }
+        if (HandleTillana(out act)) return true;
 
         if (TechnicalStepPvE.Cooldown.ElapsedAfter(103))
         {
@@ -238,7 +237,7 @@ private bool AttackGCD(out IAction? act, bool burst)
         if (FinishingMovePvE.CanUse(out act, skipAoeCheck: true)) return true;
 
         // Further prioritized GCD abilities
-        if ((burst || (Esprit >= 85 && !TechnicalStepPvE.Cooldown.ElapsedAfter(115))) && SaberDancePvE.CanUse(out act, skipAoeCheck: true)) return true;
+        if ((burst || (Esprit >= 70 && !TechnicalStepPvE.Cooldown.ElapsedAfter(115))) && SaberDancePvE.CanUse(out act, skipAoeCheck: true)) return true;
 
         if (StarfallDancePvE.CanUse(out act, skipAoeCheck: true)) return true;
 
@@ -319,5 +318,20 @@ private bool FinishTheDance(out IAction? act)
         act = null;
         return false;
     }
+ 
+    // Handles the logic for using the Tillana.
+    private bool HandleTillana(out IAction? act)
+    {
+        // Check if Esprit is less than or equal to 50 and Devilment cannot be used
+        if (Esprit <= 45 && !DevilmentPvE.CanUse(out _, skipComboCheck: true))
+        {
+            // Attempt to use Tillana, skipping the AoE check
+            if (TillanaPvE.CanUse(out act, skipAoeCheck: true)) return true;
+        }
+
+        // No Tillana action was performed
+        act = null;
+        return false;
+    }
     #endregion
 }