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] 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.