Skip to content

Commit

Permalink
Merge pull request #3940 from grzpra/feature/sw-fix
Browse files Browse the repository at this point in the history
Fix Shield Wall damage reduction (&update tests)
  • Loading branch information
psiven authored Oct 25, 2023
2 parents 1d77eb5 + 7955546 commit d944ccf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions sim/warrior/protection/TestProtectionWarrior.results
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ character_stats_results: {
stat_weights_results: {
key: "TestProtectionWarrior-StatWeights-Default"
value: {
weights: 1.01803
weights: 0.84402
weights: 0
weights: 0
weights: 0
Expand All @@ -57,7 +57,7 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.19691
weights: 0.26128
weights: 0
weights: 0
weights: 0
Expand All @@ -66,12 +66,12 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.02012
weights: 0.01763
weights: 0
weights: 0
weights: 0
weights: 0.42911
weights: 0.07235
weights: 0.4296
weights: 0.02365
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -921,9 +921,9 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Average-Default"
value: {
dps: 2772.35319
tps: 6734.95331
dtps: 127.69906
dps: 2771.43209
tps: 6732.50018
dtps: 127.46896
}
}
dps_results: {
Expand Down
2 changes: 1 addition & 1 deletion sim/warrior/shield_wall.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func (warrior *Warrior) RegisterShieldWallCD() {
duration := time.Second*12 + core.TernaryDuration(warrior.HasSetBonus(ItemSetDreadnaughtPlate, 4), time.Second*3, 0)
hasGlyph := warrior.HasMajorGlyph(proto.WarriorMajorGlyph_GlyphOfShieldWall)
//This is the inverse of the tooltip since it is a damage TAKEN coefficient
damageTaken := core.TernaryFloat64(hasGlyph, 0.4, 0.6)
damageTaken := core.TernaryFloat64(hasGlyph, 0.6, 0.4)

actionID := core.ActionID{SpellID: 871}
swAura := warrior.RegisterAura(core.Aura{
Expand Down

0 comments on commit d944ccf

Please sign in to comment.