Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

mch bugfixes #255

Merged
merged 4 commits into from
Sep 24, 2024
Merged

mch bugfixes #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af3dfe2
fix wf/hc bugs in mch beta 1
Sep 24, 2024
efa3fe6
don't hold drill/hypercharge if combo time is 0
Sep 24, 2024
5028572
don't hold drill/hypercharge if combo time is 0
Sep 24, 2024
695eb74
Merge branch 'main' of https://github.com/Karaha-Baruha/RebornRotations
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions BasicRotations/Ranged/zMCH_Beta.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Ranged/zMCH_Beta_2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down