From a54330c2121c29375ed6c230ce8f31d38eb7030e Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Wed, 11 Sep 2024 14:48:13 +0200
Subject: [PATCH 01/11] Update SB build & add Incinerate

---
 sim/warlock/demonology/TestDemonology.results | 942 +++++++++---------
 sim/warlock/demonology/demonology_test.go     |   2 +-
 ui/core/launched_sims.ts                      |  84 +-
 ui/warlock/demonology/apls/default.apl.json   |  35 -
 .../demonology/apls/incinerate.apl.json       | 819 +++++++++++++++
 .../demonology/apls/shadow-bolt.apl.json      | 783 +++++++++++++++
 ui/warlock/demonology/presets.ts              |  37 +-
 ui/warlock/demonology/sim.ts                  |  12 +-
 8 files changed, 2156 insertions(+), 558 deletions(-)
 delete mode 100644 ui/warlock/demonology/apls/default.apl.json
 create mode 100644 ui/warlock/demonology/apls/incinerate.apl.json
 create mode 100644 ui/warlock/demonology/apls/shadow-bolt.apl.json

diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results
index a835153a8f..b83dde5bd5 100644
--- a/sim/warlock/demonology/TestDemonology.results
+++ b/sim/warlock/demonology/TestDemonology.results
@@ -38,1562 +38,1562 @@ character_stats_results: {
 dps_results: {
  key: "TestDemonology-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 30479.102
-  tps: 15371.13584
+  dps: 30412.13418
+  tps: 15391.08749
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 28465.29552
-  tps: 14485.79173
+  dps: 28506.5978
+  tps: 14539.46968
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 26910.26271
-  tps: 14532.53103
+  dps: 28694.27675
+  tps: 14544.69005
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 28887.2511
-  tps: 14716.79873
+  dps: 28865.81642
+  tps: 14762.41013
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 28973.39151
-  tps: 14752.05404
+  dps: 29144.78723
+  tps: 14842.20336
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 30278.54005
-  tps: 15219.08305
+  dps: 30207.61705
+  tps: 15237.16656
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 30407.13834
-  tps: 15031.32467
+  dps: 30527.86981
+  tps: 15126.13677
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 27916.60447
-  tps: 14236.49973
-  hps: 98.14692
+  dps: 28003.29856
+  tps: 14301.89153
+  hps: 98.311
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 29647.4296
-  tps: 15079.6097
+  dps: 29732.22064
+  tps: 15130.00751
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BindingPromise-67037"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 26642.93221
-  tps: 14443.03994
+  dps: 28415.84055
+  tps: 14441.47398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 28332.22435
-  tps: 14380.23944
+  dps: 28415.84055
+  tps: 14441.47398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 28470.94664
-  tps: 14431.52165
+  dps: 28555.05865
+  tps: 14493.08201
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 26270.23162
-  tps: 14275.83032
+  dps: 27997.08139
+  tps: 14286.17492
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 27283.20806
-  tps: 14851.44996
+  dps: 28847.21417
+  tps: 14771.26405
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 26255.46545
-  tps: 14252.99982
+  dps: 27998.20821
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 28336.84612
-  tps: 14459.156
+  dps: 28366.00078
+  tps: 14475.28457
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 27925.8677
-  tps: 14229.04946
+  dps: 28001.91147
+  tps: 14291.43857
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.20821
+  tps: 14286.90157
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.20821
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 28831.76245
-  tps: 14680.88452
+  dps: 28898.27023
+  tps: 14742.82447
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BottledLightning-66879"
  value: {
-  dps: 26956.16491
-  tps: 14612.75593
+  dps: 28629.855
+  tps: 14605.87356
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 30447.72432
-  tps: 15008.9693
+  dps: 30390.40025
+  tps: 15027.03072
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Brawler'sTrophy-71338"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 30650.00265
-  tps: 15456.64507
+  dps: 30596.58172
+  tps: 15477.15171
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 30550.7437
-  tps: 15403.7026
+  dps: 30477.67036
+  tps: 15425.64277
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Coren'sChilledChromiumCoaster-71335"
  value: {
-  dps: 28412.6159
-  tps: 14483.95353
+  dps: 28419.06233
+  tps: 14500.79271
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 27236.8997
-  tps: 14759.7303
+  dps: 28954.78913
+  tps: 14772.77247
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CrushingWeight-59506"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CrushingWeight-65118"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.20821
+  tps: 14286.90434
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 28906.89323
-  tps: 14729.51275
+  dps: 28954.76718
+  tps: 14772.75052
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 28112.64916
-  tps: 14322.60634
+  dps: 28187.00775
+  tps: 14369.34217
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 30347.56104
-  tps: 15250.08015
+  dps: 30270.70988
+  tps: 15270.00611
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 28796.74041
-  tps: 14738.91774
+  dps: 28803.61478
+  tps: 14796.75731
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 28416.35076
-  tps: 14477.61266
+  dps: 28435.52393
+  tps: 14493.34973
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 30278.54005
-  tps: 15219.08305
+  dps: 30207.61705
+  tps: 15237.16656
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 26762.20891
-  tps: 14533.19909
+  dps: 28375.82335
+  tps: 14505.74247
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 30447.72432
-  tps: 15309.24009
+  dps: 30390.40025
+  tps: 15328.76561
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 30347.56104
-  tps: 15250.08015
+  dps: 30270.70988
+  tps: 15270.00611
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 26910.26271
-  tps: 14532.53103
+  dps: 28694.27675
+  tps: 14544.69005
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 30278.54005
-  tps: 15219.08305
+  dps: 30207.61705
+  tps: 15237.16656
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FallofMortality-59500"
  value: {
-  dps: 28906.89323
-  tps: 14729.51275
+  dps: 28954.76718
+  tps: 14772.75052
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FallofMortality-65124"
  value: {
-  dps: 29040.46858
-  tps: 14808.4035
+  dps: 29107.53438
+  tps: 14865.93998
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 27312.35274
-  tps: 14837.4142
+  dps: 28935.9036
+  tps: 14784.23926
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 26543.66274
-  tps: 14386.42894
+  dps: 28216.65885
+  tps: 14442.0039
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 27129.58727
-  tps: 14704.16979
+  dps: 28860.1464
+  tps: 14729.22029
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 27925.84242
-  tps: 14230.54593
+  dps: 28005.02987
+  tps: 14288.47522
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 28099.36609
-  tps: 15270.10036
+  dps: 29792.55654
+  tps: 15227.11239
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 30278.54005
-  tps: 15219.06341
+  dps: 30207.61705
+  tps: 15237.12727
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FluidDeath-58181"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 30447.72432
-  tps: 15303.35228
+  dps: 30390.40025
+  tps: 15322.12172
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 28387.60159
-  tps: 14481.2875
+  dps: 28396.02422
+  tps: 14490.9011
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GaleofShadows-56138"
  value: {
-  dps: 29033.22463
-  tps: 14840.26185
+  dps: 28912.3763
+  tps: 14941.67017
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GaleofShadows-56462"
  value: {
-  dps: 29155.68549
-  tps: 14906.61073
+  dps: 28887.57229
+  tps: 14989.35775
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GearDetector-61462"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 24752.21356
-  tps: 12365.30029
+  dps: 24845.37961
+  tps: 12400.99587
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 28498.43363
-  tps: 14502.12471
+  dps: 28540.18611
+  tps: 14555.98951
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HarmlightToken-63839"
  value: {
-  dps: 29061.2286
-  tps: 14751.03094
+  dps: 29177.27605
+  tps: 14908.65136
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 29134.52897
-  tps: 14876.06813
+  dps: 29157.68962
+  tps: 15059.41965
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 29277.15885
-  tps: 14961.96753
+  dps: 29372.43735
+  tps: 15232.32205
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofRage-59224"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofRage-65072"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofSolace-55868"
  value: {
-  dps: 28364.86864
-  tps: 14501.38258
+  dps: 28298.61893
+  tps: 14551.87201
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofSolace-56393"
  value: {
-  dps: 28398.04523
-  tps: 14522.11642
+  dps: 28354.96599
+  tps: 14569.09885
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofThunder-55845"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofThunder-56370"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 30347.56104
-  tps: 15250.08015
+  dps: 30270.70988
+  tps: 15270.00611
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 28332.22435
-  tps: 14380.23944
+  dps: 28415.81818
+  tps: 14441.45161
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 28470.94664
-  tps: 14431.52165
+  dps: 28555.03614
+  tps: 14493.0595
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 27105.57291
-  tps: 14696.0777
+  dps: 28850.42006
+  tps: 14651.21003
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 27923.64617
-  tps: 14237.73706
+  dps: 27972.84754
+  tps: 14312.39889
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 27930.4906
-  tps: 14242.46703
+  dps: 27984.87091
+  tps: 14308.86836
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 26642.93221
-  tps: 14443.03994
+  dps: 28415.84055
+  tps: 14441.47398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 28203.40587
-  tps: 14426.47723
+  dps: 28226.97595
+  tps: 14513.02616
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 28203.40587
-  tps: 14426.47723
+  dps: 28226.97595
+  tps: 14513.02616
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 26650.71393
-  tps: 14520.41323
+  dps: 28214.16565
+  tps: 14457.03855
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeadenDespair-55816"
  value: {
-  dps: 27925.84242
-  tps: 14230.19277
+  dps: 28005.02987
+  tps: 14288.19774
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeadenDespair-56347"
  value: {
-  dps: 27925.84242
-  tps: 14230.54593
+  dps: 28005.02987
+  tps: 14288.47522
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 26263.22377
-  tps: 14287.78435
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 26263.22377
-  tps: 14287.78435
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 27925.88966
-  tps: 14229.05066
+  dps: 27988.26601
+  tps: 14293.71518
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 27925.88966
-  tps: 14229.05066
+  dps: 27988.26601
+  tps: 14293.71518
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 26450.04443
-  tps: 14287.78435
+  dps: 28213.88525
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 26473.39701
-  tps: 14287.78435
+  dps: 28240.84762
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 26534.63831
-  tps: 14411.2772
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 26534.63831
-  tps: 14411.2772
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 28470.94664
-  tps: 14431.52165
+  dps: 28555.03614
+  tps: 14493.0595
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 28470.94664
-  tps: 14431.52165
+  dps: 28555.03614
+  tps: 14493.0595
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MithrilStopwatch-71337"
  value: {
-  dps: 29544.50959
-  tps: 15023.2666
+  dps: 29546.28694
+  tps: 15037.72874
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 27666.06611
-  tps: 14834.9185
+  dps: 29292.03032
+  tps: 14804.22375
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 27925.84242
-  tps: 14230.82777
+  dps: 28005.02987
+  tps: 14288.69667
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 29612.57309
-  tps: 14970.55897
+  dps: 29684.04389
+  tps: 15040.61264
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 29901.05133
-  tps: 15094.27079
+  dps: 29945.78622
+  tps: 15152.45923
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 26543.18385
-  tps: 14405.65542
+  dps: 28249.84718
+  tps: 14427.03641
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedPickledEgg-71336"
  value: {
-  dps: 28957.45158
-  tps: 14756.27503
+  dps: 29017.16831
+  tps: 14804.2018
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 28838.77144
-  tps: 14684.30584
+  dps: 28881.15462
+  tps: 14731.42195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 30278.54005
-  tps: 15219.08305
+  dps: 30207.61705
+  tps: 15237.16656
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Rainsong-55854"
  value: {
-  dps: 27916.05747
-  tps: 14226.16972
+  dps: 27998.18626
+  tps: 14286.45189
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Rainsong-56377"
  value: {
-  dps: 27925.88966
-  tps: 14229.08801
+  dps: 28001.88952
+  tps: 14291.43135
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 30479.102
-  tps: 15371.13584
+  dps: 30412.13418
+  tps: 15391.08749
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 30479.102
-  tps: 15371.05335
+  dps: 30412.13418
+  tps: 15391.00802
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 26801.57166
-  tps: 14560.50848
+  dps: 28403.34693
+  tps: 14517.70912
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 28231.92508
-  tps: 14411.75695
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RuneofZeth-68998"
  value: {
-  dps: 27705.2427
-  tps: 15041.79796
+  dps: 29452.51429
+  tps: 15044.84575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SeaStar-55256"
  value: {
-  dps: 26769.55
-  tps: 14551.54582
+  dps: 28425.50397
+  tps: 14530.37781
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SeaStar-56290"
  value: {
-  dps: 27217.34061
-  tps: 14810.95453
+  dps: 28899.59457
+  tps: 14761.46394
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ShadowflameRegalia"
  value: {
-  dps: 27745.3042
-  tps: 14001.00412
+  dps: 27736.14728
+  tps: 14029.69166
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ShardofWoe-60233"
  value: {
-  dps: 28645.41931
-  tps: 14634.46481
+  dps: 28224.00755
+  tps: 14530.91967
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 27925.84242
-  tps: 14229.97205
+  dps: 28001.88642
+  tps: 14286.81146
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 26516.25625
-  tps: 14286.27206
+  dps: 28191.29547
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 26548.85511
-  tps: 14290.43109
+  dps: 28215.43138
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sorrowsong-55879"
  value: {
-  dps: 28936.28129
-  tps: 14682.60848
+  dps: 29016.79475
+  tps: 14744.2133
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sorrowsong-56400"
  value: {
-  dps: 29157.34628
-  tps: 14774.67867
+  dps: 28887.51965
+  tps: 14893.09973
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 26534.63831
-  tps: 14411.2772
+  dps: 28216.6369
+  tps: 14441.98195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SoulCasket-58183"
  value: {
-  dps: 28098.05792
-  tps: 15236.62584
+  dps: 29881.27285
+  tps: 15177.98468
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 28907.54744
-  tps: 14720.59803
+  dps: 28869.9989
+  tps: 14718.89849
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-StumpofTime-62465"
  value: {
-  dps: 29339.50138
-  tps: 14984.44069
+  dps: 29566.9123
+  tps: 14935.30206
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-StumpofTime-62470"
  value: {
-  dps: 29398.67304
-  tps: 14979.54953
+  dps: 29547.11573
+  tps: 14963.8781
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 27925.84242
-  tps: 14230.73269
+  dps: 28005.02987
+  tps: 14288.62196
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 27925.84242
-  tps: 14230.94322
+  dps: 28005.02987
+  tps: 14288.78738
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 29128.11196
-  tps: 14778.22151
+  dps: 29154.12942
+  tps: 14839.70211
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TearofBlood-55819"
  value: {
-  dps: 28599.02041
-  tps: 14558.58277
+  dps: 28641.51547
+  tps: 14618.30549
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TearofBlood-56351"
  value: {
-  dps: 28793.86209
-  tps: 14675.49074
+  dps: 28860.12445
+  tps: 14729.19833
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 28943.27145
-  tps: 14674.82292
+  dps: 29023.95126
+  tps: 14735.78984
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 29336.43542
-  tps: 14837.05233
+  dps: 29390.36161
+  tps: 14828.32352
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TheHungerer-68927"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TheHungerer-69112"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 29480.50348
-  tps: 14864.62798
+  dps: 29549.35445
+  tps: 14962.91895
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 29774.63179
-  tps: 15040.1821
+  dps: 30004.5977
+  tps: 15144.34177
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 28332.22435
-  tps: 14380.23944
+  dps: 28415.84055
+  tps: 14441.47398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 28470.94664
-  tps: 14431.52165
+  dps: 28555.05865
+  tps: 14493.08201
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 28125.6855
-  tps: 14315.42019
+  dps: 28170.76884
+  tps: 14389.75729
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 27215.08257
-  tps: 14820.41373
+  dps: 28875.49576
+  tps: 14867.20026
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnheededWarning-59520"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 26252.34809
-  tps: 14250.45227
+  dps: 27998.20821
+  tps: 14286.51344
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 26761.50384
-  tps: 14459.04498
+  dps: 28555.08117
+  tps: 14493.10453
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 29443.08554
-  tps: 15131.80468
+  dps: 29435.47628
+  tps: 15169.33103
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 30198.92083
-  tps: 15904.05334
+  dps: 30150.73564
+  tps: 15752.02932
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 27916.05747
-  tps: 14226.39282
+  dps: 27998.18626
+  tps: 14286.64989
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 27925.84242
-  tps: 14230.73269
+  dps: 28005.02987
+  tps: 14288.62196
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 27925.84242
-  tps: 14230.94322
+  dps: 28005.02987
+  tps: 14288.78738
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 26255.46545
-  tps: 14252.99982
+  dps: 27998.20821
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 27340.68051
-  tps: 14884.91592
+  dps: 28894.69147
+  tps: 14798.36295
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 26255.46545
-  tps: 14252.99982
+  dps: 27998.20821
+  tps: 14286.67184
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 28231.90313
-  tps: 14411.735
+  dps: 28216.65885
+  tps: 14440.0478
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 28555.69238
-  tps: 14610.86645
+  dps: 28385.96814
+  tps: 14610.23398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 28412.59395
-  tps: 14483.93157
+  dps: 28419.08428
+  tps: 14500.81466
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.20821
+  tps: 14286.91478
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 28470.92413
-  tps: 14431.49914
+  dps: 28555.08117
+  tps: 14493.34747
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.20821
+  tps: 14286.91478
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 27916.03551
-  tps: 14226.37087
+  dps: 27998.1643
+  tps: 14286.62794
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 28850.77663
-  tps: 14678.11672
+  dps: 28917.59912
+  tps: 14745.85281
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 27916.07942
-  tps: 14226.41478
+  dps: 27998.1643
+  tps: 14286.62794
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 28982.38187
-  tps: 14812.12342
+  dps: 28891.57541
+  tps: 14764.14369
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 29483.02442
-  tps: 15129.93557
+  dps: 29201.69866
+  tps: 15115.75715
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 26634.99424
-  tps: 14407.53369
+  dps: 28415.84055
+  tps: 14441.47398
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 26433.23503
-  tps: 14291.0311
+  dps: 28193.33939
+  tps: 14288.21375
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 26433.23503
-  tps: 14291.0311
+  dps: 28193.33939
+  tps: 14288.21375
  }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
  value: {
-  dps: 30784.1056
-  tps: 15616.42303
+  dps: 30796.81
+  tps: 15654.59399
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 45325.03428
-  tps: 41392.84133
+  dps: 45355.71758
+  tps: 41472.6787
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29846.47308
-  tps: 15404.63179
+  dps: 29812.44492
+  tps: 15471.19594
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47636.66714
-  tps: 22964.67148
+  dps: 46695.44967
+  tps: 23089.36431
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30536.26253
-  tps: 30130.4028
+  dps: 30416.6772
+  tps: 30071.13551
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 21186.64187
-  tps: 10754.09497
+  dps: 21055.7299
+  tps: 10740.09616
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 29174.37624
-  tps: 12921.25662
+  dps: 28521.20915
+  tps: 12665.25355
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 44804.08173
-  tps: 40803.88636
+  dps: 44695.05875
+  tps: 40572.42712
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29693.31568
-  tps: 15246.06692
+  dps: 29708.83275
+  tps: 15314.7272
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47129.53804
-  tps: 22755.90509
+  dps: 46133.78369
+  tps: 22819.04556
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30248.91805
-  tps: 29839.25601
+  dps: 30109.0485
+  tps: 29823.20889
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 20992.05993
-  tps: 10638.09738
+  dps: 20849.4507
+  tps: 10612.54922
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 28826.33592
-  tps: 12652.39482
+  dps: 28157.99353
+  tps: 12400.00502
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 46197.32962
-  tps: 41381.19729
+  dps: 45985.62043
+  tps: 41149.43015
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 30650.00265
-  tps: 15456.64507
+  dps: 30596.58172
+  tps: 15477.15171
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48912.76682
-  tps: 23093.8644
+  dps: 47892.93583
+  tps: 23177.6061
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31311.24577
-  tps: 30371.24285
+  dps: 31066.49731
+  tps: 30225.86033
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 21690.81423
-  tps: 10765.83878
+  dps: 21509.92224
+  tps: 10713.49505
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 30093.22634
-  tps: 12861.09506
+  dps: 29430.41712
+  tps: 12601.51237
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 46773.7499
-  tps: 42658.48401
+  dps: 46682.31368
+  tps: 42507.17115
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 30038.1814
-  tps: 15616.24449
+  dps: 29987.1255
+  tps: 15707.00035
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48734.30621
-  tps: 23917.78639
+  dps: 48332.94636
+  tps: 24202.77697
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31517.51802
-  tps: 30923.19751
+  dps: 31468.59069
+  tps: 30960.14929
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 21377.79822
-  tps: 10859.51354
+  dps: 21286.75557
+  tps: 10872.98049
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 30486.63239
-  tps: 13774.83395
+  dps: 29951.00559
+  tps: 13673.7378
  }
 }
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 30500.73363
-  tps: 15456.64507
+  dps: 30447.46709
+  tps: 15477.15171
  }
 }
diff --git a/sim/warlock/demonology/demonology_test.go b/sim/warlock/demonology/demonology_test.go
index c73aabb881..f77c31e35a 100644
--- a/sim/warlock/demonology/demonology_test.go
+++ b/sim/warlock/demonology/demonology_test.go
@@ -455,7 +455,7 @@ func TestDemonology(t *testing.T) {
 		Consumes:         fullConsumes,
 		SpecOptions:      core.SpecOptionsCombo{Label: "Demonology Warlock", SpecOptions: defaultDemonologyWarlock},
 		OtherSpecOptions: []core.SpecOptionsCombo{},
-		Rotation:         core.GetAplRotation("../../../ui/warlock/demonology/apls", "default"),
+		Rotation:         core.GetAplRotation("../../../ui/warlock/demonology/apls", "shadow-bolt"),
 		OtherRotations:   []core.RotationCombo{},
 		ItemFilter:       itemFilter,
 		StartingDistance: 25,
diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts
index 8d03288c1a..82b718ae8f 100644
--- a/ui/core/launched_sims.ts
+++ b/ui/core/launched_sims.ts
@@ -18,33 +18,33 @@ export type SimStatus = {
 };
 
 export const raidSimStatus: SimStatus = {
-	phase: Phase.Phase1,
+	phase: Phase.Phase2,
 	status: LaunchStatus.Unlaunched,
 };
 
 // This list controls which links are shown in the top-left dropdown menu.
 export const simLaunchStatuses: Record<Spec, SimStatus> = {
 	[Spec.SpecUnknown]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	// Death Knight
 	[Spec.SpecBloodDeathKnight]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecFrostDeathKnight]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecUnholyDeathKnight]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	// Druid
 	[Spec.SpecBalanceDruid]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecFeralDruid]: {
 		phase: Phase.Phase2,
@@ -55,112 +55,112 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
 		status: LaunchStatus.Launched,
 	},
 	[Spec.SpecRestorationDruid]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	// Hunter
 	[Spec.SpecBeastMasteryHunter]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecMarksmanshipHunter]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecSurvivalHunter]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	// Mage
 	[Spec.SpecArcaneMage]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecFireMage]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Launched,
 	},
 	[Spec.SpecFrostMage]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	// Paladin
 	[Spec.SpecHolyPaladin]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	[Spec.SpecProtectionPaladin]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Alpha,
 	},
 	[Spec.SpecRetributionPaladin]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	// Priest
 	[Spec.SpecDisciplinePriest]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	[Spec.SpecHolyPriest]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	[Spec.SpecShadowPriest]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	// Rogue
 	[Spec.SpecAssassinationRogue]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecCombatRogue]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecSubtletyRogue]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	// Shaman
 	[Spec.SpecElementalShaman]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecEnhancementShaman]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecRestorationShaman]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Unlaunched,
 	},
 	// Warlock
 	[Spec.SpecAfflictionWarlock]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecDemonologyWarlock]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecDestructionWarlock]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Beta,
 	},
 	// Warrior
 	[Spec.SpecArmsWarrior]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Launched,
 	},
 	[Spec.SpecFuryWarrior]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Launched,
 	},
 	[Spec.SpecProtectionWarrior]: {
-		phase: Phase.Phase1,
-		status: LaunchStatus.Alpha,
+		phase: Phase.Phase2,
+		status: LaunchStatus.Launched,
 	},
 };
 
diff --git a/ui/warlock/demonology/apls/default.apl.json b/ui/warlock/demonology/apls/default.apl.json
deleted file mode 100644
index a8643985fa..0000000000
--- a/ui/warlock/demonology/apls/default.apl.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{ "type": "TypeAPL",
-	"prepullActions": [
-		{"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}},
-		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.5s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}}
-	],
-	"priorityList": [
-		{"action":{"autocastOtherCooldowns":{}}},
-		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}}]}},"sequence":{"name":"doomguard","actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"spellId":82174}}},{"castSpell":{"spellId":{"spellId":18540}}}]}}},
-		{"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}},
-		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59672}}},"castSpell":{"spellId":{"itemId":58091}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"61s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":82174}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}},
-		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}},
-		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
-		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":89937}}},"castSpell":{"spellId":{"spellId":77799}}}},
-		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":50589}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":17941}}},"castSpell":{"spellId":{"spellId":686}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":71165}}},"castSpell":{"spellId":{"spellId":29722}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":63167}}},"castSpell":{"spellId":{"spellId":6353}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":686}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
-	]
-}
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
new file mode 100644
index 0000000000..007c77af8a
--- /dev/null
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -0,0 +1,819 @@
+{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 30146 } } },
+			"doAtValue": { "const": { "val": "-10s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 77801 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 74434 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 691 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": {
+				"castSpell": { "spellId": { "otherId": "OtherActionPotion" } }
+			},
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 59672 } } },
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 686 } } },
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 348 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 58183 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 56290 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 52353 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 82174 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 33697 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		}
+	],
+	"priorityList": [
+		{ "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": { "auraIsActive": { "auraId": { "spellId": 89937 } } },
+				"castSpell": { "spellId": { "spellId": 77799 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"or": {
+									"vals": [
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92318 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 89091 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91007 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91047 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90898 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90992 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91002 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpGe",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 92325 }
+																}
+															},
+															"rhs": { "const": { "val": "5" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpGe",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 91027 }
+																}
+															},
+															"rhs": { "const": { "val": "5" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpEq",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 90953 }
+																}
+															},
+															"rhs": { "const": { "val": "20" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpEq",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 90985 }
+																}
+															},
+															"rhs": { "const": { "val": "20" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92320 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91024 }
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92318 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 92318 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91007 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91007 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91047 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91047 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 89091 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 89091 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90898 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 90898 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91002 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91002 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90992 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 90992 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92320 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 92320 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91024 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91024 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "itemId": 58091 }
+														}
+													},
+													{
+														"or": {
+															"vals": [
+																{
+																	"and": {
+																		"vals": [
+																			{
+																				"auraIsActive": {
+																					"auraId": { "spellId": 75170 }
+																				}
+																			},
+																			{
+																				"auraIsActive": {
+																					"auraId": { "spellId": 74241 }
+																				}
+																			},
+																			{
+																				"cmp": {
+																					"op": "OpLe",
+																					"lhs": {
+																						"auraRemainingTime": {
+																							"auraId": { "itemId": 58091 }
+																						}
+																					},
+																					"rhs": {
+																						"const": { "val": "1s" }
+																					}
+																				}
+																			}
+																		]
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpLe",
+																		"lhs": { "remainingTime": {} },
+																		"rhs": { "const": { "val": "120s" } }
+																	}
+																}
+															]
+														}
+													},
+													{
+														"or": {
+															"vals": [
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 90898 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 92318 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91047 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91007 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 90992 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91002 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 89091 }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 92325 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "5" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 92325 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "5" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 90953 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "20" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 90985 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "20" } }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 92320 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91024 }
+																	}
+																}
+															]
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "itemId": 58091 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "itemId": 58091 }
+																}
+															},
+															"rhs": { "const": { "val": "3s" } }
+														}
+													}
+												]
+											}
+										}
+									]
+								}
+							},
+							{ "spellCanCast": { "spellId": { "spellId": 18540 } } }
+						]
+					}
+				},
+				"strictSequence": {
+					"actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }]
+				}
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } },
+				"castSpell": { "spellId": { "itemId": 58091 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "and": {} },
+				"sequence": {
+					"name": "burst",
+					"actions": [
+						{ "castSpell": { "spellId": { "spellId": 77801 } } },
+						{ "castSpell": { "spellId": { "spellId": 74434 } } },
+						{ "castSpell": { "spellId": { "spellId": 691 } } },
+						{ "castSpell": { "spellId": { "spellId": 59672 } } },
+						{ "castSpell": { "spellId": { "spellId": 603 } } },
+						{ "castSpell": { "spellId": { "spellId": 348 } } },
+						{ "castSpell": { "spellId": { "spellId": 172 } } }
+					]
+				}
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "sequenceIsComplete": { "sequenceName": "burst" } },
+							{ "spellCanCast": { "spellId": { "spellId": 77801 } } },
+							{ "spellCanCast": { "spellId": { "spellId": 59672 } } }
+						]
+					}
+				},
+				"resetSequence": { "sequenceName": "burst" }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "spellIsReady": { "spellId": { "spellId": 59672 } } },
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": {
+										"spellTimeToReady": { "spellId": { "spellId": 77801 } }
+									},
+									"rhs": { "const": { "val": "20" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": { "remainingTime": {} },
+									"rhs": { "const": { "val": "60" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 59672 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "spellIsReady": { "spellId": { "spellId": 77801 } } },
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": {
+										"spellTimeToReady": { "spellId": { "spellId": 59672 } }
+									},
+									"rhs": { "remainingTime": {} }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77801 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": { "currentMana": {} },
+									"rhs": { "const": { "val": "67000" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": { "const": { "val": "10s" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 1454 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": { "const": { "val": "121s" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGt",
+									"lhs": { "currentTime": {} },
+									"rhs": { "const": { "val": "60s" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 33697 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": {
+										"spellCastTime": { "spellId": { "spellId": 30146 } }
+									}
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"spellCpm": { "spellId": { "spellId": 30146 } }
+									},
+									"rhs": { "const": { "val": "1" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"spellTimeToReady": { "spellId": { "spellId": 77801 } }
+									},
+									"rhs": { "const": { "val": "10" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"spellTimeToReady": { "spellId": { "spellId": 59672 } }
+									},
+									"rhs": { "const": { "val": "10" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": { "remainingTime": {} },
+									"rhs": { "const": { "val": "30" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 30146 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": {
+							"dotRemainingTime": {
+								"spellId": { "spellId": 348, "tag": 1 }
+							}
+						},
+						"rhs": {
+							"math": {
+								"op": "OpAdd",
+								"lhs": {
+									"spellCastTime": { "spellId": { "spellId": 348 } }
+								},
+								"rhs": {
+									"dotTickFrequency": {
+										"spellId": { "spellId": 348, "tag": 1 }
+									}
+								}
+							}
+						}
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 348 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": {
+							"dotRemainingTime": { "spellId": { "spellId": 172 } }
+						},
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 172 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"spellIsReady": { "spellId": { "spellId": 71521 } }
+				},
+				"castSpell": { "spellId": { "spellId": 71521 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"spellIsReady": { "spellId": { "spellId": 47897 } }
+				},
+				"castSpell": { "spellId": { "spellId": 47897 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLt",
+									"lhs": {
+										"dotRemainingTime": { "spellId": { "spellId": 603 } }
+									},
+									"rhs": {
+										"dotTickFrequency": { "spellId": { "spellId": 603 } }
+									}
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGt",
+									"lhs": { "remainingTime": {} },
+									"rhs": {
+										"math": {
+											"op": "OpMul",
+											"lhs": {
+												"dotTickFrequency": {
+													"spellId": { "spellId": 603 }
+												}
+											},
+											"rhs": { "const": { "val": "2" } }
+										}
+									}
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
+		{
+			"hide": true,
+			"action": {
+				"condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } },
+				"castSpell": { "spellId": { "spellId": 686 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } },
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } },
+				"castSpell": { "spellId": { "spellId": 6353 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } },
+		{ "action": {} }
+	]
+}
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
new file mode 100644
index 0000000000..cef0ecae01
--- /dev/null
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -0,0 +1,783 @@
+{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 30146 } } },
+			"doAtValue": { "const": { "val": "-10s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 77801 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 74434 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 691 } } },
+			"doAtValue": { "const": { "val": "-4.0s" } }
+		},
+		{
+			"action": {
+				"castSpell": { "spellId": { "otherId": "OtherActionPotion" } }
+			},
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 59672 } } },
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 29722 } } },
+			"doAtValue": { "const": { "val": "-2.5s" } },
+			"hide": true
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 686 } } },
+			"doAtValue": { "const": { "val": "-2.5s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 348 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 58183 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 56290 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "itemId": 52353 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 82174 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		},
+		{
+			"action": { "castSpell": { "spellId": { "spellId": 33697 } } },
+			"doAtValue": { "const": { "val": "-0.7s" } }
+		}
+	],
+	"priorityList": [
+		{ "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"or": {
+									"vals": [
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92318 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 89091 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91007 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91047 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90898 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90992 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91002 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpGe",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 92325 }
+																}
+															},
+															"rhs": { "const": { "val": "5" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpGe",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 91027 }
+																}
+															},
+															"rhs": { "const": { "val": "5" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpEq",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 90953 }
+																}
+															},
+															"rhs": { "const": { "val": "20" } }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpEq",
+															"lhs": {
+																"auraNumStacks": {
+																	"auraId": { "spellId": 90985 }
+																}
+															},
+															"rhs": { "const": { "val": "20" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92320 }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91024 }
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92318 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 92318 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91007 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91007 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91047 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91047 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 89091 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 89091 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90898 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 90898 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91002 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91002 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 90992 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 90992 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 92320 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 92320 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													},
+													{
+														"auraIsActive": {
+															"auraId": { "spellId": 91024 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "spellId": 91024 }
+																}
+															},
+															"rhs": { "const": { "val": "1s" } }
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "itemId": 58091 }
+														}
+													},
+													{
+														"or": {
+															"vals": [
+																{
+																	"and": {
+																		"vals": [
+																			{
+																				"auraIsActive": {
+																					"auraId": { "spellId": 75170 }
+																				}
+																			},
+																			{
+																				"auraIsActive": {
+																					"auraId": { "spellId": 74241 }
+																				}
+																			},
+																			{
+																				"cmp": {
+																					"op": "OpLe",
+																					"lhs": {
+																						"auraRemainingTime": {
+																							"auraId": { "itemId": 58091 }
+																						}
+																					},
+																					"rhs": {
+																						"const": { "val": "1s" }
+																					}
+																				}
+																			}
+																		]
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpLe",
+																		"lhs": { "remainingTime": {} },
+																		"rhs": { "const": { "val": "120s" } }
+																	}
+																}
+															]
+														}
+													},
+													{
+														"or": {
+															"vals": [
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 90898 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 92318 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91047 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91007 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 90992 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91002 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 89091 }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 92325 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "5" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 92325 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "5" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 90953 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "20" } }
+																	}
+																},
+																{
+																	"cmp": {
+																		"op": "OpGe",
+																		"lhs": {
+																			"auraNumStacks": {
+																				"auraId": { "spellId": 90985 }
+																			}
+																		},
+																		"rhs": { "const": { "val": "20" } }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 92320 }
+																	}
+																},
+																{
+																	"auraIsActive": {
+																		"auraId": { "spellId": 91024 }
+																	}
+																}
+															]
+														}
+													}
+												]
+											}
+										},
+										{
+											"and": {
+												"vals": [
+													{
+														"auraIsActive": {
+															"auraId": { "itemId": 58091 }
+														}
+													},
+													{
+														"cmp": {
+															"op": "OpLe",
+															"lhs": {
+																"auraRemainingTime": {
+																	"auraId": { "itemId": 58091 }
+																}
+															},
+															"rhs": { "const": { "val": "3s" } }
+														}
+													}
+												]
+											}
+										}
+									]
+								}
+							},
+							{ "spellCanCast": { "spellId": { "spellId": 18540 } } }
+						]
+					}
+				},
+				"strictSequence": {
+					"actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }]
+				}
+			}
+		},
+		{
+			"action": {
+				"condition": { "and": {} },
+				"sequence": {
+					"name": "burst",
+					"actions": [
+						{ "castSpell": { "spellId": { "spellId": 77801 } } },
+						{ "castSpell": { "spellId": { "spellId": 74434 } } },
+						{ "castSpell": { "spellId": { "spellId": 691 } } },
+						{ "castSpell": { "spellId": { "spellId": 59672 } } },
+						{ "castSpell": { "spellId": { "spellId": 603 } } },
+						{ "castSpell": { "spellId": { "spellId": 348 } } },
+						{ "castSpell": { "spellId": { "spellId": 172 } } }
+					]
+				}
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "sequenceIsComplete": { "sequenceName": "burst" } },
+							{ "spellCanCast": { "spellId": { "spellId": 77801 } } },
+							{ "spellCanCast": { "spellId": { "spellId": 59672 } } }
+						]
+					}
+				},
+				"resetSequence": { "sequenceName": "burst" }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "itemId": 58091 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": { "currentMana": {} },
+									"rhs": { "const": { "val": "67000" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": { "const": { "val": "10s" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 1454 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpGe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": { "const": { "val": "121s" } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGt",
+									"lhs": { "currentTime": {} },
+									"rhs": { "const": { "val": "60s" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 33697 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"sequenceTimeToReady": { "sequenceName": "burst" }
+									},
+									"rhs": {
+										"spellCastTime": { "spellId": { "spellId": 30146 } }
+									}
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpLe",
+									"lhs": {
+										"spellCpm": { "spellId": { "spellId": 30146 } }
+									},
+									"rhs": { "const": { "val": "1" } }
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 30146 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": {
+							"dotRemainingTime": {
+								"spellId": { "spellId": 348, "tag": 1 }
+							}
+						},
+						"rhs": {
+							"math": {
+								"op": "OpAdd",
+								"lhs": {
+									"spellCastTime": { "spellId": { "spellId": 348 } }
+								},
+								"rhs": {
+									"dotTickFrequency": {
+										"spellId": { "spellId": 348, "tag": 1 }
+									}
+								}
+							}
+						}
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 348 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": {
+							"dotRemainingTime": { "spellId": { "spellId": 172 } }
+						},
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 172 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"spellIsReady": { "spellId": { "spellId": 71521 } }
+				},
+				"castSpell": { "spellId": { "spellId": 71521 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 89937 } } }, { "auraIsKnown": { "auraId": { "spellId": 89937 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77799 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"spellIsReady": { "spellId": { "spellId": 47897 } }
+				},
+				"castSpell": { "spellId": { "spellId": 47897 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLt",
+									"lhs": {
+										"dotRemainingTime": { "spellId": { "spellId": 603 } }
+									},
+									"rhs": {
+										"dotTickFrequency": { "spellId": { "spellId": 603 } }
+									}
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGt",
+									"lhs": { "remainingTime": {} },
+									"rhs": {
+										"math": {
+											"op": "OpMul",
+											"lhs": {
+												"dotTickFrequency": {
+													"spellId": { "spellId": 603 }
+												}
+											},
+											"rhs": { "const": { "val": "2" } }
+										}
+									}
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 686 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 6353 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"not": {
+						"val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } },
+				"castSpell": { "spellId": { "spellId": 686 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+	]
+}
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
index 264da522d1..945fd36fc3 100644
--- a/ui/warlock/demonology/presets.ts
+++ b/ui/warlock/demonology/presets.ts
@@ -23,7 +23,8 @@ import {
 } from '../../core/proto/warlock';
 import { Stats, UnitStat } from '../../core/proto_utils/stats';
 import { WARLOCK_BREAKPOINTS } from '../presets';
-import DefaultApl from './apls/default.apl.json';
+import IncinerateAPL from './apls/incinerate.apl.json';
+import ShadowBoltAPL from './apls/shadow-bolt.apl.json';
 import P1Gear from './gear_sets/p1.gear.json';
 import P4WrathGear from './gear_sets/p4_wrath.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
@@ -38,7 +39,8 @@ export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', Prer
 export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
 export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP });
 
-export const APL_Default = PresetUtils.makePresetAPLRotation('Demo', DefaultApl);
+export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', ShadowBoltAPL);
+export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL);
 
 // Preset options for EP weights
 export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
@@ -56,8 +58,8 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wotlk.wowhead.com/talent-calc and copy the numbers in the url.
 
-export const DemonologyTalents = {
-	name: 'Demonology',
+export const DemonologyTalentsShadowBolt = {
+	name: 'Shadow bolt',
 	data: SavedTalents.create({
 		talentsString: '-3312222300310212211-33202',
 		glyphs: Glyphs.create({
@@ -73,6 +75,23 @@ export const DemonologyTalents = {
 		}),
 	}),
 };
+export const DemonologyTalentsIncinerate = {
+	name: 'Incinerate',
+	data: SavedTalents.create({
+		talentsString: '003-3312222300310212211-03202',
+		glyphs: Glyphs.create({
+			prime1: PrimeGlyph.GlyphOfImmolate,
+			prime2: PrimeGlyph.GlyphOfIncinerate,
+			prime3: PrimeGlyph.GlyphOfMetamorphosis,
+			major1: MajorGlyph.GlyphOfSoulstone,
+			major2: MajorGlyph.GlyphOfLifeTap,
+			major3: MajorGlyph.GlyphOfSoulLink,
+			minor1: MinorGlyph.GlyphOfDrainSoul,
+			minor2: MinorGlyph.GlyphOfRitualOfSouls,
+			minor3: MinorGlyph.GlyphOfUnendingBreath,
+		}),
+	}),
+};
 
 export const DefaultOptions = WarlockOptions.create({
 	classOptions: {
@@ -133,6 +152,16 @@ export const OtherDefaults = {
 	darkIntentUptime: 90,
 };
 
+export const PRESET_BUILD_SHADOWBOLT = PresetUtils.makePresetBuild('Shadow Bolt', {
+	talents: DemonologyTalentsShadowBolt,
+	rotation: APL_ShadowBolt,
+});
+
+export const PRESET_BUILD_INCINERATE = PresetUtils.makePresetBuild('Incinerate', {
+	talents: DemonologyTalentsIncinerate,
+	rotation: APL_Incinerate,
+});
+
 export const DEMONOLOGY_BREAKPOINTS = [
 	{
 		unitStat: UnitStat.fromPseudoStat(PseudoStat.PseudoStatSpellHastePercent),
diff --git a/ui/warlock/demonology/sim.ts b/ui/warlock/demonology/sim.ts
index f40230f10b..590dc23d80 100644
--- a/ui/warlock/demonology/sim.ts
+++ b/ui/warlock/demonology/sim.ts
@@ -79,7 +79,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 		consumes: Presets.DefaultConsumes,
 
 		// Default talents.
-		talents: Presets.DemonologyTalents.data,
+		talents: Presets.DemonologyTalentsShadowBolt.data,
 		// Default spec-specific settings.
 		specOptions: Presets.DefaultOptions,
 
@@ -133,22 +133,24 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 	presets: {
 		epWeights: [Presets.P1_EP_PRESET],
 		// Preset talents that the user can quickly select.
-		talents: [Presets.DemonologyTalents],
+		talents: [Presets.DemonologyTalentsShadowBolt, Presets.DemonologyTalentsIncinerate],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.APL_Default],
+		rotations: [Presets.APL_ShadowBolt, Presets.APL_Incinerate],
 
 		// Preset gear configurations that the user can quickly select.
 		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET],
+
+		builds: [Presets.PRESET_BUILD_SHADOWBOLT, Presets.PRESET_BUILD_INCINERATE]
 	},
 
 	autoRotation: (_player: Player<Spec.SpecDemonologyWarlock>): APLRotation => {
-		return Presets.APL_Default.rotation.rotation!;
+		return Presets.APL_ShadowBolt.rotation.rotation!;
 	},
 
 	raidSimPresets: [
 		{
 			spec: Spec.SpecDemonologyWarlock,
-			talents: Presets.DemonologyTalents.data,
+			talents: Presets.DemonologyTalentsShadowBolt.data,
 			specOptions: Presets.DefaultOptions,
 			consumes: Presets.DefaultConsumes,
 			defaultFactionRaces: {

From da53cb1d29b64a58d6dd07c440a401b271230fb4 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Thu, 12 Sep 2024 21:28:48 +0200
Subject: [PATCH 02/11] Fel Spark aura known

---
 ui/warlock/affliction/apls/default.apl.json   | 207 ++++++++++++++++--
 .../demonology/apls/incinerate.apl.json       |   9 +-
 .../demonology/apls/shadow-bolt.apl.json      |   5 +-
 3 files changed, 197 insertions(+), 24 deletions(-)

diff --git a/ui/warlock/affliction/apls/default.apl.json b/ui/warlock/affliction/apls/default.apl.json
index 3839dca004..36a70da1ab 100644
--- a/ui/warlock/affliction/apls/default.apl.json
+++ b/ui/warlock/affliction/apls/default.apl.json
@@ -1,27 +1,190 @@
-{ "type": "TypeAPL",
+{
+	"type": "TypeAPL",
 	"prepullActions": [
-		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-4.0s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-3.0s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":48181}}},"doAtValue":{"const":{"val":"-0.8"}}}
+		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-3.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 48181 } } }, "doAtValue": { "const": { "val": "-0.8" } } }
 	],
 	"priorityList": [
-		{"action":{"autocastOtherCooldowns":{}}},
-		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"71s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":82174}}}},
-		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"136s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
-		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"141s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":77801}}}},
-		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"26s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
-		{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":92318}}}]}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":33697}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":18540}}}},
-		{"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
-		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":30108}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotTickFrequency":{"spellId":{"spellId":30108}}},"rhs":{"spellCastTime":{"spellId":{"spellId":30108}}}}}}},"castSpell":{"spellId":{"spellId":30108}}}},
-		{"action":{"condition":{"spellCanCast":{"spellId":{"spellId":48181}}},"castSpell":{"spellId":{"spellId":48181}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"isExecutePhase":{"threshold":"E25"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":89937}}},"castSpell":{"spellId":{"spellId":77799}}}},
-		{"action":{"condition":{"isExecutePhase":{"threshold":"E25"}},"channelSpell":{"spellId":{"spellId":1120},"interruptIf":{"const":{"val":"true"}}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":47897}}}},
-		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":74434}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}}}]}},"castSpell":{"spellId":{"spellId":74434}}}},
-		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":74434}}},"castSpell":{"spellId":{"spellId":6353}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":686}}}},
-		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
+		{ "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "71s" } } } },
+							{ "isExecutePhase": { "threshold": "E25" } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 82174 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "136s" } } } },
+							{ "isExecutePhase": { "threshold": "E25" } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 33697 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "141s" } } } },
+							{ "isExecutePhase": { "threshold": "E25" } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77801 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "26s" } } } },
+							{ "isExecutePhase": { "threshold": "E25" } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "itemId": 58091 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{
+								"and": {
+									"vals": [
+										{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
+										{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
+										{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
+										{ "auraIsActive": { "auraId": { "spellId": 92318 } } }
+									]
+								}
+							},
+							{ "cmp": { "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 33697 } } }, "rhs": { "const": { "val": "2s" } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 18540 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 172 } } } } },
+				"castSpell": { "spellId": { "spellId": 172 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 30108 } } },
+						"rhs": {
+							"math": {
+								"op": "OpAdd",
+								"lhs": { "dotTickFrequency": { "spellId": { "spellId": 30108 } } },
+								"rhs": { "spellCastTime": { "spellId": { "spellId": 30108 } } }
+							}
+						}
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 30108 } }
+			}
+		},
+		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 48181 } } }, "castSpell": { "spellId": { "spellId": 48181 } } } },
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "cmp": { "op": "OpLt", "lhs": { "currentManaPercent": {} }, "rhs": { "const": { "val": "15%" } } } },
+							{ "not": { "val": { "isExecutePhase": { "threshold": "E25" } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 1454 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{
+								"cmp": {
+									"op": "OpLt",
+									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
+								}
+							},
+							{
+								"cmp": {
+									"op": "OpGt",
+									"lhs": { "remainingTime": {} },
+									"rhs": {
+										"math": {
+											"op": "OpMul",
+											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
+											"rhs": { "const": { "val": "2" } }
+										}
+									}
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
+							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77799 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "isExecutePhase": { "threshold": "E25" } },
+				"channelSpell": { "spellId": { "spellId": 1120 }, "interruptIf": { "const": { "val": "true" } } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 47897 } } } },
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "spellIsReady": { "spellId": { "spellId": 74434 } } },
+							{ "not": { "val": { "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 74434 } }
+			}
+		},
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
 	]
 }
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index 007c77af8a..84c84cd158 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -60,7 +60,14 @@
 		{ "action": { "autocastOtherCooldowns": {} } },
 		{
 			"action": {
-				"condition": { "auraIsActive": { "auraId": { "spellId": 89937 } } },
+				"condition": {
+					"and": {
+						"vals": [
+							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
+							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
+						]
+					}
+				},
 				"castSpell": { "spellId": { "spellId": 77799 } }
 			}
 		},
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
index cef0ecae01..0e3f333c2f 100644
--- a/ui/warlock/demonology/apls/shadow-bolt.apl.json
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -678,7 +678,10 @@
 			"action": {
 				"condition": {
 					"and": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 89937 } } }, { "auraIsKnown": { "auraId": { "spellId": 89937 } } }]
+						"vals": [
+							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
+							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
+						]
 					}
 				},
 				"castSpell": { "spellId": { "spellId": 77799 } }

From e773d02edb23c1c9924de0adc330ab67229172e4 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Thu, 12 Sep 2024 21:40:42 +0200
Subject: [PATCH 03/11] Remove duplicate entries

---
 .../demonology/apls/incinerate.apl.json       | 585 +++---------------
 .../demonology/apls/shadow-bolt.apl.json      | 541 +++-------------
 2 files changed, 157 insertions(+), 969 deletions(-)

diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index 84c84cd158..89e032384d 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -1,60 +1,19 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 30146 } } },
-			"doAtValue": { "const": { "val": "-10s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 77801 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 74434 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 691 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": {
-				"castSpell": { "spellId": { "otherId": "OtherActionPotion" } }
-			},
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 59672 } } },
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 686 } } },
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 348 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 58183 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 56290 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 52353 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 82174 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 33697 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		}
+		{ "action": { "castSpell": { "spellId": { "spellId": 30146 } } }, "doAtValue": { "const": { "val": "-10s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 77801 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
 	],
 	"priorityList": [
 		{ "action": { "autocastOtherCooldowns": {} } },
@@ -82,242 +41,86 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92318 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 89091 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91007 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91047 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90898 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90992 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91002 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpGe",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 92325 }
-																}
-															},
-															"rhs": { "const": { "val": "5" } }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 													{
 														"cmp": {
 															"op": "OpGe",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 91027 }
-																}
-															},
+															"lhs": { "auraNumStacks": { "auraId": { "spellId": 91027 } } },
 															"rhs": { "const": { "val": "5" } }
 														}
 													},
 													{
 														"cmp": {
 															"op": "OpEq",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 90953 }
-																}
-															},
-															"rhs": { "const": { "val": "20" } }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpEq",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 90985 }
-																}
-															},
+															"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
 															"rhs": { "const": { "val": "20" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92320 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91024 }
-														}
-													}
+													{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
 												]
 											}
 										},
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92318 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 92318 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91007 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91007 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91007 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91047 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91047 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91047 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 89091 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 89091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 89091 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90898 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90898 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 90898 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91002 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91002 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91002 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90992 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90992 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 92320 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 90992 }
-																}
-															},
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92320 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 92320 }
-																}
-															},
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91024 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91024 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92320 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													}
@@ -327,38 +130,20 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "itemId": 58091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
 													{
 														"or": {
 															"vals": [
 																{
 																	"and": {
 																		"vals": [
-																			{
-																				"auraIsActive": {
-																					"auraId": { "spellId": 75170 }
-																				}
-																			},
-																			{
-																				"auraIsActive": {
-																					"auraId": { "spellId": 74241 }
-																				}
-																			},
+																			{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
+																			{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
 																			{
 																				"cmp": {
 																					"op": "OpLe",
-																					"lhs": {
-																						"auraRemainingTime": {
-																							"auraId": { "itemId": 58091 }
-																						}
-																					},
-																					"rhs": {
-																						"const": { "val": "1s" }
-																					}
+																					"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
+																					"rhs": { "const": { "val": "1s" } }
 																				}
 																			}
 																		]
@@ -377,95 +162,28 @@
 													{
 														"or": {
 															"vals": [
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 90898 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 92318 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91047 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91007 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 90992 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91002 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 89091 }
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 92325 }
-																			}
-																		},
-																		"rhs": { "const": { "val": "5" } }
-																	}
-																},
+																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
 																{
 																	"cmp": {
 																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 92325 }
-																			}
-																		},
+																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
 																		"rhs": { "const": { "val": "5" } }
 																	}
 																},
 																{
 																	"cmp": {
 																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 90953 }
-																			}
-																		},
+																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90985 } } },
 																		"rhs": { "const": { "val": "20" } }
 																	}
 																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 90985 }
-																			}
-																		},
-																		"rhs": { "const": { "val": "20" } }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 92320 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91024 }
-																	}
-																}
+																{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
 															]
 														}
 													}
@@ -475,19 +193,11 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "itemId": 58091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "itemId": 58091 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
 															"rhs": { "const": { "val": "3s" } }
 														}
 													}
@@ -501,17 +211,10 @@
 						]
 					}
 				},
-				"strictSequence": {
-					"actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }]
-				}
-			}
-		},
-		{
-			"action": {
-				"condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } },
-				"castSpell": { "spellId": { "itemId": 58091 } }
+				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
 			}
 		},
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } }, "castSpell": { "spellId": { "itemId": 58091 } } } },
 		{
 			"action": {
 				"condition": { "and": {} },
@@ -550,21 +253,9 @@
 						"vals": [
 							{ "spellIsReady": { "spellId": { "spellId": 59672 } } },
 							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": {
-										"spellTimeToReady": { "spellId": { "spellId": 77801 } }
-									},
-									"rhs": { "const": { "val": "20" } }
-								}
+								"cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "20" } } }
 							},
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": { "remainingTime": {} },
-									"rhs": { "const": { "val": "60" } }
-								}
-							}
+							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "60" } } } }
 						]
 					}
 				},
@@ -577,15 +268,7 @@
 					"and": {
 						"vals": [
 							{ "spellIsReady": { "spellId": { "spellId": 77801 } } },
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": {
-										"spellTimeToReady": { "spellId": { "spellId": 59672 } }
-									},
-									"rhs": { "remainingTime": {} }
-								}
-							}
+							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "remainingTime": {} } } }
 						]
 					}
 				},
@@ -597,22 +280,8 @@
 				"condition": {
 					"and": {
 						"vals": [
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": { "currentMana": {} },
-									"rhs": { "const": { "val": "67000" } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": { "const": { "val": "10s" } }
-								}
-							}
+							{ "cmp": { "op": "OpLe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "67000" } } } },
+							{ "cmp": { "op": "OpLe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "10s" } } } }
 						]
 					}
 				},
@@ -624,22 +293,8 @@
 				"condition": {
 					"and": {
 						"vals": [
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": { "const": { "val": "121s" } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpGt",
-									"lhs": { "currentTime": {} },
-									"rhs": { "const": { "val": "60s" } }
-								}
-							}
+							{ "cmp": { "op": "OpGe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "121s" } } } },
+							{ "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }
 						]
 					}
 				},
@@ -654,48 +309,18 @@
 							{
 								"cmp": {
 									"op": "OpLe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": {
-										"spellCastTime": { "spellId": { "spellId": 30146 } }
-									}
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"spellCpm": { "spellId": { "spellId": 30146 } }
-									},
-									"rhs": { "const": { "val": "1" } }
+									"lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } },
+									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
 								}
 							},
+							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } },
 							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"spellTimeToReady": { "spellId": { "spellId": 77801 } }
-									},
-									"rhs": { "const": { "val": "10" } }
-								}
+								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "10" } } }
 							},
 							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"spellTimeToReady": { "spellId": { "spellId": 59672 } }
-									},
-									"rhs": { "const": { "val": "10" } }
-								}
+								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "const": { "val": "10" } } }
 							},
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": { "remainingTime": {} },
-									"rhs": { "const": { "val": "30" } }
-								}
-							}
+							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30" } } } }
 						]
 					}
 				},
@@ -707,22 +332,12 @@
 				"condition": {
 					"cmp": {
 						"op": "OpLt",
-						"lhs": {
-							"dotRemainingTime": {
-								"spellId": { "spellId": 348, "tag": 1 }
-							}
-						},
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
 						"rhs": {
 							"math": {
 								"op": "OpAdd",
-								"lhs": {
-									"spellCastTime": { "spellId": { "spellId": 348 } }
-								},
-								"rhs": {
-									"dotTickFrequency": {
-										"spellId": { "spellId": 348, "tag": 1 }
-									}
-								}
+								"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
+								"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
 							}
 						}
 					}
@@ -735,31 +350,15 @@
 				"condition": {
 					"cmp": {
 						"op": "OpLt",
-						"lhs": {
-							"dotRemainingTime": { "spellId": { "spellId": 172 } }
-						},
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
 						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
 					}
 				},
 				"castSpell": { "spellId": { "spellId": 172 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"spellIsReady": { "spellId": { "spellId": 71521 } }
-				},
-				"castSpell": { "spellId": { "spellId": 71521 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"spellIsReady": { "spellId": { "spellId": 47897 } }
-				},
-				"castSpell": { "spellId": { "spellId": 47897 } }
-			}
-		},
+		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
+		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
 		{
 			"action": {
 				"condition": {
@@ -768,12 +367,8 @@
 							{
 								"cmp": {
 									"op": "OpLt",
-									"lhs": {
-										"dotRemainingTime": { "spellId": { "spellId": 603 } }
-									},
-									"rhs": {
-										"dotTickFrequency": { "spellId": { "spellId": 603 } }
-									}
+									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
 								}
 							},
 							{
@@ -783,11 +378,7 @@
 									"rhs": {
 										"math": {
 											"op": "OpMul",
-											"lhs": {
-												"dotTickFrequency": {
-													"spellId": { "spellId": 603 }
-												}
-											},
+											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
 											"rhs": { "const": { "val": "2" } }
 										}
 									}
@@ -800,25 +391,9 @@
 			}
 		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{
-			"hide": true,
-			"action": {
-				"condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } },
-				"castSpell": { "spellId": { "spellId": 686 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } },
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } },
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
+		{ "hide": true, "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } }, "castSpell": { "spellId": { "spellId": 29722 } } } },
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } },
 		{ "action": {} }
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
index 0e3f333c2f..7cb3255ac6 100644
--- a/ui/warlock/demonology/apls/shadow-bolt.apl.json
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -1,65 +1,20 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 30146 } } },
-			"doAtValue": { "const": { "val": "-10s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 77801 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 74434 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 691 } } },
-			"doAtValue": { "const": { "val": "-4.0s" } }
-		},
-		{
-			"action": {
-				"castSpell": { "spellId": { "otherId": "OtherActionPotion" } }
-			},
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 59672 } } },
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 29722 } } },
-			"doAtValue": { "const": { "val": "-2.5s" } },
-			"hide": true
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 686 } } },
-			"doAtValue": { "const": { "val": "-2.5s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 348 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 58183 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 56290 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "itemId": 52353 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 82174 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		},
-		{
-			"action": { "castSpell": { "spellId": { "spellId": 33697 } } },
-			"doAtValue": { "const": { "val": "-0.7s" } }
-		}
+		{ "action": { "castSpell": { "spellId": { "spellId": 30146 } } }, "doAtValue": { "const": { "val": "-10s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 77801 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } }, "hide": true },
+		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
 	],
 	"priorityList": [
 		{ "action": { "autocastOtherCooldowns": {} } },
@@ -74,242 +29,86 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92318 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 89091 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91007 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91047 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90898 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90992 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91002 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpGe",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 92325 }
-																}
-															},
-															"rhs": { "const": { "val": "5" } }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 													{
 														"cmp": {
 															"op": "OpGe",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 91027 }
-																}
-															},
+															"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
 															"rhs": { "const": { "val": "5" } }
 														}
 													},
 													{
 														"cmp": {
 															"op": "OpEq",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 90953 }
-																}
-															},
+															"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
 															"rhs": { "const": { "val": "20" } }
 														}
 													},
-													{
-														"cmp": {
-															"op": "OpEq",
-															"lhs": {
-																"auraNumStacks": {
-																	"auraId": { "spellId": 90985 }
-																}
-															},
-															"rhs": { "const": { "val": "20" } }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92320 }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91024 }
-														}
-													}
+													{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
 												]
 											}
 										},
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92318 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 92318 }
-																}
-															},
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91007 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91007 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91007 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91047 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91047 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91047 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 89091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 89091 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 89091 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90898 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 90898 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90898 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91002 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91002 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91002 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 90992 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 90992 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90992 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 92320 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "spellId": 92320 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 92320 }
-																}
-															},
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{
-														"auraIsActive": {
-															"auraId": { "spellId": 91024 }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "spellId": 91024 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92320 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													}
@@ -319,38 +118,20 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "itemId": 58091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
 													{
 														"or": {
 															"vals": [
 																{
 																	"and": {
 																		"vals": [
-																			{
-																				"auraIsActive": {
-																					"auraId": { "spellId": 75170 }
-																				}
-																			},
-																			{
-																				"auraIsActive": {
-																					"auraId": { "spellId": 74241 }
-																				}
-																			},
+																			{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
+																			{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
 																			{
 																				"cmp": {
 																					"op": "OpLe",
-																					"lhs": {
-																						"auraRemainingTime": {
-																							"auraId": { "itemId": 58091 }
-																						}
-																					},
-																					"rhs": {
-																						"const": { "val": "1s" }
-																					}
+																					"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
+																					"rhs": { "const": { "val": "1s" } }
 																				}
 																			}
 																		]
@@ -369,95 +150,28 @@
 													{
 														"or": {
 															"vals": [
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 90898 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 92318 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91047 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91007 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 90992 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91002 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 89091 }
-																	}
-																},
+																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
 																{
 																	"cmp": {
 																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 92325 }
-																			}
-																		},
+																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
 																		"rhs": { "const": { "val": "5" } }
 																	}
 																},
 																{
 																	"cmp": {
 																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 92325 }
-																			}
-																		},
-																		"rhs": { "const": { "val": "5" } }
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 90953 }
-																			}
-																		},
+																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
 																		"rhs": { "const": { "val": "20" } }
 																	}
 																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": {
-																			"auraNumStacks": {
-																				"auraId": { "spellId": 90985 }
-																			}
-																		},
-																		"rhs": { "const": { "val": "20" } }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 92320 }
-																	}
-																},
-																{
-																	"auraIsActive": {
-																		"auraId": { "spellId": 91024 }
-																	}
-																}
+																{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
 															]
 														}
 													}
@@ -467,19 +181,11 @@
 										{
 											"and": {
 												"vals": [
-													{
-														"auraIsActive": {
-															"auraId": { "itemId": 58091 }
-														}
-													},
+													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": {
-																"auraRemainingTime": {
-																	"auraId": { "itemId": 58091 }
-																}
-															},
+															"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
 															"rhs": { "const": { "val": "3s" } }
 														}
 													}
@@ -493,9 +199,7 @@
 						]
 					}
 				},
-				"strictSequence": {
-					"actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }]
-				}
+				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
 			}
 		},
 		{
@@ -532,9 +236,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }]
-					}
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }] }
 				},
 				"castSpell": { "spellId": { "itemId": 58091 } }
 			}
@@ -544,22 +246,8 @@
 				"condition": {
 					"and": {
 						"vals": [
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": { "currentMana": {} },
-									"rhs": { "const": { "val": "67000" } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": { "const": { "val": "10s" } }
-								}
-							}
+							{ "cmp": { "op": "OpLe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "67000" } } } },
+							{ "cmp": { "op": "OpLe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "10s" } } } }
 						]
 					}
 				},
@@ -571,22 +259,8 @@
 				"condition": {
 					"and": {
 						"vals": [
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": { "const": { "val": "121s" } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpGt",
-									"lhs": { "currentTime": {} },
-									"rhs": { "const": { "val": "60s" } }
-								}
-							}
+							{ "cmp": { "op": "OpGe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "121s" } } } },
+							{ "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }
 						]
 					}
 				},
@@ -601,23 +275,11 @@
 							{
 								"cmp": {
 									"op": "OpLe",
-									"lhs": {
-										"sequenceTimeToReady": { "sequenceName": "burst" }
-									},
-									"rhs": {
-										"spellCastTime": { "spellId": { "spellId": 30146 } }
-									}
+									"lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } },
+									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
 								}
 							},
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": {
-										"spellCpm": { "spellId": { "spellId": 30146 } }
-									},
-									"rhs": { "const": { "val": "1" } }
-								}
-							}
+							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } }
 						]
 					}
 				},
@@ -629,22 +291,12 @@
 				"condition": {
 					"cmp": {
 						"op": "OpLt",
-						"lhs": {
-							"dotRemainingTime": {
-								"spellId": { "spellId": 348, "tag": 1 }
-							}
-						},
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
 						"rhs": {
 							"math": {
 								"op": "OpAdd",
-								"lhs": {
-									"spellCastTime": { "spellId": { "spellId": 348 } }
-								},
-								"rhs": {
-									"dotTickFrequency": {
-										"spellId": { "spellId": 348, "tag": 1 }
-									}
-								}
+								"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
+								"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
 							}
 						}
 					}
@@ -657,23 +309,14 @@
 				"condition": {
 					"cmp": {
 						"op": "OpLt",
-						"lhs": {
-							"dotRemainingTime": { "spellId": { "spellId": 172 } }
-						},
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
 						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
 					}
 				},
 				"castSpell": { "spellId": { "spellId": 172 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"spellIsReady": { "spellId": { "spellId": 71521 } }
-				},
-				"castSpell": { "spellId": { "spellId": 71521 } }
-			}
-		},
+		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
 		{
 			"action": {
 				"condition": {
@@ -687,14 +330,7 @@
 				"castSpell": { "spellId": { "spellId": 77799 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"spellIsReady": { "spellId": { "spellId": 47897 } }
-				},
-				"castSpell": { "spellId": { "spellId": 47897 } }
-			}
-		},
+		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
 		{
 			"action": {
 				"condition": {
@@ -703,12 +339,8 @@
 							{
 								"cmp": {
 									"op": "OpLt",
-									"lhs": {
-										"dotRemainingTime": { "spellId": { "spellId": 603 } }
-									},
-									"rhs": {
-										"dotTickFrequency": { "spellId": { "spellId": 603 } }
-									}
+									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
 								}
 							},
 							{
@@ -718,11 +350,7 @@
 									"rhs": {
 										"math": {
 											"op": "OpMul",
-											"lhs": {
-												"dotTickFrequency": {
-													"spellId": { "spellId": 603 }
-												}
-											},
+											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
 											"rhs": { "const": { "val": "2" } }
 										}
 									}
@@ -738,9 +366,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }]
-					}
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 686 } }
 			}
@@ -748,9 +374,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }]
-					}
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 29722 } }
 			}
@@ -758,29 +382,18 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }]
-					}
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 6353 } }
 			}
 		},
 		{
 			"action": {
-				"condition": {
-					"not": {
-						"val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }
-					}
-				},
+				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } } } },
 				"castSpell": { "spellId": { "spellId": 29722 } }
 			}
 		},
-		{
-			"action": {
-				"condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } },
-				"castSpell": { "spellId": { "spellId": 686 } }
-			}
-		},
+		{ "action": { "condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
 	]
 }

From b0f5c4d37d09efc5f82c5556fe9210aa63ecff08 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 13 Sep 2024 13:59:38 +0200
Subject: [PATCH 04/11] Fix preset build talents&glyphs toggle

---
 .../preset_configuration_picker.tsx           |  16 ++-
 ui/warlock/affliction/apls/default.apl.json   |   7 +-
 .../demonology/apls/incinerate.apl.json       | 107 ++++++++----------
 .../demonology/apls/shadow-bolt.apl.json      |  15 +--
 ui/warlock/destruction/apls/default.apl.json  |   7 +-
 5 files changed, 69 insertions(+), 83 deletions(-)

diff --git a/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx b/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx
index c098217b3a..21e96de134 100644
--- a/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx
+++ b/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx
@@ -5,6 +5,7 @@ import { IndividualSimUI } from '../../individual_sim_ui';
 import { PresetBuild } from '../../preset_utils';
 import { APLRotation, APLRotation_Type } from '../../proto/apl';
 import { Encounter, EquipmentSpec, HealingModel, Spec } from '../../proto/common';
+import { SavedTalents } from '../../proto/ui';
 import { TypedEvent } from '../../typed_event';
 import { Component } from '../component';
 import { ContentBlock } from '../content_block';
@@ -86,7 +87,10 @@ export class PresetConfigurationPicker extends Component {
 		const eventID = TypedEvent.nextEventID();
 		TypedEvent.freezeAllAndDo(() => {
 			if (gear) this.simUI.player.setGear(eventID, this.simUI.sim.db.lookupEquipmentSpec(gear.gear));
-			if (talents) this.simUI.player.setTalentsString(eventID, talents.data.talentsString);
+			if (talents) {
+				this.simUI.player.setTalentsString(eventID, talents.data.talentsString);
+				if (talents.data.glyphs) this.simUI.player.setGlyphs(eventID, talents.data.glyphs);
+			}
 			if (rotation?.rotation.rotation) {
 				this.simUI.player.setAplRotation(eventID, rotation.rotation.rotation);
 			}
@@ -105,7 +109,15 @@ export class PresetConfigurationPicker extends Component {
 
 	private isBuildActive({ gear, rotation, talents, epWeights, encounter }: PresetBuild): boolean {
 		const hasGear = gear ? EquipmentSpec.equals(gear.gear, this.simUI.player.getGear().asSpec()) : true;
-		const hasTalents = talents ? talents.data.talentsString == this.simUI.player.getTalentsString() : true;
+		const hasTalents = talents
+			? SavedTalents.equals(
+					talents.data,
+					SavedTalents.create({
+						talentsString: this.simUI.player.getTalentsString(),
+						glyphs: this.simUI.player.getGlyphs(),
+					}),
+			  )
+			: true;
 		const hasRotation = rotation ? APLRotation.equals(rotation.rotation.rotation, this.simUI.player.aplRotation) : true;
 		const hasEpWeights = epWeights ? this.simUI.player.getEpWeights().equals(epWeights.epWeights) : true;
 		const hasEncounter = encounter?.encounter ? Encounter.equals(encounter.encounter, this.simUI.sim.encounter.toProto()) : true;
diff --git a/ui/warlock/affliction/apls/default.apl.json b/ui/warlock/affliction/apls/default.apl.json
index 36a70da1ab..15c97fd36a 100644
--- a/ui/warlock/affliction/apls/default.apl.json
+++ b/ui/warlock/affliction/apls/default.apl.json
@@ -153,12 +153,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
-						]
-					}
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 77799 } }
 			}
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index 89e032384d..ed63719169 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -7,7 +7,7 @@
 		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
 		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
