Merge pull request #60 from FFXIV-CombatReborn/Mch-HeatBlast-oGCD-Fix…

…ors-ty-nostra Heatblast ogcd fix
FFXIV-CombatReborn · Apr 25, 2024 · 7b31c8d · 7b31c8d
2 parents f981566 + b60c440
commit 7b31c8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 198 deletions.
diff --git a/BasicRotations/Ranged/MCH_Beta.cs b/BasicRotations/Ranged/MCH_Beta.cs
diff --git a/BasicRotations/Ranged/MCH_Default.cs b/BasicRotations/Ranged/MCH_Default.cs
@@ -57,13 +57,13 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
             if (ReassemblePvE.CanUse(out act, onLastAbility: true, skipClippingCheck: true, skipComboCheck: true, usedUp: true)) return true;
         }
         // Use Ricochet
-        if (isRicochetMore && ((!IsLastAction(true, GaussRoundPvE) && !IsLastAction(true, RicochetPvE) && Player.HasStatus(true, StatusID.Overheated)) || !Player.HasStatus(true, StatusID.Overheated)))
+        if (isRicochetMore && ((!IsLastAction(true, [GaussRoundPvE, RicochetPvE]) && IsLastGCD(true, HeatBlastPvE)) || !IsLastGCD(true, HeatBlastPvE)))
 
         {
             return RicochetPvE.CanUse(out act, skipAoeCheck: true, usedUp: true);
         }
         // Use Gause
-        if (isGaussMore && ((!IsLastAction(true, GaussRoundPvE) && !IsLastAction(true, RicochetPvE) && Player.HasStatus(true, StatusID.Overheated)) || !Player.HasStatus(true, StatusID.Overheated)))
+        if (isGaussMore && ((!IsLastAction(true, [GaussRoundPvE, RicochetPvE]) && IsLastGCD(true, HeatBlastPvE)) || !IsLastGCD(true, HeatBlastPvE)))
         {
             return GaussRoundPvE.CanUse(out act, usedUp: true);
         }