Merge commit 'refs/pull/1760/head' of https://github.com/Nik-Potokar/…

…XIVSlothCombo
Nik-Potokar · Sep 14, 2024 · e889c01 · e889c01
2 parents 3d09386 + a0f9cda
commit e889c01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -221,7 +221,7 @@ public enum CustomComboPreset
         [CustomComboInfo("Earthly Star Option", "Adds Earthly Star." +
                                                 "\nTo be used in conjunction with Redirect/Reaction/etc", AST.JobID, 11)]
         AST_ST_DPS_EarthlyStar = 1051,
-
+               
         #endregion
 
         #region AOE DPS
@@ -359,7 +359,7 @@ public enum CustomComboPreset
         AST_Cards_QuickTargetCards_TargetExtra = 1031,
         #endregion
 
-        // Last value = 1053
+        // Last value = 1054
 
         #endregion
 

diff --git a/XIVSlothCombo/Combos/PvE/AST.cs b/XIVSlothCombo/Combos/PvE/AST.cs
@@ -215,11 +215,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 if (((!AlternateMode && MaleficList.Contains(actionID)) ||
                     (AlternateMode && CombustList.ContainsKey(actionID)) &&
                     !InCombat()))
-
+                {
                     if (IsEnabled(CustomComboPreset.AST_DPS_AutoDraw) &&
                         ActionReady(OriginalHook(AstralDraw)) && (Gauge.DrawnCards.All(x => x is CardType.NONE) || (DrawnCard == CardType.NONE && Config.AST_ST_DPS_OverwriteCards)))
                         return OriginalHook(AstralDraw);
-
+                }
                 //In combat
                 if (((!AlternateMode && MaleficList.Contains(actionID)) ||
                      (AlternateMode && CombustList.ContainsKey(actionID))) &&
@@ -248,7 +248,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         if (MaleficCount == 1 && CombustCount == 0)
                             return OriginalHook(Combust);
 
-                        if (MaleficCount == 1 && (CombustCount == 1) && ActionReady(Lightspeed) && CanDelayedWeave(actionID))
+                        if (MaleficCount == 1 && (CombustCount == 1) && ActionReady(Lightspeed) && CanDelayedWeave(actionID) && !HasEffect(Buffs.Lightspeed))
                             return OriginalHook(Lightspeed);
 
                         if (MaleficCount == 3 && CanWeave(actionID))
@@ -335,6 +335,12 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
                         ActionWatching.NumberOfGcdsUsed >= 3)
                         return Divination;
 
+                    //Earthly Star
+                    if (IsEnabled(CustomComboPreset.AST_ST_DPS_EarthlyStar) &&
+                        ActionReady(EarthlyStar) &&
+                        CanSpellWeave(actionID))
+                        return EarthlyStar;
+
                     if (IsEnabled(CustomComboPreset.AST_DPS_Oracle) &&
                         HasEffect(Buffs.Divining) &&
                         CanSpellWeave(actionID))
@@ -345,13 +351,7 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
                         IsEnabled(CustomComboPreset.AST_DPS_LazyLord) && Gauge.DrawnCrownCard is CardType.LORD &&
                         HasBattleTarget() &&
                         CanDelayedWeave(actionID))
-                        return OriginalHook(MinorArcana);
-
-                    //Earthly Star
-                    if (IsEnabled(CustomComboPreset.AST_ST_DPS_EarthlyStar) &&
-                        ActionReady(EarthlyStar) &&
-                        CanSpellWeave(actionID))
-                        return EarthlyStar;
+                        return OriginalHook(MinorArcana);                                       
 
                     if (HasBattleTarget())
                     {
@@ -451,6 +451,11 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
                         CanDelayedWeave(actionID) &&
                         ActionWatching.NumberOfGcdsUsed >= 3)
                         return Divination;
+                    //Earthly Star
+                    if (IsEnabled(CustomComboPreset.AST_AOE_DPS_EarthlyStar) && !IsMoving &&
+                        ActionReady(EarthlyStar) &&
+                        CanSpellWeave(actionID))
+                        return EarthlyStar;
 
                     if (IsEnabled(CustomComboPreset.AST_AOE_Oracle) &&
                         HasEffect(Buffs.Divining) &&
@@ -463,13 +468,6 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
                         HasBattleTarget() &&
                         CanDelayedWeave(actionID))
                         return OriginalHook(MinorArcana);
-
-                    //Earthly Star
-                    if (IsEnabled(CustomComboPreset.AST_AOE_DPS_EarthlyStar) &&
-                        ActionReady(EarthlyStar) &&
-                        CanSpellWeave(actionID))
-                        return EarthlyStar;
-
                 }
                 return actionID;
             }