Skip to content

[Prot] Holy Shield fixes #1439

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

Merged
hillerstorm merged 1 commit into from
Apr 4, 2025
Merged

[Prot] Holy Shield fixes #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions sim/paladin/holy_shield.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func (paladin *Paladin) registerHolyShield() {
SpellSchool: core.SpellSchoolHoly,
DefenseType: core.DefenseTypeMagic,
ProcMask: core.ProcMaskSpellDamage,
Flags: core.SpellFlagBinary, // By default HS is binary, unless T1 6pc (Radiant Defender) is equipped

RequiredLevel: int(level),
Rank: rank,
Expand All @@ -56,8 +57,8 @@ func (paladin *Paladin) registerHolyShield() {
BonusCoefficient: 0.05,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
// Spell damage from Holy Shield can crit, but does not miss.
spell.CalcAndDealDamage(sim, target, paladin.getHolyShieldDamage(sim, damage), spell.OutcomeMagicCrit)
outcome := core.Ternary(paladin.holyShieldCanCrit, spell.OutcomeMagicHitAndCrit, spell.OutcomeMagicHit)
spell.CalcAndDealDamage(sim, target, paladin.getHolyShieldDamage(sim, damage), outcome)
},
})

Expand Down
5 changes: 5 additions & 0 deletions sim/paladin/item_sets_pve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,11 @@ func (paladin *Paladin) applyPaladinT1Prot6P() {
// Holy Shield aura no longer has stacks and does not set stacks on gain or remove stacks on block.
// Setting MaxStacks to 0 disables this behavior in holy_shield.go
paladin.holyShieldAura[i].MaxStacks = 0

// With this bonus, the proc can partial resist and crit
paladin.holyShieldProc[i].ActionID.SpellID = 456544
paladin.holyShieldProc[i].Flags ^= core.SpellFlagBinary
paladin.holyShieldCanCrit = true
}
},
}))
Expand Down
1 change: 1 addition & 0 deletions sim/paladin/paladin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ type Paladin struct {
onHolyPowerSpent func(sim *core.Simulation, holyPower int32)
holyShieldExtraDamage func(sim *core.Simulation, paladin *Paladin) float64
bypassAvengingWrathForbearance bool
holyShieldCanCrit bool

enableMultiJudge bool
lingerDuration time.Duration
Expand Down
42 changes: 21 additions & 21 deletions sim/paladin/protection/TestProtection.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,25 @@ stat_weights_results: {
key: "TestProtection-Phase4-Lvl60-StatWeights-Default"
value: {
weights: 0.94763
weights: 0.7863
weights: 0.71525
weights: 0
weights: 0.23688
weights: -0.1323
weights: 0
weights: 0.18971
weights: 0.18883
weights: 0
weights: 0
weights: 0
weights: 0.10504
weights: 0.10453
weights: 0
weights: 0
weights: 0
weights: 4.27199
weights: 2.23259
weights: 3.58275
weights: 1.49198
weights: 0
weights: 0
weights: 0.41331
weights: 0.41361
weights: 0
weights: 14.38904
weights: 14.95314
weights: 0
weights: 0
weights: 0
Expand All @@ -78,11 +78,11 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 1.75188
weights: -0.23798
weights: 1.11579
weights: -4.73602
weights: -2.76022
weights: 1.91042
weights: 0.04632
weights: 1.09649
weights: -2.30515
weights: -0.50859
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -139,10 +139,10 @@ dps_results: {
dps_results: {
key: "TestProtection-Phase4-Lvl60-Average-Default"
value: {
dps: 1882.6172
tps: 4577.88087
dtps: 431.23099
hps: 105.56614
dps: 1876.20909
tps: 4555.65527
dtps: 431.25301
hps: 105.61709
}
}
dps_results: {
Expand Down Expand Up @@ -238,9 +238,9 @@ dps_results: {
dps_results: {
key: "TestProtection-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 1623.04164
tps: 3940.51183
dtps: 534.06876
hps: 95.83329
dps: 1612.7989
tps: 3918.62187
dtps: 533.66711
hps: 95.54016
}
}
Loading