From 5cb7121334939e87548f0565a397dc4753531400 Mon Sep 17 00:00:00 2001
From: James Tanner <jimmyt857@gmail.com>
Date: Thu, 12 Oct 2023 20:25:57 -0700
Subject: [PATCH 1/3] Fix auto timer update ordering so that it works
 intuitively with TimeToNextAuto APL value

---
 sim/core/apl_values_auto_attacks.go           |   3 +
 sim/core/attack.go                            |  12 +-
 sim/deathknight/dps/TestUnholy.results        |   4 +-
 sim/druid/tank/TestFeralTank.results          |   6 +-
 sim/hunter/TestBM.results                     | 534 ++++++++--------
 sim/hunter/TestMM.results                     | 584 +++++++++---------
 sim/hunter/TestSV.results                     |   8 +-
 sim/rogue/TestAssassination.results           |   4 +-
 sim/rogue/TestSubtlety.results                |  36 +-
 .../enhancement/TestEnhancement.results       | 392 ++++++------
 sim/warrior/dps/TestArms.results              | 532 ++++++++--------
 sim/warrior/dps/TestFury.results              |  16 +-
 .../protection/TestProtectionWarrior.results  |  16 +-
 13 files changed, 1078 insertions(+), 1069 deletions(-)

diff --git a/sim/core/apl_values_auto_attacks.go b/sim/core/apl_values_auto_attacks.go
index 36c59c42fc..4fa0c7d11e 100644
--- a/sim/core/apl_values_auto_attacks.go
+++ b/sim/core/apl_values_auto_attacks.go
@@ -20,6 +20,9 @@ func (value *APLValueAutoTimeToNext) Type() proto.APLValueType {
 	return proto.APLValueType_ValueTypeDuration
 }
 func (value *APLValueAutoTimeToNext) GetDuration(sim *Simulation) time.Duration {
+	if sim.Log != nil {
+		sim.Log("TimeToNextAuto: %s", max(0, value.unit.AutoAttacks.NextAttackAt()-sim.CurrentTime))
+	}
 	return max(0, value.unit.AutoAttacks.NextAttackAt()-sim.CurrentTime)
 }
 func (value *APLValueAutoTimeToNext) String() string {
diff --git a/sim/core/attack.go b/sim/core/attack.go
index c8f8a7b920..b2e0a4e638 100644
--- a/sim/core/attack.go
+++ b/sim/core/attack.go
@@ -508,8 +508,10 @@ func (aa *AutoAttacks) TrySwingMH(sim *Simulation, target *Unit) {
 
 	attackSpell := aa.MaybeReplaceMHSwing(sim, aa.MHAuto)
 
-	attackSpell.Cast(sim, target)
+	// Update swing timer BEFORE the cast, so that APL checks for TimeToNextAuto behave correctly
+	// if the attack causes APL evaluations (e.g. from rage gain).
 	aa.MainhandSwingAt = sim.CurrentTime + aa.curMHSwingDuration
+	attackSpell.Cast(sim, target)
 
 	if !sim.Options.Interactive {
 		if aa.unit.IsUsingAPL {
@@ -537,8 +539,10 @@ func (aa *AutoAttacks) TrySwingOH(sim *Simulation, target *Unit) {
 		return
 	}
 
-	aa.OHAuto.Cast(sim, target)
+	// Update swing timer BEFORE the cast, so that APL checks for TimeToNextAuto behave correctly
+	// if the attack causes APL evaluations (e.g. from rage gain).
 	aa.OffhandSwingAt = sim.CurrentTime + aa.curOHSwingDuration
+	aa.OHAuto.Cast(sim, target)
 
 	if !sim.Options.Interactive {
 		if aa.unit.IsUsingAPL {
@@ -555,8 +559,10 @@ func (aa *AutoAttacks) TrySwingRanged(sim *Simulation, target *Unit) {
 		return
 	}
 
-	aa.RangedAuto.Cast(sim, target)
+	// Update swing timer BEFORE the cast, so that APL checks for TimeToNextAuto behave correctly
+	// if the attack causes APL evaluations.
 	aa.RangedSwingAt = sim.CurrentTime + aa.RangedSwingSpeed()
+	aa.RangedAuto.Cast(sim, target)
 
 	if !sim.Options.Interactive {
 		if aa.unit.IsUsingAPL {
diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results
index 97eb8087eb..6507baca80 100644
--- a/sim/deathknight/dps/TestUnholy.results
+++ b/sim/deathknight/dps/TestUnholy.results
@@ -918,8 +918,8 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 10596.60128
-  tps: 6872.43752
+  dps: 10596.77085
+  tps: 6872.60709
   hps: 304.79181
  }
 }
diff --git a/sim/druid/tank/TestFeralTank.results b/sim/druid/tank/TestFeralTank.results
index 17294de347..fd901f5880 100644
--- a/sim/druid/tank/TestFeralTank.results
+++ b/sim/druid/tank/TestFeralTank.results
@@ -1074,9 +1074,9 @@ dps_results: {
 dps_results: {
  key: "TestFeralTank-Average-Default"
  value: {
-  dps: 2664.56255
-  tps: 5648.23342
-  dtps: 59.71589
+  dps: 2664.65503
+  tps: 5648.53713
+  dtps: 59.70577
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index 99974f6cef..2d77f3ff6a 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -46,935 +46,935 @@ character_stats_results: {
 dps_results: {
  key: "TestBM-AllItems-Ahn'KaharBloodHunter'sBattlegear"
  value: {
-  dps: 7199.67998
-  tps: 5152.31655
+  dps: 7185.01083
+  tps: 5147.57896
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-AshtongueTalismanofSwiftness-32487"
  value: {
-  dps: 6347.99551
-  tps: 4278.55582
+  dps: 6344.94423
+  tps: 4262.83997
  }
 }
 dps_results: {
  key: "TestBM-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6443.6543
-  tps: 4365.29112
+  dps: 6438.86987
+  tps: 4348.09246
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6283.63535
-  tps: 4230.15429
+  dps: 6280.57186
+  tps: 4214.55697
   hps: 92.16151
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6283.63535
-  tps: 4230.15429
+  dps: 6280.57186
+  tps: 4214.55697
   hps: 92.16151
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6406.82078
-  tps: 4313.36927
+  dps: 6391.69916
+  tps: 4291.85991
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 6287.02002
-  tps: 4238.17751
+  dps: 6279.853
+  tps: 4230.75048
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BlackBowoftheBetrayer-32336"
  value: {
-  dps: 5972.41775
-  tps: 3900.93768
+  dps: 5958.76135
+  tps: 3891.83797
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BlackBruise-50035"
  value: {
-  dps: 6145.82638
-  tps: 4110.85048
+  dps: 6130.74888
+  tps: 4101.88241
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BlackBruise-50692"
  value: {
-  dps: 6135.1471
-  tps: 4102.91991
+  dps: 6120.10921
+  tps: 4093.9824
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5343.42925
-  tps: 3601.7327
+  dps: 5339.35651
+  tps: 3591.32894
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5157.735
-  tps: 3456.27495
+  dps: 5158.67765
+  tps: 3468.9396
  }
 }
 dps_results: {
  key: "TestBM-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4206.00163
+  dps: 6363.97775
+  tps: 4182.81919
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6476.15496
-  tps: 4381.42337
+  dps: 6456.28595
+  tps: 4358.30894
  }
 }
 dps_results: {
  key: "TestBM-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
   hps: 64
  }
 }
 dps_results: {
  key: "TestBM-AllItems-CryptstalkerBattlegear"
  value: {
-  dps: 5943.1584
-  tps: 3982.43545
+  dps: 5907.97763
+  tps: 3953.51008
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6365.9497
-  tps: 4296.47693
+  dps: 6343.19382
+  tps: 4280.1374
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6415.73792
-  tps: 4347.76374
+  dps: 6402.25965
+  tps: 4340.53214
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6472.43437
-  tps: 4388.64181
+  dps: 6452.61758
+  tps: 4354.27115
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Death'sChoice-47464"
  value: {
-  dps: 6609.90711
-  tps: 4483.27706
+  dps: 6594.65772
+  tps: 4462.77298
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6342.09588
-  tps: 4276.85283
+  dps: 6343.10641
+  tps: 4282.40355
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 6601.46664
-  tps: 4514.55847
+  dps: 6610.70077
+  tps: 4506.0031
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 6649.85079
-  tps: 4555.69903
+  dps: 6652.5393
+  tps: 4544.61609
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6402.54558
-  tps: 4307.83612
+  dps: 6381.3421
+  tps: 4284.5305
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6368.33277
-  tps: 4310.8938
+  dps: 6350.34074
+  tps: 4308.99139
  }
 }
 dps_results: {
  key: "TestBM-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6342.08687
-  tps: 4289.89582
+  dps: 6351.2009
+  tps: 4288.66491
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6395.84865
-  tps: 4301.13072
+  dps: 6376.2652
+  tps: 4275.82957
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6398.39728
-  tps: 4303.66569
+  dps: 6379.49325
+  tps: 4281.51625
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6397.78381
-  tps: 4302.6237
+  dps: 6378.68559
+  tps: 4280.70859
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6333.62737
-  tps: 4271.00621
+  dps: 6327.11607
+  tps: 4262.33845
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6404.27611
-  tps: 4335.01825
+  dps: 6390.12666
+  tps: 4327.51865
  }
 }
 dps_results: {
  key: "TestBM-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6353.60713
-  tps: 4285.07922
+  dps: 6340.89581
+  tps: 4278.36795
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6332.34739
-  tps: 4272.85634
+  dps: 6324.19094
+  tps: 4249.63722
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6342.37064
-  tps: 4274.93888
+  dps: 6326.84138
+  tps: 4262.33071
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6443.42224
-  tps: 4349.5113
+  dps: 6439.91884
+  tps: 4333.21152
  }
 }
 dps_results: {
  key: "TestBM-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Gladiator'sPursuit"
  value: {
-  dps: 6237.99138
-  tps: 4311.59863
+  dps: 6231.63162
+  tps: 4299.7928
  }
 }
 dps_results: {
  key: "TestBM-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6387.4448
-  tps: 4319.53839
+  dps: 6376.54351
+  tps: 4314.93034
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Gronnstalker'sArmor"
  value: {
-  dps: 5016.49042
-  tps: 3342.65122
+  dps: 5010.01957
+  tps: 3329.43898
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Heartpierce-49982"
  value: {
-  dps: 6533.31289
-  tps: 4422.94363
+  dps: 6511.411
+  tps: 4398.88865
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Heartpierce-50641"
  value: {
-  dps: 6534.3577
-  tps: 4423.72451
+  dps: 6512.45082
+  tps: 4399.66419
  }
 }
 dps_results: {
  key: "TestBM-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6283.97778
-  tps: 4230.66716
+  dps: 6280.80891
+  tps: 4214.93559
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6398.39728
-  tps: 4303.66569
+  dps: 6379.49325
+  tps: 4281.51625
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6397.78381
-  tps: 4302.6237
+  dps: 6378.68559
+  tps: 4280.70859
  }
 }
 dps_results: {
  key: "TestBM-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6429.57746
-  tps: 4356.88377
+  dps: 6424.63507
+  tps: 4339.26456
  }
 }
 dps_results: {
  key: "TestBM-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6456.10696
-  tps: 4360.81007
+  dps: 6428.94946
+  tps: 4325.72242
  }
 }
 dps_results: {
  key: "TestBM-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6400.98833
-  tps: 4305.7569
-  hps: 11.12548
+  dps: 6387.95371
+  tps: 4286.20256
+  hps: 11.19844
  }
 }
 dps_results: {
  key: "TestBM-AllItems-LastWord-50179"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-AllItems-LastWord-50708"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6392.38848
-  tps: 4328.31812
+  dps: 6375.75748
+  tps: 4303.55675
  }
 }
 dps_results: {
  key: "TestBM-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6395.63113
-  tps: 4324.72954
+  dps: 6405.21313
+  tps: 4324.15104
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Nibelung-49992"
  value: {
-  dps: 6600.19353
-  tps: 4482.77203
+  dps: 6580.64603
+  tps: 4457.82692
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Nibelung-50648"
  value: {
-  dps: 6611.38159
-  tps: 4492.96858
+  dps: 6585.05064
+  tps: 4460.98459
  }
 }
 dps_results: {
  key: "TestBM-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6402.15744
-  tps: 4303.48919
+  dps: 6381.40211
+  tps: 4279.74314
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6406.27626
-  tps: 4306.55244
+  dps: 6385.50195
+  tps: 4282.7858
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6292.91669
-  tps: 4239.60399
+  dps: 6289.17293
+  tps: 4223.18785
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6294.05637
-  tps: 4240.74368
+  dps: 6290.29025
+  tps: 4224.30517
  }
 }
 dps_results: {
  key: "TestBM-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6393.65407
-  tps: 4300.13849
+  dps: 6378.27016
+  tps: 4277.7978
  }
 }
 dps_results: {
  key: "TestBM-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ScourgestalkerBattlegear"
  value: {
-  dps: 6357.15787
-  tps: 4319.03829
+  dps: 6319.08004
+  tps: 4298.07513
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Shadowmourne-49623"
  value: {
-  dps: 6669.72714
-  tps: 4567.89806
+  dps: 6655.25104
+  tps: 4551.05498
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6319.64302
-  tps: 4269.28035
+  dps: 6313.88547
+  tps: 4248.96918
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6326.20808
-  tps: 4275.81725
+  dps: 6322.73213
+  tps: 4257.78733
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6360.4513
-  tps: 4292.94649
+  dps: 6350.26035
+  tps: 4288.25795
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SparkofLife-37657"
  value: {
-  dps: 6358.25291
-  tps: 4285.35901
+  dps: 6346.12896
+  tps: 4258.27572
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6438.96332
-  tps: 4315.78742
+  dps: 6418.80194
+  tps: 4298.98534
  }
 }
 dps_results: {
  key: "TestBM-AllItems-StormshroudArmor"
  value: {
-  dps: 5065.54503
-  tps: 3368.27672
+  dps: 5050.34605
+  tps: 3342.00715
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6406.27626
-  tps: 4306.55244
+  dps: 6385.50195
+  tps: 4282.7858
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6402.15744
-  tps: 4303.48919
+  dps: 6381.40211
+  tps: 4279.74314
  }
 }
 dps_results: {
  key: "TestBM-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6394.94951
-  tps: 4298.1285
+  dps: 6374.22737
+  tps: 4274.41848
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6366.14443
-  tps: 4299.78203
+  dps: 6365.39433
+  tps: 4283.16626
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TheFistsofFury"
  value: {
-  dps: 6183.76544
-  tps: 4144.16577
+  dps: 6161.87479
+  tps: 4128.70714
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 6328.95494
-  tps: 4265.8116
+  dps: 6312.6576
+  tps: 4254.59259
  }
 }
 dps_results: {
  key: "TestBM-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6387.19267
-  tps: 4299.56134
+  dps: 6387.33211
+  tps: 4285.98061
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6352.04073
-  tps: 4251.11907
+  dps: 6332.56556
+  tps: 4234.62823
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6352.04073
-  tps: 4251.11907
+  dps: 6332.56556
+  tps: 4234.62823
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6302.70376
-  tps: 4249.27443
+  dps: 6314.27327
+  tps: 4240.97705
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6384.65245
-  tps: 4290.47038
+  dps: 6363.97775
+  tps: 4266.81183
  }
 }
 dps_results: {
  key: "TestBM-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5265.57118
-  tps: 3545.52319
+  dps: 5253.80088
+  tps: 3532.67869
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 6266.27388
-  tps: 4206.09383
+  dps: 6217.24678
+  tps: 4173.91339
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 6457.55985
-  tps: 4438.74804
+  dps: 6434.78941
+  tps: 4401.3569
  }
 }
 dps_results: {
  key: "TestBM-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6283.97752
-  tps: 4230.6669
+  dps: 6280.83455
+  tps: 4214.96122
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Zod'sRepeatingLongbow-50034"
  value: {
-  dps: 6849.85264
-  tps: 4772.7877
+  dps: 6833.0189
+  tps: 4758.05895
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Zod'sRepeatingLongbow-50638"
  value: {
-  dps: 7023.27697
-  tps: 4950.22203
+  dps: 7038.23923
+  tps: 4966.89739
  }
 }
 dps_results: {
  key: "TestBM-Average-Default"
  value: {
-  dps: 6442.64363
-  tps: 4359.29548
+  dps: 6433.20298
+  tps: 4349.4617
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14107.65756
-  tps: 13402.37361
+  dps: 14089.69804
+  tps: 13400.54792
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6387.26667
-  tps: 4392.37202
+  dps: 6360.92184
+  tps: 4367.27242
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7583.34302
-  tps: 5162.29019
+  dps: 7622.26077
+  tps: 5201.03751
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7579.36406
-  tps: 8735.86121
+  dps: 7562.64991
+  tps: 8710.0143
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3047.46054
-  tps: 2410.76172
+  dps: 3048.58679
+  tps: 2407.41844
  }
 }
 dps_results: {
  key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3516.49357
-  tps: 2773.22167
+  dps: 3493.97125
+  tps: 2753.08417
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14285.57888
-  tps: 13468.5624
+  dps: 14281.82423
+  tps: 13473.82205
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6484.72902
-  tps: 4386.63286
+  dps: 6463.05956
+  tps: 4362.82632
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7754.5471
-  tps: 5182.44203
+  dps: 7772.83752
+  tps: 5212.04328
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7633.48217
-  tps: 8750.70023
+  dps: 7634.869
+  tps: 8751.05919
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3089.83864
-  tps: 2414.92503
+  dps: 3078.71573
+  tps: 2403.14887
  }
 }
 dps_results: {
  key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3574.39816
-  tps: 2782.85263
+  dps: 3553.79138
+  tps: 2766.14097
  }
 }
 dps_results: {
  key: "TestBM-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6304.24988
-  tps: 4367.13052
+  dps: 6303.68473
+  tps: 4376.71809
  }
 }
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index f099d8e639..db6d22fd47 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -46,1019 +46,1019 @@ character_stats_results: {
 dps_results: {
  key: "TestMM-AllItems-Ahn'KaharBloodHunter'sBattlegear"
  value: {
-  dps: 8487.5486
-  tps: 7563.95414
+  dps: 8479.78131
+  tps: 7556.37143
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-AshtongueTalismanofSwiftness-32487"
  value: {
-  dps: 7072.07666
-  tps: 6154.96138
+  dps: 7040.24865
+  tps: 6122.12672
  }
 }
 dps_results: {
  key: "TestMM-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7178.32706
-  tps: 6256.88455
+  dps: 7145.3023
+  tps: 6222.77186
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7003.37041
-  tps: 6092.84644
-  hps: 92.44168
+  dps: 6972.12323
+  tps: 6060.67361
+  hps: 92.97876
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7003.37041
-  tps: 6092.84644
-  hps: 92.44168
+  dps: 6972.12323
+  tps: 6060.67361
+  hps: 92.97876
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7147.83919
-  tps: 6224.17747
+  dps: 7129.87178
+  tps: 6204.48328
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7063.66282
-  tps: 6154.96084
+  dps: 7058.9673
+  tps: 6152.38547
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BlackBowoftheBetrayer-32336"
  value: {
-  dps: 6636.09782
-  tps: 5712.41202
+  dps: 6630.11794
+  tps: 5708.26266
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BlackBruise-50035"
  value: {
-  dps: 6889.2735
-  tps: 5986.53463
+  dps: 6896.6057
+  tps: 5996.20953
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BlackBruise-50692"
  value: {
-  dps: 6876.54905
-  tps: 5975.01032
+  dps: 6883.86046
+  tps: 5984.66102
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6108.09219
-  tps: 5318.80885
+  dps: 6087.38907
+  tps: 5303.64985
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5841.91414
-  tps: 5074.04511
+  dps: 5855.24229
+  tps: 5086.71023
  }
 }
 dps_results: {
  key: "TestMM-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6086.49278
+  dps: 7112.09419
+  tps: 6063.76889
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7290.20112
-  tps: 6366.46699
+  dps: 7272.96015
+  tps: 6347.5051
  }
 }
 dps_results: {
  key: "TestMM-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
   hps: 64
  }
 }
 dps_results: {
  key: "TestMM-AllItems-CryptstalkerBattlegear"
  value: {
-  dps: 6721.38124
-  tps: 5833.28617
+  dps: 6700.12906
+  tps: 5808.91044
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7136.79526
-  tps: 6222.93877
+  dps: 7119.77842
+  tps: 6204.93928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7168.90756
-  tps: 6256.69232
+  dps: 7161.95756
+  tps: 6246.71437
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7272.07434
-  tps: 6343.54038
+  dps: 7257.53562
+  tps: 6327.03003
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Death'sChoice-47464"
  value: {
-  dps: 7448.5224
-  tps: 6508.17262
+  dps: 7444.10018
+  tps: 6501.99795
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7086.30804
-  tps: 6177.34693
+  dps: 7070.67983
+  tps: 6159.99087
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7401.58138
-  tps: 6481.48232
+  dps: 7376.04476
+  tps: 6451.45803
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7442.44652
-  tps: 6519.70418
+  dps: 7409.37918
+  tps: 6481.83654
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7150.32068
-  tps: 6226.59081
+  dps: 7134.80173
+  tps: 6209.34667
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7201.22847
-  tps: 6297.86453
+  dps: 7173.17426
+  tps: 6264.42595
  }
 }
 dps_results: {
  key: "TestMM-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7163.4967
-  tps: 6258.46597
+  dps: 7091.36478
+  tps: 6184.92407
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7143.35213
-  tps: 6218.68561
+  dps: 7117.57044
+  tps: 6191.0589
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7149.01241
-  tps: 6225.27828
+  dps: 7132.19319
+  tps: 6206.73813
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7146.71151
-  tps: 6222.98323
+  dps: 7129.15688
+  tps: 6203.70182
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7123.7681
-  tps: 6216.01307
+  dps: 7117.58086
+  tps: 6212.57463
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7196.41036
-  tps: 6282.92178
+  dps: 7181.01283
+  tps: 6265.84595
  }
 }
 dps_results: {
  key: "TestMM-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7127.45301
-  tps: 6213.6161
+  dps: 7102.23263
+  tps: 6186.81794
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7030.12057
-  tps: 6116.41397
+  dps: 7000.8607
+  tps: 6086.63275
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7088.5782
-  tps: 6176.17578
+  dps: 7077.20701
+  tps: 6161.8566
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7193.73733
-  tps: 6264.96695
+  dps: 7161.39178
+  tps: 6231.66257
  }
 }
 dps_results: {
  key: "TestMM-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Gladiator'sPursuit"
  value: {
-  dps: 7262.69999
-  tps: 6387.89257
+  dps: 7233.99135
+  tps: 6351.76668
  }
 }
 dps_results: {
  key: "TestMM-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7136.45799
-  tps: 6224.50722
+  dps: 7131.6641
+  tps: 6216.56318
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Gronnstalker'sArmor"
  value: {
-  dps: 5539.16836
-  tps: 4788.33806
+  dps: 5553.30092
+  tps: 4796.63036
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Heartpierce-49982"
  value: {
-  dps: 7359.60253
-  tps: 6429.48818
+  dps: 7338.66963
+  tps: 6406.49354
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Heartpierce-50641"
  value: {
-  dps: 7360.85094
-  tps: 6430.62208
+  dps: 7339.91436
+  tps: 6407.6234
  }
 }
 dps_results: {
  key: "TestMM-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7003.63768
-  tps: 6092.6282
+  dps: 6972.3294
+  tps: 6060.38004
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7149.01241
-  tps: 6225.27828
+  dps: 7132.19319
+  tps: 6206.73813
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7146.71151
-  tps: 6222.98323
+  dps: 7129.15688
+  tps: 6203.70182
  }
 }
 dps_results: {
  key: "TestMM-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7161.05025
-  tps: 6241.58202
+  dps: 7127.68857
+  tps: 6207.26994
  }
 }
 dps_results: {
  key: "TestMM-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7204.19447
-  tps: 6280.41084
+  dps: 7184.43424
+  tps: 6258.40498
  }
 }
 dps_results: {
  key: "TestMM-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7158.47849
-  tps: 6232.66608
+  dps: 7143.44768
+  tps: 6216.57413
   hps: 11.23202
  }
 }
 dps_results: {
  key: "TestMM-AllItems-LastWord-50179"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-AllItems-LastWord-50708"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7003.64499
-  tps: 6092.63552
+  dps: 6972.3294
+  tps: 6060.38004
  }
 }
 dps_results: {
  key: "TestMM-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7202.45403
-  tps: 6294.269
+  dps: 7168.13937
+  tps: 6262.31112
  }
 }
 dps_results: {
  key: "TestMM-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7175.34305
-  tps: 6265.27894
+  dps: 7148.25387
+  tps: 6234.93203
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Nibelung-49992"
  value: {
-  dps: 7420.84296
-  tps: 6484.9205
+  dps: 7395.78314
+  tps: 6458.25826
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Nibelung-50648"
  value: {
-  dps: 7430.19872
-  tps: 6492.95838
+  dps: 7406.09187
+  tps: 6467.19241
  }
 }
 dps_results: {
  key: "TestMM-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7153.80679
-  tps: 6228.21225
+  dps: 7132.80068
+  tps: 6204.95072
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7158.69516
-  tps: 6232.64249
+  dps: 7137.6728
+  tps: 6209.36314
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7012.00684
-  tps: 6101.17338
+  dps: 6981.48737
+  tps: 6069.69869
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7013.26691
-  tps: 6102.43346
+  dps: 6982.88888
+  tps: 6071.1002
  }
 }
 dps_results: {
  key: "TestMM-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7128.99639
-  tps: 6205.07177
+  dps: 7113.97051
+  tps: 6187.86778
  }
 }
 dps_results: {
  key: "TestMM-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ScourgestalkerBattlegear"
  value: {
-  dps: 7047.98888
-  tps: 6168.22594
+  dps: 7015.87383
+  tps: 6136.17129
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Shadowmourne-49623"
  value: {
-  dps: 7517.01626
-  tps: 6590.5212
+  dps: 7497.64909
+  tps: 6571.7757
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7056.48942
-  tps: 6145.25855
+  dps: 7026.44868
+  tps: 6114.40046
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7058.52636
-  tps: 6147.6879
+  dps: 7028.38841
+  tps: 6116.62672
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7132.22018
-  tps: 6219.31652
+  dps: 7105.76672
+  tps: 6191.59543
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SparkofLife-37657"
  value: {
-  dps: 7121.71505
-  tps: 6205.37295
+  dps: 7121.94478
+  tps: 6207.17699
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7098.00693
-  tps: 6177.15663
+  dps: 7065.88133
+  tps: 6144.07779
  }
 }
 dps_results: {
  key: "TestMM-AllItems-StormshroudArmor"
  value: {
-  dps: 5690.50664
-  tps: 4926.3799
+  dps: 5682.49994
+  tps: 4921.02458
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7158.69516
-  tps: 6232.64249
+  dps: 7137.6728
+  tps: 6209.36314
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7153.80679
-  tps: 6228.21225
+  dps: 7132.80068
+  tps: 6204.95072
  }
 }
 dps_results: {
  key: "TestMM-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7145.25213
-  tps: 6220.45933
+  dps: 7124.27448
+  tps: 6197.22897
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7088.89708
-  tps: 6170.35941
+  dps: 7058.00932
+  tps: 6138.06022
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TheFistsofFury"
  value: {
-  dps: 6924.81694
-  tps: 6022.24294
+  dps: 6931.89209
+  tps: 6029.78467
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 7055.77982
-  tps: 6152.84798
+  dps: 7065.56545
+  tps: 6161.8372
  }
 }
 dps_results: {
  key: "TestMM-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7160.85879
-  tps: 6246.66102
+  dps: 7111.73639
+  tps: 6192.17267
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7003.83238
-  tps: 6092.82291
+  dps: 6972.53347
+  tps: 6060.58411
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7003.83238
-  tps: 6092.82291
+  dps: 6972.53347
+  tps: 6060.58411
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7093.12523
-  tps: 6186.59645
+  dps: 7065.80215
+  tps: 6157.41469
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7133.0312
-  tps: 6209.38372
+  dps: 7112.09419
+  tps: 6186.19791
  }
 }
 dps_results: {
  key: "TestMM-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5990.51629
-  tps: 5211.57551
+  dps: 6023.50933
+  tps: 5239.87171
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 6993.61907
-  tps: 6092.92957
+  dps: 6999.85741
+  tps: 6098.39483
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 7279.07447
-  tps: 6370.19634
+  dps: 7263.99141
+  tps: 6357.35551
  }
 }
 dps_results: {
  key: "TestMM-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7003.63015
-  tps: 6092.62067
+  dps: 6972.32864
+  tps: 6060.37928
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Zod'sRepeatingLongbow-50034"
  value: {
-  dps: 7807.12254
-  tps: 6888.43729
+  dps: 7776.61762
+  tps: 6860.76608
  }
 }
 dps_results: {
  key: "TestMM-AllItems-Zod'sRepeatingLongbow-50638"
  value: {
-  dps: 8065.67984
-  tps: 7151.44843
+  dps: 8015.95498
+  tps: 7101.14235
  }
 }
 dps_results: {
  key: "TestMM-Average-Default"
  value: {
-  dps: 7277.1677
-  tps: 6362.30912
+  dps: 7261.46246
+  tps: 6346.09998
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14243.64224
-  tps: 14604.60565
+  dps: 14193.97777
+  tps: 14557.51261
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7263.83496
-  tps: 6386.62829
+  dps: 7242.89841
+  tps: 6364.5906
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8197.88368
-  tps: 7181.43756
+  dps: 8152.33138
+  tps: 7137.74959
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7301.48195
-  tps: 8774.38579
+  dps: 7291.29371
+  tps: 8778.76381
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3575.87081
-  tps: 3322.00622
+  dps: 3553.33521
+  tps: 3298.49469
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4153.43582
-  tps: 3827.38705
+  dps: 4156.32319
+  tps: 3831.6856
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14056.52029
-  tps: 14361.4925
+  dps: 14053.93382
+  tps: 14360.66888
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7254.38934
-  tps: 6382.9744
+  dps: 7248.94863
+  tps: 6375.76279
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8388.96044
-  tps: 7378.16186
+  dps: 8408.62634
+  tps: 7398.36308
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7151.95668
-  tps: 8581.82868
+  dps: 7200.54516
+  tps: 8630.29486
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3560.77873
-  tps: 3305.68738
+  dps: 3542.1299
+  tps: 3287.6059
  }
 }
 dps_results: {
  key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4402.84907
-  tps: 4064.86805
+  dps: 4403.98227
+  tps: 4067.07331
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14318.83683
-  tps: 14634.31027
+  dps: 14274.17819
+  tps: 14585.40593
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7301.55128
-  tps: 6376.76159
+  dps: 7280.78997
+  tps: 6353.95514
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8271.13314
-  tps: 7193.50896
+  dps: 8226.28444
+  tps: 7149.53136
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7316.93145
-  tps: 8777.17385
+  dps: 7296.11181
+  tps: 8763.17951
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3563.65387
-  tps: 3291.90081
+  dps: 3549.91766
+  tps: 3278.9174
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4230.89834
-  tps: 3879.74645
+  dps: 4230.07755
+  tps: 3880.4478
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14123.93553
-  tps: 14384.98068
+  dps: 14120.50347
+  tps: 14379.2739
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7288.95829
-  tps: 6365.85241
+  dps: 7280.0761
+  tps: 6356.85712
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8484.2126
-  tps: 7412.02788
+  dps: 8493.91293
+  tps: 7422.26831
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7228.29214
-  tps: 8642.87217
+  dps: 7218.03768
+  tps: 8634.29052
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3560.00303
-  tps: 3288.29801
+  dps: 3560.42249
+  tps: 3286.8438
  }
 }
 dps_results: {
  key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4409.56009
-  tps: 4048.93311
+  dps: 4400.14485
+  tps: 4040.03483
  }
 }
 dps_results: {
  key: "TestMM-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7241.66021
-  tps: 6377.36226
+  dps: 7220.66336
+  tps: 6355.71844
  }
 }
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index 62efad309c..317d188eac 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -519,8 +519,8 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7438.75848
-  tps: 6407.91198
+  dps: 7452.23838
+  tps: 6421.76847
  }
 }
 dps_results: {
@@ -785,8 +785,8 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7463.1309
-  tps: 6410.82178
+  dps: 7462.62688
+  tps: 6411.87337
  }
 }
 dps_results: {
diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
index d46ae1fbd1..d9ee887fb0 100644
--- a/sim/rogue/TestAssassination.results
+++ b/sim/rogue/TestAssassination.results
@@ -708,8 +708,8 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6752.94737
-  tps: 4794.59264
+  dps: 6752.96191
+  tps: 4794.60296
  }
 }
 dps_results: {
diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results
index 8e5d8ce276..1eaa89ab32 100644
--- a/sim/rogue/TestSubtlety.results
+++ b/sim/rogue/TestSubtlety.results
@@ -125,8 +125,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-BonescytheBattlegear"
  value: {
-  dps: 6919.96335
-  tps: 4908.36641
+  dps: 6931.47826
+  tps: 4916.542
  }
 }
 dps_results: {
@@ -203,8 +203,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8296.08218
-  tps: 5887.32209
+  dps: 8295.24348
+  tps: 5886.72661
  }
 }
 dps_results: {
@@ -273,8 +273,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7974.95818
-  tps: 5660.21719
+  dps: 7974.95333
+  tps: 5660.21374
  }
 }
 dps_results: {
@@ -357,8 +357,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-Gladiator'sVestments"
  value: {
-  dps: 7293.01793
-  tps: 5175.63133
+  dps: 7288.31034
+  tps: 5172.32843
  }
 }
 dps_results: {
@@ -456,8 +456,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8089.67818
-  tps: 5741.23124
+  dps: 8089.40129
+  tps: 5741.03465
  }
 }
 dps_results: {
@@ -631,8 +631,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-SparkofLife-37657"
  value: {
-  dps: 7963.11381
-  tps: 5651.4162
+  dps: 7963.37873
+  tps: 5651.60429
  }
 }
 dps_results: {
@@ -694,8 +694,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-TheFistsofFury"
  value: {
-  dps: 6971.40475
-  tps: 4944.34363
+  dps: 6972.18242
+  tps: 4944.89577
  }
 }
 dps_results: {
@@ -708,8 +708,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8175.74959
-  tps: 5801.48507
+  dps: 8175.7533
+  tps: 5801.4877
  }
 }
 dps_results: {
@@ -785,8 +785,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-Average-Default"
  value: {
-  dps: 8311.57873
-  tps: 5898.44268
+  dps: 8311.52053
+  tps: 5898.38628
  }
 }
 dps_results: {
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 275b574b77..3ae38d5c30 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -60,8 +60,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7386.64684
-  tps: 4076.06014
+  dps: 7386.65192
+  tps: 4076.06201
  }
 }
 dps_results: {
@@ -90,78 +90,78 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7425.11015
-  tps: 4096.93947
+  dps: 7425.11523
+  tps: 4096.94134
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7159.60611
-  tps: 3933.6339
+  dps: 7159.60569
+  tps: 3933.63365
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Bizuri'sTotemofShatteredIce-50458"
  value: {
-  dps: 7828.65657
-  tps: 4345.45916
+  dps: 7828.66998
+  tps: 4345.46475
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-BlackBruise-50035"
  value: {
-  dps: 7362.20829
-  tps: 4047.82556
+  dps: 7362.06744
+  tps: 4047.75644
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-BlackBruise-50692"
  value: {
-  dps: 7424.30421
-  tps: 4082.73785
+  dps: 7424.15473
+  tps: 4082.66451
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6104.66745
-  tps: 3343.63497
+  dps: 6104.66703
+  tps: 3343.63472
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6017.48347
-  tps: 3301.2355
+  dps: 6017.60472
+  tps: 3301.2943
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7409.5882
-  tps: 3976.37623
+  dps: 7409.59328
+  tps: 3976.37805
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7564.87432
-  tps: 4186.12282
+  dps: 7564.87893
+  tps: 4186.12441
  }
 }
 dps_results: {
@@ -210,8 +210,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-DeadlyGladiator'sTotemofSurvival-42602"
  value: {
-  dps: 7555.69667
-  tps: 4172.2235
+  dps: 7555.71008
+  tps: 4172.22909
  }
 }
 dps_results: {
@@ -252,8 +252,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7412.06926
-  tps: 4092.30964
+  dps: 7412.07435
+  tps: 4092.31151
  }
 }
 dps_results: {
@@ -280,36 +280,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-EarthshatterGarb"
  value: {
-  dps: 6451.70476
-  tps: 3545.34607
+  dps: 6451.7496
+  tps: 3545.36695
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7386.64684
-  tps: 4076.06014
+  dps: 7386.65192
+  tps: 4076.06201
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7427.37817
-  tps: 4096.55442
+  dps: 7427.38331
+  tps: 4096.55631
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7409.34869
-  tps: 4091.11567
+  dps: 7409.35377
+  tps: 4091.11754
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7404.58608
-  tps: 4087.81395
+  dps: 7404.59117
+  tps: 4087.81582
  }
 }
 dps_results: {
@@ -329,8 +329,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7386.64684
-  tps: 4076.06014
+  dps: 7386.65192
+  tps: 4076.06201
  }
 }
 dps_results: {
@@ -371,36 +371,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7409.5882
-  tps: 4089.30414
+  dps: 7409.59328
+  tps: 4089.30601
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7404.99993
-  tps: 4086.65534
+  dps: 7405.00501
+  tps: 4086.65721
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-FrostWitch'sBattlegear"
  value: {
-  dps: 8274.01504
-  tps: 4531.87884
+  dps: 8274.08044
+  tps: 4531.90969
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-FrostWitch'sRegalia"
  value: {
-  dps: 7852.68985
-  tps: 4365.10688
+  dps: 7852.68882
+  tps: 4365.10633
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-FuriousGladiator'sTotemofSurvival-42603"
  value: {
-  dps: 7566.96184
-  tps: 4179.62617
+  dps: 7566.97526
+  tps: 4179.63176
  }
 }
 dps_results: {
@@ -420,15 +420,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-Gladiator'sEarthshaker"
  value: {
-  dps: 7049.16991
-  tps: 3826.99778
+  dps: 7049.23677
+  tps: 3827.0303
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Gladiator'sWartide"
  value: {
-  dps: 6169.2123
-  tps: 3355.34928
+  dps: 6169.26051
+  tps: 3355.37309
  }
 }
 dps_results: {
@@ -455,22 +455,22 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-HatefulGladiator'sTotemofSurvival-42601"
  value: {
-  dps: 7533.19767
-  tps: 4157.16435
+  dps: 7533.21108
+  tps: 4157.16994
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Heartpierce-49982"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Heartpierce-50641"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
@@ -483,15 +483,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7409.34869
-  tps: 4091.11567
+  dps: 7409.35377
+  tps: 4091.11754
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7404.58608
-  tps: 4087.81395
+  dps: 7404.59117
+  tps: 4087.81582
  }
 }
 dps_results: {
@@ -504,30 +504,30 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7436.23308
-  tps: 4096.49307
+  dps: 7436.23824
+  tps: 4096.49498
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7411.39288
-  tps: 4090.27547
+  dps: 7411.3981
+  tps: 4090.2774
   hps: 11.01615
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-LastWord-50179"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-LastWord-50708"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
@@ -554,15 +554,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-Nibelung-49992"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Nibelung-50648"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
@@ -575,15 +575,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7407.31092
-  tps: 4088.28394
+  dps: 7407.31611
+  tps: 4088.28586
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7411.39288
-  tps: 4090.27547
+  dps: 7411.3981
+  tps: 4090.2774
  }
 }
 dps_results: {
@@ -610,15 +610,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7386.64684
-  tps: 4076.06014
+  dps: 7386.65192
+  tps: 4076.06201
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7386.64684
-  tps: 4076.06014
+  dps: 7386.65192
+  tps: 4076.06201
  }
 }
 dps_results: {
@@ -645,22 +645,22 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-RelentlessGladiator'sTotemofSurvival-42604"
  value: {
-  dps: 7580.64098
-  tps: 4188.61514
+  dps: 7580.6544
+  tps: 4188.62073
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7387.09643
-  tps: 4074.49755
+  dps: 7387.10152
+  tps: 4074.49942
  }
 }
 dps_results: {
@@ -673,8 +673,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-SavageGladiator'sTotemofSurvival-42594"
  value: {
-  dps: 7527.74129
-  tps: 4153.62335
+  dps: 7527.75471
+  tps: 4153.62894
  }
 }
 dps_results: {
@@ -687,8 +687,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-Shadowmourne-49623"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
@@ -708,22 +708,22 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-SkycallTotem-33506"
  value: {
-  dps: 7501.81066
-  tps: 4138.62373
+  dps: 7501.82407
+  tps: 4138.62932
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-SkyshatterHarness"
  value: {
-  dps: 5415.78301
-  tps: 2943.95101
+  dps: 5415.78063
+  tps: 2943.95013
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-SkyshatterRegalia"
  value: {
-  dps: 5320.33463
-  tps: 2900.20711
+  dps: 5320.42841
+  tps: 2900.25225
  }
 }
 dps_results: {
@@ -771,36 +771,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-Stonebreaker'sTotem-33507"
  value: {
-  dps: 7527.13895
-  tps: 4150.78428
+  dps: 7527.15236
+  tps: 4150.78987
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-StormshroudArmor"
  value: {
-  dps: 5663.37934
-  tps: 3088.27653
+  dps: 5663.42953
+  tps: 3088.30103
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7411.39288
-  tps: 4090.27547
+  dps: 7411.3981
+  tps: 4090.2774
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7407.31092
-  tps: 4088.28394
+  dps: 7407.31611
+  tps: 4088.28586
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7399.38849
-  tps: 4082.74053
+  dps: 7399.39364
+  tps: 4082.74243
  }
 }
 dps_results: {
@@ -820,8 +820,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-TheFistsofFury"
  value: {
-  dps: 6494.56783
-  tps: 3545.86564
+  dps: 6516.17407
+  tps: 3558.32108
  }
 }
 dps_results: {
@@ -834,29 +834,29 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-Thrall'sBattlegear"
  value: {
-  dps: 7275.48994
-  tps: 4015.11157
+  dps: 7275.5866
+  tps: 4015.15841
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Thrall'sRegalia"
  value: {
-  dps: 6955.95677
-  tps: 3852.92824
+  dps: 6955.96769
+  tps: 3852.93292
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7477.4401
-  tps: 4129.024
+  dps: 7477.44519
+  tps: 4129.02587
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TidefuryRaiment"
  value: {
-  dps: 5354.32533
-  tps: 2904.21431
+  dps: 5354.36968
+  tps: 2904.23623
  }
 }
 dps_results: {
@@ -876,15 +876,15 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7409.5882
-  tps: 4089.30414
+  dps: 7409.59328
+  tps: 4089.30601
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7404.99993
-  tps: 4086.65534
+  dps: 7405.00501
+  tps: 4086.65721
  }
 }
 dps_results: {
@@ -897,57 +897,57 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-TotemofElectrifyingWind-47666"
  value: {
-  dps: 7783.06117
-  tps: 4314.1923
+  dps: 7783.07458
+  tps: 4314.19789
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TotemofQuakingEarth-47667"
  value: {
-  dps: 7634.89001
-  tps: 4212.36375
+  dps: 7634.90342
+  tps: 4212.36934
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TotemoftheAvalanche-50463"
  value: {
-  dps: 7791.46686
-  tps: 4292.23179
+  dps: 7791.48164
+  tps: 4292.23805
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TotemoftheElementalPlane-40708"
  value: {
-  dps: 7537.37155
-  tps: 4160.92952
+  dps: 7537.38496
+  tps: 4160.93511
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7404.99993
-  tps: 4086.65534
+  dps: 7405.00501
+  tps: 4086.65721
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7409.5882
-  tps: 4089.30414
+  dps: 7409.59328
+  tps: 4089.30601
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6051.07697
-  tps: 3312.45893
+  dps: 6051.07717
+  tps: 3312.45894
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7778.90676
-  tps: 4293.06631
+  dps: 7778.47649
+  tps: 4292.82665
  }
 }
 dps_results: {
@@ -967,106 +967,106 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-AllItems-WorldbreakerGarb"
  value: {
-  dps: 6948.68876
-  tps: 3844.80381
+  dps: 6948.62944
+  tps: 3844.77412
  }
 }
 dps_results: {
  key: "TestEnhancement-AllItems-WrathfulGladiator'sTotemofSurvival-51513"
  value: {
-  dps: 7595.12478
-  tps: 4198.13286
+  dps: 7595.13819
+  tps: 4198.13845
  }
 }
 dps_results: {
  key: "TestEnhancement-Average-Default"
  value: {
-  dps: 7576.35998
-  tps: 4184.97499
+  dps: 7576.35308
+  tps: 4184.97183
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25964.64638
-  tps: 15728.86752
+  dps: 25964.65641
+  tps: 15728.8729
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7600.66454
-  tps: 4170.90052
+  dps: 7600.66921
+  tps: 4170.90214
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9540.33013
-  tps: 4535.40617
+  dps: 9540.35349
+  tps: 4535.4143
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-LongMultiTarget"
  value: {
-  dps: 13406.4327
-  tps: 8725.17005
+  dps: 13406.38583
+  tps: 8725.14793
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3967.03618
-  tps: 2133.43047
+  dps: 3966.98428
+  tps: 2133.40483
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5176.66
-  tps: 2432.35029
+  dps: 5176.40049
+  tps: 2432.22206
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25091.92778
-  tps: 15124.2391
+  dps: 25091.93781
+  tps: 15124.24448
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7699.98434
-  tps: 4247.90027
+  dps: 7699.98902
+  tps: 4247.9019
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9646.18268
-  tps: 4628.50426
+  dps: 9646.20604
+  tps: 4628.51239
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-LongMultiTarget"
  value: {
-  dps: 12760.43153
-  tps: 8341.16494
+  dps: 12760.38465
+  tps: 8341.14282
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3954.64554
-  tps: 2136.55325
+  dps: 3954.59364
+  tps: 2136.52761
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5182.94379
-  tps: 2436.7026
+  dps: 5182.68428
+  tps: 2436.57438
  }
 }
 dps_results: {
@@ -1240,85 +1240,85 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25778.92338
-  tps: 15756.01325
+  dps: 25778.93342
+  tps: 15756.01864
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7557.56002
-  tps: 4179.34252
+  dps: 7557.5647
+  tps: 4179.34415
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9601.76473
-  tps: 4666.58399
+  dps: 9601.78813
+  tps: 4666.59215
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-LongMultiTarget"
  value: {
-  dps: 13393.60044
-  tps: 8806.42712
+  dps: 13393.55355
+  tps: 8806.40499
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3920.29394
-  tps: 2134.5437
+  dps: 3920.24202
+  tps: 2134.51804
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5165.85689
-  tps: 2478.43513
+  dps: 5165.59729
+  tps: 2478.30686
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25338.70915
-  tps: 15490.73618
+  dps: 25338.71919
+  tps: 15490.74156
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7687.61625
-  tps: 4262.64534
+  dps: 7687.62093
+  tps: 4262.64697
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9717.07463
-  tps: 4740.03731
+  dps: 9717.09802
+  tps: 4740.04546
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-LongMultiTarget"
  value: {
-  dps: 12762.29156
-  tps: 8377.13145
+  dps: 12762.24467
+  tps: 8377.10932
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3980.00176
-  tps: 2165.33744
+  dps: 3979.94984
+  tps: 2165.31179
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5244.26399
-  tps: 2521.8172
+  dps: 5244.00439
+  tps: 2521.68893
  }
 }
 dps_results: {
@@ -1492,7 +1492,7 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7236.09534
-  tps: 3979.87431
+  dps: 7236.23285
+  tps: 3979.93998
  }
 }
diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index 8ffabec9f2..a2631f86c5 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -46,935 +46,935 @@ character_stats_results: {
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8069.88214
-  tps: 6636.95814
+  dps: 8050.40231
+  tps: 6617.62845
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7959.60635
-  tps: 6534.37263
+  dps: 7977.53649
+  tps: 6548.24856
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8086.2697
-  tps: 6652.57641
+  dps: 8089.88788
+  tps: 6652.86335
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7937.91687
-  tps: 6529.12168
+  dps: 7895.90933
+  tps: 6491.57184
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlackBruise-50035"
  value: {
-  dps: 6212.01892
-  tps: 5164.72438
+  dps: 6236.55586
+  tps: 5186.85528
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlackBruise-50692"
  value: {
-  dps: 6365.46956
-  tps: 5280.88191
+  dps: 6422.50934
+  tps: 5331.43059
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6772.10173
-  tps: 5572.07422
+  dps: 6716.39452
+  tps: 5529.09795
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6643.76014
-  tps: 5464.37653
+  dps: 6661.20542
+  tps: 5477.55974
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6403.20047
-  tps: 5274.05229
+  dps: 6389.35926
+  tps: 5263.59417
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6502.60628
+  dps: 8063.21939
+  tps: 6498.29326
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
   hps: 64
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7880.83007
-  tps: 6476.47595
+  dps: 7924.63615
+  tps: 6511.16194
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7913.95945
-  tps: 6501.90078
+  dps: 7953.41187
+  tps: 6533.4538
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8328.45011
-  tps: 6846.28326
+  dps: 8351.22625
+  tps: 6862.93009
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7864.91948
-  tps: 6465.54262
+  dps: 7918.28643
+  tps: 6508.59287
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8317.51907
-  tps: 6833.40109
+  dps: 8312.78355
+  tps: 6826.72767
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8374.76569
-  tps: 6880.06205
+  dps: 8359.84417
+  tps: 6866.70315
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7785.10474
-  tps: 6398.18657
+  dps: 7842.83184
+  tps: 6440.53523
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8103.04746
-  tps: 6667.17339
+  dps: 8111.60994
+  tps: 6671.76324
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7957.47842
-  tps: 6541.93637
+  dps: 7976.44709
+  tps: 6553.04827
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7891.73415
-  tps: 6486.14216
+  dps: 7896.15936
+  tps: 6493.85385
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 7477.47736
-  tps: 6154.86358
+  dps: 7476.23598
+  tps: 6150.83157
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtPlate"
  value: {
-  dps: 6599.89544
-  tps: 5419.72483
+  dps: 6582.81872
+  tps: 5398.24917
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8086.2697
-  tps: 6652.57641
+  dps: 8089.88788
+  tps: 6652.86335
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8078.85797
-  tps: 6645.96029
+  dps: 8072.87161
+  tps: 6637.16587
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7862.50871
-  tps: 6462.55342
+  dps: 7870.92775
+  tps: 6470.34907
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7914.84683
-  tps: 6503.05394
+  dps: 7959.02669
+  tps: 6538.51905
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7867.52165
-  tps: 6465.13934
+  dps: 7911.34072
+  tps: 6500.31581
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7842.2197
-  tps: 6444.61085
+  dps: 7884.23926
+  tps: 6476.1122
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7999.44454
-  tps: 6568.88627
+  dps: 8029.50057
+  tps: 6593.49428
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 7887.96704
-  tps: 6452.98517
+  dps: 7835.94664
+  tps: 6415.80751
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7892.59669
-  tps: 6484.75864
+  dps: 7930.69911
+  tps: 6515.28359
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-49982"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-50641"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8086.2697
-  tps: 6652.57641
+  dps: 8089.88788
+  tps: 6652.86335
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8078.85797
-  tps: 6645.96029
+  dps: 8072.87161
+  tps: 6637.16587
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8021.70089
-  tps: 6583.82009
+  dps: 8039.13965
+  tps: 6601.57908
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8114.5032
-  tps: 6671.70661
+  dps: 8065.937
+  tps: 6631.42277
   hps: 14.14952
  }
 }
 dps_results: {
  key: "TestArms-AllItems-LastWord-50179"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-LastWord-50708"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7894.54362
-  tps: 6485.57023
+  dps: 7910.28275
+  tps: 6500.29003
  }
 }
 dps_results: {
  key: "TestArms-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7935.74043
-  tps: 6526.51572
+  dps: 7985.33862
+  tps: 6568.6209
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7775.41802
-  tps: 6389.6712
+  dps: 7843.55214
+  tps: 6441.07522
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtArmor"
  value: {
-  dps: 5410.54674
-  tps: 4447.21199
+  dps: 5396.53104
+  tps: 4440.94172
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 6229.6121
-  tps: 5116.41427
+  dps: 6264.67604
+  tps: 5151.16299
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8084.8133
-  tps: 6645.9633
+  dps: 8061.6668
+  tps: 6628.45738
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8116.28176
-  tps: 6671.41709
+  dps: 8084.89521
+  tps: 6647.32401
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7832.89795
-  tps: 6434.24785
+  dps: 7854.14638
+  tps: 6449.70559
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7840.51874
-  tps: 6439.32108
+  dps: 7865.31316
+  tps: 6459.42762
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8264.3092
-  tps: 6794.65896
+  dps: 8287.82494
+  tps: 6810.8394
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7779.60392
-  tps: 6393.62615
+  dps: 7853.08878
+  tps: 6447.63867
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 7954.93309
-  tps: 6538.51994
+  dps: 7911.05448
+  tps: 6504.21622
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerPlate"
  value: {
-  dps: 6806.88164
-  tps: 5588.09686
+  dps: 6776.89885
+  tps: 5558.44614
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7870.71375
-  tps: 6467.74748
+  dps: 7914.57663
+  tps: 6502.959
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SparkofLife-37657"
  value: {
-  dps: 7851.02595
-  tps: 6451.31935
+  dps: 7848.59726
+  tps: 6450.10218
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 8062.18262
-  tps: 6623.10917
+  dps: 8089.94601
+  tps: 6646.18573
  }
 }
 dps_results: {
  key: "TestArms-AllItems-StormshroudArmor"
  value: {
-  dps: 6284.10329
-  tps: 5164.22033
+  dps: 6331.87716
+  tps: 5202.71844
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8116.28176
-  tps: 6671.41709
+  dps: 8084.89521
+  tps: 6647.32401
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8084.8133
-  tps: 6645.9633
+  dps: 8061.6668
+  tps: 6628.45738
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8072.13275
-  tps: 6639.4997
+  dps: 8050.35634
+  tps: 6619.98325
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheFistsofFury"
  value: {
-  dps: 4698.85218
-  tps: 3950.60566
+  dps: 4691.3216
+  tps: 3944.94674
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5063.65687
-  tps: 4257.6161
+  dps: 5032.36752
+  tps: 4226.35497
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8148.63006
-  tps: 6706.03038
+  dps: 8114.98205
+  tps: 6676.11127
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8210.22965
-  tps: 6750.16782
+  dps: 8195.60328
+  tps: 6730.66767
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8243.13796
-  tps: 6773.92865
+  dps: 8270.38741
+  tps: 6792.33381
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7833.22367
-  tps: 6444.59452
+  dps: 7818.06081
+  tps: 6430.11591
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8067.97543
-  tps: 6635.23104
+  dps: 8063.21939
+  tps: 6630.83038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6659.09658
-  tps: 5479.32723
+  dps: 6638.13063
+  tps: 5464.86947
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5242.26397
-  tps: 4434.19717
+  dps: 5230.25898
+  tps: 4424.99907
  }
 }
 dps_results: {
  key: "TestArms-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7760.99349
-  tps: 6380.23169
+  dps: 7852.40784
+  tps: 6451.84658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 8732.72317
-  tps: 7168.30969
+  dps: 8739.84464
+  tps: 7172.30898
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sPlate"
  value: {
-  dps: 7100.54798
-  tps: 5822.72514
+  dps: 7092.96307
+  tps: 5822.70403
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 9323.60786
-  tps: 7681.58288
+  dps: 9334.80501
+  tps: 7692.10534
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 7413.87804
-  tps: 6083.61087
+  dps: 7434.46942
+  tps: 6098.55656
  }
 }
 dps_results: {
  key: "TestArms-Average-Default"
  value: {
-  dps: 8269.10291
-  tps: 6800.46774
+  dps: 8268.01597
+  tps: 6799.55785
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 10957.02617
-  tps: 9349.31429
+  dps: 10918.22761
+  tps: 9316.0926
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8236.73413
-  tps: 6775.24454
+  dps: 8194.09749
+  tps: 6738.84105
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8704.87233
-  tps: 7223.70662
+  dps: 8715.4711
+  tps: 7231.83232
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 6454.07814
-  tps: 5579.61679
+  dps: 6421.48367
+  tps: 5547.41344
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4621.81006
-  tps: 3801.62068
+  dps: 4610.02099
+  tps: 3794.48371
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4493.53566
-  tps: 3731.4646
+  dps: 4488.93069
+  tps: 3725.7865
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 10990.17972
-  tps: 9382.88236
+  dps: 10997.41247
+  tps: 9388.26534
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8269.60659
-  tps: 6800.41807
+  dps: 8277.41036
+  tps: 6801.25246
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8800.81647
-  tps: 7308.27786
+  dps: 8813.98703
+  tps: 7317.40723
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 6502.59527
-  tps: 5617.69445
+  dps: 6485.43756
+  tps: 5605.29853
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4627.26546
-  tps: 3804.8561
+  dps: 4588.72206
+  tps: 3775.98074
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4555.99666
-  tps: 3788.40901
+  dps: 4522.90384
+  tps: 3759.80824
  }
 }
 dps_results: {
  key: "TestArms-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7631.46447
-  tps: 6271.21547
+  dps: 7638.48085
+  tps: 6274.20145
  }
 }
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index 73c20ea4c6..3f8d54b1aa 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -104,15 +104,15 @@ dps_results: {
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50035"
  value: {
-  dps: 5837.90085
-  tps: 4333.0186
+  dps: 5833.67568
+  tps: 4328.73701
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50692"
  value: {
-  dps: 5926.92039
-  tps: 4395.38921
+  dps: 5917.54802
+  tps: 4388.85577
  }
 }
 dps_results: {
@@ -757,8 +757,8 @@ dps_results: {
 dps_results: {
  key: "TestFury-AllItems-TheFistsofFury"
  value: {
-  dps: 5014.10292
-  tps: 3714.77686
+  dps: 5006.80751
+  tps: 3709.33453
  }
 }
 dps_results: {
@@ -771,8 +771,8 @@ dps_results: {
 dps_results: {
  key: "TestFury-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5359.5552
-  tps: 3970.12359
+  dps: 5359.59122
+  tps: 3970.14881
  }
 }
 dps_results: {
diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results
index 7f3aa93f33..d1a9e0e5c6 100644
--- a/sim/warrior/protection/TestProtectionWarrior.results
+++ b/sim/warrior/protection/TestProtectionWarrior.results
@@ -46,7 +46,7 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestProtectionWarrior-StatWeights-Default"
  value: {
-  weights: 1.0298
+  weights: 1.01803
   weights: 0
   weights: 0
   weights: 0
@@ -57,7 +57,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15157
+  weights: 0.19691
   weights: 0
   weights: 0
   weights: 0
@@ -66,12 +66,12 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.01649
+  weights: 0.02012
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.42999
-  weights: 0.05199
+  weights: 0.42911
+  weights: 0.07235
   weights: 0
   weights: 0
   weights: 0
@@ -921,9 +921,9 @@ dps_results: {
 dps_results: {
  key: "TestProtectionWarrior-Average-Default"
  value: {
-  dps: 2772.11065
-  tps: 6734.84041
-  dtps: 127.7138
+  dps: 2772.35319
+  tps: 6734.95331
+  dtps: 127.69906
  }
 }
 dps_results: {

From 166fa960099157f9a182b6a2c2b56c6bf024ea00 Mon Sep 17 00:00:00 2001
From: James Tanner <jimmyt857@gmail.com>
Date: Thu, 12 Oct 2023 20:27:06 -0700
Subject: [PATCH 2/3] Clean up NextAttackAt

---
 sim/core/attack.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sim/core/attack.go b/sim/core/attack.go
index b2e0a4e638..36adbc600f 100644
--- a/sim/core/attack.go
+++ b/sim/core/attack.go
@@ -686,11 +686,11 @@ func (aa *AutoAttacks) DelayRangedUntil(sim *Simulation, readyAt time.Duration)
 
 // Returns the time at which the next attack will occur.
 func (aa *AutoAttacks) NextAttackAt() time.Duration {
-	nextAttack := aa.MainhandSwingAt
-	if aa.IsDualWielding && aa.OffhandSwingAt < nextAttack {
-		nextAttack = aa.OffhandSwingAt
+	if aa.IsDualWielding && aa.OffhandSwingAt < aa.MainhandSwingAt {
+		return aa.OffhandSwingAt
+	} else {
+		return aa.MainhandSwingAt
 	}
-	return nextAttack
 }
 
 type PPMManager struct {

From a181a9ed40e14ea8452783223cc9febd25639020 Mon Sep 17 00:00:00 2001
From: James Tanner <jimmyt857@gmail.com>
Date: Thu, 12 Oct 2023 20:32:27 -0700
Subject: [PATCH 3/3] Forgot to remove debug print

---
 sim/core/apl_values_auto_attacks.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sim/core/apl_values_auto_attacks.go b/sim/core/apl_values_auto_attacks.go
index 4fa0c7d11e..36c59c42fc 100644
--- a/sim/core/apl_values_auto_attacks.go
+++ b/sim/core/apl_values_auto_attacks.go
@@ -20,9 +20,6 @@ func (value *APLValueAutoTimeToNext) Type() proto.APLValueType {
 	return proto.APLValueType_ValueTypeDuration
 }
 func (value *APLValueAutoTimeToNext) GetDuration(sim *Simulation) time.Duration {
-	if sim.Log != nil {
-		sim.Log("TimeToNextAuto: %s", max(0, value.unit.AutoAttacks.NextAttackAt()-sim.CurrentTime))
-	}
 	return max(0, value.unit.AutoAttacks.NextAttackAt()-sim.CurrentTime)
 }
 func (value *APLValueAutoTimeToNext) String() string {