RDM: Fix acceleration to grand impact when swiftcast feature is disabled

MKhayle · Jul 6, 2024 · ecab61e · ecab61e
1 parent 5d50d4d
commit ecab61e
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/XIVComboExpanded/Combos/RDM.cs b/XIVComboExpanded/Combos/RDM.cs
@@ -372,7 +372,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
 internal class RedMageAcceleration : CustomCombo
 {
-    protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.RedMageAccelerationSwiftcastFeature;
+    protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.RdmAny;
 
     protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
     {
@@ -383,17 +383,20 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 if (IsEnabled(CustomComboPreset.RedMageAccelerationGrandImpactFeature) && HasEffect(RDM.Buffs.GrandImpactReady))
                     return RDM.GrandImpact;
 
-                if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastOption))
+                if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastFeature))
                 {
-                    if (IsOffCooldown(RDM.Acceleration) && IsOffCooldown(ADV.Swiftcast))
-                        return ADV.Swiftcast;
-                }
+                    if (IsEnabled(CustomComboPreset.RedMageAccelerationSwiftcastOption))
+                    {
+                        if (IsOffCooldown(RDM.Acceleration) && IsOffCooldown(ADV.Swiftcast))
+                            return ADV.Swiftcast;
+                    }
 
-                if (IsOffCooldown(RDM.Acceleration))
-                    return RDM.Acceleration;
+                    if (IsOffCooldown(RDM.Acceleration))
+                        return RDM.Acceleration;
 
-                if (IsOffCooldown(ADV.Swiftcast))
-                    return ADV.Swiftcast;
+                    if (IsOffCooldown(ADV.Swiftcast))
+                        return ADV.Swiftcast;
+                }
 
                 return RDM.Acceleration;
             }