From 1f22beedaf47704f532284569bed353da4ea1475 Mon Sep 17 00:00:00 2001
From: adocoD <jannickhu@hotmail.com>
Date: Sun, 7 Jul 2024 20:50:11 +0200
Subject: [PATCH 1/3] Updated Base melee range and MS

---
 sim/core/attack.go                            |   4 +-
 sim/core/test_generators.go                   |   2 +-
 sim/core/unit.go                              |   2 +-
 sim/druid/balance/TestBalance.results         |  84 ++++-----
 sim/hunter/TestBM.results                     | 164 ++++++++----------
 sim/hunter/TestMM.results                     |  70 ++++----
 sim/hunter/TestSV.results                     | 128 ++++++--------
 sim/hunter/carve.go                           |   2 +-
 sim/hunter/flanking_strike.go                 |   2 +-
 sim/hunter/mongoose_bite.go                   |   2 +-
 sim/hunter/raptor_strike.go                   |   4 +-
 sim/hunter/wing_clip.go                       |   2 +-
 sim/hunter/wyvern_strike.go                   |   2 +-
 sim/mage/TestArcane.results                   |  46 ++---
 sim/mage/TestFire.results                     |  68 ++++----
 sim/mage/TestFrost.results                    |  18 +-
 sim/priest/shadow/TestShadow.results          | 104 +++++------
 sim/shaman/elemental/TestElemental.results    |  84 ++++-----
 .../enhancement/TestEnhancement.results       |  84 ++++-----
 sim/warlock/dps/TestAffliction.results        |  64 +++----
 sim/warlock/dps/TestDemonology.results        |  16 +-
 sim/warlock/dps/TestDestruction.results       |  84 ++++-----
 sim/warlock/tank/TestAffliction.results       |  12 +-
 sim/warlock/tank/TestDemonology.results       |  16 +-
 sim/warlock/tank/TestDestruction.results      |  50 +++---
 25 files changed, 535 insertions(+), 579 deletions(-)

diff --git a/sim/core/attack.go b/sim/core/attack.go
index 34fc1c9337..bebff9cf66 100644
--- a/sim/core/attack.go
+++ b/sim/core/attack.go
@@ -517,7 +517,7 @@ func (aa *AutoAttacks) startPull(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 1 {
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
 			aa.oh.addWeaponAttack(sim, aa.mh.curSwingSpeed)
@@ -566,7 +566,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 1 {
 		aa.mh.swingAt = max(aa.mh.swingAt, sim.CurrentTime, 0)
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
diff --git a/sim/core/test_generators.go b/sim/core/test_generators.go
index 6f29314b55..e25bf6ea23 100644
--- a/sim/core/test_generators.go
+++ b/sim/core/test_generators.go
@@ -450,7 +450,7 @@ func FullCharacterTestSuiteGenerator(configs []CharacterSuiteConfig) []TestGener
 				Rotation:      config.Rotation.Rotation,
 
 				InFrontOfTarget:    config.InFrontOfTarget,
-				DistanceFromTarget: 5,
+				DistanceFromTarget: 1,
 				ReactionTimeMs:     150,
 				ChannelClipDelayMs: 50,
 			},
diff --git a/sim/core/unit.go b/sim/core/unit.go
index c673e5cd05..1025b5cf8a 100644
--- a/sim/core/unit.go
+++ b/sim/core/unit.go
@@ -428,7 +428,7 @@ func (unit *Unit) MoveTo(moveRange float64, sim *Simulation) {
 	unit.moveSpell.Cast(sim, unit.CurrentTarget)
 
 	sim.AddPendingAction(NewPeriodicAction(sim, PeriodicActionOptions{
-		Period:          time.Millisecond * 500,
+		Period:          time.Millisecond * 143,
 		NumTicks:        int(moveTicks),
 		TickImmediately: false,
 
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
index 0a5179d72f..8a31053733 100644
--- a/sim/druid/balance/TestBalance.results
+++ b/sim/druid/balance/TestBalance.results
@@ -249,7 +249,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.00888
+  weights: 0.00446
   weights: 0
   weights: 0.80631
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.6818
-  weights: 5.19571
+  weights: 6.66054
+  weights: 5.23672
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl25-Average-Default"
  value: {
-  dps: 179.42249
-  tps: 181.64573
+  dps: 179.4887
+  tps: 181.71194
  }
 }
 dps_results: {
@@ -498,15 +498,15 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-FeralheartRaiment"
  value: {
-  dps: 221.87766
-  tps: 230.27941
+  dps: 222.10434
+  tps: 230.51159
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Average-Default"
  value: {
-  dps: 653.96376
-  tps: 664.5731
+  dps: 654.10257
+  tps: 664.71218
  }
 }
 dps_results: {
@@ -597,21 +597,21 @@ dps_results: {
  key: "TestBalance-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 647.65654
-  tps: 658.21605
+  tps: 658.2188
  }
 }
 dps_results: {
  key: "TestBalance-Lvl50-AllItems-FeralheartRaiment"
  value: {
-  dps: 472.4627
-  tps: 487.22404
+  dps: 472.32498
+  tps: 487.08632
  }
 }
 dps_results: {
  key: "TestBalance-Lvl50-Average-Default"
  value: {
-  dps: 1284.89777
-  tps: 1298.67282
+  dps: 1285.21009
+  tps: 1298.9882
  }
 }
 dps_results: {
@@ -708,99 +708,99 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 640.69644
-  tps: 656.83837
+  dps: 642.3413
+  tps: 658.5078
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 599.25376
-  tps: 615.70543
+  dps: 599.67214
+  tps: 616.15331
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 574.03196
-  tps: 589.80514
+  dps: 574.28203
+  tps: 590.06013
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 781.10916
-  tps: 797.76733
+  dps: 780.89799
+  tps: 797.54141
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 574.14996
-  tps: 589.99197
+  dps: 574.49432
+  tps: 590.34124
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 598.50352
-  tps: 614.95519
+  dps: 598.91737
+  tps: 615.39854
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 614.49619
-  tps: 630.40703
+  dps: 614.07966
+  tps: 629.9905
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 783.78965
-  tps: 800.09382
+  dps: 783.83755
+  tps: 800.14173
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 553.86355
-  tps: 570.56455
+  dps: 554.08203
+  tps: 570.71337
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 640.69644
-  tps: 656.83837
+  dps: 642.3413
+  tps: 658.5078
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 599.25376
-  tps: 615.70543
+  dps: 599.67214
+  tps: 616.15331
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 574.03196
-  tps: 589.80514
+  dps: 574.28203
+  tps: 590.06013
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 841.37602
-  tps: 858.00469
+  dps: 840.22155
+  tps: 856.81089
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-Average-Default"
  value: {
-  dps: 1565.5451
-  tps: 1580.55388
+  dps: 1565.9965
+  tps: 1581.00986
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index 09972fe65e..df8ee7760c 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestBM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.51891
+  weights: 0.19917
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0262
-  weights: 2.40326
-  weights: 2.22103
+  weights: 0.0017
+  weights: 1.19119
+  weights: 1.19249
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.13124
+  weights: 0.04637
   weights: 0
   weights: 0
   weights: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestBM-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.8079
+  weights: 0.23297
   weights: 0
   weights: 0
   weights: 0
@@ -165,17 +165,17 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.31124
-  weights: 8.44271
-  weights: 7.62158
   weights: 0
+  weights: 2.68494
+  weights: 2.20355
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.06516
+  weights: 0
+  weights: 0.06253
   weights: 0
   weights: 0
   weights: 0
@@ -197,169 +197,160 @@ stat_weights_results: {
 dps_results: {
  key: "TestBM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 322.86052
-  tps: 165.63671
+  dps: 121.07095
+  tps: 2.00489
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Average-Default"
  value: {
-  dps: 250.3442
-  tps: 102.79252
+  dps: 133.50163
+  tps: 1.67734
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 250.89875
-  tps: 114.38548
+  dps: 128.79458
+  tps: 5.25954
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 242.36747
-  tps: 101.12937
+  dps: 126.50587
+  tps: 2.97777
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 312.10516
-  tps: 119.32138
+  dps: 142.49123
+  tps: 14.88885
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 126.40871
-  tps: 62.42832
+  dps: 62.79353
+  tps: 3.37022
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 122.17212
-  tps: 56.70515
+  dps: 61.43628
+  tps: 1.84086
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 154.5189
-  tps: 65.81464
+  dps: 71.33753
+  tps: 9.20432
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 251.89503
-  tps: 111.02439
+  dps: 133.32568
+  tps: 5.15457
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 243.4198
-  tps: 98.58413
+  dps: 131.0742
+  tps: 2.89499
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 315.17718
-  tps: 117.42254
+  dps: 147.03843
+  tps: 14.47493
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 126.73686
-  tps: 61.71224
+  dps: 64.86401
+  tps: 3.31661
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 123.05605
-  tps: 55.86071
+  dps: 63.52715
+  tps: 1.80988
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 154.53532
-  tps: 65.12392
+  dps: 73.49368
+  tps: 9.04941
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 247.90955
-  tps: 102.24514
+  dps: 131.83928
+  tps: 1.76864
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 527.06296
-  tps: 238.97786
+  dps: 301.35382
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 836.59954
-  tps: 320.1109
+  dps: 290.97578
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Average-Default"
  value: {
-  dps: 847.09336
-  tps: 326.90583
+  dps: 293.85674
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1621.82778
-  tps: 995.97245
+  dps: 279.55979
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 730.26915
-  tps: 236.75592
+  dps: 279.55979
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 762.85699
-  tps: 248.61717
+  dps: 309.8841
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 865.73065
-  tps: 640.06892
+  dps: 131.77929
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 370.2734
-  tps: 131.15666
+  dps: 131.77929
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 399.71796
-  tps: 135.04526
+  dps: 147.35168
  }
 }
 dps_results: {
@@ -407,43 +398,37 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 486.22279
-  tps: 474.74016
+  dps: 286.11789
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 486.22279
-  tps: 209.7514
+  dps: 286.11789
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 537.78676
-  tps: 233.56775
+  dps: 317.80828
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 243.3659
-  tps: 438.18124
+  dps: 136.04891
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 243.3659
-  tps: 123.581
+  dps: 136.04891
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 277.45929
-  tps: 133.68913
+  dps: 152.01532
  }
 }
 dps_results: {
@@ -491,43 +476,37 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1630.77885
-  tps: 990.55107
+  dps: 291.05668
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 744.69965
-  tps: 235.90031
+  dps: 291.05668
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 787.53742
-  tps: 249.04312
+  dps: 323.72139
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 863.26146
-  tps: 633.2562
+  dps: 136.70438
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 373.62562
-  tps: 129.14291
+  dps: 136.70438
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 406.77043
-  tps: 135.17851
+  dps: 153.663
  }
 }
 dps_results: {
@@ -575,43 +554,37 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 497.58636
-  tps: 473.68846
+  dps: 297.99277
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 497.58636
-  tps: 206.87987
+  dps: 297.99277
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 552.45886
-  tps: 236.75199
+  dps: 331.4387
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 248.0248
-  tps: 436.80323
+  dps: 141.48053
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 248.0248
-  tps: 122.04852
+  dps: 141.48053
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 281.03819
-  tps: 132.24348
+  dps: 158.5143
  }
 }
 dps_results: {
@@ -659,7 +632,6 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 803.96822
-  tps: 299.90694
+  dps: 291.05668
  }
 }
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index 0a7872748e..0c3a61627c 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestMM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.42134
+  weights: 0.15476
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.03161
-  weights: 2.32423
-  weights: 2.04516
+  weights: 0.00173
+  weights: 1.14594
+  weights: 0.97019
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.12382
+  weights: 0.0392
   weights: 0
   weights: 0
   weights: 0
@@ -197,106 +197,106 @@ stat_weights_results: {
 dps_results: {
  key: "TestMM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 317.40381
-  tps: 174.3657
+  dps: 103.72042
+  tps: 2.11215
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Average-Default"
  value: {
-  dps: 237.09163
-  tps: 105.50931
+  dps: 114.19994
+  tps: 1.75676
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 233.46906
-  tps: 114.43437
+  dps: 109.00725
+  tps: 5.31781
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 222.16438
-  tps: 100.50421
+  dps: 106.72765
+  tps: 3.01951
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 297.68661
-  tps: 126.96257
+  dps: 121.91286
+  tps: 15.09756
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 117.3875
-  tps: 63.05768
+  dps: 52.93811
+  tps: 3.45156
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 112.16344
-  tps: 56.82452
+  dps: 51.56797
+  tps: 1.90723
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 147.07858
-  tps: 68.76283
+  dps: 61.03866
+  tps: 9.53616
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 238.93696
-  tps: 114.97132
+  dps: 114.26246
+  tps: 5.36017
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 228.04429
-  tps: 101.33553
+  dps: 111.96865
+  tps: 3.0581
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 304.20553
-  tps: 127.56377
+  dps: 127.4831
+  tps: 15.29051
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 118.20948
-  tps: 61.82332
+  dps: 55.53493
+  tps: 3.45866
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 114.65893
-  tps: 56.8723
+  dps: 54.15638
+  tps: 1.91137
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 148.8127
-  tps: 68.15914
+  dps: 63.83915
+  tps: 9.55687
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 234.02799
-  tps: 106.00548
+  dps: 112.64665
+  tps: 1.80279
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index edf36daac8..39d0550457 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestSV-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.42471
+  weights: 0.17702
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.02742
-  weights: 1.87513
-  weights: 1.95844
+  weights: 0.0017
+  weights: 1.35752
+  weights: 0.84403
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.12048
+  weights: 0.03846
   weights: 0
   weights: 0
   weights: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestSV-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.94662
+  weights: 0.33781
   weights: 0
   weights: 0
   weights: 0
@@ -165,17 +165,17 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35631
-  weights: 0.36455
-  weights: 6.70309
   weights: 0
   weights: 0
+  weights: 1.94756
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.03686
+  weights: 0
+  weights: 0
+  weights: 0.03514
   weights: 0
   weights: 0
   weights: 0
@@ -197,217 +197,201 @@ stat_weights_results: {
 dps_results: {
  key: "TestSV-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 312.12877
-  tps: 166.21411
+  dps: 100.46196
+  tps: 1.96536
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Average-Default"
  value: {
-  dps: 226.32869
-  tps: 100.41993
+  dps: 110.55175
+  tps: 1.70098
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 229.45762
-  tps: 113.50363
+  dps: 107.26091
+  tps: 5.41256
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 219.9321
-  tps: 99.07432
+  dps: 104.94508
+  tps: 3.01721
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 296.39028
-  tps: 122.13163
+  dps: 120.07394
+  tps: 15.08607
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 114.48996
-  tps: 61.20312
+  dps: 52.38272
+  tps: 3.47066
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 110.10097
-  tps: 55.36928
+  dps: 50.79199
+  tps: 1.86525
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 144.31375
-  tps: 64.76151
+  dps: 60.1584
+  tps: 9.32626
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 229.37991
-  tps: 109.82405
+  dps: 111.09869
+  tps: 5.30525
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 220.96553
-  tps: 96.74541
+  dps: 108.74527
+  tps: 2.9336
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 298.54116
-  tps: 120.08976
+  dps: 123.68807
+  tps: 14.668
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 114.91423
-  tps: 60.10125
+  dps: 54.07827
+  tps: 3.41543
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 110.5218
-  tps: 54.40434
+  dps: 52.51459
+  tps: 1.83373
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 143.48348
-  tps: 65.29829
+  dps: 61.95537
+  tps: 9.16866
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 222.68336
-  tps: 99.52159
+  dps: 109.7591
+  tps: 1.80877
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 434.39369
-  tps: 271.32762
+  dps: 178.25182
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 790.46674
-  tps: 355.09957
+  dps: 169.29333
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Average-Default"
  value: {
-  dps: 799.53008
-  tps: 361.30319
+  dps: 170.54235
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1606.17589
-  tps: 1024.23204
+  dps: 161.55121
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 646.83936
-  tps: 243.35858
+  dps: 161.55121
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 664.72246
-  tps: 252.96198
+  dps: 171.71757
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 857.9147
-  tps: 637.72295
+  dps: 76.4107
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 332.47728
-  tps: 134.10586
+  dps: 76.4107
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 354.11556
-  tps: 137.46675
+  dps: 82.41553
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1617.31294
-  tps: 1023.9301
+  dps: 169.70691
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 662.87964
-  tps: 244.83736
+  dps: 169.70691
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 680.75712
-  tps: 258.06929
+  dps: 180.51601
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 856.99433
-  tps: 635.62351
+  dps: 80.33001
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 337.85046
-  tps: 134.93215
+  dps: 80.33001
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 359.98879
-  tps: 138.54583
+  dps: 86.61353
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 756.63543
-  tps: 336.64431
+  dps: 169.70691
  }
 }
diff --git a/sim/hunter/carve.go b/sim/hunter/carve.go
index e049897007..24803dada9 100644
--- a/sim/hunter/carve.go
+++ b/sim/hunter/carve.go
@@ -50,7 +50,7 @@ func (hunter *Hunter) registerCarveSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= 1
 		},
 
 		DamageMultiplier: 0.65,
diff --git a/sim/hunter/flanking_strike.go b/sim/hunter/flanking_strike.go
index 5e93787505..8c6f2cf353 100644
--- a/sim/hunter/flanking_strike.go
+++ b/sim/hunter/flanking_strike.go
@@ -91,7 +91,7 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= 1
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/mongoose_bite.go b/sim/hunter/mongoose_bite.go
index e2e7d05e42..05854aaa10 100644
--- a/sim/hunter/mongoose_bite.go
+++ b/sim/hunter/mongoose_bite.go
@@ -42,7 +42,7 @@ func (hunter *Hunter) getMongooseBiteConfig(rank int) core.SpellConfig {
 		},
 
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5 && hunter.DefensiveState.IsActive()
+			return hunter.DistanceFromTarget <= 1 && hunter.DefensiveState.IsActive()
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
index c5c5487ff1..35ecb53c2c 100644
--- a/sim/hunter/raptor_strike.go
+++ b/sim/hunter/raptor_strike.go
@@ -70,7 +70,7 @@ func (hunter *Hunter) getRaptorStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= 1
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
@@ -172,7 +172,7 @@ func (hunter *Hunter) makeQueueSpellsAndAura(srcSpell *core.Spell) *core.Spell {
 			return hunter.curQueueAura != queueAura &&
 				hunter.CurrentMana() >= srcSpell.DefaultCast.Cost &&
 				sim.CurrentTime >= hunter.Hardcast.Expires &&
-				hunter.DistanceFromTarget <= 5 &&
+				hunter.DistanceFromTarget <= 1 &&
 				srcSpell.IsReady(sim)
 		},
 
diff --git a/sim/hunter/wing_clip.go b/sim/hunter/wing_clip.go
index df2a1ba2ac..4d0eeecc38 100644
--- a/sim/hunter/wing_clip.go
+++ b/sim/hunter/wing_clip.go
@@ -30,7 +30,7 @@ func (hunter *Hunter) getWingClipConfig(rank int) core.SpellConfig {
 			IgnoreHaste: true,
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= 1
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/wyvern_strike.go b/sim/hunter/wyvern_strike.go
index 0e5ab6257b..2b3c42922c 100644
--- a/sim/hunter/wyvern_strike.go
+++ b/sim/hunter/wyvern_strike.go
@@ -39,7 +39,7 @@ func (hunter *Hunter) getWyvernStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= 1
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index 789f70a46c..1cd883652e 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -102,10 +102,10 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.02138
+  weights: -0.13634
   weights: 0
-  weights: 0.4711
-  weights: 0.4711
+  weights: 0.47304
+  weights: 0.47304
   weights: 0
   weights: 0
   weights: 0
@@ -113,7 +113,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.43921
+  weights: 2.40811
   weights: 0
   weights: 0
   weights: 0
@@ -151,18 +151,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -2.51567
+  weights: -3.86388
   weights: 0
-  weights: 1.21932
-  weights: 0.38206
-  weights: 0.83726
+  weights: 1.22232
+  weights: 0.38245
+  weights: 0.83988
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 11.39667
+  weights: 11.75083
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestArcane-Lvl40-Average-Default"
  value: {
-  dps: 409.15278
-  tps: 253.40576
+  dps: 410.79058
+  tps: 254.39627
  }
 }
 dps_results: {
@@ -288,8 +288,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 417.26839
-  tps: 258.28982
+  dps: 420.06121
+  tps: 259.98801
  }
 }
 dps_results: {
@@ -323,8 +323,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 646.29768
-  tps: 658.42209
+  dps: 653.75316
+  tps: 665.87557
  }
 }
 dps_results: {
@@ -344,22 +344,22 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1500.95278
-  tps: 1518.92408
+  dps: 1516.76579
+  tps: 1534.79788
  }
 }
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-Sorcerer'sRegalia"
  value: {
-  dps: 682.83219
-  tps: 695.65426
+  dps: 685.42829
+  tps: 697.99665
  }
 }
 dps_results: {
  key: "TestArcane-Lvl60-Average-Default"
  value: {
-  dps: 1825.74544
-  tps: 1844.20129
+  dps: 1830.89617
+  tps: 1849.35556
  }
 }
 dps_results: {
@@ -449,7 +449,7 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1820.64422
-  tps: 1838.75488
+  dps: 1815.59215
+  tps: 1833.65146
  }
 }
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index 9c4db658cd..3f82b5e9a0 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -151,18 +151,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.3089
+  weights: 1.5419
   weights: 0
-  weights: 0.61862
+  weights: 0.61986
   weights: 0
-  weights: 0.61862
+  weights: 0.61986
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.63235
-  weights: 6.50589
+  weights: 5.89445
+  weights: 6.30392
   weights: 0
   weights: 0
   weights: 0
@@ -211,7 +211,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 12.02781
+  weights: 11.90025
   weights: 0
   weights: 0
   weights: 0
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.74166
+  weights: 5.35686
   weights: 0
-  weights: 2.12682
+  weights: 2.11895
   weights: 0
-  weights: 2.12682
+  weights: 2.11895
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 8.98325
+  weights: 3.09406
   weights: 0
   weights: 0
   weights: 0
@@ -295,8 +295,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestFire-Lvl40-Average-Default"
  value: {
-  dps: 450.4571
-  tps: 327.41637
+  dps: 450.63511
+  tps: 327.54089
  }
 }
 dps_results: {
@@ -386,15 +386,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 449.46436
-  tps: 326.79714
+  dps: 449.99404
+  tps: 327.16792
  }
 }
 dps_results: {
  key: "TestFire-Lvl50-Average-Default"
  value: {
-  dps: 1272.85317
-  tps: 908.65304
+  dps: 1273.38005
+  tps: 909.02474
  }
 }
 dps_results: {
@@ -491,29 +491,29 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1943.13062
-  tps: 1124.47945
+  dps: 1941.10733
+  tps: 1123.4156
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1734.49039
-  tps: 1004.36451
+  dps: 1736.04614
+  tps: 1005.35095
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1922.26676
-  tps: 1112.39097
+  dps: 1921.46169
+  tps: 1112.20907
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1706.35664
-  tps: 987.29994
+  dps: 1704.837
+  tps: 986.6085
  }
 }
 dps_results: {
@@ -526,22 +526,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1943.13062
-  tps: 1124.47945
+  dps: 1941.10733
+  tps: 1123.4156
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1734.49039
-  tps: 1004.36451
+  dps: 1736.04614
+  tps: 1005.35095
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 2274.7345
-  tps: 1401.29368
+  dps: 2278.16228
+  tps: 1403.37223
  }
 }
 dps_results: {
@@ -554,8 +554,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-Average-Default"
  value: {
-  dps: 2975.32014
-  tps: 1848.76402
+  dps: 2977.11754
+  tps: 1849.88183
  }
 }
 dps_results: {
@@ -645,7 +645,7 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2974.81982
-  tps: 1845.92946
+  dps: 2969.51906
+  tps: 1843.64853
  }
 }
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index 11099a4cf6..23076f1dae 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -153,16 +153,16 @@ stat_weights_results: {
   weights: 0
   weights: 8.69663
   weights: 0
-  weights: 0.549
+  weights: 0.5502
   weights: 0
   weights: 0.14992
-  weights: 0.39908
+  weights: 0.40028
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: -5.40459
-  weights: 13.00086
+  weights: 12.51764
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestFrost-Lvl50-Average-Default"
  value: {
-  dps: 1083.76616
-  tps: 850.60304
+  dps: 1084.18285
+  tps: 850.9319
  }
 }
 dps_results: {
@@ -358,8 +358,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Lvl60-Average-Default"
  value: {
-  dps: 741.00989
-  tps: 623.10628
+  dps: 741.02807
+  tps: 623.11274
  }
 }
 dps_results: {
@@ -449,7 +449,7 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 728.95233
-  tps: 614.11532
+  dps: 729.70121
+  tps: 614.5989
  }
 }
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index 2c55b25efa..62f704c370 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.21119
+  weights: 0.22873
   weights: 0