@@ -17,19 +17,6 @@
 	],
 	"priorityList": [
 		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
 		{
 			"action": {
 				"condition": {
@@ -50,7 +37,7 @@
 													{
 														"cmp": {
 															"op": "OpGe",
-															"lhs": { "auraNumStacks": { "auraId": { "spellId": 91027 } } },
+															"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
 															"rhs": { "const": { "val": "5" } }
 														}
 													},
@@ -68,11 +55,11 @@
 										{
 											"and": {
 												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91007 } } },
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92318 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
@@ -116,11 +103,11 @@
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
-													{ "auraIsActive": { "auraId": { "spellId": 92320 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 91024 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92320 } } },
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91024 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													}
@@ -163,7 +150,6 @@
 														"or": {
 															"vals": [
 																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
@@ -214,7 +200,6 @@
 				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
 			}
 		},
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } }, "castSpell": { "spellId": { "itemId": 58091 } } } },
 		{
 			"action": {
 				"condition": { "and": {} },
@@ -249,30 +234,9 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [
-							{ "spellIsReady": { "spellId": { "spellId": 59672 } } },
-							{
-								"cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "20" } } }
-							},
-							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "60" } } } }
-						]
-					}
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }] }
 				},
-				"castSpell": { "spellId": { "spellId": 59672 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "spellIsReady": { "spellId": { "spellId": 77801 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "remainingTime": {} } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77801 } }
+				"castSpell": { "spellId": { "itemId": 58091 } }
 			}
 		},
 		{
@@ -313,14 +277,7 @@
 									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
 								}
 							},
-							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } },
-							{
-								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "10" } } }
-							},
-							{
-								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "const": { "val": "10" } } }
-							},
-							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30" } } } }
+							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } }
 						]
 					}
 				},
@@ -358,6 +315,14 @@
 			}
 		},
 		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 77799 } }
+			}
+		},
 		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
 		{
 			"action": {
@@ -391,11 +356,37 @@
 			}
 		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{ "hide": true, "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } }, "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } },
-		{ "action": {} }
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 686 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 6353 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } } } },
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{ "action": { "condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
 	]
 }
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
index 7cb3255ac6..f98b0a46f5 100644
--- a/ui/warlock/demonology/apls/shadow-bolt.apl.json
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -7,7 +7,6 @@
 		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
 		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } }, "hide": true },
 		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
@@ -56,11 +55,11 @@
 										{
 											"and": {
 												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
+													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
 													{
 														"cmp": {
 															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91007 } } },
+															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92318 } } },
 															"rhs": { "const": { "val": "1s" } }
 														}
 													},
@@ -153,7 +152,6 @@
 																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
@@ -167,7 +165,7 @@
 																{
 																	"cmp": {
 																		"op": "OpGe",
-																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
+																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90985 } } },
 																		"rhs": { "const": { "val": "20" } }
 																	}
 																},
@@ -320,12 +318,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
-						]
-					}
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 77799 } }
 			}
diff --git a/ui/warlock/destruction/apls/default.apl.json b/ui/warlock/destruction/apls/default.apl.json
index c73b18d80f..9d7bad8629 100644
--- a/ui/warlock/destruction/apls/default.apl.json
+++ b/ui/warlock/destruction/apls/default.apl.json
@@ -135,12 +135,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsKnown": { "auraId": { "spellId": 89937 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } }
-						]
-					}
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 77799 } }
 			}

From c7e6f3647e9d2c03cbcb20952eeb867b0926aba3 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 13 Sep 2024 14:18:34 +0200
Subject: [PATCH 05/11] Fix Incinerate APL

---
 .../demonology/apls/incinerate.apl.json       | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index ed63719169..6f1b9ae797 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -17,6 +17,14 @@
 	],
 	"priorityList": [
 		{ "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 77799 } }
+			}
+		},
 		{
 			"action": {
 				"condition": {
@@ -150,8 +158,8 @@
 														"or": {
 															"vals": [
 																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
+																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91007 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
 																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
@@ -169,7 +177,7 @@
 																		"rhs": { "const": { "val": "20" } }
 																	}
 																},
-																{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
+																{ "auraIsActive": { "auraId": { "spellId": 91024 } } }
 															]
 														}
 													}
@@ -200,6 +208,7 @@
 				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
 			}
 		},
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } }, "castSpell": { "spellId": { "itemId": 58091 } } } },
 		{
 			"action": {
 				"condition": { "and": {} },
@@ -234,9 +243,30 @@
 		{
 			"action": {
 				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }] }
+					"and": {
+						"vals": [
+							{ "spellIsReady": { "spellId": { "spellId": 59672 } } },
+							{
+								"cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "20" } } }
+							},
+							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "60" } } } }
+						]
+					}
 				},
-				"castSpell": { "spellId": { "itemId": 58091 } }
+				"castSpell": { "spellId": { "spellId": 59672 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "spellIsReady": { "spellId": { "spellId": 77801 } } },
+							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "remainingTime": {} } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77801 } }
 			}
 		},
 		{
@@ -277,7 +307,14 @@
 									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
 								}
 							},
-							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } }
+							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } },
+							{
+								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "10" } } }
+							},
+							{
+								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "const": { "val": "10" } } }
+							},
+							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30" } } } }
 						]
 					}
 				},
@@ -315,14 +352,6 @@
 			}
 		},
 		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
 		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
 		{
 			"action": {
@@ -356,37 +385,11 @@
 			}
 		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 686 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } } } },
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{ "action": { "condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+		{ "hide": true, "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } }, "castSpell": { "spellId": { "spellId": 29722 } } } },
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } },
+		{ "action": {} }
 	]
 }

From 102f410e32a355db1d7e3be25677197022bd4cd3 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 17:52:29 +0200
Subject: [PATCH 06/11] Adjust Demo P3 set/apl

---
 sim/warlock/demonology/TestDemonology.results | 1280 ++++++++++++++++-
 sim/warlock/demonology/demonology_test.go     |   46 +-
 .../demonology/apls/incinerate.apl.json       |   24 +-
 .../demonology/apls/shadow-bolt.apl.json      |   16 +-
 ui/warlock/demonology/gear_sets/p3.gear.json  |   21 +
 .../demonology/gear_sets/p4_wrath.gear.json   |   19 -
 .../demonology/gear_sets/preraid.gear.json    |    4 +-
 ui/warlock/demonology/presets.ts              |   14 +-
 ui/warlock/demonology/sim.ts                  |   28 +-
 9 files changed, 1324 insertions(+), 128 deletions(-)
 create mode 100644 ui/warlock/demonology/gear_sets/p3.gear.json
 delete mode 100644 ui/warlock/demonology/gear_sets/p4_wrath.gear.json

diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results
index e934828dba..a30d706b3a 100644
--- a/sim/warlock/demonology/TestDemonology.results
+++ b/sim/warlock/demonology/TestDemonology.results
@@ -410,8 +410,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 28935.9036
-  tps: 14784.23926
+  dps: 28996.957
+  tps: 14748.50301
  }
 }
 dps_results: {
@@ -991,8 +991,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-AllItems-RuneofZeth-68998"
  value: {
-  dps: 29452.51429
-  tps: 15044.84575
+  dps: 29543.83251
+  tps: 15060.83127
  }
 }
 dps_results: {
@@ -1474,171 +1474,1347 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 46952.46091
+  tps: 45796.1027
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29681.20715
+  tps: 14782.12516
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 45861.97138
+  tps: 21376.81159
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30453.54539
+  tps: 32783.81095
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 20840.77325
+  tps: 10158.95381
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 28745.50742
+  tps: 12247.98307
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 45370.32382
   tps: 41487.28493
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29825.77428
   tps: 15484.52529
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 46714.18431
   tps: 23108.09895
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 30422.78589
   tps: 30077.2442
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 21061.83859
   tps: 10746.20485
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 28528.82462
   tps: 12672.86901
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 47310.57163
+  tps: 45990.01629
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30008.92031
+  tps: 15142.92633
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 46488.02444
+  tps: 22040.34795
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30666.84695
+  tps: 32949.56994
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21137.5074
+  tps: 10409.96063
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 28962.60251
+  tps: 12565.44273
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 44373.64132
+  tps: 39962.69936
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29268.31891
+  tps: 14880.40752
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 45828.14577
+  tps: 21896.6616
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30048.73771
+  tps: 29454.51415
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 20397.63519
+  tps: 10191.37532
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27704.65807
+  tps: 12021.43047
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 56978.38274
+  tps: 52757.9214
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37361.03322
+  tps: 18713.76203
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55345.62602
+  tps: 25572.48667
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37715.99836
+  tps: 37302.39249
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26459.98494
+  tps: 12907.60148
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34148.78603
+  tps: 14687.72222
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 55103.30846
+  tps: 48908.57458
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37072.1686
+  tps: 19334.71952
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55676.45646
+  tps: 27570.75318
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37612.81793
+  tps: 34991.6638
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26647.75252
+  tps: 13642.11169
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34187.30042
+  tps: 15287.27899
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 57645.8836
+  tps: 52878.92206
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37739.40722
+  tps: 19138.01908
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55883.6184
+  tps: 26184.42044
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38302.15329
+  tps: 37693.85733
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26922.54128
+  tps: 13301.71692
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34931.12764
+  tps: 15247.608
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 53853.11885
+  tps: 47801.07199
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36366.86122
+  tps: 18700.64304
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 54276.86977
+  tps: 26314.90857
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37144.365
+  tps: 34251.63344
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 25846.50711
+  tps: 12927.45946
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 33553.86967
+  tps: 14806.10368
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 46677.53562
+  tps: 45089.97415
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29522.89596
+  tps: 14599.12933
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 45383.64414
+  tps: 20967.49465
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30350.23151
+  tps: 32559.58782
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 20858.61071
+  tps: 10132.07118
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 28628.37133
+  tps: 12218.35828
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 44708.86083
   tps: 40586.22921
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29718.63015
   tps: 15324.5246
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 46152.69081
   tps: 22837.95269
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 30116.44017
   tps: 29830.60056
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 20856.84237
   tps: 10619.94089
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Human-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 28164.56684
   tps: 12406.57833
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 45999.54595
-  tps: 41163.35567
+  dps: 46839.36582
+  tps: 45077.33308
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 30606.44039
-  tps: 15487.01038
+  dps: 29905.84665
+  tps: 14972.71303
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47912.15385
-  tps: 23196.82412
+  dps: 45893.48036
+  tps: 21565.97068
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31074.14736
-  tps: 30233.51038
+  dps: 30541.4134
+  tps: 32668.79263
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 21517.57229
-  tps: 10721.1451
+  dps: 21064.59301
+  tps: 10335.75427
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 29437.10226
-  tps: 12608.19752
+  dps: 28724.83694
+  tps: 12490.42561
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 46697.22505
-  tps: 42522.08251
+  dps: 43944.48468
+  tps: 39896.65071
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29999.9625
-  tps: 15719.83734
+  dps: 28887.25728
+  tps: 14686.92435
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48351.92796
-  tps: 24221.75857
+  dps: 45034.74307
+  tps: 21287.38474
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31477.09528
-  tps: 30968.65388
+  dps: 29929.2302
+  tps: 29549.98585
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 21295.26016
-  tps: 10881.48509
+  dps: 20291.36264
+  tps: 10124.89952
  }
 }
 dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 29957.74533
-  tps: 13680.47754
+  dps: 27321.51881
+  tps: 11646.16577
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 56886.60111
+  tps: 52558.63234
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37158.07469
+  tps: 18557.96838
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 54923.23005
+  tps: 25399.80194
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38112.95136
+  tps: 37784.39554
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26528.47895
+  tps: 12938.88435
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34294.06651
+  tps: 14702.83345
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 54659.96159
+  tps: 48653.44993
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36953.18363
+  tps: 19245.25224
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55457.87912
+  tps: 27389.26484
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37434.45128
+  tps: 34603.32422
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26446.73778
+  tps: 13562.22849
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34058.96626
+  tps: 15247.81011
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 57531.40572
+  tps: 53426.50374
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37650.99789
+  tps: 18999.34742
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55533.50953
+  tps: 26120.48332
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38654.01977
+  tps: 38020.35108
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26945.65192
+  tps: 13355.55184
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34745.10141
+  tps: 15220.4569
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 53472.51883
+  tps: 47854.18047
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36134.36117
+  tps: 18430.70197
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 53790.28076
+  tps: 25725.26079
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37084.83846
+  tps: 34070.23205
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 25816.20282
+  tps: 12929.38213
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 33336.58965
+  tps: 14632.58938
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 47793.59499
+  tps: 45427.85934
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30337.08833
+  tps: 14722.40099
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47136.12669
+  tps: 21305.94637
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31179.17879
+  tps: 32839.38652
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21487.89562
+  tps: 10197.51507
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 29892.79258
+  tps: 12418.36285
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 45999.54595
+  tps: 41163.35567
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30606.44039
+  tps: 15487.01038
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47912.15385
+  tps: 23196.82412
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31074.14736
+  tps: 30233.51038
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21517.57229
+  tps: 10721.1451
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 29437.10226
+  tps: 12608.19752
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 47989.51173
+  tps: 45515.73388
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30751.11199
+  tps: 15104.70273
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47641.34317
+  tps: 21913.93868
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31322.48274
+  tps: 32885.14562
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21706.57654
+  tps: 10430.55157
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 30001.6432
+  tps: 12702.39745
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 45118.48239
+  tps: 40441.87135
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29706.12259
+  tps: 14825.16253
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 46614.51679
+  tps: 21625.75687
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30907.38975
+  tps: 29952.32152
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 20950.84893
+  tps: 10239.1775
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 28606.17645
+  tps: 11868.44567
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 58135.59274
+  tps: 52902.77586
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 38130.01098
+  tps: 18694.42761
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 56914.00895
+  tps: 25750.06774
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39119.67785
+  tps: 38103.23196
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 27283.72893
+  tps: 13028.98341
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 35733.36141
+  tps: 14916.37735
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 56132.72223
+  tps: 49276.74751
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37972.1958
+  tps: 19413.78082
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 57418.43273
+  tps: 27756.46617
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38530.17285
+  tps: 35015.49631
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 27222.22796
+  tps: 13671.87065
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 35492.27669
+  tps: 15458.70076
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 58828.93947
+  tps: 54058.3999
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 38643.87882
+  tps: 19136.90977
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 57526.50945
+  tps: 26478.00105
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39582.67266
+  tps: 38322.51194
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 27691.94287
+  tps: 13433.59935
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 36187.07377
+  tps: 15437.7278
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 54815.85602
+  tps: 48380.58017
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37031.82893
+  tps: 18533.05979
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55600.51896
+  tps: 26041.49256
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38209.92549
+  tps: 34495.89334
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26598.70029
+  tps: 13049.36027
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34770.89526
+  tps: 14861.43877
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 48490.95072
+  tps: 46976.66518
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30049.74994
+  tps: 15016.02745
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47196.12648
+  tps: 22211.8579
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31670.25387
+  tps: 34030.8309
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21143.81875
+  tps: 10297.68295
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 29909.76512
+  tps: 13063.7934
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 46697.22505
+  tps: 42522.08251
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29999.9625
+  tps: 15719.83734
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48351.92796
+  tps: 24221.75857
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31477.09528
+  tps: 30968.65388
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21295.26016
+  tps: 10881.48509
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 29957.74533
+  tps: 13680.47754
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 49076.46833
+  tps: 47590.42457
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 30489.64538
+  tps: 15432.24166
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48112.99787
+  tps: 23239.44386
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 32069.63873
+  tps: 34313.35554
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 21373.71028
+  tps: 10561.07162
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 30132.32872
+  tps: 13493.85174
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 45977.19727
+  tps: 41778.38883
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29580.55942
+  tps: 15083.72492
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47173.52991
+  tps: 22646.28893
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31242.2186
+  tps: 30724.48941
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 20748.63683
+  tps: 10449.94267
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 29130.2117
+  tps: 13113.27906
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 59689.18311
+  tps: 54935.55073
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37719.31506
+  tps: 19063.14635
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 56782.03303
+  tps: 26804.58016
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39482.54312
+  tps: 38848.95835
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26778.95581
+  tps: 13155.30007
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 35726.93269
+  tps: 15755.12898
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 56806.29345
+  tps: 50855.18942
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37314.26298
+  tps: 19631.9639
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 57581.84692
+  tps: 28976.37543
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38587.87269
+  tps: 35958.73561
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26785.3862
+  tps: 13808.69583
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 35790.84648
+  tps: 16585.06137
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 59976.54445
+  tps: 55301.78215
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 38199.75371
+  tps: 19504.29854
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 57617.24888
+  tps: 27624.81878
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39465.01807
+  tps: 38691.41865
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 27102.61914
+  tps: 13434.1261
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 36130.36018
+  tps: 16116.77008
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 55351.93625
+  tps: 48668.02524
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36638.34972
+  tps: 18816.66643
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 55735.28977
+  tps: 26951.30994
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38407.26621
+  tps: 35594.65747
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 26205.35879
+  tps: 13134.3396
+ }
+}
+dps_results: {
+ key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 34706.60345
+  tps: 15519.08298
  }
 }
 dps_results: {
diff --git a/sim/warlock/demonology/demonology_test.go b/sim/warlock/demonology/demonology_test.go
index f77c31e35a..34ff1170de 100644
--- a/sim/warlock/demonology/demonology_test.go
+++ b/sim/warlock/demonology/demonology_test.go
@@ -435,28 +435,52 @@ func TestDemonology(t *testing.T) {
 		TinkerHands:       proto.TinkerHands_TinkerHandsSynapseSprings,
 	}
 
-	var demonologyTalents = "-3312222300310212211-33202"
-	var demonologyGlyphs = &proto.Glyphs{
+	// Shadow Bolt
+	var demonologyTalentsShadowBolt = "-3312222300310212211-33202"
+	var demonologyGlyphsShadowBolt = &proto.Glyphs{
 		Prime1: int32(proto.WarlockPrimeGlyph_GlyphOfImmolate),
 		Prime2: int32(proto.WarlockPrimeGlyph_GlyphOfCorruption),
 		Prime3: int32(proto.WarlockPrimeGlyph_GlyphOfMetamorphosis),
-		Major1: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap),
-		Major2: int32(proto.WarlockMajorGlyph_GlyphOfShadowBolt),
+		Major1: int32(proto.WarlockMajorGlyph_GlyphOfShadowBolt),
+		Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap),
+		Major3: int32(proto.WarlockMajorGlyph_GlyphOfFelhunter),
+	}
+
+	// Incinerate
+	var demonologyTalentsIncenerate = "003-3312222300310212211-03202"
+	var demonologyGlyphsIncenerate = &proto.Glyphs{
+		Prime1: int32(proto.WarlockPrimeGlyph_GlyphOfImmolate),
+		Prime2: int32(proto.WarlockPrimeGlyph_GlyphOfIncinerate),
+		Prime3: int32(proto.WarlockPrimeGlyph_GlyphOfMetamorphosis),
+		Major1: int32(proto.WarlockMajorGlyph_GlyphOfSoulstone),
+		Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap),
 		Major3: int32(proto.WarlockMajorGlyph_GlyphOfFelhunter),
 	}
 
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{
-		Class:            proto.Class_ClassWarlock,
-		Race:             proto.Race_RaceOrc,
-		OtherRaces:       []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:          core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p1"),
-		Talents:          demonologyTalents,
-		Glyphs:           demonologyGlyphs,
+		Class:      proto.Class_ClassWarlock,
+		Race:       proto.Race_RaceOrc,
+		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
+		GearSet:    core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p1"),
+		OtherGearSets: []core.GearSetCombo{
+			core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p3"),
+		},
+		Talents: demonologyTalentsShadowBolt,
+		Glyphs:  demonologyGlyphsShadowBolt,
+		OtherTalentSets: []core.TalentsCombo{
+			{
+				Label:   "Incinerate",
+				Talents: demonologyTalentsIncenerate,
+				Glyphs:  demonologyGlyphsIncenerate,
+			},
+		},
 		Consumes:         fullConsumes,
 		SpecOptions:      core.SpecOptionsCombo{Label: "Demonology Warlock", SpecOptions: defaultDemonologyWarlock},
 		OtherSpecOptions: []core.SpecOptionsCombo{},
 		Rotation:         core.GetAplRotation("../../../ui/warlock/demonology/apls", "shadow-bolt"),
-		OtherRotations:   []core.RotationCombo{},
+		OtherRotations: []core.RotationCombo{
+			core.GetAplRotation("../../../ui/warlock/demonology/apls", "incinerate"),
+		},
 		ItemFilter:       itemFilter,
 		StartingDistance: 25,
 	}))
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index 6f1b9ae797..ac59a66396 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -12,6 +12,8 @@
 		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 68998 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 69000 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
 	],
@@ -385,11 +387,23 @@
 			}
 		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{ "hide": true, "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 71165 } } }, "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 63167 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 71165 } } }, { "auraIsActive": { "auraId": { "spellId": 71165 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 29722 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 63167 } } }, { "auraIsActive": { "auraId": { "spellId": 63167 } } }] }
+				},
+				"castSpell": { "spellId": { "spellId": 6353 } }
+			}
+		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } },
-		{ "action": {} }
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
 	]
 }
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
index f98b0a46f5..ff37d01e8c 100644
--- a/ui/warlock/demonology/apls/shadow-bolt.apl.json
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -12,6 +12,8 @@
 		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 68998 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
+		{ "action": { "castSpell": { "spellId": { "itemId": 69000 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
 	],
@@ -359,7 +361,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 17941 } } }, { "auraIsKnown": { "auraId": { "spellId": 17941 } } }] }
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 17941 } } }, { "auraIsActive": { "auraId": { "spellId": 17941 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 686 } }
 			}
@@ -367,7 +369,7 @@
 		{
 			"action": {
 				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 71165 } } }, { "auraIsKnown": { "auraId": { "spellId": 71165 } } }] }
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 71165 } } }, { "auraIsActive": { "auraId": { "spellId": 71165 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 29722 } }
 			}
@@ -375,18 +377,12 @@
 		{
 			"action": {
 				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 63167 } } }, { "auraIsKnown": { "auraId": { "spellId": 63167 } } }] }
+					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 63167 } } }, { "auraIsActive": { "auraId": { "spellId": 63167 } } }] }
 				},
 				"castSpell": { "spellId": { "spellId": 6353 } }
 			}
 		},
-		{
-			"action": {
-				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 17941 } } } } },
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{ "action": { "condition": { "auraIsKnown": { "auraId": { "spellId": 17941 } } }, "castSpell": { "spellId": { "spellId": 686 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
 	]
 }
diff --git a/ui/warlock/demonology/gear_sets/p3.gear.json b/ui/warlock/demonology/gear_sets/p3.gear.json
new file mode 100644
index 0000000000..08473d114a
--- /dev/null
+++ b/ui/warlock/demonology/gear_sets/p3.gear.json
@@ -0,0 +1,21 @@
+{
+	"items": [
+		{ "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 151 },
+		{ "id": 71472, "gems": [52207], "reforging": 165 },
+		{ "id": 71598, "enchant": 4200, "gems": [52207], "reforging": 154 },
+		{ "id": 71434, "enchant": 4115, "reforging": 144 },
+		{ "id": 71597, "enchant": 4102, "gems": [52207, 52207], "reforging": 154 },
+		{ "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 },
+		{ "id": 71614, "enchant": 4107, "gems": [52207, 0], "reforging": 147 },
+		{ "id": 71613, "gems": [52207, 52207], "reforging": 151 },
+		{ "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 144 },
+		{ "id": 71447, "enchant": 4104, "gems": [52207], "reforging": 144 },
+		{ "id": 71217, "gems": [52207] },
+		{ "id": 71449, "reforging": 144 },
+		{ "id": 69110 },
+		{ "id": 62047, "reforging": 165 },
+		{ "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207], "reforging": 154 },
+		{},
+		{ "id": 71473, "reforging": 144 }
+	]
+}
diff --git a/ui/warlock/demonology/gear_sets/p4_wrath.gear.json b/ui/warlock/demonology/gear_sets/p4_wrath.gear.json
deleted file mode 100644
index d6da3c5752..0000000000
--- a/ui/warlock/demonology/gear_sets/p4_wrath.gear.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"items": [
-    {"id":51231,"enchant":3820,"gems":[41285,40133]},
-    {"id":50658,"gems":[40153]},
-    {"id":51234,"enchant":3810,"gems":[40153]},
-    {"id":50668,"enchant":3722,"gems":[40133]},
-    {"id":50717,"enchant":1144,"gems":[40133,40113,40153]},
-    {"id":50686,"enchant":2332,"gems":[40133,0]},
-    {"id":51230,"enchant":3604,"gems":[40133,0]},
-    {"id":50702,"gems":[40153,40113,40113]},
-    {"id":51232,"enchant":3872,"gems":[40113,40113]},
-    {"id":50699,"enchant":4223,"gems":[40133,40113]},
-    {"id":50398,"gems":[40153]},
-    {"id":50636,"gems":[40153]},
-    {"id":50365},
-    {"id":50348},
-    {"id":50732,"enchant":3834,"gems":[40113]},
-    {"id":50635},
-    {"id":50631,"gems":[40153]}
-]}
diff --git a/ui/warlock/demonology/gear_sets/preraid.gear.json b/ui/warlock/demonology/gear_sets/preraid.gear.json
index 9c35c9c159..d7e5b6b2a5 100644
--- a/ui/warlock/demonology/gear_sets/preraid.gear.json
+++ b/ui/warlock/demonology/gear_sets/preraid.gear.json
@@ -1,3 +1 @@
-{"items": [
-    ]}
-    
\ No newline at end of file
+{ "items": [] }
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
index 2d5ceb26e0..1cea62d789 100644
--- a/ui/warlock/demonology/presets.ts
+++ b/ui/warlock/demonology/presets.ts
@@ -26,25 +26,23 @@ import { WARLOCK_BREAKPOINTS } from '../presets';
 import IncinerateAPL from './apls/incinerate.apl.json';
 import ShadowBoltAPL from './apls/shadow-bolt.apl.json';
 import P1Gear from './gear_sets/p1.gear.json';
-import P4WrathGear from './gear_sets/p4_wrath.gear.json';
+import P3Gear from './gear_sets/p3.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
 // keep them in a separate file.
 
-export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/";
-
 export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
 export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
-export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP });
+export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear);
 
 export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', ShadowBoltAPL);
 export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL);
 
 // Preset options for EP weights
-export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
-	'P1',
+export const EP_PRESET_DEFAULT = PresetUtils.makePresetEpWeights(
+	'Default',
 	Stats.fromMap({
 		[Stat.StatIntellect]: 1.27,
 		[Stat.StatSpellPower]: 1.0,
@@ -68,7 +66,7 @@ export const DemonologyTalentsShadowBolt = {
 			prime3: PrimeGlyph.GlyphOfMetamorphosis,
 			major1: MajorGlyph.GlyphOfShadowBolt,
 			major2: MajorGlyph.GlyphOfLifeTap,
-			major3: MajorGlyph.GlyphOfSoulLink,
+			major3: MajorGlyph.GlyphOfFelhunter,
 			minor1: MinorGlyph.GlyphOfDrainSoul,
 			minor2: MinorGlyph.GlyphOfRitualOfSouls,
 			minor3: MinorGlyph.GlyphOfUnendingBreath,
@@ -85,7 +83,7 @@ export const DemonologyTalentsIncinerate = {
 			prime3: PrimeGlyph.GlyphOfMetamorphosis,
 			major1: MajorGlyph.GlyphOfSoulstone,
 			major2: MajorGlyph.GlyphOfLifeTap,
-			major3: MajorGlyph.GlyphOfSoulLink,
+			major3: MajorGlyph.GlyphOfFelhunter,
 			minor1: MinorGlyph.GlyphOfDrainSoul,
 			minor2: MinorGlyph.GlyphOfRitualOfSouls,
 			minor3: MinorGlyph.GlyphOfUnendingBreath,
diff --git a/ui/warlock/demonology/sim.ts b/ui/warlock/demonology/sim.ts
index 5a29e9d4a2..7b3035bd1c 100644
--- a/ui/warlock/demonology/sim.ts
+++ b/ui/warlock/demonology/sim.ts
@@ -24,20 +24,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 	epReferenceStat: Stat.StatSpellPower,
 	// Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar.
 	displayStats: UnitStat.createDisplayStatArray(
-		[
-			Stat.StatHealth,
-			Stat.StatMana,
-			Stat.StatStamina,
-			Stat.StatIntellect,
-			Stat.StatSpellPower,
-			Stat.StatMasteryRating,
-			Stat.StatMP5,
-		],
-		[
-			PseudoStat.PseudoStatSpellHitPercent,
-			PseudoStat.PseudoStatSpellCritPercent,
-			PseudoStat.PseudoStatSpellHastePercent,
-		],
+		[Stat.StatHealth, Stat.StatMana, Stat.StatStamina, Stat.StatIntellect, Stat.StatSpellPower, Stat.StatMasteryRating, Stat.StatMP5],
+		[PseudoStat.PseudoStatSpellHitPercent, PseudoStat.PseudoStatSpellCritPercent, PseudoStat.PseudoStatSpellHastePercent],
 	),
 
 	defaults: {
@@ -45,7 +33,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 		gear: Presets.P1_PRESET.gear,
 
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.EP_PRESET_DEFAULT.epWeights,
 		// Default stat caps for the Reforge optimizer
 		statCaps: (() => {
 			return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17);
@@ -132,16 +120,16 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.EP_PRESET_DEFAULT],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.DemonologyTalentsShadowBolt, Presets.DemonologyTalentsIncinerate],
 		// Preset rotations that the user can quickly select.
 		rotations: [Presets.APL_ShadowBolt, Presets.APL_Incinerate],
 
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET],
+		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET],
 
-		builds: [Presets.PRESET_BUILD_SHADOWBOLT, Presets.PRESET_BUILD_INCINERATE]
+		builds: [Presets.PRESET_BUILD_SHADOWBOLT, Presets.PRESET_BUILD_INCINERATE],
 	},
 
 	autoRotation: (_player: Player<Spec.SpecDemonologyWarlock>): APLRotation => {
@@ -164,12 +152,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 				[Faction.Alliance]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 				[Faction.Horde]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 			},
 			otherDefaults: Presets.OtherDefaults,

From f172059b5112393baa6997619e30944908f5a89e Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 18:15:13 +0200
Subject: [PATCH 07/11] Update Destruction P3

---
 .../destruction/TestDestruction.results       | 552 +++++++++++++++++-
 sim/warlock/destruction/destruction_test.go   |  17 +-
 ui/warlock/demonology/presets.ts              |   6 +-
 .../apls/{default.apl.json => p1.apl.json}    |   0
 ui/warlock/destruction/apls/p3.apl.json       | 150 +++++
 ui/warlock/destruction/gear_sets/p3.gear.json |  21 +
 .../destruction/gear_sets/p4_wrath.gear.json  |  19 -
 ui/warlock/destruction/presets.ts             |  28 +-
 ui/warlock/destruction/sim.ts                 |  33 +-
 9 files changed, 744 insertions(+), 82 deletions(-)
 rename ui/warlock/destruction/apls/{default.apl.json => p1.apl.json} (100%)
 create mode 100644 ui/warlock/destruction/apls/p3.apl.json
 create mode 100644 ui/warlock/destruction/gear_sets/p3.gear.json
 delete mode 100644 ui/warlock/destruction/gear_sets/p4_wrath.gear.json

diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results
index 8d72002904..694f10fc98 100644
--- a/sim/warlock/destruction/TestDestruction.results
+++ b/sim/warlock/destruction/TestDestruction.results
@@ -1474,173 +1474,677 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 30944.55015
   tps: 35553.94797
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29243.24577
   tps: 19127.87924
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 39628.43095
   tps: 23833.4509
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 18878.3363
   tps: 26037.2245
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 18878.3363
   tps: 12421.21542
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 22023.66669
   tps: 13083.18104
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30667.56719
+  tps: 35114.15407
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 28931.06266
+  tps: 18592.76728
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 39759.90878
+  tps: 23592.3701
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 18506.71658
+  tps: 26076.05954
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 18506.71658
+  tps: 11925.4119
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 21766.92069
+  tps: 12493.18876
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38840.61715
+  tps: 43557.98207
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36897.34578
+  tps: 24250.2093
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47289.08001
+  tps: 28982.90147
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24331.48873
+  tps: 30197.09151
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24331.48873
+  tps: 15959.68752
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27111.25683
+  tps: 16399.58361
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38853.67653
+  tps: 41613.07619
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36915.39806
+  tps: 23897.09932
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47075.66769
+  tps: 28488.92276
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24101.82774
+  tps: 29955.15936
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24101.82774
+  tps: 15458.44038
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27052.53289
+  tps: 15815.95281
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 30788.26856
   tps: 35350.25733
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29049.20842
   tps: 19019.91918
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 39644.20571
   tps: 23805.5196
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 18811.39643
   tps: 25781.20452
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 18811.39643
   tps: 12462.11256
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 21879.11477
   tps: 13049.56207
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30519.2967
+  tps: 34694.77393
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 28882.80993
+  tps: 18571.11752
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 39467.21416
+  tps: 23410.26932
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 18411.8521
+  tps: 25818.92386
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 18411.8521
+  tps: 11856.44313
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 21862.1944
+  tps: 12476.95063
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38554.27012
+  tps: 43435.21829
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36692.87386
+  tps: 24060.14254
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 47125.01574
+  tps: 28917.80132
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24016.05785
+  tps: 29647.68884
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24016.05785
+  tps: 15722.18975
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 26579.22036
+  tps: 15974.65233
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 38609.50058
+  tps: 41587.19344
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36819.74211
+  tps: 23802.28345
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 46890.34338
+  tps: 28382.41699
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 23830.94811
+  tps: 29467.69106
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 23830.94811
+  tps: 15305.18319
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 26692.01165
+  tps: 15695.91612
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 31331.13957
   tps: 35501.27991
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29589.57194
   tps: 19175.05687
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 40744.3767
   tps: 24107.53598
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 19187.0579
   tps: 25806.62518
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 19187.0579
   tps: 12556.49334
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 22589.74275
   tps: 13224.88738
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 31039.33036
+  tps: 34853.6147
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29421.35536
+  tps: 18720.462
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 40573.30316
+  tps: 23726.2413
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 18819.95828
+  tps: 25940.74083
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 18819.95828
+  tps: 11982.81282
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 22576.32968
+  tps: 12647.91227
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39179.05391
+  tps: 43595.26607
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37315.29027
+  tps: 24222.67125
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48328.3378
+  tps: 29247.51338
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24451.25789
+  tps: 29741.80827
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24451.25789
+  tps: 15817.00975
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27371.78109
+  tps: 16147.96853
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39249.98523
+  tps: 41764.56739
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37442.15897
+  tps: 23970.00509
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48093.03979
+  tps: 28713.19006
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24242.20814
+  tps: 29547.17384
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24242.20814
+  tps: 15400.8561
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27475.62729
+  tps: 15864.02246
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 31084.99479
   tps: 35914.24842
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 29399.58917
   tps: 19272.90715
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 40336.6087
   tps: 24222.36944
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 19049.27039
   tps: 26192.54997
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 19049.27039
   tps: 12576.59316
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 22824.72289
   tps: 13662.46545
  }
 }
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 30786.63685
+  tps: 35233.1714
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 29035.19728
+  tps: 18651.72368
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 40300.58414
+  tps: 23943.99453
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 18708.09533
+  tps: 26435.23468
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 18708.09533
+  tps: 12066.10654
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 22726.59818
+  tps: 13134.51981
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39083.015
+  tps: 43711.66813
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37379.99838
+  tps: 24618.22443
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48392.65036
+  tps: 29709.79102
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24388.43767
+  tps: 30142.78831
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24388.43767
+  tps: 15995.68418
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27953.69626
+  tps: 17038.56073
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 39029.16261
+  tps: 41909.08975
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 37325.51277
+  tps: 24176.42959
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 48186.31065
+  tps: 29305.68
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24152.33225
+  tps: 29872.269
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24152.33225
+  tps: 15532.94851
+ }
+}
+dps_results: {
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27867.96396
+  tps: 16485.40739
+ }
+}
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
  value: {
diff --git a/sim/warlock/destruction/destruction_test.go b/sim/warlock/destruction/destruction_test.go
index 3dfc4af40b..9d4b885bef 100644
--- a/sim/warlock/destruction/destruction_test.go
+++ b/sim/warlock/destruction/destruction_test.go
@@ -355,17 +355,22 @@ func TestDestruction(t *testing.T) {
 	}
 
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{
-		Class:            proto.Class_ClassWarlock,
-		Race:             proto.Race_RaceOrc,
-		OtherRaces:       []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:          core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p1"),
+		Class:      proto.Class_ClassWarlock,
+		Race:       proto.Race_RaceOrc,
+		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
+		GearSet:    core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p1"),
+		OtherGearSets: []core.GearSetCombo{
+			core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p3"),
+		},
 		Talents:          destructionTalents,
 		Glyphs:           destructionGlyphs,
 		Consumes:         fullConsumes,
 		SpecOptions:      core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: defaultDestructionWarlock},
 		OtherSpecOptions: []core.SpecOptionsCombo{},
-		Rotation:         core.GetAplRotation("../../../ui/warlock/destruction/apls", "default"),
-		OtherRotations:   []core.RotationCombo{},
+		Rotation:         core.GetAplRotation("../../../ui/warlock/destruction/apls", "p1"),
+		OtherRotations: []core.RotationCombo{
+			core.GetAplRotation("../../../ui/warlock/destruction/apls", "p3"),
+		},
 		ItemFilter:       itemFilter,
 		StartingDistance: 25,
 	}))
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
index 1cea62d789..83045f8c44 100644
--- a/ui/warlock/demonology/presets.ts
+++ b/ui/warlock/demonology/presets.ts
@@ -33,9 +33,9 @@ import PreraidGear from './gear_sets/preraid.gear.json';
 // Eventually we will import these values for the raid sim too, so its good to
 // keep them in a separate file.
 
