Merge pull request #86 from FFXIV-CombatReborn/MCH-oGCD-DoubleWeave-A…

…OE-Protection Doubleweave protection for Overheat AOE
FFXIV-CombatReborn · May 17, 2024 · f97a8a0 · f97a8a0
2 parents 507aaf8 + fdc25a5
commit f97a8a0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/BasicRotations/Ranged/MCH_Default.cs b/BasicRotations/Ranged/MCH_Default.cs
@@ -57,14 +57,14 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
         }
 
         // Use Ricochet
-        if (isRicochetMore && ((!IsLastAction(true, new[] { GaussRoundPvE, RicochetPvE }) && IsLastGCD(true, HeatBlastPvE)) || !IsLastGCD(true, HeatBlastPvE)))
+        if (isRicochetMore && ((!IsLastAction(true, new[] { GaussRoundPvE, RicochetPvE }) && IsLastGCD(true, new[] { HeatBlastPvE, AutoCrossbowPvE })) || !IsLastGCD(true, new[] { HeatBlastPvE, AutoCrossbowPvE })))
         {
             if (RicochetPvE.CanUse(out act, skipAoeCheck: true, usedUp: true))
                 return true;
         }
 
         // Use Gauss
-        if (isGaussMore && ((!IsLastAction(true, new[] { GaussRoundPvE, RicochetPvE }) && IsLastGCD(true, HeatBlastPvE)) || !IsLastGCD(true, HeatBlastPvE)))
+        if (isGaussMore && ((!IsLastAction(true, new[] { GaussRoundPvE, RicochetPvE }) && IsLastGCD(true, new[] { HeatBlastPvE, AutoCrossbowPvE })) || !IsLastGCD(true, new[] { HeatBlastPvE, AutoCrossbowPvE })))
         {
             if (GaussRoundPvE.CanUse(out act, usedUp: true))
                 return true;