Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BRD] Fixes #161

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[BRD] Fixes #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd44c8
Level check fix for dots
edewen Dec 1, 2024
b7685a0
Bloodletter aoe below rain of death
edewen Dec 1, 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
21 changes: 13 additions & 8 deletions WrathCombo/Combos/PvE/BRD/BRD.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
// At least Lv56 (Iron Jaws) from here on...

// DoT application takes priority, as Iron Jaws always cuts ticks
if (blue is null)
if (blue is null && LevelChecked(Windbite))
return OriginalHook(Windbite);
if (purple is null)
if (purple is null && LevelChecked(VenomousBite))
return OriginalHook(VenomousBite);

// DoT refresh over Apex Option
Expand Down Expand Up @@ -533,6 +533,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
else if (rainOfDeathCharges > 0) //Dont pool when not enabled
return OriginalHook(RainOfDeath);
}
if (!LevelChecked(RainOfDeath) && !(WasLastAction(Bloodletter) && GetRemainingCharges(Bloodletter) > 0))
return OriginalHook(Bloodletter);
}

#endregion
Expand Down Expand Up @@ -847,9 +849,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return canIronJaws ? IronJaws : VenomousBite;
if (blue is not null && blueRemaining < 4)
return canIronJaws ? IronJaws : Windbite;
if (blue is null)
if (blue is null && LevelChecked(Windbite))
return OriginalHook(Windbite);
if (purple is null)
if (purple is null && LevelChecked(VenomousBite))
return OriginalHook(VenomousBite);

}
Expand Down Expand Up @@ -1084,6 +1086,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(RainOfDeath);
}

if (!LevelChecked(RainOfDeath) && !(WasLastAction(Bloodletter) && GetRemainingCharges(Bloodletter) > 0))
return OriginalHook(Bloodletter);

// Self care section for healing and debuff removal

if (PlayerHealthPercentageHp() <= 40 && ActionReady(All.SecondWind))
Expand Down Expand Up @@ -1347,19 +1352,19 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return IronJaws;
}

// Irong jaws Dot refresh, or low level manaul dot refresh
// Iron jaws Dot refresh, or low level manaul dot refresh
if (purple is not null && purpleRemaining < 4)
return canIronJaws ? IronJaws : VenomousBite;
if (blue is not null && blueRemaining < 4)
return canIronJaws ? IronJaws : Windbite;

// Dot application
if (blue is null)
if (blue is null && LevelChecked(Windbite))
return OriginalHook(Windbite);
if (purple is null)
if (purple is null && LevelChecked(VenomousBite))
return OriginalHook(VenomousBite);


}
#endregion

Expand Down