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

Fix Shield Wall damage reduction (&update tests) #3940

Merged
merged 2 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading