From da3d4367c3b8ba0ee25896842be6139f8476dc43 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Sat, 23 Sep 2023 04:05:12 -0700 Subject: [PATCH] Move ele and enhance shaman to Beta APL --- sim/shaman/elemental/TestElemental.results | 694 +++++++------- sim/shaman/elemental/elemental_test.go | 153 ++-- .../enhancement/TestEnhancement.results | 844 ++++++++++-------- sim/shaman/enhancement/enhancement_test.go | 214 ++--- ui/core/launched_sims.ts | 4 +- ui/core/sim_ui.ts | 5 +- ui/elemental_shaman/presets.ts | 34 +- ui/elemental_shaman/sim.ts | 13 +- ui/enhancement_shaman/sim.ts | 25 +- 9 files changed, 996 insertions(+), 990 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index e53f566be4..3cbcf6da3c 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -49,12 +49,12 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.37294 + weights: 0.35511 weights: 0 - weights: 1.50648 + weights: 1.67793 weights: 0 weights: 0 - weights: 1.0093 + weights: 1.03944 weights: 0 weights: 0 weights: 0 @@ -91,1116 +91,1116 @@ stat_weights_results: { dps_results: { key: "TestElemental-AllItems-Althor'sAbacus-50359" value: { - dps: 6561.39153 - tps: 4158.58965 + dps: 7222.83456 + tps: 4087.29431 } } dps_results: { key: "TestElemental-AllItems-Althor'sAbacus-50366" value: { - dps: 6593.51074 - tps: 4178.75995 + dps: 7258.25953 + tps: 4107.10665 } } dps_results: { key: "TestElemental-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-Bandit'sInsignia-40371" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6303.77892 - tps: 3996.97061 - hps: 91.87737 + dps: 6930.28525 + tps: 3914.52834 + hps: 92.28755 } } dps_results: { key: "TestElemental-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6303.77892 - tps: 3996.97061 - hps: 91.87737 + dps: 6930.28525 + tps: 3914.52834 + hps: 92.28755 } } dps_results: { key: "TestElemental-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6485.36987 - tps: 4089.3109 + dps: 7195.64996 + tps: 4030.58855 } } dps_results: { key: "TestElemental-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6300.50836 - tps: 3988.43333 + dps: 6990.81007 + tps: 3933.01055 } } dps_results: { key: "TestElemental-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - dps: 6849.78888 - tps: 4325.42122 + dps: 7587.45378 + tps: 4286.7679 } } dps_results: { key: "TestElemental-AllItems-BlackBruise-50035" value: { - dps: 5741.29537 - tps: 3631.12507 + dps: 6348.54429 + tps: 3573.18711 } } dps_results: { key: "TestElemental-AllItems-BlackBruise-50692" value: { - dps: 5741.29537 - tps: 3631.12507 + dps: 6348.54429 + tps: 3573.18711 } } dps_results: { key: "TestElemental-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5139.01017 - tps: 3280.18377 + dps: 5408.32334 + tps: 3030.69882 } } dps_results: { key: "TestElemental-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5380.96748 - tps: 3433.68448 + dps: 5653.17027 + tps: 3158.28452 } } dps_results: { key: "TestElemental-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6515.12214 - tps: 4027.51946 + dps: 7222.1743 + tps: 3964.99661 } } dps_results: { key: "TestElemental-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-CorpseTongueCoin-50349" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-CorpseTongueCoin-50352" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 hps: 64 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6391.89983 - tps: 4045.3297 + dps: 7035.92216 + tps: 3982.30894 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6421.25429 - tps: 4085.31356 + dps: 7093.16769 + tps: 4028.95199 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6327.44434 - tps: 4016.12637 + dps: 7003.02264 + tps: 3964.24563 } } dps_results: { key: "TestElemental-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - dps: 6606.59727 - tps: 4172.30971 + dps: 7324.32564 + tps: 4105.42718 } } dps_results: { key: "TestElemental-AllItems-Death'sChoice-47464" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6326.22983 - tps: 4005.97594 + dps: 6965.39518 + tps: 3942.42059 } } dps_results: { key: "TestElemental-AllItems-Deathbringer'sWill-50362" value: { - dps: 6361.3383 - tps: 4034.07818 + dps: 6971.54053 + tps: 3936.55182 } } dps_results: { key: "TestElemental-AllItems-Deathbringer'sWill-50363" value: { - dps: 6373.42712 - tps: 4037.59126 + dps: 7004.56764 + tps: 3963.30551 } } dps_results: { key: "TestElemental-AllItems-Defender'sCode-40257" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6491.75641 - tps: 4094.87286 + dps: 7198.63396 + tps: 4032.33244 } } dps_results: { key: "TestElemental-AllItems-DislodgedForeignObject-50348" value: { - dps: 6925.45793 - tps: 4389.71711 + dps: 7523.49554 + tps: 4274.75168 } } dps_results: { key: "TestElemental-AllItems-DislodgedForeignObject-50353" value: { - dps: 6847.49048 - tps: 4342.91022 + dps: 7459.26892 + tps: 4224.79477 } } dps_results: { key: "TestElemental-AllItems-EarthshatterBattlegear" value: { - dps: 5101.59064 - tps: 3233.71005 + dps: 5701.80556 + tps: 3190.31283 } } dps_results: { key: "TestElemental-AllItems-EarthshatterGarb" value: { - dps: 5905.35901 - tps: 3743.68819 + dps: 6579.01211 + tps: 3695.94381 } } dps_results: { key: "TestElemental-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-EmberSkyflareDiamond" value: { - dps: 6514.9182 - tps: 4107.93067 + dps: 7227.1302 + tps: 4047.99179 } } dps_results: { key: "TestElemental-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6490.20032 - tps: 4094.123 + dps: 7195.64996 + tps: 4030.42213 } } dps_results: { key: "TestElemental-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6488.49497 - tps: 4093.27295 + dps: 7192.70568 + tps: 4028.36114 } } dps_results: { key: "TestElemental-AllItems-EphemeralSnowflake-50260" value: { - dps: 6428.96286 - tps: 4077.70688 + dps: 7093.7644 + tps: 4022.75543 } } dps_results: { key: "TestElemental-AllItems-EssenceofGossamer-37220" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6397.54049 - tps: 4055.52952 + dps: 7080.52846 + tps: 4008.70025 } } dps_results: { key: "TestElemental-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6570.25322 - tps: 4158.3157 + dps: 7234.1008 + tps: 4096.20366 } } dps_results: { key: "TestElemental-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6334.54381 - tps: 4012.64179 + dps: 6941.85418 + tps: 3931.86367 } } dps_results: { key: "TestElemental-AllItems-ForethoughtTalisman-40258" value: { - dps: 6462.114 - tps: 4096.24509 + dps: 7113.33919 + tps: 4026.05615 } } dps_results: { key: "TestElemental-AllItems-ForgeEmber-37660" value: { - dps: 6499.79532 - tps: 4114.76472 + dps: 7156.30772 + tps: 4048.56456 } } dps_results: { key: "TestElemental-AllItems-ForlornSkyflareDiamond" value: { - dps: 6515.12214 - tps: 4109.20817 + dps: 7222.1743 + tps: 4045.38613 } } dps_results: { key: "TestElemental-AllItems-ForlornStarflareDiamond" value: { - dps: 6507.85974 - tps: 4104.67212 + dps: 7214.11468 + tps: 4040.92368 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sBattlegear" value: { - dps: 5456.78191 - tps: 3453.9235 + dps: 6042.83671 + tps: 3391.82412 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sRegalia" value: { - dps: 6868.83265 - tps: 4316.5737 + dps: 7443.16639 + tps: 4168.59601 } } dps_results: { key: "TestElemental-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - dps: 6620.2408 - tps: 4180.75028 + dps: 7339.74652 + tps: 4113.56724 } } dps_results: { key: "TestElemental-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-FuturesightRune-38763" value: { - dps: 6390.57578 - tps: 4051.32033 + dps: 7034.43812 + tps: 3981.92866 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sEarthshaker" value: { - dps: 5006.2627 - tps: 3183.93946 + dps: 5575.98295 + tps: 3141.49783 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sWartide" value: { - dps: 5890.87292 - tps: 3747.08605 + dps: 6579.92689 + tps: 3682.8821 } } dps_results: { key: "TestElemental-AllItems-GlowingTwilightScale-54573" value: { - dps: 6577.45114 - tps: 4168.6748 + dps: 7240.54704 + tps: 4097.20048 } } dps_results: { key: "TestElemental-AllItems-GlowingTwilightScale-54589" value: { - dps: 6613.95023 - tps: 4191.5956 + dps: 7280.80269 + tps: 4119.7145 } } dps_results: { key: "TestElemental-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6411.71687 - tps: 4077.04482 + dps: 7048.85326 + tps: 3999.26303 } } dps_results: { key: "TestElemental-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - dps: 6570.59798 - tps: 4150.2737 + dps: 7286.30822 + tps: 4083.77984 } } dps_results: { key: "TestElemental-AllItems-Heartpierce-49982" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-Heartpierce-50641" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6490.20032 - tps: 4094.123 + dps: 7195.64996 + tps: 4030.42213 } } dps_results: { key: "TestElemental-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6488.49497 - tps: 4093.27295 + dps: 7192.70568 + tps: 4028.36114 } } dps_results: { key: "TestElemental-AllItems-IncisorFragment-37723" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6486.03018 - tps: 4090.93933 + dps: 7186.80374 + tps: 4031.68111 } } dps_results: { key: "TestElemental-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-LastWord-50179" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-LastWord-50708" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6365.8763 - tps: 4030.65444 + dps: 7014.30025 + tps: 3970.03283 } } dps_results: { key: "TestElemental-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6509.70951 - tps: 4121.3516 + dps: 7153.97016 + tps: 4049.90828 } } dps_results: { key: "TestElemental-AllItems-Nibelung-49992" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-Nibelung-50648" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-OfferingofSacrifice-37638" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-PetrifiedScarab-21685" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-PurifiedShardoftheGods" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47316" value: { - dps: 6696.85895 - tps: 4313.0634 + dps: 7351.22254 + tps: 4230.37063 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47477" value: { - dps: 6747.09981 - tps: 4353.53922 + dps: 7403.4626 + tps: 4269.80677 } } dps_results: { key: "TestElemental-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6665.51737 - tps: 4205.01661 + dps: 7368.9685 + tps: 4138.30033 } } dps_results: { key: "TestElemental-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - dps: 6636.80795 - tps: 4190.99955 + dps: 7358.47187 + tps: 4123.45161 } } dps_results: { key: "TestElemental-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6475.98108 - tps: 4082.93474 + dps: 7181.87621 + tps: 4023.05851 } } dps_results: { key: "TestElemental-AllItems-RuneofRepulsion-40372" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - dps: 6565.40146 - tps: 4147.02098 + dps: 7280.00387 + tps: 4080.70678 } } dps_results: { key: "TestElemental-AllItems-SealofthePantheon-36993" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-Shadowmourne-49623" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { key: "TestElemental-AllItems-ShinyShardoftheGods" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-SkycallTotem-33506" value: { - dps: 6588.01527 - tps: 4158.3576 + dps: 7264.73389 + tps: 4074.16014 } } dps_results: { key: "TestElemental-AllItems-SkyshatterHarness" value: { - dps: 4257.95031 - tps: 2715.20041 + dps: 4610.86817 + tps: 2568.09776 } } dps_results: { key: "TestElemental-AllItems-SkyshatterRegalia" value: { - dps: 5070.11934 - tps: 3213.9831 + dps: 5608.36043 + tps: 3129.87269 } } dps_results: { key: "TestElemental-AllItems-SliverofPureIce-50339" value: { - dps: 6551.57738 - tps: 4152.04319 + dps: 7189.01981 + tps: 4075.3999 } } dps_results: { key: "TestElemental-AllItems-SliverofPureIce-50346" value: { - dps: 6580.86115 - tps: 4171.08878 + dps: 7221.22433 + tps: 4094.09446 } } dps_results: { key: "TestElemental-AllItems-SoulPreserver-37111" value: { - dps: 6409.55531 - tps: 4063.23914 + dps: 7055.37106 + tps: 3993.63596 } } dps_results: { key: "TestElemental-AllItems-SouloftheDead-40382" value: { - dps: 6403.40768 - tps: 4059.9089 + dps: 7030.80867 + tps: 3987.84237 } } dps_results: { key: "TestElemental-AllItems-SparkofLife-37657" value: { - dps: 6409.66452 - tps: 4062.56764 + dps: 7060.20639 + tps: 3998.76366 } } dps_results: { key: "TestElemental-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6414.90322 - tps: 4044.31941 + dps: 7113.4843 + tps: 3998.9751 } } dps_results: { key: "TestElemental-AllItems-Stonebreaker'sTotem-33507" value: { - dps: 6538.37959 - tps: 4130.10685 + dps: 7247.22126 + tps: 4064.72683 } } dps_results: { key: "TestElemental-AllItems-StormshroudArmor" value: { - dps: 4912.14935 - tps: 3137.89019 + dps: 5161.0871 + tps: 2880.36141 } } dps_results: { key: "TestElemental-AllItems-SwiftSkyflareDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-SwiftStarflareDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-SwiftWindfireDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-TearsoftheVanquished-47215" value: { - dps: 6340.10848 - tps: 4012.0601 + dps: 6964.19665 + tps: 3941.92546 } } dps_results: { key: "TestElemental-AllItems-TheFistsofFury" value: { - dps: 5936.21054 - tps: 3755.036 + dps: 6526.12034 + tps: 3665.43034 } } dps_results: { key: "TestElemental-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6300.05803 - tps: 3994.47675 + dps: 6934.60411 + tps: 3926.09388 } } dps_results: { key: "TestElemental-AllItems-Thrall'sBattlegear" value: { - dps: 5376.88142 - tps: 3414.84166 + dps: 5971.41705 + tps: 3361.27181 } } dps_results: { key: "TestElemental-AllItems-Thrall'sRegalia" value: { - dps: 6345.4662 - tps: 4023.52759 + dps: 7089.80307 + tps: 4011.28445 } } dps_results: { key: "TestElemental-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6478.81014 - tps: 4086.52794 + dps: 7181.87621 + tps: 4023.07385 } } dps_results: { key: "TestElemental-AllItems-TidefuryRaiment" value: { - dps: 4830.34291 - tps: 3088.72166 + dps: 5202.375 + tps: 2902.60446 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6459.71065 - tps: 4075.94163 + dps: 7134.25112 + tps: 4009.97963 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6459.71065 - tps: 4075.94163 + dps: 7134.25112 + tps: 4009.97963 } } dps_results: { key: "TestElemental-AllItems-TirelessSkyflareDiamond" value: { - dps: 6515.12214 - tps: 4109.20817 + dps: 7222.1743 + tps: 4045.38613 } } dps_results: { key: "TestElemental-AllItems-TirelessStarflareDiamond" value: { - dps: 6507.85974 - tps: 4104.67212 + dps: 7214.11468 + tps: 4040.92368 } } dps_results: { key: "TestElemental-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6443.00312 - tps: 4077.18534 + dps: 7096.24713 + tps: 4003.48646 } } dps_results: { key: "TestElemental-AllItems-TotemofElectrifyingWind-47666" value: { - dps: 6814.58056 - tps: 4301.3039 + dps: 7558.51042 + tps: 4266.82863 } } dps_results: { key: "TestElemental-AllItems-TotemofQuakingEarth-47667" value: { - dps: 6538.37959 - tps: 4130.10685 + dps: 7247.22126 + tps: 4064.72683 } } dps_results: { key: "TestElemental-AllItems-TotemoftheAvalanche-50463" value: { - dps: 6538.37959 - tps: 4130.10685 + dps: 7247.22126 + tps: 4064.72683 } } dps_results: { key: "TestElemental-AllItems-TotemoftheElementalPlane-40708" value: { - dps: 6621.36497 - tps: 4182.76413 + dps: 7297.41918 + tps: 4097.1737 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6507.85974 - tps: 4104.67212 + dps: 7214.11468 + tps: 4040.92368 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6515.12214 - tps: 4109.20817 + dps: 7222.1743 + tps: 4045.38613 } } dps_results: { key: "TestElemental-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 4982.9779 - tps: 3178.86402 + dps: 5048.65852 + tps: 2803.12782 } } dps_results: { key: "TestElemental-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6932.70332 - tps: 4370.37332 + dps: 7637.0945 + tps: 4287.56536 } } dps_results: { key: "TestElemental-AllItems-WingedTalisman-37844" value: { - dps: 6406.98492 - tps: 4061.8931 + dps: 7073.17838 + tps: 3986.14764 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerBattlegear" value: { - dps: 5307.2116 - tps: 3364.25928 + dps: 5875.83993 + tps: 3299.77855 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerGarb" value: { - dps: 6403.63791 - tps: 4114.2761 + dps: 7119.35411 + tps: 4073.55774 } } dps_results: { key: "TestElemental-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - dps: 6654.34964 - tps: 4201.85171 + dps: 7378.29871 + tps: 4133.91741 } } dps_results: { key: "TestElemental-Average-Default" value: { - dps: 6746.477 - tps: 4260.67589 + dps: 7486.73284 + tps: 4211.31342 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-FullBuffs-LongMultiTarget" value: { - dps: 12334.342 - tps: 9114.101 + dps: 8973.5832 + tps: 4462.55688 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-FullBuffs-LongSingleTarget" value: { - dps: 6687.09509 - tps: 4217.80511 + dps: 7444.78568 + tps: 4153.11459 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-FullBuffs-ShortSingleTarget" value: { - dps: 7570.48676 - tps: 4782.44354 + dps: 9042.20125 + tps: 4797.08247 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-NoBuffs-LongMultiTarget" value: { - dps: 4671.09546 - tps: 3437.72815 + dps: 4674.73797 + tps: 1650.09722 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-NoBuffs-LongSingleTarget" value: { - dps: 3583.32571 - tps: 2306.91776 + dps: 3270.75952 + tps: 1688.29404 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive--NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-P1-Adaptive-Default-NoBuffs-ShortSingleTarget" value: { - dps: 5548.00641 - tps: 3495.13081 + dps: 6476.96023 + tps: 3326.00116 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-FullBuffs-LongMultiTarget" value: { - dps: 14721.35735 - tps: 8888.63143 + dps: 8973.5832 + tps: 4462.55688 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-FullBuffs-LongSingleTarget" value: { - dps: 7211.24578 - tps: 4159.80144 + dps: 7444.78568 + tps: 4153.11459 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-FullBuffs-ShortSingleTarget" value: { - dps: 8850.44744 - tps: 4698.13853 + dps: 9042.20125 + tps: 4797.08247 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-NoBuffs-LongMultiTarget" value: { - dps: 6641.64245 - tps: 3291.89853 + dps: 4674.73797 + tps: 1650.09722 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-NoBuffs-LongSingleTarget" value: { - dps: 3958.61413 - tps: 2228.54298 + dps: 3270.75952 + tps: 1688.29404 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental--NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-P1-EleFireElemental-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6471.27664 - tps: 3359.46196 + dps: 6476.96023 + tps: 3326.00116 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-FullBuffs-LongMultiTarget" value: { - dps: 12211.94033 - tps: 9015.45946 + dps: 8819.52604 + tps: 4484.22969 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-FullBuffs-LongSingleTarget" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-FullBuffs-ShortSingleTarget" value: { - dps: 7454.69969 - tps: 4705.72043 + dps: 8778.12039 + tps: 4686.22892 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-NoBuffs-LongMultiTarget" value: { - dps: 4562.52218 - tps: 3375.96078 + dps: 4458.42699 + tps: 1610.08053 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-NoBuffs-LongSingleTarget" value: { - dps: 3565.18471 - tps: 2296.13631 + dps: 3218.50167 + tps: 1674.991 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive--NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-P1-Adaptive-Default-NoBuffs-ShortSingleTarget" value: { - dps: 5425.45389 - tps: 3419.65288 + dps: 6396.57345 + tps: 3317.4338 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-FullBuffs-LongMultiTarget" value: { - dps: 14543.00628 - tps: 8905.46423 + dps: 8819.52604 + tps: 4484.22969 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-FullBuffs-LongSingleTarget" value: { - dps: 7191.69609 - tps: 4177.0809 + dps: 7383.90937 + tps: 4146.2629 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-FullBuffs-ShortSingleTarget" value: { - dps: 8654.28635 - tps: 4637.13936 + dps: 8778.12039 + tps: 4686.22892 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-NoBuffs-LongMultiTarget" value: { - dps: 6408.84265 - tps: 3245.07318 + dps: 4458.42699 + tps: 1610.08053 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-NoBuffs-LongSingleTarget" value: { - dps: 3936.09344 - tps: 2238.16946 + dps: 3218.50167 + tps: 1674.991 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental--NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-P1-EleFireElemental-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6347.91705 - tps: 3320.70821 + dps: 6396.57345 + tps: 3317.4338 } } dps_results: { key: "TestElemental-SwitchInFrontOfTarget-Default" value: { - dps: 6677.88617 - tps: 4213.26576 + dps: 7363.33688 + tps: 4146.2629 } } diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go index 9bdd3864cb..4714196b40 100644 --- a/sim/shaman/elemental/elemental_test.go +++ b/sim/shaman/elemental/elemental_test.go @@ -26,6 +26,7 @@ func TestElemental(t *testing.T) { OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "EleFireElemental", SpecOptions: PlayerOptionsAdaptiveFireElemental}, }, + Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -104,32 +105,25 @@ var FireElementalBasicTotems = &proto.ShamanTotems{ UseFireElemental: true, } -var eleShamOptionsFireElemental = &proto.ElementalShaman_Options{ - Shield: proto.ShamanShield_WaterShield, - Bloodlust: true, - Totems: FireElementalBasicTotems, -} - -var eleShamOptions = &proto.ElementalShaman_Options{ - Shield: proto.ShamanShield_WaterShield, - Bloodlust: true, - Totems: BasicTotems, -} var PlayerOptionsAdaptive = &proto.Player_ElementalShaman{ ElementalShaman: &proto.ElementalShaman{ - Options: eleShamOptions, - Rotation: &proto.ElementalShaman_Rotation{ - Type: proto.ElementalShaman_Rotation_Adaptive, + Options: &proto.ElementalShaman_Options{ + Shield: proto.ShamanShield_WaterShield, + Bloodlust: true, + Totems: BasicTotems, }, + Rotation: &proto.ElementalShaman_Rotation{}, }, } var PlayerOptionsAdaptiveFireElemental = &proto.Player_ElementalShaman{ ElementalShaman: &proto.ElementalShaman{ - Options: eleShamOptionsFireElemental, - Rotation: &proto.ElementalShaman_Rotation{ - Type: proto.ElementalShaman_Rotation_Adaptive, + Options: &proto.ElementalShaman_Options{ + Shield: proto.ShamanShield_WaterShield, + Bloodlust: true, + Totems: FireElementalBasicTotems, }, + Rotation: &proto.ElementalShaman_Rotation{}, }, } @@ -141,90 +135,45 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredDarkRune, } +var DefaultRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":66842}}},"doAtValue":{"const":{"val":"-3.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAtValue":{"const":{"val":"-2s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825}}}}, + {"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":16166}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":26297}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":16166}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":64701}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":26297}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"auraIsActive":{"auraId":{"itemId":40255}}},{"auraIsActive":{"auraId":{"itemId":40682}}},{"auraIsActive":{"auraId":{"itemId":37660}}},{"auraIsActive":{"auraId":{"itemId":45518}}},{"auraIsActive":{"auraId":{"itemId":54572}}},{"auraIsActive":{"auraId":{"itemId":54588}}},{"auraIsActive":{"auraId":{"itemId":47213}}},{"auraIsActive":{"auraId":{"itemId":45490}}},{"auraIsActive":{"auraId":{"itemId":50348}}},{"auraIsActive":{"auraId":{"itemId":50353}}},{"auraIsActive":{"auraId":{"itemId":50360}}},{"auraIsActive":{"auraId":{"itemId":50365}}},{"auraIsActive":{"auraId":{"itemId":50345}}},{"auraIsActive":{"auraId":{"itemId":50340}}},{"auraIsActive":{"auraId":{"itemId":50398}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":45308}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":40432}}},"rhs":{"const":{"val":"10"}}}},{"auraIsActive":{"auraId":{"spellId":55637}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"itemId":40212}}},{"castSpell":{"spellId":{"itemId":37873}}},{"castSpell":{"spellId":{"itemId":45148}}},{"castSpell":{"spellId":{"itemId":48724}}},{"castSpell":{"spellId":{"itemId":50357}}},{"castSpell":{"spellId":{"spellId":2894}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"totemRemainingTime":{"totemType":"Water"}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":66842}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58704}}}}}]}},"castSpell":{"spellId":{"spellId":58704}}}}, + {"action":{"multidot":{"spellId":{"spellId":49233},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":49271}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":60043}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49238}}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40516, - "enchant": 3820, - "gems": [ - 41285, - 40027 - ] - }, - { - "id": 44661, - "gems": [ - 39998 - ] - }, - { - "id": 40286, - "enchant": 3810 - }, - { - "id": 44005, - "enchant": 3722, - "gems": [ - 40027 - ] - }, - { - "id": 40514, - "enchant": 3832, - "gems": [ - 42144, - 42144 - ] - }, - { - "id": 40324, - "enchant": 2332, - "gems": [ - 42144, - 0 - ] - }, - { - "id": 40302, - "enchant": 3246, - "gems": [ - 0 - ] - }, - { - "id": 40301, - "gems": [ - 40014 - ] - }, - { - "id": 40560, - "enchant": 3721 - }, - { - "id": 40519, - "enchant": 3826 - }, - { - "id": 37694 - }, - { - "id": 40399 - }, - { - "id": 40432 - }, - { - "id": 40255 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 40401, - "enchant": 1128 - }, - { - "id": 40267 - } + {"id":40516,"enchant":3820,"gems":[41285,40027]}, + {"id":44661,"gems":[39998]}, + {"id":40286,"enchant":3810}, + {"id":44005,"enchant":3722,"gems":[40027]}, + {"id":40514,"enchant":3832,"gems":[42144,42144]}, + {"id":40324,"enchant":2332,"gems":[42144,0]}, + {"id":40302,"enchant":3246,"gems":[0]}, + {"id":40301,"gems":[40014]}, + {"id":40560,"enchant":3721}, + {"id":40519,"enchant":3826}, + {"id":37694}, + {"id":40399}, + {"id":40432}, + {"id":40255}, + {"id":40395,"enchant":3834}, + {"id":40401,"enchant":1128}, + {"id":40267} ]}`) diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 81604f9b19..a06de296bf 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -46,1201 +46,1285 @@ character_stats_results: { dps_results: { key: "TestEnhancement-AllItems-Althor'sAbacus-50359" value: { - dps: 7488.1111 - tps: 4099.80575 + dps: 7265.89341 + tps: 4024.96922 } } dps_results: { key: "TestEnhancement-AllItems-Althor'sAbacus-50366" value: { - dps: 7508.05936 - tps: 4111.2823 + dps: 7285.56653 + tps: 4036.26913 } } dps_results: { key: "TestEnhancement-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7423.51619 - tps: 4072.42624 + dps: 7180.45241 + tps: 3975.60385 } } dps_results: { key: "TestEnhancement-AllItems-Bandit'sInsignia-40371" value: { - dps: 7545.63792 - tps: 4135.54003 + dps: 7262.12456 + tps: 4021.05663 } } dps_results: { key: "TestEnhancement-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7325.37914 - tps: 4006.33071 - hps: 94.19099 + dps: 7105.62223 + tps: 3932.93074 + hps: 95.1271 } } dps_results: { key: "TestEnhancement-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7325.37914 - tps: 4006.33071 - hps: 94.19099 + dps: 7105.62223 + tps: 3932.93074 + hps: 95.1271 } } dps_results: { key: "TestEnhancement-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7468.25188 - tps: 4096.41876 + dps: 7200.1088 + tps: 3987.3065 } } dps_results: { key: "TestEnhancement-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7195.54317 - tps: 3929.51068 + dps: 6987.55415 + tps: 3851.98627 } } dps_results: { key: "TestEnhancement-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - dps: 7826.79601 - tps: 4310.82623 + dps: 7604.5214 + tps: 4236.81639 } } dps_results: { key: "TestEnhancement-AllItems-BlackBruise-50035" value: { - dps: 7437.77187 - tps: 4071.27165 + dps: 7158.41456 + tps: 3954.60352 } } dps_results: { key: "TestEnhancement-AllItems-BlackBruise-50692" value: { - dps: 7491.75766 - tps: 4099.73096 + dps: 7208.45094 + tps: 3980.18909 } } dps_results: { key: "TestEnhancement-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6107.78923 - tps: 3310.80904 + dps: 5912.11207 + tps: 3248.6586 } } dps_results: { key: "TestEnhancement-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6036.49019 - tps: 3281.968 + dps: 5809.74692 + tps: 3194.95666 } } dps_results: { key: "TestEnhancement-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7446.47838 - tps: 3972.73616 + dps: 7202.98232 + tps: 3878.44083 } } dps_results: { key: "TestEnhancement-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7607.76534 - tps: 4182.70933 + dps: 7346.57431 + tps: 4075.07647 } } dps_results: { key: "TestEnhancement-AllItems-CorpseTongueCoin-50349" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-CorpseTongueCoin-50352" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7325.78651 - tps: 4006.42836 + dps: 7105.82813 + tps: 3933.02907 hps: 64 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7473.99955 - tps: 4092.62607 + dps: 7218.35458 + tps: 3989.78745 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7550.73621 - tps: 4144.01852 + dps: 7289.46187 + tps: 4044.24521 } } dps_results: { key: "TestEnhancement-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7567.10466 - tps: 4133.06867 + dps: 7295.24723 + tps: 4024.29351 } } dps_results: { key: "TestEnhancement-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - dps: 7620.80211 - tps: 4183.41763 + dps: 7332.97022 + tps: 4065.41561 } } dps_results: { key: "TestEnhancement-AllItems-Death'sChoice-47464" value: { - dps: 7723.90444 - tps: 4212.9881 + dps: 7474.92574 + tps: 4121.13724 } } dps_results: { key: "TestEnhancement-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7452.37026 - tps: 4079.36424 + dps: 7188.10822 + tps: 3977.76496 } } dps_results: { key: "TestEnhancement-AllItems-Deathbringer'sWill-50362" value: { - dps: 7689.54181 - tps: 4196.42406 + dps: 7413.80485 + tps: 4085.83277 } } dps_results: { key: "TestEnhancement-AllItems-Deathbringer'sWill-50363" value: { - dps: 7743.25779 - tps: 4221.65319 + dps: 7477.48623 + tps: 4124.93482 } } dps_results: { key: "TestEnhancement-AllItems-Defender'sCode-40257" value: { - dps: 7325.78946 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7454.97497 - tps: 4089.68379 + dps: 7197.75347 + tps: 3984.629 } } dps_results: { key: "TestEnhancement-AllItems-DislodgedForeignObject-50348" value: { - dps: 7834.81944 - tps: 4308.68482 + dps: 7529.57295 + tps: 4199.66674 } } dps_results: { key: "TestEnhancement-AllItems-DislodgedForeignObject-50353" value: { - dps: 7805.58034 - tps: 4295.17933 + dps: 7486.55796 + tps: 4171.61318 } } dps_results: { key: "TestEnhancement-AllItems-EarthshatterBattlegear" value: { - dps: 6820.07613 - tps: 3712.66515 + dps: 6566.03117 + tps: 3603.03037 } } dps_results: { key: "TestEnhancement-AllItems-EarthshatterGarb" value: { - dps: 6472.2612 - tps: 3531.1991 + dps: 6246.53653 + tps: 3443.08876 } } dps_results: { key: "TestEnhancement-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7423.51619 - tps: 4072.42624 + dps: 7180.45241 + tps: 3975.60385 } } dps_results: { key: "TestEnhancement-AllItems-EmberSkyflareDiamond" value: { - dps: 7483.19718 - tps: 4105.06911 + dps: 7216.4855 + tps: 3996.01814 } } dps_results: { key: "TestEnhancement-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7451.90792 - tps: 4087.86144 + dps: 7195.44679 + tps: 3983.25991 } } dps_results: { key: "TestEnhancement-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7444.93011 - tps: 4083.57346 + dps: 7188.79131 + tps: 3979.50391 } } dps_results: { key: "TestEnhancement-AllItems-EphemeralSnowflake-50260" value: { - dps: 7529.4853 - tps: 4132.15844 + dps: 7232.50394 + tps: 4004.50107 } } dps_results: { key: "TestEnhancement-AllItems-EssenceofGossamer-37220" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7423.51619 - tps: 4072.42624 + dps: 7180.45241 + tps: 3975.60385 } } dps_results: { key: "TestEnhancement-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7513.58735 - tps: 4120.59294 + dps: 7234.01027 + tps: 4004.62661 } } dps_results: { key: "TestEnhancement-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7566.22582 - tps: 4142.69717 + dps: 7325.06833 + tps: 4057.80586 } } dps_results: { key: "TestEnhancement-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7409.15089 - tps: 4055.37529 + dps: 7154.5044 + tps: 3960.88521 } } dps_results: { key: "TestEnhancement-AllItems-ForethoughtTalisman-40258" value: { - dps: 7426.45286 - tps: 4064.33277 + dps: 7205.0856 + tps: 3990.04224 } } dps_results: { key: "TestEnhancement-AllItems-ForgeEmber-37660" value: { - dps: 7553.66744 - tps: 4127.8658 + dps: 7254.04288 + tps: 4022.73495 } } dps_results: { key: "TestEnhancement-AllItems-ForlornSkyflareDiamond" value: { - dps: 7446.47838 - tps: 4085.70387 + dps: 7202.98232 + tps: 3988.55606 } } dps_results: { key: "TestEnhancement-AllItems-ForlornStarflareDiamond" value: { - dps: 7441.88594 - tps: 4083.04834 + dps: 7198.47634 + tps: 3985.96561 } } dps_results: { key: "TestEnhancement-AllItems-FrostWitch'sBattlegear" value: { - dps: 7621.57609 - tps: 4146.82475 + dps: 7347.60184 + tps: 4051.09949 } } dps_results: { key: "TestEnhancement-AllItems-FrostWitch'sRegalia" value: { - dps: 7222.66862 - tps: 3961.1461 + dps: 6957.18937 + tps: 3850.6954 } } dps_results: { key: "TestEnhancement-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - dps: 7633.68522 - tps: 4190.84064 + dps: 7344.00191 + tps: 4072.65778 } } dps_results: { key: "TestEnhancement-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7534.1864 - tps: 4116.53106 + dps: 7289.70818 + tps: 4032.57453 } } dps_results: { key: "TestEnhancement-AllItems-FuturesightRune-38763" value: { - dps: 7382.02265 - tps: 4038.77137 + dps: 7161.2682 + tps: 3964.87426 } } dps_results: { key: "TestEnhancement-AllItems-Gladiator'sEarthshaker" value: { - dps: 7060.98585 - tps: 3803.07803 + dps: 6847.07671 + tps: 3734.48306 } } dps_results: { key: "TestEnhancement-AllItems-Gladiator'sWartide" value: { - dps: 6164.32673 - tps: 3319.6686 + dps: 5973.15262 + tps: 3257.57754 } } dps_results: { key: "TestEnhancement-AllItems-GlowingTwilightScale-54573" value: { - dps: 7498.08523 - tps: 4105.54402 + dps: 7275.72997 + tps: 4030.61917 } } dps_results: { key: "TestEnhancement-AllItems-GlowingTwilightScale-54589" value: { - dps: 7520.75371 - tps: 4118.58555 + dps: 7298.08579 + tps: 4043.45998 } } dps_results: { key: "TestEnhancement-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7531.98352 - tps: 4135.60835 + dps: 7254.71932 + tps: 4022.53531 } } dps_results: { key: "TestEnhancement-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - dps: 7595.6296 - tps: 4168.111 + dps: 7310.72136 + tps: 4050.53182 } } dps_results: { key: "TestEnhancement-AllItems-Heartpierce-49982" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-Heartpierce-50641" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7491.43253 - tps: 4106.0173 + dps: 7255.89914 + tps: 4031.4064 } } dps_results: { key: "TestEnhancement-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7451.90792 - tps: 4087.86144 + dps: 7195.44679 + tps: 3983.25991 } } dps_results: { key: "TestEnhancement-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7444.93011 - tps: 4083.57346 + dps: 7188.79131 + tps: 3979.50391 } } dps_results: { key: "TestEnhancement-AllItems-IncisorFragment-37723" value: { - dps: 7455.51541 - tps: 4073.95323 + dps: 7231.98655 + tps: 3998.71687 } } dps_results: { key: "TestEnhancement-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7461.52054 - tps: 4097.29 + dps: 7202.3382 + tps: 3988.09521 } } dps_results: { key: "TestEnhancement-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7447.43764 - tps: 4084.86114 + dps: 7206.07987 + tps: 3988.53006 hps: 11.01615 } } dps_results: { key: "TestEnhancement-AllItems-LastWord-50179" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-LastWord-50708" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7325.78651 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7532.9328 - tps: 4119.0392 + dps: 7295.36961 + tps: 4042.20177 } } dps_results: { key: "TestEnhancement-AllItems-Nibelung-49992" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-Nibelung-50648" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-OfferingofSacrifice-37638" value: { - dps: 7325.78651 - tps: 4006.42836 + dps: 7105.82837 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7444.69103 - tps: 4082.97566 + dps: 7192.20996 + tps: 3980.61805 } } dps_results: { key: "TestEnhancement-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7447.43764 - tps: 4084.86114 + dps: 7206.07987 + tps: 3988.53006 } } dps_results: { key: "TestEnhancement-AllItems-PetrifiedScarab-21685" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7423.51619 - tps: 4072.42624 + dps: 7180.45241 + tps: 3975.60385 } } dps_results: { key: "TestEnhancement-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7423.51619 - tps: 4072.42624 + dps: 7180.45241 + tps: 3975.60385 } } dps_results: { key: "TestEnhancement-AllItems-PurifiedShardoftheGods" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-ReignoftheDead-47316" value: { - dps: 7769.42672 - tps: 4297.60264 + dps: 7520.25458 + tps: 4198.7396 } } dps_results: { key: "TestEnhancement-AllItems-ReignoftheDead-47477" value: { - dps: 7819.59557 - tps: 4330.67897 + dps: 7569.61877 + tps: 4231.25115 } } dps_results: { key: "TestEnhancement-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - dps: 7649.32899 - tps: 4199.8543 + dps: 7357.39754 + tps: 4081.45185 } } dps_results: { key: "TestEnhancement-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7435.99073 - tps: 4078.56695 + dps: 7174.19827 + tps: 3970.613 } } dps_results: { key: "TestEnhancement-AllItems-RuneofRepulsion-40372" value: { - dps: 7325.78946 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - dps: 7589.30148 - tps: 4164.59351 + dps: 7305.41336 + tps: 4047.09196 } } dps_results: { key: "TestEnhancement-AllItems-SealofthePantheon-36993" value: { - dps: 7325.78946 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-Shadowmourne-49623" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { key: "TestEnhancement-AllItems-ShinyShardoftheGods" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7325.78209 - tps: 4006.42836 + dps: 7105.82283 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-SkycallTotem-33506" value: { - dps: 7568.52996 - tps: 4152.76927 + dps: 7270.98301 + tps: 4030.80396 } } dps_results: { key: "TestEnhancement-AllItems-SkyshatterHarness" value: { - dps: 5419.01411 - tps: 2919.09905 + dps: 5247.41155 + tps: 2862.66496 } } dps_results: { key: "TestEnhancement-AllItems-SkyshatterRegalia" value: { - dps: 5386.92277 - tps: 2903.85164 + dps: 5150.1222 + tps: 2816.21951 } } dps_results: { key: "TestEnhancement-AllItems-SliverofPureIce-50339" value: { - dps: 7502.79147 - tps: 4105.04839 + dps: 7267.62882 + tps: 4027.58716 } } dps_results: { key: "TestEnhancement-AllItems-SliverofPureIce-50346" value: { - dps: 7506.78813 - tps: 4108.71487 + dps: 7276.44723 + tps: 4034.79501 } } dps_results: { key: "TestEnhancement-AllItems-SoulPreserver-37111" value: { - dps: 7393.81026 - tps: 4045.55296 + dps: 7172.89322 + tps: 3971.55148 } } dps_results: { key: "TestEnhancement-AllItems-SouloftheDead-40382" value: { - dps: 7480.95231 - tps: 4100.69159 + dps: 7223.41036 + tps: 3999.14694 } } dps_results: { key: "TestEnhancement-AllItems-SparkofLife-37657" value: { - dps: 7480.12056 - tps: 4095.94619 + dps: 7206.75357 + tps: 3990.84495 } } dps_results: { key: "TestEnhancement-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7514.09178 - tps: 4102.55734 + dps: 7230.43464 + tps: 3997.92051 } } dps_results: { key: "TestEnhancement-AllItems-Stonebreaker'sTotem-33507" value: { - dps: 7588.77562 - tps: 4164.02757 + dps: 7305.73883 + tps: 4046.20949 } } dps_results: { key: "TestEnhancement-AllItems-StormshroudArmor" value: { - dps: 5684.58217 - tps: 3069.46111 + dps: 5491.07789 + tps: 2996.82344 } } dps_results: { key: "TestEnhancement-AllItems-SwiftSkyflareDiamond" value: { - dps: 7447.43764 - tps: 4084.86114 + dps: 7206.07987 + tps: 3988.53006 } } dps_results: { key: "TestEnhancement-AllItems-SwiftStarflareDiamond" value: { - dps: 7444.69103 - tps: 4082.97566 + dps: 7192.20996 + tps: 3980.61805 } } dps_results: { key: "TestEnhancement-AllItems-SwiftWindfireDiamond" value: { - dps: 7435.51293 - tps: 4078.15247 + dps: 7182.9924 + tps: 3976.20538 } } dps_results: { key: "TestEnhancement-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-TearsoftheVanquished-47215" value: { - dps: 7453.04703 - tps: 4080.83899 + dps: 7196.81754 + tps: 3977.08101 } } dps_results: { key: "TestEnhancement-AllItems-TheFistsofFury" value: { - dps: 6518.87073 - tps: 3533.65319 + dps: 6307.40468 + tps: 3450.16053 } } dps_results: { key: "TestEnhancement-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7325.80484 - tps: 4006.42836 + dps: 7105.82577 + tps: 3933.02907 } } dps_results: { key: "TestEnhancement-AllItems-Thrall'sBattlegear" value: { - dps: 7331.2289 - tps: 4028.03859 + dps: 7088.9104 + tps: 3930.79975 } } dps_results: { key: "TestEnhancement-AllItems-Thrall'sRegalia" value: { - dps: 6969.38309 - tps: 3836.24497 + dps: 6772.68149 + tps: 3762.48622 } } dps_results: { key: "TestEnhancement-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7505.14093 - tps: 4114.13359 + dps: 7237.90129 + tps: 4005.88881 } } dps_results: { key: "TestEnhancement-AllItems-TidefuryRaiment" value: { - dps: 5395.48374 - tps: 2898.50345 + dps: 5202.86534 + tps: 2835.97513 } } dps_results: { key: "TestEnhancement-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7542.61808 - tps: 4129.6815 + dps: 7311.04212 + tps: 4045.61311 } } dps_results: { key: "TestEnhancement-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7588.17867 - tps: 4161.33864 + dps: 7328.08338 + tps: 4060.12819 } } dps_results: { key: "TestEnhancement-AllItems-TirelessSkyflareDiamond" value: { - dps: 7446.47838 - tps: 4085.70387 + dps: 7202.98232 + tps: 3988.55606 } } dps_results: { key: "TestEnhancement-AllItems-TirelessStarflareDiamond" value: { - dps: 7441.88594 - tps: 4083.04834 + dps: 7198.47634 + tps: 3985.96561 } } dps_results: { key: "TestEnhancement-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7527.04601 - tps: 4124.97842 + dps: 7246.48458 + tps: 4006.70017 } } dps_results: { key: "TestEnhancement-AllItems-TotemofElectrifyingWind-47666" value: { - dps: 7773.4131 - tps: 4277.07669 + dps: 7498.05699 + tps: 4158.17163 } } dps_results: { key: "TestEnhancement-AllItems-TotemofQuakingEarth-47667" value: { - dps: 7691.3748 - tps: 4217.79452 + dps: 7408.49982 + tps: 4102.2885 } } dps_results: { key: "TestEnhancement-AllItems-TotemoftheAvalanche-50463" value: { - dps: 7843.38449 - tps: 4299.0607 + dps: 7567.08591 + tps: 4186.70063 } } dps_results: { key: "TestEnhancement-AllItems-TotemoftheElementalPlane-40708" value: { - dps: 7578.38875 - tps: 4165.12288 + dps: 7280.00263 + tps: 4031.35342 } } dps_results: { key: "TestEnhancement-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7441.88594 - tps: 4083.04834 + dps: 7198.47634 + tps: 3985.96561 } } dps_results: { key: "TestEnhancement-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7446.47838 - tps: 4085.70387 + dps: 7202.98232 + tps: 3988.55606 } } dps_results: { key: "TestEnhancement-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6053.51034 - tps: 3283.49309 + dps: 5823.21989 + tps: 3194.47571 } } dps_results: { key: "TestEnhancement-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7806.73496 - tps: 4277.87322 + dps: 7535.32661 + tps: 4167.6734 } } dps_results: { key: "TestEnhancement-AllItems-WingedTalisman-37844" value: { - dps: 7423.61621 - tps: 4045.07376 + dps: 7162.47246 + tps: 3970.03425 } } dps_results: { key: "TestEnhancement-AllItems-WorldbreakerBattlegear" value: { - dps: 7295.38289 - tps: 4003.44058 + dps: 7063.21882 + tps: 3918.35156 } } dps_results: { key: "TestEnhancement-AllItems-WorldbreakerGarb" value: { - dps: 6978.6044 - tps: 3841.76654 + dps: 6784.66749 + tps: 3773.40651 } } dps_results: { key: "TestEnhancement-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - dps: 7665.89299 - tps: 4209.39818 + dps: 7371.58114 + tps: 4090.76322 } } dps_results: { key: "TestEnhancement-Average-Default" value: { - dps: 7611.74491 - tps: 4175.5283 + dps: 7352.23919 + tps: 4074.44893 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-FullBuffs-LongMultiTarget" value: { - dps: 5937.45439 - tps: 4615.71132 + dps: 25396.25808 + tps: 15392.25636 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-FullBuffs-LongSingleTarget" value: { - dps: 5937.45439 - tps: 3551.00975 + dps: 7368.28652 + tps: 4060.46192 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-FullBuffs-ShortSingleTarget" value: { - dps: 7270.95291 - tps: 3928.63919 + dps: 8528.93773 + tps: 4070.32341 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-NoBuffs-LongMultiTarget" value: { - dps: 3029.92474 - tps: 3359.99656 + dps: 13464.08779 + tps: 8761.63734 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-NoBuffs-LongSingleTarget" value: { - dps: 3029.92474 - tps: 1893.59633 + dps: 3963.04656 + tps: 2131.90898 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-FT-NoBuffs-ShortSingleTarget" value: { - dps: 3641.29399 - tps: 2032.4313 + dps: 5172.36752 + tps: 2428.74258 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-FullBuffs-LongMultiTarget" value: { - dps: 26447.63157 - tps: 15879.62841 + dps: 24779.59711 + tps: 14943.01339 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-FullBuffs-LongSingleTarget" value: { - dps: 7646.7218 - tps: 4153.47787 + dps: 7450.7416 + tps: 4120.78698 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-FullBuffs-ShortSingleTarget" value: { - dps: 9477.89413 - tps: 4540.33683 + dps: 8563.27936 + tps: 4099.88604 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-NoBuffs-LongMultiTarget" value: { - dps: 12707.27305 - tps: 7925.18348 + dps: 12789.85312 + tps: 8364.9904 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-NoBuffs-LongSingleTarget" value: { - dps: 4056.6481 - tps: 2134.25259 + dps: 3954.42889 + tps: 2138.49486 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-FT-WF-NoBuffs-ShortSingleTarget" value: { - dps: 5827.5252 - tps: 2777.5894 + dps: 5183.3033 + tps: 2436.61187 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-FullBuffs-LongMultiTarget" value: { - dps: 5263.07876 - tps: 4095.04798 + dps: 21361.21894 + tps: 13124.77782 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-FullBuffs-LongSingleTarget" value: { - dps: 5263.07876 - tps: 3075.22842 + dps: 6321.53175 + tps: 3396.30489 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-FullBuffs-ShortSingleTarget" value: { - dps: 6524.10871 - tps: 3392.88268 + dps: 7511.60889 + tps: 3470.03686 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-NoBuffs-LongMultiTarget" value: { - dps: 2727.92772 - tps: 3029.93856 + dps: 10617.54287 + tps: 7379.26305 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-NoBuffs-LongSingleTarget" value: { - dps: 2727.92772 - tps: 1674.92089 + dps: 2987.04446 + tps: 1626.45739 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-Wf--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-FT-NoBuffs-ShortSingleTarget" value: { - dps: 3264.90659 - tps: 1749.50042 + dps: 4017.00906 + tps: 1883.76847 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-FullBuffs-LongMultiTarget" value: { - dps: 5955.01259 - tps: 4644.11436 + dps: 20621.51679 + tps: 12577.78834 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-FullBuffs-LongSingleTarget" value: { - dps: 5955.01259 - tps: 3574.98519 + dps: 6416.32153 + tps: 3464.96234 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-FullBuffs-ShortSingleTarget" value: { - dps: 7321.53756 - tps: 3991.26709 + dps: 7556.14273 + tps: 3505.52962 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-NoBuffs-LongMultiTarget" value: { - dps: 2995.90672 - tps: 3322.87699 + dps: 9918.77505 + tps: 6889.41132 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-NoBuffs-LongSingleTarget" value: { - dps: 2995.90672 - tps: 1876.83885 + dps: 3032.49743 + tps: 1655.56566 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-P1-WF-WF-NoBuffs-ShortSingleTarget" value: { - dps: 3561.43895 - tps: 2000.71033 + dps: 4082.98008 + tps: 1931.46372 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-FullBuffs-LongMultiTarget" value: { - dps: 26173.11359 - tps: 15928.74214 + dps: 25398.45329 + tps: 15452.08234 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-FullBuffs-LongSingleTarget" value: { - dps: 7599.41138 - tps: 4178.73186 + dps: 7333.47782 + tps: 4067.88538 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-FullBuffs-ShortSingleTarget" value: { - dps: 9407.576 - tps: 4594.19241 + dps: 8472.39997 + tps: 4113.08216 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-NoBuffs-LongMultiTarget" value: { - dps: 12777.30273 - tps: 8135.43802 + dps: 13396.68015 + tps: 8810.55075 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-NoBuffs-LongSingleTarget" value: { - dps: 4032.57609 - tps: 2154.78905 + dps: 3919.14355 + tps: 2133.20657 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-FT-NoBuffs-ShortSingleTarget" value: { - dps: 5752.09503 - tps: 2797.27633 + dps: 5146.8463 + tps: 2466.28555 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-FullBuffs-LongMultiTarget" value: { - dps: 5276.4605 - tps: 4124.12972 + dps: 24610.88064 + tps: 14935.40925 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-FullBuffs-LongSingleTarget" value: { - dps: 5276.4605 - tps: 3093.19786 + dps: 7431.94317 + tps: 4129.9476 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-FullBuffs-ShortSingleTarget" value: { - dps: 6566.81221 - tps: 3446.91184 + dps: 8609.0128 + tps: 4196.21876 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-NoBuffs-LongMultiTarget" value: { - dps: 2699.32538 - tps: 3004.54636 + dps: 12762.99236 + tps: 8384.85554 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-NoBuffs-LongSingleTarget" value: { - dps: 2699.32538 - tps: 1660.70541 + dps: 3975.01096 + tps: 2162.62979 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-Wf--NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-P1-FT-WF-NoBuffs-ShortSingleTarget" value: { - dps: 3212.59838 - tps: 1736.5911 + dps: 5239.72909 + tps: 2518.91535 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-FullBuffs-LongMultiTarget" + value: { + dps: 21056.10847 + tps: 12814.22752 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-FullBuffs-LongSingleTarget" + value: { + dps: 6296.53783 + tps: 3409.99461 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-FullBuffs-ShortSingleTarget" + value: { + dps: 7441.42708 + tps: 3482.37286 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-NoBuffs-LongMultiTarget" + value: { + dps: 10513.99175 + tps: 7328.76632 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-NoBuffs-LongSingleTarget" + value: { + dps: 2970.48679 + tps: 1627.54304 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-FT-NoBuffs-ShortSingleTarget" + value: { + dps: 3973.25186 + tps: 1897.54169 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-FullBuffs-LongMultiTarget" + value: { + dps: 20432.26201 + tps: 12534.69662 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-FullBuffs-LongSingleTarget" + value: { + dps: 6399.5724 + tps: 3469.63277 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-FullBuffs-ShortSingleTarget" + value: { + dps: 7492.55252 + tps: 3526.42155 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-NoBuffs-LongMultiTarget" + value: { + dps: 9919.70176 + tps: 6990.33035 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-NoBuffs-LongSingleTarget" + value: { + dps: 3031.81574 + tps: 1671.38477 + } +} +dps_results: { + key: "TestEnhancement-Settings-Troll-P1-WF-WF-NoBuffs-ShortSingleTarget" + value: { + dps: 4039.93956 + tps: 1943.90379 } } dps_results: { key: "TestEnhancement-SwitchInFrontOfTarget-Default" value: { - dps: 7248.25443 - tps: 3964.38236 + dps: 6987.61881 + tps: 3853.35568 } } diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go index 8d7d509759..4d1806117e 100644 --- a/sim/shaman/enhancement/enhancement_test.go +++ b/sim/shaman/enhancement/enhancement_test.go @@ -24,8 +24,11 @@ func TestEnhancement(t *testing.T) { Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "FT", SpecOptions: PlayerOptionsFTFT}, OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "EnhItemSwap", SpecOptions: PlayerOptionsItemSwap}, - {Label: "Wf", SpecOptions: PlayerOptionsWFWF}, + {Label: "WF", SpecOptions: PlayerOptionsWFWF}, + }, + Rotation: core.RotationCombo{Label: "FT", Rotation: DefaultFTRotation}, + OtherRotations: []core.RotationCombo{ + {Label: "WF", Rotation: DefaultWFRotation}, }, ItemFilter: core.ItemFilter{ @@ -84,50 +87,35 @@ var StandardGlyphs = &proto.Glyphs{ var PlayerOptionsWFWF = &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ Options: enhShamWFWF, - Rotation: enhShamRotation, + Rotation: &proto.EnhancementShaman_Rotation{}, }, } var PlayerOptionsFTFT = &proto.Player_EnhancementShaman{ EnhancementShaman: &proto.EnhancementShaman{ Options: enhShamFTFT, - Rotation: enhShamRotation, - }, -} - -var PlayerOptionsItemSwap = &proto.Player_EnhancementShaman{ - EnhancementShaman: &proto.EnhancementShaman{ - Options: enhShamWFFT, - Rotation: enhShamRotationItemSwap, + Rotation: &proto.EnhancementShaman_Rotation{}, }, } -var enhShamRotation = &proto.EnhancementShaman_Rotation{ - RotationType: proto.EnhancementShaman_Rotation_Priority, - FirenovaManaThreshold: 3000, - ShamanisticRageManaThreshold: 25, - PrimaryShock: proto.EnhancementShaman_Rotation_Earth, - WeaveFlameShock: true, -} - -var enhShamRotationItemSwap = &proto.EnhancementShaman_Rotation{ - RotationType: proto.EnhancementShaman_Rotation_Priority, - FirenovaManaThreshold: 3000, - ShamanisticRageManaThreshold: 25, - PrimaryShock: proto.EnhancementShaman_Rotation_Earth, - WeaveFlameShock: true, - //Temp to test Item Swap, will switch to a more realistic swap with Phase 2 gear. - EnableItemSwap: true, - ItemSwap: &proto.ItemSwap{ - MhItem: &proto.ItemSpec{ - Id: 41752, - }, - OhItem: &proto.ItemSpec{ - Id: 41752, - Enchant: 3790, - }, - }, -} +//var enhShamRotationItemSwap = &proto.EnhancementShaman_Rotation{ +// RotationType: proto.EnhancementShaman_Rotation_Priority, +// FirenovaManaThreshold: 3000, +// ShamanisticRageManaThreshold: 25, +// PrimaryShock: proto.EnhancementShaman_Rotation_Earth, +// WeaveFlameShock: true, +// //Temp to test Item Swap, will switch to a more realistic swap with Phase 2 gear. +// EnableItemSwap: true, +// ItemSwap: &proto.ItemSwap{ +// MhItem: &proto.ItemSpec{ +// Id: 41752, +// }, +// OhItem: &proto.ItemSpec{ +// Id: 41752, +// Enchant: 3790, +// }, +// }, +//} var enhShamWFWF = &proto.EnhancementShaman_Options{ Shield: proto.ShamanShield_WaterShield, @@ -164,98 +152,64 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredFlameCap, } +var DefaultFTRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":66842}}},"doAtValue":{"const":{"val":"-3s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":53817}}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":49238}}}}, + {"action":{"castSpell":{"spellId":{"spellId":17364}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"spellId":49233}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":17364}}}}},"castSpell":{"spellId":{"spellId":17364}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49231}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"totemRemainingTime":{"totemType":"Water"}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":66842}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":58734}}},"rhs":{"const":{"val":"100ms"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}}]}},"castSpell":{"spellId":{"spellId":58734}}}}, + {"action":{"castSpell":{"spellId":{"spellId":61657}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":49281}}}}},"castSpell":{"spellId":{"spellId":49281}}}}, + {"action":{"castSpell":{"spellId":{"spellId":60103}}}} + ] +}`) + +var DefaultWFRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":66842}}},"doAtValue":{"const":{"val":"-3s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":53817}}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":49238}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":53817}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"const":{"val":"300ms"}},"rhs":{"spellCastTime":{"spellId":{"spellId":49238}}}}},"rhs":{"autoTimeToNext":{}}}}]}},"castSpell":{"spellId":{"spellId":49238}}}}, + {"action":{"castSpell":{"spellId":{"spellId":17364}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"spellId":49233}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49231}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"totemRemainingTime":{"totemType":"Water"}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":66842}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":58734}}},"rhs":{"const":{"val":"100ms"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}}]}},"castSpell":{"spellId":{"spellId":58734}}}}, + {"action":{"castSpell":{"spellId":{"spellId":61657}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":49281}}}}},"castSpell":{"spellId":{"spellId":49281}}}}, + {"action":{"castSpell":{"spellId":{"spellId":60103}}}} + ] +}`) + var Phase1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40543, - "enchant": 3817, - "gems": [ - 41398, - 40014 - ] - }, - { - "id": 44661, - "gems": [ - 40014 - ] - }, - { - "id": 40524, - "enchant": 3808, - "gems": [ - 40014 - ] - }, - { - "id": 40403, - "enchant": 3605 - }, - { - "id": 40523, - "enchant": 3832, - "gems": [ - 40003, - 40014 - ] - }, - { - "id": 40282, - "enchant": 3845, - "gems": [ - 42702, - 0 - ] - }, - { - "id": 40520, - "enchant": 3604, - "gems": [ - 42154, - 0 - ] - }, - { - "id": 40275, - "gems": [ - 42156 - ] - }, - { - "id": 40522, - "enchant": 3823, - "gems": [ - 39999, - 42156 - ] - }, - { - "id": 40367, - "enchant": 3606, - "gems": [ - 40058 - ] - }, - { - "id": 40474 - }, - { - "id": 40074 - }, - { - "id": 40684 - }, - { - "id": 37390 - }, - { - "id": 39763, - "enchant": 3789 - }, - { - "id": 39468, - "enchant": 3789 - }, - { - "id": 40322 - } + {"id":40543,"enchant":3817,"gems":[41398,40014]}, + {"id":44661,"gems":[40014]}, + {"id":40524,"enchant":3808,"gems":[40014]}, + {"id":40403,"enchant":3605}, + {"id":40523,"enchant":3832,"gems":[40003,40014]}, + {"id":40282,"enchant":3845,"gems":[42702,0]}, + {"id":40520,"enchant":3604,"gems":[42154,0]}, + {"id":40275,"gems":[42156]}, + {"id":40522,"enchant":3823,"gems":[39999,42156]}, + {"id":40367,"enchant":3606,"gems":[40058]}, + {"id":40474}, + {"id":40074}, + {"id":40684}, + {"id":37390}, + {"id":39763,"enchant":3789}, + {"id":39468,"enchant":3789}, + {"id":40322} ]}`) diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 4fe6308891..b69b2ca007 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -44,8 +44,8 @@ export const aplLaunchStatuses: Record = { [Spec.SpecFeralDruid]: LaunchStatus.Alpha, [Spec.SpecFeralTankDruid]: LaunchStatus.Beta, [Spec.SpecRestorationDruid]: LaunchStatus.Beta, - [Spec.SpecElementalShaman]: LaunchStatus.Alpha, - [Spec.SpecEnhancementShaman]: LaunchStatus.Alpha, + [Spec.SpecElementalShaman]: LaunchStatus.Beta, + [Spec.SpecEnhancementShaman]: LaunchStatus.Beta, [Spec.SpecRestorationShaman]: LaunchStatus.Beta, [Spec.SpecHunter]: LaunchStatus.Launched, [Spec.SpecMage]: LaunchStatus.Beta, diff --git a/ui/core/sim_ui.ts b/ui/core/sim_ui.ts index d8254747d3..9dc7bf34a3 100644 --- a/ui/core/sim_ui.ts +++ b/ui/core/sim_ui.ts @@ -14,9 +14,8 @@ import { SimTab } from './components/sim_tab.js'; import { BaseModal } from './components/base_modal.js'; const URLMAXLEN = 2048; -const globalKnownIssues = [ - 'Wowhead tooltips may not correctly display Tier 8 set bonuses when combining 10 and 25 player tier pieces.' -] +const globalKnownIssues: Array = [ +]; // Config for displaying a warning to the user whenever a condition is met. export interface SimWarning { diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts index 393a4b48d8..dec38e2e49 100644 --- a/ui/elemental_shaman/presets.ts +++ b/ui/elemental_shaman/presets.ts @@ -197,37 +197,29 @@ export const P3_PRESET_ALLI = { }`), }; -export const ROTATION_PRESET_BUILTIN = { - name: "Legacy", - rotation: SavedRotation.create({ - specRotationOptionsJson: ElementalShamanRotation.toJsonString(DefaultRotation), - }), -} - -export const ROTATION_PRESET_BASIC_APL = { - name: 'Basic APL', +export const ROTATION_PRESET_DEFAULT = { + name: 'Default', rotation: SavedRotation.create({ specRotationOptionsJson: ElementalShamanRotation.toJsonString(DefaultRotation), rotation: APLRotation.fromJsonString(`{ - "type": 3, + "type": "TypeAPL", "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":3738}}},"doAtValue":{"const":{"val":"-6s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":58643}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":58774}}},"doAtValue":{"const":{"val":"-4s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":57722}}},"doAtValue":{"const":{"val":"-3s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAtValue":{"const":{"val":"-2s"}}}, - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + {"action":{"castSpell":{"spellId":{"spellId":66842}}},"doAtValue":{"const":{"val":"-3.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAtValue":{"const":{"val":"-2s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},{"spellIsReady":{"spellId":{"tag":-1,"spellId":2825}}}]}},"castSpell":{"spellId":{"tag":-1,"spellId":2825}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},{"spellIsReady":{"spellId":{"spellId":2825}}}]}},"castSpell":{"spellId":{"spellId":2825}}}}, - {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":26297}}},{"spellIsReady":{"spellId":{"spellId":16166}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":16166}}}]}}}, + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825}}}}, + {"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":16166}}}]}}}, {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":26297}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":16166}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":64701}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":26297}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"auraIsActive":{"auraId":{"itemId":40255}}},{"auraIsActive":{"auraId":{"itemId":40682}}},{"auraIsActive":{"auraId":{"itemId":37660}}},{"auraIsActive":{"auraId":{"itemId":45518}}},{"auraIsActive":{"auraId":{"itemId":54572}}},{"auraIsActive":{"auraId":{"itemId":54588}}},{"auraIsActive":{"auraId":{"itemId":47213}}},{"auraIsActive":{"auraId":{"itemId":45490}}},{"auraIsActive":{"auraId":{"itemId":50348}}},{"auraIsActive":{"auraId":{"itemId":50353}}},{"auraIsActive":{"auraId":{"itemId":50360}}},{"auraIsActive":{"auraId":{"itemId":50365}}},{"auraIsActive":{"auraId":{"itemId":50345}}},{"auraIsActive":{"auraId":{"itemId":50340}}},{"auraIsActive":{"auraId":{"itemId":50398}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":45308}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":40432}}},"rhs":{"const":{"val":"10"}}}},{"auraIsActive":{"auraId":{"spellId":55637}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"itemId":40212}}},{"castSpell":{"spellId":{"itemId":37873}}},{"castSpell":{"spellId":{"itemId":45148}}},{"castSpell":{"spellId":{"itemId":48724}}},{"castSpell":{"spellId":{"itemId":50357}}},{"castSpell":{"spellId":{"spellId":2894}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"totemRemainingTime":{"totemType":"Water"}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":66842}}}}, {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58704}}}}}]}},"castSpell":{"spellId":{"spellId":58704}}}}, {"action":{"multidot":{"spellId":{"spellId":49233},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"spellIsReady":{"spellId":{"spellId":49271}}}]}},"castSpell":{"spellId":{"spellId":49271}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":60043}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":49271}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":60043}}}}, {"action":{"castSpell":{"spellId":{"spellId":49238}}}} ] }`), diff --git a/ui/elemental_shaman/sim.ts b/ui/elemental_shaman/sim.ts index c78c600dd0..972ec7cf76 100644 --- a/ui/elemental_shaman/sim.ts +++ b/ui/elemental_shaman/sim.ts @@ -5,6 +5,11 @@ import { Debuffs } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; import { Stat } from '../core/proto/common.js'; import { TristateEffect } from '../core/proto/common.js' +import { + APLAction, + APLListItem, + APLRotation, +} from '../core/proto/apl.js'; import { Player } from '../core/player.js'; import { Stats } from '../core/proto_utils/stats.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -17,7 +22,6 @@ import * as Mechanics from '../core/constants/mechanics.js'; import * as ShamanInputs from './inputs.js'; import * as Presets from './presets.js'; -import { shamanGlyphsConfig } from '../core/talents/shaman.js'; export class ElementalShamanSimUI extends IndividualSimUI { constructor(parentElem: HTMLElement, player: Player) { @@ -155,8 +159,7 @@ export class ElementalShamanSimUI extends IndividualSimUI): APLRotation => { + return Presets.ROTATION_PRESET_DEFAULT.rotation.rotation!; + }, }); } } diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts index 0eb3883103..6cec38a22d 100644 --- a/ui/enhancement_shaman/sim.ts +++ b/ui/enhancement_shaman/sim.ts @@ -3,6 +3,12 @@ import { IndividualBuffs } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; import { Stat, PseudoStat } from '../core/proto/common.js'; import { TristateEffect } from '../core/proto/common.js' +import { + APLAction, + APLListItem, + APLRotation, +} from '../core/proto/apl.js'; +import { ShamanImbue } from '../core/proto/shaman.js'; import { Player } from '../core/player.js'; import { Stats } from '../core/proto_utils/stats.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -21,8 +27,6 @@ export class EnhancementShamanSimUI extends IndividualSimUI): APLRotation => { + const hasT94P = player.getCurrentStats().sets.includes('Triumphant Nobundo\'s Battlegear (4pc)') + || player.getCurrentStats().sets.includes('Nobundo\'s Battlegear (4pc)') + || player.getCurrentStats().sets.includes('Triumphant Thrall\'s Battlegear (4pc)') + || player.getCurrentStats().sets.includes('Thrall\'s Battlegear (4pc)'); + const options = player.getSpecOptions(); + + if (hasT94P) { + console.log("has set"); + return Presets.ROTATION_PHASE_3.rotation.rotation!; + } else if (options.imbueMh == ShamanImbue.FlametongueWeapon) { + return Presets.ROTATION_FT_DEFAULT.rotation.rotation!; + } else { + return Presets.ROTATION_WF_DEFAULT.rotation.rotation!; + } + }, }); } }