-  weights: 0.69427
+  weights: 0.69429
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.69427
+  weights: 0.69429
   weights: 0
   weights: 0.1009
-  weights: 1.31029
+  weights: 1.31069
   weights: 0
   weights: 0
   weights: 0
@@ -298,18 +298,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.2179
+  weights: 0.21239
   weights: 0
-  weights: 0.87908
+  weights: 0.87979
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.87908
+  weights: 0.87979
   weights: 0
   weights: 0.19439
-  weights: 4.68382
+  weights: 4.67976
   weights: 0
   weights: 0
   weights: 0
@@ -349,16 +349,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.20385
   weights: 0
-  weights: 0.98445
+  weights: 0.98563
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.98445
+  weights: 0.98563
   weights: 0
-  weights: 9.7897
-  weights: 6.4058
+  weights: 9.74801
+  weights: 6.3897
   weights: 0
   weights: 0
   weights: 0
@@ -505,8 +505,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl40-Average-Default"
  value: {
-  dps: 628.08447
-  tps: 496.95151
+  dps: 628.49535
+  tps: 497.30172
  }
 }
 dps_results: {
@@ -596,8 +596,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 628.09576
-  tps: 496.76576
+  dps: 627.8407
+  tps: 496.53501
  }
 }
 dps_results: {
@@ -611,9 +611,9 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl50-Average-Default"
  value: {
-  dps: 1154.4957
-  tps: 925.54638
-  hps: 15.62465
+  dps: 1155.42544
+  tps: 926.33839
+  hps: 15.63644
  }
 }
 dps_results: {
@@ -715,49 +715,49 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1153.21218
-  tps: 924.18498
-  hps: 16.31738
+  dps: 1153.54839
+  tps: 924.4674
+  hps: 16.32649
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BenevolentProphet'sVestments"
  value: {
-  dps: 1102.22409
-  tps: 1057.25164
-  hps: 17.83603
+  dps: 1102.56025
+  tps: 1057.58182
+  hps: 17.84118
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 971.51161
-  tps: 933.81193
-  hps: 18.55627
+  dps: 971.74011
+  tps: 934.03933
+  hps: 18.56141
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 878.01448
-  tps: 844.45763
-  hps: 18.27333
+  dps: 878.23041
+  tps: 844.67311
+  hps: 18.28105
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 964.99288
-  tps: 927.42934
-  hps: 18.55627
+  dps: 965.22013
+  tps: 927.65766
+  hps: 18.56141
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 877.78328
-  tps: 843.88771
-  hps: 18.27333
+  dps: 877.99921
+  tps: 844.10287
+  hps: 18.28105
  }
 }
 dps_results: {
@@ -771,25 +771,25 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 971.51161
-  tps: 933.81193
-  hps: 18.55627
+  dps: 971.74011
+  tps: 934.03933
+  hps: 18.56141
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 878.01448
-  tps: 844.45763
-  hps: 18.27333
+  dps: 878.23041
+  tps: 844.67311
+  hps: 18.28105
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1172.47321
-  tps: 1124.31667
-  hps: 17.83603
+  dps: 1172.82945
+  tps: 1124.65867
+  hps: 17.84118
  }
 }
 dps_results: {
@@ -803,9 +803,9 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-Average-Default"
  value: {
-  dps: 1504.02543
-  tps: 1383.65955
-  hps: 17.30445
+  dps: 1504.90553
+  tps: 1384.54526
+  hps: 17.31158
  }
 }
 dps_results: {
@@ -907,8 +907,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1505.62159
-  tps: 1384.41647
-  hps: 18.10987
+  dps: 1507.11836
+  tps: 1385.90005
+  hps: 18.11502
  }
 }
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index c727256024..6db40f5989 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -202,16 +202,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.02401
   weights: 0
-  weights: 0.51961
+  weights: 0.5196
   weights: 0
-  weights: 0.21054
+  weights: 0.21059
   weights: 0
   weights: 0
-  weights: 0.30908
+  weights: 0.30901
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.52354
+  weights: 0.52562
   weights: 0
   weights: 0
   weights: 0
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.53991
+  weights: 0.28188
   weights: 0
-  weights: 0.75885
+  weights: 0.75591
   weights: 0
-  weights: 0.22015
+  weights: 0.2199
   weights: 0
   weights: 0
-  weights: 0.5387
+  weights: 0.53602
   weights: 0
   weights: 0
-  weights: 6.61337
-  weights: 1.72512
+  weights: 6.16382
+  weights: 1.71894
   weights: 0
   weights: 0
   weights: 0
@@ -300,16 +300,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.97171
+  weights: 0.97262
   weights: 0
-  weights: 0.30655
+  weights: 0.30688
   weights: 0
   weights: 0
-  weights: 0.66516
+  weights: 0.66574
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.62657
+  weights: 3.52501
   weights: 0
   weights: 0
   weights: 0
@@ -349,16 +349,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.00709
   weights: 0
-  weights: 1.0872
+  weights: 1.08756
   weights: 0
-  weights: 0.31688
+  weights: 0.3165
   weights: 0
   weights: 0
-  weights: 0.77032
+  weights: 0.77106
   weights: 0
   weights: 0
-  weights: 15.0715
-  weights: 3.20448
+  weights: 14.72296
+  weights: 3.19603
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl25-Average-Default"
  value: {
-  dps: 190.90871
-  tps: 155.98116
+  dps: 191.03118
+  tps: 156.06534
  }
 }
 dps_results: {
@@ -491,22 +491,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 189.72104
+  dps: 189.72087
   tps: 155.11549
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-TheFiveThunders"
  value: {
-  dps: 420.3398
-  tps: 423.96341
+  dps: 420.49507
+  tps: 424.12144
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Average-Default"
  value: {
-  dps: 550.18801
-  tps: 477.19969
+  dps: 548.31173
+  tps: 475.24315
  }
 }
 dps_results: {
@@ -596,8 +596,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 549.57598
-  tps: 476.64061
+  dps: 548.72096
+  tps: 475.73188
  }
 }
 dps_results: {
@@ -610,8 +610,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl50-Average-Default"
  value: {
-  dps: 1061.82504
-  tps: 953.58932
+  dps: 1062.6519
+  tps: 954.16604
  }
 }
 dps_results: {
@@ -701,22 +701,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1057.50975
-  tps: 948.10372
+  dps: 1058.29396
+  tps: 949.23318
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
   dps: 712.73207
-  tps: 767.85787
+  tps: 767.85839
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sMail"
  value: {
   dps: 712.9767
-  tps: 768.00483
+  tps: 768.00498
  }
 }
 dps_results: {
@@ -750,15 +750,15 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1011.90761
-  tps: 1057.39482
+  dps: 1014.36259
+  tps: 1060.13814
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 1088.23843
-  tps: 1132.86206
+  dps: 1090.96243
+  tps: 1135.87547
  }
 }
 dps_results: {
@@ -771,8 +771,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-Average-Default"
  value: {
-  dps: 1317.82559
-  tps: 1219.68328
+  dps: 1319.0096
+  tps: 1220.6091
  }
 }
 dps_results: {
@@ -862,7 +862,7 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1305.75336
-  tps: 1207.75132
+  dps: 1306.11629
+  tps: 1207.6641
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index d83929b607..0f79ca3ef8 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -264,8 +264,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.45928
-  weights: 5.6103
-  weights: 8.56827
+  weights: 5.61896
+  weights: 8.3496
   weights: 0
   weights: 0
   weights: 0
@@ -295,12 +295,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Lvl50-StatWeights-Default"
  value: {
-  weights: 1.46297
-  weights: 0.00953
+  weights: 1.46192
+  weights: 0.60158
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.48662
+  weights: 0.48435
   weights: 0
   weights: 0
   weights: 0
@@ -312,9 +312,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.61573
-  weights: 10.30677
-  weights: 8.12082
+  weights: 0.61529
+  weights: 10.02538
+  weights: 8.47181
   weights: 0
   weights: 0
   weights: 0
@@ -344,12 +344,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.41194
-  weights: 0.35295
+  weights: 1.41252
+  weights: 0.39359
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.53846
+  weights: 0.5391
   weights: 0
   weights: 0
   weights: 0
@@ -361,9 +361,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.64179
-  weights: 28.38052
-  weights: 9.4819
+  weights: 0.64205
+  weights: 26.55773
+  weights: 9.35804
   weights: 0
   weights: 0
   weights: 0
@@ -589,8 +589,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl40-Average-Default"
  value: {
-  dps: 861.41978
-  tps: 912.02242
+  dps: 861.3905
+  tps: 911.98143
  }
 }
 dps_results: {
@@ -778,8 +778,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl50-Average-Default"
  value: {
-  dps: 1668.66663
-  tps: 1226.66831
+  dps: 1668.14542
+  tps: 1227.5522
  }
 }
 dps_results: {
@@ -953,78 +953,78 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1543.62974
-  tps: 1134.56854
+  dps: 1543.51332
+  tps: 1135.35572
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1174.95172
-  tps: 1242.42105
+  dps: 1179.1499
+  tps: 1247.56925
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1227.44773
-  tps: 1294.86499
+  dps: 1231.89236
+  tps: 1300.33067
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1285.15026
-  tps: 1355.16976
+  dps: 1288.29358
+  tps: 1358.32652
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1207.55273
-  tps: 1274.74026
+  dps: 1212.03683
+  tps: 1280.13201
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1174.86116
-  tps: 1242.35095
+  dps: 1179.12904
+  tps: 1247.47353
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1210.7251
-  tps: 1278.21489
+  dps: 1215.11354
+  tps: 1283.45802
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1673.69664
-  tps: 1753.97246
+  dps: 1678.69917
+  tps: 1761.45989
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 1636.51902
-  tps: 1719.77285
+  dps: 1642.26976
+  tps: 1726.29358
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 415.38639
-  tps: 439.34968
+  dps: 415.28404
+  tps: 439.24959
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-Average-Default"
  value: {
-  dps: 2284.75957
-  tps: 1681.64373
+  dps: 2285.006
+  tps: 1682.95369
  }
 }
 dps_results: {
@@ -1198,7 +1198,7 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1756.75986
-  tps: 1300.46574
+  dps: 1758.88489
+  tps: 1301.68703
  }
 }
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 1dbe912880..865c8c7898 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.03084
+  weights: 0.27528
   weights: 0
-  weights: 1.29073
+  weights: 1.34064
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.71761
-  weights: 1.53791
+  weights: 3.75613
+  weights: 1.51493
   weights: 0
   weights: 0
   weights: 0
@@ -200,9 +200,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -2.01877
+  weights: 0.15915
   weights: 0
-  weights: 0.78592
+  weights: 0.83029
   weights: 0
   weights: 0
   weights: 0
@@ -210,8 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.76552
-  weights: 8.49773
+  weights: 4.92288
+  weights: 6.88164
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.97751
+  weights: 5.58752
   weights: 0
-  weights: 1.893
+  weights: 3.40014
   weights: 0
   weights: 0
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 15.96845
-  weights: 15.89471
+  weights: 15.91498
+  weights: 12.63863
   weights: 0
   weights: 0
   weights: 0
@@ -302,8 +302,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl40-Average-Default"
  value: {
-  dps: 509.31394
-  tps: 495.24453
+  dps: 509.16563
+  tps: 495.06688
  }
 }
 dps_results: {
@@ -351,8 +351,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 511.04372
-  tps: 497.0408
+  dps: 510.95502
+  tps: 496.88046
  }
 }
 dps_results: {
@@ -365,8 +365,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl50-Average-Default"
  value: {
-  dps: 1189.35413
-  tps: 1039.05945
+  dps: 1190.07584
+  tps: 1039.75403
  }
 }
 dps_results: {
@@ -414,8 +414,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1183.82315
-  tps: 1033.74368
+  dps: 1181.34046
+  tps: 1031.58379
  }
 }
 dps_results: {
@@ -442,8 +442,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2058.1844
-  tps: 1903.18656
+  dps: 2057.9889
+  tps: 1902.21652
  }
 }
 dps_results: {
@@ -463,29 +463,29 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1630.70754
-  tps: 1525.96604
+  dps: 1628.7369
+  tps: 1524.16016
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1601.85343
-  tps: 1497.73317
+  dps: 1602.87783
+  tps: 1499.1007
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2042.09457
-  tps: 1885.68575
+  dps: 2059.40887
+  tps: 1903.70458
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Average-Default"
  value: {
-  dps: 2121.57534
-  tps: 1961.06149
+  dps: 2121.45479
+  tps: 1961.03258
  }
 }
 dps_results: {
@@ -533,7 +533,7 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2107.58657
-  tps: 1947.22715
+  dps: 2109.77208
+  tps: 1949.05154
  }
 }
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
index b92da10118..d27abffda2 100644
--- a/sim/warlock/dps/TestDemonology.results
+++ b/sim/warlock/dps/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15653
+  weights: -0.43976
   weights: 0
-  weights: 0.87801
+  weights: 0.41267
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.47631
-  weights: 2.13801
+  weights: 5.78914
+  weights: 2.27937
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 585.42885
-  tps: 454.96704
+  dps: 583.29945
+  tps: 452.83628
  }
 }
 dps_results: {
@@ -155,7 +155,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 586.60324
-  tps: 457.12106
+  dps: 584.04074
+  tps: 454.92867
  }
 }
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index 075be9070c..f62e9b4341 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -202,7 +202,7 @@ stat_weights_results: {
   weights: 0
   weights: -0.27694
   weights: 0
-  weights: 0.64921
+  weights: 0.64646
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.01317
+  weights: -1.18194
   weights: 0
-  weights: -1.0326
+  weights: 2.00882
   weights: 0
   weights: 0
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.62658
-  weights: 1.78647
+  weights: 7.97007
+  weights: 2.80383
   weights: 0
   weights: 0
   weights: 0
@@ -298,9 +298,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.70345
+  weights: -10.30937
   weights: 0
-  weights: -2.1209
+  weights: 6.66759
   weights: 0
   weights: 0
   weights: 0
@@ -308,8 +308,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 29.0706
-  weights: 12.7386
+  weights: 29.15513
+  weights: 14.96938
   weights: 0
   weights: 0
   weights: 0
@@ -347,9 +347,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.01419
+  weights: 5.25592
   weights: 0
-  weights: 1.3026
+  weights: 1.31359
   weights: 0
   weights: 0
   weights: 0
@@ -358,7 +358,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 19.3361
+  weights: 43.13305
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-Average-Default"
  value: {
-  dps: 193.69505
-  tps: 159.00154
+  dps: 192.81491
+  tps: 158.1214
  }
 }
 dps_results: {
@@ -449,8 +449,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 193.73626
-  tps: 159.09545
+  dps: 192.83254
+  tps: 158.19174
  }
 }
 dps_results: {
@@ -463,8 +463,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-  dps: 566.1329
-  tps: 490.85301
+  dps: 566.35808
+  tps: 491.17118
  }
 }
 dps_results: {
@@ -512,8 +512,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 565.86225
-  tps: 490.64227
+  dps: 559.91916
+  tps: 485.03175
  }
 }
 dps_results: {
@@ -526,8 +526,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-  dps: 1313.58183
-  tps: 1176.38876
+  dps: 1313.48711
+  tps: 1176.38259
  }
 }
 dps_results: {
@@ -575,15 +575,15 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1298.04286
-  tps: 1162.76084
+  dps: 1291.47932
+  tps: 1156.86173
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1366.34624
-  tps: 1223.0551
+  dps: 1370.83312
+  tps: 1227.74839
  }
 }
 dps_results: {
@@ -596,15 +596,15 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1356.12301
-  tps: 1215.26636
+  dps: 1352.56801
+  tps: 1210.48208
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2168.51833
-  tps: 1953.19857
+  dps: 2151.17412
+  tps: 1935.26269
  }
 }
 dps_results: {
@@ -617,36 +617,36 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1366.34624
-  tps: 1223.0551
+  dps: 1370.83312
+  tps: 1227.74839
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1814.39592
-  tps: 1667.00953
+  dps: 1821.75645
+  tps: 1676.16343
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1785.17829
-  tps: 1635.76336
+  dps: 1772.56748
+  tps: 1622.5091
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2159.51804
-  tps: 1946.7226
+  dps: 2162.36051
+  tps: 1949.63843
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Average-Default"
  value: {
-  dps: 2197.94642
-  tps: 1978.94143
+  dps: 2196.87784
+  tps: 1977.75536
  }
 }
 dps_results: {
@@ -694,7 +694,7 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2163.3791
-  tps: 1943.29844
+  dps: 2161.34821
+  tps: 1941.79431
  }
 }
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
index dced11ddcb..c48717e0fe 100644
--- a/sim/warlock/tank/TestAffliction.results
+++ b/sim/warlock/tank/TestAffliction.results
@@ -55,7 +55,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.04835
   weights: 0
-  weights: 0.54536
+  weights: 0.54254
   weights: 0
   weights: 0
   weights: 0
@@ -64,7 +64,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.47249
+  weights: 0.47102
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl25-Average-Default"
  value: {
-  dps: 173.87316
-  tps: 331.0974
+  dps: 172.96599
+  tps: 329.73664
  }
 }
 dps_results: {
@@ -197,7 +197,7 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 174.03296
-  tps: 331.32744
+  dps: 173.15399
+  tps: 330.00898
  }
 }
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index 6e6c080d1e..d3160fd5d3 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.23486
+  weights: 0.12436
   weights: 0
-  weights: 0.72345
+  weights: 0.64671
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.95994
-  weights: 1.47474
+  weights: 6.03339
+  weights: 1.45585
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 545.54
-  tps: 986.74844
+  dps: 543.66994
+  tps: 983.90774
  }
 }
 dps_results: {
@@ -155,7 +155,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 539.0973
-  tps: 976.45744
+  dps: 538.94579
+  tps: 977.63818
  }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 3d4ce29f3d..2cecb63c7d 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -153,7 +153,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.07352
   weights: 0
-  weights: 0.46341
+  weights: 0.46059
   weights: 0
   weights: 0
   weights: 0
@@ -162,7 +162,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.46769
+  weights: 0.4618
   weights: 0
   weights: 0
   weights: 0
@@ -200,9 +200,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.24874
+  weights: -0.20966
   weights: 0
-  weights: 0.63064
+  weights: 0.65836
   weights: 0
   weights: 0
   weights: 0
@@ -210,8 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.76182
-  weights: 2.61946
+  weights: 5.82681
+  weights: 2.57678
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.76078
+  weights: -0.16803
   weights: 0
-  weights: 2.19305
+  weights: 3.3769
   weights: 0
   weights: 0
   weights: 0
@@ -260,7 +260,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.05544
+  weights: 6.35655
   weights: 0
   weights: 0
   weights: 0
@@ -302,8 +302,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-Average-Default"
  value: {
-  dps: 153.09281
-  tps: 298.22158
+  dps: 152.18098
+  tps: 296.85383
  }
 }
 dps_results: {
@@ -351,8 +351,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 152.76073
-  tps: 297.82841
+  dps: 151.88176
+  tps: 296.50994
  }
 }
 dps_results: {
@@ -365,8 +365,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-  dps: 411.22147
-  tps: 963.79384
+  dps: 409.43674
+  tps: 961.11455
  }
 }
 dps_results: {
@@ -414,24 +414,24 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 404.61652
-  tps: 953.03176
+  dps: 402.83138
+  tps: 950.35018
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-AllItems-DeathmistRaiment"
  value: {
-  dps: 303.50094
-  tps: 211.45395
+  dps: 297.52654
+  tps: 205.37431
   hps: 9.8368
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-  dps: 1176.36583
-  tps: 2031.81997
-  hps: 18.3079
+  dps: 1169.86429
+  tps: 2021.95926
+  hps: 18.31172
  }
 }
 dps_results: {
@@ -485,8 +485,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1149.17696
-  tps: 1985.7694
-  hps: 18.35945
+  dps: 1144.64168
+  tps: 1983.02965
+  hps: 18.3283
  }
 }

From 86dae5f42faa165478a8aab564038a983a5cc04c Mon Sep 17 00:00:00 2001
From: adocoD <jannickhu@hotmail.com>
Date: Sun, 7 Jul 2024 21:31:21 +0200
Subject: [PATCH 2/3] Changed back from 1 to 5 and ranged to 12

---
 sim/core/attack.go                            |   8 +-
 sim/core/test_generators.go                   |   2 +-
 sim/druid/balance/TestBalance.results         |  84 ++++-----
 sim/hunter/TestBM.results                     | 164 ++++++++++--------
 sim/hunter/TestMM.results                     |  70 ++++----
 sim/hunter/TestSV.results                     | 128 ++++++++------
 sim/hunter/aimed_shot.go                      |   2 +-
 sim/hunter/arcane_shot.go                     |   2 +-
 sim/hunter/carve.go                           |   2 +-
 sim/hunter/chimera_shot.go                    |   2 +-
 sim/hunter/explosive_shot.go                  |   2 +-
 sim/hunter/flanking_strike.go                 |   2 +-
 sim/hunter/mongoose_bite.go                   |   2 +-
 sim/hunter/multi_shot.go                      |   2 +-
 sim/hunter/raptor_strike.go                   |   4 +-
 sim/hunter/serpent_sting.go                   |   2 +-
 sim/hunter/steady_shot.go                     |   2 +-
 sim/hunter/wing_clip.go                       |   2 +-
 sim/hunter/wyvern_strike.go                   |   2 +-
 sim/mage/TestArcane.results                   |  46 ++---
 sim/mage/TestFire.results                     |  68 ++++----
 sim/mage/TestFrost.results                    |  18 +-
 sim/priest/shadow/TestShadow.results          | 104 +++++------
 sim/shaman/elemental/TestElemental.results    |  84 ++++-----
 .../enhancement/TestEnhancement.results       |  84 ++++-----
 sim/warlock/dps/TestAffliction.results        |  64 +++----
 sim/warlock/dps/TestDemonology.results        |  16 +-
 sim/warlock/dps/TestDestruction.results       |  84 ++++-----
 sim/warlock/tank/TestAffliction.results       |  12 +-
 sim/warlock/tank/TestDemonology.results       |  16 +-
 sim/warlock/tank/TestDestruction.results      |  50 +++---
 ui/hunter/apls/p1_weave.apl.json              |   2 +-
 ui/hunter/apls/p2_ranged_bm.apl.json          |   2 +-
 33 files changed, 589 insertions(+), 545 deletions(-)

diff --git a/sim/core/attack.go b/sim/core/attack.go
index bebff9cf66..68bdc53291 100644
--- a/sim/core/attack.go
+++ b/sim/core/attack.go
@@ -517,14 +517,14 @@ func (aa *AutoAttacks) startPull(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 1 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
 			aa.oh.addWeaponAttack(sim, aa.mh.curSwingSpeed)
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 8 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 12 {
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}
 }
@@ -566,7 +566,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 1 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
 		aa.mh.swingAt = max(aa.mh.swingAt, sim.CurrentTime, 0)
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
@@ -575,7 +575,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 8 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 12 {
 		aa.ranged.swingAt = max(aa.ranged.swingAt, sim.CurrentTime, 0)
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}
diff --git a/sim/core/test_generators.go b/sim/core/test_generators.go
index e25bf6ea23..6f29314b55 100644
--- a/sim/core/test_generators.go
+++ b/sim/core/test_generators.go
@@ -450,7 +450,7 @@ func FullCharacterTestSuiteGenerator(configs []CharacterSuiteConfig) []TestGener
 				Rotation:      config.Rotation.Rotation,
 
 				InFrontOfTarget:    config.InFrontOfTarget,
-				DistanceFromTarget: 1,
+				DistanceFromTarget: 5,
 				ReactionTimeMs:     150,
 				ChannelClipDelayMs: 50,
 			},
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
index 8a31053733..0a5179d72f 100644
--- a/sim/druid/balance/TestBalance.results
+++ b/sim/druid/balance/TestBalance.results
@@ -249,7 +249,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.00446
+  weights: -0.00888
   weights: 0
   weights: 0.80631
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.66054
-  weights: 5.23672
+  weights: 6.6818
+  weights: 5.19571
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl25-Average-Default"
  value: {
-  dps: 179.4887
-  tps: 181.71194
+  dps: 179.42249
+  tps: 181.64573
  }
 }
 dps_results: {
@@ -498,15 +498,15 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-FeralheartRaiment"
  value: {
-  dps: 222.10434
-  tps: 230.51159
+  dps: 221.87766
+  tps: 230.27941
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Average-Default"
  value: {
-  dps: 654.10257
-  tps: 664.71218
+  dps: 653.96376
+  tps: 664.5731
  }
 }
 dps_results: {
@@ -597,21 +597,21 @@ dps_results: {
  key: "TestBalance-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 647.65654
-  tps: 658.2188
+  tps: 658.21605
  }
 }
 dps_results: {
  key: "TestBalance-Lvl50-AllItems-FeralheartRaiment"
  value: {
-  dps: 472.32498
-  tps: 487.08632
+  dps: 472.4627
+  tps: 487.22404
  }
 }
 dps_results: {
  key: "TestBalance-Lvl50-Average-Default"
  value: {
-  dps: 1285.21009
-  tps: 1298.9882
+  dps: 1284.89777
+  tps: 1298.67282
  }
 }
 dps_results: {
@@ -708,99 +708,99 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 642.3413
-  tps: 658.5078
+  dps: 640.69644
+  tps: 656.83837
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 599.67214
-  tps: 616.15331
+  dps: 599.25376
+  tps: 615.70543
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 574.28203
-  tps: 590.06013
+  dps: 574.03196
+  tps: 589.80514
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 780.89799
-  tps: 797.54141
+  dps: 781.10916
+  tps: 797.76733
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 574.49432
-  tps: 590.34124
+  dps: 574.14996
+  tps: 589.99197
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 598.91737
-  tps: 615.39854
+  dps: 598.50352
+  tps: 614.95519
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 614.07966
-  tps: 629.9905
+  dps: 614.49619
+  tps: 630.40703
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 783.83755
-  tps: 800.14173
+  dps: 783.78965
+  tps: 800.09382
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 554.08203
-  tps: 570.71337
+  dps: 553.86355
+  tps: 570.56455
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 642.3413
-  tps: 658.5078
+  dps: 640.69644
+  tps: 656.83837
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 599.67214
-  tps: 616.15331
+  dps: 599.25376
+  tps: 615.70543
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 574.28203
-  tps: 590.06013
+  dps: 574.03196
+  tps: 589.80514
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 840.22155
-  tps: 856.81089
+  dps: 841.37602
+  tps: 858.00469
  }
 }
 dps_results: {
  key: "TestBalance-Lvl60-Average-Default"
  value: {
-  dps: 1565.9965
-  tps: 1581.00986
+  dps: 1565.5451
+  tps: 1580.55388
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index df8ee7760c..04c8c9d5c2 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestBM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.19917
+  weights: 0.5359
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0017
-  weights: 1.19119
-  weights: 1.19249
+  weights: 0.02802
+  weights: 2.5825
+  weights: 2.2529
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.04637
+  weights: 0.13184
   weights: 0
   weights: 0
   weights: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestBM-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.23297
+  weights: 0.8079
   weights: 0
   weights: 0
   weights: 0
@@ -165,17 +165,17 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
+  weights: 0.31124
+  weights: 8.44271
+  weights: 7.62158
   weights: 0
-  weights: 2.68494
-  weights: 2.20355
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0
-  weights: 0.06253
+  weights: 0.06516
   weights: 0
   weights: 0
   weights: 0
@@ -197,160 +197,169 @@ stat_weights_results: {
 dps_results: {
  key: "TestBM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 121.07095
-  tps: 2.00489
+  dps: 330.07554
+  tps: 172.72722
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Average-Default"
  value: {
-  dps: 133.50163
-  tps: 1.67734
+  dps: 252.80261
+  tps: 104.90266
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 128.79458
-  tps: 5.25954
+  dps: 257.72821
+  tps: 119.0442
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 126.50587
-  tps: 2.97777
+  dps: 245.04571
+  tps: 105.68089
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 142.49123
-  tps: 14.88885
+  dps: 356.26811
+  tps: 153.1418
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 62.79353
-  tps: 3.37022
+  dps: 129.9132
+  tps: 65.46055
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 61.43628
-  tps: 1.84086
+  dps: 124.35146
+  tps: 59.64804
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 71.33753
-  tps: 9.20432
+  dps: 164.56247
+  tps: 78.73124
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 133.32568
-  tps: 5.15457
+  dps: 257.91801
+  tps: 115.81494
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 131.0742
-  tps: 2.89499
+  dps: 246.8775
+  tps: 102.67821
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 147.03843
-  tps: 14.47493
+  dps: 358.26057
+  tps: 150.8146
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 64.86401
-  tps: 3.31661
+  dps: 130.07871
+  tps: 64.10887
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 63.52715
-  tps: 1.80988
+  dps: 124.25077
+  tps: 57.64671
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 73.49368
-  tps: 9.04941
+  dps: 160.15572
+  tps: 74.25661
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 131.83928
-  tps: 1.76864
+  dps: 248.3383
+  tps: 103.15869
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 301.35382
+  dps: 527.06296
+  tps: 238.97786
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 290.97578
+  dps: 836.59954
+  tps: 320.1109
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Average-Default"
  value: {
-  dps: 293.85674
+  dps: 847.09336
+  tps: 326.90583
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 279.55979
+  dps: 1821.20835
+  tps: 1184.89474
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 279.55979
+  dps: 837.90083
+  tps: 326.81696
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 309.8841
+  dps: 879.77664
+  tps: 339.3802
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 131.77929
+  dps: 1015.91811
+  tps: 790.45397
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 131.77929
+  dps: 420.9362
+  tps: 169.29647
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 147.35168
+  dps: 455.38741
+  tps: 170.08554
  }
 }
 dps_results: {
@@ -398,37 +407,43 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 286.11789
+  dps: 512.55838
+  tps: 564.61171
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 286.11789
+  dps: 512.55838
+  tps: 240.05141
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 317.80828
+  dps: 548.8634
+  tps: 257.91959
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 136.04891
+  dps: 246.07684
+  tps: 449.92796
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 136.04891
+  dps: 246.07684
+  tps: 125.69401
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 152.01532
+  dps: 269.9229
+  tps: 130.908
  }
 }
 dps_results: {
@@ -476,37 +491,43 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 291.05668
+  dps: 1805.8468
+  tps: 1161.50171
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 291.05668
+  dps: 843.826
+  tps: 323.09824
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 323.72139
+  dps: 891.61084
+  tps: 332.72337
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 136.70438
+  dps: 1003.90037
+  tps: 778.30242
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 136.70438
+  dps: 424.35603
+  tps: 168.18546
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 153.663
+  dps: 455.45797
+  tps: 166.21835
  }
 }
 dps_results: {
@@ -554,37 +575,43 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 297.99277
+  dps: 526.86689
+  tps: 562.12478
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 297.99277
+  dps: 526.86689
+  tps: 239.40739
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 331.4387
+  dps: 563.62273
+  tps: 254.61929
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 141.48053
+  dps: 253.22927
+  tps: 447.1994
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 141.48053
+  dps: 253.22927
+  tps: 126.12835
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 158.5143
+  dps: 282.13349
+  tps: 130.23571
  }
 }
 dps_results: {
@@ -632,6 +659,7 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 291.05668
+  dps: 803.96822
+  tps: 299.90694
  }
 }
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index 0c3a61627c..19b1eae7b2 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestMM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.15476
+  weights: 0.43206
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.00173
-  weights: 1.14594
-  weights: 0.97019
+  weights: 0.03205
+  weights: 2.27875
+  weights: 2.05739
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0392
+  weights: 0.12514
   weights: 0
   weights: 0
   weights: 0
@@ -197,106 +197,106 @@ stat_weights_results: {
 dps_results: {
  key: "TestMM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 103.72042
-  tps: 2.11215
+  dps: 325.25372
+  tps: 181.78295
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Average-Default"
  value: {
-  dps: 114.19994
-  tps: 1.75676
+  dps: 238.71997
+  tps: 107.36929
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 109.00725
-  tps: 5.31781
+  dps: 240.47337
+  tps: 119.61973
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 106.72765
-  tps: 3.01951
+  dps: 229.70669
+  tps: 105.7416
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 121.91286
-  tps: 15.09756
+  dps: 344.47384
+  tps: 153.05402
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 52.93811
-  tps: 3.45156
+  dps: 120.06285
+  tps: 65.13581
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 51.56797
-  tps: 1.90723
+  dps: 115.51246
+  tps: 59.28238
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 61.03866
-  tps: 9.53616
+  dps: 165.39038
+  tps: 83.65758
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 114.26246
-  tps: 5.36017
+  dps: 246.31189
+  tps: 121.63138
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 111.96865
-  tps: 3.0581
+  dps: 234.55693
+  tps: 105.71372
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 127.4831
-  tps: 15.29051
+  dps: 351.27571
+  tps: 153.73803
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 55.53493
-  tps: 3.45866
+  dps: 122.38963
+  tps: 64.78513
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 54.15638
-  tps: 1.91137
+  dps: 117.68882
+  tps: 59.18667
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 63.83915
-  tps: 9.55687
+  dps: 163.96546
+  tps: 81.16107
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 112.64665
-  tps: 1.80279
+  dps: 236.06336
+  tps: 107.31619
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index 39d0550457..fdefd75ba4 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestSV-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.17702
+  weights: 0.46964
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0017
-  weights: 1.35752
-  weights: 0.84403
+  weights: 0.02865
+  weights: 3.27489
+  weights: 2.06157
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.03846
+  weights: 0.12114
   weights: 0
   weights: 0
   weights: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestSV-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.33781
+  weights: 0.94662
   weights: 0
   weights: 0
   weights: 0
@@ -165,17 +165,17 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
+  weights: 0.35631
+  weights: 0.36455
+  weights: 6.70309
   weights: 0
   weights: 0
-  weights: 1.94756
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.03514
+  weights: 0.03686
   weights: 0
   weights: 0
   weights: 0
@@ -197,201 +197,217 @@ stat_weights_results: {
 dps_results: {
  key: "TestSV-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 100.46196
-  tps: 1.96536
+  dps: 315.63215
+  tps: 171.51771
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Average-Default"
  value: {
-  dps: 110.55175
-  tps: 1.70098
+  dps: 228.97535
+  tps: 102.44453
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 107.26091
-  tps: 5.41256
+  dps: 234.40328
+  tps: 116.26614
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 104.94508
-  tps: 3.01721
+  dps: 222.95539
+  tps: 103.52661
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 120.07394
-  tps: 15.08607
+  dps: 344.64565
+  tps: 152.79244
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 52.38272
-  tps: 3.47066
+  dps: 118.11037
+  tps: 63.36897
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 50.79199
-  tps: 1.86525
+  dps: 112.82526
+  tps: 57.82169
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 60.1584
-  tps: 9.32626
+  dps: 158.17986
+  tps: 78.69066
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 111.09869
-  tps: 5.30525
+  dps: 235.20032
+  tps: 114.26719
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 108.74527
-  tps: 2.9336
+  dps: 224.9935
+  tps: 101.10596
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 123.68807
-  tps: 14.668
+  dps: 344.8195
+  tps: 149.85879
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 54.07827
-  tps: 3.41543
+  dps: 118.08339
+  tps: 62.57784
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 52.51459
-  tps: 1.83373
+  dps: 111.99553
+  tps: 55.9946
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 61.95537
-  tps: 9.16866
+  dps: 153.38241
+  tps: 74.32338
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 109.7591
-  tps: 1.80877
+  dps: 225.32728
+  tps: 102.15744
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 178.25182
+  dps: 434.39369
+  tps: 271.32762
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 169.29333
+  dps: 790.46674
+  tps: 355.09957
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Average-Default"
  value: {
-  dps: 170.54235
+  dps: 799.53008
+  tps: 361.30319
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 161.55121
+  dps: 1869.94639
+  tps: 1262.90741
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 161.55121
+  dps: 789.57246
+  tps: 358.72637
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 171.71757
+  dps: 816.767
+  tps: 376.03978
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 76.4107
+  dps: 1062.97185
+  tps: 836.63235
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 76.4107
+  dps: 409.53563
+  tps: 187.90722
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 82.41553
+  dps: 431.31528
+  tps: 187.66556
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 169.70691
+  dps: 1865.08931
+  tps: 1253.44618
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 169.70691
+  dps: 801.55906
+  tps: 360.98791
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 180.51601
+  dps: 825.5615
+  tps: 379.2634
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 80.33001
+  dps: 1055.03424
+  tps: 820.77818
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 80.33001
+  dps: 413.91904
+  tps: 187.9094
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 86.61353
+  dps: 439.52835
+  tps: 196.15882
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 169.70691
+  dps: 756.63543
+  tps: 336.64431
  }
 }
diff --git a/sim/hunter/aimed_shot.go b/sim/hunter/aimed_shot.go
index 4bbf4b566b..577b3edf0a 100644
--- a/sim/hunter/aimed_shot.go
+++ b/sim/hunter/aimed_shot.go
@@ -56,7 +56,7 @@ func (hunter *Hunter) getAimedShotConfig(rank int, timer *core.Timer) core.Spell
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/arcane_shot.go b/sim/hunter/arcane_shot.go
index a9b6d4247e..2f624fc0c3 100644
--- a/sim/hunter/arcane_shot.go
+++ b/sim/hunter/arcane_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) getArcaneShotConfig(rank int, timer *core.Timer) core.Spel
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/carve.go b/sim/hunter/carve.go
index 24803dada9..e049897007 100644
--- a/sim/hunter/carve.go
+++ b/sim/hunter/carve.go
@@ -50,7 +50,7 @@ func (hunter *Hunter) registerCarveSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1
+			return hunter.DistanceFromTarget <= 5
 		},
 
 		DamageMultiplier: 0.65,
diff --git a/sim/hunter/chimera_shot.go b/sim/hunter/chimera_shot.go
index 39a86e241c..31d4375d31 100644
--- a/sim/hunter/chimera_shot.go
+++ b/sim/hunter/chimera_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) registerChimeraShotSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/explosive_shot.go b/sim/hunter/explosive_shot.go
index 82ab61d5ce..1c4726b92f 100644
--- a/sim/hunter/explosive_shot.go
+++ b/sim/hunter/explosive_shot.go
@@ -47,7 +47,7 @@ func (hunter *Hunter) registerExplosiveShotSpell(timer *core.Timer) {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/flanking_strike.go b/sim/hunter/flanking_strike.go
index 8c6f2cf353..5e93787505 100644
--- a/sim/hunter/flanking_strike.go
+++ b/sim/hunter/flanking_strike.go
@@ -91,7 +91,7 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1
+			return hunter.DistanceFromTarget <= 5
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/mongoose_bite.go b/sim/hunter/mongoose_bite.go
index 05854aaa10..e2e7d05e42 100644
--- a/sim/hunter/mongoose_bite.go
+++ b/sim/hunter/mongoose_bite.go
@@ -42,7 +42,7 @@ func (hunter *Hunter) getMongooseBiteConfig(rank int) core.SpellConfig {
 		},
 
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1 && hunter.DefensiveState.IsActive()
+			return hunter.DistanceFromTarget <= 5 && hunter.DefensiveState.IsActive()
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
diff --git a/sim/hunter/multi_shot.go b/sim/hunter/multi_shot.go
index 068c7abec8..376ab5b1fa 100644
--- a/sim/hunter/multi_shot.go
+++ b/sim/hunter/multi_shot.go
@@ -56,7 +56,7 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
index 35ecb53c2c..c5c5487ff1 100644
--- a/sim/hunter/raptor_strike.go
+++ b/sim/hunter/raptor_strike.go
@@ -70,7 +70,7 @@ func (hunter *Hunter) getRaptorStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1
+			return hunter.DistanceFromTarget <= 5
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
@@ -172,7 +172,7 @@ func (hunter *Hunter) makeQueueSpellsAndAura(srcSpell *core.Spell) *core.Spell {
 			return hunter.curQueueAura != queueAura &&
 				hunter.CurrentMana() >= srcSpell.DefaultCast.Cost &&
 				sim.CurrentTime >= hunter.Hardcast.Expires &&
-				hunter.DistanceFromTarget <= 1 &&
+				hunter.DistanceFromTarget <= 5 &&
 				srcSpell.IsReady(sim)
 		},
 
diff --git a/sim/hunter/serpent_sting.go b/sim/hunter/serpent_sting.go
index a1864ee410..a0020277fc 100644
--- a/sim/hunter/serpent_sting.go
+++ b/sim/hunter/serpent_sting.go
@@ -37,7 +37,7 @@ func (hunter *Hunter) getSerpentStingConfig(rank int) core.SpellConfig {
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		DamageMultiplier: 1 + 0.02*float64(hunter.Talents.ImprovedSerpentSting),
diff --git a/sim/hunter/steady_shot.go b/sim/hunter/steady_shot.go
index 357b886e1a..636a55bcf5 100644
--- a/sim/hunter/steady_shot.go
+++ b/sim/hunter/steady_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) registerSteadyShotSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 8
+			return hunter.DistanceFromTarget >= 12
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/wing_clip.go b/sim/hunter/wing_clip.go
index 4d0eeecc38..df2a1ba2ac 100644
--- a/sim/hunter/wing_clip.go
+++ b/sim/hunter/wing_clip.go
@@ -30,7 +30,7 @@ func (hunter *Hunter) getWingClipConfig(rank int) core.SpellConfig {
 			IgnoreHaste: true,
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1
+			return hunter.DistanceFromTarget <= 5
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/wyvern_strike.go b/sim/hunter/wyvern_strike.go
index 2b3c42922c..0e5ab6257b 100644
--- a/sim/hunter/wyvern_strike.go
+++ b/sim/hunter/wyvern_strike.go
@@ -39,7 +39,7 @@ func (hunter *Hunter) getWyvernStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 1
+			return hunter.DistanceFromTarget <= 5
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index 1cd883652e..789f70a46c 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -102,10 +102,10 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.13634
+  weights: 0.02138
   weights: 0
-  weights: 0.47304
-  weights: 0.47304
+  weights: 0.4711
+  weights: 0.4711
   weights: 0
   weights: 0
   weights: 0
@@ -113,7 +113,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.40811
+  weights: 2.43921
   weights: 0
   weights: 0
   weights: 0
@@ -151,18 +151,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -3.86388
+  weights: -2.51567
   weights: 0
-  weights: 1.22232
-  weights: 0.38245
-  weights: 0.83988
+  weights: 1.21932
+  weights: 0.38206
+  weights: 0.83726
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 11.75083
+  weights: 11.39667
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestArcane-Lvl40-Average-Default"
  value: {
-  dps: 410.79058
-  tps: 254.39627
+  dps: 409.15278
+  tps: 253.40576
  }
 }
 dps_results: {
@@ -288,8 +288,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 420.06121
-  tps: 259.98801
+  dps: 417.26839
+  tps: 258.28982
  }
 }
 dps_results: {
@@ -323,8 +323,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 653.75316
-  tps: 665.87557
+  dps: 646.29768
+  tps: 658.42209
  }
 }
 dps_results: {
@@ -344,22 +344,22 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1516.76579
-  tps: 1534.79788
+  dps: 1500.95278
+  tps: 1518.92408
  }
 }
 dps_results: {
  key: "TestArcane-Lvl60-AllItems-Sorcerer'sRegalia"
  value: {
-  dps: 685.42829
-  tps: 697.99665
+  dps: 682.83219
+  tps: 695.65426
  }
 }
 dps_results: {
  key: "TestArcane-Lvl60-Average-Default"
  value: {
-  dps: 1830.89617
-  tps: 1849.35556
+  dps: 1825.74544
+  tps: 1844.20129
  }
 }
 dps_results: {
@@ -449,7 +449,7 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1815.59215
-  tps: 1833.65146
+  dps: 1820.64422
+  tps: 1838.75488
  }
 }
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index 3f82b5e9a0..9c4db658cd 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -151,18 +151,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.5419
+  weights: 1.3089
   weights: 0
-  weights: 0.61986
+  weights: 0.61862
   weights: 0
-  weights: 0.61986
+  weights: 0.61862
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.89445
-  weights: 6.30392
+  weights: 5.63235
+  weights: 6.50589
   weights: 0
   weights: 0
   weights: 0
@@ -211,7 +211,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 11.90025
+  weights: 12.02781
   weights: 0
   weights: 0
   weights: 0
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.35686
+  weights: 4.74166
   weights: 0
-  weights: 2.11895
+  weights: 2.12682
   weights: 0
-  weights: 2.11895
+  weights: 2.12682
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.09406
+  weights: 8.98325
   weights: 0
   weights: 0
   weights: 0
@@ -295,8 +295,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestFire-Lvl40-Average-Default"
  value: {
-  dps: 450.63511
-  tps: 327.54089
+  dps: 450.4571
+  tps: 327.41637
  }
 }
 dps_results: {
@@ -386,15 +386,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 449.99404
-  tps: 327.16792
+  dps: 449.46436
+  tps: 326.79714
  }
 }
 dps_results: {
  key: "TestFire-Lvl50-Average-Default"
  value: {
-  dps: 1273.38005
-  tps: 909.02474
+  dps: 1272.85317
+  tps: 908.65304
  }
 }
 dps_results: {
@@ -491,29 +491,29 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1941.10733
-  tps: 1123.4156
+  dps: 1943.13062
+  tps: 1124.47945
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1736.04614
-  tps: 1005.35095
+  dps: 1734.49039
+  tps: 1004.36451
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1921.46169
-  tps: 1112.20907
+  dps: 1922.26676
+  tps: 1112.39097
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1704.837
-  tps: 986.6085
+  dps: 1706.35664
+  tps: 987.29994
  }
 }
 dps_results: {
@@ -526,22 +526,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1941.10733
-  tps: 1123.4156
+  dps: 1943.13062
+  tps: 1124.47945
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1736.04614
-  tps: 1005.35095
+  dps: 1734.49039
+  tps: 1004.36451
  }
 }
 dps_results: {
  key: "TestFire-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 2278.16228
-  tps: 1403.37223
+  dps: 2274.7345
+  tps: 1401.29368
  }
 }
 dps_results: {
@@ -554,8 +554,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-Average-Default"
  value: {
-  dps: 2977.11754
-  tps: 1849.88183
+  dps: 2975.32014
+  tps: 1848.76402
  }
 }
 dps_results: {
@@ -645,7 +645,7 @@ dps_results: {
 dps_results: {
  key: "TestFire-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2969.51906
-  tps: 1843.64853
+  dps: 2974.81982
+  tps: 1845.92946
  }
 }
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index 23076f1dae..11099a4cf6 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -153,16 +153,16 @@ stat_weights_results: {
   weights: 0
   weights: 8.69663
   weights: 0
-  weights: 0.5502
+  weights: 0.549
   weights: 0
   weights: 0.14992
-  weights: 0.40028
+  weights: 0.39908
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: -5.40459
-  weights: 12.51764
+  weights: 13.00086
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 dps_results: {
  key: "TestFrost-Lvl50-Average-Default"
  value: {
-  dps: 1084.18285
-  tps: 850.9319
+  dps: 1083.76616
+  tps: 850.60304
  }
 }
 dps_results: {
@@ -358,8 +358,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Lvl60-Average-Default"
  value: {
-  dps: 741.02807
-  tps: 623.11274
+  dps: 741.00989
+  tps: 623.10628
  }
 }
 dps_results: {
@@ -449,7 +449,7 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 729.70121
-  tps: 614.5989
+  dps: 728.95233
+  tps: 614.11532
  }
 }
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index 62f704c370..2c55b25efa 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.22873
+  weights: 0.21119
   weights: 0
-  weights: 0.69429
+  weights: 0.69427
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.69429
+  weights: 0.69427
   weights: 0
   weights: 0.1009
-  weights: 1.31069
+  weights: 1.31029
   weights: 0
   weights: 0
   weights: 0
@@ -298,18 +298,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.21239
+  weights: 0.2179
   weights: 0
-  weights: 0.87979
+  weights: 0.87908
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.87979
+  weights: 0.87908
   weights: 0
   weights: 0.19439
-  weights: 4.67976
+  weights: 4.68382
   weights: 0
   weights: 0
   weights: 0
@@ -349,16 +349,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.20385
   weights: 0
-  weights: 0.98563
+  weights: 0.98445
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.98563
+  weights: 0.98445
   weights: 0
-  weights: 9.74801
-  weights: 6.3897
+  weights: 9.7897
+  weights: 6.4058
   weights: 0
   weights: 0
   weights: 0
@@ -505,8 +505,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl40-Average-Default"
  value: {
-  dps: 628.49535
-  tps: 497.30172
+  dps: 628.08447
+  tps: 496.95151
  }
 }
 dps_results: {
@@ -596,8 +596,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 627.8407
-  tps: 496.53501
+  dps: 628.09576
+  tps: 496.76576
  }
 }
 dps_results: {
@@ -611,9 +611,9 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl50-Average-Default"
  value: {
-  dps: 1155.42544
-  tps: 926.33839
-  hps: 15.63644
+  dps: 1154.4957
+  tps: 925.54638
+  hps: 15.62465
  }
 }
 dps_results: {
@@ -715,49 +715,49 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1153.54839
-  tps: 924.4674
-  hps: 16.32649
+  dps: 1153.21218
+  tps: 924.18498
+  hps: 16.31738
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BenevolentProphet'sVestments"
  value: {
-  dps: 1102.56025
-  tps: 1057.58182
-  hps: 17.84118
+  dps: 1102.22409
+  tps: 1057.25164
+  hps: 17.83603
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 971.74011
-  tps: 934.03933
-  hps: 18.56141
+  dps: 971.51161
+  tps: 933.81193
+  hps: 18.55627
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 878.23041
-  tps: 844.67311
-  hps: 18.28105
+  dps: 878.01448
+  tps: 844.45763
+  hps: 18.27333
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 965.22013
-  tps: 927.65766
-  hps: 18.56141
+  dps: 964.99288
+  tps: 927.42934
+  hps: 18.55627
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 877.99921
-  tps: 844.10287
-  hps: 18.28105
+  dps: 877.78328
+  tps: 843.88771
+  hps: 18.27333
  }
 }
 dps_results: {
@@ -771,25 +771,25 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 971.74011
-  tps: 934.03933
-  hps: 18.56141
+  dps: 971.51161
+  tps: 933.81193
+  hps: 18.55627
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 878.23041
-  tps: 844.67311
-  hps: 18.28105
+  dps: 878.01448
+  tps: 844.45763
+  hps: 18.27333
  }
 }
 dps_results: {
  key: "TestShadow-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1172.82945
-  tps: 1124.65867
-  hps: 17.84118
+  dps: 1172.47321
+  tps: 1124.31667
+  hps: 17.83603
  }
 }
 dps_results: {
@@ -803,9 +803,9 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-Average-Default"
  value: {
-  dps: 1504.90553
-  tps: 1384.54526
-  hps: 17.31158
+  dps: 1504.02543
+  tps: 1383.65955
+  hps: 17.30445
  }
 }
 dps_results: {
@@ -907,8 +907,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1507.11836
-  tps: 1385.90005
-  hps: 18.11502
+  dps: 1505.62159
+  tps: 1384.41647
+  hps: 18.10987
  }
 }
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index 6db40f5989..c727256024 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -202,16 +202,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.02401
   weights: 0
-  weights: 0.5196
+  weights: 0.51961
   weights: 0
-  weights: 0.21059
+  weights: 0.21054
   weights: 0
   weights: 0
-  weights: 0.30901
+  weights: 0.30908
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.52562
+  weights: 0.52354
   weights: 0
   weights: 0
   weights: 0
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.28188
+  weights: 0.53991
   weights: 0
-  weights: 0.75591
+  weights: 0.75885
   weights: 0
-  weights: 0.2199
+  weights: 0.22015
   weights: 0
   weights: 0
-  weights: 0.53602
+  weights: 0.5387
   weights: 0
   weights: 0
-  weights: 6.16382
-  weights: 1.71894
+  weights: 6.61337
+  weights: 1.72512
   weights: 0
   weights: 0
   weights: 0
@@ -300,16 +300,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.97262
+  weights: 0.97171
   weights: 0
-  weights: 0.30688
+  weights: 0.30655
   weights: 0
   weights: 0
-  weights: 0.66574
+  weights: 0.66516
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.52501
+  weights: 3.62657
   weights: 0
   weights: 0
   weights: 0
@@ -349,16 +349,16 @@ stat_weights_results: {
   weights: 0
   weights: 0.00709
   weights: 0
-  weights: 1.08756
+  weights: 1.0872
   weights: 0
-  weights: 0.3165
+  weights: 0.31688
   weights: 0
   weights: 0
-  weights: 0.77106
+  weights: 0.77032
   weights: 0
   weights: 0
-  weights: 14.72296
-  weights: 3.19603
+  weights: 15.0715
+  weights: 3.20448
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl25-Average-Default"
  value: {
-  dps: 191.03118
-  tps: 156.06534
+  dps: 190.90871
+  tps: 155.98116
  }
 }
 dps_results: {
@@ -491,22 +491,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 189.72087
+  dps: 189.72104
   tps: 155.11549
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-TheFiveThunders"
  value: {
-  dps: 420.49507
-  tps: 424.12144
+  dps: 420.3398
+  tps: 423.96341
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Average-Default"
  value: {
-  dps: 548.31173
-  tps: 475.24315
+  dps: 550.18801
+  tps: 477.19969
  }
 }
 dps_results: {
@@ -596,8 +596,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 548.72096
-  tps: 475.73188
+  dps: 549.57598
+  tps: 476.64061
  }
 }
 dps_results: {
@@ -610,8 +610,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl50-Average-Default"
  value: {
-  dps: 1062.6519
-  tps: 954.16604
+  dps: 1061.82504
+  tps: 953.58932
  }
 }
 dps_results: {
@@ -701,22 +701,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1058.29396
-  tps: 949.23318
+  dps: 1057.50975
+  tps: 948.10372
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
   dps: 712.73207
-  tps: 767.85839
+  tps: 767.85787
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sMail"
  value: {
   dps: 712.9767
-  tps: 768.00498
+  tps: 768.00483
  }
 }
 dps_results: {
@@ -750,15 +750,15 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1014.36259
-  tps: 1060.13814
+  dps: 1011.90761
+  tps: 1057.39482
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 1090.96243
-  tps: 1135.87547
+  dps: 1088.23843
+  tps: 1132.86206
  }
 }
 dps_results: {
@@ -771,8 +771,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-Average-Default"
  value: {
-  dps: 1319.0096
-  tps: 1220.6091
+  dps: 1317.82559
+  tps: 1219.68328
  }
 }
 dps_results: {
@@ -862,7 +862,7 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1306.11629
-  tps: 1207.6641
+  dps: 1305.75336
+  tps: 1207.75132
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 0f79ca3ef8..d83929b607 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -264,8 +264,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.45928
-  weights: 5.61896
-  weights: 8.3496
+  weights: 5.6103
+  weights: 8.56827
   weights: 0
   weights: 0
   weights: 0
@@ -295,12 +295,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Lvl50-StatWeights-Default"
  value: {
-  weights: 1.46192
-  weights: 0.60158
+  weights: 1.46297
+  weights: 0.00953
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.48435
+  weights: 0.48662
   weights: 0
   weights: 0
   weights: 0
@@ -312,9 +312,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.61529
-  weights: 10.02538
-  weights: 8.47181
+  weights: 0.61573
+  weights: 10.30677
+  weights: 8.12082
   weights: 0
   weights: 0
   weights: 0
@@ -344,12 +344,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.41252
-  weights: 0.39359
+  weights: 1.41194
+  weights: 0.35295
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.5391
+  weights: 0.53846
   weights: 0
   weights: 0
   weights: 0
@@ -361,9 +361,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.64205
-  weights: 26.55773
-  weights: 9.35804
+  weights: 0.64179
+  weights: 28.38052
+  weights: 9.4819
   weights: 0
   weights: 0
   weights: 0
@@ -589,8 +589,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl40-Average-Default"
  value: {
-  dps: 861.3905
-  tps: 911.98143
+  dps: 861.41978
+  tps: 912.02242
  }
 }
 dps_results: {
@@ -778,8 +778,8 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl50-Average-Default"
  value: {
-  dps: 1668.14542
-  tps: 1227.5522
+  dps: 1668.66663
+  tps: 1226.66831
  }
 }
 dps_results: {
@@ -953,78 +953,78 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1543.51332
-  tps: 1135.35572
+  dps: 1543.62974
+  tps: 1134.56854
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1179.1499
-  tps: 1247.56925
+  dps: 1174.95172
+  tps: 1242.42105
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1231.89236
-  tps: 1300.33067
+  dps: 1227.44773
+  tps: 1294.86499
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1288.29358
-  tps: 1358.32652
+  dps: 1285.15026
+  tps: 1355.16976
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1212.03683
-  tps: 1280.13201
+  dps: 1207.55273
+  tps: 1274.74026
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1179.12904
-  tps: 1247.47353
+  dps: 1174.86116
+  tps: 1242.35095
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1215.11354
-  tps: 1283.45802
+  dps: 1210.7251
+  tps: 1278.21489
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1678.69917
-  tps: 1761.45989
+  dps: 1673.69664
+  tps: 1753.97246
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 1642.26976
-  tps: 1726.29358
+  dps: 1636.51902
+  tps: 1719.77285
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 415.28404
-  tps: 439.24959
+  dps: 415.38639
+  tps: 439.34968
  }
 }
 dps_results: {
  key: "TestEnhancement-Lvl60-Average-Default"
  value: {
-  dps: 2285.006
-  tps: 1682.95369
+  dps: 2284.75957
+  tps: 1681.64373
  }
 }
 dps_results: {
@@ -1198,7 +1198,7 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1758.88489
-  tps: 1301.68703
+  dps: 1756.75986
+  tps: 1300.46574
  }
 }
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 865c8c7898..1dbe912880 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.27528
+  weights: 0.03084
   weights: 0
