Phase 7 Shoulder "Runes" #1197
Merged
Phase 7 Shoulder "Runes" #1197
Conversation
This file contains 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
Collaborator
kayla-glick
commented
Dec 23, 2024
•
kayla-glick
commented
kayla-glick
commented
Dec 23, 2024
proto/shaman.proto
Outdated
Comment on lines
67
to
73
| RuneShouldersChieftain = 1220266; | ||
| RuneShouldersRagingFlame = 1220279; | ||
| RuneShouldersRefined = 1220034; | ||
| RuneShouldersShieldMaster = 1220234; | ||
| RuneShouldersTotemicProtector = 1220236; | ||
| RuneShouldersVolcano = 1220278; | ||
| RuneShouldersWindwalker = 1220232; |
There was a problem hiding this comment.
Storing the rune spell IDs as proto values for consistency. I left out the SoulOfThe because that's just text bloat
kayla-glick
commented
Dec 23, 2024
sim/shaman/item_sets_phase_4.go
Outdated
| @@ -0,0 +1,307 @@ | |||
| package shaman | |||
There was a problem hiding this comment.
With these changes we're going to be breaking out a lot of functions so I think it would be good to separate PvE sets by phase at least starting with Phase 4
kayla-glick
commented
Dec 23, 2024
sim/shaman/item_sets_phase_4.go
Outdated
Comment on lines
80
to
95
| // Your Lightning Bolt critical strikes have a 35% chance to reset the cooldown on Lava Burst and Chain Lightning and make the next Lava Burst, Chain Heal, or Chain Lightning within 10 sec instant. | ||
| func (shaman *Shaman) applyT1Elemental4PBonus() { | ||
| label := "S03 - Item - T1 - Shaman - Elemental 4P Bonus" | ||
| if shaman.HasAura(label) { | ||
| return | ||
| } | ||
|
|
||
| core.MakePermanent(shaman.RegisterAura(core.Aura{ | ||
| Label: label, | ||
| OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { | ||
| if spell.SpellCode == SpellCode_ShamanLightningBolt && spell.ProcMask.Matches(core.ProcMaskSpellDamage) && result.DidCrit() && sim.Proc(.35, "Power Surge") { | ||
| shaman.PowerSurgeDamageAura.Activate(sim) | ||
| } | ||
| }, | ||
| })) | ||
| } |
There was a problem hiding this comment.
Bonus defined as follows:
- Comment with the spell tooltip description
- Class method
apply[Tier#][SpecName][#Pieces]Bonus() - Define the label then return if the character already has the aura registered. This is more important for more complex bonuses where
GetOrRegisterAuramay not necessarily prevent other side effects and is a more reliable pattern we can follow
kayla-glick
commented
Dec 23, 2024
sim/shaman/runes.go
Outdated
Comment on lines
54
to
75
| func (shaman *Shaman) applyShoulderRuneEffect() { | ||
| if shaman.Equipment.Shoulders().Rune == int32(proto.ShamanRune_RuneNone) { | ||
| return | ||
| } | ||
|
|
||
| switch shaman.Equipment.Shoulders().Rune { | ||
| case int32(proto.ShamanRune_RuneShouldersVolcano): | ||
| shaman.applyT1Elemental4PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersRagingFlame): | ||
| shaman.applyT1Elemental4PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersRefined): | ||
| shaman.applyT1Enhancement4PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersChieftain): | ||
| shaman.applyT1Enhancement6PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersWindwalker): | ||
| shaman.applyT1Tank2PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersShieldMaster): | ||
| shaman.applyT1Tank4PBonus() | ||
| case int32(proto.ShamanRune_RuneShouldersTotemicProtector): | ||
| shaman.applyT1Tank6PBonus() | ||
| } | ||
| } |
There was a problem hiding this comment.
Should runes get a method inside of runes.go with a switch statement. I ordered these by Tier #, then Spec, then # of pieces
kayla-glick
commented
Dec 23, 2024
| @@ -18,6 +18,7 @@ type OnInit func(aura *Aura, sim *Simulation) | |||
| type OnReset func(aura *Aura, sim *Simulation) | |||
| type OnDoneIteration func(aura *Aura, sim *Simulation) | |||
| type OnGain func(aura *Aura, sim *Simulation) | |||
| type OnRefresh func(aura *Aura, sim *Simulation) | |||
There was a problem hiding this comment.
New callback used to handle some effects that we can't quite handle through a buff aura, e.g. Shield Mastery restoring mana on apply/refresh
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.