Merge pull request #4127 from wowsims/fixes

Disable EnableResumeAfterManaWait for APL, because it subtly affects …
wowsims · Jan 6, 2024 · 92f2756 · 92f2756
2 parents 022b884 + da72c67
commit 92f2756
Show file tree

Hide file tree

Showing 10 changed files with 1,108 additions and 1,105 deletions.
diff --git a/sim/core/mana.go b/sim/core/mana.go
@@ -67,6 +67,9 @@ func (character *Character) EnableResumeAfterManaWait(callback func(sim *Simulat
 	if callback == nil {
 		panic("attempted to setup a mana tick callback that was nil")
 	}
+	if character.IsUsingAPL {
+		return
+	}
 	character.OnManaTick = func(sim *Simulation) {
 		if character.FinishedWaitingForManaAndGCDReady(sim) {
 			callback(sim)

diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
@@ -252,8 +252,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 10738.79708
-  tps: 6577.6561
+  dps: 10727.16841
+  tps: 6570.11619
  }
 }
 dps_results: {

diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
@@ -770,8 +770,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-FullBuffs-LongMultiTarget"
  value: {
-  dps: 38085.36222
-  tps: 32980.78258
+  dps: 38064.82304
+  tps: 32963.64697
  }
 }
 dps_results: {
@@ -791,8 +791,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-NoBuffs-LongMultiTarget"
  value: {
-  dps: 22222.81509
-  tps: 20575.92958
+  dps: 22173.53497
+  tps: 20541.48297
  }
 }
 dps_results: {