From 44ef32ea3c69eb679604dc58caa9a06b1e193cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= Date: Thu, 31 Oct 2024 18:52:28 +0100 Subject: [PATCH] [Unholy] Move Unholy Death Knight to phase 3 --- sim/death_knight/unholy/TestUnholy.results | 1680 ++++++++-------- sim/death_knight/unholy/unholy_test.go | 1 + ui/core/launched_sims.ts | 2 +- ui/death_knight/unholy/apls/default.apl.json | 942 +++++---- ui/death_knight/unholy/apls/solace.apl.json | 1719 ----------------- .../unholy/gear_sets/prebis.gear.json | 30 +- ui/death_knight/unholy/presets.ts | 18 +- ui/death_knight/unholy/sim.ts | 41 +- 8 files changed, 1402 insertions(+), 3031 deletions(-) delete mode 100644 ui/death_knight/unholy/apls/solace.apl.json diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results index 624e307555..1f3112e986 100644 --- a/sim/death_knight/unholy/TestUnholy.results +++ b/sim/death_knight/unholy/TestUnholy.results @@ -38,2248 +38,2248 @@ character_stats_results: { dps_results: { key: "TestUnholy-AllItems-AgileShadowspiritDiamond" value: { - dps: 41186.72617 - tps: 30602.17837 - hps: 661.39849 + dps: 41918.22759 + tps: 31062.24914 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-Althor'sAbacus-50366" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 757.71085 + dps: 39435.0552 + tps: 29251.64027 + hps: 763.07597 } } dps_results: { key: "TestUnholy-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 39345.31078 - tps: 29468.65389 - hps: 644.94189 + dps: 40062.30959 + tps: 29934.62072 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Anhuur'sHymnal-55889" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Anhuur'sHymnal-56407" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 40227.2128 - tps: 29874.27687 - hps: 644.94189 + dps: 40937.6387 + tps: 30331.14022 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 40422.79125 - tps: 30014.95596 - hps: 644.94189 + dps: 41133.79843 + tps: 30472.06711 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ArrowofTime-72897" value: { - dps: 40017.77449 - tps: 29703.13151 - hps: 661.39849 + dps: 40503.12996 + tps: 29931.69564 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-AustereShadowspiritDiamond" value: { - dps: 40861.04673 - tps: 30276.77324 - hps: 666.42324 + dps: 41571.54377 + tps: 30727.67582 + hps: 672.74005 } } dps_results: { key: "TestUnholy-AllItems-BaubleofTrueBlood-50726" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BedrockTalisman-58182" value: { - dps: 38768.27418 - tps: 28835.69452 - hps: 644.94189 + dps: 39474.37927 + tps: 29290.74575 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BellofEnragingResonance-59326" value: { - dps: 39401.87468 - tps: 29299.95244 - hps: 656.69661 + dps: 40132.28112 + tps: 29780.85182 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-BellofEnragingResonance-65053" value: { - dps: 39488.70749 - tps: 29373.76964 - hps: 659.04755 + dps: 40209.49536 + tps: 29848.11285 + hps: 664.53308 } } dps_results: { key: "TestUnholy-AllItems-BindingPromise-67037" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 39081.18376 - tps: 29180.65487 - hps: 644.94189 + dps: 39793.45715 + tps: 29641.90647 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodofIsiset-55995" value: { - dps: 39134.30013 - tps: 29238.57475 - hps: 644.94189 + dps: 39847.52384 + tps: 29700.77462 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodofIsiset-56414" value: { - dps: 39187.43219 - tps: 29296.51032 - hps: 644.94189 + dps: 39901.60648 + tps: 29759.65873 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 39352.11382 - tps: 29264.72067 - hps: 656.69661 + dps: 40078.52103 + tps: 29737.70063 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 39075.97188 - tps: 29027.60758 - hps: 644.94189 + dps: 39826.37092 + tps: 29502.83701 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 40018.08839 - tps: 29723.92594 - hps: 644.94189 + dps: 40752.95483 + tps: 30180.52187 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Bone-LinkFetish-77210" value: { - dps: 41364.93372 - tps: 30863.76767 - hps: 644.94189 + dps: 42150.30046 + tps: 31459.19928 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Bone-LinkFetish-77982" value: { - dps: 41040.87718 - tps: 30593.90943 - hps: 644.94189 + dps: 41795.51411 + tps: 31172.70703 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Bone-LinkFetish-78002" value: { - dps: 41701.73967 - tps: 31115.22143 - hps: 644.94189 + dps: 42492.26712 + tps: 31715.46261 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BottledLightning-66879" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-BottledWishes-77114" value: { - dps: 39585.17777 - tps: 29439.51975 - hps: 666.88402 + dps: 40243.26469 + tps: 29924.61875 + hps: 668.45132 } } dps_results: { key: "TestUnholy-AllItems-BottledWishes-77985" value: { - dps: 39500.18613 - tps: 29327.70969 - hps: 661.39849 + dps: 40073.48605 + tps: 29692.53834 + hps: 662.96579 } } dps_results: { key: "TestUnholy-AllItems-BottledWishes-78005" value: { - dps: 39614.10407 - tps: 29461.10781 - hps: 665.31673 + dps: 40273.73972 + tps: 29832.48595 + hps: 666.10038 } } dps_results: { key: "TestUnholy-AllItems-BracingShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 29657.86483 - hps: 661.39849 + dps: 41557.79886 + tps: 30099.72779 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-Brawler'sTrophy-232015" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 42692.08211 - tps: 31764.20733 - hps: 606.03224 + dps: 43231.9444 + tps: 32100.65345 + hps: 602.84679 } } dps_results: { key: "TestUnholy-AllItems-BurningShadowspiritDiamond" value: { - dps: 41134.48637 - tps: 30566.16395 - hps: 661.39849 + dps: 41848.17301 + tps: 31019.87172 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 41242.76038 - tps: 30649.835 - hps: 662.18214 + dps: 41967.69769 + tps: 31108.07894 + hps: 669.23497 } } dps_results: { key: "TestUnholy-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 39639.69839 - tps: 29544.95186 - hps: 656.69661 + dps: 40386.76146 + tps: 30028.96082 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-CoreofRipeness-58184" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-CorpseTongueCoin-50349" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-CrecheoftheFinalDragon-77205" value: { - dps: 42031.5142 - tps: 31162.08945 - hps: 662.96579 + dps: 42817.63301 + tps: 31639.4242 + hps: 666.88402 } } dps_results: { key: "TestUnholy-AllItems-CrecheoftheFinalDragon-77972" value: { - dps: 41637.93968 - tps: 30889.28261 - hps: 659.04755 + dps: 42456.19347 + tps: 31423.66525 + hps: 666.10038 } } dps_results: { key: "TestUnholy-AllItems-CrecheoftheFinalDragon-77992" value: { - dps: 42470.85541 - tps: 31472.08861 - hps: 669.23497 + dps: 43318.80164 + tps: 32062.16087 + hps: 674.7205 } } dps_results: { key: "TestUnholy-AllItems-CrushingWeight-59506" value: { - dps: 40743.63876 - tps: 30309.93739 - hps: 659.04755 + dps: 41222.30274 + tps: 30552.83859 + hps: 660.61484 } } dps_results: { key: "TestUnholy-AllItems-CrushingWeight-65118" value: { - dps: 40964.53724 - tps: 30338.8239 - hps: 663.74943 + dps: 41546.80862 + tps: 30663.33346 + hps: 665.31673 } } dps_results: { key: "TestUnholy-AllItems-CunningoftheCruel-77208" value: { - dps: 39338.14589 - tps: 29373.55336 - hps: 644.94189 + dps: 39995.67447 + tps: 29793.26723 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-CunningoftheCruel-77980" value: { - dps: 39237.30078 - tps: 29307.18529 - hps: 644.94189 + dps: 39873.03682 + tps: 29712.61696 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-CunningoftheCruel-78000" value: { - dps: 39390.04214 - tps: 29448.71898 - hps: 644.94189 + dps: 40032.33218 + tps: 29848.27719 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 40285.87886 - tps: 29957.40509 - hps: 644.94189 + dps: 41152.22421 + tps: 30639.89868 + hps: 641.8073 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 39412.17122 - tps: 29328.5578 - hps: 644.94189 + dps: 40242.38827 + tps: 29952.56167 + hps: 641.8073 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 39349.22682 - tps: 29445.82523 - hps: 644.94189 + dps: 40027.69258 + tps: 29904.14001 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Deathbringer'sWill-50363" value: { - dps: 39763.53243 - tps: 29499.35695 - hps: 652.77837 + dps: 40386.15479 + tps: 29902.23548 + hps: 654.34566 } } dps_results: { key: "TestUnholy-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 40951.1153 - tps: 30342.06233 - hps: 662.18214 + dps: 41672.63048 + tps: 30797.2223 + hps: 669.23497 } } dps_results: { key: "TestUnholy-AllItems-DislodgedForeignObject-50348" value: { - dps: 39205.8666 - tps: 29081.76078 - hps: 649.64378 + dps: 39740.21161 + tps: 29534.85871 + hps: 652.77837 } } dps_results: { key: "TestUnholy-AllItems-Dwyer'sCaber-70141" value: { - dps: 40896.16871 - tps: 30386.24689 - hps: 659.8312 + dps: 41609.12403 + tps: 30825.91377 + hps: 665.31673 } } dps_results: { key: "TestUnholy-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 30263.12738 - hps: 666.42324 + dps: 41557.79886 + tps: 30714.00794 + hps: 672.74005 } } dps_results: { key: "TestUnholy-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ElementiumDeathplateBattlearmor" value: { - dps: 33643.50057 - tps: 25202.72269 - hps: 578.02917 + dps: 34188.48316 + tps: 25510.66044 + hps: 581.15788 } } dps_results: { key: "TestUnholy-AllItems-ElementiumDeathplateBattlegear" value: { - dps: 37865.92085 - tps: 28274.42079 - hps: 649.20733 + dps: 38392.11334 + tps: 28587.71246 + hps: 651.55386 } } dps_results: { key: "TestUnholy-AllItems-EmberShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 30263.12738 - hps: 661.39849 + dps: 41557.79886 + tps: 30714.00794 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 40951.1153 - tps: 30342.06233 - hps: 662.18214 + dps: 41672.63048 + tps: 30797.2223 + hps: 669.23497 } } dps_results: { key: "TestUnholy-AllItems-EssenceoftheCyclone-59473" value: { - dps: 39685.90198 - tps: 29481.33087 - hps: 655.91296 + dps: 40490.03885 + tps: 30007.86725 + hps: 658.2639 } } dps_results: { key: "TestUnholy-AllItems-EssenceoftheCyclone-65140" value: { - dps: 39977.67813 - tps: 29712.24586 - hps: 659.04755 + dps: 40675.28629 + tps: 30131.57388 + hps: 661.39849 } } dps_results: { key: "TestUnholy-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 39345.31078 - tps: 29468.65389 - hps: 644.94189 + dps: 40062.30959 + tps: 29934.62072 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-EternalShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 30263.12738 - hps: 666.42324 + dps: 41557.79886 + tps: 30714.00794 + hps: 672.74005 } } dps_results: { key: "TestUnholy-AllItems-EyeofUnmaking-77200" value: { - dps: 42088.84424 - tps: 31214.34014 - hps: 644.94189 + dps: 42812.96149 + tps: 31678.83179 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-EyeofUnmaking-77977" value: { - dps: 41707.05306 - tps: 30939.60548 - hps: 644.94189 + dps: 42429.1085 + tps: 31403.01457 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-EyeofUnmaking-77997" value: { - dps: 42508.81454 - tps: 31516.54828 - hps: 644.94189 + dps: 43235.19977 + tps: 31982.23073 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FallofMortality-59500" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FallofMortality-65124" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FieryQuintessence-69000" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Figurine-DemonPanther-52199" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Figurine-DreamOwl-52354" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 670.77134 + dps: 39435.0552 + tps: 29251.64027 + hps: 676.47656 } } dps_results: { key: "TestUnholy-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Figurine-KingofBoars-52351" value: { - dps: 39187.43219 - tps: 29296.51032 - hps: 644.94189 + dps: 39901.60648 + tps: 29759.65873 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FireoftheDeep-77117" value: { - dps: 39466.22972 - tps: 29600.4899 - hps: 644.94189 + dps: 40185.3917 + tps: 30068.61524 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FireoftheDeep-77988" value: { - dps: 39382.38397 - tps: 29509.07498 - hps: 644.94189 + dps: 40100.04601 + tps: 29975.70361 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FireoftheDeep-78008" value: { - dps: 39561.40956 - tps: 29704.25784 - hps: 644.94189 + dps: 40282.2742 + tps: 30174.08218 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FleetShadowspiritDiamond" value: { - dps: 40938.68676 - tps: 30362.82811 - hps: 661.39849 + dps: 41650.71092 + tps: 30815.26271 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-FluidDeath-58181" value: { - dps: 39134.99219 - tps: 29075.4321 - hps: 644.94189 + dps: 39866.3211 + tps: 29540.79976 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ForlornShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 30263.12738 - hps: 661.39849 + dps: 41557.79886 + tps: 30714.00794 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-FoulGiftoftheDemonLord-72898" value: { - dps: 39418.48642 - tps: 29549.09613 - hps: 644.94189 + dps: 40104.38442 + tps: 29983.83963 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-FuryofAngerforge-59461" value: { - dps: 39402.04104 - tps: 29300.26851 - hps: 656.69661 + dps: 40132.25295 + tps: 29780.7983 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-GaleofShadows-56138" value: { - dps: 39197.00132 - tps: 29071.27728 - hps: 655.12931 + dps: 39862.95271 + tps: 29502.12027 + hps: 652.77837 } } dps_results: { key: "TestUnholy-AllItems-GaleofShadows-56462" value: { - dps: 39265.41583 - tps: 29187.25336 - hps: 656.69661 + dps: 40000.58124 + tps: 29626.97322 + hps: 659.8312 } } dps_results: { key: "TestUnholy-AllItems-GearDetector-61462" value: { - dps: 39259.10339 - tps: 29094.86897 - hps: 653.56202 + dps: 39727.43303 + tps: 29383.49861 + hps: 651.99472 } } dps_results: { key: "TestUnholy-AllItems-GlowingTwilightScale-54589" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-GraceoftheHerald-55266" value: { - dps: 39180.58133 - tps: 29108.5235 - hps: 648.86013 + dps: 39914.24352 + tps: 29573.22244 + hps: 653.56202 } } dps_results: { key: "TestUnholy-AllItems-GraceoftheHerald-56295" value: { - dps: 39457.36153 - tps: 29325.24337 - hps: 652.77837 + dps: 40161.30497 + tps: 29750.15471 + hps: 657.48025 } } dps_results: { key: "TestUnholy-AllItems-Gurthalak,VoiceoftheDeeps-77191" value: { - dps: 44041.15678 - tps: 32881.9536 - hps: 639.53641 + dps: 44831.06552 + tps: 33325.26882 + hps: 638.69602 } } dps_results: { key: "TestUnholy-AllItems-Gurthalak,VoiceoftheDeeps-78478" value: { - dps: 44376.72271 - tps: 33143.17469 - hps: 645.07383 + dps: 45167.2777 + tps: 33586.31724 + hps: 644.22616 } } dps_results: { key: "TestUnholy-AllItems-Gurthalak,VoiceoftheDeeps-78487" value: { - dps: 43745.4969 - tps: 32651.76157 - hps: 634.55833 + dps: 44534.83859 + tps: 33095.23088 + hps: 633.72448 } } dps_results: { key: "TestUnholy-AllItems-HarmlightToken-63839" value: { - dps: 38792.83815 - tps: 28869.40139 - hps: 644.15825 + dps: 39546.25602 + tps: 29362.84109 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 40047.13884 - tps: 29890.21183 - hps: 644.94189 + dps: 40757.4374 + tps: 30341.97766 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-HeartofIgnacious-59514" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-HeartofIgnacious-65110" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-HeartofRage-59224" value: { - dps: 40714.91235 - tps: 30258.09229 - hps: 653.56202 + dps: 41550.44112 + tps: 30772.59537 + hps: 659.04755 } } dps_results: { key: "TestUnholy-AllItems-HeartofSolace-55868" value: { - dps: 39197.00132 - tps: 29071.27728 - hps: 655.12931 + dps: 39862.95271 + tps: 29502.12027 + hps: 652.77837 } } dps_results: { key: "TestUnholy-AllItems-HeartofSolace-56393" value: { - dps: 40969.00743 - tps: 30328.67412 - hps: 656.69661 + dps: 41705.8424 + tps: 30759.67793 + hps: 653.56202 } } dps_results: { key: "TestUnholy-AllItems-HeartofThunder-55845" value: { - dps: 38755.34223 - tps: 28822.81962 - hps: 644.94189 + dps: 39461.40386 + tps: 29277.84246 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-HeartofThunder-56370" value: { - dps: 38763.8212 - tps: 28831.26119 - hps: 644.94189 + dps: 39469.91132 + tps: 29286.30264 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-HeartoftheVile-66969" value: { - dps: 39197.95608 - tps: 29117.99617 - hps: 648.86013 + dps: 39930.65117 + tps: 29591.25436 + hps: 654.34566 } } dps_results: { key: "TestUnholy-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 40951.1153 - tps: 30342.06233 - hps: 662.18214 + dps: 41672.63048 + tps: 30797.2223 + hps: 669.23497 } } dps_results: { key: "TestUnholy-AllItems-ImpatienceofYouth-62464" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ImpatienceofYouth-62469" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ImpetuousQuery-55881" value: { - dps: 39134.30013 - tps: 29238.57475 - hps: 644.94189 + dps: 39847.52384 + tps: 29700.77462 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ImpetuousQuery-56406" value: { - dps: 39187.43219 - tps: 29296.51032 - hps: 644.94189 + dps: 39901.60648 + tps: 29759.65873 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-IndomitablePride-77211" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 686.49887 + dps: 39435.0552 + tps: 29251.64027 + hps: 692.33786 } } dps_results: { key: "TestUnholy-AllItems-IndomitablePride-77983" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 681.78061 + dps: 39435.0552 + tps: 29251.64027 + hps: 687.57947 } } dps_results: { key: "TestUnholy-AllItems-IndomitablePride-78003" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 691.82203 + dps: 39435.0552 + tps: 29251.64027 + hps: 697.7063 } } dps_results: { key: "TestUnholy-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-InsigniaoftheCorruptedMind-77203" value: { - dps: 39642.48773 - tps: 29379.5332 - hps: 663.74943 + dps: 40243.28405 + tps: 29676.76585 + hps: 664.53308 } } dps_results: { key: "TestUnholy-AllItems-InsigniaoftheCorruptedMind-77971" value: { - dps: 39593.00536 - tps: 29301.61002 + dps: 40408.69046 + tps: 29932.61712 hps: 663.74943 } } dps_results: { key: "TestUnholy-AllItems-InsigniaoftheCorruptedMind-77991" value: { - dps: 39931.66911 - tps: 29592.87082 - hps: 663.74943 + dps: 40622.84664 + tps: 30037.5435 + hps: 665.31673 } } dps_results: { key: "TestUnholy-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 39040.95454 - tps: 29136.78662 - hps: 644.94189 + dps: 39752.50816 + tps: 29597.32001 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-JarofAncientRemedies-59354" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.1198 + tps: 29251.76302 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-JarofAncientRemedies-65029" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.1198 + tps: 29251.76302 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-JawsofDefeat-68926" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-JawsofDefeat-69111" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-JujuofNimbleness-63840" value: { - dps: 39081.18376 - tps: 29180.65487 - hps: 644.94189 + dps: 39793.45715 + tps: 29641.90647 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 39000.27815 - tps: 28982.90918 - hps: 644.94189 + dps: 39712.47174 + tps: 29428.68121 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 39090.22168 - tps: 29047.41834 - hps: 644.94189 + dps: 39805.28614 + tps: 29479.75228 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-KiroptyricSigil-77113" value: { - dps: 39585.17777 - tps: 29439.51975 - hps: 666.88402 + dps: 40243.26469 + tps: 29924.61875 + hps: 668.45132 } } dps_results: { key: "TestUnholy-AllItems-KiroptyricSigil-77984" value: { - dps: 39500.18613 - tps: 29327.70969 - hps: 661.39849 + dps: 40073.48605 + tps: 29692.53834 + hps: 662.96579 } } dps_results: { key: "TestUnholy-AllItems-KiroptyricSigil-78004" value: { - dps: 39614.10407 - tps: 29461.10781 - hps: 665.31673 + dps: 40273.73972 + tps: 29832.48595 + hps: 666.10038 } } dps_results: { key: "TestUnholy-AllItems-KvaldirBattleStandard-59685" value: { - dps: 39120.76073 - tps: 29028.80127 - hps: 646.50919 + dps: 39748.21631 + tps: 29539.497 + hps: 651.99472 } } dps_results: { key: "TestUnholy-AllItems-KvaldirBattleStandard-59689" value: { - dps: 39120.76073 - tps: 29028.80127 - hps: 646.50919 + dps: 39748.21631 + tps: 29539.497 + hps: 651.99472 } } dps_results: { key: "TestUnholy-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-LeadenDespair-55816" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 664.48032 + dps: 39435.0552 + tps: 29251.64027 + hps: 670.13204 } } dps_results: { key: "TestUnholy-AllItems-LeadenDespair-56347" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 670.77134 + dps: 39435.0552 + tps: 29251.64027 + hps: 676.47656 } } dps_results: { key: "TestUnholy-AllItems-LeftEyeofRajh-56102" value: { - dps: 39295.14501 - tps: 29169.66791 - hps: 651.99472 + dps: 39819.17084 + tps: 29552.27834 + hps: 655.12931 } } dps_results: { key: "TestUnholy-AllItems-LeftEyeofRajh-56427" value: { - dps: 39255.73681 - tps: 29197.27768 - hps: 651.99472 + dps: 39881.27881 + tps: 29593.2222 + hps: 655.91296 } } dps_results: { key: "TestUnholy-AllItems-LicensetoSlay-58180" value: { - dps: 40179.96019 - tps: 29840.72618 - hps: 644.94189 + dps: 40893.91293 + tps: 30299.92203 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MagmaPlatedBattlearmor" value: { - dps: 31997.01551 - tps: 23570.49781 - hps: 549.3259 + dps: 32633.99414 + tps: 23959.46412 + hps: 552.30731 } } dps_results: { key: "TestUnholy-AllItems-MagmaPlatedBattlegear" value: { - dps: 35413.63031 - tps: 26399.06627 - hps: 603.73674 + dps: 36054.22687 + tps: 26760.97167 + hps: 604.48209 } } dps_results: { key: "TestUnholy-AllItems-MagnetiteMirror-55814" value: { - dps: 38859.81608 - tps: 28831.40791 - hps: 648.07648 + dps: 39494.83056 + tps: 29319.89058 + hps: 653.56202 } } dps_results: { key: "TestUnholy-AllItems-MagnetiteMirror-56345" value: { - dps: 38974.21536 - tps: 29008.26298 - hps: 651.99472 + dps: 39597.89097 + tps: 29426.2686 + hps: 655.91296 } } dps_results: { key: "TestUnholy-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MarkofKhardros-56132" value: { - dps: 39714.79724 - tps: 29505.69767 - hps: 644.94189 + dps: 40423.70022 + tps: 29961.91178 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MarkofKhardros-56458" value: { - dps: 39843.87902 - tps: 29598.54586 - hps: 644.94189 + dps: 40553.16564 + tps: 30054.92352 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MatrixRestabilizer-68994" value: { - dps: 40327.94274 - tps: 29955.21654 - hps: 658.2639 + dps: 41104.70112 + tps: 30434.82082 + hps: 664.53308 } } dps_results: { key: "TestUnholy-AllItems-MatrixRestabilizer-69150" value: { - dps: 40624.44666 - tps: 30147.5362 - hps: 662.18214 + dps: 41445.40361 + tps: 30669.48708 + hps: 668.45132 } } dps_results: { key: "TestUnholy-AllItems-MightoftheOcean-55251" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MightoftheOcean-56285" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MirrorofBrokenImages-62466" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MirrorofBrokenImages-62471" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MithrilStopwatch-232013" value: { - dps: 39357.81551 - tps: 29265.47518 - hps: 656.69661 + dps: 40085.74076 + tps: 29742.20464 + hps: 662.18214 } } dps_results: { key: "TestUnholy-AllItems-MoonwellChalice-70142" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-MoonwellPhial-70143" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 675.79205 + dps: 39435.0552 + tps: 29251.64027 + hps: 681.53998 } } dps_results: { key: "TestUnholy-AllItems-NecromanticFocus-68982" value: { - dps: 39330.06108 - tps: 29450.99723 - hps: 644.94189 + dps: 40047.12225 + tps: 29916.52003 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-NecromanticFocus-69139" value: { - dps: 39407.25943 - tps: 29535.03442 - hps: 644.94189 + dps: 40125.74561 + tps: 30001.91425 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-NecroticBoneplateBattlegear" value: { - dps: 36043.4934 - tps: 26886.93832 - hps: 631.93644 + dps: 36656.25034 + tps: 27342.43515 + hps: 633.47213 } } dps_results: { key: "TestUnholy-AllItems-Oremantle'sFavor-61448" value: { - dps: 39487.92623 - tps: 29342.50993 - hps: 644.94189 + dps: 40196.15494 + tps: 29798.43659 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 38977.72143 - tps: 28939.06073 + dps: 39574.85863 + tps: 29314.94762 hps: 647.29284 } } dps_results: { key: "TestUnholy-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 38751.52974 - tps: 28819.02396 - hps: 644.94189 + dps: 39457.57856 + tps: 29274.03843 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 39102.30848 - tps: 29091.48942 - hps: 650.42743 + dps: 39809.12241 + tps: 29538.67118 + hps: 655.91296 } } dps_results: { key: "TestUnholy-AllItems-PorcelainCrab-55237" value: { - dps: 39102.39076 - tps: 29198.86163 - hps: 644.94189 + dps: 39815.75924 + tps: 29663.6525 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-PorcelainCrab-56280" value: { - dps: 39395.0718 - tps: 29517.53769 - hps: 644.94189 + dps: 40126.35071 + tps: 29990.40667 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 40847.33325 - tps: 30263.12738 - hps: 666.42324 + dps: 41557.79886 + tps: 30714.00794 + hps: 672.74005 } } dps_results: { key: "TestUnholy-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 39722.48155 - tps: 29430.40186 - hps: 656.69661 + dps: 40489.90309 + tps: 29996.31619 + hps: 662.96579 } } dps_results: { key: "TestUnholy-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 39843.76134 - tps: 29519.16165 - hps: 662.18214 + dps: 40415.15277 + tps: 29962.08643 + hps: 661.39849 } } dps_results: { key: "TestUnholy-AllItems-Rainsong-55854" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Rainsong-56377" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ReflectionoftheLight-77115" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ReflectionoftheLight-77986" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ReflectionoftheLight-78006" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ResolveofUndying-77201" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ResolveofUndying-77978" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ResolveofUndying-77998" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 41350.07907 - tps: 30721.32138 - hps: 661.39849 + dps: 42064.34036 + tps: 31175.2006 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 41134.48637 - tps: 30566.16395 - hps: 661.39849 + dps: 41848.17301 + tps: 31019.87172 + hps: 667.66767 } } dps_results: { key: "TestUnholy-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 39112.86366 - tps: 29057.63233 - hps: 644.94189 + dps: 39842.61947 + tps: 29525.12135 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-RightEyeofRajh-56100" value: { - dps: 39757.8137 - tps: 29524.3745 - hps: 644.94189 + dps: 40474.74386 + tps: 29966.90224 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-RightEyeofRajh-56431" value: { - dps: 39805.21349 - tps: 29546.18157 - hps: 644.94189 + dps: 40570.44126 + tps: 30031.02918 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-RosaryofLight-72901" value: { - dps: 41170.32051 - tps: 30563.63611 - hps: 662.18214 + dps: 41903.25223 + tps: 31049.8158 + hps: 671.58591 } } dps_results: { key: "TestUnholy-AllItems-RottingSkull-77116" value: { - dps: 39683.3812 - tps: 29523.45104 - hps: 662.96579 + dps: 40427.56322 + tps: 30002.01737 + hps: 668.45132 } } dps_results: { key: "TestUnholy-AllItems-RottingSkull-77987" value: { - dps: 39580.30747 - tps: 29439.27375 - hps: 660.61484 + dps: 40315.681 + tps: 29921.11804 + hps: 666.10038 } } dps_results: { key: "TestUnholy-AllItems-RottingSkull-78007" value: { - dps: 39811.77537 - tps: 29628.00589 - hps: 664.53308 + dps: 40571.16774 + tps: 30105.62579 + hps: 670.01861 } } dps_results: { key: "TestUnholy-AllItems-RuneofZeth-68998" value: { - dps: 39519.24085 - tps: 29396.15219 - hps: 659.8312 + dps: 40253.84002 + tps: 29878.03471 + hps: 665.31673 } } dps_results: { key: "TestUnholy-AllItems-ScalesofLife-68915" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 679.72393 + dps: 39435.0552 + tps: 29251.64027 + hps: 685.5053 } } dps_results: { key: "TestUnholy-AllItems-ScalesofLife-69109" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 684.26072 + dps: 39435.0552 + tps: 29251.64027 + hps: 690.08068 } } dps_results: { key: "TestUnholy-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 39374.38161 - tps: 29400.16402 - hps: 644.94189 + dps: 40099.51005 + tps: 29854.82966 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SeaStar-55256" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SeaStar-56290" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Shadowmourne-49623" value: { - dps: 43992.43906 - tps: 32706.18202 - hps: 613.75596 + dps: 44715.74652 + tps: 33210.95462 + hps: 616.96934 } } dps_results: { key: "TestUnholy-AllItems-ShardofWoe-60233" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 40016.93512 - tps: 29768.04546 - hps: 650.42743 + dps: 40715.21991 + tps: 30152.68697 + hps: 656.69661 } } dps_results: { key: "TestUnholy-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 660.54844 + dps: 39435.0552 + tps: 29251.64027 + hps: 666.16672 } } dps_results: { key: "TestUnholy-AllItems-Skardyn'sGrace-56115" value: { - dps: 38991.20252 - tps: 28981.19281 - hps: 644.94189 + dps: 39719.47485 + tps: 29440.31543 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Skardyn'sGrace-56440" value: { - dps: 39036.86535 - tps: 29006.04966 - hps: 644.94189 + dps: 39762.24844 + tps: 29470.78793 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Sorrowsong-55879" value: { - dps: 39134.30013 - tps: 29238.57475 - hps: 644.94189 + dps: 39847.52384 + tps: 29700.77462 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Sorrowsong-56400" value: { - dps: 39187.43219 - tps: 29296.51032 - hps: 644.94189 + dps: 39901.60648 + tps: 29759.65873 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Soul'sAnguish-66994" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SoulCasket-58183" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SoulshifterVortex-77206" value: { - dps: 39702.5819 - tps: 29862.32798 - hps: 686.49887 + dps: 40436.24347 + tps: 30345.0497 + hps: 692.33786 } } dps_results: { key: "TestUnholy-AllItems-SoulshifterVortex-77970" value: { - dps: 39619.51704 - tps: 29768.52836 - hps: 681.78061 + dps: 40315.18308 + tps: 30208.28107 + hps: 687.57947 } } dps_results: { key: "TestUnholy-AllItems-SoulshifterVortex-77990" value: { - dps: 39876.13576 - tps: 30042.11601 - hps: 691.82203 + dps: 40671.29437 + tps: 30593.22723 + hps: 697.7063 } } dps_results: { key: "TestUnholy-AllItems-SpidersilkSpindle-68981" value: { - dps: 39345.31078 - tps: 29468.65389 - hps: 644.94189 + dps: 40062.30959 + tps: 29934.62072 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SpidersilkSpindle-69138" value: { - dps: 39425.9144 - tps: 29556.53556 - hps: 644.94189 + dps: 40144.35517 + tps: 30023.94125 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-StarcatcherCompass-77202" value: { - dps: 40057.42467 - tps: 29577.03869 + dps: 40874.67426 + tps: 30231.22448 hps: 662.96579 } } dps_results: { key: "TestUnholy-AllItems-StarcatcherCompass-77973" value: { - dps: 40116.68953 - tps: 29662.08988 - hps: 659.8312 + dps: 40596.69088 + tps: 29910.20205 + hps: 661.39849 } } dps_results: { key: "TestUnholy-AllItems-StarcatcherCompass-77993" value: { - dps: 40396.50723 - tps: 29869.54269 - hps: 667.66767 + dps: 41220.19775 + tps: 30431.26532 + hps: 666.88402 } } dps_results: { key: "TestUnholy-AllItems-StayofExecution-68996" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Stonemother'sKiss-61411" value: { - dps: 39211.85268 - tps: 29131.11064 - hps: 653.56202 + dps: 39993.11548 + tps: 29635.64883 + hps: 659.8312 } } dps_results: { key: "TestUnholy-AllItems-StumpofTime-62465" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-StumpofTime-62470" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.08337 + tps: 29251.69379 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-SymbioticWorm-59332" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 674.09831 + dps: 39435.0552 + tps: 29251.64027 + hps: 679.83183 } } dps_results: { key: "TestUnholy-AllItems-SymbioticWorm-65048" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 677.84872 + dps: 39435.0552 + tps: 29251.64027 + hps: 683.61414 } } dps_results: { key: "TestUnholy-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 39059.84846 - tps: 29156.25088 - hps: 644.94189 + dps: 39773.91017 + tps: 29618.33469 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 40021.39288 - tps: 29611.87174 - hps: 654.34566 + dps: 40663.42444 + tps: 30138.93228 + hps: 653.56202 } } dps_results: { key: "TestUnholy-AllItems-TearofBlood-55819" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-TearofBlood-56351" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 39074.74648 - tps: 29173.63534 - hps: 644.94189 + dps: 39786.97079 + tps: 29634.8976 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 39187.26075 - tps: 29296.1846 - hps: 644.94189 + dps: 39901.60648 + tps: 29759.65873 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-TheHungerer-68927" value: { - dps: 39816.26878 - tps: 29484.66949 - hps: 659.04755 + dps: 40475.04714 + tps: 29933.65215 + hps: 660.61484 } } dps_results: { key: "TestUnholy-AllItems-TheHungerer-69112" value: { - dps: 40132.80926 - tps: 29782.98064 - hps: 659.04755 + dps: 40693.69836 + tps: 30133.2966 + hps: 663.74943 } } dps_results: { key: "TestUnholy-AllItems-Theralion'sMirror-59519" value: { - dps: 39262.53641 - tps: 29380.71288 - hps: 644.94189 + dps: 39974.20921 + tps: 29842.12429 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Theralion'sMirror-65105" value: { - dps: 39353.04183 - tps: 29474.03022 - hps: 644.94189 + dps: 40046.94649 + tps: 29915.61942 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Throngus'sFinger-56121" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Throngus'sFinger-56449" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Tia'sGrace-55874" value: { - dps: 39451.97228 - tps: 29458.97531 - hps: 644.94189 + dps: 40180.1331 + tps: 29926.29803 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Tia'sGrace-56394" value: { - dps: 39563.97753 - tps: 29558.36087 - hps: 644.94189 + dps: 40303.47302 + tps: 30034.51654 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-TinyAbominationinaJar-50706" value: { - dps: 39235.9004 - tps: 29186.11816 - hps: 685.69156 + dps: 39886.22462 + tps: 29567.76635 + hps: 680.98968 } } dps_results: { key: "TestUnholy-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-UnheededWarning-59520" value: { - dps: 39407.16268 - tps: 29355.42769 - hps: 644.94189 + dps: 40168.79851 + tps: 29840.88282 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-UnquenchableFlame-67101" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-UnsolvableRiddle-62463" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-UnsolvableRiddle-62468" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-UnsolvableRiddle-68709" value: { - dps: 39245.41233 - tps: 29359.73065 - hps: 644.94189 + dps: 39960.62393 + tps: 29823.91413 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 39301.06601 - tps: 29328.09157 - hps: 644.94189 + dps: 39852.12096 + tps: 29784.23736 + hps: 646.50919 } } dps_results: { key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 39388.40762 - tps: 29404.61924 - hps: 644.15825 + dps: 39962.47664 + tps: 29847.95906 + hps: 646.50919 } } dps_results: { key: "TestUnholy-AllItems-Varo'then'sBrooch-72899" value: { - dps: 41011.46144 - tps: 30728.20754 - hps: 644.94189 + dps: 41749.04316 + tps: 31214.35505 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-VeilofLies-72900" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 679.72393 + dps: 39435.0552 + tps: 29251.64027 + hps: 685.5053 } } dps_results: { key: "TestUnholy-AllItems-VesselofAcceleration-68995" value: { - dps: 41048.1528 - tps: 30493.87963 - hps: 659.8312 + dps: 41757.30985 + tps: 30954.23613 + hps: 665.31673 } } dps_results: { key: "TestUnholy-AllItems-VialofShadows-77207" value: { - dps: 39691.23765 - tps: 29536.67267 - hps: 644.94189 + dps: 40430.56621 + tps: 30076.04045 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-VialofShadows-77979" value: { - dps: 39613.84506 - tps: 29487.59965 - hps: 644.94189 + dps: 40359.71803 + tps: 30023.13045 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-VialofShadows-77999" value: { - dps: 39770.28276 - tps: 29600.57307 - hps: 644.94189 + dps: 40556.23944 + tps: 30173.68465 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-VialofStolenMemories-59515" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 674.09831 + dps: 39435.0552 + tps: 29251.64027 + hps: 679.83183 } } dps_results: { key: "TestUnholy-AllItems-VialofStolenMemories-65109" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 677.84872 + dps: 39435.0552 + tps: 29251.64027 + hps: 683.61414 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 39449.95636 - tps: 29291.58694 - hps: 657.48025 + dps: 40067.45049 + tps: 29703.28941 + hps: 663.74943 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 39428.39689 - tps: 29321.97632 - hps: 657.48025 + dps: 40151.48327 + tps: 29799.22143 + hps: 662.96579 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 39037.97395 - tps: 29063.00541 - hps: 655.12931 + dps: 39728.65523 + tps: 29531.09873 + hps: 659.8312 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 39276.02048 - tps: 29393.10447 - hps: 644.94189 + dps: 39991.77968 + tps: 29857.83436 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 39093.15273 - tps: 29021.54935 - hps: 644.94189 + dps: 39828.74366 + tps: 29499.13691 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 38728.91547 - tps: 28796.359 - hps: 644.94189 + dps: 39435.08337 + tps: 29251.69379 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 40044.07899 - tps: 29722.12635 - hps: 644.94189 + dps: 40765.88725 + tps: 30200.91085 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WillofUnbinding-77198" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WillofUnbinding-77975" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WillofUnbinding-77995" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 644.94189 + dps: 39435.0552 + tps: 29251.64027 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WitchingHourglass-55787" value: { - dps: 39113.48007 - tps: 29108.86431 - hps: 653.56202 + dps: 39866.13877 + tps: 29598.96083 + hps: 652.77837 } } dps_results: { key: "TestUnholy-AllItems-WitchingHourglass-56320" value: { - dps: 39167.55641 - tps: 29036.16962 - hps: 652.77837 + dps: 39804.48243 + tps: 29502.47287 + hps: 655.91296 } } dps_results: { key: "TestUnholy-AllItems-World-QuellerFocus-63842" value: { - dps: 39081.18376 - tps: 29180.65487 - hps: 644.94189 + dps: 39793.45715 + tps: 29641.90647 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WrathofUnchaining-77197" value: { - dps: 39629.65769 - tps: 29422.88542 - hps: 644.94189 + dps: 40417.45625 + tps: 29909.37938 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WrathofUnchaining-77974" value: { - dps: 39533.68206 - tps: 29356.70788 - hps: 644.94189 + dps: 40313.91547 + tps: 29847.18609 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-WrathofUnchaining-77994" value: { - dps: 39711.41252 - tps: 29458.7449 - hps: 644.94189 + dps: 40523.06074 + tps: 29961.31911 + hps: 650.42743 } } dps_results: { key: "TestUnholy-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 664.84327 + dps: 39435.0552 + tps: 29251.64027 + hps: 670.49807 } } dps_results: { key: "TestUnholy-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 38729.08182 - tps: 28796.67507 - hps: 664.84327 + dps: 39435.0552 + tps: 29251.64027 + hps: 670.49807 } } dps_results: { key: "TestUnholy-Average-Default" value: { - dps: 41310.01622 - tps: 30587.89909 - hps: 625.41199 + dps: 41953.89804 + tps: 31026.49403 + hps: 626.81602 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 73113.83584 - tps: 87152.23482 - hps: 654.34566 + dps: 73787.61022 + tps: 87624.70832 + hps: 659.8312 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 41350.07907 - tps: 30721.32138 - hps: 661.39849 + dps: 42064.34036 + tps: 31175.2006 + hps: 667.66767 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 54272.73856 - tps: 35364.13394 - hps: 814.9934 + dps: 55361.87062 + tps: 35671.67039 + hps: 811.07516 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 47128.74583 - tps: 55381.14185 - hps: 514.96995 + dps: 46928.75036 + tps: 55540.65881 + hps: 520.64455 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 26834.73293 - tps: 20083.84071 - hps: 515.67928 + dps: 26559.48216 + tps: 19964.58505 + hps: 514.96995 } } dps_results: { key: "TestUnholy-Settings-Orc-p3.bis-Basic-default-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32762.67724 - tps: 21923.41606 - hps: 556.82013 + dps: 32081.30342 + tps: 21987.73205 + hps: 571.00663 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 72657.32846 - tps: 87147.40803 - hps: 664.47075 + dps: 73352.04733 + tps: 87805.9111 + hps: 666.0379 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 41052.96714 - tps: 30910.79836 - hps: 666.82147 + dps: 41678.15151 + tps: 31272.86922 + hps: 673.87364 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 53458.46868 - tps: 35410.75143 - hps: 818.83483 + dps: 54536.39646 + tps: 35745.42187 + hps: 814.91696 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 46830.04853 - tps: 55476.55303 - hps: 519.88391 + dps: 46756.51691 + tps: 55776.02998 + hps: 524.8487 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 26615.12586 - tps: 20150.74509 - hps: 522.01168 + dps: 26405.02779 + tps: 20078.45653 + hps: 523.43019 } } dps_results: { key: "TestUnholy-Settings-Worgen-p3.bis-Basic-default-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32265.39775 - tps: 21878.91955 - hps: 563.85772 + dps: 31799.47218 + tps: 22029.92405 + hps: 581.5891 } } dps_results: { key: "TestUnholy-SwitchInFrontOfTarget-Default" value: { - dps: 38951.3329 - tps: 29003.35621 - hps: 604.19222 + dps: 39622.50052 + tps: 29368.3713 + hps: 605.75952 } } diff --git a/sim/death_knight/unholy/unholy_test.go b/sim/death_knight/unholy/unholy_test.go index e66f7d0809..b34f9f5e2b 100644 --- a/sim/death_knight/unholy/unholy_test.go +++ b/sim/death_knight/unholy/unholy_test.go @@ -57,6 +57,7 @@ var FullConsumes = &proto.Consumes{ DefaultPotion: proto.Potions_GolembloodPotion, PrepopPotion: proto.Potions_GolembloodPotion, Food: proto.Food_FoodBeerBasedCrocolisk, + TinkerHands: proto.TinkerHands_TinkerHandsSynapseSprings, } var ItemFilter = core.ItemFilter{ diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 127cea7def..a42682fa08 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -38,7 +38,7 @@ export const simLaunchStatuses: Record = { status: LaunchStatus.Launched, }, [Spec.SpecUnholyDeathKnight]: { - phase: Phase.Phase2, + phase: Phase.Phase3, status: LaunchStatus.Launched, }, // Druid diff --git a/ui/death_knight/unholy/apls/default.apl.json b/ui/death_knight/unholy/apls/default.apl.json index 8b712c1497..291e7a9850 100644 --- a/ui/death_knight/unholy/apls/default.apl.json +++ b/ui/death_knight/unholy/apls/default.apl.json @@ -25,25 +25,6 @@ "castSpell": { "spellId": { "spellId": 63560 } } } }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } }, - { - "cmp": { "op": "OpLe", "lhs": { "dotRemainingTime": { "spellId": { "spellId": 55078 } } }, "rhs": { "const": { "val": "3s" } } } - }, - { - "cmp": { "op": "OpLe", "lhs": { "dotRemainingTime": { "spellId": { "spellId": 55095 } } }, "rhs": { "const": { "val": "3s" } } } - }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "3s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } - } - }, { "action": { "condition": { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "5s" } } } }, @@ -53,146 +34,46 @@ { "action": { "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, "auraId": { "spellId": 63560 } } }, - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "5s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "30s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { - "and": { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } } + ] } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ + }, { "and": { "vals": [ { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "15s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] + "auraIsActive": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } + { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } } ] } }, { "and": { "vals": [ + { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }, { "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "15s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } - ] - } - } + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } } ] } - }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + } ] } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 33697 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 26297 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] - } - } + }, + { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } } ] } }, @@ -202,68 +83,84 @@ { "action": { "condition": { - "and": { + "or": { "vals": [ { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } } + ] } }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "cmp": { "op": "OpLe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "20s" } } } }, - { "auraIsActive": { "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, "auraId": { "spellId": 63560 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49206 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "21s" } } } }, { - "or": { + "and": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, { "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "10.5s" } } + } + } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "10.5s" } } + } + } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "itemId": 58146 } } }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, + "rhs": { "const": { "val": "10.5s" } } + } + } + ] + } + } ] } - } + }, + { "spellIsReady": { "spellId": { "spellId": 49206 } } } ] } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49206 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "13s" } } } }, { "not": { "val": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "179s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "240s" } } } } - ] + "cmp": { + "op": "OpLt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 49206 } } }, + "rhs": { "const": { "val": "30s" } } } } } - } + }, + { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } } ] } }, @@ -273,79 +170,62 @@ { "action": { "condition": { - "and": { + "or": { "vals": [ { "and": { "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "179s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "240s" } } } } + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { "spellIsKnown": { "spellId": { "spellId": 26297 } } } ] } }, { - "or": { + "and": { "vals": [ + { "auraIsActive": { "auraId": { "itemId": 58146 } } }, { - "and": { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "10.5s" } } + "op": "OpGe", + "lhs": { + "auraRemainingTime": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } + } + }, + "rhs": { "const": { "val": "7.5s" } } } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, + }, { "cmp": { "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, + "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, "rhs": { "const": { "val": "10.5s" } } } } ] } - } + }, + { "spellIsKnown": { "spellId": { "spellId": 26297 } } } + ] + } + }, + { + "and": { + "vals": [ + { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "10.5s" } } } }, + { "spellIsKnown": { "spellId": { "spellId": 26297 } } } ] } } ] } }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "9s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "12s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 33697 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "14s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 49016 } } } - ] - } - }, "castSpell": { "spellId": { "spellId": 26297 } } } }, @@ -357,17 +237,29 @@ { "and": { "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { + "cmp": { + "op": "OpLe", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "15s" } } + } + }, + { + "cmp": { + "op": "OpLe", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "15s" } } + } + } ] } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } } + } ] } }, @@ -383,11 +275,11 @@ { "cmp": { "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "15s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } + { "auraIsActive": { "auraId": { "spellId": 91364 } } } ] } }, @@ -397,18 +289,18 @@ { "cmp": { "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "15s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + { "auraIsActive": { "auraId": { "spellId": 92345 } } } ] } } ] } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } } + { "spellIsReady": { "spellId": { "spellId": 49206 } } } ] } }, @@ -418,14 +310,12 @@ "vals": [ { "cmp": { - "op": "OpLt", + "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, - "rhs": { "const": { "val": "5s" } } + "rhs": { "const": { "val": "15s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } } + { "auraIsActive": { "auraId": { "itemId": 58146 } } } ] } } @@ -443,18 +333,63 @@ { "and": { "vals": [ + { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, { "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + { + "cmp": { + "op": "OpGt", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 49016 } } }, + "rhs": { + "math": { "op": "OpSub", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "23s" } } } + } + } + }, + { "spellIsReady": { "spellId": { "spellId": 49206 } } } ] } - }, + } + ] + } + }, + { + "and": { + "vals": [{ "auraIsActive": { "auraId": { "spellId": 49016 } } }, { "spellIsReady": { "spellId": { "spellId": 49206 } } }] + } + } + ] + } + }, + "castSpell": { "spellId": { "itemId": 58146 } } + } + }, + { + "action": { + "condition": { + "or": { + "vals": [ + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 53365 } } }, { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } + { + "or": { + "vals": [ + { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } }, + { + "auraIsActive": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } + } + } + ] + } + }, + { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "6s" } } } } ] } }, @@ -470,11 +405,11 @@ { "cmp": { "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "4s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } + { "auraIsActive": { "auraId": { "spellId": 91364 } } } ] } }, @@ -484,18 +419,53 @@ { "cmp": { "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "4s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } + { "auraIsActive": { "auraId": { "spellId": 92345 } } } ] } } ] } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } + ] + } + }, + { + "and": { + "vals": [ + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } } + ] + } + }, + { + "or": { + "vals": [ + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "4s" } } + } + }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "4s" } } + } + } + ] + } + }, { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } ] } @@ -513,14 +483,12 @@ "vals": [ { "cmp": { - "op": "OpLt", + "op": "OpLe", "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, - "rhs": { "const": { "val": "5s" } } + "rhs": { "const": { "val": "4s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } ] } @@ -534,52 +502,33 @@ { "action": { "condition": { - "or": { + "and": { "vals": [ + { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "45s" } } } }, { - "and": { + "or": { "vals": [ - { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpGt", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 49016 } } }, - "rhs": { - "math": { "op": "OpSub", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "23s" } } } - } - } - }, - { "spellIsReady": { "spellId": { "spellId": 49206 } } } - ] - } - } + { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, + { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } } ] } - }, - { - "and": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 49016 } } }, { "spellIsReady": { "spellId": { "spellId": 49206 } } }] - } } ] } }, - "castSpell": { "spellId": { "itemId": 58146 } } + "castSpell": { "spellId": { "spellId": 77575 } } } }, { "action": { - "condition": { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - "castSpell": { "spellId": { "spellId": 49016 } } + "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, + "castSpell": { "spellId": { "spellId": 45477 } } } }, { "action": { - "condition": { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - "castSpell": { "spellId": { "spellId": 82174 } } + "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } }, + "castSpell": { "spellId": { "spellId": 45462, "tag": 1 } } } }, { @@ -587,12 +536,40 @@ "condition": { "and": { "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30s" } } } }, + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "8s" } } } }, { "or": { "vals": [ - { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, - { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } } + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { + "math": { + "op": "OpSub", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, + "rhs": { "const": { "val": "1" } } + } + } + } + }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { + "math": { + "op": "OpSub", + "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, + "rhs": { "const": { "val": "1" } } + } + } + } + }, + { "auraIsActive": { "auraId": { "spellId": 96229 } } } ] } } @@ -604,14 +581,57 @@ }, { "action": { - "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, - "castSpell": { "spellId": { "spellId": 45477 } } - } - }, - { - "action": { - "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } }, - "castSpell": { "spellId": { "spellId": 45462, "tag": 1 } } + "condition": { + "and": { + "vals": [ + { + "and": { + "vals": [ + { + "cmp": { + "op": "OpLe", + "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, + "rhs": { "const": { "val": "3s" } } + } + }, + { "auraIsActive": { "auraId": { "itemId": 58146 } } } + ] + } + }, + { + "or": { + "vals": [ + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } } + ] + } + } + ] + } + } + ] + } + }, + "castSpell": { "spellId": { "spellId": 77575 } } } }, { @@ -619,54 +639,61 @@ "condition": { "and": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 92345 } } }, { "auraIsActive": { "auraId": { "spellId": 91816 } } }] - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "7s" } } } }, { "or": { "vals": [ { - "or": { + "and": { "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { - "math": { - "op": "OpSub", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, - "rhs": { "const": { "val": "1" } } - } - } - } - } - ] + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "2s" } } + } + }, + { "auraIsKnown": { "auraId": { "spellId": 91364 } } } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 53365 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "2s" } } } }, + { "auraIsKnown": { "auraId": { "spellId": 92345 } } } + ] + } + }, + { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 91364 } } }, + { "auraIsActive": { "auraId": { "spellId": 92345 } } }, { - "and": { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { - "math": { - "op": "OpSub", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, - "rhs": { "const": { "val": "1" } } - } - } + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, + "rhs": { "const": { "val": "2s" } } + } + }, + { + "cmp": { + "op": "OpLt", + "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, + "rhs": { "const": { "val": "2s" } } } } ] @@ -674,8 +701,7 @@ } ] } - }, - { "auraIsActive": { "auraId": { "spellId": 96229 } } } + } ] } } @@ -688,31 +714,98 @@ { "action": { "condition": { - "or": { + "and": { "vals": [ { - "and": { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "2s" } } + "op": "OpGt", + "lhs": { "runeSlotCooldown": { "runeSlot": "SlotLeftBlood" } }, + "rhs": { "const": { "val": "5.5s" } } + } + }, + { + "and": { + "vals": [ + { + "cmp": { + "op": "OpGe", + "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, + "rhs": { "const": { "val": "1" } } + } + }, + { + "cmp": { + "op": "OpEq", + "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, + "rhs": { "const": { "val": "0" } } + } + }, + { + "cmp": { + "op": "OpGe", + "lhs": { "runeCooldown": { "runeType": "RuneFrost" } }, + "rhs": { "const": { "val": "3.5s" } } + } + } + ] } } ] } }, { - "and": { + "or": { + "vals": [ + { "not": { "val": { "currentRuneDeath": { "runeSlot": "SlotLeftBlood" } } } }, + { "not": { "val": { "currentRuneDeath": { "runeSlot": "SlotRightBlood" } } } } + ] + } + } + ] + } + }, + "castSpell": { "spellId": { "spellId": 45529 } } + } + }, + { + "action": { + "condition": { + "and": { + "vals": [ + { + "cmp": { + "op": "OpLt", + "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, + "rhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } } + } + }, + { + "or": { "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "2s" } } + "and": { + "vals": [ + { "not": { "val": { "currentRuneDeath": { "runeSlot": "SlotLeftFrost" } } } }, + { "not": { "val": { "currentRuneDeath": { "runeSlot": "SlotRightFrost" } } } } + ] + } + }, + { + "and": { + "vals": [ + { "currentRuneDeath": { "runeSlot": "SlotLeftBlood" } }, + { "currentRuneDeath": { "runeSlot": "SlotRightBlood" } }, + { + "cmp": { + "op": "OpLt", + "lhs": { "nextRuneCooldown": { "runeType": "RuneFrost" } }, + "rhs": { "nextRuneCooldown": { "runeType": "RuneBlood" } } + } + } + ] } } ] @@ -721,7 +814,7 @@ ] } }, - "castSpell": { "spellId": { "spellId": 77575 } } + "cancelAura": { "auraId": { "spellId": 45529 } } } }, { @@ -811,21 +904,6 @@ "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } } }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, "rhs": { "const": { "val": "1" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "10s" } } } }, - { "not": { "val": { "spellIsReady": { "spellId": { "spellId": 43265 } } } } }, - { "cmp": { "op": "OpLe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "90" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 45529 } } - } - }, { "action": { "condition": { "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "6s" } } } }, @@ -1030,6 +1108,90 @@ "castSpell": { "spellId": { "spellId": 55090, "tag": 1 } } } }, + { + "action": { + "condition": { + "and": { + "vals": [ + { + "not": { + "val": { + "auraIsActive": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } + } + } + } + }, + { + "cmp": { + "op": "OpEq", + "lhs": { + "auraNumStacks": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 91342 } + } + }, + "rhs": { "const": { "val": "4" } } + } + }, + { + "or": { + "vals": [ + { "cmp": { "op": "OpGe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "34" } } } }, + { "auraIsActive": { "auraId": { "spellId": 81340 } } } + ] + } + } + ] + } + }, + "castSpell": { "spellId": { "spellId": 47541 } } + } + }, + { + "action": { + "condition": { + "and": { + "vals": [ + { "auraIsActive": { "auraId": { "spellId": 81340 } } }, + { "cmp": { "op": "OpGt", "lhs": { "nextRuneCooldown": { "runeType": "RuneBlood" } }, "rhs": { "const": { "val": "3s" } } } }, + { "cmp": { "op": "OpGt", "lhs": { "nextRuneCooldown": { "runeType": "RuneFrost" } }, "rhs": { "const": { "val": "3s" } } } }, + { "cmp": { "op": "OpGt", "lhs": { "nextRuneCooldown": { "runeType": "RuneUnholy" } }, "rhs": { "const": { "val": "3s" } } } }, + { + "not": { + "val": { + "and": { + "vals": [ + { + "auraIsActive": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } + } + }, + { + "cmp": { + "op": "OpLt", + "lhs": { + "auraRemainingTime": { + "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, + "auraId": { "spellId": 63560 } + } + }, + "rhs": { "const": { "val": "2s" } } + } + } + ] + } + } + } + } + ] + } + }, + "castSpell": { "spellId": { "spellId": 47541 } } + } + }, { "action": { "castSpell": { "spellId": { "spellId": 55090, "tag": 1 } } } }, { "action": { @@ -1240,59 +1402,7 @@ "castSpell": { "spellId": { "spellId": 47541 } } } }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "10s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "runeSlotCooldown": { "runeSlot": "SlotLeftBlood" } }, "rhs": { "const": { "val": "5.5s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 45529 } } - } - }, { "action": { "castSpell": { "spellId": { "spellId": 57330 } } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 45529 } } }, - "rhs": { "const": { "val": "11s" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "1" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "0" } } - } - } - ] - } - }, - { "cmp": { "op": "OpEq", "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, "rhs": { "const": { "val": "2" } } } } - ] - } - }, - "cancelAura": { "auraId": { "spellId": 45529 } } - } - }, { "action": { "condition": { diff --git a/ui/death_knight/unholy/apls/solace.apl.json b/ui/death_knight/unholy/apls/solace.apl.json deleted file mode 100644 index 0a400a0e1b..0000000000 --- a/ui/death_knight/unholy/apls/solace.apl.json +++ /dev/null @@ -1,1719 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - { "action": { "castSpell": { "spellId": { "spellId": 48265 } } }, "doAtValue": { "const": { "val": "-20s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 57330 } } }, "doAtValue": { "const": { "val": "-12s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 47541 } } }, "doAtValue": { "const": { "val": "-11s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 47541 } } }, "doAtValue": { "const": { "val": "-10s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 47541 } } }, "doAtValue": { "const": { "val": "-9s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 47541 } } }, "doAtValue": { "const": { "val": "-8s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 42650 } } }, "doAtValue": { "const": { "val": "-7s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 47541 } } }, "doAtValue": { "const": { "val": "-1s" } } }, - { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-1s" } } } - ], - "priorityList": [ - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "15s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "5s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 63560 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } }, - { - "cmp": { "op": "OpLe", "lhs": { "dotRemainingTime": { "spellId": { "spellId": 55078 } } }, "rhs": { "const": { "val": "3s" } } } - }, - { - "cmp": { "op": "OpLe", "lhs": { "dotRemainingTime": { "spellId": { "spellId": 55095 } } }, "rhs": { "const": { "val": "3s" } } } - }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "3s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "5s" } } } }, - "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, "auraId": { "spellId": 63560 } } }, - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "5s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "30s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "15s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "15s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "15s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - } - ] - } - }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 33697 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 26297 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "204s" } } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "cmp": { "op": "OpLe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "20s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { "auraIsActive": { "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, "auraId": { "spellId": 63560 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49206 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "20s" } } } }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - } - ] - } - }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "60s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49206 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "13s" } } } }, - { - "not": { - "val": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "179s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "240s" } } } } - ] - } - } - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "179s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "240s" } } } } - ] - } - }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "10.5s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "10.5s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "10.5s" } } - } - } - ] - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "9s" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "12s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 33697 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "14s" } } } }, - { "auraIsActive": { "auraId": { "spellId": 49016 } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 26297 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } - } - } - ] - } - } - ] - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } } - ] - } - }, - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 33697 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "6s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 91816 } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - } - ] - } - }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "5s" } } - } - } - ] - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "itemId": 58146 } } }, - "rhs": { "const": { "val": "5s" } } - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "200s" } } } }, - { "auraIsActive": { "auraId": { "itemId": 58146 } } }, - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "7s" } } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 49206 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpGt", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 49016 } } }, - "rhs": { - "math": { "op": "OpSub", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "23s" } } } - } - } - }, - { "spellIsReady": { "spellId": { "spellId": 49206 } } } - ] - } - } - ] - } - }, - { - "and": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 49016 } } }, { "spellIsReady": { "spellId": { "spellId": 49206 } } }] - } - } - ] - } - }, - "castSpell": { "spellId": { "itemId": 58146 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - "castSpell": { "spellId": { "spellId": 49016 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "35s" } } } }, - "castSpell": { "spellId": { "spellId": 82174 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "30s" } } } }, - { - "or": { - "vals": [ - { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, - { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 77575 } } - } - }, - { - "action": { - "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55095 } } } } }, - "castSpell": { "spellId": { "spellId": 45477 } } - } - }, - { - "action": { - "condition": { "not": { "val": { "dotIsActive": { "spellId": { "spellId": 55078 } } } } }, - "castSpell": { "spellId": { "spellId": 45462, "tag": 1 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 91816 } } }, { "auraIsActive": { "auraId": { "spellId": 92345 } } }] - } - }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "8s" } } } }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { - "math": { - "op": "OpSub", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, - "rhs": { "const": { "val": "1" } } - } - } - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { - "math": { - "op": "OpSub", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, - "rhs": { "const": { "val": "1" } } - } - } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { - "math": { - "op": "OpSub", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 82174 } } }, - "rhs": { "const": { "val": "1" } } - } - } - } - } - ] - } - }, - { "auraIsActive": { "auraId": { "spellId": 96229 } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 77575 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "21s" } } } }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - } - ] - } - } - ] - } - }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "30s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 77575 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "30s" } } } }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 53365 } } }, - { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - } - ] - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91364 } } }, - { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { "auraIsActive": { "auraId": { "spellId": 92345 } } } - ] - } - }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91364 } } }, - "rhs": { "const": { "val": "2s" } } - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 91816 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 91816 } } }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 92345 } } }, - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 92345 } } }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - } - ] - } - } - ] - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 77575 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "99" } } } }, - { - "not": { - "val": { - "or": { - "vals": [ - { - "cmp": { - "op": "OpGe", - "lhs": { "currentRuneCount": { "runeType": "RuneDeath" } }, - "rhs": { "const": { "val": "3" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneUnholy" } }, - "rhs": { "const": { "val": "2" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "2" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "2" } } - } - }, - { - "and": { - "vals": [ - { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - { - "cmp": { - "op": "OpLe", - "lhs": { - "auraRemainingTime": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - } - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 47541 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, "rhs": { "const": { "val": "2" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "6s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, "rhs": { "const": { "val": "1" } } } }, - { "cmp": { "op": "OpLt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "10s" } } } }, - { "not": { "val": { "spellIsReady": { "spellId": { "spellId": 43265 } } } } }, - { "cmp": { "op": "OpLe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "90" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 45529 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpGe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "6s" } } } }, - "castSpell": { "spellId": { "spellId": 43265 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "not": { - "val": { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraNumStacks": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 91342 } - } - }, - "rhs": { "const": { "val": "5" } } - } - }, - { "cmp": { "op": "OpGe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "102" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 47541 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { "cmp": { "op": "OpEq", "lhs": { "currentRuneCount": { "runeType": "RuneUnholy" } }, "rhs": { "const": { "val": "2" } } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneUnholy" } }, - "rhs": { "const": { "val": "1" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "nextRuneCooldown": { "runeType": "RuneUnholy" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 55090, "tag": 1 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "2" } } - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "1" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "nextRuneCooldown": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - }, - { - "or": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "2" } } - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "1" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "nextRuneCooldown": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "currentRuneDeath": { "runeSlot": "SlotLeftBlood" } }, - { "currentRuneDeath": { "runeSlot": "SlotRightBlood" } }, - { - "cmp": { - "op": "OpLe", - "lhs": { "runeSlotCooldown": { "runeSlot": "SlotLeftBlood" } }, - "rhs": { "const": { "val": "1s" } } - } - }, - { - "cmp": { - "op": "OpLe", - "lhs": { "runeSlotCooldown": { "runeSlot": "SlotRightBlood" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "currentRuneDeath": { "runeSlot": "SlotLeftFrost" } }, - { "currentRuneDeath": { "runeSlot": "SlotRightFrost" } }, - { - "cmp": { - "op": "OpLe", - "lhs": { "runeSlotCooldown": { "runeSlot": "SlotLeftFrost" } }, - "rhs": { "const": { "val": "1s" } } - } - }, - { - "cmp": { - "op": "OpLe", - "lhs": { "runeSlotCooldown": { "runeSlot": "SlotRightFrost" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 55090, "tag": 1 } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 55090, "tag": 1 } } } }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "not": { - "val": { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraNumStacks": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 91342 } - } - }, - "rhs": { "const": { "val": "5" } } - } - }, - { "cmp": { "op": "OpGe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "44" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 47541 } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 85948, "tag": 1 } } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { "not": { "val": { "spellIsReady": { "spellId": { "spellId": 49206 } } } } }, - { - "not": { - "val": { - "and": { - "vals": [ - { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraRemainingTime": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - "rhs": { "const": { "val": "4s" } } - } - } - ] - } - } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 81340 } } }, - { - "not": { - "val": { - "and": { - "vals": [ - { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraRemainingTime": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - "rhs": { "const": { "val": "2s" } } - } - } - ] - } - } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "cmp": { "op": "OpGe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "80" } } } }, - { - "not": { - "val": { - "and": { - "vals": [ - { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraRemainingTime": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - "rhs": { "const": { "val": "3s" } } - } - } - ] - } - } - } - } - ] - } - }, - { - "and": { - "vals": [ - { "spellIsReady": { "spellId": { "spellId": 49206 } } }, - { - "not": { - "val": { - "and": { - "vals": [ - { - "auraIsActive": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { - "auraRemainingTime": { - "sourceUnit": { "type": "Pet", "index": 1, "owner": { "type": "Self" } }, - "auraId": { "spellId": 63560 } - } - }, - "rhs": { "const": { "val": "4s" } } - } - } - ] - } - } - } - }, - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "175s" } } } }, - { - "cmp": { - "op": "OpGt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 49016 } } }, - "rhs": { "const": { "val": "25s" } } - } - }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "40s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { "cmp": { "op": "OpLt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "15s" } } } }, - { - "cmp": { - "op": "OpGt", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 49206 } } }, - "rhs": { "math": { "op": "OpSub", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "8" } } } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 47541 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "10s" } } } }, - { "cmp": { "op": "OpGt", "lhs": { "runeSlotCooldown": { "runeSlot": "SlotLeftBlood" } }, "rhs": { "const": { "val": "5.5s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 45529 } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 57330 } } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLe", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 45529 } } }, - "rhs": { "const": { "val": "11s" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "1" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "0" } } - } - } - ] - } - }, - { "cmp": { "op": "OpEq", "lhs": { "currentNonDeathRuneCount": { "runeType": "RuneFrost" } }, "rhs": { "const": { "val": "2" } } } } - ] - } - }, - "cancelAura": { "auraId": { "spellId": 45529 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } } } }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 51460 } } } } }, - { "cmp": { "op": "OpLe", "lhs": { "currentRunicPower": {} }, "rhs": { "const": { "val": "38" } } } }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneBlood" } }, - "rhs": { "const": { "val": "0" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneFrost" } }, - "rhs": { "const": { "val": "0" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneUnholy" } }, - "rhs": { "const": { "val": "0" } } - } - }, - { - "cmp": { - "op": "OpEq", - "lhs": { "currentRuneCount": { "runeType": "RuneDeath" } }, - "rhs": { "const": { "val": "0" } } - } - }, - { - "cmp": { "op": "OpGt", "lhs": { "runeCooldown": { "runeType": "RuneBlood" } }, "rhs": { "const": { "val": "1s" } } } - }, - { - "cmp": { "op": "OpGt", "lhs": { "runeCooldown": { "runeType": "RuneFrost" } }, "rhs": { "const": { "val": "1s" } } } - }, - { - "cmp": { - "op": "OpGt", - "lhs": { "runeCooldown": { "runeType": "RuneUnholy" } }, - "rhs": { "const": { "val": "1s" } } - } - } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 47568 } } - } - } - ] -} diff --git a/ui/death_knight/unholy/gear_sets/prebis.gear.json b/ui/death_knight/unholy/gear_sets/prebis.gear.json index f0dd5db3ef..7388f28598 100644 --- a/ui/death_knight/unholy/gear_sets/prebis.gear.json +++ b/ui/death_knight/unholy/gear_sets/prebis.gear.json @@ -1,21 +1,21 @@ { "items": [ - { "id": 59359, "enchant": 4208, "gems": [68779, 59479, 59478] }, - { "id": 62447 }, - { "id": 69582, "enchant": 4202, "gems": [52206], "reforging": 167 }, - { "id": 67140, "enchant": 4100, "reforging": 144 }, - { "id": 60339, "enchant": 4102, "gems": [52206, 52213], "reforging": 144 }, - { "id": 57870, "enchant": 4256, "gems": [52206, 52206], "reforging": 167 }, - { "id": 60340, "enchant": 4106, "gems": [52206, 52206], "reforging": 166 }, - { "id": 55061, "gems": [52206, 52206] }, - { "id": 67141, "enchant": 4126, "gems": [52206, 52206], "reforging": 137 }, - { "id": 58195, "enchant": 4069, "gems": [52206], "reforging": 144 }, - { "id": 58185, "reforging": 165 }, - { "id": 67139, "reforging": 166 }, - { "id": 58180, "reforging": 138 }, + { "id": 60341, "enchant": 4208, "gems": [68779, 52214], "reforging": 159 }, + { "id": 69885, "randomSuffix": -122 }, + { "id": 60343, "enchant": 4202, "gems": [52206], "reforging": 137 }, + { "id": 69879, "randomSuffix": -122, "enchant": 4100 }, + { "id": 71058, "enchant": 4102, "gems": [52206, 52206], "reforging": 167 }, + { "id": 60228, "enchant": 4256, "gems": [52206, 52206], "reforging": 144 }, + { "id": 69936, "enchant": 4106, "gems": [52206, 52206], "reforging": 145 }, + { "id": 71250, "gems": [52206, 52206], "reforging": 145 }, + { "id": 71061, "enchant": 4126, "gems": [52206, 52213], "reforging": 158 }, + { "id": 69946, "enchant": 4069, "gems": [52206], "reforging": 145 }, + { "id": 71208 }, + { "id": 60226, "gems": [52206], "reforging": 167 }, { "id": 56393 }, - { "id": 64377, "enchant": 3368, "reforging": 138 }, + { "id": 65072, "reforging": 160 }, + { "id": 63679, "enchant": 3368, "reforging": 138 }, {}, - { "id": 64674, "gems": [52206], "reforging": 160 } + { "id": 71147, "gems": [52206], "reforging": 144 } ] } diff --git a/ui/death_knight/unholy/presets.ts b/ui/death_knight/unholy/presets.ts index c73c8f5a20..a70b5b10d2 100644 --- a/ui/death_knight/unholy/presets.ts +++ b/ui/death_knight/unholy/presets.ts @@ -1,10 +1,10 @@ import * as PresetUtils from '../../core/preset_utils'; +import { APLRotation_Type as APLRotationType } from '../../core/proto/apl.js'; import { Consumes, Flask, Food, Glyphs, Potions, Profession, PseudoStat, Stat, TinkerHands, UnitReference } from '../../core/proto/common'; import { DeathKnightMajorGlyph, DeathKnightMinorGlyph, DeathKnightPrimeGlyph, UnholyDeathKnight_Options } from '../../core/proto/death_knight'; import { SavedTalents } from '../../core/proto/ui'; import { Stats } from '../../core/proto_utils/stats'; import DefaultApl from '../../death_knight/unholy/apls/default.apl.json'; -import SolaceApl from '../../death_knight/unholy/apls/solace.apl.json'; import P2BISGear from '../../death_knight/unholy/gear_sets/p2.bis.gear.json'; import P3BISGear from '../../death_knight/unholy/gear_sets/p3.bis.gear.json'; import PreBISGear from '../../death_knight/unholy/gear_sets/prebis.gear.json'; @@ -17,7 +17,6 @@ export const P2_BIS_GEAR_PRESET = PresetUtils.makePresetGear('P2 - BIS', P2BISGe export const P3_BIS_GEAR_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3BISGear); export const DEFAULT_ROTATION_PRESET = PresetUtils.makePresetAPLRotation('Default', DefaultApl); -export const SOLACE_SNAPSHOT_ROTATION_PRESET = PresetUtils.makePresetAPLRotation('Solace Snapshot', SolaceApl); // Preset options for EP weights export const P2_UNHOLY_EP_PRESET = PresetUtils.makePresetEpWeights( @@ -43,19 +42,17 @@ export const P3_UNHOLY_EP_PRESET = PresetUtils.makePresetEpWeights( 'P3', Stats.fromMap( { - [Stat.StatStrength]: 4.28, + [Stat.StatStrength]: 4.29, [Stat.StatArmor]: 0.03, [Stat.StatAttackPower]: 1, - [Stat.StatExpertiseRating]: 1.03, - [Stat.StatHasteRating]: 2.38, - [Stat.StatHitRating]: 2.62, + [Stat.StatExpertiseRating]: 1.13, + [Stat.StatHasteRating]: 2.40, + [Stat.StatHitRating]: 2.61, [Stat.StatCritRating]: 2.33, [Stat.StatMasteryRating]: 1.87, }, { - [PseudoStat.PseudoStatMainHandDps]: 6.40, - [PseudoStat.PseudoStatSpellHitPercent]: 156.60, - [PseudoStat.PseudoStatPhysicalHitPercent]: 320.54, + [PseudoStat.PseudoStatMainHandDps]: 6.39, }, ), ); @@ -84,16 +81,19 @@ export const DefaultTalents = { export const PREBIS_PRESET = PresetUtils.makePresetBuild('Pre-bis', { gear: PREBIS_GEAR_PRESET, epWeights: P2_UNHOLY_EP_PRESET, + rotationType: APLRotationType.TypeAuto, }) export const P2_PRESET = PresetUtils.makePresetBuild('P2', { gear: P2_BIS_GEAR_PRESET, epWeights: P2_UNHOLY_EP_PRESET, + rotationType: APLRotationType.TypeAuto, }) export const P3_PRESET = PresetUtils.makePresetBuild('P3', { gear: P3_BIS_GEAR_PRESET, epWeights: P3_UNHOLY_EP_PRESET, + rotationType: APLRotationType.TypeAuto, }) export const DefaultOptions = UnholyDeathKnight_Options.create({ diff --git a/ui/death_knight/unholy/sim.ts b/ui/death_knight/unholy/sim.ts index ab816f647c..b3dd3cf3e4 100644 --- a/ui/death_knight/unholy/sim.ts +++ b/ui/death_knight/unholy/sim.ts @@ -11,18 +11,6 @@ import { Stats, UnitStat } from '../../core/proto_utils/stats'; import * as DeathKnightInputs from '../inputs'; import * as Presets from './presets'; -const pickRotation = (player: Player): APLRotation => { - const hasHcSolace = - player.getEquippedItem(ItemSlot.ItemSlotTrinket1)?.item.id === 56393 || - player.getEquippedItem(ItemSlot.ItemSlotTrinket2)?.item.id === 56393; - - if (hasHcSolace) { - return Presets.SOLACE_SNAPSHOT_ROTATION_PRESET.rotation.rotation!; - } - - return Presets.DEFAULT_ROTATION_PRESET.rotation.rotation!; -}; - const getEPDefaults = (player: Player) => { let hasP3Setup = false; @@ -56,11 +44,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecUnholyDeathKnight, { Stat.StatHasteRating, Stat.StatMasteryRating, ], - epPseudoStats: [ - PseudoStat.PseudoStatMainHandDps, - PseudoStat.PseudoStatPhysicalHitPercent, - PseudoStat.PseudoStatSpellHitPercent, - ], + epPseudoStats: [PseudoStat.PseudoStatMainHandDps], // Reference stat against which to calculate EP. I think all classes use either spell power or attack power. epReferenceStat: Stat.StatAttackPower, // Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar. @@ -76,9 +60,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecUnholyDeathKnight, { ), defaults: { // Default equipped gear. - gear: Presets.P2_BIS_GEAR_PRESET.gear, + gear: Presets.P3_BIS_GEAR_PRESET.gear, // Default EP weights for sorting gear in the gear picker. - epWeights: Presets.P2_UNHOLY_EP_PRESET.epWeights, + epWeights: Presets.P3_UNHOLY_EP_PRESET.epWeights, // Default stat caps for the Reforge Optimizer statCaps: (() => { const hitCap = new Stats().withPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, 8); @@ -115,7 +99,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecUnholyDeathKnight, { }), }, - autoRotation: pickRotation, + autoRotation: (_: Player): APLRotation => Presets.DEFAULT_ROTATION_PRESET.rotation.rotation!, // IconInputs to include in the 'Player' section on the settings tab. playerIconInputs: [], @@ -147,14 +131,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecUnholyDeathKnight, { presets: { epWeights: [Presets.P2_UNHOLY_EP_PRESET, Presets.P3_UNHOLY_EP_PRESET], // Preset talents that the user can quickly select. - talents: [ - Presets.DefaultTalents, - ], + talents: [Presets.DefaultTalents], // Preset rotations that the user can quickly select. - rotations: [ - Presets.DEFAULT_ROTATION_PRESET, - Presets.SOLACE_SNAPSHOT_ROTATION_PRESET, - ], + rotations: [Presets.DEFAULT_ROTATION_PRESET], // Preset gear configurations that the user can quickly select. gear: [Presets.PREBIS_GEAR_PRESET, Presets.P2_BIS_GEAR_PRESET, Presets.P3_BIS_GEAR_PRESET], builds: [Presets.PREBIS_PRESET, Presets.P2_PRESET, Presets.P3_PRESET], @@ -176,14 +155,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecUnholyDeathKnight, { [Faction.Alliance]: { 1: Presets.P2_BIS_GEAR_PRESET.gear, 2: Presets.P2_BIS_GEAR_PRESET.gear, - 3: Presets.P2_BIS_GEAR_PRESET.gear, - 4: Presets.P2_BIS_GEAR_PRESET.gear, + 3: Presets.P3_BIS_GEAR_PRESET.gear, + 4: Presets.P3_BIS_GEAR_PRESET.gear, }, [Faction.Horde]: { 1: Presets.P2_BIS_GEAR_PRESET.gear, 2: Presets.P2_BIS_GEAR_PRESET.gear, - 3: Presets.P2_BIS_GEAR_PRESET.gear, - 4: Presets.P2_BIS_GEAR_PRESET.gear, + 3: Presets.P3_BIS_GEAR_PRESET.gear, + 4: Presets.P3_BIS_GEAR_PRESET.gear, }, }, otherDefaults: Presets.OtherDefaults,