-  weights: 1.34064
+  weights: 1.29073
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.75613
-  weights: 1.51493
+  weights: 3.71761
+  weights: 1.53791
   weights: 0
   weights: 0
   weights: 0
@@ -200,9 +200,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15915
+  weights: -2.01877
   weights: 0
-  weights: 0.83029
+  weights: 0.78592
   weights: 0
   weights: 0
   weights: 0
@@ -210,8 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.92288
-  weights: 6.88164
+  weights: 6.76552
+  weights: 8.49773
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.58752
+  weights: -0.97751
   weights: 0
-  weights: 3.40014
+  weights: 1.893
   weights: 0
   weights: 0
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 15.91498
-  weights: 12.63863
+  weights: 15.96845
+  weights: 15.89471
   weights: 0
   weights: 0
   weights: 0
@@ -302,8 +302,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl40-Average-Default"
  value: {
-  dps: 509.16563
-  tps: 495.06688
+  dps: 509.31394
+  tps: 495.24453
  }
 }
 dps_results: {
@@ -351,8 +351,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 510.95502
-  tps: 496.88046
+  dps: 511.04372
+  tps: 497.0408
  }
 }
 dps_results: {
@@ -365,8 +365,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl50-Average-Default"
  value: {
-  dps: 1190.07584
-  tps: 1039.75403
+  dps: 1189.35413
+  tps: 1039.05945
  }
 }
 dps_results: {
@@ -414,8 +414,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1181.34046
-  tps: 1031.58379
+  dps: 1183.82315
+  tps: 1033.74368
  }
 }
 dps_results: {
@@ -442,8 +442,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2057.9889
-  tps: 1902.21652
+  dps: 2058.1844
+  tps: 1903.18656
  }
 }
 dps_results: {
@@ -463,29 +463,29 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1628.7369
-  tps: 1524.16016
+  dps: 1630.70754
+  tps: 1525.96604
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1602.87783
-  tps: 1499.1007
+  dps: 1601.85343
+  tps: 1497.73317
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2059.40887
-  tps: 1903.70458
+  dps: 2042.09457
+  tps: 1885.68575
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Average-Default"
  value: {
-  dps: 2121.45479
-  tps: 1961.03258
+  dps: 2121.57534
+  tps: 1961.06149
  }
 }
 dps_results: {
@@ -533,7 +533,7 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2109.77208
-  tps: 1949.05154
+  dps: 2107.58657
+  tps: 1947.22715
  }
 }
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
index d27abffda2..b92da10118 100644
--- a/sim/warlock/dps/TestDemonology.results
+++ b/sim/warlock/dps/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.43976
+  weights: 0.15653
   weights: 0
-  weights: 0.41267
+  weights: 0.87801
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.78914
-  weights: 2.27937
+  weights: 6.47631
+  weights: 2.13801
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 583.29945
-  tps: 452.83628
+  dps: 585.42885
+  tps: 454.96704
  }
 }
 dps_results: {
@@ -155,7 +155,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 584.04074
-  tps: 454.92867
+  dps: 586.60324
+  tps: 457.12106
  }
 }
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index f62e9b4341..075be9070c 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -202,7 +202,7 @@ stat_weights_results: {
   weights: 0
   weights: -0.27694
   weights: 0
-  weights: 0.64646
+  weights: 0.64921
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -1.18194
+  weights: 3.01317
   weights: 0
-  weights: 2.00882
+  weights: -1.0326
   weights: 0
   weights: 0
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 7.97007
-  weights: 2.80383
+  weights: 2.62658
+  weights: 1.78647
   weights: 0
   weights: 0
   weights: 0
@@ -298,9 +298,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -10.30937
+  weights: -0.70345
   weights: 0
-  weights: 6.66759
+  weights: -2.1209
   weights: 0
   weights: 0
   weights: 0
@@ -308,8 +308,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 29.15513
-  weights: 14.96938
+  weights: 29.0706
+  weights: 12.7386
   weights: 0
   weights: 0
   weights: 0
@@ -347,9 +347,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.25592
+  weights: 0.01419
   weights: 0
-  weights: 1.31359
+  weights: 1.3026
   weights: 0
   weights: 0
   weights: 0
@@ -358,7 +358,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 43.13305
+  weights: 19.3361
   weights: 0
   weights: 0
   weights: 0
@@ -400,8 +400,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-Average-Default"
  value: {
-  dps: 192.81491
-  tps: 158.1214
+  dps: 193.69505
+  tps: 159.00154
  }
 }
 dps_results: {
@@ -449,8 +449,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 192.83254
-  tps: 158.19174
+  dps: 193.73626
+  tps: 159.09545
  }
 }
 dps_results: {
@@ -463,8 +463,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-  dps: 566.35808
-  tps: 491.17118
+  dps: 566.1329
+  tps: 490.85301
  }
 }
 dps_results: {
@@ -512,8 +512,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 559.91916
-  tps: 485.03175
+  dps: 565.86225
+  tps: 490.64227
  }
 }
 dps_results: {
@@ -526,8 +526,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-  dps: 1313.48711
-  tps: 1176.38259
+  dps: 1313.58183
+  tps: 1176.38876
  }
 }
 dps_results: {
@@ -575,15 +575,15 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1291.47932
-  tps: 1156.86173
+  dps: 1298.04286
+  tps: 1162.76084
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1370.83312
-  tps: 1227.74839
+  dps: 1366.34624
+  tps: 1223.0551
  }
 }
 dps_results: {
@@ -596,15 +596,15 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1352.56801
-  tps: 1210.48208
+  dps: 1356.12301
+  tps: 1215.26636
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2151.17412
-  tps: 1935.26269
+  dps: 2168.51833
+  tps: 1953.19857
  }
 }
 dps_results: {
@@ -617,36 +617,36 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1370.83312
-  tps: 1227.74839
+  dps: 1366.34624
+  tps: 1223.0551
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1821.75645
-  tps: 1676.16343
+  dps: 1814.39592
+  tps: 1667.00953
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1772.56748
-  tps: 1622.5091
+  dps: 1785.17829
+  tps: 1635.76336
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2162.36051
-  tps: 1949.63843
+  dps: 2159.51804
+  tps: 1946.7226
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Average-Default"
  value: {
-  dps: 2196.87784
-  tps: 1977.75536
+  dps: 2197.94642
+  tps: 1978.94143
  }
 }
 dps_results: {
@@ -694,7 +694,7 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2161.34821
-  tps: 1941.79431
+  dps: 2163.3791
+  tps: 1943.29844
  }
 }
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
index c48717e0fe..dced11ddcb 100644
--- a/sim/warlock/tank/TestAffliction.results
+++ b/sim/warlock/tank/TestAffliction.results
@@ -55,7 +55,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.04835
   weights: 0
-  weights: 0.54254
+  weights: 0.54536
   weights: 0
   weights: 0
   weights: 0
@@ -64,7 +64,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.47102
+  weights: 0.47249
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl25-Average-Default"
  value: {
-  dps: 172.96599
-  tps: 329.73664
+  dps: 173.87316
+  tps: 331.0974
  }
 }
 dps_results: {
@@ -197,7 +197,7 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 173.15399
-  tps: 330.00898
+  dps: 174.03296
+  tps: 331.32744
  }
 }
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index d3160fd5d3..6e6c080d1e 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.12436
+  weights: 0.23486
   weights: 0
-  weights: 0.64671
+  weights: 0.72345
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.03339
-  weights: 1.45585
+  weights: 5.95994
+  weights: 1.47474
   weights: 0
   weights: 0
   weights: 0
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 543.66994
-  tps: 983.90774
+  dps: 545.54
+  tps: 986.74844
  }
 }
 dps_results: {
@@ -155,7 +155,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 538.94579
-  tps: 977.63818
+  dps: 539.0973
+  tps: 976.45744
  }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 2cecb63c7d..3d4ce29f3d 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -153,7 +153,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.07352
   weights: 0
-  weights: 0.46059
+  weights: 0.46341
   weights: 0
   weights: 0
   weights: 0
@@ -162,7 +162,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.4618
+  weights: 0.46769
   weights: 0
   weights: 0
   weights: 0
@@ -200,9 +200,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.20966
+  weights: -0.24874
   weights: 0
-  weights: 0.65836
+  weights: 0.63064
   weights: 0
   weights: 0
   weights: 0
@@ -210,8 +210,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.82681
-  weights: 2.57678
+  weights: 5.76182
+  weights: 2.61946
   weights: 0
   weights: 0
   weights: 0
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.16803
+  weights: -0.76078
   weights: 0
-  weights: 3.3769
+  weights: 2.19305
   weights: 0
   weights: 0
   weights: 0
@@ -260,7 +260,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.35655
+  weights: 6.05544
   weights: 0
   weights: 0
   weights: 0
@@ -302,8 +302,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-Average-Default"
  value: {
-  dps: 152.18098
-  tps: 296.85383
+  dps: 153.09281
+  tps: 298.22158
  }
 }
 dps_results: {
@@ -351,8 +351,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 151.88176
-  tps: 296.50994
+  dps: 152.76073
+  tps: 297.82841
  }
 }
 dps_results: {
@@ -365,8 +365,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-  dps: 409.43674
-  tps: 961.11455
+  dps: 411.22147
+  tps: 963.79384
  }
 }
 dps_results: {
@@ -414,24 +414,24 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 402.83138
-  tps: 950.35018
+  dps: 404.61652
+  tps: 953.03176
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-AllItems-DeathmistRaiment"
  value: {
-  dps: 297.52654
-  tps: 205.37431
+  dps: 303.50094
+  tps: 211.45395
   hps: 9.8368
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl50-Average-Default"
  value: {
-  dps: 1169.86429
-  tps: 2021.95926
-  hps: 18.31172
+  dps: 1176.36583
+  tps: 2031.81997
+  hps: 18.3079
  }
 }
 dps_results: {
@@ -485,8 +485,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1144.64168
-  tps: 1983.02965
-  hps: 18.3283
+  dps: 1149.17696
+  tps: 1985.7694
+  hps: 18.35945
  }
 }
diff --git a/ui/hunter/apls/p1_weave.apl.json b/ui/hunter/apls/p1_weave.apl.json
index 0ccc2fc7c0..4c93e36de8 100644
--- a/ui/hunter/apls/p1_weave.apl.json
+++ b/ui/hunter/apls/p1_weave.apl.json
@@ -12,6 +12,6 @@
       {"action":{"castSpell":{"spellId":{"spellId":415320}}}},
       {"action":{"castSpell":{"spellId":{"spellId":14262,"tag":1,"rank":4}}}},
       {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":2643,"rank":1}}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}},
-      {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1.5s"}}}},"move":{"rangeFromTarget":{"const":{"val":"8"}}}}}
+      {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1.5s"}}}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}}
     ]
 }
\ No newline at end of file
diff --git a/ui/hunter/apls/p2_ranged_bm.apl.json b/ui/hunter/apls/p2_ranged_bm.apl.json
index 4a2a077938..270218264c 100644
--- a/ui/hunter/apls/p2_ranged_bm.apl.json
+++ b/ui/hunter/apls/p2_ranged_bm.apl.json
@@ -23,7 +23,7 @@
     {"action":{"castSpell":{"spellId":{"spellId":14264,"tag":1,"rank":6}}}},
     {"action":{"castSpell":{"spellId":{"spellId":415341,"rank":6}}}},
     {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":14288,"rank":2}}}}},{"spellIsReady":{"spellId":{"spellId":14264,"tag":1,"rank":6}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}},{"spellIsReady":{"spellId":{"spellId":415341,"rank":6}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}},
-    {"hide":true,"action":{"condition":{"or":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":14264,"tag":1,"rank":6}}}}},{"spellCanCast":{"spellId":{"spellId":409433}}},{"spellCanCast":{"spellId":{"spellId":14288,"rank":2}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":415341,"rank":6}}}}},{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"MainHand"}},"rhs":{"autoSwingTime":{"autoType":"MainHand"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"8"}}}}},
+    {"hide":true,"action":{"condition":{"or":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":14264,"tag":1,"rank":6}}}}},{"spellCanCast":{"spellId":{"spellId":409433}}},{"spellCanCast":{"spellId":{"spellId":14288,"rank":2}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":415341,"rank":6}}}}},{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"MainHand"}},"rhs":{"autoSwingTime":{"autoType":"MainHand"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}},
     {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},"castSpell":{"spellId":{"spellId":14284,"rank":5}}}},
     {"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":409526,"rank":3}}}}}]}},"castSpell":{"spellId":{"spellId":409526,"rank":3}}}},
     {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"itemId":3827}}}},

From eb69a4441172ba0485a58b93b598925d949a7185 Mon Sep 17 00:00:00 2001
From: adocoD <jannickhu@hotmail.com>
Date: Mon, 8 Jul 2024 04:02:45 +0200
Subject: [PATCH 3/3] Added constants for ranges and changed movespeed

---
 sim/core/attack.go            |  8 ++--
 sim/core/constants.go         |  3 ++
 sim/core/unit.go              |  2 +-
 sim/hunter/TestBM.results     | 68 +++++++++++++++++-----------------
 sim/hunter/TestMM.results     | 70 +++++++++++++++++------------------
 sim/hunter/TestSV.results     | 70 +++++++++++++++++------------------
 sim/hunter/aimed_shot.go      |  2 +-
 sim/hunter/arcane_shot.go     |  2 +-
 sim/hunter/carve.go           |  2 +-
 sim/hunter/chimera_shot.go    |  2 +-
 sim/hunter/explosive_shot.go  |  2 +-
 sim/hunter/flanking_strike.go |  2 +-
 sim/hunter/mongoose_bite.go   |  2 +-
 sim/hunter/multi_shot.go      |  2 +-
 sim/hunter/raptor_strike.go   |  4 +-
 sim/hunter/serpent_sting.go   |  2 +-
 sim/hunter/steady_shot.go     |  2 +-
 sim/hunter/wing_clip.go       |  2 +-
 sim/hunter/wyvern_strike.go   |  2 +-
 19 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/sim/core/attack.go b/sim/core/attack.go
