Merge pull request #255 from Karaha-Baruha/main

mch bugfixes
FFXIV-CombatReborn · Sep 24, 2024 · 5f5de7f · 5f5de7f
2 parents b1cb12e + 695eb74
commit 5f5de7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/BasicRotations/Ranged/zMCH_Beta.cs b/BasicRotations/Ranged/zMCH_Beta.cs
@@ -81,20 +81,12 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         // Use Hypercharge if wildfire will not be up in 30 seconds or if you hit 100 heat
         if (!LowLevelHyperCheck && !Player.HasStatus(true, StatusID.Reassembled) && (!WildfirePvE.Cooldown.WillHaveOneCharge(30) || (Heat == 100)))
         {
-            if (ToolChargeSoon(out act)) return true;
+            if (!HoldHCForCombo || !(LiveComboTime <= 8f && LiveComboTime > 0f) && ToolChargeSoon(out act)) return true;
         }
 
         // Use Ricochet and Gauss if have pooled charges or is burst window
-        if (isRicochetMore)
-        {
-            if (IsLastGCD(true, BlazingShotPvE, HeatBlastPvE)
-                && RicochetPvE.CanUse(out act, skipAoeCheck: true, usedUp: true))
-                return true;
-        }
-
-        if (IsLastGCD(true, BlazingShotPvE, HeatBlastPvE)
-            && GaussRoundPvE.CanUse(out act, usedUp: true, skipAoeCheck: true)) 
-            return true;
+        if (isRicochetMore && RicochetPvE.CanUse(out act, skipAoeCheck: true, usedUp: true)) return true;
+        if (GaussRoundPvE.CanUse(out act, usedUp: true, skipAoeCheck: true)) return true;
 
         if (IsBurst)
         {
@@ -176,9 +168,7 @@ private bool ToolChargeSoon(out IAction? act)
                      (DrillPvE.EnoughLevel && (!DrillPvE.Cooldown.IsCoolingDown))
                      ||
                      // Chainsaw Charge Detection
-                     (ChainSawPvE.EnoughLevel && ChainSawPvE.Cooldown.WillHaveOneCharge(REST_TIME)))
-                     ||
-                     (!HoldHCForCombo || !(LiveComboTime <= REST_TIME)))
+                     (ChainSawPvE.EnoughLevel && ChainSawPvE.Cooldown.WillHaveOneCharge(REST_TIME))))
         {
             act = null;
             return false;

diff --git a/BasicRotations/Ranged/zMCH_Beta_2.cs b/BasicRotations/Ranged/zMCH_Beta_2.cs
@@ -90,7 +90,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         if (!LowLevelHyperCheck
             && !Player.HasStatus(true, StatusID.Reassembled) 
             && (!WildfirePvE.Cooldown.WillHaveOneCharge(30) || Heat == 100) 
-            && !(LiveComboTime <= HYPERCHARGE_DURATION)
+            && !(LiveComboTime <= HYPERCHARGE_DURATION && LiveComboTime > 0f)
             && ToolChargeSoon(out act)) return true;
 
         // Use Ricochet and Gauss if have pooled charges or is burst window