hammer of wrath shouldn't proc AoW (#3751)

wowsims · Sep 25, 2023 · 944dab0 · 944dab0
1 parent 8371896
commit 944dab0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
@@ -144,8 +144,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5351.42133
-  tps: 5434.73119
+  dps: 5352.74783
+  tps: 5436.05037
   dtps: 9.23882
  }
 }
@@ -594,8 +594,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-AllItems-LightbringerBattlegear"
  value: {
-  dps: 4828.09689
-  tps: 4909.20739
+  dps: 4826.60507
+  tps: 4907.79979
   dtps: 9.23882
  }
 }
@@ -714,8 +714,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-AllItems-RedemptionBattlegear"
  value: {
-  dps: 5848.79509
-  tps: 5938.10692
+  dps: 5848.02627
+  tps: 5937.34542
   dtps: 9.23882
  }
 }
@@ -1050,8 +1050,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Average-Default"
  value: {
-  dps: 6668.84767
-  tps: 6753.44996
+  dps: 6668.82111
+  tps: 6753.42361
   dtps: 13.59845
  }
 }
@@ -1262,8 +1262,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-Default-NoBuffs-LongMultiTarget"
  value: {
-  dps: 9508.90842
-  tps: 11073.81636
+  dps: 9509.93182
+  tps: 11074.83976
  }
 }
 dps_results: {
@@ -1442,8 +1442,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-Default-NoBuffs-LongMultiTarget"
  value: {
-  dps: 9469.50452
-  tps: 11026.86986
+  dps: 9468.88996
+  tps: 11026.10884
  }
 }
 dps_results: {

diff --git a/sim/paladin/talents.go b/sim/paladin/talents.go
@@ -238,7 +238,6 @@ func (paladin *Paladin) applyArdentDefender() {
 	// 540 defense (+140) yields the full heal amount
 	ardentHealAmount := core.MaxFloat(1.0, float64(paladin.GetStat(stats.Defense))/core.DefenseRatingPerDefense/140.0) * 0.10 * float64(paladin.Talents.ArdentDefender)
 
-
 	// TBD? Buff to mark time spent fully below 35% and attribute absorbs
 	// rangeAura := paladin.RegisterAura(core.Aura{
 	// Label:    "Ardent Defender (Active)",
@@ -295,7 +294,7 @@ func (paladin *Paladin) applyArdentDefender() {
 
 			// Now check death save, based on the reduced damage
 			if (result.Damage >= paladin.CurrentHealth()) && !procAura.IsActive() {
-				if (paladin.CurrentHealth() + ardentHealAmount*paladin.MaxHealth() > paladin.MaxHealth()) {
+				if paladin.CurrentHealth()+ardentHealAmount*paladin.MaxHealth() > paladin.MaxHealth() {
 					// We will overheal and wind up at the wrong HP value... Let's work around this
 					// TODO: Find a cleaner way to do this, using absorbs?
 					procHeal.Cast(sim, &paladin.Unit)
@@ -498,6 +497,10 @@ func (paladin *Paladin) applyArtOfWar() {
 				return
 			}
 
+			if spell == paladin.HammerOfWrath {
+				return
+			}
+
 			if !result.Outcome.Matches(core.OutcomeCrit) {
 				return
 			}

diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 221
   final_stats: 0
   final_stats: 5504.84
-  final_stats: 469.94994
+  final_stats: 469.94995
   final_stats: 2072.9756
   final_stats: 221
   final_stats: 94

diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 221
   final_stats: 0
   final_stats: 5725.0336
-  final_stats: 469.94994
+  final_stats: 469.94995
   final_stats: 2164.78757
   final_stats: 221
   final_stats: 94