Merge pull request #106 from zbee/dpNoAuto

[DNC] Prevent new DP option from bricking Auto-Rotation
PunishXIV · Nov 24, 2024 · e12459b · e12459b
2 parents 6d0b202 + 0a4c34a
commit e12459b
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/DNC/DNC.cs b/XIVSlothCombo/Combos/PvE/DNC/DNC.cs
@@ -289,8 +289,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 if (!InCombat())
                 {
                     // Dance Partner
-
-                    if (IsEnabled(CustomComboPreset.DNC_ST_Adv_Partner) && ActionReady(ClosedPosition) && !HasEffect(Buffs.ClosedPosition) && (GetPartyMembers().Count > 1 || HasCompanionPresent()))
+                    if (IsEnabled(CustomComboPreset.DNC_ST_Adv_Partner) &&
+                        ActionReady(ClosedPosition) &&
+                        !HasEffect(Buffs.ClosedPosition) &&
+                        (GetPartyMembers().Count > 1 || HasCompanionPresent()) &&
+                        !(Service.Configuration.AutoActions[CustomComboPreset.DNC_ST_AdvancedMode] &&
+                          Service.Configuration.RotationConfig.Enabled)) // Disabled in Auto-Rotation
+                        // todo: do not disable for auto-rotation, provide targeting
                         return ClosedPosition;
 
                     // ST Standard Step (Pre-pull)
@@ -647,8 +652,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 #region Prepull
 
                 // Dance Partner
-
-                if (!InCombat() && IsEnabled(CustomComboPreset.DNC_AoE_Adv_Partner) && ActionReady(ClosedPosition) && !HasEffect(Buffs.ClosedPosition) && (GetPartyMembers().Count > 1 || HasCompanionPresent()))
+                if (!InCombat() &&
+                    IsEnabled(CustomComboPreset.DNC_AoE_Adv_Partner) &&
+                    ActionReady(ClosedPosition) &&
+                    !HasEffect(Buffs.ClosedPosition) &&
+                    (GetPartyMembers().Count > 1 || HasCompanionPresent()) &&
+                    !(Service.Configuration.AutoActions[CustomComboPreset.DNC_AoE_AdvancedMode] &&
+                      Service.Configuration.RotationConfig.Enabled)) // Disabled in Auto-Rotation
+                    // todo: do not disable for auto-rotation, provide targeting
                     return ClosedPosition;
 
                 #endregion