-export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
-export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
-export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear);
+export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid', PreraidGear);
+export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear);
+export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear);
 
 export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', ShadowBoltAPL);
 export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL);
diff --git a/ui/warlock/destruction/apls/default.apl.json b/ui/warlock/destruction/apls/p1.apl.json
similarity index 100%
rename from ui/warlock/destruction/apls/default.apl.json
rename to ui/warlock/destruction/apls/p1.apl.json
diff --git a/ui/warlock/destruction/apls/p3.apl.json b/ui/warlock/destruction/apls/p3.apl.json
new file mode 100644
index 0000000000..001bd6d7c8
--- /dev/null
+++ b/ui/warlock/destruction/apls/p3.apl.json
@@ -0,0 +1,150 @@
+{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-8.0s" } } },
+		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 6353 } } }, "doAtValue": { "const": { "val": "-0.5s" } } }
+	],
+	"priorityList": [
+		{ "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }, { "spellCanCast": { "spellId": { "spellId": 77801 } } }]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 77801 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
+							{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
+							{ "auraIsActive": { "auraId": { "spellId": 75170 } } }
+						]
+					}
+				},
+				"sequence": { "name": "Doomguard", "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
+			}
+		},
+		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 74434 } } } },
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "auraIsActive": { "auraId": { "spellId": 74434 } } },
+							{ "auraIsActive": { "auraId": { "spellId": 47221 } } },
+							{ "cmp": { "op": "OpLt", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 18120 } } }, "rhs": { "const": { "val": "3s" } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 6353 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{
+								"and": {
+									"vals": [
+										{
+											"cmp": {
+												"op": "OpLt",
+												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
+												"rhs": {
+													"math": {
+														"op": "OpAdd",
+														"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
+														"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
+													}
+												}
+											}
+										},
+										{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "5s" } } } }
+									]
+								}
+							},
+							{
+								"and": {
+									"vals": [
+										{
+											"cmp": {
+												"op": "OpLt",
+												"lhs": { "auraRemainingTime": { "auraId": { "spellId": 2825, "tag": -1 } } },
+												"rhs": { "const": { "val": "2s" } }
+											}
+										},
+										{
+											"cmp": {
+												"op": "OpLt",
+												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
+												"rhs": { "const": { "val": "12s" } }
+											}
+										},
+										{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }
+									]
+								}
+							}
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 348 } }
+			}
+		},
+		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } },
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 172 } }
+			}
+		},
+		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
+		{
+			"action": {
+				"condition": { "and": { "vals": [{ "isExecutePhase": { "threshold": "E20" } }, { "spellCanCast": { "spellId": { "spellId": 17877 } } }] } },
+				"castSpell": { "spellId": { "spellId": 17877 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"and": {
+						"vals": [
+							{ "spellCanCast": { "spellId": { "spellId": 50796 } } },
+							{ "auraIsInactiveWithReactionTime": { "auraId": { "spellId": 54277 } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 50796 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+	]
+}
diff --git a/ui/warlock/destruction/gear_sets/p3.gear.json b/ui/warlock/destruction/gear_sets/p3.gear.json
new file mode 100644
index 0000000000..911cc46e0e
--- /dev/null
+++ b/ui/warlock/destruction/gear_sets/p3.gear.json
@@ -0,0 +1,21 @@
+{
+	"items": [
+		{ "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 165 },
+		{ "id": 71472, "gems": [52207], "reforging": 165 },
+		{ "id": 71598, "enchant": 4200, "gems": [52208] },
+		{ "id": 71434, "enchant": 4115, "reforging": 144 },
+		{ "id": 71597, "enchant": 4102, "gems": [52208, 52217] },
+		{ "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 },
+		{ "id": 71614, "enchant": 4068, "gems": [52207, 0], "reforging": 144 },
+		{ "id": 71613, "gems": [52207, 52207], "reforging": 165 },
+		{ "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 165 },
+		{ "id": 71447, "enchant": 4104, "gems": [52208], "reforging": 144 },
+		{ "id": 71217, "gems": [52207] },
+		{ "id": 71449, "reforging": 165 },
+		{ "id": 69110 },
+		{ "id": 62047, "reforging": 167 },
+		{ "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207] },
+		{},
+		{ "id": 71575, "reforging": 137 }
+	]
+}
diff --git a/ui/warlock/destruction/gear_sets/p4_wrath.gear.json b/ui/warlock/destruction/gear_sets/p4_wrath.gear.json
deleted file mode 100644
index a1c24a9a8f..0000000000
--- a/ui/warlock/destruction/gear_sets/p4_wrath.gear.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"items": [
-    {"id":51231,"enchant":3820,"gems":[41285,40133]},
-    {"id":50658,"gems":[40153]},
-    {"id":51234,"enchant":3810,"gems":[40152]},
-    {"id":50628,"enchant":3722,"gems":[40152]},
-    {"id":51233,"enchant":3832,"gems":[40113,40155]},
-    {"id":50651,"enchant":2332,"gems":[40155,0]},
-    {"id":51230,"enchant":3604,"gems":[40113,0]},
-    {"id":50613,"gems":[40133,40113,40113]},
-    {"id":50694,"enchant":3719,"gems":[40113,40113,40113]},
-    {"id":50699,"enchant":4223,"gems":[40133,40113]},
-    {"id":50664,"gems":[40113]},
-    {"id":50398,"gems":[40155]},
-    {"id":50365},
-    {"id":50348},
-    {"id":50732,"enchant":3834,"gems":[40113]},
-    {"id":50719},
-    {"id":50684,"gems":[40153]}
-]}
diff --git a/ui/warlock/destruction/presets.ts b/ui/warlock/destruction/presets.ts
index 922934aca0..ae31327ce7 100644
--- a/ui/warlock/destruction/presets.ts
+++ b/ui/warlock/destruction/presets.ts
@@ -10,9 +10,10 @@ import {
 } from '../../core/proto/warlock';
 import { Stats } from '../../core/proto_utils/stats';
 import { WARLOCK_BREAKPOINTS } from '../presets';
-import DefaultApl from './apls/default.apl.json';
+import P1Apl from './apls/p1.apl.json';
+import P3Apl from './apls/p3.apl.json';
 import P1Gear from './gear_sets/p1.gear.json';
-import P4WrathGear from './gear_sets/p4_wrath.gear.json';
+import P3Gear from './gear_sets/p3.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
 
 // Preset options for this spec.
@@ -21,15 +22,26 @@ import PreraidGear from './gear_sets/preraid.gear.json';
 
 export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/";
 
-export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
-export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
-export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP });
+export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid', PreraidGear);
+export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear);
+export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear);
 
-export const APL_Default = PresetUtils.makePresetAPLRotation('Destro', DefaultApl);
+export const P1_APL = PresetUtils.makePresetAPLRotation('P1', P1Apl);
+export const P3_APL = PresetUtils.makePresetAPLRotation('P3', P3Apl);
+
+export const P1_PRESET_BUILD = PresetUtils.makePresetBuild('P1 - Default', {
+	gear: P1_PRESET,
+	rotation: P1_APL,
+});
+
+export const P3_PRESET_BUILD = PresetUtils.makePresetBuild('P3 - Default', {
+	gear: P3_PRESET,
+	rotation: P3_APL,
+});
 
 // Preset options for EP weights
-export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
-	'P1',
+export const EP_PRESET_DEFAULT = PresetUtils.makePresetEpWeights(
+	'Default',
 	Stats.fromMap({
 		[Stat.StatIntellect]: 1.25,
 		[Stat.StatSpellPower]: 1,
diff --git a/ui/warlock/destruction/sim.ts b/ui/warlock/destruction/sim.ts
index f852f12529..e8ebdff5e9 100644
--- a/ui/warlock/destruction/sim.ts
+++ b/ui/warlock/destruction/sim.ts
@@ -1,7 +1,6 @@
 import * as BuffDebuffInputs from '../../core/components/inputs/buffs_debuffs';
 import * as OtherInputs from '../../core/components/inputs/other_inputs';
 import { ReforgeOptimizer } from '../../core/components/suggest_reforges_action';
-import * as Mechanics from '../../core/constants/mechanics.js';
 import { IndividualSimUI, registerSpecConfig } from '../../core/individual_sim_ui';
 import { Player } from '../../core/player';
 import { PlayerClasses } from '../../core/player_classes';
@@ -23,20 +22,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 	epReferenceStat: Stat.StatSpellPower,
 	// Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar.
 	displayStats: UnitStat.createDisplayStatArray(
-		[
-			Stat.StatHealth,
-			Stat.StatMana,
-			Stat.StatStamina,
-			Stat.StatIntellect,
-			Stat.StatSpellPower,
-			Stat.StatMasteryRating,
-			Stat.StatMP5,
-		],
-		[
-			PseudoStat.PseudoStatSpellHitPercent,
-			PseudoStat.PseudoStatSpellCritPercent,
-			PseudoStat.PseudoStatSpellHastePercent,
-		],
+		[Stat.StatHealth, Stat.StatMana, Stat.StatStamina, Stat.StatIntellect, Stat.StatSpellPower, Stat.StatMasteryRating, Stat.StatMP5],
+		[PseudoStat.PseudoStatSpellHitPercent, PseudoStat.PseudoStatSpellCritPercent, PseudoStat.PseudoStatSpellHastePercent],
 	),
 
 	defaults: {
@@ -44,7 +31,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 		gear: Presets.P1_PRESET.gear,
 
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.EP_PRESET_DEFAULT.epWeights,
 		// Default stat caps for the Reforge optimizer
 		statCaps: (() => {
 			return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17);
@@ -104,18 +91,20 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.EP_PRESET_DEFAULT],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.DestructionTalents],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.APL_Default],
+		rotations: [Presets.P1_APL, Presets.P3_APL],
 
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET],
+		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET],
+
+		builds: [Presets.P1_PRESET_BUILD, Presets.P3_PRESET_BUILD],
 	},
 
 	autoRotation: (_player: Player<Spec.SpecDestructionWarlock>): APLRotation => {
-		return Presets.APL_Default.rotation.rotation!;
+		return Presets.P1_APL.rotation.rotation!;
 	},
 
 	raidSimPresets: [
@@ -134,12 +123,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 				[Faction.Alliance]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 				[Faction.Horde]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 			},
 			otherDefaults: Presets.OtherDefaults,

From 9b0c89ddaf515098e8a6922ecbcced7607014054 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 18:25:32 +0200
Subject: [PATCH 08/11] Update Affliction P3

---
 sim/warlock/affliction/TestAffliction.results | 1082 ++++++++++-------
 sim/warlock/affliction/affliction_test.go     |   11 +-
 ui/warlock/affliction/apls/default.apl.json   |   12 +-
 ui/warlock/affliction/gear_sets/p3.gear.json  |   21 +
 .../affliction/gear_sets/p4_wrath.gear.json   |   19 -
 ui/warlock/affliction/presets.ts              |   14 +-
 ui/warlock/affliction/sim.ts                  |   10 +-
 ui/warlock/demonology/presets.ts              |    2 +-
 ui/warlock/demonology/sim.ts                  |    4 +-
 ui/warlock/destruction/presets.ts             |    2 +-
 ui/warlock/destruction/sim.ts                 |    4 +-
 11 files changed, 672 insertions(+), 509 deletions(-)
 create mode 100644 ui/warlock/affliction/gear_sets/p3.gear.json
 delete mode 100644 ui/warlock/affliction/gear_sets/p4_wrath.gear.json

diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results
index a1f6574f0f..0e2141d963 100644
--- a/sim/warlock/affliction/TestAffliction.results
+++ b/sim/warlock/affliction/TestAffliction.results
@@ -38,1537 +38,1621 @@ character_stats_results: {
 dps_results: {
  key: "TestAffliction-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 28439.17184
-  tps: 20697.51094
+  dps: 28432.87046
+  tps: 20716.91686
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 27268.62357
-  tps: 19848.84803
+  dps: 27216.84655
+  tps: 19845.99599
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 26965.58532
-  tps: 19774.80515
+  dps: 26905.55567
+  tps: 19745.87002
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 27483.99094
-  tps: 20065.75473
+  dps: 27447.94022
+  tps: 20066.93271
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 27531.33118
-  tps: 20094.16219
+  dps: 27501.07274
+  tps: 20102.24268
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 28106.00317
-  tps: 20369.14877
+  dps: 28089.49178
+  tps: 20382.16541
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 28406.96593
-  tps: 20430.64678
+  dps: 28384.707
+  tps: 20436.62712
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 26702.85293
-  tps: 19503.89226
-  hps: 100.63102
+  dps: 26615.19938
+  tps: 19466.99962
+  hps: 100.65769
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 28207.89867
-  tps: 20527.59106
+  dps: 28186.38726
+  tps: 20524.32006
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BindingPromise-67037"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 26799.45893
-  tps: 19610.6177
+  dps: 26741.02846
+  tps: 19601.37436
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 26939.71672
-  tps: 19724.5727
+  dps: 26917.05929
+  tps: 19713.64147
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 26939.71672
-  tps: 19724.5727
+  dps: 26917.05929
+  tps: 19713.64147
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 26616.27835
-  tps: 19441.28086
+  dps: 26556.65935
+  tps: 19412.35
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 27524.4432
-  tps: 20075.7356
+  dps: 27475.93684
+  tps: 20059.26892
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 26632.48919
-  tps: 19449.56118
+  dps: 26584.41738
+  tps: 19432.21521
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 27046.86331
-  tps: 19730.94751
+  dps: 27034.00238
+  tps: 19744.24805
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 26711.57293
-  tps: 19493.93678
+  dps: 26687.61713
+  tps: 19505.46053
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 26711.57293
-  tps: 19493.93678
+  dps: 26687.61713
+  tps: 19505.46053
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 27539.25361
-  tps: 20091.83967
+  dps: 27516.63236
+  tps: 20080.89232
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BottledLightning-66879"
  value: {
-  dps: 27362.63211
-  tps: 19963.68126
+  dps: 27341.71229
+  tps: 19964.85301
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 28302.79172
-  tps: 20127.36617
+  dps: 28287.66395
+  tps: 20135.7527
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 28594.00145
-  tps: 20812.54946
+  dps: 28579.17401
+  tps: 20821.39086
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 28528.87856
-  tps: 20757.42108
+  dps: 28515.59265
+  tps: 20772.1296
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 27083.23129
-  tps: 19760.61353
+  dps: 27070.29339
+  tps: 19753.91543
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 27652.51007
-  tps: 20154.17527
+  dps: 27588.40502
+  tps: 20134.40921
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CrushingWeight-59506"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CrushingWeight-65118"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 26710.75416
-  tps: 19490.6276
+  dps: 26686.79836
+  tps: 19502.14803
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 27700.03127
-  tps: 20155.47846
+  dps: 27629.86971
+  tps: 20125.90055
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 26917.5728
-  tps: 19649.32675
+  dps: 26906.33332
+  tps: 19648.25883
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 28235.48538
-  tps: 20472.99453
+  dps: 28221.87854
+  tps: 20487.37374
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 27325.56714
-  tps: 19948.92187
+  dps: 27325.4935
+  tps: 19980.85933
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 27087.75324
-  tps: 19780.59326
+  dps: 27066.55223
+  tps: 19767.7582
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 28106.00317
-  tps: 20369.14877
+  dps: 28089.49178
+  tps: 20382.16541
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 27070.39378
-  tps: 19767.86265
+  dps: 27042.40717
+  tps: 19762.9432
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 28280.36381
-  tps: 20540.79816
+  dps: 28269.40511
+  tps: 20551.96759
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 28235.48538
-  tps: 20472.99453
+  dps: 28221.87854
+  tps: 20487.37374
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 26965.58532
-  tps: 19774.80515
+  dps: 26905.55567
+  tps: 19745.87002
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 28106.00317
-  tps: 20369.14877
+  dps: 28089.49178
+  tps: 20382.16541
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FallofMortality-59500"
  value: {
-  dps: 27700.03127
-  tps: 20155.47846
+  dps: 27629.86971
+  tps: 20125.90055
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FallofMortality-65124"
  value: {
-  dps: 27873.34305
-  tps: 20291.99334
+  dps: 27772.99165
+  tps: 20224.66607
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 27700.67369
-  tps: 20184.94843
+  dps: 27668.37842
+  tps: 20180.27574
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 26831.30867
-  tps: 19570.26272
+  dps: 26781.17759
+  tps: 19552.67169
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 27473.81994
-  tps: 20000.93337
+  dps: 27414.44293
+  tps: 19982.61968
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 26678.6325
-  tps: 19492.20745
+  dps: 26640.88017
+  tps: 19483.30862
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 28316.75124
-  tps: 20594.50162
+  dps: 28257.67483
+  tps: 20578.87603
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 26828.94988
-  tps: 19646.02187
+  dps: 26780.61941
+  tps: 19628.41724
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 28251.552
-  tps: 20518.70188
+  dps: 28244.69835
+  tps: 20537.54715
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FluidDeath-58181"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 28302.79172
-  tps: 20530.39414
+  dps: 28287.66395
+  tps: 20539.00205
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 27091.51607
-  tps: 19766.96832
+  dps: 27084.56901
+  tps: 19766.13768
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GaleofShadows-56138"
  value: {
-  dps: 27633.05432
-  tps: 20224.21014
+  dps: 27614.35768
+  tps: 20231.35436
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GaleofShadows-56462"
  value: {
-  dps: 27874.83145
-  tps: 20413.52625
+  dps: 27889.08958
+  tps: 20459.82833
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GearDetector-61462"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 23441.06483
-  tps: 16982.27515
+  dps: 23469.45219
+  tps: 17043.96706
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 27216.73288
-  tps: 19802.7539
+  dps: 27165.02928
+  tps: 19797.82484
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HarmlightToken-63839"
  value: {
-  dps: 27732.89052
-  tps: 20105.79409
+  dps: 27684.06513
+  tps: 20107.58497
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 27891.56793
-  tps: 20490.86798
+  dps: 27832.79876
+  tps: 20462.14935
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 28050.78684
-  tps: 20676.93872
+  dps: 27977.30807
+  tps: 20612.21513
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofRage-59224"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofRage-65072"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofSolace-55868"
  value: {
-  dps: 26939.90628
-  tps: 19713.16052
+  dps: 26921.38661
+  tps: 19720.3466
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofSolace-56393"
  value: {
-  dps: 27084.8466
-  tps: 19830.81441
+  dps: 27098.12295
+  tps: 19875.85633
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofThunder-55845"
  value: {
-  dps: 26715.39161
-  tps: 19522.84199
+  dps: 26692.65294
+  tps: 19511.82951
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofThunder-56370"
  value: {
-  dps: 26703.83163
-  tps: 19514.87845
+  dps: 26681.09295
+  tps: 19503.86598
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 28235.48538
-  tps: 20472.99453
+  dps: 28221.87854
+  tps: 20487.37374
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 26927.18023
-  tps: 19744.25222
+  dps: 26878.72043
+  tps: 19726.51826
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 26927.18023
-  tps: 19744.25222
+  dps: 26878.72043
+  tps: 19726.51826
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 26949.91888
-  tps: 19734.44387
+  dps: 26923.07495
+  tps: 19719.84485
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 26949.91888
-  tps: 19734.44387
+  dps: 26923.07495
+  tps: 19719.84485
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 26722.42083
-  tps: 19534.39437
+  dps: 26699.68215
+  tps: 19523.3819
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 27226.78636
-  tps: 19881.43487
+  dps: 27166.18633
+  tps: 19871.41978
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 26729.77369
-  tps: 19528.66048
+  dps: 26692.21809
+  tps: 19522.60428
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 26792.79396
-  tps: 19590.35862
+  dps: 26739.01623
+  tps: 19547.8972
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 27832.64175
-  tps: 20284.68809
+  dps: 27809.72139
+  tps: 20291.27429
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 27940.09765
-  tps: 20379.69507
+  dps: 27902.9196
+  tps: 20369.31975
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 26799.45893
-  tps: 19610.6177
+  dps: 26741.02846
+  tps: 19601.37436
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 26779.43953
-  tps: 19610.80255
+  dps: 26729.60865
+  tps: 19604.4454
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 26779.43953
-  tps: 19610.80255
+  dps: 26729.60865
+  tps: 19604.4454
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 26724.72364
-  tps: 19524.38624
+  dps: 26695.75028
+  tps: 19502.07275
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeadenDespair-55816"
  value: {
-  dps: 26727.66794
-  tps: 19511.5979
+  dps: 26692.69913
+  tps: 19499.28109
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeadenDespair-56347"
  value: {
-  dps: 26678.6325
-  tps: 19492.20745
+  dps: 26640.88017
+  tps: 19483.30862
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 26603.8647
-  tps: 19415.02346
+  dps: 26545.66098
+  tps: 19406.00687
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 26603.8647
-  tps: 19415.02346
+  dps: 26545.66098
+  tps: 19406.00687
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 26837.84304
-  tps: 19649.0018
+  dps: 26778.2597
+  tps: 19638.60559
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 26880.38455
-  tps: 19691.54332
+  dps: 26820.55037
+  tps: 19680.89627
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 26825.99892
-  tps: 19655.68848
+  dps: 26784.21673
+  tps: 19646.06645
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 26825.99892
-  tps: 19655.68848
+  dps: 26784.21673
+  tps: 19646.06645
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 27048.80306
-  tps: 19833.32804
+  dps: 27021.97811
+  tps: 19818.74802
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 27048.80306
-  tps: 19833.32804
+  dps: 27021.97811
+  tps: 19818.74802
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 28094.60015
-  tps: 20471.26157
+  dps: 28066.50817
+  tps: 20456.24348
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 28146.83264
-  tps: 20624.0029
+  dps: 28109.66074
+  tps: 20618.39018
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 26723.72413
-  tps: 19552.95543
+  dps: 26680.38194
+  tps: 19549.61218
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 28185.62387
-  tps: 20587.15915
+  dps: 28105.89425
+  tps: 20516.29834
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 28383.43036
-  tps: 20803.07399
+  dps: 28332.44273
+  tps: 20772.43799
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 26955.50877
-  tps: 19667.38389
+  dps: 26903.57113
+  tps: 19655.48846
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 27629.00623
-  tps: 20113.47083
+  dps: 27567.73057
+  tps: 20092.70505
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 27572.91231
-  tps: 20108.20775
+  dps: 27557.06231
+  tps: 20109.16627
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 28106.00317
-  tps: 20369.14877
+  dps: 28089.49178
+  tps: 20382.16541
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Rainsong-55854"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Rainsong-56377"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 28439.17184
-  tps: 20697.51094
+  dps: 28432.87046
+  tps: 20716.91686
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 28439.17184
-  tps: 20697.51094
+  dps: 28432.87046
+  tps: 20716.91686
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 27141.36348
-  tps: 19781.18818
+  dps: 27088.88075
+  tps: 19769.80813
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 26905.77013
-  tps: 19670.83471
+  dps: 26880.49875
+  tps: 19677.36331
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RuneofZeth-68998"
  value: {
-  dps: 28094.38357
-  tps: 20422.26897
+  dps: 28099.25489
+  tps: 20440.91196
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ScalesofLife-68915"
  value: {
-  dps: 26641.68512
-  tps: 19521.80503
+  dps: 26614.54165
+  tps: 19527.31776
   hps: 354.04187
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ScalesofLife-69109"
  value: {
-  dps: 26640.35472
-  tps: 19530.31362
+  dps: 26596.54936
+  tps: 19504.16551
   hps: 399.35591
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SeaStar-55256"
  value: {
-  dps: 27081.40025
-  tps: 19764.70817
+  dps: 27033.10974
+  tps: 19747.80474
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SeaStar-56290"
  value: {
-  dps: 27468.69607
-  tps: 20036.5997
+  dps: 27420.21687
+  tps: 20020.07807
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ShadowflameRegalia"
  value: {
-  dps: 25946.47428
-  tps: 18962.54722
+  dps: 25942.80578
+  tps: 19012.49057
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ShardofWoe-60233"
  value: {
-  dps: 27101.58259
-  tps: 19800.84217
+  dps: 27105.88084
+  tps: 19835.91941
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 26662.37405
-  tps: 19451.54228
+  dps: 26632.5543
+  tps: 19445.28073
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 26895.9765
-  tps: 19713.04848
+  dps: 26848.21435
+  tps: 19696.01218
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 26943.88328
-  tps: 19760.95527
+  dps: 26896.17743
+  tps: 19743.97526
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sorrowsong-55879"
  value: {
-  dps: 27575.28938
-  tps: 20184.48661
+  dps: 27549.80252
+  tps: 20169.68354
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sorrowsong-56400"
  value: {
-  dps: 27658.51913
-  tps: 20244.71343
+  dps: 27632.66175
+  tps: 20229.40333
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 26825.99892
-  tps: 19655.68848
+  dps: 26784.21673
+  tps: 19646.06645
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SoulCasket-58183"
  value: {
-  dps: 28069.76717
-  tps: 20550.06844
+  dps: 28020.7729
+  tps: 20533.46479
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 27038.56737
-  tps: 19823.42335
+  dps: 27015.95056
+  tps: 19812.53274
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 27137.41802
-  tps: 19922.274
+  dps: 27114.84183
+  tps: 19911.42402
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StayofExecution-68996"
  value: {
-  dps: 26632.48919
-  tps: 19449.56118
+  dps: 26584.41738
+  tps: 19432.21521
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 27476.49322
-  tps: 19991.71989
+  dps: 27438.72811
+  tps: 19996.83438
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StumpofTime-62465"
  value: {
-  dps: 27947.19006
-  tps: 20423.23455
+  dps: 27921.85155
+  tps: 20430.52983
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StumpofTime-62470"
  value: {
-  dps: 27972.32965
-  tps: 20417.28377
+  dps: 27946.20782
+  tps: 20424.59916
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 26704.41039
-  tps: 19527.16122
+  dps: 26663.02174
+  tps: 19515.46656
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 26613.39898
-  tps: 19473.91301
+  dps: 26588.63978
+  tps: 19468.9888
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 27593.92998
-  tps: 20138.45385
+  dps: 27539.47015
+  tps: 20126.493
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TearofBlood-55819"
  value: {
-  dps: 27377.89711
-  tps: 19936.59338
+  dps: 27319.31701
+  tps: 19921.98482
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TearofBlood-56351"
  value: {
-  dps: 27575.35416
-  tps: 20072.05166
+  dps: 27498.09182
+  tps: 20037.3953
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 27466.81067
-  tps: 20089.29405
+  dps: 27440.79055
+  tps: 20080.49919
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 27624.96611
-  tps: 20194.23513
+  dps: 27598.66922
+  tps: 20184.07834
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TheHungerer-68927"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TheHungerer-69112"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 28022.43306
-  tps: 20477.88026
+  dps: 27953.129
+  tps: 20449.15984
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 28234.78326
-  tps: 20653.43355
+  dps: 28134.24063
+  tps: 20585.91504
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 26939.71672
-  tps: 19724.5727
+  dps: 26917.05929
+  tps: 19713.64147
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 26939.71672
-  tps: 19724.5727
+  dps: 26917.05929
+  tps: 19713.64147
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 26812.18985
-  tps: 19588.46488
+  dps: 26814.73064
+  tps: 19619.36134
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 27472.20524
-  tps: 20098.83631
+  dps: 27475.57491
+  tps: 20129.77393
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnheededWarning-59520"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 26632.48919
-  tps: 19449.56118
+  dps: 26584.41738
+  tps: 19432.21521
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 26927.18023
-  tps: 19744.25222
+  dps: 26878.72043
+  tps: 19726.51826
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 26927.18023
-  tps: 19744.25222
+  dps: 26878.72043
+  tps: 19726.51826
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 26927.18023
-  tps: 19744.25222
+  dps: 26878.72043
+  tps: 19726.51826
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 28835.12644
-  tps: 21227.21658
+  dps: 28811.39087
+  tps: 21226.79483
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 29065.94318
-  tps: 21473.97478
+  dps: 29027.73243
+  tps: 21471.24301
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 26704.41039
-  tps: 19527.16122
+  dps: 26663.02174
+  tps: 19515.46656
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 26613.39898
-  tps: 19473.91301
+  dps: 26588.63978
+  tps: 19468.9888
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 26632.48919
-  tps: 19449.56118
+  dps: 26584.41738
+  tps: 19432.21521
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 27574.3222
-  tps: 20110.75193
+  dps: 27525.79154
+  tps: 20094.33443
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 26632.48919
-  tps: 19449.56118
+  dps: 26584.41738
+  tps: 19432.21521
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 26920.54153
-  tps: 19669.97924
+  dps: 26875.85671
+  tps: 19669.13931
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 27106.20479
-  tps: 19838.25018
+  dps: 27062.30876
+  tps: 19829.86547
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 27025.39339
-  tps: 19711.01269
+  dps: 27019.41947
+  tps: 19725.50249
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 26665.7019
-  tps: 19461.35482
+  dps: 26648.29461
+  tps: 19466.77732
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 26960.42099
-  tps: 19756.07391
+  dps: 26943.28854
+  tps: 19761.77125
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 26665.7019
-  tps: 19461.35482
+  dps: 26648.29461
+  tps: 19466.77732
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 27502.29217
-  tps: 20052.27381
+  dps: 27477.43289
+  tps: 20040.53317
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 26742.01542
-  tps: 19526.8714
+  dps: 26719.27675
+  tps: 19515.85893
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 27364.04673
-  tps: 19950.88097
+  dps: 27383.84009
+  tps: 19988.94048
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 27977.08829
-  tps: 20565.40571
+  dps: 28006.15049
+  tps: 20573.36533
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 26828.94988
-  tps: 19646.02187
+  dps: 26780.61941
+  tps: 19628.41724
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 26766.20056
-  tps: 19636.81264
+  dps: 26707.64517
+  tps: 19599.15557
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 26766.20056
-  tps: 19636.81264
+  dps: 26707.64517
+  tps: 19599.15557
  }
 }
 dps_results: {
  key: "TestAffliction-Average-Default"
  value: {
-  dps: 28869.55198
-  tps: 21120.5262
+  dps: 28838.36158
+  tps: 21126.91867
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 29113.17302
-  tps: 29218.98089
+  dps: 29076.09177
+  tps: 29227.30052
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 28155.00762
-  tps: 20820.23236
+  dps: 28139.55317
+  tps: 20823.85224
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 36203.89684
-  tps: 24030.34939
+  dps: 36189.8487
+  tps: 24170.66998
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18756.75236
-  tps: 21430.54223
+  dps: 18749.90799
+  tps: 21426.74704
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18756.75236
-  tps: 13634.63719
+  dps: 18749.90799
+  tps: 13630.84199
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 21454.50588
-  tps: 13102.80665
+  dps: 21449.29745
+  tps: 13158.27027
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 36923.58849
+  tps: 33937.72303
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 35712.60246
+  tps: 26509.33583
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 44048.91466
+  tps: 29837.4703
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24024.6838
+  tps: 24938.52913
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24024.6838
+  tps: 17507.44916
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 26757.22841
+  tps: 16991.31026
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 28857.22827
-  tps: 28822.1486
+  dps: 28830.00283
+  tps: 28762.41742
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 27987.8943
-  tps: 20631.97224
+  dps: 27949.05506
+  tps: 20623.37439
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 36336.994
-  tps: 24279.60919
+  dps: 36322.70887
+  tps: 24431.01849
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18578.75999
-  tps: 21262.41576
+  dps: 18575.87587
+  tps: 21267.14291
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18578.75999
-  tps: 13466.51071
+  dps: 18575.87587
+  tps: 13471.23786
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 21349.6781
-  tps: 12983.68593
+  dps: 21326.25306
+  tps: 13046.14622
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 36607.66354
+  tps: 33597.04493
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 35429.47038
+  tps: 26196.63049
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 43947.27566
+  tps: 29452.02236
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 23819.91149
+  tps: 24659.9235
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 23819.91149
+  tps: 17371.74891
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 26559.75554
+  tps: 16883.62501
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 29462.49181
-  tps: 29001.53663
+  dps: 29448.82395
+  tps: 28959.90773
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 28594.00145
-  tps: 20812.54946
+  dps: 28579.17401
+  tps: 20821.39086
  }
 }
 dps_results: {
@@ -1581,15 +1665,15 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 19012.56226
-  tps: 21383.66914
+  dps: 19009.33659
+  tps: 21388.61585
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 19012.56226
-  tps: 13586.87353
+  dps: 19009.33659
+  tps: 13591.82024
  }
 }
 dps_results: {
@@ -1599,52 +1683,136 @@ dps_results: {
   tps: 13187.81581
  }
 }
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 37310.33903
+  tps: 33801.23651
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 36142.77119
+  tps: 26402.55888
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 43431.11869
+  tps: 29225.83081
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24336.36174
+  tps: 24805.73774
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24336.36174
+  tps: 17516.83059
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 26455.64881
+  tps: 16784.11757
+ }
+}
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 29174.24651
-  tps: 29197.93427
+  dps: 29168.25719
+  tps: 29195.76979
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 28249.11976
-  tps: 20916.83947
+  dps: 28230.08956
+  tps: 20936.18421
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 36884.08018
-  tps: 24700.98745
+  dps: 36696.99678
+  tps: 24719.89889
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18844.16514
-  tps: 21518.22038
+  dps: 18856.988
+  tps: 21536.79064
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18844.16514
-  tps: 13680.40186
+  dps: 18856.988
+  tps: 13698.97213
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22034.09878
-  tps: 13694.56474
+  dps: 22010.9013
+  tps: 13742.76558
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 36951.62542
+  tps: 34008.96839
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 35911.15781
+  tps: 26717.61309
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 44768.92024
+  tps: 30693.9623
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
+ value: {
+  dps: 24138.83905
+  tps: 25104.284
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
+ value: {
+  dps: 24138.83905
+  tps: 17530.29865
+ }
+}
+dps_results: {
+ key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
+ value: {
+  dps: 27283.59655
+  tps: 17404.03061
  }
 }
 dps_results: {
  key: "TestAffliction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 28480.94417
-  tps: 20812.54946
+  dps: 28467.6957
+  tps: 20821.39086
  }
 }
diff --git a/sim/warlock/affliction/affliction_test.go b/sim/warlock/affliction/affliction_test.go
index abc1b09842..35c8eafd24 100644
--- a/sim/warlock/affliction/affliction_test.go
+++ b/sim/warlock/affliction/affliction_test.go
@@ -400,10 +400,13 @@ func TestAffliction(t *testing.T) {
 	}
 
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{
-		Class:            proto.Class_ClassWarlock,
-		Race:             proto.Race_RaceOrc,
-		OtherRaces:       []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:          core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p1"),
+		Class:      proto.Class_ClassWarlock,
+		Race:       proto.Race_RaceOrc,
+		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
+		GearSet:    core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p1"),
+		OtherGearSets: []core.GearSetCombo{
+			core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p3"),
+		},
 		Talents:          afflictionTalents,
 		Glyphs:           afflictionGlyphs,
 		Consumes:         fullConsumes,
diff --git a/ui/warlock/affliction/apls/default.apl.json b/ui/warlock/affliction/apls/default.apl.json
index 15c97fd36a..763ba691df 100644
--- a/ui/warlock/affliction/apls/default.apl.json
+++ b/ui/warlock/affliction/apls/default.apl.json
@@ -69,8 +69,7 @@
 									"vals": [
 										{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
 										{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-										{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
-										{ "auraIsActive": { "auraId": { "spellId": 92318 } } }
+										{ "auraIsActive": { "auraId": { "spellId": 75170 } } }
 									]
 								}
 							},
@@ -150,14 +149,7 @@
 				"castSpell": { "spellId": { "spellId": 603 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 89937 } } }, "castSpell": { "spellId": { "spellId": 77799 } } } },
 		{
 			"action": {
 				"condition": { "isExecutePhase": { "threshold": "E25" } },
diff --git a/ui/warlock/affliction/gear_sets/p3.gear.json b/ui/warlock/affliction/gear_sets/p3.gear.json
new file mode 100644
index 0000000000..ad13618ea8
--- /dev/null
+++ b/ui/warlock/affliction/gear_sets/p3.gear.json
@@ -0,0 +1,21 @@
+{
+	"items": [
+		{ "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 165 },
+		{ "id": 71472, "gems": [52207], "reforging": 165 },
+		{ "id": 71598, "enchant": 4200, "gems": [52207] },
+		{ "id": 71434, "enchant": 4115, "reforging": 167 },
+		{ "id": 71597, "enchant": 4102, "gems": [52207, 52207] },
+		{ "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 },
+		{ "id": 71614, "enchant": 4107, "gems": [52207, 0], "reforging": 144 },
+		{ "id": 71613, "gems": [52207, 52207], "reforging": 165 },
+		{ "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 165 },
+		{ "id": 71447, "enchant": 4104, "gems": [52207], "reforging": 144 },
+		{ "id": 71217, "gems": [52207] },
+		{ "id": 71449, "reforging": 167 },
+		{ "id": 69110 },
+		{ "id": 62047, "reforging": 165 },
+		{ "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207] },
+		{},
+		{ "id": 71575 }
+	]
+}
diff --git a/ui/warlock/affliction/gear_sets/p4_wrath.gear.json b/ui/warlock/affliction/gear_sets/p4_wrath.gear.json
deleted file mode 100644
index defb80e9d3..0000000000
--- a/ui/warlock/affliction/gear_sets/p4_wrath.gear.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"items": [
-    {"id":51231,"enchant":3820,"gems":[41285,40133]},
-    {"id":50724,"gems":[40113]},
-    {"id":51234,"enchant":3810,"gems":[40155]},
-    {"id":50628,"enchant":3722,"gems":[40155]},
-    {"id":51233,"enchant":1144,"gems":[40113,40155]},
-    {"id":50651,"enchant":2332,"gems":[40155,0]},
-    {"id":51230,"enchant":3604,"gems":[40113,0]},
-    {"id":50613,"gems":[40133,40113,40113]},
-    {"id":50694,"enchant":3872,"gems":[40113,40133,40155]},
-    {"id":50699,"enchant":4223,"gems":[40133,40113]},
-    {"id":50398,"gems":[40155]},
-    {"id":50664,"gems":[40113]},
-    {"id":50365},
-    {"id":50348},
-    {"id":50732,"enchant":3834,"gems":[40113]},
-    {"id":50719},
-    {"id":50684,"gems":[40155]}
-]}
diff --git a/ui/warlock/affliction/presets.ts b/ui/warlock/affliction/presets.ts
index 892f8b7862..3a0f7420b5 100644
--- a/ui/warlock/affliction/presets.ts
+++ b/ui/warlock/affliction/presets.ts
@@ -12,24 +12,22 @@ import { Stats } from '../../core/proto_utils/stats';
 import { WARLOCK_BREAKPOINTS } from '../presets';
 import DefaultApl from './apls/default.apl.json';
 import P1Gear from './gear_sets/p1.gear.json';
-import P4WrathGear from './gear_sets/p4_wrath.gear.json';
+import P3Gear from './gear_sets/p3.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
 // keep them in a separate file.
 
-export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/";
-
 export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
-export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
-export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP });
+export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear);
+export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear);
 
 export const APL_Default = PresetUtils.makePresetAPLRotation('Affliction', DefaultApl);
 
 // Preset options for EP weights
-export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
-	'P1',
+export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights(
+	'Default',
 	Stats.fromMap({
 		[Stat.StatIntellect]: 1.26,
 		[Stat.StatSpellPower]: 1.0,
@@ -52,7 +50,7 @@ export const AfflictionTalents = {
 			prime2: PrimeGlyph.GlyphOfUnstableAffliction,
 			prime3: PrimeGlyph.GlyphOfCorruption,
 			major1: MajorGlyph.GlyphOfShadowBolt,
-			major2: MajorGlyph.GlyphOfLifeTap,
+			major2: MajorGlyph.GlyphOfFelhunter,
 			major3: MajorGlyph.GlyphOfSoulSwap,
 			minor1: MinorGlyph.GlyphOfDrainSoul,
 			minor2: MinorGlyph.GlyphOfRitualOfSouls,
diff --git a/ui/warlock/affliction/sim.ts b/ui/warlock/affliction/sim.ts
index 6303b70b03..ca341fd5db 100644
--- a/ui/warlock/affliction/sim.ts
+++ b/ui/warlock/affliction/sim.ts
@@ -45,7 +45,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, {
 		gear: Presets.P1_PRESET.gear,
 
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.DEFAULT_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge optimizer
 		statCaps: (() => {
 			return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17);
@@ -125,14 +125,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.DEFAULT_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.AfflictionTalents],
 		// Preset rotations that the user can quickly select.
 		rotations: [Presets.APL_Default],
 
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET],
+		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET],
 	},
 
 	autoRotation: (_player: Player<Spec.SpecAfflictionWarlock>): APLRotation => {
@@ -155,12 +155,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, {
 				[Faction.Alliance]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 				[Faction.Horde]: {
 					1: Presets.PRERAID_PRESET.gear,
 					2: Presets.P1_PRESET.gear,
-					3: Presets.P4_WOTLK_PRESET.gear,
+					3: Presets.P3_PRESET.gear,
 				},
 			},
 			otherDefaults: Presets.OtherDefaults,
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
index 83045f8c44..bbbbc52dd4 100644
--- a/ui/warlock/demonology/presets.ts
+++ b/ui/warlock/demonology/presets.ts
@@ -41,7 +41,7 @@ export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', S
 export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL);
 
 // Preset options for EP weights
-export const EP_PRESET_DEFAULT = PresetUtils.makePresetEpWeights(
+export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights(
 	'Default',
 	Stats.fromMap({
 		[Stat.StatIntellect]: 1.27,
diff --git a/ui/warlock/demonology/sim.ts b/ui/warlock/demonology/sim.ts
index 7b3035bd1c..d810409aa9 100644
--- a/ui/warlock/demonology/sim.ts
+++ b/ui/warlock/demonology/sim.ts
@@ -33,7 +33,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 		gear: Presets.P1_PRESET.gear,
 
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.EP_PRESET_DEFAULT.epWeights,
+		epWeights: Presets.DEFAULT_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge optimizer
 		statCaps: (() => {
 			return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17);
@@ -120,7 +120,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 	},
 
 	presets: {
-		epWeights: [Presets.EP_PRESET_DEFAULT],
+		epWeights: [Presets.DEFAULT_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.DemonologyTalentsShadowBolt, Presets.DemonologyTalentsIncinerate],
 		// Preset rotations that the user can quickly select.
diff --git a/ui/warlock/destruction/presets.ts b/ui/warlock/destruction/presets.ts
index ae31327ce7..81aa964643 100644
--- a/ui/warlock/destruction/presets.ts
+++ b/ui/warlock/destruction/presets.ts
@@ -40,7 +40,7 @@ export const P3_PRESET_BUILD = PresetUtils.makePresetBuild('P3 - Default', {
 });
 
 // Preset options for EP weights
-export const EP_PRESET_DEFAULT = PresetUtils.makePresetEpWeights(
+export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights(
 	'Default',
 	Stats.fromMap({
 		[Stat.StatIntellect]: 1.25,
diff --git a/ui/warlock/destruction/sim.ts b/ui/warlock/destruction/sim.ts
index e8ebdff5e9..0d6cd07c06 100644
--- a/ui/warlock/destruction/sim.ts
+++ b/ui/warlock/destruction/sim.ts
@@ -31,7 +31,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 		gear: Presets.P1_PRESET.gear,
 
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.EP_PRESET_DEFAULT.epWeights,
+		epWeights: Presets.DEFAULT_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge optimizer
 		statCaps: (() => {
 			return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17);
@@ -91,7 +91,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 	},
 
 	presets: {
-		epWeights: [Presets.EP_PRESET_DEFAULT],
+		epWeights: [Presets.DEFAULT_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.DestructionTalents],
 		// Preset rotations that the user can quickly select.

From c7c74aa23f52adc724bed031543ba54d21793b50 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 18:56:42 +0200
Subject: [PATCH 09/11] Adjust Destro APL

---
 .../destruction/TestDestruction.results       | 1210 ++++++++---------
 ui/warlock/destruction/apls/p1.apl.json       |   24 +-
 ui/warlock/destruction/apls/p3.apl.json       |   24 +-
 3 files changed, 629 insertions(+), 629 deletions(-)

diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results
index 694f10fc98..fb460eaf9b 100644
--- a/sim/warlock/destruction/TestDestruction.results
+++ b/sim/warlock/destruction/TestDestruction.results
@@ -38,2117 +38,2117 @@ character_stats_results: {
 dps_results: {
  key: "TestDestruction-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 29432.34848
-  tps: 19070.40015
+  dps: 29562.3471
+  tps: 19164.16522
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 27925.07891
-  tps: 18127.33141
+  dps: 28040.50983
+  tps: 18199.78126
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 27755.91531
-  tps: 18049.72555
+  dps: 27891.66909
+  tps: 18150.2133
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 28385.34738
-  tps: 18432.60373
+  dps: 28406.11787
+  tps: 18424.38842
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 28443.02202
-  tps: 18473.90541
+  dps: 28465.03748
+  tps: 18465.60159
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 29147.43659
-  tps: 18861.01969
+  dps: 29273.22254
+  tps: 18949.17072
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 29570.51114
-  tps: 18742.48561
+  dps: 29596.80158
+  tps: 18815.88858
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 27394.86647
-  tps: 17780.10707
-  hps: 98.89602
+  dps: 27469.01244
+  tps: 17858.04624
+  hps: 98.04972
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 28862.37223
-  tps: 18677.82983
+  dps: 28991.19715
+  tps: 18764.92599
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BindingPromise-67037"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 27571.10045
-  tps: 17918.24186
+  dps: 27710.75985
+  tps: 18025.50869
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 27636.41855
-  tps: 17943.03251
+  dps: 27751.03997
+  tps: 18042.94185
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 27673.27792
-  tps: 17969.10109
+  dps: 27788.20487
+  tps: 18069.2129
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 27305.9733
-  tps: 17729.40124
+  dps: 27454.76773
+  tps: 17845.56491
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 28235.12996
-  tps: 18267.84155
+  dps: 28374.84419
+  tps: 18375.94917
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 27307.11696
-  tps: 17730.66788
+  dps: 27453.083
+  tps: 17845.06008
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 27718.5653
-  tps: 17988.61133
+  dps: 27851.4434
+  tps: 18074.03011
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 27354.947
-  tps: 17744.36023
+  dps: 27474.41695
+  tps: 17851.22495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 27354.947
-  tps: 17744.42276
+  dps: 27467.23524
+  tps: 17843.24549
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 28221.85124
-  tps: 18269.43608
+  dps: 28336.80709
+  tps: 18377.00207
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BottledLightning-66879"
  value: {
-  dps: 28053.96676
-  tps: 18240.24938
+  dps: 28176.88562
+  tps: 18291.79367
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 29303.12994
-  tps: 18597.43489
+  dps: 29421.89599
+  tps: 18685.84455
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 29589.57194
-  tps: 19175.05687
+  dps: 29712.14893
+  tps: 19267.59174
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 29491.33634
-  tps: 19113.20836
+  dps: 29633.63554
+  tps: 19219.08473
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 27726.50244
-  tps: 17996.56547
+  dps: 27852.55435
+  tps: 18074.01648
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 28345.81456
-  tps: 18417.10145
+  dps: 28470.26591
+  tps: 18467.57867
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CrushingWeight-59506"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CrushingWeight-65118"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 27354.947
-  tps: 17744.42831
+  dps: 27467.23524
+  tps: 17843.25659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 28388.45904
-  tps: 18423.63923
+  dps: 28512.87338
+  tps: 18498.65985
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 27563.79452
-  tps: 17888.5978
+  dps: 27716.45035
+  tps: 17995.65017
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 29203.62839
-  tps: 18898.5117
+  dps: 29341.49615
+  tps: 19001.64795
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 28264.5317
-  tps: 18434.441
+  dps: 28236.66065
+  tps: 18351.41643
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 27867.15464
-  tps: 18101.33764
+  dps: 27969.07997
+  tps: 18160.38483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 29147.43659
-  tps: 18861.01969
+  dps: 29273.22254
+  tps: 18949.17072
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 27775.54108
-  tps: 18036.93229
+  dps: 27912.08712
+  tps: 18111.02469
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 29327.73364
-  tps: 18996.40675
+  dps: 29425.951
+  tps: 19070.86828
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 29203.62839
-  tps: 18898.5117
+  dps: 29341.49615
+  tps: 19001.64795
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 27755.91531
-  tps: 18049.72555
+  dps: 27891.66909
+  tps: 18150.2133
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 29147.43659
-  tps: 18861.01969
+  dps: 29273.22254
+  tps: 18949.17072
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FallofMortality-59500"
  value: {
-  dps: 28388.45904
-  tps: 18423.63923
+  dps: 28512.87338
+  tps: 18498.65985
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FallofMortality-65124"
  value: {
-  dps: 28536.74767
-  tps: 18520.64363
+  dps: 28658.48177
+  tps: 18589.0203
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 28500.68484
-  tps: 18495.35244
+  dps: 28623.71131
+  tps: 18546.36663
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 27708.93218
-  tps: 18058.67278
+  dps: 27753.24749
+  tps: 18042.08964
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 28238.11014
-  tps: 18350.60913
+  dps: 28368.61966
+  tps: 18408.73353
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 27346.23782
-  tps: 17734.28991
+  dps: 27462.24874
+  tps: 17849.0841
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 29109.5833
-  tps: 18853.23008
+  dps: 29237.87836
+  tps: 18909.48805
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 27624.92672
-  tps: 17955.41441
+  dps: 27774.17196
+  tps: 18072.04252
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 29211.1331
-  tps: 18903.15148
+  dps: 29337.25687
+  tps: 18994.52806
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FluidDeath-58181"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 29303.12994
-  tps: 18961.32918
+  dps: 29421.89599
+  tps: 19051.48904
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 27748.68796
-  tps: 18015.72298
+  dps: 27888.10846
+  tps: 18102.86154
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GaleofShadows-56138"
  value: {
-  dps: 28569.58148
-  tps: 18571.33082
+  dps: 28491.54082
+  tps: 18508.075
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GaleofShadows-56462"
  value: {
-  dps: 28634.61393
-  tps: 18648.335
+  dps: 28663.13201
+  tps: 18639.60312
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GearDetector-61462"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 24105.23538
-  tps: 15568.27126
+  dps: 24176.01507
+  tps: 15695.29768
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 27952.07306
-  tps: 18142.54454
+  dps: 28060.86216
+  tps: 18214.41497
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HarmlightToken-63839"
  value: {
-  dps: 28206.46928
-  tps: 18363.51203
+  dps: 28381.24589
+  tps: 18500.55159
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 28698.12373
-  tps: 18669.73937
+  dps: 28750.59642
+  tps: 18723.98048
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 28873.72675
-  tps: 18791.19138
+  dps: 28909.91827
+  tps: 18828.99065
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofRage-59224"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofRage-65072"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofSolace-55868"
  value: {
-  dps: 27861.4534
-  tps: 18122.05382
+  dps: 27785.43849
+  tps: 18060.07207
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofSolace-56393"
  value: {
-  dps: 27833.54983
-  tps: 18138.77358
+  dps: 27861.55728
+  tps: 18129.77444
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofThunder-55845"
  value: {
-  dps: 27351.67881
-  tps: 17741.99807
+  dps: 27457.47868
+  tps: 17839.18051
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofThunder-56370"
  value: {
-  dps: 27351.67881
-  tps: 17742.03587
+  dps: 27457.47868
+  tps: 17839.29391
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 29203.62839
-  tps: 18898.5117
+  dps: 29341.49615
+  tps: 19001.64795
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 27665.07112
-  tps: 17983.80344
+  dps: 27814.73057
+  tps: 18100.71399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 27665.07112
-  tps: 17983.80344
+  dps: 27814.73057
+  tps: 18100.71399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 27636.41855
-  tps: 17943.03251
+  dps: 27751.03997
+  tps: 18042.94185
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 27673.27792
-  tps: 17969.10109
+  dps: 27788.20487
+  tps: 18069.2129
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 27351.67881
-  tps: 17741.98674
+  dps: 27457.47868
+  tps: 17839.14654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 28072.60666
-  tps: 18203.23474
+  dps: 28221.59285
+  tps: 18312.42863
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 27380.33154
-  tps: 17792.37712
+  dps: 27510.92037
+  tps: 17899.85965
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 27394.74583
-  tps: 17803.35678
+  dps: 27490.48923
+  tps: 17870.58467
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 28549.4818
-  tps: 18551.73159
+  dps: 28689.92933
+  tps: 18610.0703
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 28724.12617
-  tps: 18669.45348
+  dps: 28837.91317
+  tps: 18711.69529
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 27571.10045
-  tps: 17918.24186
+  dps: 27710.75985
+  tps: 18025.50869
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 27622.17076
-  tps: 18041.95641
+  dps: 27709.17585
+  tps: 18070.04639
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 27622.17076
-  tps: 18041.95641
+  dps: 27709.17585
+  tps: 18070.04639
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 27589.12742
-  tps: 17947.15919
+  dps: 27591.47238
+  tps: 17931.22135
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeadenDespair-55816"
  value: {
-  dps: 27351.67881
-  tps: 17742.87907
+  dps: 27462.24874
+  tps: 17848.64839
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeadenDespair-56347"
  value: {
-  dps: 27346.23782
-  tps: 17734.28991
+  dps: 27462.24874
+  tps: 17849.0841
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 27326.59678
-  tps: 17745.36294
+  dps: 27464.0318
+  tps: 17851.1122
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 27326.59678
-  tps: 17745.36294
+  dps: 27464.0318
+  tps: 17851.1122
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 27354.947
-  tps: 17743.89662
+  dps: 27474.41695
+  tps: 17850.3019
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 27354.947
-  tps: 17743.89662
+  dps: 27474.41695
+  tps: 17850.3019
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 27638.10258
-  tps: 17967.39221
+  dps: 27784.48281
+  tps: 18074.7978
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 27678.895
-  tps: 17996.46747
+  dps: 27826.44663
+  tps: 18104.08996
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 27722.67593
-  tps: 18061.55026
+  dps: 27742.26978
+  tps: 18020.44174
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 27722.67593
-  tps: 18061.55026
+  dps: 27742.26978
+  tps: 18020.44174
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 27713.48815
-  tps: 17997.53955
+  dps: 27828.74841
+  tps: 18097.87222
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 27713.48815
-  tps: 17997.53955
+  dps: 27828.74841
+  tps: 18097.87222
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 28760.80243
-  tps: 18625.38771
+  dps: 28892.43016
+  tps: 18707.69338
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 28955.55
-  tps: 18844.22874
+  dps: 29074.99026
+  tps: 18880.15348
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 27348.31666
-  tps: 17736.01838
+  dps: 27462.24874
+  tps: 17849.43182
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 29034.89566
-  tps: 18870.78085
+  dps: 29159.77591
+  tps: 18940.83015
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 29261.41619
-  tps: 19024.95855
+  dps: 29377.46222
+  tps: 19078.82967
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 27636.87868
-  tps: 17955.40867
+  dps: 27744.29024
+  tps: 18018.99868
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 28345.43219
-  tps: 18394.39912
+  dps: 28469.98909
+  tps: 18484.74513
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 28252.8998
-  tps: 18301.54281
+  dps: 28399.46972
+  tps: 18412.56771
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 29147.43659
-  tps: 18861.01969
+  dps: 29273.22254
+  tps: 18949.17072
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Rainsong-55854"
  value: {
-  dps: 27354.947
-  tps: 17743.91864
+  dps: 27467.4307
+  tps: 17842.47731
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Rainsong-56377"
  value: {
-  dps: 27354.947
-  tps: 17743.9041
+  dps: 27474.41695
+  tps: 17850.30938
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 29432.34848
-  tps: 19070.40015
+  dps: 29562.3471
+  tps: 19164.16522
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 29432.34848
-  tps: 19070.39122
+  dps: 29562.3471
+  tps: 19164.15629
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 27830.56895
-  tps: 18059.40121
+  dps: 27999.49491
+  tps: 18152.07938
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 27740.57809
-  tps: 18041.52817
+  dps: 27759.60193
+  tps: 18030.17271
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RuneofZeth-68998"
  value: {
-  dps: 28946.4329
-  tps: 18790.14475
+  dps: 29042.1266
+  tps: 18796.35018
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ScalesofLife-68915"
  value: {
-  dps: 27402.1002
-  tps: 17790.10306
+  dps: 27481.15215
+  tps: 17883.83388
   hps: 351.03642
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ScalesofLife-69109"
  value: {
-  dps: 27402.1002
-  tps: 17790.35112
+  dps: 27474.50107
+  tps: 17875.52997
   hps: 395.9658
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SeaStar-55256"
  value: {
-  dps: 27774.17614
-  tps: 18000.98018
+  dps: 27916.9957
+  tps: 18112.20111
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SeaStar-56290"
  value: {
-  dps: 28177.12914
-  tps: 18234.20899
+  dps: 28315.49255
+  tps: 18338.75231
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ShadowflameRegalia"
  value: {
-  dps: 26754.26642
-  tps: 17350.8202
+  dps: 26746.812
+  tps: 17439.25357
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ShardofWoe-60233"
  value: {
-  dps: 28089.12586
-  tps: 18271.86849
+  dps: 28039.75038
+  tps: 18221.57876
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 27357.66024
-  tps: 17747.02285
+  dps: 27468.22696
+  tps: 17846.15525
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 27696.49136
-  tps: 18003.23842
+  dps: 27835.95613
+  tps: 18112.45565
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 27747.48087
-  tps: 18038.93218
+  dps: 27886.09428
+  tps: 18147.47173
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sorrowsong-55879"
  value: {
-  dps: 28251.78612
-  tps: 18329.9142
+  dps: 28383.54202
+  tps: 18442.20642
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sorrowsong-56400"
  value: {
-  dps: 28370.19506
-  tps: 18407.342
+  dps: 28504.54853
+  tps: 18521.49061
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 27722.67593
-  tps: 18061.55026
+  dps: 27742.26978
+  tps: 18020.44174
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SoulCasket-58183"
  value: {
-  dps: 28856.2224
-  tps: 18675.07756
+  dps: 28997.75839
+  tps: 18783.8734
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 27782.73908
-  tps: 18046.51689
+  dps: 27898.57338
+  tps: 18147.22995
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 27838.58661
-  tps: 18086.01475
+  dps: 27954.88384
+  tps: 18187.03457
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StayofExecution-68996"
  value: {
-  dps: 27307.11696
-  tps: 17730.66788
+  dps: 27453.083
+  tps: 17845.06008
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 28304.47635
-  tps: 18375.71228
+  dps: 28469.3055
+  tps: 18471.3997
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StumpofTime-62465"
  value: {
-  dps: 28762.78574
-  tps: 18670.08544
+  dps: 28804.92422
+  tps: 18682.00651
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StumpofTime-62470"
  value: {
-  dps: 28802.44158
-  tps: 18684.65714
+  dps: 28840.9601
+  tps: 18681.12198
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 27348.31666
-  tps: 17735.93812
+  dps: 27462.24874
+  tps: 17849.31452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 27353.05069
-  tps: 17742.2818
+  dps: 27462.99781
+  tps: 17850.8639
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 28373.116
-  tps: 18433.73977
+  dps: 28495.50134
+  tps: 18498.0791
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TearofBlood-55819"
  value: {
-  dps: 28077.40616
-  tps: 18228.18916
+  dps: 28179.76723
+  tps: 18288.89639
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TearofBlood-56351"
  value: {
-  dps: 28284.29631
-  tps: 18362.83857
+  dps: 28408.77594
+  tps: 18435.30372
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 28211.69893
-  tps: 18292.15387
+  dps: 28324.29408
+  tps: 18392.9348
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 28504.37778
-  tps: 18472.36667
+  dps: 28644.91801
+  tps: 18588.6448
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TheHungerer-68927"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TheHungerer-69112"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 28903.8408
-  tps: 18791.20343
+  dps: 29018.56297
+  tps: 18862.77965
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 29111.89045
-  tps: 18924.66732
+  dps: 29219.1108
+  tps: 18982.62994
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 27636.41855
-  tps: 17943.03251
+  dps: 27751.03997
+  tps: 18042.94185
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 27673.27792
-  tps: 17969.10109
+  dps: 27788.20487
+  tps: 18069.2129
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 27626.17583
-  tps: 17992.0306
+  dps: 27609.20792
+  tps: 17931.35659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 28242.0869
-  tps: 18403.73128
+  dps: 28309.04029
+  tps: 18429.28434
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnheededWarning-59520"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 27307.11696
-  tps: 17730.63215
+  dps: 27453.083
+  tps: 17845.0172
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 27665.07112
-  tps: 17983.80344
+  dps: 27814.73057
+  tps: 18100.71399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 27665.07112
-  tps: 17983.80344
+  dps: 27814.73057
+  tps: 18100.71399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 27665.07112
-  tps: 17983.80344
+  dps: 27814.73057
+  tps: 18100.71399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 29599.57252
-  tps: 19545.66115
+  dps: 29624.49957
+  tps: 19535.71982
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 29824.60529
-  tps: 19659.108
+  dps: 29953.1639
+  tps: 19820.17792
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 27348.31666
-  tps: 17735.93812
+  dps: 27462.24874
+  tps: 17849.31452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 27353.05069
-  tps: 17742.2818
+  dps: 27462.99781
+  tps: 17850.8639
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 27307.11696
-  tps: 17730.66788
+  dps: 27453.083
+  tps: 17845.06008
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 28287.02542
-  tps: 18297.88086
+  dps: 28426.39004
+  tps: 18405.63704
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 27307.11696
-  tps: 17730.66788
+  dps: 27453.083
+  tps: 17845.06008
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 27740.57809
-  tps: 18041.77111
+  dps: 27759.60193
+  tps: 18031.14447
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 27930.14154
-  tps: 18169.45316
+  dps: 27887.35162
+  tps: 18140.5438
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 27778.1743
-  tps: 18031.90047
+  dps: 27907.59675
+  tps: 18118.29238
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 27354.947
-  tps: 17744.44919
+  dps: 27467.23524
+  tps: 17843.29835
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 27734.71021
-  tps: 18013.03461
+  dps: 27850.14638
+  tps: 18113.96974
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 27354.947
-  tps: 17744.44919
+  dps: 27467.23524
+  tps: 17843.29835
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 28209.37841
-  tps: 18255.73469
+  dps: 28320.49223
+  tps: 18358.12355
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 27354.947
-  tps: 17743.96331
+  dps: 27467.23524
+  tps: 17842.32659
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 28412.79736
-  tps: 18554.42317
+  dps: 28441.60715
+  tps: 18532.59243
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 28763.74711
-  tps: 18694.53493
+  dps: 28767.39763
+  tps: 18715.3095
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 27551.32867
-  tps: 17903.36784
+  dps: 27699.81452
+  tps: 18019.47816
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 27606.42576
-  tps: 17950.1169
+  dps: 27740.07908
+  tps: 18043.83511
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 27606.42576
-  tps: 17950.1169
+  dps: 27740.07908
+  tps: 18043.83511
  }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
  value: {
-  dps: 29988.9574
-  tps: 19527.79483
+  dps: 30048.19042
+  tps: 19604.41398
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30944.55015
-  tps: 35553.94797
+  dps: 31002.32745
+  tps: 35823.34937
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29243.24577
-  tps: 19127.87924
+  dps: 29297.6037
+  tps: 19217.61055
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 39628.43095
-  tps: 23833.4509
+  dps: 39934.35911
+  tps: 24301.83466
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18878.3363
-  tps: 26037.2245
+  dps: 18923.61287
+  tps: 25940.27138
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18878.3363
-  tps: 12421.21542
+  dps: 18923.61287
+  tps: 12444.71147
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22023.66669
-  tps: 13083.18104
+  dps: 22009.368
+  tps: 13011.59967
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30667.56719
-  tps: 35114.15407
+  dps: 30661.66773
+  tps: 35076.27127
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 28931.06266
-  tps: 18592.76728
+  dps: 28955.33614
+  tps: 18656.544
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 39759.90878
-  tps: 23592.3701
+  dps: 39722.49767
+  tps: 23758.8092
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18506.71658
-  tps: 26076.05954
+  dps: 18534.93802
+  tps: 26002.86159
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18506.71658
-  tps: 11925.4119
+  dps: 18534.93802
+  tps: 11947.96835
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 21766.92069
-  tps: 12493.18876
+  dps: 21971.14275
+  tps: 12596.38075
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 38840.61715
-  tps: 43557.98207
+  dps: 38825.43896
+  tps: 43811.01561
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 36897.34578
-  tps: 24250.2093
+  dps: 36972.29886
+  tps: 24388.55295
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47289.08001
-  tps: 28982.90147
+  dps: 47305.94792
+  tps: 29013.33618
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24331.48873
-  tps: 30197.09151
+  dps: 24268.64788
+  tps: 30045.1002
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24331.48873
-  tps: 15959.68752
+  dps: 24268.64788
+  tps: 15873.27851
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27111.25683
-  tps: 16399.58361
+  dps: 27024.10697
+  tps: 16375.40229
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 38853.67653
-  tps: 41613.07619
+  dps: 38906.61121
+  tps: 41696.1233
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 36915.39806
-  tps: 23897.09932
+  dps: 36965.63125
+  tps: 23904.62495
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47075.66769
-  tps: 28488.92276
+  dps: 47213.43282
+  tps: 28618.47819
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24101.82774
-  tps: 29955.15936
+  dps: 24194.62937
+  tps: 29956.69904
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24101.82774
-  tps: 15458.44038
+  dps: 24194.62937
+  tps: 15567.26683
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27052.53289
-  tps: 15815.95281
+  dps: 27312.8549
+  tps: 16128.63053
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30788.26856
-  tps: 35350.25733
+  dps: 30896.36022
+  tps: 35531.09808
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29049.20842
-  tps: 19019.91918
+  dps: 29176.25636
+  tps: 19120.82744
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 39644.20571
-  tps: 23805.5196
+  dps: 39611.81694
+  tps: 24023.9582
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18811.39643
-  tps: 25781.20452
+  dps: 18709.78867
+  tps: 25620.05795
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18811.39643
-  tps: 12462.11256
+  dps: 18709.78867
+  tps: 12312.20612
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 21879.11477
-  tps: 13049.56207
+  dps: 21674.25952
+  tps: 12826.73653
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30519.2967
-  tps: 34694.77393
+  dps: 30451.38586
+  tps: 34745.79773
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 28882.80993
-  tps: 18571.11752
+  dps: 28705.51716
+  tps: 18461.16283
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 39467.21416
-  tps: 23410.26932
+  dps: 39411.68242
+  tps: 23545.93571
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18411.8521
-  tps: 25818.92386
+  dps: 18455.90684
+  tps: 25830.41308
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18411.8521
-  tps: 11856.44313
+  dps: 18455.90684
+  tps: 11839.36305
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 21862.1944
-  tps: 12476.95063
+  dps: 21785.61696
+  tps: 12311.85886
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 38554.27012
-  tps: 43435.21829
+  dps: 38641.3084
+  tps: 43551.66576
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 36692.87386
-  tps: 24060.14254
+  dps: 36806.9086
+  tps: 24185.20952
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 47125.01574
-  tps: 28917.80132
+  dps: 47317.07704
+  tps: 29114.71577
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24016.05785
-  tps: 29647.68884
+  dps: 24097.04752
+  tps: 29745.74324
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24016.05785
-  tps: 15722.18975
+  dps: 24097.04752
+  tps: 15810.88064
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 26579.22036
-  tps: 15974.65233
+  dps: 26731.37002
+  tps: 16074.55993
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 38609.50058
-  tps: 41587.19344
+  dps: 38697.85247
+  tps: 41441.14129
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 36819.74211
-  tps: 23802.28345
+  dps: 36828.89299
+  tps: 23795.20702
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 46890.34338
-  tps: 28382.41699
+  dps: 47191.29275
+  tps: 28554.52167
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 23830.94811
-  tps: 29467.69106
+  dps: 23816.18364
+  tps: 29334.93587
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 23830.94811
-  tps: 15305.18319
+  dps: 23816.18364
+  tps: 15271.6767
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 26692.01165
-  tps: 15695.91612
+  dps: 26777.97606
+  tps: 15612.96937
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31331.13957
-  tps: 35501.27991
+  dps: 31437.75888
+  tps: 35678.78391
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29589.57194
-  tps: 19175.05687
+  dps: 29712.14893
+  tps: 19267.59174
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 40744.3767
-  tps: 24107.53598
+  dps: 40716.35432
+  tps: 24327.99901
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 19187.0579
-  tps: 25806.62518
+  dps: 19064.25829
+  tps: 25680.23359
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 19187.0579
-  tps: 12556.49334
+  dps: 19064.25829
+  tps: 12389.62827
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22589.74275
-  tps: 13224.88738
+  dps: 22386.24851
+  tps: 12991.33026
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31039.33036
-  tps: 34853.6147
+  dps: 31018.26296
+  tps: 34940.75178
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29421.35536
-  tps: 18720.462
+  dps: 29236.23792
+  tps: 18621.33869
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 40573.30316
-  tps: 23726.2413
+  dps: 40530.9544
+  tps: 23863.52056
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18819.95828
-  tps: 25940.74083
+  dps: 18827.42394
+  tps: 25928.80065
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18819.95828
-  tps: 11982.81282
+  dps: 18827.42394
+  tps: 11948.22261
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22576.32968
-  tps: 12647.91227
+  dps: 22499.32981
+  tps: 12469.9502
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 39179.05391
-  tps: 43595.26607
+  dps: 39273.17022
+  tps: 43706.45776
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 37315.29027
-  tps: 24222.67125
+  dps: 37438.72798
+  tps: 24344.71254
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48328.3378
-  tps: 29247.51338
+  dps: 48560.31399
+  tps: 29437.25489
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24451.25789
-  tps: 29741.80827
+  dps: 24530.76378
+  tps: 29839.14421
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24451.25789
-  tps: 15817.00975
+  dps: 24530.76378
+  tps: 15910.80345
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27371.78109
-  tps: 16147.96853
+  dps: 27505.53285
+  tps: 16238.26843
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 39249.98523
-  tps: 41764.56739
+  dps: 39345.08301
+  tps: 41581.35051
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 37442.15897
-  tps: 23970.00509
+  dps: 37471.1179
+  tps: 23948.5721
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48093.03979
-  tps: 28713.19006
+  dps: 48442.0541
+  tps: 28874.3529
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24242.20814
-  tps: 29547.17384
+  dps: 24295.34805
+  tps: 29490.26596
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24242.20814
-  tps: 15400.8561
+  dps: 24295.34805
+  tps: 15413.65719
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27475.62729
-  tps: 15864.02246
+  dps: 27553.80535
+  tps: 15776.4083
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 31084.99479
-  tps: 35914.24842
+  dps: 31203.92358
+  tps: 35981.89031
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29399.58917
-  tps: 19272.90715
+  dps: 29417.75284
+  tps: 19320.99354
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 40336.6087
-  tps: 24222.36944
+  dps: 40678.88976
+  tps: 24696.9935
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 19049.27039
-  tps: 26192.54997
+  dps: 19139.80707
+  tps: 26194.14192
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 19049.27039
-  tps: 12576.59316
+  dps: 19139.80707
+  tps: 12707.14513
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22824.72289
-  tps: 13662.46545
+  dps: 22838.95964
+  tps: 13659.65137
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 30786.63685
-  tps: 35233.1714
+  dps: 30856.43838
+  tps: 35143.58071
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 29035.19728
-  tps: 18651.72368
+  dps: 29153.29315
+  tps: 18828.21342
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 40300.58414
-  tps: 23943.99453
+  dps: 40554.23144
+  tps: 24378.99723
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 18708.09533
-  tps: 26435.23468
+  dps: 18807.36487
+  tps: 26334.02891
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 18708.09533
-  tps: 12066.10654
+  dps: 18807.36487
+  tps: 12155.3025
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 22726.59818
-  tps: 13134.51981
+  dps: 22920.09158
+  tps: 13252.39047
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 39083.015
-  tps: 43711.66813
+  dps: 38928.16464
+  tps: 44004.2056
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 37379.99838
-  tps: 24618.22443
+  dps: 37061.67669
+  tps: 24409.27646
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48392.65036
-  tps: 29709.79102
+  dps: 48359.64291
+  tps: 29886.78774
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24388.43767
-  tps: 30142.78831
+  dps: 24423.28408
+  tps: 30174.26393
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24388.43767
-  tps: 15995.68418
+  dps: 24423.28408
+  tps: 15993.65257
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27953.69626
-  tps: 17038.56073
+  dps: 27948.27782
+  tps: 16917.89429
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 39029.16261
-  tps: 41909.08975
+  dps: 39050.55105
+  tps: 41686.0048
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 37325.51277
-  tps: 24176.42959
+  dps: 37257.22442
+  tps: 24125.37667
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 48186.31065
-  tps: 29305.68
+  dps: 48398.90128
+  tps: 29388.62699
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
  value: {
-  dps: 24152.33225
-  tps: 29872.269
+  dps: 24263.41712
+  tps: 30124.10859
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
  value: {
-  dps: 24152.33225
-  tps: 15532.94851
+  dps: 24263.41712
+  tps: 15620.07003
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
-  dps: 27867.96396
-  tps: 16485.40739
+  dps: 28177.92885
+  tps: 16698.77121
  }
 }
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 29582.41307
-  tps: 19175.05687
+  dps: 29705.25976
+  tps: 19267.59174
  }
 }
diff --git a/ui/warlock/destruction/apls/p1.apl.json b/ui/warlock/destruction/apls/p1.apl.json
index 9d7bad8629..bc216b934c 100644
--- a/ui/warlock/destruction/apls/p1.apl.json
+++ b/ui/warlock/destruction/apls/p1.apl.json
@@ -47,18 +47,6 @@
 				"castSpell": { "spellId": { "spellId": 6353 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
 		{
 			"action": {
 				"condition": {
@@ -112,6 +100,18 @@
 			}
 		},
 		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } },
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
 		{
 			"action": {
 				"condition": {
diff --git a/ui/warlock/destruction/apls/p3.apl.json b/ui/warlock/destruction/apls/p3.apl.json
index 001bd6d7c8..b2d41410d3 100644
--- a/ui/warlock/destruction/apls/p3.apl.json
+++ b/ui/warlock/destruction/apls/p3.apl.json
@@ -47,18 +47,6 @@
 				"castSpell": { "spellId": { "spellId": 6353 } }
 			}
 		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
 		{
 			"action": {
 				"condition": {
@@ -112,6 +100,18 @@
 			}
 		},
 		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } },
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLt",
+						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
+						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 603 } }
+			}
+		},
 		{
 			"action": {
 				"condition": {

From bc337f06e1bfce2b8bcdf8f622e8ea08b3eee15a Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 21:42:15 +0200
Subject: [PATCH 10/11] PR feedback

---
 sim/warlock/affliction/TestAffliction.results | 1036 +++++------
 sim/warlock/affliction/affliction_test.go     |   11 +-
 sim/warlock/demonology/TestDemonology.results | 1538 +++++------------
 sim/warlock/demonology/demonology_test.go     |    9 +-
 .../destruction/TestDestruction.results       | 1420 +++++----------
 sim/warlock/destruction/destruction_test.go   |   16 +-
 ui/warlock/affliction/presets.ts              |    2 +-
 .../demonology/apls/incinerate.apl.json       |  438 +----
 .../demonology/apls/shadow-bolt.apl.json      |  416 +----
 ui/warlock/demonology/presets.ts              |    2 +-
 ui/warlock/destruction/apls/default.apl.json  |   26 +
 ui/warlock/destruction/apls/p1.apl.json       |  146 --
 ui/warlock/destruction/apls/p3.apl.json       |  150 --
 ui/warlock/destruction/presets.ts             |   16 +-
 ui/warlock/destruction/sim.ts                 |    6 +-
 15 files changed, 1440 insertions(+), 3792 deletions(-)
 create mode 100644 ui/warlock/destruction/apls/default.apl.json
 delete mode 100644 ui/warlock/destruction/apls/p1.apl.json
 delete mode 100644 ui/warlock/destruction/apls/p3.apl.json

diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results
index 0e2141d963..b6a6fac659 100644
--- a/sim/warlock/affliction/TestAffliction.results
+++ b/sim/warlock/affliction/TestAffliction.results
@@ -3,19 +3,19 @@ character_stats_results: {
  value: {
   final_stats: 666.75
   final_stats: 668.85
-  final_stats: 7057.05
-  final_stats: 5543.37
+  final_stats: 8311.8
+  final_stats: 7126.56
   final_stats: 183
-  final_stats: 1748
-  final_stats: 989
-  final_stats: 2200
+  final_stats: 1750
+  final_stats: 1028
+  final_stats: 2510
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 991
+  final_stats: 1049
   final_stats: 788.1
   final_stats: 0
-  final_stats: 9216.207
+  final_stats: 11594.616
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -23,1496 +23,1454 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 8479
+  final_stats: 9372
   final_stats: 0
-  final_stats: 136722.7
-  final_stats: 105549.55
+  final_stats: 154289.2
+  final_stats: 129297.4
   final_stats: 1353.65
-  final_stats: 14.55347
-  final_stats: 17.06269
-  final_stats: 13.13851
-  final_stats: 20.53156
+  final_stats: 14.57012
+  final_stats: 17.08221
+  final_stats: 13.35605
+  final_stats: 23.12389
   final_stats: 5
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 28432.87046
-  tps: 20716.91686
+  dps: 35969.57138
+  tps: 26258.5514
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 27216.84655
-  tps: 19845.99599
+  dps: 34493.16883
+  tps: 25310.24545
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 26905.55567
-  tps: 19745.87002
+  dps: 34403.80663
+  tps: 25311.89842
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 27447.94022
-  tps: 20066.93271
+  dps: 34732.66224
+  tps: 25338.1397
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 27501.07274
-  tps: 20102.24268
+  dps: 34785.29734
+  tps: 25376.9615
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 28089.49178
-  tps: 20382.16541
+  dps: 35659.13114
+  tps: 25959.58315
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 28384.707
-  tps: 20436.62712
+  dps: 33268.19898
+  tps: 24356.54466
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 26615.19938
-  tps: 19466.99962
-  hps: 100.65769
+  dps: 33871.79364
+  tps: 24696.32383
+  hps: 101.77201
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 28186.38726
-  tps: 20524.32006
+  dps: 35479.77457
+  tps: 25905.84208
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-BellofEnragingResonance-65053"
+ value: {
+  dps: 35692.37464
+  tps: 26064.58378
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BindingPromise-67037"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 26741.02846
-  tps: 19601.37436
+  dps: 34122.24182
+  tps: 25020.63104
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 26917.05929
-  tps: 19713.64147
+  dps: 34320.80553
+  tps: 25255.31528
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 26917.05929
-  tps: 19713.64147
+  dps: 34320.80553
+  tps: 25255.31528
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 26556.65935
-  tps: 19412.35
+  dps: 33871.63776
+  tps: 24775.07313
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 27475.93684
-  tps: 20059.26892
+  dps: 34798.44982
+  tps: 25423.70579
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 26584.41738
-  tps: 19432.21521
+  dps: 33853.3422
+  tps: 24750.23347
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 27034.00238
-  tps: 19744.24805
+  dps: 34305.76588
+  tps: 25116.3178
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 26687.61713
-  tps: 19505.46053
+  dps: 33830.82055
+  tps: 24710.98624
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 26687.61713
-  tps: 19505.46053
+  dps: 33894.53999
+  tps: 24795.75037
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 27516.63236
-  tps: 20080.89232
+  dps: 34786.26199
+  tps: 25482.26803
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BottledLightning-66879"
  value: {
-  dps: 27341.71229
-  tps: 19964.85301
+  dps: 34733.20423
+  tps: 25380.94647
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 28287.66395
-  tps: 20135.7527
+  dps: 35752.42264
+  tps: 25511.24536
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 28579.17401
-  tps: 20821.39086
+  dps: 36142.77119
+  tps: 26402.55888
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 28515.59265
-  tps: 20772.1296
+  dps: 36055.83534
+  tps: 26322.55486
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 27070.29339
-  tps: 19753.91543
+  dps: 34307.92673
+  tps: 25099.78979
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 27588.40502
-  tps: 20134.40921
+  dps: 35028.24675
+  tps: 25486.49844
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CrushingWeight-59506"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-CrushingWeight-65118"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 26686.79836
-  tps: 19502.14803
+  dps: 33898.79626
+  tps: 24799.62147
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 27629.86971
-  tps: 20125.90055
+  dps: 34933.9772
+  tps: 25434.00986
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 26906.33332
-  tps: 19648.25883
+  dps: 34147.36109
+  tps: 25007.76426
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 28221.87854
-  tps: 20487.37374
+  dps: 35665.20776
+  tps: 25944.93985
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 27325.4935
-  tps: 19980.85933
+  dps: 34912.05439
+  tps: 25539.48518
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 27066.55223
-  tps: 19767.7582
+  dps: 34361.59047
+  tps: 25134.72197
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 28089.49178
-  tps: 20382.16541
+  dps: 35659.13114
+  tps: 25959.58315
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 27042.40717
-  tps: 19762.9432
+  dps: 34301.0675
+  tps: 25093.80856
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 28269.40511
-  tps: 20551.96759
+  dps: 35834.34886
+  tps: 26004.31069
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 28221.87854
-  tps: 20487.37374
+  dps: 35665.20776
+  tps: 25944.93985
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 26905.55567
-  tps: 19745.87002
+  dps: 34403.80663
+  tps: 25311.89842
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 28089.49178
-  tps: 20382.16541
+  dps: 35659.13114
+  tps: 25959.58315
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FallofMortality-59500"
  value: {
-  dps: 27629.86971
-  tps: 20125.90055
+  dps: 34933.9772
+  tps: 25434.00986
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FallofMortality-65124"
  value: {
-  dps: 27772.99165
-  tps: 20224.66607
+  dps: 35131.73214
+  tps: 25639.32267
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 27668.37842
-  tps: 20180.27574
+  dps: 35127.61301
+  tps: 25670.91504
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 26781.17759
-  tps: 19552.67169
+  dps: 34177.34604
+  tps: 24961.46078
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 27414.44293
-  tps: 19982.61968
+  dps: 34882.7013
+  tps: 25418.44731
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 26640.88017
-  tps: 19483.30862
+  dps: 33814.37233
+  tps: 24723.5376
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 28257.67483
-  tps: 20578.87603
+  dps: 35783.57179
+  tps: 26059.8949
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 26780.61941
-  tps: 19628.41724
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 28244.69835
-  tps: 20537.54715
+  dps: 35582.52588
+  tps: 25884.44956
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FluidDeath-58181"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 28287.66395
-  tps: 20539.00205
+  dps: 35752.42264
+  tps: 26025.0817
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 27084.56901
-  tps: 19766.13768
+  dps: 34333.50535
+  tps: 25114.17136
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GaleofShadows-56138"
  value: {
-  dps: 27614.35768
-  tps: 20231.35436
+  dps: 35142.46491
+  tps: 25750.2589
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GaleofShadows-56462"
  value: {
-  dps: 27889.08958
-  tps: 20459.82833
+  dps: 35188.97481
+  tps: 25762.01708
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GearDetector-61462"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 23469.45219
-  tps: 17043.96706
+  dps: 27955.83224
+  tps: 20586.34827
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 27165.02928
-  tps: 19797.82484
+  dps: 34516.06854
+  tps: 25324.48642
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HarmlightToken-63839"
  value: {
-  dps: 27684.06513
-  tps: 20107.58497
+  dps: 35160.10665
+  tps: 25617.14301
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 27832.79876
-  tps: 20462.14935
+  dps: 35312.88911
+  tps: 25871.45544
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 27977.30807
-  tps: 20612.21513
+  dps: 35573.51015
+  tps: 26049.57348
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofRage-59224"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofRage-65072"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofSolace-55868"
  value: {
-  dps: 26921.38661
-  tps: 19720.3466
+  dps: 34412.12939
+  tps: 25208.49157
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofSolace-56393"
  value: {
-  dps: 27098.12295
-  tps: 19875.85633
+  dps: 34361.4844
+  tps: 25148.40688
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofThunder-55845"
  value: {
-  dps: 26692.65294
-  tps: 19511.82951
+  dps: 33924.73911
+  tps: 24841.70906
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartofThunder-56370"
  value: {
-  dps: 26681.09295
-  tps: 19503.86598
+  dps: 33931.41727
+  tps: 24850.2813
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 28221.87854
-  tps: 20487.37374
+  dps: 35665.20776
+  tps: 25944.93985
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 26878.72043
-  tps: 19726.51826
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 26878.72043
-  tps: 19726.51826
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 26923.07495
-  tps: 19719.84485
+  dps: 34321.88383
+  tps: 25273.05091
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 26923.07495
-  tps: 19719.84485
+  dps: 34321.88383
+  tps: 25273.05091
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 26699.68215
-  tps: 19523.3819
+  dps: 33924.73911
+  tps: 24841.54598
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 27166.18633
-  tps: 19871.41978
+  dps: 34686.00593
+  tps: 25411.03914
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 26692.21809
-  tps: 19522.60428
+  dps: 33864.16089
+  tps: 24733.45482
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 26739.01623
-  tps: 19547.8972
+  dps: 33816.81241
+  tps: 24666.4982
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 27809.72139
-  tps: 20291.27429
+  dps: 35194.26423
+  tps: 25663.06853
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 27902.9196
-  tps: 20369.31975
+  dps: 35305.63442
+  tps: 25741.13959
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 26741.02846
-  tps: 19601.37436
+  dps: 34122.24182
+  tps: 25020.63104
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 26729.60865
-  tps: 19604.4454
+  dps: 34133.28567
+  tps: 24982.86775
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 26729.60865
-  tps: 19604.4454
+  dps: 34133.28567
+  tps: 24982.86775
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 26695.75028
-  tps: 19502.07275
+  dps: 34185.43194
+  tps: 24921.97519
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeadenDespair-55816"
  value: {
-  dps: 26692.69913
-  tps: 19499.28109
+  dps: 33875.38988
+  tps: 24815.69117
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeadenDespair-56347"
  value: {
-  dps: 26640.88017
-  tps: 19483.30862
+  dps: 33814.37233
+  tps: 24723.5376
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 26545.66098
-  tps: 19406.00687
+  dps: 33877.53891
+  tps: 24775.92814
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 26545.66098
-  tps: 19406.00687
+  dps: 33877.53891
+  tps: 24775.92814
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33868.75628
+  tps: 24771.55439
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33868.75628
+  tps: 24771.55439
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 26778.2597
-  tps: 19638.60559
+  dps: 34191.92565
+  tps: 25090.31487
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 26820.55037
-  tps: 19680.89627
+  dps: 34218.12454
+  tps: 25116.51376
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 26784.21673
-  tps: 19646.06645
+  dps: 34165.31262
+  tps: 25015.41035
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 26784.21673
-  tps: 19646.06645
+  dps: 34165.31262
+  tps: 25015.41035
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 27021.97811
-  tps: 19818.74802
+  dps: 34321.88383
+  tps: 25273.05091
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 27021.97811
-  tps: 19818.74802
+  dps: 34321.88383
+  tps: 25273.05091
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 28066.50817
-  tps: 20456.24348
+  dps: 35364.211
+  tps: 25845.89216
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 28109.66074
-  tps: 20618.39018
+  dps: 35575.12173
+  tps: 26011.21325
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 26680.38194
-  tps: 19549.61218
+  dps: 33846.02254
+  tps: 24781.50266
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 28105.89425
-  tps: 20516.29834
+  dps: 35656.72203
+  tps: 26140.59532
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 28332.44273
-  tps: 20772.43799
+  dps: 35736.66288
+  tps: 26180.71199
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 26903.57113
-  tps: 19655.48846
+  dps: 34231.03901
+  tps: 25033.48039
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 27567.73057
-  tps: 20092.70505
+  dps: 34824.29663
+  tps: 25400.92352
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 27557.06231
-  tps: 20109.16627
+  dps: 34826.63501
+  tps: 25480.93969
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 28089.49178
-  tps: 20382.16541
+  dps: 35659.13114
+  tps: 25959.58315
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Rainsong-55854"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33888.39973
+  tps: 24794.17532
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Rainsong-56377"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33820.88968
+  tps: 24748.92613
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 28432.87046
-  tps: 20716.91686
+  dps: 35969.57138
+  tps: 26258.5514
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 28432.87046
-  tps: 20716.91686
+  dps: 35997.40428
+  tps: 26296.49642
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 27088.88075
-  tps: 19769.80813
+  dps: 34476.20782
+  tps: 25216.44783
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 26880.49875
-  tps: 19677.36331
+  dps: 34161.82384
+  tps: 24945.65116
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RuneofZeth-68998"
  value: {
-  dps: 28099.25489
-  tps: 20440.91196
+  dps: 35446.13481
+  tps: 25872.59563
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ScalesofLife-68915"
  value: {
-  dps: 26614.54165
-  tps: 19527.31776
-  hps: 354.04187
+  dps: 33825.5427
+  tps: 24757.99289
+  hps: 357.04731
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ScalesofLife-69109"
  value: {
-  dps: 26596.54936
-  tps: 19504.16551
-  hps: 399.35591
+  dps: 33821.76338
+  tps: 24760.94716
+  hps: 402.74602
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SeaStar-55256"
  value: {
-  dps: 27033.10974
-  tps: 19747.80474
+  dps: 34315.64923
+  tps: 25045.17114
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SeaStar-56290"
  value: {
-  dps: 27420.21687
-  tps: 20020.07807
+  dps: 34725.65707
+  tps: 25336.92241
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ShadowflameRegalia"
  value: {
-  dps: 25942.80578
-  tps: 19012.49057
+  dps: 30613.70472
+  tps: 22752.61448
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ShardofWoe-60233"
  value: {
-  dps: 27105.88084
-  tps: 19835.91941
+  dps: 34486.66808
+  tps: 25176.6125
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 26632.5543
-  tps: 19445.28073
+  dps: 33891.37521
+  tps: 24809.7108
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 26848.21435
-  tps: 19696.01218
+  dps: 34204.12323
+  tps: 25101.0145
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 26896.17743
-  tps: 19743.97526
+  dps: 34233.35499
+  tps: 25130.24626
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sorrowsong-55879"
  value: {
-  dps: 27549.80252
-  tps: 20169.68354
+  dps: 34995.8213
+  tps: 25762.57691
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Sorrowsong-56400"
  value: {
-  dps: 27632.66175
-  tps: 20229.40333
+  dps: 35084.21623
+  tps: 25829.00403
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 26784.21673
-  tps: 19646.06645
+  dps: 34165.31262
+  tps: 25015.41035
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SoulCasket-58183"
  value: {
-  dps: 28020.7729
-  tps: 20533.46479
+  dps: 35431.6239
+  tps: 25984.32464
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 27015.95056
-  tps: 19812.53274
+  dps: 34443.54292
+  tps: 25378.05267
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 27114.84183
-  tps: 19911.42402
+  dps: 34443.54292
+  tps: 25378.05267
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StayofExecution-68996"
  value: {
-  dps: 26584.41738
-  tps: 19432.21521
+  dps: 33853.3422
+  tps: 24750.23347
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 27438.72811
-  tps: 19996.83438
+  dps: 34957.95785
+  tps: 25631.93436
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StumpofTime-62465"
  value: {
-  dps: 27921.85155
-  tps: 20430.52983
+  dps: 35263.14065
+  tps: 25760.72805
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-StumpofTime-62470"
  value: {
-  dps: 27946.20782
-  tps: 20424.59916
+  dps: 35267.55701
+  tps: 25731.70857
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 26663.02174
-  tps: 19515.46656
+  dps: 33862.02014
+  tps: 24802.16967
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 26588.63978
-  tps: 19468.9888
+  dps: 33879.29024
+  tps: 24782.47176
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 27539.47015
-  tps: 20126.493
+  dps: 34913.78956
+  tps: 25610.91045
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TearofBlood-55819"
  value: {
-  dps: 27319.31701
-  tps: 19921.98482
+  dps: 34630.10174
+  tps: 25338.22407
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TearofBlood-56351"
  value: {
-  dps: 27498.09182
-  tps: 20037.3953
+  dps: 34779.70067
+  tps: 25390.07861
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 27440.79055
-  tps: 20080.49919
+  dps: 34749.62886
+  tps: 25518.84065
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 27598.66922
-  tps: 20184.07834
+  dps: 35015.08404
+  tps: 25727.68434
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TheHungerer-68927"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TheHungerer-69112"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 27953.129
-  tps: 20449.15984
+  dps: 35352.22477
+  tps: 25852.25743
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 28134.24063
-  tps: 20585.91504
+  dps: 35583.51303
+  tps: 26091.10356
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 26917.05929
-  tps: 19713.64147
+  dps: 34320.80553
+  tps: 25255.31528
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 26917.05929
-  tps: 19713.64147
+  dps: 34320.80553
+  tps: 25255.31528
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 26814.73064
-  tps: 19619.36134
+  dps: 34098.88257
+  tps: 24955.41711
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 27475.57491
-  tps: 20129.77393
+  dps: 34700.2981
+  tps: 25413.24276
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnheededWarning-59520"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 26584.41738
-  tps: 19432.21521
+  dps: 33839.81901
+  tps: 24706.54275
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 26878.72043
-  tps: 19726.51826
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 26878.72043
-  tps: 19726.51826
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 26878.72043
-  tps: 19726.51826
+  dps: 34220.61576
+  tps: 25117.50703
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 28811.39087
-  tps: 21226.79483
- }
-}
-dps_results: {
- key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-69110"
- value: {
-  dps: 29027.73243
-  tps: 21471.24301
+  dps: 35192.01567
+  tps: 25633.34994
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 26663.02174
-  tps: 19515.46656
+  dps: 33862.02014
+  tps: 24802.16967
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 26588.63978
-  tps: 19468.9888
+  dps: 33879.29024
+  tps: 24782.47176
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 26584.41738
-  tps: 19432.21521
+  dps: 33853.3422
+  tps: 24750.23347
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 27525.79154
-  tps: 20094.33443
+  dps: 34851.30124
+  tps: 25461.36707
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 26584.41738
-  tps: 19432.21521
+  dps: 33853.3422
+  tps: 24750.23347
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 26875.85671
-  tps: 19669.13931
+  dps: 34133.78541
+  tps: 24937.11276
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 27062.30876
-  tps: 19829.86547
+  dps: 34711.49844
+  tps: 25468.42727
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 27019.41947
-  tps: 19725.50249
+  dps: 34392.58825
+  tps: 25182.24067
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 26648.29461
-  tps: 19466.77732
+  dps: 33892.5296
+  tps: 24792.27029
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 26943.28854
-  tps: 19761.77125
+  dps: 34259.76782
+  tps: 25159.50851
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 26648.29461
-  tps: 19466.77732
+  dps: 33892.5296
+  tps: 24792.27029
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 27477.43289
-  tps: 20040.53317
+  dps: 34728.03259
+  tps: 25427.02755
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 26719.27675
-  tps: 19515.85893
+  dps: 33952.59335
+  tps: 24887.1031
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 27383.84009
-  tps: 19988.94048
+  dps: 35086.09274
+  tps: 25625.94708
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 28006.15049
-  tps: 20573.36533
+  dps: 35246.65578
+  tps: 25812.00084
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 26780.61941
-  tps: 19628.41724
+  dps: 34098.19124
+  tps: 24995.08251
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 26707.64517
-  tps: 19599.15557
+  dps: 34151.56546
+  tps: 25060.2696
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 26707.64517
-  tps: 19599.15557
+  dps: 34151.56546
+  tps: 25060.2696
  }
 }
 dps_results: {
  key: "TestAffliction-Average-Default"
  value: {
-  dps: 28838.36158
-  tps: 21126.91867
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 29076.09177
-  tps: 29227.30052
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28139.55317
-  tps: 20823.85224
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 36189.8487
-  tps: 24170.66998
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18749.90799
-  tps: 21426.74704
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18749.90799
-  tps: 13630.84199
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21449.29745
-  tps: 13158.27027
+  dps: 36540.04285
+  tps: 26772.37498
  }
 }
 dps_results: {
@@ -1557,48 +1515,6 @@ dps_results: {
   tps: 16991.31026
  }
 }
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 28830.00283
-  tps: 28762.41742
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 27949.05506
-  tps: 20623.37439
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 36322.70887
-  tps: 24431.01849
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18575.87587
-  tps: 21267.14291
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18575.87587
-  tps: 13471.23786
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21326.25306
-  tps: 13046.14622
- }
-}
 dps_results: {
  key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -1641,48 +1557,6 @@ dps_results: {
   tps: 16883.62501
  }
 }
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 29448.82395
-  tps: 28959.90773
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28579.17401
-  tps: 20821.39086
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 35879.16502
-  tps: 24304.69141
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 19009.33659
-  tps: 21388.61585
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 19009.33659
-  tps: 13591.82024
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21139.88727
-  tps: 13187.81581
- }
-}
 dps_results: {
  key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -1725,48 +1599,6 @@ dps_results: {
   tps: 16784.11757
  }
 }
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 29168.25719
-  tps: 29195.76979
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28230.08956
-  tps: 20936.18421
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 36696.99678
-  tps: 24719.89889
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18856.988
-  tps: 21536.79064
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18856.988
-  tps: 13698.97213
- }
-}
-dps_results: {
- key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22010.9013
-  tps: 13742.76558
- }
-}
 dps_results: {
  key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -1812,7 +1644,7 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 28467.6957
-  tps: 20821.39086
+  dps: 36009.29189
+  tps: 26402.55888
  }
 }
diff --git a/sim/warlock/affliction/affliction_test.go b/sim/warlock/affliction/affliction_test.go
index 35c8eafd24..3cf5d06912 100644
--- a/sim/warlock/affliction/affliction_test.go
+++ b/sim/warlock/affliction/affliction_test.go
@@ -400,13 +400,10 @@ func TestAffliction(t *testing.T) {
 	}
 
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{
-		Class:      proto.Class_ClassWarlock,
-		Race:       proto.Race_RaceOrc,
-		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:    core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p1"),
-		OtherGearSets: []core.GearSetCombo{
-			core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p3"),
-		},
+		Class:            proto.Class_ClassWarlock,
+		Race:             proto.Race_RaceOrc,
+		OtherRaces:       []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
+		GearSet:          core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p3"),
 		Talents:          afflictionTalents,
 		Glyphs:           afflictionGlyphs,
 		Consumes:         fullConsumes,
diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results
index a30d706b3a..d22692bb1b 100644
--- a/sim/warlock/demonology/TestDemonology.results
+++ b/sim/warlock/demonology/TestDemonology.results
@@ -3,19 +3,19 @@ character_stats_results: {
  value: {
   final_stats: 666.75
   final_stats: 668.85
-  final_stats: 7762.755
-  final_stats: 5543.37
+  final_stats: 9142.98
+  final_stats: 7126.56
   final_stats: 183
+  final_stats: 1744
+  final_stats: 846
   final_stats: 1743
-  final_stats: 767
-  final_stats: 1733
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 1685
+  final_stats: 2003
   final_stats: 788.1
   final_stats: 0
-  final_stats: 9216.207
+  final_stats: 11594.616
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -23,1622 +23,1454 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 8479
+  final_stats: 9372
   final_stats: 0
-  final_stats: 146602.57
-  final_stats: 105549.55
+  final_stats: 165925.72
+  final_stats: 129297.4
   final_stats: 1353.65
-  final_stats: 14.51184
-  final_stats: 17.01388
-  final_stats: 11.90022
-  final_stats: 19.29328
+  final_stats: 14.52017
+  final_stats: 17.02365
+  final_stats: 12.34087
+  final_stats: 22.10871
   final_stats: 5
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 30422.22115
-  tps: 15401.17445
+  dps: 37797.77205
+  tps: 19325.35925
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 28506.5978
-  tps: 14539.46968
+  dps: 35693.07533
+  tps: 18504.28139
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 28694.27675
-  tps: 14544.69005
+  dps: 35992.29056
+  tps: 18549.95349
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 28865.81642
-  tps: 14762.41013
+  dps: 36153.11891
+  tps: 18812.45007
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 29144.78723
-  tps: 14842.20336
+  dps: 36448.17726
+  tps: 18779.13632
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 30217.41022
-  tps: 15246.95973
+  dps: 37521.64998
+  tps: 19116.21917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 30537.19114
-  tps: 15135.4581
+  dps: 34891.44075
+  tps: 18065.64938
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 28003.29856
-  tps: 14301.89153
-  hps: 98.311
+  dps: 35167.10467
+  tps: 18231.9179
+  hps: 101.33224
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 29605.61022
-  tps: 15096.25506
+  dps: 36734.53797
+  tps: 19100.99947
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-BellofEnragingResonance-65053"
+ value: {
+  dps: 37221.39562
+  tps: 19020.95863
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BindingPromise-67037"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 28415.84055
-  tps: 14441.47398
+  dps: 35663.13234
+  tps: 18423.96689
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 28415.84055
-  tps: 14441.47398
+  dps: 35663.13234
+  tps: 18423.96689
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 28555.05865
-  tps: 14493.08201
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 27997.08139
-  tps: 14286.17492
+  dps: 35164.48342
+  tps: 18234.05293
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 28847.21417
-  tps: 14771.26405
+  dps: 36233.03039
+  tps: 18718.90539
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 27998.20821
-  tps: 14286.67184
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 28366.00078
-  tps: 14475.28457
+  dps: 35539.74209
+  tps: 18448.04274
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 28001.91147
-  tps: 14291.43857
+  dps: 35169.39502
+  tps: 18234.42099
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 27998.20821
-  tps: 14286.90157
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 27998.20821
-  tps: 14286.67184
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 28898.27023
-  tps: 14742.82447
+  dps: 36086.78839
+  tps: 18711.51203
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BottledLightning-66879"
  value: {
-  dps: 28629.855
-  tps: 14605.87356
+  dps: 35841.54188
+  tps: 18519.99466
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 30399.97178
-  tps: 15036.41081
+  dps: 37694.1046
+  tps: 18831.26472
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 30606.44039
-  tps: 15487.01038
+  dps: 37972.1958
+  tps: 19413.78082
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 30487.75733
-  tps: 15435.72974
+  dps: 37871.69009
+  tps: 19365.41905
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 28383.56945
-  tps: 14488.08887
+  dps: 35544.1289
+  tps: 18450.55464
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 28954.78913
-  tps: 14772.77247
+  dps: 36158.50793
+  tps: 18752.46353
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CrushingWeight-59506"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CrushingWeight-65118"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 27998.20821
-  tps: 14286.90434
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 28954.76718
-  tps: 14772.75052
+  dps: 36158.50793
+  tps: 18752.46353
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 28187.00775
-  tps: 14369.34217
+  dps: 35390.99569
+  tps: 18366.43591
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 30280.50305
-  tps: 15279.79928
+  dps: 37592.9287
+  tps: 19154.73221
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 28803.61478
-  tps: 14796.75731
+  dps: 35953.65495
+  tps: 18582.55603
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 28435.52393
-  tps: 14493.34973
+  dps: 35616.78113
+  tps: 18552.01548
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 30217.41022
-  tps: 15246.95973
+  dps: 37521.64998
+  tps: 19116.21917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 28375.82335
-  tps: 14505.74247
+  dps: 35571.7466
+  tps: 18402.34037
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 30399.97178
-  tps: 15338.33713
+  dps: 37694.1046
+  tps: 19208.77133
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 30280.50305
-  tps: 15279.79928
+  dps: 37592.9287
+  tps: 19154.73221
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 28694.27675
-  tps: 14544.69005
+  dps: 35992.29056
+  tps: 18549.95349
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 30217.41022
-  tps: 15246.95973
+  dps: 37521.64998
+  tps: 19116.21917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FallofMortality-59500"
  value: {
-  dps: 28954.76718
-  tps: 14772.75052
+  dps: 36158.50793
+  tps: 18752.46353
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FallofMortality-65124"
  value: {
-  dps: 29107.53438
-  tps: 14865.93998
+  dps: 36318.6378
+  tps: 18826.63086
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 28996.957
-  tps: 14748.50301
+  dps: 36268.45028
+  tps: 18732.92687
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 28216.65885
-  tps: 14442.0039
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 28860.1464
-  tps: 14729.22029
+  dps: 36021.99346
+  tps: 18681.21816
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 28005.02987
-  tps: 14288.47522
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 29792.55654
-  tps: 15227.11239
+  dps: 36983.34885
+  tps: 19188.62844
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 30217.41022
-  tps: 15246.92044
+  dps: 37521.64998
+  tps: 19116.21917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FluidDeath-58181"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 30399.97178
-  tps: 15331.69324
+  dps: 37694.1046
+  tps: 19203.15251
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 28396.02422
-  tps: 14490.9011
+  dps: 35589.35061
+  tps: 18470.70907
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GaleofShadows-56138"
  value: {
-  dps: 28912.3763
-  tps: 14941.67017
+  dps: 36136.79839
+  tps: 18801.38548
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GaleofShadows-56462"
  value: {
-  dps: 29103.36774
-  tps: 14950.02227
+  dps: 36223.36872
+  tps: 18798.02109
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GearDetector-61462"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 24854.74094
-  tps: 12410.35719
+  dps: 28470.20972
+  tps: 14929.78212
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 28540.18611
-  tps: 14555.98951
+  dps: 35728.74798
+  tps: 18521.98042
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HarmlightToken-63839"
  value: {
-  dps: 29196.68397
-  tps: 14928.05928
+  dps: 36418.55126
+  tps: 18800.57518
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 29076.00008
-  tps: 14975.05358
+  dps: 36684.08456
+  tps: 19087.6537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 29372.43735
-  tps: 15232.32205
+  dps: 36974.79948
+  tps: 19243.11123
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofRage-59224"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofRage-65072"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofSolace-55868"
  value: {
-  dps: 28298.61893
-  tps: 14551.87201
+  dps: 35356.24779
+  tps: 18422.99189
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofSolace-56393"
  value: {
-  dps: 28354.96599
-  tps: 14569.09885
+  dps: 35400.89483
+  tps: 18401.88005
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofThunder-55845"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartofThunder-56370"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 30280.50305
-  tps: 15279.79928
+  dps: 37592.9287
+  tps: 19154.73221
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 28415.81818
-  tps: 14441.45161
+  dps: 35663.15527
+  tps: 18423.98982
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 28555.03614
-  tps: 14493.0595
+  dps: 35827.73452
+  tps: 18486.98326
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 28850.42006
-  tps: 14651.21003
+  dps: 36210.92476
+  tps: 18626.67131
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 27972.84754
-  tps: 14312.39889
+  dps: 35169.39502
+  tps: 18244.47723
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 27984.87091
-  tps: 14308.86836
+  dps: 35169.39502
+  tps: 18245.52862
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 29164.66785
-  tps: 14881.87107
+  dps: 36395.13681
+  tps: 18855.28567
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 29321.69045
-  tps: 14961.01445
+  dps: 36554.09544
+  tps: 18933.94484
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 28415.84055
-  tps: 14441.47398
+  dps: 35663.13234
+  tps: 18423.96689
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 28226.97595
-  tps: 14513.02616
+  dps: 35389.63127
+  tps: 18330.71959
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 28226.97595
-  tps: 14513.02616
+  dps: 35389.63127
+  tps: 18330.71959
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 28214.16565
-  tps: 14457.03855
+  dps: 35381.78912
+  tps: 18474.0437
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeadenDespair-55816"
  value: {
-  dps: 28005.02987
-  tps: 14288.19774
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeadenDespair-56347"
  value: {
-  dps: 28005.02987
-  tps: 14288.47522
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 27988.26601
-  tps: 14293.71518
+  dps: 35169.39502
+  tps: 18234.38111
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 27988.26601
-  tps: 14293.71518
+  dps: 35169.39502
+  tps: 18234.38111
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 28213.88525
-  tps: 14286.64989
+  dps: 35587.79983
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 28240.84762
-  tps: 14286.64989
+  dps: 35640.10043
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 28555.03614
-  tps: 14493.0595
+  dps: 35827.73452
+  tps: 18486.98326
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 28555.03614
-  tps: 14493.0595
+  dps: 35827.73452
+  tps: 18486.98326
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 29390.17024
-  tps: 14968.7577
+  dps: 36533.37956
+  tps: 18949.68638
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 29292.03032
-  tps: 14804.22375
+  dps: 36820.58295
+  tps: 18785.35568
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 28005.02987
-  tps: 14288.69667
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 29684.04389
-  tps: 15040.61264
+  dps: 37072.12058
+  tps: 19053.7476
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 29945.78622
-  tps: 15152.45923
+  dps: 37370.67459
+  tps: 19173.13399
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 28249.84718
-  tps: 14427.03641
+  dps: 35399.88409
+  tps: 18358.82219
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 28920.1631
-  tps: 14755.80522
+  dps: 36093.03112
+  tps: 18715.46298
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 28881.15462
-  tps: 14731.42195
+  dps: 36059.23151
+  tps: 18708.02588
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 30217.41022
-  tps: 15246.95973
+  dps: 37521.64998
+  tps: 19116.21917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Rainsong-55854"
  value: {
-  dps: 27998.18626
-  tps: 14286.45189
+  dps: 35169.39502
+  tps: 18234.59246
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Rainsong-56377"
  value: {
-  dps: 28001.88952
-  tps: 14291.43135
+  dps: 35169.39502
+  tps: 18234.45289
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 30422.22115
-  tps: 15401.17445
+  dps: 37797.77205
+  tps: 19325.35925
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 30422.22115
-  tps: 15401.09498
+  dps: 37797.77205
+  tps: 19325.24434
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 28403.34693
-  tps: 14517.70912
+  dps: 35717.80715
+  tps: 18554.74009
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RuneofZeth-68998"
  value: {
-  dps: 29543.83251
-  tps: 15060.83127
+  dps: 36769.42207
+  tps: 19132.97757
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ScalesofLife-68915"
  value: {
-  dps: 28007.83742
-  tps: 14298.55411
-  hps: 351.03642
+  dps: 35172.91892
+  tps: 18238.62203
+  hps: 354.04187
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ScalesofLife-69109"
  value: {
-  dps: 28007.83742
-  tps: 14298.71783
-  hps: 395.9658
+  dps: 35172.91892
+  tps: 18238.62203
+  hps: 399.35591
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SeaStar-55256"
  value: {
-  dps: 28425.50397
-  tps: 14530.37781
+  dps: 35704.7115
+  tps: 18478.1734
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SeaStar-56290"
  value: {
-  dps: 28899.59457
-  tps: 14761.46394
+  dps: 36049.16163
+  tps: 18719.49802
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ShadowflameRegalia"
  value: {
-  dps: 27747.57868
-  tps: 14041.12306
+  dps: 32196.78785
+  tps: 17028.79607
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ShardofWoe-60233"
  value: {
-  dps: 28224.00755
-  tps: 14530.91967
+  dps: 35669.49595
+  tps: 18610.14193
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 28001.88642
-  tps: 14286.81146
+  dps: 35169.41753
+  tps: 18235.0095
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 28191.29547
-  tps: 14286.67184
+  dps: 35586.49569
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 28215.43138
-  tps: 14286.67184
+  dps: 35638.63327
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sorrowsong-55879"
  value: {
-  dps: 29016.79475
-  tps: 14744.2133
+  dps: 36315.5654
+  tps: 18747.08365
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sorrowsong-56400"
  value: {
-  dps: 28887.51965
-  tps: 14893.09973
+  dps: 36568.9901
+  tps: 18853.63513
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 28216.6369
-  tps: 14441.98195
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SoulCasket-58183"
  value: {
-  dps: 29881.27285
-  tps: 15177.98468
+  dps: 37102.5784
+  tps: 19200.3463
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 28694.27675
-  tps: 14544.69005
+  dps: 35992.29056
+  tps: 18549.95349
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 28833.49485
-  tps: 14596.29808
+  dps: 36156.86966
+  tps: 18612.94679
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-StayofExecution-68996"
  value: {
-  dps: 27998.20821
-  tps: 14286.67184
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 28869.9989
-  tps: 14718.89849
+  dps: 36185.92638
+  tps: 18740.58542
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-StumpofTime-62465"
  value: {
-  dps: 29566.9123
-  tps: 14935.30206
+  dps: 36838.72951
+  tps: 18874.40156
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-StumpofTime-62470"
  value: {
-  dps: 29547.11573
-  tps: 14963.8781
+  dps: 36983.32098
+  tps: 18939.22517
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 28005.02987
-  tps: 14288.62196
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 28005.02987
-  tps: 14288.78738
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 29154.12942
-  tps: 14839.70211
+  dps: 36467.74028
+  tps: 18850.74575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TearofBlood-55819"
  value: {
-  dps: 28641.51547
-  tps: 14618.30549
+  dps: 35824.89689
+  tps: 18561.63827
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TearofBlood-56351"
  value: {
-  dps: 28860.12445
-  tps: 14729.19833
+  dps: 36021.99346
+  tps: 18681.21816
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 29023.95126
-  tps: 14735.78984
+  dps: 36288.04926
+  tps: 18727.18676
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 29390.36161
-  tps: 14828.32352
+  dps: 37057.40369
+  tps: 18957.48252
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TheHungerer-68927"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TheHungerer-69112"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 29555.83231
-  tps: 14962.85904
+  dps: 36869.20695
+  tps: 18950.30728
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 30004.5977
-  tps: 15144.34177
+  dps: 37564.69027
+  tps: 19114.86175
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 28415.84055
-  tps: 14441.47398
+  dps: 35663.13234
+  tps: 18423.96689
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 28555.05865
-  tps: 14493.08201
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 28170.76884
-  tps: 14389.75729
+  dps: 35321.21955
+  tps: 18286.74542
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 28885.07561
-  tps: 14876.78011
+  dps: 36283.74749
+  tps: 18886.55358
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnheededWarning-59520"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 27998.20821
-  tps: 14286.51344
+  dps: 35169.39502
+  tps: 18234.67819
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 28555.08117
-  tps: 14493.10453
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 30063.77923
-  tps: 15800.32321
- }
-}
-dps_results: {
- key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-69110"
- value: {
-  dps: 30524.62971
-  tps: 16131.95758
+  dps: 36275.36518
+  tps: 18636.38878
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 27998.18626
-  tps: 14286.64989
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 28005.02987
-  tps: 14288.62196
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 28005.02987
-  tps: 14288.78738
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 27998.20821
-  tps: 14286.67184
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 28894.69147
-  tps: 14798.36295
+  dps: 36292.51
+  tps: 18745.96661
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 27998.20821
-  tps: 14286.67184
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 28216.65885
-  tps: 14440.0478
+  dps: 35496.9307
+  tps: 18485.63669
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 28385.96814
-  tps: 14610.23398
+  dps: 35560.09348
+  tps: 18582.0721
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 28419.08428
-  tps: 14500.81466
+  dps: 35599.59016
+  tps: 18478.9874
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 27998.20821
-  tps: 14286.91478
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 28555.08117
-  tps: 14493.34747
+  dps: 35827.71145
+  tps: 18486.96019
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 27998.20821
-  tps: 14286.91478
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 27998.1643
-  tps: 14286.62794
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 28917.59912
-  tps: 14745.85281
+  dps: 36087.22252
+  tps: 18706.92908
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 27998.1643
-  tps: 14286.62794
+  dps: 35169.39502
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 28891.57541
-  tps: 14764.14369
+  dps: 36008.27932
+  tps: 18708.22787
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 29201.69866
-  tps: 15115.75715
+  dps: 36547.18811
+  tps: 18971.7992
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 28415.84055
-  tps: 14441.47398
+  dps: 35663.13234
+  tps: 18423.96689
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 28193.33939
-  tps: 14288.21375
+  dps: 35535.49922
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 28193.33939
-  tps: 14288.21375
+  dps: 35535.49922
+  tps: 18234.98699
  }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
  value: {
-  dps: 30808.76254
-  tps: 15666.54652
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 46952.46091
-  tps: 45796.1027
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29681.20715
-  tps: 14782.12516
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 45861.97138
-  tps: 21376.81159
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30453.54539
-  tps: 32783.81095
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20840.77325
-  tps: 10158.95381
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28745.50742
-  tps: 12247.98307
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 45370.32382
-  tps: 41487.28493
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29825.77428
-  tps: 15484.52529
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 46714.18431
-  tps: 23108.09895
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30422.78589
-  tps: 30077.2442
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21061.83859
-  tps: 10746.20485
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28528.82462
-  tps: 12672.86901
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 47310.57163
-  tps: 45990.01629
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30008.92031
-  tps: 15142.92633
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 46488.02444
-  tps: 22040.34795
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30666.84695
-  tps: 32949.56994
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21137.5074
-  tps: 10409.96063
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28962.60251
-  tps: 12565.44273
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 44373.64132
-  tps: 39962.69936
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29268.31891
-  tps: 14880.40752
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 45828.14577
-  tps: 21896.6616
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30048.73771
-  tps: 29454.51415
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20397.63519
-  tps: 10191.37532
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Goblin-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 27704.65807
-  tps: 12021.43047
+  dps: 38322.6298
+  tps: 19750.90932
  }
 }
 dps_results: {
@@ -1809,174 +1641,6 @@ dps_results: {
   tps: 14806.10368
  }
 }
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 46677.53562
-  tps: 45089.97415
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29522.89596
-  tps: 14599.12933
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 45383.64414
-  tps: 20967.49465
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30350.23151
-  tps: 32559.58782
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20858.61071
-  tps: 10132.07118
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28628.37133
-  tps: 12218.35828
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 44708.86083
-  tps: 40586.22921
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29718.63015
-  tps: 15324.5246
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 46152.69081
-  tps: 22837.95269
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30116.44017
-  tps: 29830.60056
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20856.84237
-  tps: 10619.94089
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28164.56684
-  tps: 12406.57833
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 46839.36582
-  tps: 45077.33308
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29905.84665
-  tps: 14972.71303
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 45893.48036
-  tps: 21565.97068
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30541.4134
-  tps: 32668.79263
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21064.59301
-  tps: 10335.75427
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28724.83694
-  tps: 12490.42561
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 43944.48468
-  tps: 39896.65071
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28887.25728
-  tps: 14686.92435
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 45034.74307
-  tps: 21287.38474
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 29929.2302
-  tps: 29549.98585
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20291.36264
-  tps: 10124.89952
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Human-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 27321.51881
-  tps: 11646.16577
- }
-}
 dps_results: {
  key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -2145,174 +1809,6 @@ dps_results: {
   tps: 14632.58938
  }
 }
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 47793.59499
-  tps: 45427.85934
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30337.08833
-  tps: 14722.40099
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47136.12669
-  tps: 21305.94637
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31179.17879
-  tps: 32839.38652
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21487.89562
-  tps: 10197.51507
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 29892.79258
-  tps: 12418.36285
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 45999.54595
-  tps: 41163.35567
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30606.44039
-  tps: 15487.01038
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47912.15385
-  tps: 23196.82412
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31074.14736
-  tps: 30233.51038
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21517.57229
-  tps: 10721.1451
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 29437.10226
-  tps: 12608.19752
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 47989.51173
-  tps: 45515.73388
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30751.11199
-  tps: 15104.70273
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47641.34317
-  tps: 21913.93868
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31322.48274
-  tps: 32885.14562
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21706.57654
-  tps: 10430.55157
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 30001.6432
-  tps: 12702.39745
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 45118.48239
-  tps: 40441.87135
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29706.12259
-  tps: 14825.16253
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 46614.51679
-  tps: 21625.75687
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30907.38975
-  tps: 29952.32152
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20950.84893
-  tps: 10239.1775
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Orc-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 28606.17645
-  tps: 11868.44567
- }
-}
 dps_results: {
  key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -2481,174 +1977,6 @@ dps_results: {
   tps: 14861.43877
  }
 }
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 48490.95072
-  tps: 46976.66518
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30049.74994
-  tps: 15016.02745
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47196.12648
-  tps: 22211.8579
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31670.25387
-  tps: 34030.8309
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21143.81875
-  tps: 10297.68295
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 29909.76512
-  tps: 13063.7934
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 46697.22505
-  tps: 42522.08251
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29999.9625
-  tps: 15719.83734
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 48351.92796
-  tps: 24221.75857
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31477.09528
-  tps: 30968.65388
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21295.26016
-  tps: 10881.48509
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 29957.74533
-  tps: 13680.47754
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 49076.46833
-  tps: 47590.42457
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30489.64538
-  tps: 15432.24166
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 48112.99787
-  tps: 23239.44386
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 32069.63873
-  tps: 34313.35554
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 21373.71028
-  tps: 10561.07162
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 30132.32872
-  tps: 13493.85174
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 45977.19727
-  tps: 41778.38883
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29580.55942
-  tps: 15083.72492
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47173.52991
-  tps: 22646.28893
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31242.2186
-  tps: 30724.48941
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 20748.63683
-  tps: 10449.94267
- }
-}
-dps_results: {
- key: "TestDemonology-Settings-Troll-p1-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 29130.2117
-  tps: 13113.27906
- }
-}
 dps_results: {
  key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget"
  value: {
@@ -2820,7 +2148,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 30457.32576
-  tps: 15487.01038
+  dps: 37799.89585
+  tps: 19413.78082
  }
 }
diff --git a/sim/warlock/demonology/demonology_test.go b/sim/warlock/demonology/demonology_test.go
index 34ff1170de..e25ad34d6e 100644
--- a/sim/warlock/demonology/demonology_test.go
+++ b/sim/warlock/demonology/demonology_test.go
@@ -461,12 +461,9 @@ func TestDemonology(t *testing.T) {
 		Class:      proto.Class_ClassWarlock,
 		Race:       proto.Race_RaceOrc,
 		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:    core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p1"),
-		OtherGearSets: []core.GearSetCombo{
-			core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p3"),
-		},
-		Talents: demonologyTalentsShadowBolt,
-		Glyphs:  demonologyGlyphsShadowBolt,
+		GearSet:    core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p3"),
+		Talents:    demonologyTalentsShadowBolt,
+		Glyphs:     demonologyGlyphsShadowBolt,
 		OtherTalentSets: []core.TalentsCombo{
 			{
 				Label:   "Incinerate",
diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results
index fb460eaf9b..d1c23b2bd6 100644
--- a/sim/warlock/destruction/TestDestruction.results
+++ b/sim/warlock/destruction/TestDestruction.results
@@ -3,19 +3,19 @@ character_stats_results: {
  value: {
   final_stats: 666.75
   final_stats: 668.85
-  final_stats: 7057.05
-  final_stats: 5554.395
+  final_stats: 8311.8
+  final_stats: 7071.435
   final_stats: 183
-  final_stats: 1749
-  final_stats: 853
-  final_stats: 2259
+  final_stats: 1744
+  final_stats: 1009
+  final_stats: 2605
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 1047
+  final_stats: 1054
   final_stats: 788.1
   final_stats: 0
-  final_stats: 9228.3345
+  final_stats: 11533.9785
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -23,2123 +23,1619 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 8479
+  final_stats: 9372
   final_stats: 0
-  final_stats: 136722.7
-  final_stats: 105714.925
+  final_stats: 154289.2
+  final_stats: 128470.525
   final_stats: 1353.65
-  final_stats: 14.5618
-  final_stats: 17.07245
-  final_stats: 12.37992
-  final_stats: 19.78951
+  final_stats: 14.52017
+  final_stats: 17.02365
+  final_stats: 13.25007
+  final_stats: 22.93522
   final_stats: 5
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 29562.3471
-  tps: 19164.16522
+  dps: 37227.16767
+  tps: 23784.87689
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 28040.50983
-  tps: 18199.78126
+  dps: 35751.24505
+  tps: 22825.03897
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 27891.66909
-  tps: 18150.2133
+  dps: 35605.9104
+  tps: 22749.06455
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 28406.11787
-  tps: 18424.38842
+  dps: 35848.92258
+  tps: 22874.64291
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 28465.03748
-  tps: 18465.60159
+  dps: 35921.86896
+  tps: 22926.94027
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 29273.22254
-  tps: 18949.17072
+  dps: 36838.27116
+  tps: 23498.3806
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Balespider'sBurningVestments"
  value: {
-  dps: 29596.80158
-  tps: 18815.88858
+  dps: 34333.28691
+  tps: 21951.03685
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 27469.01244
-  tps: 17858.04624
-  hps: 98.04972
+  dps: 35204.55799
+  tps: 22461.8239
+  hps: 99.98853
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 28991.19715
-  tps: 18764.92599
+  dps: 36729.14841
+  tps: 23394.35474
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-BellofEnragingResonance-65053"
+ value: {
+  dps: 36974.09908
+  tps: 23546.1074
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BindingPromise-67037"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 27710.75985
-  tps: 18025.50869
+  dps: 35383.60127
+  tps: 22611.5977
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 27751.03997
-  tps: 18042.94185
+  dps: 35508.86833
+  tps: 22697.9614
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 27788.20487
-  tps: 18069.2129
+  dps: 35554.52739
+  tps: 22729.3921
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 27454.76773
-  tps: 17845.56491
+  dps: 35046.59985
+  tps: 22354.60151
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 28374.84419
-  tps: 18375.94917
+  dps: 36047.68821
+  tps: 22913.36882
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 27453.083
-  tps: 17845.06008
+  dps: 35046.3841
+  tps: 22353.69483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 27851.4434
-  tps: 18074.03011
+  dps: 35524.05242
+  tps: 22673.13366
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 27474.41695
-  tps: 17851.22495
+  dps: 35165.98017
+  tps: 22458.94366
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 27467.23524
-  tps: 17843.24549
+  dps: 35160.19912
+  tps: 22458.40465
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 28336.80709
-  tps: 18377.00207
+  dps: 36086.55988
+  tps: 23020.01347
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BottledLightning-66879"
  value: {
-  dps: 28176.88562
-  tps: 18291.79367
+  dps: 35801.76804
+  tps: 22843.46051
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 29421.89599
-  tps: 18685.84455
+  dps: 37076.69648
+  tps: 23201.22593
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 29712.14893
-  tps: 19267.59174
+  dps: 37471.1179
+  tps: 23948.5721
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 29633.63554
-  tps: 19219.08473
+  dps: 37339.57504
+  tps: 23878.18486
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 27852.55435
-  tps: 18074.01648
+  dps: 35527.2651
+  tps: 22673.33217
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 28470.26591
-  tps: 18467.57867
+  dps: 36120.04805
+  tps: 23050.39807
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CrushingWeight-59506"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CrushingWeight-65118"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 27467.23524
-  tps: 17843.25659
+  dps: 35160.19912
+  tps: 22458.4102
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 28512.87338
-  tps: 18498.65985
+  dps: 36174.4002
+  tps: 23073.00432
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 27716.45035
-  tps: 17995.65017
+  dps: 35350.43577
+  tps: 22590.06717
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 29341.49615
-  tps: 19001.64795
+  dps: 36945.05749
+  tps: 23586.55177
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 28236.66065
-  tps: 18351.41643
+  dps: 35824.65271
+  tps: 22783.46774
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 27969.07997
-  tps: 18160.38483
+  dps: 35667.72512
+  tps: 22747.27434
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 29273.22254
-  tps: 18949.17072
+  dps: 36838.27116
+  tps: 23498.3806
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 27912.08712
-  tps: 18111.02469
+  dps: 35573.92891
+  tps: 22683.27346
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 29425.951
-  tps: 19070.86828
+  dps: 37053.31796
+  tps: 23662.60187
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 29341.49615
-  tps: 19001.64795
+  dps: 36945.05749
+  tps: 23586.55177
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 27891.66909
-  tps: 18150.2133
+  dps: 35605.9104
+  tps: 22749.06455
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 29273.22254
-  tps: 18949.17072
+  dps: 36838.27116
+  tps: 23498.3806
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FallofMortality-59500"
  value: {
-  dps: 28512.87338
-  tps: 18498.65985
+  dps: 36174.4002
+  tps: 23073.00432
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FallofMortality-65124"
  value: {
-  dps: 28658.48177
-  tps: 18589.0203
+  dps: 36310.35673
+  tps: 23160.50207
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 28623.71131
-  tps: 18546.36663
+  dps: 36316.9493
+  tps: 23148.69585
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 27753.24749
-  tps: 18042.08964
+  dps: 35046.3841
+  tps: 22353.69483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 28368.61966
-  tps: 18408.73353
+  dps: 36047.87082
+  tps: 23012.17499
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 27462.24874
-  tps: 17849.0841
+  dps: 35139.26715
+  tps: 22444.3041
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 29237.87836
-  tps: 18909.48805
+  dps: 36988.53892
+  tps: 23537.8358
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 27774.17196
-  tps: 18072.04252
+  dps: 35439.26361
+  tps: 22623.58486
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 29337.25687
-  tps: 18994.52806
+  dps: 36915.78356
+  tps: 23551.80104
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FluidDeath-58181"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 29421.89599
-  tps: 19051.48904
+  dps: 37076.69648
+  tps: 23657.61108
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 27888.10846
-  tps: 18102.86154
+  dps: 35546.94747
+  tps: 22689.56302
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GaleofShadows-56138"
  value: {
-  dps: 28491.54082
-  tps: 18508.075
+  dps: 36196.07415
+  tps: 23132.55561
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GaleofShadows-56462"
  value: {
-  dps: 28663.13201
-  tps: 18639.60312
+  dps: 36296.56445
+  tps: 23185.8151
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GearDetector-61462"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 24176.01507
-  tps: 15695.29768
+  dps: 28123.49529
+  tps: 18282.18876
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 28060.86216
-  tps: 18214.41497
+  dps: 35774.99845
+  tps: 22835.01541
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HarmlightToken-63839"
  value: {
-  dps: 28381.24589
-  tps: 18500.55159
+  dps: 36053.80008
+  tps: 23064.08405
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 28750.59642
-  tps: 18723.98048
+  dps: 36705.14701
+  tps: 23484.52166
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 28909.91827
-  tps: 18828.99065
+  dps: 36830.07228
+  tps: 23610.11008
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofRage-59224"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofRage-65072"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofSolace-55868"
  value: {
-  dps: 27785.43849
-  tps: 18060.07207
+  dps: 35444.78491
+  tps: 22661.90463
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofSolace-56393"
  value: {
-  dps: 27861.55728
-  tps: 18129.77444
+  dps: 35445.28372
+  tps: 22652.68748
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofThunder-55845"
  value: {
-  dps: 27457.47868
-  tps: 17839.18051
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartofThunder-56370"
  value: {
-  dps: 27457.47868
-  tps: 17839.29391
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 29341.49615
-  tps: 19001.64795
+  dps: 36945.05749
+  tps: 23586.55177
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 27814.73057
-  tps: 18100.71399
+  dps: 35488.89049
+  tps: 22657.67624
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 27814.73057
-  tps: 18100.71399
+  dps: 35488.89049
+  tps: 22657.67624
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 27751.03997
-  tps: 18042.94185
+  dps: 35508.86833
+  tps: 22697.9614
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 27788.20487
-  tps: 18069.2129
+  dps: 35554.52739
+  tps: 22729.3921
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 27457.47868
-  tps: 17839.14654
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 28221.59285
-  tps: 18312.42863
+  dps: 35934.69067
+  tps: 22908.97269
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 27510.92037
-  tps: 17899.85965
+  dps: 35136.48536
+  tps: 22447.02075
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 27490.48923
-  tps: 17870.58467
+  dps: 35152.84831
+  tps: 22469.6681
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 28689.92933
-  tps: 18610.0703
+  dps: 36343.7903
+  tps: 23192.55065
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 28837.91317
-  tps: 18711.69529
+  dps: 36519.80253
+  tps: 23305.03078
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 27710.75985
-  tps: 18025.50869
+  dps: 35383.60127
+  tps: 22611.5977
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KeytotheEndlessChamber-56328"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 27709.17585
-  tps: 18070.04639
+  dps: 35189.46766
+  tps: 22400.46175
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 27709.17585
-  tps: 18070.04639
+  dps: 35189.46766
+  tps: 22400.46175
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 27591.47238
-  tps: 17931.22135
+  dps: 35387.23461
+  tps: 22585.02031
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeadenDespair-55816"
  value: {
-  dps: 27462.24874
-  tps: 17848.64839
+  dps: 35139.26715
+  tps: 22444.05185
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeadenDespair-56347"
  value: {
-  dps: 27462.24874
-  tps: 17849.0841
+  dps: 35139.26715
+  tps: 22444.3041
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 27464.0318
-  tps: 17851.1122
+  dps: 35081.26832
+  tps: 22403.55766
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 27464.0318
-  tps: 17851.1122
+  dps: 35081.26832
+  tps: 22403.55766
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 27474.41695
-  tps: 17850.3019
+  dps: 35165.98017
+  tps: 22458.70925
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 27474.41695
-  tps: 17850.3019
+  dps: 35165.98017
+  tps: 22458.70925
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 27784.48281
-  tps: 18074.7978
+  dps: 35474.53809
+  tps: 22660.68265
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 27826.44663
-  tps: 18104.08996
+  dps: 35526.03771
+  tps: 22694.35378
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 27742.26978
-  tps: 18020.44174
+  dps: 35081.26832
+  tps: 22403.55766
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 27742.26978
-  tps: 18020.44174
+  dps: 35081.26832
+  tps: 22403.55766
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 27828.74841
-  tps: 18097.87222
+  dps: 35604.33728
+  tps: 22763.68012
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 27828.74841
-  tps: 18097.87222
+  dps: 35604.33728
+  tps: 22763.68012
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 28892.43016
-  tps: 18707.69338
+  dps: 36631.57874
+  tps: 23348.49626
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 29074.99026
-  tps: 18880.15348
+  dps: 36849.74274
+  tps: 23535.08083
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 27462.24874
-  tps: 17849.43182
+  dps: 35139.26715
+  tps: 22444.50541
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 29159.77591
-  tps: 18940.83015
+  dps: 36919.97402
+  tps: 23582.01692
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 29377.46222
-  tps: 19078.82967
+  dps: 37170.85742
+  tps: 23753.48773
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 27744.29024
-  tps: 18018.99868
+  dps: 35367.74244
+  tps: 22545.91656
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 28469.98909
-  tps: 18484.74513
+  dps: 36111.98161
+  tps: 23024.72474
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 28399.46972
-  tps: 18412.56771
+  dps: 36082.47187
+  tps: 23041.48968
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 29273.22254
-  tps: 18949.17072
+  dps: 36838.27116
+  tps: 23498.3806
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Rainsong-55854"
  value: {
-  dps: 27467.4307
-  tps: 17842.47731
+  dps: 35165.98017
+  tps: 22458.7341
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Rainsong-56377"
  value: {
-  dps: 27474.41695
-  tps: 17850.30938
+  dps: 35165.98017
+  tps: 22458.71769
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 29562.3471
-  tps: 19164.16522
+  dps: 37227.16767
+  tps: 23784.87689
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 29562.3471
-  tps: 19164.15629
+  dps: 37227.16767
+  tps: 23784.8626
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 27999.49491
-  tps: 18152.07938
+  dps: 35661.36494
+  tps: 22717.37684
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 27759.60193
-  tps: 18030.17271
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RuneofZeth-68998"
  value: {
-  dps: 29042.1266
-  tps: 18796.35018
+  dps: 36883.9316
+  tps: 23497.47556
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ScalesofLife-68915"
  value: {
-  dps: 27481.15215
-  tps: 17883.83388
-  hps: 351.03642
+  dps: 35189.28808
+  tps: 22451.5131
+  hps: 357.04731
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ScalesofLife-69109"
  value: {
-  dps: 27474.50107
-  tps: 17875.52997
-  hps: 395.9658
+  dps: 35189.28808
+  tps: 22451.67848
+  hps: 402.74602
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SeaStar-55256"
  value: {
-  dps: 27916.9957
-  tps: 18112.20111
+  dps: 35560.66161
+  tps: 22651.44381
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SeaStar-56290"
  value: {
-  dps: 28315.49255
-  tps: 18338.75231
+  dps: 35995.35626
+  tps: 22894.55165
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ShadowflameRegalia"
  value: {
-  dps: 26746.812
-  tps: 17439.25357
+  dps: 31021.52776
+  tps: 20184.20732
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ShardofWoe-60233"
  value: {
-  dps: 28039.75038
-  tps: 18221.57876
+  dps: 35948.85634
+  tps: 22935.73617
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 27468.22696
-  tps: 17846.15525
+  dps: 35139.26715
+  tps: 22443.89419
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 27835.95613
-  tps: 18112.45565
+  dps: 35511.31637
+  tps: 22661.32734
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 27886.09428
-  tps: 18147.47173
+  dps: 35572.20036
+  tps: 22701.61255
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sorrowsong-55879"
  value: {
-  dps: 28383.54202
-  tps: 18442.20642
+  dps: 36154.60091
+  tps: 23097.88459
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sorrowsong-56400"
  value: {
-  dps: 28504.54853
-  tps: 18521.49061
+  dps: 36285.90024
+  tps: 23182.46584
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 27742.26978
-  tps: 18020.44174
+  dps: 35081.26832
+  tps: 22403.55766
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SoulCasket-58183"
  value: {
-  dps: 28997.75839
-  tps: 18783.8734
+  dps: 36774.30392
+  tps: 23377.79834
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 27898.57338
-  tps: 18147.22995
+  dps: 35690.12097
+  tps: 22822.73173
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 27954.88384
-  tps: 18187.03457
+  dps: 35759.30137
+  tps: 22870.35399
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StayofExecution-68996"
  value: {
-  dps: 27453.083
-  tps: 17845.06008
+  dps: 35046.3841
+  tps: 22353.69483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 28469.3055
-  tps: 18471.3997
+  dps: 36148.16776
+  tps: 23075.56984
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StumpofTime-62465"
  value: {
-  dps: 28804.92422
-  tps: 18682.00651
+  dps: 36253.31235
+  tps: 23121.33141
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-StumpofTime-62470"
  value: {
-  dps: 28840.9601
-  tps: 18681.12198
+  dps: 36298.12816
+  tps: 23125.7527
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 27462.24874
-  tps: 17849.31452
+  dps: 35139.26715
+  tps: 22444.4375
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 27462.99781
-  tps: 17850.8639
+  dps: 35139.26715
+  tps: 22444.58788
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 28495.50134
-  tps: 18498.0791
+  dps: 36242.40397
+  tps: 23145.62105
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TearofBlood-55819"
  value: {
-  dps: 28179.76723
-  tps: 18288.89639
+  dps: 35901.78343
+  tps: 22927.42989
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TearofBlood-56351"
  value: {
-  dps: 28408.77594
-  tps: 18435.30372
+  dps: 36059.04467
+  tps: 22994.72014
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 28324.29408
-  tps: 18392.9348
+  dps: 36128.40318
+  tps: 23065.32505
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 28644.91801
-  tps: 18588.6448
+  dps: 36450.81964
+  tps: 23263.80158
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TheHungerer-68927"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TheHungerer-69112"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 29018.56297
-  tps: 18862.77965
+  dps: 36766.45094
+  tps: 23476.10956
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 29219.1108
-  tps: 18982.62994
+  dps: 36988.4058
+  tps: 23622.86159
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 27751.03997
-  tps: 18042.94185
+  dps: 35508.86833
+  tps: 22697.9614
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 27788.20487
-  tps: 18069.2129
+  dps: 35554.52739
+  tps: 22729.3921
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 27609.20792
-  tps: 17931.35659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 28309.04029
-  tps: 18429.28434
+  dps: 36029.73562
+  tps: 23006.41748
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnheededWarning-59520"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 27453.083
-  tps: 17845.0172
+  dps: 35056.81098
+  tps: 22369.64319
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 27814.73057
-  tps: 18100.71399
+  dps: 35488.89049
+  tps: 22657.67624
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 27814.73057
-  tps: 18100.71399
+  dps: 35488.89049
+  tps: 22657.67624
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-UnsolvableRiddle-68709"
  value: {
-  dps: 27814.73057
-  tps: 18100.71399
+  dps: 35488.89049
+  tps: 22657.67624
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 29624.49957
-  tps: 19535.71982
- }
-}
-dps_results: {
- key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-69110"
- value: {
-  dps: 29953.1639
-  tps: 19820.17792
+  dps: 36429.58373
+  tps: 23209.8915
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 27462.24874
-  tps: 17849.31452
+  dps: 35139.26715
+  tps: 22444.4375
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 27462.99781
-  tps: 17850.8639
+  dps: 35139.26715
+  tps: 22444.58788
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 27453.083
-  tps: 17845.06008
+  dps: 35046.3841
+  tps: 22353.69483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 28426.39004
-  tps: 18405.63704
+  dps: 36103.68219
+  tps: 22944.66638
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 27453.083
-  tps: 17845.06008
+  dps: 35046.3841
+  tps: 22353.69483
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 27759.60193
-  tps: 18031.14447
+  dps: 35160.19912
+  tps: 22458.43108
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 27887.35162
-  tps: 18140.5438
+  dps: 35539.30595
+  tps: 22680.08942
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 27907.59675
-  tps: 18118.29238
+  dps: 35576.89404
+  tps: 22705.83569
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 27467.23524
-  tps: 17843.29835
+  dps: 35160.19912
+  tps: 22458.43108
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 27850.14638
-  tps: 18113.96974
+  dps: 35630.62583
+  tps: 22782.26246
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 27467.23524
-  tps: 17843.29835
+  dps: 35160.19912
+  tps: 22458.43108
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 28320.49223
-  tps: 18358.12355
+  dps: 36077.43339
+  tps: 23000.72749
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 27467.23524
-  tps: 17842.32659
+  dps: 35160.19912
+  tps: 22457.9452
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 28441.60715
-  tps: 18532.59243
+  dps: 36318.15686
+  tps: 23207.57367
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 28767.39763
-  tps: 18715.3095
+  dps: 36637.73106
+  tps: 23442.2022
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 27699.81452
-  tps: 18019.47816
+  dps: 35348.28098
+  tps: 22561.08401
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 27740.07908
-  tps: 18043.83511
+  dps: 35402.38575
+  tps: 22613.01311
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 27740.07908
-  tps: 18043.83511
+  dps: 35402.38575
+  tps: 22613.01311
  }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
  value: {
-  dps: 30048.19042
-  tps: 19604.41398
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31002.32745
-  tps: 35823.34937
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29297.6037
-  tps: 19217.61055
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 39934.35911
-  tps: 24301.83466
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18923.61287
-  tps: 25940.27138
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18923.61287
-  tps: 12444.71147
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22009.368
-  tps: 13011.59967
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30661.66773
-  tps: 35076.27127
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28955.33614
-  tps: 18656.544
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 39722.49767
-  tps: 23758.8092
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18534.93802
-  tps: 26002.86159
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18534.93802
-  tps: 11947.96835
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21971.14275
-  tps: 12596.38075
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 38825.43896
-  tps: 43811.01561
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 36972.29886
-  tps: 24388.55295
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47305.94792
-  tps: 29013.33618
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 24268.64788
-  tps: 30045.1002
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 24268.64788
-  tps: 15873.27851
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 27024.10697
-  tps: 16375.40229
+  dps: 37826.0349
+  tps: 24266.98313
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 38906.61121
   tps: 41696.1233
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 36965.63125
   tps: 23904.62495
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 47213.43282
   tps: 28618.47819
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 24194.62937
   tps: 29956.69904
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 24194.62937
   tps: 15567.26683
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 27312.8549
   tps: 16128.63053
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30896.36022
-  tps: 35531.09808
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29176.25636
-  tps: 19120.82744
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 39611.81694
-  tps: 24023.9582
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18709.78867
-  tps: 25620.05795
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18709.78867
-  tps: 12312.20612
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21674.25952
-  tps: 12826.73653
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30451.38586
-  tps: 34745.79773
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28705.51716
-  tps: 18461.16283
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 39411.68242
-  tps: 23545.93571
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18455.90684
-  tps: 25830.41308
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18455.90684
-  tps: 11839.36305
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 21785.61696
-  tps: 12311.85886
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 38641.3084
-  tps: 43551.66576
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 36806.9086
-  tps: 24185.20952
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 47317.07704
-  tps: 29114.71577
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 24097.04752
-  tps: 29745.74324
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 24097.04752
-  tps: 15810.88064
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 26731.37002
-  tps: 16074.55993
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 38697.85247
   tps: 41441.14129
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 36828.89299
   tps: 23795.20702
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 47191.29275
   tps: 28554.52167
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 23816.18364
   tps: 29334.93587
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 23816.18364
   tps: 15271.6767
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Human-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 26777.97606
   tps: 15612.96937
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31437.75888
-  tps: 35678.78391
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29712.14893
-  tps: 19267.59174
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 40716.35432
-  tps: 24327.99901
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 19064.25829
-  tps: 25680.23359
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 19064.25829
-  tps: 12389.62827
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22386.24851
-  tps: 12991.33026
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31018.26296
-  tps: 34940.75178
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29236.23792
-  tps: 18621.33869
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 40530.9544
-  tps: 23863.52056
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18827.42394
-  tps: 25928.80065
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18827.42394
-  tps: 11948.22261
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22499.32981
-  tps: 12469.9502
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 39273.17022
-  tps: 43706.45776
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 37438.72798
-  tps: 24344.71254
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 48560.31399
-  tps: 29437.25489
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 24530.76378
-  tps: 29839.14421
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 24530.76378
-  tps: 15910.80345
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 27505.53285
-  tps: 16238.26843
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 39345.08301
   tps: 41581.35051
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 37471.1179
   tps: 23948.5721
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 48442.0541
   tps: 28874.3529
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 24295.34805
   tps: 29490.26596
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 24295.34805
   tps: 15413.65719
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 27553.80535
   tps: 15776.4083
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 31203.92358
-  tps: 35981.89031
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29417.75284
-  tps: 19320.99354
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 40678.88976
-  tps: 24696.9935
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 19139.80707
-  tps: 26194.14192
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 19139.80707
-  tps: 12707.14513
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22838.95964
-  tps: 13659.65137
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30856.43838
-  tps: 35143.58071
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29153.29315
-  tps: 18828.21342
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 40554.23144
-  tps: 24378.99723
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18807.36487
-  tps: 26334.02891
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18807.36487
-  tps: 12155.3025
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 22920.09158
-  tps: 13252.39047
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 38928.16464
-  tps: 44004.2056
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 37061.67669
-  tps: 24409.27646
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 48359.64291
-  tps: 29886.78774
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 24423.28408
-  tps: 30174.26393
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 24423.28408
-  tps: 15993.65257
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p1-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 27948.27782
-  tps: 16917.89429
- }
-}
-dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 39050.55105
   tps: 41686.0048
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 37257.22442
   tps: 24125.37667
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-FullBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 48398.90128
   tps: 29388.62699
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongMultiTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget"
  value: {
   dps: 24263.41712
   tps: 30124.10859
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-LongSingleTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget"
  value: {
   dps: 24263.41712
   tps: 15620.07003
  }
 }
 dps_results: {
- key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-p3-NoBuffs-25.0yards-ShortSingleTarget"
+ key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget"
  value: {
   dps: 28177.92885
   tps: 16698.77121
@@ -2148,7 +1644,7 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 29705.25976
-  tps: 19267.59174
+  dps: 37461.35439
+  tps: 23948.5721
  }
 }
diff --git a/sim/warlock/destruction/destruction_test.go b/sim/warlock/destruction/destruction_test.go
index 9d4b885bef..8c3629d0a6 100644
--- a/sim/warlock/destruction/destruction_test.go
+++ b/sim/warlock/destruction/destruction_test.go
@@ -355,22 +355,16 @@ func TestDestruction(t *testing.T) {
 	}
 
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{
-		Class:      proto.Class_ClassWarlock,
-		Race:       proto.Race_RaceOrc,
-		OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
-		GearSet:    core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p1"),
-		OtherGearSets: []core.GearSetCombo{
-			core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p3"),
-		},
+		Class:            proto.Class_ClassWarlock,
+		Race:             proto.Race_RaceOrc,
+		OtherRaces:       []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman},
+		GearSet:          core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p3"),
 		Talents:          destructionTalents,
 		Glyphs:           destructionGlyphs,
 		Consumes:         fullConsumes,
 		SpecOptions:      core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: defaultDestructionWarlock},
 		OtherSpecOptions: []core.SpecOptionsCombo{},
-		Rotation:         core.GetAplRotation("../../../ui/warlock/destruction/apls", "p1"),
-		OtherRotations: []core.RotationCombo{
-			core.GetAplRotation("../../../ui/warlock/destruction/apls", "p3"),
-		},
+		Rotation:         core.GetAplRotation("../../../ui/warlock/destruction/apls", "default"),
 		ItemFilter:       itemFilter,
 		StartingDistance: 25,
 	}))
diff --git a/ui/warlock/affliction/presets.ts b/ui/warlock/affliction/presets.ts
index 3a0f7420b5..76a45d5085 100644
--- a/ui/warlock/affliction/presets.ts
+++ b/ui/warlock/affliction/presets.ts
@@ -50,7 +50,7 @@ export const AfflictionTalents = {
 			prime2: PrimeGlyph.GlyphOfUnstableAffliction,
 			prime3: PrimeGlyph.GlyphOfCorruption,
 			major1: MajorGlyph.GlyphOfShadowBolt,
-			major2: MajorGlyph.GlyphOfFelhunter,
+			major2: MajorGlyph.GlyphOfSoulLink,
 			major3: MajorGlyph.GlyphOfSoulSwap,
 			minor1: MinorGlyph.GlyphOfDrainSoul,
 			minor2: MinorGlyph.GlyphOfRitualOfSouls,
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
index ac59a66396..61f7468000 100644
--- a/ui/warlock/demonology/apls/incinerate.apl.json
+++ b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -1,409 +1,43 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{ "action": { "castSpell": { "spellId": { "spellId": 30146 } } }, "doAtValue": { "const": { "val": "-10s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 77801 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 68998 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 69000 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
+		{"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":29722}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":58183}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":56290}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":52353}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":68998}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":69000}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.7s"}}}
 	],
 	"priorityList": [
-		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"or": {
-									"vals": [
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-													{
-														"cmp": {
-															"op": "OpGe",
-															"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
-															"rhs": { "const": { "val": "5" } }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpEq",
-															"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
-															"rhs": { "const": { "val": "20" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92318 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91047 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 89091 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90898 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91002 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90992 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 91024 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91024 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													}
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
-													{
-														"or": {
-															"vals": [
-																{
-																	"and": {
-																		"vals": [
-																			{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
-																			{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
-																			{
-																				"cmp": {
-																					"op": "OpLe",
-																					"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
-																					"rhs": { "const": { "val": "1s" } }
-																				}
-																			}
-																		]
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpLe",
-																		"lhs": { "remainingTime": {} },
-																		"rhs": { "const": { "val": "120s" } }
-																	}
-																}
-															]
-														}
-													},
-													{
-														"or": {
-															"vals": [
-																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
-																		"rhs": { "const": { "val": "5" } }
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90985 } } },
-																		"rhs": { "const": { "val": "20" } }
-																	}
-																},
-																{ "auraIsActive": { "auraId": { "spellId": 91024 } } }
-															]
-														}
-													}
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
-															"rhs": { "const": { "val": "3s" } }
-														}
-													}
-												]
-											}
-										}
-									]
-								}
-							},
-							{ "spellCanCast": { "spellId": { "spellId": 18540 } } }
-						]
-					}
-				},
-				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
-			}
-		},
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 59672 } } }, "castSpell": { "spellId": { "itemId": 58091 } } } },
-		{
-			"action": {
-				"condition": { "and": {} },
-				"sequence": {
-					"name": "burst",
-					"actions": [
-						{ "castSpell": { "spellId": { "spellId": 77801 } } },
-						{ "castSpell": { "spellId": { "spellId": 74434 } } },
-						{ "castSpell": { "spellId": { "spellId": 691 } } },
-						{ "castSpell": { "spellId": { "spellId": 59672 } } },
-						{ "castSpell": { "spellId": { "spellId": 603 } } },
-						{ "castSpell": { "spellId": { "spellId": 348 } } },
-						{ "castSpell": { "spellId": { "spellId": 172 } } }
-					]
-				}
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "sequenceIsComplete": { "sequenceName": "burst" } },
-							{ "spellCanCast": { "spellId": { "spellId": 77801 } } },
-							{ "spellCanCast": { "spellId": { "spellId": 59672 } } }
-						]
-					}
-				},
-				"resetSequence": { "sequenceName": "burst" }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "spellIsReady": { "spellId": { "spellId": 59672 } } },
-							{
-								"cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "20" } } }
-							},
-							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "60" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 59672 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "spellIsReady": { "spellId": { "spellId": 77801 } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "remainingTime": {} } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77801 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpLe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "67000" } } } },
-							{ "cmp": { "op": "OpLe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "10s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 1454 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpGe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "121s" } } } },
-							{ "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 33697 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } },
-									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
-								}
-							},
-							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } },
-							{
-								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 77801 } } }, "rhs": { "const": { "val": "10" } } }
-							},
-							{
-								"cmp": { "op": "OpLe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 59672 } } }, "rhs": { "const": { "val": "10" } } }
-							},
-							{ "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 30146 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-						"rhs": {
-							"math": {
-								"op": "OpAdd",
-								"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
-								"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
-							}
-						}
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 348 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 172 } }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpLt",
-									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpGt",
-									"lhs": { "remainingTime": {} },
-									"rhs": {
-										"math": {
-											"op": "OpMul",
-											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
-											"rhs": { "const": { "val": "2" } }
-										}
-									}
-								}
-							}
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 71165 } } }, { "auraIsActive": { "auraId": { "spellId": 71165 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 63167 } } }, { "auraIsActive": { "auraId": { "spellId": 63167 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+		{"action":{"autocastOtherCooldowns":{}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}},
+		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":90953}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92318}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91047}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":89091}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90898}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91002}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90992}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91024}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91024}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":90985}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":91024}}}]}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"3s"}}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":18540}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}},
+		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59672}}},"castSpell":{"spellId":{"itemId":58091}}}},
+		{"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}},
+		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":59672}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":77801}}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"60"}}}}]}},"castSpell":{"spellId":{"spellId":59672}}}},
+		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":77801}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":59672}}},"rhs":{"remainingTime":{}}}}]}},"castSpell":{"spellId":{"spellId":77801}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":77801}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":59672}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"30"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
+		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}},
+		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":50589}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":71165}}},{"auraIsActive":{"auraId":{"spellId":71165}}}]}},"castSpell":{"spellId":{"spellId":29722}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":63167}}},{"auraIsActive":{"auraId":{"spellId":63167}}}]}},"castSpell":{"spellId":{"spellId":6353}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":29722}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
 	]
 }
diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
index ff37d01e8c..17a7f25842 100644
--- a/ui/warlock/demonology/apls/shadow-bolt.apl.json
+++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -1,388 +1,42 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{ "action": { "castSpell": { "spellId": { "spellId": 30146 } } }, "doAtValue": { "const": { "val": "-10s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 77801 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 691 } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 59672 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 348 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 58183 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 56290 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 52353 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 68998 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 69000 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 82174 } } }, "doAtValue": { "const": { "val": "-0.7s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 33697 } } }, "doAtValue": { "const": { "val": "-0.7s" } } }
+		{"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":58183}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":56290}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":52353}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":68998}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"itemId":69000}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-0.7s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.7s"}}}
 	],
 	"priorityList": [
-		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"or": {
-									"vals": [
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-													{
-														"cmp": {
-															"op": "OpGe",
-															"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
-															"rhs": { "const": { "val": "5" } }
-														}
-													},
-													{
-														"cmp": {
-															"op": "OpEq",
-															"lhs": { "auraNumStacks": { "auraId": { "spellId": 90953 } } },
-															"rhs": { "const": { "val": "20" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92318 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91047 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 89091 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90898 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 91002 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 90992 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													},
-													{ "auraIsActive": { "auraId": { "spellId": 92320 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "spellId": 92320 } } },
-															"rhs": { "const": { "val": "1s" } }
-														}
-													}
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
-													{
-														"or": {
-															"vals": [
-																{
-																	"and": {
-																		"vals": [
-																			{ "auraIsActive": { "auraId": { "spellId": 75170 } } },
-																			{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
-																			{
-																				"cmp": {
-																					"op": "OpLe",
-																					"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
-																					"rhs": { "const": { "val": "1s" } }
-																				}
-																			}
-																		]
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpLe",
-																		"lhs": { "remainingTime": {} },
-																		"rhs": { "const": { "val": "120s" } }
-																	}
-																}
-															]
-														}
-													},
-													{
-														"or": {
-															"vals": [
-																{ "auraIsActive": { "auraId": { "spellId": 90898 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 92318 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91047 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 90992 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 91002 } } },
-																{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 92325 } } },
-																		"rhs": { "const": { "val": "5" } }
-																	}
-																},
-																{
-																	"cmp": {
-																		"op": "OpGe",
-																		"lhs": { "auraNumStacks": { "auraId": { "spellId": 90985 } } },
-																		"rhs": { "const": { "val": "20" } }
-																	}
-																},
-																{ "auraIsActive": { "auraId": { "spellId": 92320 } } }
-															]
-														}
-													}
-												]
-											}
-										},
-										{
-											"and": {
-												"vals": [
-													{ "auraIsActive": { "auraId": { "itemId": 58091 } } },
-													{
-														"cmp": {
-															"op": "OpLe",
-															"lhs": { "auraRemainingTime": { "auraId": { "itemId": 58091 } } },
-															"rhs": { "const": { "val": "3s" } }
-														}
-													}
-												]
-											}
-										}
-									]
-								}
-							},
-							{ "spellCanCast": { "spellId": { "spellId": 18540 } } }
-						]
-					}
-				},
-				"strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
-			}
-		},
-		{
-			"action": {
-				"condition": { "and": {} },
-				"sequence": {
-					"name": "burst",
-					"actions": [
-						{ "castSpell": { "spellId": { "spellId": 77801 } } },
-						{ "castSpell": { "spellId": { "spellId": 74434 } } },
-						{ "castSpell": { "spellId": { "spellId": 691 } } },
-						{ "castSpell": { "spellId": { "spellId": 59672 } } },
-						{ "castSpell": { "spellId": { "spellId": 603 } } },
-						{ "castSpell": { "spellId": { "spellId": 348 } } },
-						{ "castSpell": { "spellId": { "spellId": 172 } } }
-					]
-				}
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "sequenceIsComplete": { "sequenceName": "burst" } },
-							{ "spellCanCast": { "spellId": { "spellId": 77801 } } },
-							{ "spellCanCast": { "spellId": { "spellId": 59672 } } }
-						]
-					}
-				},
-				"resetSequence": { "sequenceName": "burst" }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsActive": { "auraId": { "spellId": 59672 } } }, { "auraIsKnown": { "auraId": { "spellId": 59672 } } }] }
-				},
-				"castSpell": { "spellId": { "itemId": 58091 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpLe", "lhs": { "currentMana": {} }, "rhs": { "const": { "val": "67000" } } } },
-							{ "cmp": { "op": "OpLe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "10s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 1454 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpGe", "lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } }, "rhs": { "const": { "val": "121s" } } } },
-							{ "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 33697 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpLe",
-									"lhs": { "sequenceTimeToReady": { "sequenceName": "burst" } },
-									"rhs": { "spellCastTime": { "spellId": { "spellId": 30146 } } }
-								}
-							},
-							{ "cmp": { "op": "OpLe", "lhs": { "spellCpm": { "spellId": { "spellId": 30146 } } }, "rhs": { "const": { "val": "1" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 30146 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-						"rhs": {
-							"math": {
-								"op": "OpAdd",
-								"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
-								"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
-							}
-						}
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 348 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 172 } }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 71521 } } }, "castSpell": { "spellId": { "spellId": 71521 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpLt",
-									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpGt",
-									"lhs": { "remainingTime": {} },
-									"rhs": {
-										"math": {
-											"op": "OpMul",
-											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
-											"rhs": { "const": { "val": "2" } }
-										}
-									}
-								}
-							}
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 50589 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 17941 } } }, { "auraIsActive": { "auraId": { "spellId": 17941 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 686 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 71165 } } }, { "auraIsActive": { "auraId": { "spellId": 71165 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 29722 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 63167 } } }, { "auraIsActive": { "auraId": { "spellId": 63167 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+		{"action":{"autocastOtherCooldowns":{}}},
+		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":90953}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92318}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91047}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":89091}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90898}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91002}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90992}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92320}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":90985}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"3s"}}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":18540}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}},
+		{"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":59672}}},{"auraIsKnown":{"auraId":{"spellId":59672}}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
+		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}},
+		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":50589}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17941}}},{"auraIsActive":{"auraId":{"spellId":17941}}}]}},"castSpell":{"spellId":{"spellId":686}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":71165}}},{"auraIsActive":{"auraId":{"spellId":71165}}}]}},"castSpell":{"spellId":{"spellId":29722}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":63167}}},{"auraIsActive":{"auraId":{"spellId":63167}}}]}},"castSpell":{"spellId":{"spellId":6353}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":686}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
 	]
 }
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
index bbbbc52dd4..f2a42b8bcc 100644
--- a/ui/warlock/demonology/presets.ts
+++ b/ui/warlock/demonology/presets.ts
@@ -83,7 +83,7 @@ export const DemonologyTalentsIncinerate = {
 			prime3: PrimeGlyph.GlyphOfMetamorphosis,
 			major1: MajorGlyph.GlyphOfSoulstone,
 			major2: MajorGlyph.GlyphOfLifeTap,
-			major3: MajorGlyph.GlyphOfFelhunter,
+			major3: MajorGlyph.GlyphOfSoulLink,
 			minor1: MinorGlyph.GlyphOfDrainSoul,
 			minor2: MinorGlyph.GlyphOfRitualOfSouls,
 			minor3: MinorGlyph.GlyphOfUnendingBreath,
diff --git a/ui/warlock/destruction/apls/default.apl.json b/ui/warlock/destruction/apls/default.apl.json
new file mode 100644
index 0000000000..528f6f1e01
--- /dev/null
+++ b/ui/warlock/destruction/apls/default.apl.json
@@ -0,0 +1,26 @@
+{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-8.0s"}}},
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":29722}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":6353}}},"doAtValue":{"const":{"val":"-0.5s"}}}
+	],
+	"priorityList": [
+		{"action":{"autocastOtherCooldowns":{}}},
+		{"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}},{"spellCanCast":{"spellId":{"spellId":77801}}}]}},"castSpell":{"spellId":{"spellId":77801}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}}]}},"sequence":{"name":"Doomguard","actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}},
+		{"action":{"condition":{"spellIsReady":{"spellId":{"spellId":74434}}},"castSpell":{"spellId":{"spellId":74434}}}},
+		{"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":74434}}},{"auraIsActive":{"auraId":{"spellId":47221}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":18120}}},"rhs":{"const":{"val":"3s"}}}}]}},"castSpell":{"spellId":{"spellId":6353}}}},
+		{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":2825,"tag":-1}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"const":{"val":"12s"}}}},{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}]}}]}},"castSpell":{"spellId":{"spellId":348}}}},
+		{"action":{"condition":{"spellCanCast":{"spellId":{"spellId":17962}}},"castSpell":{"spellId":{"spellId":17962}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},"castSpell":{"spellId":{"spellId":603}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
+		{"action":{"condition":{"spellCanCast":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}},
+		{"action":{"condition":{"and":{"vals":[{"isExecutePhase":{"threshold":"E20"}},{"spellCanCast":{"spellId":{"spellId":17877}}}]}},"castSpell":{"spellId":{"spellId":17877}}}},
+		{"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":50796}}},{"auraIsInactiveWithReactionTime":{"auraId":{"spellId":54277}}}]}},"castSpell":{"spellId":{"spellId":50796}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":29722}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
+	]
+}
diff --git a/ui/warlock/destruction/apls/p1.apl.json b/ui/warlock/destruction/apls/p1.apl.json
deleted file mode 100644
index bc216b934c..0000000000
--- a/ui/warlock/destruction/apls/p1.apl.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-	"type": "TypeAPL",
-	"prepullActions": [
-		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-8.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 6353 } } }, "doAtValue": { "const": { "val": "-0.5s" } } }
-	],
-	"priorityList": [
-		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }, { "spellCanCast": { "spellId": { "spellId": 77801 } } }]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77801 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 75170 } } }
-						]
-					}
-				},
-				"sequence": { "name": "Doomguard", "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 74434 } } } },
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "auraIsActive": { "auraId": { "spellId": 74434 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 47221 } } },
-							{ "cmp": { "op": "OpLt", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 18120 } } }, "rhs": { "const": { "val": "3s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{
-								"and": {
-									"vals": [
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-												"rhs": {
-													"math": {
-														"op": "OpAdd",
-														"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
-														"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
-													}
-												}
-											}
-										},
-										{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "5s" } } } }
-									]
-								}
-							},
-							{
-								"and": {
-									"vals": [
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "auraRemainingTime": { "auraId": { "spellId": 2825, "tag": -1 } } },
-												"rhs": { "const": { "val": "2s" } }
-											}
-										},
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-												"rhs": { "const": { "val": "12s" } }
-											}
-										},
-										{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }
-									]
-								}
-							}
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 348 } }
-			}
-		},
-		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } },
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 172 } }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 50796 } } }, "castSpell": { "spellId": { "spellId": 50796 } } } },
-		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
-		{
-			"action": {
-				"condition": { "and": { "vals": [{ "isExecutePhase": { "threshold": "E20" } }, { "spellCanCast": { "spellId": { "spellId": 17877 } } }] } },
-				"castSpell": { "spellId": { "spellId": 17877 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": { "vals": [{ "auraIsKnown": { "auraId": { "spellId": 89937 } } }, { "auraIsActive": { "auraId": { "spellId": 89937 } } }] }
-				},
-				"castSpell": { "spellId": { "spellId": 77799 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
-	]
-}
diff --git a/ui/warlock/destruction/apls/p3.apl.json b/ui/warlock/destruction/apls/p3.apl.json
deleted file mode 100644
index b2d41410d3..0000000000
--- a/ui/warlock/destruction/apls/p3.apl.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-	"type": "TypeAPL",
-	"prepullActions": [
-		{ "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-8.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 6353 } } }, "doAtValue": { "const": { "val": "-0.5s" } } }
-	],
-	"priorityList": [
-		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }, { "spellCanCast": { "spellId": { "spellId": 77801 } } }]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77801 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 75170 } } }
-						]
-					}
-				},
-				"sequence": { "name": "Doomguard", "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] }
-			}
-		},
-		{ "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 74434 } } } },
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "auraIsActive": { "auraId": { "spellId": 74434 } } },
-							{ "auraIsActive": { "auraId": { "spellId": 47221 } } },
-							{ "cmp": { "op": "OpLt", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 18120 } } }, "rhs": { "const": { "val": "3s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 6353 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{
-								"and": {
-									"vals": [
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-												"rhs": {
-													"math": {
-														"op": "OpAdd",
-														"lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } },
-														"rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } }
-													}
-												}
-											}
-										},
-										{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "5s" } } } }
-									]
-								}
-							},
-							{
-								"and": {
-									"vals": [
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "auraRemainingTime": { "auraId": { "spellId": 2825, "tag": -1 } } },
-												"rhs": { "const": { "val": "2s" } }
-											}
-										},
-										{
-											"cmp": {
-												"op": "OpLt",
-												"lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } },
-												"rhs": { "const": { "val": "12s" } }
-											}
-										},
-										{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }
-									]
-								}
-							}
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 348 } }
-			}
-		},
-		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } },
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } },
-						"rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } }
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 172 } }
-			}
-		},
-		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } },
-		{
-			"action": {
-				"condition": { "and": { "vals": [{ "isExecutePhase": { "threshold": "E20" } }, { "spellCanCast": { "spellId": { "spellId": 17877 } } }] } },
-				"castSpell": { "spellId": { "spellId": 17877 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "spellCanCast": { "spellId": { "spellId": 50796 } } },
-							{ "auraIsInactiveWithReactionTime": { "auraId": { "spellId": 54277 } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 50796 } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 29722 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
-	]
-}
diff --git a/ui/warlock/destruction/presets.ts b/ui/warlock/destruction/presets.ts
index 81aa964643..cdedf09fa6 100644
--- a/ui/warlock/destruction/presets.ts
+++ b/ui/warlock/destruction/presets.ts
@@ -10,8 +10,7 @@ import {
 } from '../../core/proto/warlock';
 import { Stats } from '../../core/proto_utils/stats';
 import { WARLOCK_BREAKPOINTS } from '../presets';
-import P1Apl from './apls/p1.apl.json';
-import P3Apl from './apls/p3.apl.json';
+import DefaultApl from './apls/default.apl.json';
 import P1Gear from './gear_sets/p1.gear.json';
 import P3Gear from './gear_sets/p3.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
@@ -26,18 +25,7 @@ export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid', PreraidGear
 export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear);
 export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear);
 
