Merge pull request #2223 from Horatio27/fix_ui_stats

Fixed Stats that used addStatsDynamic during measuring stats.
wowsims · Dec 23, 2022 · f888d08 · f888d08
2 parents 036dd5c + 5ba382b
commit f888d08
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 25 deletions.
diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -201,9 +201,7 @@ func (unit *Unit) AddDynamicDamageTakenModifier(ddtm DynamicDamageTakenModifier)
 
 func (unit *Unit) AddStatsDynamic(sim *Simulation, bonus stats.Stats) {
 	if unit.Env == nil || !unit.Env.IsFinalized() {
-		if unit.Env.MeasuringStats {
-			unit.AddStats(bonus)
-		} else {
+		if !unit.Env.MeasuringStats {
 			panic("Not finalized, use AddStats instead!")
 		}
 	}

diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1717.65
   final_stats: 174.9
   final_stats: 228.8
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 307
   final_stats: 1220.1

diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1720.95
   final_stats: 174.9
   final_stats: 228.8
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 327.696
   final_stats: 1023.28

diff --git a/sim/deathknight/tank/TestBloodTank.results b/sim/deathknight/tank/TestBloodTank.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 2938.26555
   final_stats: 157.3
   final_stats: 211.2
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 137
   final_stats: 459.1

diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1309.935
   final_stats: 1294.6758
   final_stats: 623.832
-  final_stats: 2965.5107
+  final_stats: 2685.5107
   final_stats: 128
   final_stats: 367.928
   final_stats: 1269.84489

diff --git a/sim/hunter/TestHunter.results b/sim/hunter/TestHunter.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1453.65
   final_stats: 613.184
   final_stats: 276.1
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 232
   final_stats: 1188.45766

diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1333.75
   final_stats: 1388.97
   final_stats: 824.01
-  final_stats: 3011.3455
+  final_stats: 2731.3455
   final_stats: 109
   final_stats: 295.696
   final_stats: 1443.21502

diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1333.75
   final_stats: 1207.8
   final_stats: 779.064
-  final_stats: 2803
+  final_stats: 2523
   final_stats: 109
   final_stats: 217
   final_stats: 1377.57883

diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1333.75
   final_stats: 1207.8
   final_stats: 779.064
-  final_stats: 2803
+  final_stats: 2523
   final_stats: 109
   final_stats: 295.696
   final_stats: 967.17643

diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 3023.71784
   final_stats: 255.2
   final_stats: 279.4
-  final_stats: 1567.193
+  final_stats: 1287.193
   final_stats: 109
   final_stats: 146
   final_stats: 774.38718

diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1524.05
   final_stats: 280.72
   final_stats: 301.4
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 267
   final_stats: 1574.23692

diff --git a/sim/priest/healing/TestDisc.results b/sim/priest/healing/TestDisc.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1307.02
   final_stats: 1348.49
   final_stats: 753.236
-  final_stats: 3206
+  final_stats: 2926
   final_stats: 325
   final_stats: 0
   final_stats: 1030.93345

diff --git a/sim/priest/healing/TestHoly.results b/sim/priest/healing/TestHoly.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1307.02
   final_stats: 1172.6
   final_stats: 746.13
-  final_stats: 3392.5325
+  final_stats: 3112.5325
   final_stats: 325
   final_stats: 0
   final_stats: 982.48279

diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1371.084
   final_stats: 1151.7
   final_stats: 745.8
-  final_stats: 2916.16
+  final_stats: 2636.16
   final_stats: 128
   final_stats: 285
   final_stats: 875.72568

diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1444.3
   final_stats: 1350.9441
   final_stats: 723.5613
-  final_stats: 3217.89033
+  final_stats: 2937.89033
   final_stats: 128
   final_stats: 346
   final_stats: 1035.33945

diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1445.95
   final_stats: 187
   final_stats: 244.728
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 437.16
   final_stats: 877.777

diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1445.95
   final_stats: 187
   final_stats: 244.728
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 437.16
   final_stats: 877.777

diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1395.35
   final_stats: 1141.8
   final_stats: 335.5
-  final_stats: 2773
+  final_stats: 2493
   final_stats: 373.016
   final_stats: 294
   final_stats: 1072.07222

diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1356.85
   final_stats: 831.6
   final_stats: 320.1
-  final_stats: 3213.15556
+  final_stats: 2933.15556
   final_stats: 109
   final_stats: 374
   final_stats: 1448.17453

diff --git a/sim/warlock/TestWarlock.results b/sim/warlock/TestWarlock.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1472.35
   final_stats: 1155
   final_stats: 767.8
-  final_stats: 3112.34
+  final_stats: 2832.34
   final_stats: 109
   final_stats: 368.696
   final_stats: 865.61556

diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1889.25
   final_stats: 176
   final_stats: 229.9
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 141
   final_stats: 1145.55

diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 1889.25
   final_stats: 176
   final_stats: 229.9
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 141
   final_stats: 1145.55

diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results
@@ -6,7 +6,7 @@ character_stats_results: {
   final_stats: 2818.3375
   final_stats: 185.9
   final_stats: 239.8
-  final_stats: 560
+  final_stats: 280
   final_stats: 109
   final_stats: 226
   final_stats: 254.55