Merge pull request #3603 from Tharre/dp_changes

warlock: make DP use ICD every crit, not just on refresh
wowsims · Sep 3, 2023 · 86dff21 · 86dff21
2 parents bd2a1f5 + b6e1dea
commit 86dff21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results
@@ -46,8 +46,8 @@ character_stats_results: {
 dps_results: {
  key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493"
  value: {
-  dps: 10009.25236
-  tps: 8371.36967
+  dps: 10009.24515
+  tps: 8371.36339
  }
 }
 dps_results: {
@@ -333,22 +333,22 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-LongMultiTarget"
  value: {
-  dps: 21149.97579
-  tps: 26407.76385
+  dps: 21149.91649
+  tps: 26407.75939
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5845.99127
-  tps: 5288.81666
+  dps: 5844.32582
+  tps: 5287.35785
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6180.0365
-  tps: 5505.27947
+  dps: 6173.79485
+  tps: 5499.90151
  }
 }
 dps_results: {

diff --git a/sim/warlock/talents.go b/sim/warlock/talents.go
@@ -574,6 +574,8 @@ func (warlock *Warlock) setupDemonicPact() {
 				return
 			}
 
+			icd.Use(sim)
+
 			lastBonus := 0.0
 			newSPBonus := 0.0
 			if warlock.DemonicPactAura.IsActive() {
@@ -593,14 +595,8 @@ func (warlock *Warlock) setupDemonicPact() {
 				}
 			}
 
-			shouldRefresh := !warlock.DemonicPactAura.IsActive() ||
-				warlock.DemonicPactAura.RemainingDuration(sim) < time.Second*10 ||
-				newSPBonus >= lastBonus
-
-			if shouldRefresh {
+			if warlock.DemonicPactAura.RemainingDuration(sim) < 10*time.Second || newSPBonus >= lastBonus {
 				warlock.updateDPASP(sim)
-
-				icd.Use(sim)
 				for _, dpAura := range demonicPactAuras {
 					if dpAura != nil {
 						dpAura.ExclusiveEffects[0].SetPriority(sim, newSPBonus)