-export const P1_APL = PresetUtils.makePresetAPLRotation('P1', P1Apl);
-export const P3_APL = PresetUtils.makePresetAPLRotation('P3', P3Apl);
-
-export const P1_PRESET_BUILD = PresetUtils.makePresetBuild('P1 - Default', {
-	gear: P1_PRESET,
-	rotation: P1_APL,
-});
-
-export const P3_PRESET_BUILD = PresetUtils.makePresetBuild('P3 - Default', {
-	gear: P3_PRESET,
-	rotation: P3_APL,
-});
+export const DEFAULT_APL = PresetUtils.makePresetAPLRotation('Default', DefaultApl);
 
 // Preset options for EP weights
 export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights(
diff --git a/ui/warlock/destruction/sim.ts b/ui/warlock/destruction/sim.ts
index 0d6cd07c06..643c5c67f8 100644
--- a/ui/warlock/destruction/sim.ts
+++ b/ui/warlock/destruction/sim.ts
@@ -95,16 +95,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, {
 		// Preset talents that the user can quickly select.
 		talents: [Presets.DestructionTalents],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.P1_APL, Presets.P3_APL],
+		rotations: [Presets.DEFAULT_APL],
 
 		// Preset gear configurations that the user can quickly select.
 		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET],
-
-		builds: [Presets.P1_PRESET_BUILD, Presets.P3_PRESET_BUILD],
 	},
 
 	autoRotation: (_player: Player<Spec.SpecDestructionWarlock>): APLRotation => {
-		return Presets.P1_APL.rotation.rotation!;
+		return Presets.DEFAULT_APL.rotation.rotation!;
 	},
 
 	raidSimPresets: [

From 6b6f1645d4d13fa51998a1be6854d866a78625c4 Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Fri, 27 Sep 2024 22:10:30 +0200
Subject: [PATCH 11/11] Fix Affli APL formatting

---
 ui/warlock/affliction/apls/default.apl.json | 191 +++-----------------
 1 file changed, 21 insertions(+), 170 deletions(-)

diff --git a/ui/warlock/affliction/apls/default.apl.json b/ui/warlock/affliction/apls/default.apl.json
index 763ba691df..463577194f 100644
--- a/ui/warlock/affliction/apls/default.apl.json
+++ b/ui/warlock/affliction/apls/default.apl.json
@@ -1,177 +1,28 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-4.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } }, "doAtValue": { "const": { "val": "-3.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 48181 } } }, "doAtValue": { "const": { "val": "-0.8" } } }
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-4.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-3.0s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":48181}}},"doAtValue":{"const":{"val":"-0.8"}}}
 	],
 	"priorityList": [
-		{ "action": { "autocastOtherCooldowns": {} } },
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "71s" } } } },
-							{ "isExecutePhase": { "threshold": "E25" } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 82174 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "136s" } } } },
-							{ "isExecutePhase": { "threshold": "E25" } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 33697 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "141s" } } } },
-							{ "isExecutePhase": { "threshold": "E25" } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 77801 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{ "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "26s" } } } },
-							{ "isExecutePhase": { "threshold": "E25" } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "itemId": 58091 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"or": {
-						"vals": [
-							{
-								"and": {
-									"vals": [
-										{ "auraIsActive": { "auraId": { "spellId": 74241 } } },
-										{ "auraIsActive": { "auraId": { "spellId": 89091 } } },
-										{ "auraIsActive": { "auraId": { "spellId": 75170 } } }
-									]
-								}
-							},
-							{ "cmp": { "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 33697 } } }, "rhs": { "const": { "val": "2s" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 18540 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 172 } } } } },
-				"castSpell": { "spellId": { "spellId": 172 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"cmp": {
-						"op": "OpLt",
-						"lhs": { "dotRemainingTime": { "spellId": { "spellId": 30108 } } },
-						"rhs": {
-							"math": {
-								"op": "OpAdd",
-								"lhs": { "dotTickFrequency": { "spellId": { "spellId": 30108 } } },
-								"rhs": { "spellCastTime": { "spellId": { "spellId": 30108 } } }
-							}
-						}
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 30108 } }
-			}
-		},
-		{ "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 48181 } } }, "castSpell": { "spellId": { "spellId": 48181 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpLt", "lhs": { "currentManaPercent": {} }, "rhs": { "const": { "val": "15%" } } } },
-							{ "not": { "val": { "isExecutePhase": { "threshold": "E25" } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 1454 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpLt",
-									"lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } },
-									"rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } }
-								}
-							},
-							{
-								"cmp": {
-									"op": "OpGt",
-									"lhs": { "remainingTime": {} },
-									"rhs": {
-										"math": {
-											"op": "OpMul",
-											"lhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } },
-											"rhs": { "const": { "val": "2" } }
-										}
-									}
-								}
-							}
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 603 } }
-			}
-		},
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 89937 } } }, "castSpell": { "spellId": { "spellId": 77799 } } } },
-		{
-			"action": {
-				"condition": { "isExecutePhase": { "threshold": "E25" } },
-				"channelSpell": { "spellId": { "spellId": 1120 }, "interruptIf": { "const": { "val": "true" } } }
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 47897 } } } },
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "spellIsReady": { "spellId": { "spellId": 74434 } } },
-							{ "not": { "val": { "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 74434 } }
-			}
-		},
-		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 6353 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 686 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 1454 } } } }
+		{"action":{"autocastOtherCooldowns":{}}},
+		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"71s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":82174}}}},
+		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"136s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
+		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"141s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":77801}}}},
+		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"26s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
+		{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}}]}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":33697}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":18540}}}},
+		{"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":30108}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotTickFrequency":{"spellId":{"spellId":30108}}},"rhs":{"spellCastTime":{"spellId":{"spellId":30108}}}}}}},"castSpell":{"spellId":{"spellId":30108}}}},
+		{"action":{"condition":{"spellCanCast":{"spellId":{"spellId":48181}}},"castSpell":{"spellId":{"spellId":48181}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"isExecutePhase":{"threshold":"E25"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}},
+		{"action":{"condition":{"isExecutePhase":{"threshold":"E25"}},"channelSpell":{"spellId":{"spellId":1120},"interruptIf":{"const":{"val":"true"}}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":47897}}}},
+		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":74434}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}}}]}},"castSpell":{"spellId":{"spellId":74434}}}},
+		{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":74434}}},"castSpell":{"spellId":{"spellId":6353}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":686}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":1454}}}}
 	]
 }