Add Badge of the Swarmguard #134
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kayla-glick
reviewed
Jul 7, 2025
sim/common/item_effects.go
Outdated
Comment on lines
3530
to
3551
| trinketAura := character.RegisterAura(core.Aura{ | ||
| Label: auraLabel, | ||
| ActionID: actionID, | ||
| Duration: time.Second * 30, | ||
| OnExpire: func(aura *core.Aura, sim *core.Simulation) { | ||
| procAura.Deactivate(sim) | ||
| }, | ||
| OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { | ||
| if !result.Landed() { | ||
| return | ||
| } | ||
| if !spell.ProcMask.Matches(core.ProcMaskMeleeOrRanged) { | ||
| return | ||
| } | ||
| if !ppmm.ProcWithWeaponSpecials(sim, spell.ProcMask, auraLabel) { | ||
| return | ||
| } | ||
|
|
||
| procAura.Activate(sim) | ||
| procAura.AddStack(sim) | ||
| }, | ||
| }) |
Contributor
There was a problem hiding this comment.
We can simplify this by using the MakeProcTriggerAura helper (I edited this together in browser so I'd double check that I did all of the syntax correctly)
Suggested change
| trinketAura := character.RegisterAura(core.Aura{ | |
| Label: auraLabel, | |
| ActionID: actionID, | |
| Duration: time.Second * 30, | |
| OnExpire: func(aura *core.Aura, sim *core.Simulation) { | |
| procAura.Deactivate(sim) | |
| }, | |
| OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { | |
| if !result.Landed() { | |
| return | |
| } | |
| if !spell.ProcMask.Matches(core.ProcMaskMeleeOrRanged) { | |
| return | |
| } | |
| if !ppmm.ProcWithWeaponSpecials(sim, spell.ProcMask, auraLabel) { | |
| return | |
| } | |
| procAura.Activate(sim) | |
| procAura.AddStack(sim) | |
| }, | |
| }) | |
| trinketAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ | |
| Name: auraLabel, | |
| ActionID: actionID, | |
| Duration: time.Second * 30, | |
| Callback: core.CallbackOnSpellHitDealt, | |
| Outcome: core.OutcomeLanded, | |
| ProcMask: core.ProcMaskMeleeOrRanged, | |
| SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, | |
| PPM: 10.0, | |
| Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) { | |
| procAura.Activate(sim) | |
| procAura.AddStack(sim) | |
| }, | |
| }) |
kayla-glick
reviewed
Jul 7, 2025
sim/common/item_effects.go
Outdated
|
|
||
| spell := character.RegisterSpell(core.SpellConfig{ | ||
| ActionID: actionID, | ||
| Flags: core.SpellFlagNoOnCastComplete, |
Contributor
There was a problem hiding this comment.
Suggested change
| Flags: core.SpellFlagNoOnCastComplete, | |
| Flags: core.SpellFlagNoOnCastComplete | SpellFlagOffensiveEquipment, |
kayla-glick
approved these changes
Jul 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mostly based on the TBC implementation but had to make a few changes.