index 68bdc53291..8231acd40f 100644
--- a/sim/core/attack.go
+++ b/sim/core/attack.go
@@ -517,14 +517,14 @@ func (aa *AutoAttacks) startPull(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= MaxMeleeAttackDistance {
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
 			aa.oh.addWeaponAttack(sim, aa.mh.curSwingSpeed)
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 12 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= MinRangedAttackDistance {
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}
 }
@@ -566,7 +566,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= MaxMeleeAttackDistance {
 		aa.mh.swingAt = max(aa.mh.swingAt, sim.CurrentTime, 0)
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
@@ -575,7 +575,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 12 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= MinRangedAttackDistance {
 		aa.ranged.swingAt = max(aa.ranged.swingAt, sim.CurrentTime, 0)
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}
diff --git a/sim/core/constants.go b/sim/core/constants.go
index ee218e48f0..d2de664bfc 100644
--- a/sim/core/constants.go
+++ b/sim/core/constants.go
@@ -13,6 +13,9 @@ const SpellBatchWindow = time.Millisecond * 10
 const DefaultAttackPowerPerDPS = 14.0
 const ArmorPenPerPercentArmor = 13.99
 
+const MaxMeleeAttackDistance = 5
+const MinRangedAttackDistance = 12
+
 const MissDodgeParryBlockCritChancePerDefense = 0.04
 
 const DefenseRatingToChanceReduction = (1.0 / DefenseRatingPerDefense) * MissDodgeParryBlockCritChancePerDefense / 100
diff --git a/sim/core/unit.go b/sim/core/unit.go
index 1025b5cf8a..0ae79c9310 100644
--- a/sim/core/unit.go
+++ b/sim/core/unit.go
@@ -428,7 +428,7 @@ func (unit *Unit) MoveTo(moveRange float64, sim *Simulation) {
 	unit.moveSpell.Cast(sim, unit.CurrentTarget)
 
 	sim.AddPendingAction(NewPeriodicAction(sim, PeriodicActionOptions{
-		Period:          time.Millisecond * 143,
+		Period:          time.Millisecond * 1000 / 7,
 		NumTicks:        int(moveTicks),
 		TickImmediately: false,
 
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index 04c8c9d5c2..74158e99b9 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestBM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.5359
+  weights: 0.53077
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.02802
-  weights: 2.5825
-  weights: 2.2529
+  weights: 0.02801
+  weights: 2.516
+  weights: 2.23961
   weights: 0
   weights: 0
   weights: 0
@@ -197,106 +197,106 @@ stat_weights_results: {
 dps_results: {
  key: "TestBM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 330.07554
-  tps: 172.72722
+  dps: 329.13801
+  tps: 171.79857
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Average-Default"
  value: {
-  dps: 252.80261
-  tps: 104.90266
+  dps: 252.85604
+  tps: 104.89061
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 257.72821
-  tps: 119.0442
+  dps: 257.62869
+  tps: 119.02478
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 245.04571
-  tps: 105.68089
+  dps: 245.53092
+  tps: 105.46271
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 356.26811
-  tps: 153.1418
+  dps: 357.79828
+  tps: 153.21729
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 129.9132
-  tps: 65.46055
+  dps: 129.82503
+  tps: 65.34086
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 124.35146
-  tps: 59.64804
+  dps: 124.43263
+  tps: 59.47774
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 164.56247
-  tps: 78.73124
+  dps: 165.47936
+  tps: 78.43874
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 257.91801
-  tps: 115.81494
+  dps: 258.30095
+  tps: 115.96123
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 246.8775
-  tps: 102.67821
+  dps: 247.09104
+  tps: 102.98106
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 358.26057
-  tps: 150.8146
+  dps: 358.97586
+  tps: 150.11605
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 130.07871
-  tps: 64.10887
+  dps: 130.0554
+  tps: 63.97371
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 124.25077
-  tps: 57.64671
+  dps: 124.5532
+  tps: 57.86326
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 160.15572
-  tps: 74.25661
+  dps: 161.12417
+  tps: 74.75417
  }
 }
 dps_results: {
  key: "TestBM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 248.3383
-  tps: 103.15869
+  dps: 248.07389
+  tps: 103.71803
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index 19b1eae7b2..e1046ff9fb 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestMM-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.43206
+  weights: 0.42143
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.03205
-  weights: 2.27875
-  weights: 2.05739
+  weights: 0.03208
+  weights: 2.0933
+  weights: 2.07672
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.12514
+  weights: 0.12499
   weights: 0
   weights: 0
   weights: 0
@@ -197,106 +197,106 @@ stat_weights_results: {
 dps_results: {
  key: "TestMM-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 325.25372
-  tps: 181.78295
+  dps: 325.01626
+  tps: 181.75677
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Average-Default"
  value: {
-  dps: 238.71997
-  tps: 107.36929
+  dps: 238.74394
+  tps: 107.31649
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 240.47337
-  tps: 119.61973
+  dps: 241.0249
+  tps: 119.84683
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 229.70669
-  tps: 105.7416
+  dps: 229.04531
+  tps: 105.46469
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 344.47384
-  tps: 153.05402
+  dps: 344.84387
+  tps: 152.67551
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 120.06285
-  tps: 65.13581
+  dps: 119.9057
+  tps: 64.81461
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 115.51246
-  tps: 59.28238
+  dps: 115.59932
+  tps: 59.43702
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Dwarf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 165.39038
-  tps: 83.65758
+  dps: 165.18412
+  tps: 82.93043
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 246.31189
-  tps: 121.63138
+  dps: 246.37548
+  tps: 121.34234
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 234.55693
-  tps: 105.71372
+  dps: 234.0019
+  tps: 105.24519
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 351.27571
-  tps: 153.73803
+  dps: 351.65613
+  tps: 153.37919
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 122.38963
-  tps: 64.78513
+  dps: 122.28699
+  tps: 64.50714
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 117.68882
-  tps: 59.18667
+  dps: 118.08539
+  tps: 59.36571
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 163.96546
-  tps: 81.16107
+  dps: 164.69071
+  tps: 81.12654
  }
 }
 dps_results: {
  key: "TestMM-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 236.06336
-  tps: 107.31619
+  dps: 235.76775
+  tps: 107.47194
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index fdefd75ba4..942f632d3d 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestSV-Lvl25-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.46964
+  weights: 0.46944
   weights: 0
   weights: 0
   weights: 0
@@ -116,9 +116,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.02865
-  weights: 3.27489
-  weights: 2.06157
+  weights: 0.02853
+  weights: 3.09965
+  weights: 2.05937
   weights: 0
   weights: 0
   weights: 0
@@ -126,7 +126,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.12114
+  weights: 0.12111
   weights: 0
   weights: 0
   weights: 0
@@ -197,106 +197,106 @@ stat_weights_results: {
 dps_results: {
  key: "TestSV-Lvl25-AllItems-BeastmasterArmor"
  value: {
-  dps: 315.63215
-  tps: 171.51771
+  dps: 315.54176
+  tps: 171.46691
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Average-Default"
  value: {
-  dps: 228.97535
-  tps: 102.44453
+  dps: 229.0378
+  tps: 102.46264
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 234.40328
-  tps: 116.26614
+  dps: 234.70818
+  tps: 116.51019
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 222.95539
-  tps: 103.52661
+  dps: 222.93762
+  tps: 103.47843
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 344.64565
-  tps: 152.79244
+  dps: 344.21197
+  tps: 152.47823
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 118.11037
-  tps: 63.36897
+  dps: 118.32782
+  tps: 63.68751
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 112.82526
-  tps: 57.82169
+  dps: 112.81679
+  tps: 57.87097
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-NightElf-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 158.17986
-  tps: 78.69066
+  dps: 157.96918
+  tps: 78.49461
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 235.20032
-  tps: 114.26719
+  dps: 235.22262
+  tps: 114.51388
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 224.9935
-  tps: 101.10596
+  dps: 224.81764
+  tps: 101.08274
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 344.8195
-  tps: 149.85879
+  dps: 344.10676
+  tps: 149.97081
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 118.08339
-  tps: 62.57784
+  dps: 117.9478
+  tps: 62.49287
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 111.99553
-  tps: 55.9946
+  dps: 111.91388
+  tps: 56.16102
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-Settings-Orc-phase1-Basic-p1_weave-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 153.38241
-  tps: 74.32338
+  dps: 153.28127
+  tps: 74.3443
  }
 }
 dps_results: {
  key: "TestSV-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 225.32728
-  tps: 102.15744
+  dps: 225.35881
+  tps: 102.06573
  }
 }
 dps_results: {
diff --git a/sim/hunter/aimed_shot.go b/sim/hunter/aimed_shot.go
index 577b3edf0a..a9a592be9e 100644
--- a/sim/hunter/aimed_shot.go
+++ b/sim/hunter/aimed_shot.go
@@ -56,7 +56,7 @@ func (hunter *Hunter) getAimedShotConfig(rank int, timer *core.Timer) core.Spell
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/arcane_shot.go b/sim/hunter/arcane_shot.go
index 2f624fc0c3..7bbf48ee4c 100644
--- a/sim/hunter/arcane_shot.go
+++ b/sim/hunter/arcane_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) getArcaneShotConfig(rank int, timer *core.Timer) core.Spel
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/carve.go b/sim/hunter/carve.go
index e049897007..5829fa88fe 100644
--- a/sim/hunter/carve.go
+++ b/sim/hunter/carve.go
@@ -50,7 +50,7 @@ func (hunter *Hunter) registerCarveSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance
 		},
 
 		DamageMultiplier: 0.65,
diff --git a/sim/hunter/chimera_shot.go b/sim/hunter/chimera_shot.go
index 31d4375d31..aba036cf35 100644
--- a/sim/hunter/chimera_shot.go
+++ b/sim/hunter/chimera_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) registerChimeraShotSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/explosive_shot.go b/sim/hunter/explosive_shot.go
index 1c4726b92f..45145cbd94 100644
--- a/sim/hunter/explosive_shot.go
+++ b/sim/hunter/explosive_shot.go
@@ -47,7 +47,7 @@ func (hunter *Hunter) registerExplosiveShotSpell(timer *core.Timer) {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/flanking_strike.go b/sim/hunter/flanking_strike.go
index 5e93787505..1ce9a4605b 100644
--- a/sim/hunter/flanking_strike.go
+++ b/sim/hunter/flanking_strike.go
@@ -91,7 +91,7 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/mongoose_bite.go b/sim/hunter/mongoose_bite.go
index e2e7d05e42..90b4c54582 100644
--- a/sim/hunter/mongoose_bite.go
+++ b/sim/hunter/mongoose_bite.go
@@ -42,7 +42,7 @@ func (hunter *Hunter) getMongooseBiteConfig(rank int) core.SpellConfig {
 		},
 
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5 && hunter.DefensiveState.IsActive()
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance && hunter.DefensiveState.IsActive()
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
diff --git a/sim/hunter/multi_shot.go b/sim/hunter/multi_shot.go
index 376ab5b1fa..93b79be44a 100644
--- a/sim/hunter/multi_shot.go
+++ b/sim/hunter/multi_shot.go
@@ -56,7 +56,7 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
index c5c5487ff1..e469375374 100644
--- a/sim/hunter/raptor_strike.go
+++ b/sim/hunter/raptor_strike.go
@@ -70,7 +70,7 @@ func (hunter *Hunter) getRaptorStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance
 		},
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
@@ -172,7 +172,7 @@ func (hunter *Hunter) makeQueueSpellsAndAura(srcSpell *core.Spell) *core.Spell {
 			return hunter.curQueueAura != queueAura &&
 				hunter.CurrentMana() >= srcSpell.DefaultCast.Cost &&
 				sim.CurrentTime >= hunter.Hardcast.Expires &&
-				hunter.DistanceFromTarget <= 5 &&
+				hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance &&
 				srcSpell.IsReady(sim)
 		},
 
diff --git a/sim/hunter/serpent_sting.go b/sim/hunter/serpent_sting.go
index a0020277fc..c13183d1b5 100644
--- a/sim/hunter/serpent_sting.go
+++ b/sim/hunter/serpent_sting.go
@@ -37,7 +37,7 @@ func (hunter *Hunter) getSerpentStingConfig(rank int) core.SpellConfig {
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		DamageMultiplier: 1 + 0.02*float64(hunter.Talents.ImprovedSerpentSting),
diff --git a/sim/hunter/steady_shot.go b/sim/hunter/steady_shot.go
index 636a55bcf5..09131b2348 100644
--- a/sim/hunter/steady_shot.go
+++ b/sim/hunter/steady_shot.go
@@ -46,7 +46,7 @@ func (hunter *Hunter) registerSteadyShotSpell() {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget >= 12
+			return hunter.DistanceFromTarget >= core.MinRangedAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/wing_clip.go b/sim/hunter/wing_clip.go
index df2a1ba2ac..3cd209d595 100644
--- a/sim/hunter/wing_clip.go
+++ b/sim/hunter/wing_clip.go
@@ -30,7 +30,7 @@ func (hunter *Hunter) getWingClipConfig(rank int) core.SpellConfig {
 			IgnoreHaste: true,
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),
diff --git a/sim/hunter/wyvern_strike.go b/sim/hunter/wyvern_strike.go
index 0e5ab6257b..473761aa4a 100644
--- a/sim/hunter/wyvern_strike.go
+++ b/sim/hunter/wyvern_strike.go
@@ -39,7 +39,7 @@ func (hunter *Hunter) getWyvernStrikeConfig(rank int) core.SpellConfig {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return hunter.DistanceFromTarget <= 5
+			return hunter.DistanceFromTarget <= core.MaxMeleeAttackDistance
 		},
 
 		CritDamageBonus: hunter.mortalShots(),