Merge pull request #1818 from Kagekazu/MCH-Infinite-Queen

[MCH] Queen Update
Nik-Potokar · Oct 14, 2024 · 98e95b3 · 98e95b3
2 parents e86b6d1 + d9953a5
commit 98e95b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/MCH.cs b/XIVSlothCombo/Combos/JobHelpers/MCH.cs
@@ -289,15 +289,15 @@ public static bool UseQueen(MCHGauge gauge)
                         return true;
 
                     //odd mins 2nd queen
-                    if (BSUsed is 2 or 5 or 8 && gauge is { Battery: >= 60, LastSummonBatteryPower: 50 })
+                    if (BSUsed % 3 is 2 && gauge is { Battery: >= 60, LastSummonBatteryPower: 50 })
                         return true;
 
                     //odd mins 2nd queen
-                    if (BSUsed is 3 or 6 or 9 && gauge is { Battery: >= 70, LastSummonBatteryPower: 50 })
+                    if (BSUsed % 3 is 0 && gauge is { Battery: >= 70, LastSummonBatteryPower: 50 })
                         return true;
 
                     //odd mins 2nd queen
-                    if (BSUsed is 4 or 7 or 10 && gauge is { Battery: >= 80, LastSummonBatteryPower: 50 })
+                    if (BSUsed % 3 is 1 && gauge is { Battery: >= 80, LastSummonBatteryPower: 50 })
                         return true;
                 }
 

diff --git a/XIVSlothCombo/Combos/PvE/MCH.cs b/XIVSlothCombo/Combos/PvE/MCH.cs
@@ -231,9 +231,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 if (LevelChecked(Excavator) &&
                     HasEffect(Buffs.ExcavatorReady) &&
                     (BSUsed is 1 ||
-                     (BSUsed is 2 or 5 or 8 && Gauge.Battery <= 40) ||
-                     (BSUsed is 3 or 6 or 9 && Gauge.Battery <= 50) ||
-                     (BSUsed is 4 or 7 or 10 && Gauge.Battery <= 60) ||
+                     (BSUsed % 3 is 2 && Gauge.Battery <= 40) ||
+                     (BSUsed % 3 is 0 && Gauge.Battery <= 50) ||
+                     (BSUsed % 3 is 1 && Gauge.Battery <= 60) ||
                      GetBuffRemainingTime(Buffs.ExcavatorReady) < 6))
                     return OriginalHook(Chainsaw);
 
@@ -476,9 +476,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                     LevelChecked(Excavator) &&
                     HasEffect(Buffs.ExcavatorReady) &&
                     (BSUsed is 1 ||
-                     (BSUsed is 2 or 5 or 8 && Gauge.Battery <= 40) ||
-                     (BSUsed is 3 or 6 or 9 && Gauge.Battery <= 50) ||
-                     (BSUsed is 4 or 7 or 10 && Gauge.Battery <= 60) ||
+                     (BSUsed % 3 is 2 && Gauge.Battery <= 40) ||
+                     (BSUsed % 3 is 0 && Gauge.Battery <= 50) ||
+                     (BSUsed % 3 is 1 && Gauge.Battery <= 60) ||
                      GetBuffRemainingTime(Buffs.ExcavatorReady) < 6))
                     return OriginalHook(Chainsaw);