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.

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

Hunter - T3 Melee strike reset updates #1211

Merged
merged 5 commits into from
Jan 12, 2025

Conversation

ncberman
Copy link
Contributor

Hunter T3 set strikes only reset themselves
Raptor Strike resets the parent spell and not the hit spell
Added a Queued Spell Reset function for spells to match real-world performance where a 2nd spell can't be queued up during a wild-strikes or HoJ extra-attack window

@ncberman ncberman changed the title fixed strikes resetting all strikes naxx set: Hunter - T3 Melee strike reset updates Jan 12, 2025
Comment on lines 66 to 71
if (spell.Flags.Matches(SpellFlagStrike) || spell.SpellCode == SpellCode_HunterMongooseBite || spell.SpellCode == SpellCode_HunterRaptorStrikeHit) && result.DidCrit() {
if spell.SpellCode == SpellCode_HunterRaptorStrikeHit {
hunter.RaptorStrike.CD.QueueReset(sim.CurrentTime)
} else {
spell.CD.Reset()
}
Copy link
Collaborator

@kayla-glick kayla-glick Jan 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be slightly cleaner:

Suggested change
if (spell.Flags.Matches(SpellFlagStrike) || spell.SpellCode == SpellCode_HunterMongooseBite || spell.SpellCode == SpellCode_HunterRaptorStrikeHit) && result.DidCrit() {
if spell.SpellCode == SpellCode_HunterRaptorStrikeHit {
hunter.RaptorStrike.CD.QueueReset(sim.CurrentTime)
} else {
spell.CD.Reset()
}
if (spell.Flags.Matches(SpellFlagStrike) || spell.SpellCode == SpellCode_HunterMongooseBite) && result.DidCrit() {
spell.CD.Reset()
} else if spell.SpellCode == SpellCode_HunterRaptorStrikeHit && result.DidCrit() {
hunter.RaptorStrike.CD.QueueReset(sim.CurrentTime)
}

sim/core/cooldown.go Show resolved Hide resolved
@kayla-glick kayla-glick merged commit 39cf4a8 into wowsims:master Jan 12, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants