From 25b35a7c668b580c5041653753a6197c97941820 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Sun, 17 Sep 2023 02:23:23 -0700 Subject: [PATCH] Add more hunter presets and update tests to use APL only --- .gitignore | 4 +- sim/hunter/TestAPL.results | 977 ---------------------------- sim/hunter/TestBM.results | 558 ++++++++-------- sim/hunter/TestMM.results | 562 ++++++++-------- sim/hunter/TestSV.results | 632 +++++++++--------- sim/hunter/hunter.go | 3 + sim/hunter/hunter_test.go | 309 ++++----- sim/rogue/TestAssassination.results | 2 +- sim/rogue/TestCombat.results | 2 +- ui/hunter/presets.ts | 121 +++- ui/hunter/sim.ts | 4 + 11 files changed, 1133 insertions(+), 2041 deletions(-) delete mode 100644 sim/hunter/TestAPL.results diff --git a/.gitignore b/.gitignore index 2b2b1dd32f..96129a0df2 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,7 @@ sim/web/__debug_bin wowsimwotlk # old result file -TestHunter.results -TestRotation.results -TestWarlock.results +TestAPL.results #macos .DS_Store diff --git a/sim/hunter/TestAPL.results b/sim/hunter/TestAPL.results deleted file mode 100644 index 97120410d2..0000000000 --- a/sim/hunter/TestAPL.results +++ /dev/null @@ -1,977 +0,0 @@ -character_stats_results: { - key: "TestAPL-CharacterStats-Default" - value: { - final_stats: 358.6 - final_stats: 2028.9082 - final_stats: 1597.805 - final_stats: 589.6 - final_stats: 275 - final_stats: 500 - final_stats: 109 - final_stats: 232 - final_stats: 1347.28032 - final_stats: 225 - final_stats: 0 - final_stats: 6521.73467 - final_stats: 264.78999 - final_stats: 2204.58833 - final_stats: 225 - final_stats: 68 - final_stats: 0 - final_stats: 13610 - final_stats: 0 - final_stats: 0 - final_stats: 14050.3164 - final_stats: 6786.83467 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 23122.05 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 75 - final_stats: 130 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -dps_results: { - key: "TestAPL-AllItems-Ahn'KaharBloodHunter'sBattlegear" - value: { - dps: 6808.70729 - tps: 5951.11193 - } -} -dps_results: { - key: "TestAPL-AllItems-Althor'sAbacus-50359" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Althor'sAbacus-50366" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-AshtongueTalismanofSwiftness-32487" - value: { - dps: 6401.05856 - tps: 5509.3493 - } -} -dps_results: { - key: "TestAPL-AllItems-AustereEarthsiegeDiamond" - value: { - dps: 6475.92537 - tps: 5569.37214 - } -} -dps_results: { - key: "TestAPL-AllItems-Bandit'sInsignia-40371" - value: { - dps: 6519.31732 - tps: 5622.23422 - } -} -dps_results: { - key: "TestAPL-AllItems-BaubleofTrueBlood-50354" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-BaubleofTrueBlood-50726" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-BeamingEarthsiegeDiamond" - value: { - dps: 6483.21938 - tps: 5579.24845 - } -} -dps_results: { - key: "TestAPL-AllItems-Beast-tamer'sShoulders-30892" - value: { - dps: 6411.82217 - tps: 5511.77945 - } -} -dps_results: { - key: "TestAPL-AllItems-BlackBowoftheBetrayer-32336" - value: { - dps: 6168.93575 - tps: 5270.98951 - } -} -dps_results: { - key: "TestAPL-AllItems-BlackBruise-50035" - value: { - dps: 6263.84078 - tps: 5375.08841 - } -} -dps_results: { - key: "TestAPL-AllItems-BlackBruise-50692" - value: { - dps: 6255.22274 - tps: 5366.76622 - } -} -dps_results: { - key: "TestAPL-AllItems-BlessedGarboftheUndeadSlayer" - value: { - dps: 5397.52232 - tps: 4647.09936 - } -} -dps_results: { - key: "TestAPL-AllItems-BlessedRegaliaofUndeadCleansing" - value: { - dps: 5167.02067 - tps: 4433.06736 - } -} -dps_results: { - key: "TestAPL-AllItems-BracingEarthsiegeDiamond" - value: { - dps: 6467.83437 - tps: 5453.8559 - } -} -dps_results: { - key: "TestAPL-AllItems-Bryntroll,theBoneArbiter-50415" - value: { - dps: 6673.31361 - tps: 5754.61909 - } -} -dps_results: { - key: "TestAPL-AllItems-Bryntroll,theBoneArbiter-50709" - value: { - dps: 6676.40401 - tps: 5756.72653 - } -} -dps_results: { - key: "TestAPL-AllItems-ChaoticSkyflareDiamond" - value: { - dps: 6616.97102 - tps: 5713.05312 - } -} -dps_results: { - key: "TestAPL-AllItems-CorpseTongueCoin-50349" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-CorpseTongueCoin-50352" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-CorrodedSkeletonKey-50356" - value: { - dps: 6416.63912 - tps: 5510.14268 - } -} -dps_results: { - key: "TestAPL-AllItems-CryptstalkerBattlegear" - value: { - dps: 5957.9364 - tps: 5113.36956 - } -} -dps_results: { - key: "TestAPL-AllItems-DarkmoonCard:Berserker!-42989" - value: { - dps: 6440.75672 - tps: 5551.96376 - } -} -dps_results: { - key: "TestAPL-AllItems-DarkmoonCard:Death-42990" - value: { - dps: 6495.5654 - tps: 5606.63956 - } -} -dps_results: { - key: "TestAPL-AllItems-DarkmoonCard:Greatness-44255" - value: { - dps: 6555.0804 - tps: 5653.47059 - } -} -dps_results: { - key: "TestAPL-AllItems-Death'sChoice-47464" - value: { - dps: 6751.79075 - tps: 5834.85368 - } -} -dps_results: { - key: "TestAPL-AllItems-DeathKnight'sAnguish-38212" - value: { - dps: 6415.08325 - tps: 5526.13292 - } -} -dps_results: { - key: "TestAPL-AllItems-Deathbringer'sWill-50362" - value: { - dps: 6664.22837 - tps: 5762.10685 - } -} -dps_results: { - key: "TestAPL-AllItems-Deathbringer'sWill-50363" - value: { - dps: 6708.79277 - tps: 5806.59347 - } -} -dps_results: { - key: "TestAPL-AllItems-Defender'sCode-40257" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-DestructiveSkyflareDiamond" - value: { - dps: 6486.36358 - tps: 5582.46547 - } -} -dps_results: { - key: "TestAPL-AllItems-DislodgedForeignObject-50348" - value: { - dps: 6492.20509 - tps: 5598.89266 - } -} -dps_results: { - key: "TestAPL-AllItems-DislodgedForeignObject-50353" - value: { - dps: 6496.70394 - tps: 5604.97464 - } -} -dps_results: { - key: "TestAPL-AllItems-EffulgentSkyflareDiamond" - value: { - dps: 6475.92537 - tps: 5569.37214 - } -} -dps_results: { - key: "TestAPL-AllItems-EmberSkyflareDiamond" - value: { - dps: 6473.96634 - tps: 5569.41838 - } -} -dps_results: { - key: "TestAPL-AllItems-EnigmaticSkyflareDiamond" - value: { - dps: 6483.21938 - tps: 5579.30148 - } -} -dps_results: { - key: "TestAPL-AllItems-EnigmaticStarflareDiamond" - value: { - dps: 6481.4256 - tps: 5577.48943 - } -} -dps_results: { - key: "TestAPL-AllItems-EphemeralSnowflake-50260" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-EssenceofGossamer-37220" - value: { - dps: 6386.93342 - tps: 5489.98867 - } -} -dps_results: { - key: "TestAPL-AllItems-EternalEarthsiegeDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-ExtractofNecromanticPower-40373" - value: { - dps: 6499.08686 - tps: 5610.37441 - } -} -dps_results: { - key: "TestAPL-AllItems-EyeoftheBroodmother-45308" - value: { - dps: 6430.65129 - tps: 5541.7718 - } -} -dps_results: { - key: "TestAPL-AllItems-Figurine-SapphireOwl-42413" - value: { - dps: 6382.93673 - tps: 5492.65361 - } -} -dps_results: { - key: "TestAPL-AllItems-ForethoughtTalisman-40258" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-ForgeEmber-37660" - value: { - dps: 6413.89435 - tps: 5524.8886 - } -} -dps_results: { - key: "TestAPL-AllItems-ForlornSkyflareDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-ForlornStarflareDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-FuryoftheFiveFlights-40431" - value: { - dps: 6519.10107 - tps: 5616.31379 - } -} -dps_results: { - key: "TestAPL-AllItems-FuturesightRune-38763" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Gladiator'sPursuit" - value: { - dps: 6386.6149 - tps: 5523.47927 - } -} -dps_results: { - key: "TestAPL-AllItems-GlowingTwilightScale-54573" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-GlowingTwilightScale-54589" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-GnomishLightningGenerator-41121" - value: { - dps: 6423.7172 - tps: 5534.79495 - } -} -dps_results: { - key: "TestAPL-AllItems-Gronnstalker'sArmor" - value: { - dps: 4796.75281 - tps: 4082.30151 - } -} -dps_results: { - key: "TestAPL-AllItems-Heartpierce-49982" - value: { - dps: 6699.18302 - tps: 5783.45563 - } -} -dps_results: { - key: "TestAPL-AllItems-Heartpierce-50641" - value: { - dps: 6702.56668 - tps: 5786.00382 - } -} -dps_results: { - key: "TestAPL-AllItems-IllustrationoftheDragonSoul-40432" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-ImpassiveSkyflareDiamond" - value: { - dps: 6483.21938 - tps: 5579.30148 - } -} -dps_results: { - key: "TestAPL-AllItems-ImpassiveStarflareDiamond" - value: { - dps: 6481.4256 - tps: 5577.48943 - } -} -dps_results: { - key: "TestAPL-AllItems-IncisorFragment-37723" - value: { - dps: 6436.22891 - tps: 5541.0995 - } -} -dps_results: { - key: "TestAPL-AllItems-InsightfulEarthsiegeDiamond" - value: { - dps: 6479.84662 - tps: 5580.50914 - } -} -dps_results: { - key: "TestAPL-AllItems-InvigoratingEarthsiegeDiamond" - value: { - dps: 6490.9839 - tps: 5584.9986 - hps: 12.062 - } -} -dps_results: { - key: "TestAPL-AllItems-LastWord-50179" - value: { - dps: 6658.6342 - tps: 5744.60874 - } -} -dps_results: { - key: "TestAPL-AllItems-LastWord-50708" - value: { - dps: 6656.05886 - tps: 5742.85254 - } -} -dps_results: { - key: "TestAPL-AllItems-Lavanthor'sTalisman-37872" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-MajesticDragonFigurine-40430" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-MeteoriteWhetstone-37390" - value: { - dps: 6467.06269 - tps: 5576.33717 - } -} -dps_results: { - key: "TestAPL-AllItems-NevermeltingIceCrystal-50259" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Nibelung-49992" - value: { - dps: 6720.07239 - tps: 5800.33256 - } -} -dps_results: { - key: "TestAPL-AllItems-Nibelung-50648" - value: { - dps: 6725.79231 - tps: 5805.26553 - } -} -dps_results: { - key: "TestAPL-AllItems-OfferingofSacrifice-37638" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-PersistentEarthshatterDiamond" - value: { - dps: 6485.51473 - tps: 5579.91237 - } -} -dps_results: { - key: "TestAPL-AllItems-PersistentEarthsiegeDiamond" - value: { - dps: 6489.67482 - tps: 5583.67944 - } -} -dps_results: { - key: "TestAPL-AllItems-PetrifiedScarab-21685" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-PetrifiedTwilightScale-54571" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-PetrifiedTwilightScale-54591" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-PowerfulEarthshatterDiamond" - value: { - dps: 6474.40831 - tps: 5568.34655 - } -} -dps_results: { - key: "TestAPL-AllItems-PowerfulEarthsiegeDiamond" - value: { - dps: 6475.92537 - tps: 5569.37214 - } -} -dps_results: { - key: "TestAPL-AllItems-PurifiedShardoftheGods" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-ReignoftheDead-47316" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-ReignoftheDead-47477" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-RelentlessEarthsiegeDiamond" - value: { - dps: 6631.85071 - tps: 5726.34424 - } -} -dps_results: { - key: "TestAPL-AllItems-RevitalizingSkyflareDiamond" - value: { - dps: 6467.83437 - tps: 5563.66748 - } -} -dps_results: { - key: "TestAPL-AllItems-RuneofRepulsion-40372" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-ScourgestalkerBattlegear" - value: { - dps: 6382.95749 - tps: 5520.22698 - } -} -dps_results: { - key: "TestAPL-AllItems-SealofthePantheon-36993" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Shadowmourne-49623" - value: { - dps: 6845.26666 - tps: 5924.04536 - } -} -dps_results: { - key: "TestAPL-AllItems-ShinyShardoftheGods" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Sindragosa'sFlawlessFang-50361" - value: { - dps: 6416.63912 - tps: 5510.14268 - } -} -dps_results: { - key: "TestAPL-AllItems-SliverofPureIce-50339" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-SliverofPureIce-50346" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-SoulPreserver-37111" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-SouloftheDead-40382" - value: { - dps: 6432.9619 - tps: 5544.1487 - } -} -dps_results: { - key: "TestAPL-AllItems-SparkofLife-37657" - value: { - dps: 6399.01463 - tps: 5503.57093 - } -} -dps_results: { - key: "TestAPL-AllItems-SphereofRedDragon'sBlood-37166" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-StormshroudArmor" - value: { - dps: 5085.51516 - tps: 4364.37477 - } -} -dps_results: { - key: "TestAPL-AllItems-SwiftSkyflareDiamond" - value: { - dps: 6489.67482 - tps: 5583.67944 - } -} -dps_results: { - key: "TestAPL-AllItems-SwiftStarflareDiamond" - value: { - dps: 6485.51473 - tps: 5579.91237 - } -} -dps_results: { - key: "TestAPL-AllItems-SwiftWindfireDiamond" - value: { - dps: 6478.23458 - tps: 5573.32002 - } -} -dps_results: { - key: "TestAPL-AllItems-TalismanofTrollDivinity-37734" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-TearsoftheVanquished-47215" - value: { - dps: 6407.12237 - tps: 5514.45842 - } -} -dps_results: { - key: "TestAPL-AllItems-TheFistsofFury" - value: { - dps: 6301.21539 - tps: 5410.7623 - } -} -dps_results: { - key: "TestAPL-AllItems-TheGeneral'sHeart-45507" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-TheTwinBladesofAzzinoth" - value: { - dps: 6411.60122 - tps: 5521.50582 - } -} -dps_results: { - key: "TestAPL-AllItems-ThunderingSkyflareDiamond" - value: { - dps: 6479.17557 - tps: 5574.86947 - } -} -dps_results: { - key: "TestAPL-AllItems-TinyAbominationinaJar-50351" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-TinyAbominationinaJar-50706" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-TirelessSkyflareDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-TirelessStarflareDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-TomeofArcanePhenomena-36972" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-TrenchantEarthshatterDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-TrenchantEarthsiegeDiamond" - value: { - dps: 6467.83437 - tps: 5563.90236 - } -} -dps_results: { - key: "TestAPL-AllItems-UndeadSlayer'sBlessedArmor" - value: { - dps: 5386.46454 - tps: 4633.99134 - } -} -dps_results: { - key: "TestAPL-AllItems-Val'anyr,HammerofAncientKings-46017" - value: { - dps: 6307.77754 - tps: 5425.07744 - } -} -dps_results: { - key: "TestAPL-AllItems-Windrunner'sPursuit" - value: { - dps: 6528.03918 - tps: 5645.5849 - } -} -dps_results: { - key: "TestAPL-AllItems-WingedTalisman-37844" - value: { - dps: 6358.75108 - tps: 5470.8682 - } -} -dps_results: { - key: "TestAPL-AllItems-Zod'sRepeatingLongbow-50034" - value: { - dps: 6854.59646 - tps: 5947.38942 - } -} -dps_results: { - key: "TestAPL-AllItems-Zod'sRepeatingLongbow-50638" - value: { - dps: 7002.08291 - tps: 6090.0359 - } -} -dps_results: { - key: "TestAPL-Average-Default" - value: { - dps: 6602.69938 - tps: 5695.83204 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" - value: { - dps: 7813.54711 - tps: 8182.89136 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" - value: { - dps: 7171.93299 - tps: 6180.14709 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" - value: { - dps: 8033.21546 - tps: 6884.76988 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" - value: { - dps: 4104.97814 - tps: 5150.21236 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" - value: { - dps: 3671.88425 - tps: 3343.48572 - } -} -dps_results: { - key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" - value: { - dps: 4307.25152 - tps: 3908.33573 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" - value: { - dps: 7858.92934 - tps: 8163.86442 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" - value: { - dps: 7204.64777 - tps: 6157.34301 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" - value: { - dps: 8109.70788 - tps: 6893.66223 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" - value: { - dps: 4118.65031 - tps: 5160.93976 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" - value: { - dps: 3691.87933 - tps: 3342.73207 - } -} -dps_results: { - key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" - value: { - dps: 4347.85226 - tps: 3924.24608 - } -} -dps_results: { - key: "TestAPL-SwitchInFrontOfTarget-Default" - value: { - dps: 6515.19284 - tps: 5676.26285 - } -} diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index 239869f3aa..b34b070628 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -46,935 +46,935 @@ character_stats_results: { dps_results: { key: "TestBM-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 6430.60948 - tps: 4462.81428 + dps: 6448.84165 + tps: 4476.74824 } } dps_results: { key: "TestBM-AllItems-Althor'sAbacus-50359" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-Althor'sAbacus-50366" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6172.49079 - tps: 4066.65692 + dps: 6168.29622 + tps: 4062.95115 } } dps_results: { key: "TestBM-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-Bandit'sInsignia-40371" value: { - dps: 6264.36623 - tps: 4150.37989 + dps: 6259.8055 + tps: 4146.37864 } } dps_results: { key: "TestBM-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6110.44287 - tps: 4021.55623 + dps: 6106.12899 + tps: 4017.88052 hps: 92.00776 } } dps_results: { key: "TestBM-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6110.44287 - tps: 4021.55623 + dps: 6106.12899 + tps: 4017.88052 hps: 92.00776 } } dps_results: { key: "TestBM-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6208.97708 - tps: 4089.41938 + dps: 6199.66791 + tps: 4086.87629 } } dps_results: { key: "TestBM-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6062.97191 - tps: 4002.02078 + dps: 6073.49939 + tps: 4021.60887 } } dps_results: { key: "TestBM-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 5753.0558 - tps: 3662.00551 + dps: 5754.09914 + tps: 3662.69984 } } dps_results: { key: "TestBM-AllItems-BlackBruise-50035" value: { - dps: 5994.2142 - tps: 3931.42938 + dps: 5991.83283 + tps: 3928.80541 } } dps_results: { key: "TestBM-AllItems-BlackBruise-50692" value: { - dps: 5984.21826 - tps: 3924.19684 + dps: 5981.84912 + tps: 3921.59092 } } dps_results: { key: "TestBM-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5157.66381 - tps: 3392.77837 + dps: 5202.4887 + tps: 3452.38261 } } dps_results: { key: "TestBM-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5010.24552 - tps: 3284.07215 + dps: 5037.93757 + tps: 3322.09948 } } dps_results: { key: "TestBM-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6189.84348 - tps: 3997.22095 + dps: 6179.0121 + tps: 3993.41431 } } dps_results: { key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6274.4109 + tps: 4160.445 } } dps_results: { key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6274.4109 + tps: 4160.445 } } dps_results: { key: "TestBM-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6280.96311 - tps: 4161.57265 + dps: 6269.74657 + tps: 4158.25558 } } dps_results: { key: "TestBM-AllItems-CorpseTongueCoin-50349" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-CorpseTongueCoin-50352" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 hps: 64 } } dps_results: { key: "TestBM-AllItems-CryptstalkerBattlegear" value: { - dps: 5731.84077 - tps: 3761.00352 + dps: 5728.76714 + tps: 3760.05413 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6176.49382 - tps: 4083.06025 + dps: 6165.42015 + tps: 4080.33561 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6230.44491 - tps: 4140.92156 + dps: 6221.28374 + tps: 4139.2015 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6259.71724 - tps: 4145.39512 + dps: 6269.64517 + tps: 4152.17256 } } dps_results: { key: "TestBM-AllItems-Death'sChoice-47464" value: { - dps: 6414.77522 - tps: 4260.39337 + dps: 6404.87314 + tps: 4252.53615 } } dps_results: { key: "TestBM-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6156.62706 - tps: 4066.15729 + dps: 6163.33217 + tps: 4074.65391 } } dps_results: { key: "TestBM-AllItems-Deathbringer'sWill-50362" value: { - dps: 6436.92672 - tps: 4310.24998 + dps: 6432.12301 + tps: 4312.36911 } } dps_results: { key: "TestBM-AllItems-Deathbringer'sWill-50363" value: { - dps: 6473.38342 - tps: 4352.55927 + dps: 6456.57817 + tps: 4344.11495 } } dps_results: { key: "TestBM-AllItems-Defender'sCode-40257" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6207.20626 - tps: 4087.6877 + dps: 6195.56818 + tps: 4083.8369 } } dps_results: { key: "TestBM-AllItems-DislodgedForeignObject-50348" value: { - dps: 6190.20706 - tps: 4117.68152 + dps: 6172.16475 + tps: 4101.43832 } } dps_results: { key: "TestBM-AllItems-DislodgedForeignObject-50353" value: { - dps: 6168.41023 - tps: 4087.37038 + dps: 6170.51221 + tps: 4087.5 } } dps_results: { key: "TestBM-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-EmberSkyflareDiamond" value: { - dps: 6199.01857 - tps: 4085.30306 + dps: 6187.20995 + tps: 4079.84526 } } dps_results: { key: "TestBM-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6201.26834 - tps: 4081.87788 + dps: 6190.23566 + tps: 4078.74467 } } dps_results: { key: "TestBM-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6197.07562 - tps: 4079.06355 + dps: 6187.19489 + tps: 4075.83137 } } dps_results: { key: "TestBM-AllItems-EphemeralSnowflake-50260" value: { - dps: 6147.54012 - tps: 4080.58107 + dps: 6139.34083 + tps: 4077.94212 } } dps_results: { key: "TestBM-AllItems-EssenceofGossamer-37220" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6206.97348 - tps: 4115.66367 + dps: 6194.9086 + tps: 4112.11765 } } dps_results: { key: "TestBM-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6171.0574 - tps: 4079.83524 + dps: 6159.42331 + tps: 4077.70179 } } dps_results: { key: "TestBM-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6140.1 - tps: 4045.59432 + dps: 6143.18942 + tps: 4047.0102 } } dps_results: { key: "TestBM-AllItems-ForethoughtTalisman-40258" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-ForgeEmber-37660" value: { - dps: 6156.86838 - tps: 4067.41335 + dps: 6150.27797 + tps: 4068.21773 } } dps_results: { key: "TestBM-AllItems-ForlornSkyflareDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-ForlornStarflareDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6260.09906 - tps: 4130.13967 + dps: 6255.72757 + tps: 4126.28702 } } dps_results: { key: "TestBM-AllItems-FuturesightRune-38763" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-Gladiator'sPursuit" value: { - dps: 5999.81565 - tps: 4073.00616 + dps: 6036.34696 + tps: 4112.65517 } } dps_results: { key: "TestBM-AllItems-GlowingTwilightScale-54573" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-GlowingTwilightScale-54589" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6205.90568 - tps: 4116.35069 + dps: 6196.50308 + tps: 4114.44582 } } dps_results: { key: "TestBM-AllItems-Gronnstalker'sArmor" value: { - dps: 4826.55577 - tps: 3133.37978 + dps: 4895.20867 + tps: 3209.71506 } } dps_results: { key: "TestBM-AllItems-Heartpierce-49982" value: { - dps: 6330.00574 - tps: 4196.84209 + dps: 6319.62715 + tps: 4193.36569 } } dps_results: { key: "TestBM-AllItems-Heartpierce-50641" value: { - dps: 6330.97959 - tps: 4197.5512 + dps: 6320.59955 + tps: 4194.07366 } } dps_results: { key: "TestBM-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6201.26834 - tps: 4081.87788 + dps: 6190.23566 + tps: 4078.74467 } } dps_results: { key: "TestBM-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6197.07562 - tps: 4079.06355 + dps: 6187.19489 + tps: 4075.83137 } } dps_results: { key: "TestBM-AllItems-IncisorFragment-37723" value: { - dps: 6251.59056 - tps: 4143.12575 + dps: 6247.40194 + tps: 4139.49455 } } dps_results: { key: "TestBM-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6214.86711 - tps: 4105.64543 + dps: 6217.66326 + tps: 4111.59364 } } dps_results: { key: "TestBM-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6211.25555 - tps: 4093.11478 - hps: 11.12548 + dps: 6199.92964 + tps: 4088.88871 + hps: 11.27139 } } dps_results: { key: "TestBM-AllItems-LastWord-50179" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6274.4109 + tps: 4160.445 } } dps_results: { key: "TestBM-AllItems-LastWord-50708" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6274.4109 + tps: 4160.445 } } dps_results: { key: "TestBM-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6205.51321 - tps: 4121.70118 + dps: 6194.73398 + tps: 4120.73737 } } dps_results: { key: "TestBM-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6204.63211 - tps: 4122.20467 + dps: 6197.60159 + tps: 4118.34776 } } dps_results: { key: "TestBM-AllItems-Nibelung-49992" value: { - dps: 6355.22986 - tps: 4217.52872 + dps: 6359.16856 + tps: 4224.62529 } } dps_results: { key: "TestBM-AllItems-Nibelung-50648" value: { - dps: 6359.61833 - tps: 4220.72842 + dps: 6364.72433 + tps: 4228.67699 } } dps_results: { key: "TestBM-AllItems-OfferingofSacrifice-37638" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6206.16725 - tps: 4089.56131 + dps: 6195.31486 + tps: 4085.58508 } } dps_results: { key: "TestBM-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6210.00814 - tps: 4092.34606 + dps: 6199.15081 + tps: 4088.36638 } } dps_results: { key: "TestBM-AllItems-PetrifiedScarab-21685" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-PurifiedShardoftheGods" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-ReignoftheDead-47316" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-ReignoftheDead-47477" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6274.4109 + tps: 4160.445 } } dps_results: { key: "TestBM-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6193.18139 - tps: 4080.75089 + dps: 6188.04802 + tps: 4081.20289 } } dps_results: { key: "TestBM-AllItems-RuneofRepulsion-40372" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-ScourgestalkerBattlegear" value: { - dps: 6146.02396 - tps: 4106.23907 + dps: 6136.49607 + tps: 4097.71004 } } dps_results: { key: "TestBM-AllItems-SealofthePantheon-36993" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-Shadowmourne-49623" value: { - dps: 6493.34829 - tps: 4379.73722 + dps: 6481.82345 + tps: 4370.67328 } } dps_results: { key: "TestBM-AllItems-ShinyShardoftheGods" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-SliverofPureIce-50339" value: { - dps: 6124.51987 - tps: 4039.91887 + dps: 6134.095 + tps: 4046.45664 } } dps_results: { key: "TestBM-AllItems-SliverofPureIce-50346" value: { - dps: 6126.01836 - tps: 4041.93623 + dps: 6134.095 + tps: 4047.13997 } } dps_results: { key: "TestBM-AllItems-SoulPreserver-37111" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-SouloftheDead-40382" value: { - dps: 6174.5744 - tps: 4083.55112 + dps: 6163.37489 + tps: 4080.69107 } } dps_results: { key: "TestBM-AllItems-SparkofLife-37657" value: { - dps: 6155.03367 - tps: 4064.96946 + dps: 6146.15243 + tps: 4061.32781 } } dps_results: { key: "TestBM-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6233.62006 - tps: 4099.84603 + dps: 6225.55685 + tps: 4099.53434 } } dps_results: { key: "TestBM-AllItems-StormshroudArmor" value: { - dps: 4872.86861 - tps: 3163.52785 + dps: 4947.6938 + tps: 3247.20185 } } dps_results: { key: "TestBM-AllItems-SwiftSkyflareDiamond" value: { - dps: 6210.00814 - tps: 4092.34606 + dps: 6199.15081 + tps: 4088.36638 } } dps_results: { key: "TestBM-AllItems-SwiftStarflareDiamond" value: { - dps: 6206.16725 - tps: 4089.56131 + dps: 6195.31486 + tps: 4085.58508 } } dps_results: { key: "TestBM-AllItems-SwiftWindfireDiamond" value: { - dps: 6199.4457 - tps: 4084.688 + dps: 6188.60196 + tps: 4080.71779 } } dps_results: { key: "TestBM-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-TearsoftheVanquished-47215" value: { - dps: 6166.47993 - tps: 4064.57412 + dps: 6173.3581 + tps: 4068.7212 } } dps_results: { key: "TestBM-AllItems-TheFistsofFury" value: { - dps: 6019.24932 - tps: 3953.00966 + dps: 6016.9665 + tps: 3952.82643 } } dps_results: { key: "TestBM-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 6139.80315 - tps: 4055.95006 + dps: 6131.20825 + tps: 4055.61072 } } dps_results: { key: "TestBM-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6201.75171 - tps: 4096.32299 + dps: 6205.18703 + tps: 4095.84572 } } dps_results: { key: "TestBM-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6154.00385 - tps: 4042.58673 + dps: 6145.88356 + tps: 4042.26711 } } dps_results: { key: "TestBM-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6154.00385 - tps: 4042.58673 + dps: 6145.88356 + tps: 4042.26711 } } dps_results: { key: "TestBM-AllItems-TirelessSkyflareDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-TirelessStarflareDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6134.58586 - tps: 4053.01247 + dps: 6123.95676 + tps: 4046.31105 } } dps_results: { key: "TestBM-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6189.84348 - tps: 4077.72613 + dps: 6179.0121 + tps: 4073.76453 } } dps_results: { key: "TestBM-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5095.50417 - tps: 3340.43113 + dps: 5169.21763 + tps: 3423.4168 } } dps_results: { key: "TestBM-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6076.22112 - tps: 4019.31575 + dps: 6069.99313 + tps: 4012.1493 } } dps_results: { key: "TestBM-AllItems-Windrunner'sPursuit" value: { - dps: 6285.83794 - tps: 4240.88252 + dps: 6277.60094 + tps: 4234.49795 } } dps_results: { key: "TestBM-AllItems-WingedTalisman-37844" value: { - dps: 6110.45978 - tps: 4021.55623 + dps: 6106.19343 + tps: 4017.88052 } } dps_results: { key: "TestBM-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 6677.17643 - tps: 4597.13156 + dps: 6678.98126 + tps: 4603.42764 } } dps_results: { key: "TestBM-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 6876.74098 - tps: 4791.07846 + dps: 6872.01651 + tps: 4796.9912 } } dps_results: { key: "TestBM-Average-Default" value: { - dps: 6222.64804 - tps: 4123.73162 + dps: 6207.3495 + tps: 4114.57047 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongMultiTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 6845.8155 - tps: 5845.40652 + dps: 6644.9874 + tps: 5614.27286 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongSingleTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6194.78462 - tps: 4185.55652 + dps: 5986.5656 + tps: 3973.48249 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-ShortSingleTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7410.33732 - tps: 4922.58113 + dps: 7163.68763 + tps: 4690.7284 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongMultiTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3451.89812 - tps: 4306.02312 + dps: 2102.97983 + tps: 1461.15178 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongSingleTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3002.99743 - tps: 2351.25841 + dps: 2006.48569 + tps: 1363.12906 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-ShortSingleTarget" + key: "TestBM-Settings-Dwarf-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3521.75427 - tps: 2736.47636 + dps: 3413.92935 + tps: 2606.91741 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongMultiTarget" + key: "TestBM-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 6946.78131 - tps: 5845.03148 + dps: 6747.21059 + tps: 5599.90433 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongSingleTarget" + key: "TestBM-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6284.72175 - tps: 4163.86842 + dps: 6084.2474 + tps: 3956.63587 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-FullBuffs-ShortSingleTarget" + key: "TestBM-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7570.43523 - tps: 4940.69444 + dps: 7321.79796 + tps: 4708.74066 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongMultiTarget" + key: "TestBM-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3491.37097 - tps: 4310.44333 + dps: 2145.10314 + tps: 1467.50421 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongSingleTarget" + key: "TestBM-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3041.82941 - tps: 2347.98207 + dps: 2050.44779 + tps: 1371.77132 } } dps_results: { - key: "TestBM-Settings-Orc-P1-BM-NoBuffs-ShortSingleTarget" + key: "TestBM-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3574.18477 - tps: 2740.69022 + dps: 3481.22204 + tps: 2625.92919 } } dps_results: { key: "TestBM-SwitchInFrontOfTarget-Default" value: { - dps: 6126.27821 - tps: 4179.1492 + dps: 6105.96567 + tps: 4172.12801 } } diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results index 046a29ddbf..c53a6bf286 100644 --- a/sim/hunter/TestMM.results +++ b/sim/hunter/TestMM.results @@ -46,935 +46,935 @@ character_stats_results: { dps_results: { key: "TestMM-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 7561.33712 - tps: 6654.11824 + dps: 7806.26697 + tps: 6913.74705 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50359" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50366" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6901.1898 - tps: 5979.6667 + dps: 7110.15864 + tps: 6192.45938 } } dps_results: { key: "TestMM-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-Bandit'sInsignia-40371" value: { - dps: 6995.2324 - tps: 6069.38722 + dps: 7206.66603 + tps: 6284.8081 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6833.83837 - tps: 5918.65261 - hps: 91.34376 + dps: 7039.23333 + tps: 6128.13381 + hps: 91.85693 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6833.83837 - tps: 5918.65261 - hps: 91.34376 + dps: 7039.23333 + tps: 6128.13381 + hps: 91.85693 } } dps_results: { key: "TestMM-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6946.36092 - tps: 6020.41565 + dps: 7148.47276 + tps: 6227.31069 } } dps_results: { key: "TestMM-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6918.88601 - tps: 6004.58388 + dps: 7108.83961 + tps: 6196.69952 } } dps_results: { key: "TestMM-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6391.03407 - tps: 5470.73728 + dps: 6635.90335 + tps: 5719.36597 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50035" value: { - dps: 6746.18095 - tps: 5826.76683 + dps: 6946.67586 + tps: 6046.10624 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50692" value: { - dps: 6734.12058 - tps: 5815.91545 + dps: 6933.89887 + tps: 6034.52118 } } dps_results: { key: "TestMM-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6020.72751 - tps: 5218.66668 + dps: 6108.57928 + tps: 5320.79602 } } dps_results: { key: "TestMM-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5774.08751 - tps: 4988.32615 + dps: 5906.66833 + tps: 5131.26057 } } dps_results: { key: "TestMM-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6909.0946 - tps: 5866.41552 + dps: 7125.83 + tps: 6080.68931 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 7289.03205 + tps: 6365.92618 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 7289.03205 + tps: 6365.92618 } } dps_results: { key: "TestMM-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7090.88966 - tps: 6165.00307 + dps: 7284.97528 + tps: 6364.57188 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50349" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50352" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 hps: 64 } } dps_results: { key: "TestMM-AllItems-CryptstalkerBattlegear" value: { - dps: 6512.94636 - tps: 5613.16592 + dps: 6701.25007 + tps: 5809.02851 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6945.31811 - tps: 6029.823 + dps: 7136.3086 + tps: 6225.58609 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6999.20987 - tps: 6082.29801 + dps: 7176.55964 + tps: 6266.48775 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7017.19197 - tps: 6090.5562 + dps: 7272.91066 + tps: 6345.57427 } } dps_results: { key: "TestMM-AllItems-Death'sChoice-47464" value: { - dps: 7240.84921 - tps: 6299.05006 + dps: 7451.73689 + tps: 6512.50475 } } dps_results: { key: "TestMM-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6928.77315 - tps: 6013.11441 + dps: 7122.70901 + tps: 6213.01949 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50362" value: { - dps: 7232.63382 - tps: 6306.59968 + dps: 7435.32776 + tps: 6512.1507 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50363" value: { - dps: 7287.78361 - tps: 6360.2919 + dps: 7482.71021 + tps: 6558.11107 } } dps_results: { key: "TestMM-AllItems-Defender'sCode-40257" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6949.86365 - tps: 6023.97705 + dps: 7143.7907 + tps: 6223.66883 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50348" value: { - dps: 6991.90257 - tps: 6070.23865 + dps: 7161.67859 + tps: 6248.4746 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50353" value: { - dps: 6978.43202 - tps: 6057.93793 + dps: 7149.2089 + tps: 6239.62565 } } dps_results: { key: "TestMM-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-EmberSkyflareDiamond" value: { - dps: 6916.1183 - tps: 5991.28707 + dps: 7138.33582 + tps: 6214.84431 } } dps_results: { key: "TestMM-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6946.36092 - tps: 6020.47432 + dps: 7142.98347 + tps: 6222.58007 } } dps_results: { key: "TestMM-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6940.81524 - tps: 6014.92865 + dps: 7140.94973 + tps: 6220.54633 } } dps_results: { key: "TestMM-AllItems-EphemeralSnowflake-50260" value: { - dps: 6928.97019 - tps: 6005.03617 + dps: 7092.87981 + tps: 6187.35272 } } dps_results: { key: "TestMM-AllItems-EssenceofGossamer-37220" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6998.71739 - tps: 6083.23558 + dps: 7186.01548 + tps: 6275.47344 } } dps_results: { key: "TestMM-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6940.90392 - tps: 6024.88411 + dps: 7122.45223 + tps: 6212.22888 } } dps_results: { key: "TestMM-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6861.33959 - tps: 5943.8474 + dps: 7086.95395 + tps: 6171.5938 } } dps_results: { key: "TestMM-AllItems-ForethoughtTalisman-40258" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-ForgeEmber-37660" value: { - dps: 6928.95718 - tps: 6012.12647 + dps: 7102.54092 + tps: 6192.55011 } } dps_results: { key: "TestMM-AllItems-ForlornSkyflareDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-ForlornStarflareDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7013.19007 - tps: 6080.45957 + dps: 7229.36112 + tps: 6300.36887 } } dps_results: { key: "TestMM-AllItems-FuturesightRune-38763" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-Gladiator'sPursuit" value: { - dps: 7050.9929 - tps: 6169.66526 + dps: 7249.05623 + tps: 6376.09385 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54573" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54589" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6977.36541 - tps: 6060.28825 + dps: 7150.82886 + tps: 6240.67776 } } dps_results: { key: "TestMM-AllItems-Gronnstalker'sArmor" value: { - dps: 5445.29927 - tps: 4676.46198 + dps: 5571.71325 + tps: 4823.19575 } } dps_results: { key: "TestMM-AllItems-Heartpierce-49982" value: { - dps: 7153.00561 - tps: 6220.46698 + dps: 7346.61323 + tps: 6418.21293 } } dps_results: { key: "TestMM-AllItems-Heartpierce-50641" value: { - dps: 7154.18062 - tps: 6221.5283 + dps: 7347.85153 + tps: 6419.33738 } } dps_results: { key: "TestMM-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.50503 + tps: 6128.33185 } } dps_results: { key: "TestMM-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6946.36092 - tps: 6020.47432 + dps: 7142.98347 + tps: 6222.58007 } } dps_results: { key: "TestMM-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6940.81524 - tps: 6014.92865 + dps: 7140.94973 + tps: 6220.54633 } } dps_results: { key: "TestMM-AllItems-IncisorFragment-37723" value: { - dps: 6993.372 - tps: 6069.95892 + dps: 7199.03345 + tps: 6279.42371 } } dps_results: { key: "TestMM-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6922.85371 - tps: 6004.72667 + dps: 7180.75614 + tps: 6259.59841 } } dps_results: { key: "TestMM-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6937.84907 - tps: 6011.39856 - hps: 11.30426 + dps: 7148.6555 + tps: 6223.96266 + hps: 11.15979 } } dps_results: { key: "TestMM-AllItems-LastWord-50179" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 7289.03205 + tps: 6365.92618 } } dps_results: { key: "TestMM-AllItems-LastWord-50708" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 7289.03205 + tps: 6365.92618 } } dps_results: { key: "TestMM-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7003.71415 - tps: 6087.42348 + dps: 7187.48209 + tps: 6270.80096 } } dps_results: { key: "TestMM-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6993.53249 - tps: 6078.61754 + dps: 7194.62115 + tps: 6283.26717 } } dps_results: { key: "TestMM-AllItems-Nibelung-49992" value: { - dps: 7170.30517 - tps: 6235.72981 + dps: 7401.85333 + tps: 6467.26458 } } dps_results: { key: "TestMM-AllItems-Nibelung-50648" value: { - dps: 7175.682 - tps: 6240.55672 + dps: 7408.68046 + tps: 6473.36101 } } dps_results: { key: "TestMM-AllItems-OfferingofSacrifice-37638" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6928.5672 - tps: 6002.54173 + dps: 7146.4464 + tps: 6222.19817 } } dps_results: { key: "TestMM-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6933.14899 - tps: 6006.66963 + dps: 7151.29731 + tps: 6226.59329 } } dps_results: { key: "TestMM-AllItems-PetrifiedScarab-21685" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-PurifiedShardoftheGods" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47316" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7048.65175 + tps: 6137.47386 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47477" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7049.86388 + tps: 6138.68599 } } dps_results: { key: "TestMM-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 7289.03205 + tps: 6365.92618 } } dps_results: { key: "TestMM-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6909.0946 - tps: 5984.76435 + dps: 7133.17599 + tps: 6209.80841 } } dps_results: { key: "TestMM-AllItems-RuneofRepulsion-40372" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-ScourgestalkerBattlegear" value: { - dps: 6880.95298 - tps: 5991.28151 + dps: 7085.16295 + tps: 6206.76154 } } dps_results: { key: "TestMM-AllItems-SealofthePantheon-36993" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-Shadowmourne-49623" value: { - dps: 7360.52915 - tps: 6433.34821 + dps: 7523.90217 + tps: 6604.07758 } } dps_results: { key: "TestMM-AllItems-ShinyShardoftheGods" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50339" value: { - dps: 6833.65022 - tps: 5923.61821 + dps: 7079.35313 + tps: 6168.86356 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50346" value: { - dps: 6833.65022 - tps: 5924.02663 + dps: 7080.43153 + tps: 6170.49032 } } dps_results: { key: "TestMM-AllItems-SoulPreserver-37111" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-SouloftheDead-40382" value: { - dps: 6938.75316 - tps: 6023.33899 + dps: 7140.77887 + tps: 6230.11118 } } dps_results: { key: "TestMM-AllItems-SparkofLife-37657" value: { - dps: 6926.50647 - tps: 6010.39604 + dps: 7101.30649 + tps: 6191.25195 } } dps_results: { key: "TestMM-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6926.52996 - tps: 6001.76422 + dps: 7138.26932 + tps: 6217.38206 } } dps_results: { key: "TestMM-AllItems-StormshroudArmor" value: { - dps: 5678.43152 - tps: 4890.59501 + dps: 5747.89276 + tps: 4982.98695 } } dps_results: { key: "TestMM-AllItems-SwiftSkyflareDiamond" value: { - dps: 6933.14899 - tps: 6006.66963 + dps: 7151.29731 + tps: 6226.59329 } } dps_results: { key: "TestMM-AllItems-SwiftStarflareDiamond" value: { - dps: 6928.5672 - tps: 6002.54173 + dps: 7146.4464 + tps: 6222.19817 } } dps_results: { key: "TestMM-AllItems-SwiftWindfireDiamond" value: { - dps: 6920.54907 - tps: 5995.31792 + dps: 7137.95729 + tps: 6214.5067 } } dps_results: { key: "TestMM-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-TearsoftheVanquished-47215" value: { - dps: 6889.03711 - tps: 5968.29115 + dps: 7125.69188 + tps: 6205.40447 } } dps_results: { key: "TestMM-AllItems-TheFistsofFury" value: { - dps: 6783.18401 - tps: 5862.22524 + dps: 6980.56521 + tps: 6079.19973 } } dps_results: { key: "TestMM-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.512 + tps: 6128.33882 } } dps_results: { key: "TestMM-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 6903.53729 - tps: 5980.70386 + dps: 7121.1151 + tps: 6219.90303 } } dps_results: { key: "TestMM-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6951.21502 - tps: 6019.24371 + dps: 7166.43989 + tps: 6247.83712 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6833.85767 - tps: 5918.86005 + dps: 7039.7296 + tps: 6128.55642 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6833.85767 - tps: 5918.86005 + dps: 7039.7296 + tps: 6128.55642 } } dps_results: { key: "TestMM-AllItems-TirelessSkyflareDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-TirelessStarflareDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6913.39479 - tps: 5991.99037 + dps: 7064.13602 + tps: 6155.05274 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6909.0946 - tps: 5984.99819 + dps: 7125.83 + tps: 6203.51889 } } dps_results: { key: "TestMM-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5994.82154 - tps: 5198.29311 + dps: 6066.88495 + tps: 5285.44464 } } dps_results: { key: "TestMM-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6829.33381 - tps: 5928.10722 + dps: 7029.34664 + tps: 6123.46382 } } dps_results: { key: "TestMM-AllItems-Windrunner'sPursuit" value: { - dps: 7074.59751 - tps: 6153.94814 + dps: 7318.21177 + tps: 6398.9946 } } dps_results: { key: "TestMM-AllItems-WingedTalisman-37844" value: { - dps: 6833.65022 - tps: 5918.65261 + dps: 7039.51859 + tps: 6128.34541 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7675.09177 - tps: 6746.35818 + dps: 7779.76491 + tps: 6862.6882 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 7893.69197 - tps: 6974.16989 + dps: 8048.10992 + tps: 7130.67432 } } dps_results: { key: "TestMM-Average-Default" value: { - dps: 7111.02182 - tps: 6185.04292 + dps: 7285.56076 + tps: 6369.69972 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 7773.66735 - tps: 7994.87213 + dps: 6856.8672 + tps: 7002.04398 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 7062.10901 - tps: 6184.83648 + dps: 6186.98246 + tps: 5302.2022 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8033.11625 - tps: 7021.20422 + dps: 7126.57511 + tps: 6102.06963 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3941.49087 - tps: 5234.69263 + dps: 1819.5762 + tps: 1517.36463 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3484.69958 - tps: 3211.8784 + dps: 1736.1631 + tps: 1436.00068 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4146.19849 - tps: 3784.56535 + dps: 3596.81842 + tps: 3223.24096 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 7799.1931 - tps: 7971.29929 + dps: 6867.35934 + tps: 6962.733 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 7098.36783 - tps: 6171.11563 + dps: 6221.67823 + tps: 5285.2419 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8123.04999 - tps: 7049.09301 + dps: 7208.08663 + tps: 6121.3929 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 3948.3167 - tps: 5226.48417 + dps: 1836.9872 + tps: 1519.05448 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3510.55818 - tps: 3219.84328 + dps: 1740.43777 + tps: 1425.98401 } } dps_results: { - key: "TestMM-Settings-Orc-P1-MM-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4183.2087 - tps: 3800.62106 + dps: 3573.35645 + tps: 3179.07506 } } dps_results: { key: "TestMM-SwitchInFrontOfTarget-Default" value: { - dps: 7049.15876 - tps: 6172.68313 + dps: 7241.4931 + tps: 6379.58708 } } diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 2a6768468d..218144633a 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -46,1019 +46,1019 @@ character_stats_results: { dps_results: { key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 7465.78158 - tps: 6466.62847 + dps: 7887.95855 + tps: 6897.37084 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50359" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50366" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6963.46717 - tps: 5928.83104 + dps: 7434.40295 + tps: 6395.67993 } } dps_results: { key: "TestSV-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7038.45204 - tps: 5990.03126 + dps: 7549.04078 + tps: 6495.32085 } } dps_results: { key: "TestSV-AllItems-Bandit'sInsignia-40371" value: { - dps: 7075.58504 - tps: 6034.70949 + dps: 7560.93614 + tps: 6515.87294 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6916.20013 - tps: 5885.86192 - hps: 91.86418 + dps: 7384.37841 + tps: 6349.81391 + hps: 91.41974 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6916.20013 - tps: 5885.86192 - hps: 91.86418 + dps: 7384.37841 + tps: 6349.81391 + hps: 91.41974 } } dps_results: { key: "TestSV-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7049.90218 - tps: 6004.59644 + dps: 7559.28626 + tps: 6508.52862 } } dps_results: { key: "TestSV-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7029.43844 - tps: 5990.53963 + dps: 7502.02544 + tps: 6466.17609 } } dps_results: { key: "TestSV-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6805.65375 - tps: 5765.38434 + dps: 7281.25026 + tps: 6237.11084 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50035" value: { - dps: 6842.2278 - tps: 5817.5003 + dps: 7325.73499 + tps: 6299.99082 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50692" value: { - dps: 6832.97485 - tps: 5808.58491 + dps: 7315.08806 + tps: 6289.68178 } } dps_results: { key: "TestSV-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5905.00468 - tps: 5037.73721 + dps: 6225.84635 + tps: 5361.46751 } } dps_results: { key: "TestSV-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5632.14717 - tps: 4780.39136 + dps: 5977.4598 + tps: 5138.21263 } } dps_results: { key: "TestSV-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7029.71614 - tps: 5865.80188 + dps: 7539.39249 + tps: 6360.11902 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7249.38265 - tps: 6187.38274 + dps: 7767.48528 + tps: 6700.15077 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7252.71693 - tps: 6189.62172 + dps: 7771.16337 + tps: 6702.72859 } } dps_results: { key: "TestSV-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7192.93037 - tps: 6147.67482 + dps: 7707.14152 + tps: 6656.44107 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50349" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50352" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6978.7727 - tps: 5927.65715 + dps: 7452.13786 + tps: 6396.87681 hps: 64 } } dps_results: { key: "TestSV-AllItems-CryptstalkerBattlegear" value: { - dps: 6460.83291 - tps: 5483.79864 + dps: 6802.17227 + tps: 5824.70387 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7013.99803 - tps: 5984.06626 + dps: 7483.81503 + tps: 6449.57298 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7062.54159 - tps: 6031.77388 + dps: 7533.21366 + tps: 6498.8366 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7122.27584 - tps: 6078.88872 + dps: 7633.89358 + tps: 6583.4726 } } dps_results: { key: "TestSV-AllItems-Death'sChoice-47464" value: { - dps: 7342.54511 - tps: 6278.91281 + dps: 7880.77173 + tps: 6814.50378 } } dps_results: { key: "TestSV-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6992.42754 - tps: 5962.4808 + dps: 7461.88066 + tps: 6427.66753 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50362" value: { - dps: 7256.96446 - tps: 6214.1096 + dps: 7727.89358 + tps: 6681.37007 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50363" value: { - dps: 7292.77614 - tps: 6248.73582 + dps: 7772.85604 + tps: 6725.43792 } } dps_results: { key: "TestSV-AllItems-Defender'sCode-40257" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7053.61307 - tps: 6008.3884 + dps: 7562.20269 + tps: 6511.49271 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50348" value: { - dps: 7069.94589 - tps: 6033.20841 + dps: 7485.38325 + tps: 6448.28633 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50353" value: { - dps: 7072.51479 - tps: 6036.98963 + dps: 7477.71438 + tps: 6439.97266 } } dps_results: { key: "TestSV-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7038.45204 - tps: 5990.03126 + dps: 7549.04078 + tps: 6495.32085 } } dps_results: { key: "TestSV-AllItems-EmberSkyflareDiamond" value: { - dps: 7036.27 - tps: 5990.08521 + dps: 7546.862 + tps: 6495.38654 } } dps_results: { key: "TestSV-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7049.90218 - tps: 6004.64664 + dps: 7559.28626 + tps: 6508.58581 } } dps_results: { key: "TestSV-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7045.55821 - tps: 6000.10401 + dps: 7553.50561 + tps: 6502.80778 } } dps_results: { key: "TestSV-AllItems-EphemeralSnowflake-50260" value: { - dps: 7004.21284 - tps: 5970.43166 + dps: 7432.27281 + tps: 6402.22955 } } dps_results: { key: "TestSV-AllItems-EssenceofGossamer-37220" value: { - dps: 6946.67618 - tps: 5906.23274 + dps: 7416.75957 + tps: 6372.2128 } } dps_results: { key: "TestSV-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7072.66756 - tps: 6042.03369 + dps: 7541.5073 + tps: 6506.97844 } } dps_results: { key: "TestSV-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7002.87847 - tps: 5972.25407 + dps: 7474.14383 + tps: 6439.8529 } } dps_results: { key: "TestSV-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6942.08315 - tps: 5909.88231 + dps: 7412.58594 + tps: 6376.13029 } } dps_results: { key: "TestSV-AllItems-ForethoughtTalisman-40258" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-ForgeEmber-37660" value: { - dps: 6982.0164 - tps: 5951.75802 + dps: 7458.23261 + tps: 6423.82854 } } dps_results: { key: "TestSV-AllItems-ForlornSkyflareDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-ForlornStarflareDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7087.62506 - tps: 6040.45977 + dps: 7578.01982 + tps: 6526.669 } } dps_results: { key: "TestSV-AllItems-FuturesightRune-38763" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-Gladiator'sPursuit" value: { - dps: 6990.86387 - tps: 5997.23423 + dps: 7518.4746 + tps: 6533.26076 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54573" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21344 + tps: 6348.83149 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54589" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21344 + tps: 6348.83149 } } dps_results: { key: "TestSV-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7034.64837 - tps: 6003.99624 + dps: 7514.55274 + tps: 6480.04229 } } dps_results: { key: "TestSV-AllItems-Gronnstalker'sArmor" value: { - dps: 5245.34995 - tps: 4424.99762 + dps: 5571.3156 + tps: 4758.39502 } } dps_results: { key: "TestSV-AllItems-Heartpierce-49982" value: { - dps: 7276.75322 - tps: 6218.01922 + dps: 7799.47695 + tps: 6735.4235 } } dps_results: { key: "TestSV-AllItems-Heartpierce-50641" value: { - dps: 7280.39228 - tps: 6220.72646 + dps: 7803.52994 + tps: 6738.54043 } } dps_results: { key: "TestSV-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20283 + tps: 6348.82087 } } dps_results: { key: "TestSV-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7049.90218 - tps: 6004.64664 + dps: 7559.28626 + tps: 6508.58581 } } dps_results: { key: "TestSV-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7045.55821 - tps: 6000.10401 + dps: 7553.50561 + tps: 6502.80778 } } dps_results: { key: "TestSV-AllItems-IncisorFragment-37723" value: { - dps: 7056.33093 - tps: 6017.85165 + dps: 7531.92176 + tps: 6489.3473 } } dps_results: { key: "TestSV-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7042.55905 - tps: 6001.84388 + dps: 7554.02924 + tps: 6508.48519 } } dps_results: { key: "TestSV-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7057.60166 - tps: 6009.90017 + dps: 7564.18391 + tps: 6511.06832 hps: 12.062 } } dps_results: { key: "TestSV-AllItems-LastWord-50179" value: { - dps: 7233.54484 - tps: 6176.74755 + dps: 7750.01437 + tps: 6687.90616 } } dps_results: { key: "TestSV-AllItems-LastWord-50708" value: { - dps: 7230.76627 - tps: 6174.88173 + dps: 7746.9493 + tps: 6685.75798 } } dps_results: { key: "TestSV-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7098.9554 - tps: 6071.04523 + dps: 7492.54164 + tps: 6456.01692 } } dps_results: { key: "TestSV-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7033.57212 - tps: 6003.68593 + dps: 7501.50082 + tps: 6468.49487 } } dps_results: { key: "TestSV-AllItems-Nibelung-49992" value: { - dps: 7299.16155 - tps: 6236.01076 + dps: 7824.67187 + tps: 6756.15604 } } dps_results: { key: "TestSV-AllItems-Nibelung-50648" value: { - dps: 7305.28644 - tps: 6241.25804 + dps: 7831.59757 + tps: 6762.20112 } } dps_results: { key: "TestSV-AllItems-OfferingofSacrifice-37638" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.19379 + tps: 6348.81183 } } dps_results: { key: "TestSV-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7048.61295 - tps: 6001.23698 + dps: 7560.9294 + tps: 6508.25913 } } dps_results: { key: "TestSV-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7053.05926 - tps: 6005.24189 + dps: 7565.99691 + tps: 6512.88325 } } dps_results: { key: "TestSV-AllItems-PetrifiedScarab-21685" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.18658 + tps: 6348.80463 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7036.81406 - tps: 5988.94093 + dps: 7547.23172 + tps: 6494.06193 } } dps_results: { key: "TestSV-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7038.45204 - tps: 5990.03126 + dps: 7549.04078 + tps: 6495.32085 } } dps_results: { key: "TestSV-AllItems-PurifiedShardoftheGods" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-ReignoftheDead-47316" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7399.46693 + tps: 6365.02827 } } dps_results: { key: "TestSV-AllItems-ReignoftheDead-47477" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7401.46407 + tps: 6367.02541 } } dps_results: { key: "TestSV-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7204.64777 - tps: 6157.34301 + dps: 7718.13761 + tps: 6665.56511 } } dps_results: { key: "TestSV-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7029.71614 - tps: 5984.00487 + dps: 7539.39249 + tps: 6488.36625 } } dps_results: { key: "TestSV-AllItems-RuneofRepulsion-40372" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-ScourgestalkerBattlegear" value: { - dps: 6939.44612 - tps: 5945.48525 + dps: 7401.41625 + tps: 6403.38894 } } dps_results: { key: "TestSV-AllItems-SealofthePantheon-36993" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-Shadowmourne-49623" value: { - dps: 7480.04587 - tps: 6412.08357 + dps: 7966.87945 + tps: 6897.35944 } } dps_results: { key: "TestSV-AllItems-ShinyShardoftheGods" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6978.7727 - tps: 5927.65715 + dps: 7452.14717 + tps: 6396.88612 } } dps_results: { key: "TestSV-AllItems-SliverofPureIce-50339" value: { - dps: 6916.22563 - tps: 5890.10587 + dps: 7383.20413 + tps: 6353.95761 } } dps_results: { key: "TestSV-AllItems-SliverofPureIce-50346" value: { - dps: 6916.22563 - tps: 5890.44754 + dps: 7383.20413 + tps: 6354.43385 } } dps_results: { key: "TestSV-AllItems-SoulPreserver-37111" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-SouloftheDead-40382" value: { - dps: 7008.69952 - tps: 5978.06123 + dps: 7478.36541 + tps: 6445.65425 } } dps_results: { key: "TestSV-AllItems-SparkofLife-37657" value: { - dps: 7023.67386 - tps: 5985.37035 + dps: 7437.64403 + tps: 6398.36787 } } dps_results: { key: "TestSV-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7006.19095 - tps: 5966.678 + dps: 7482.94307 + tps: 6439.19451 } } dps_results: { key: "TestSV-AllItems-StormshroudArmor" value: { - dps: 5489.1514 - tps: 4650.31576 + dps: 5772.61132 + tps: 4946.12509 } } dps_results: { key: "TestSV-AllItems-SwiftSkyflareDiamond" value: { - dps: 7053.05926 - tps: 6005.24189 + dps: 7565.99691 + tps: 6512.88325 } } dps_results: { key: "TestSV-AllItems-SwiftStarflareDiamond" value: { - dps: 7048.61295 - tps: 6001.23698 + dps: 7560.9294 + tps: 6508.25913 } } dps_results: { key: "TestSV-AllItems-SwiftWindfireDiamond" value: { - dps: 7040.83191 - tps: 5994.2284 + dps: 7552.06126 + tps: 6500.16693 } } dps_results: { key: "TestSV-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-TearsoftheVanquished-47215" value: { - dps: 6967.94081 - tps: 5932.25624 + dps: 7441.96729 + tps: 6402.18976 } } dps_results: { key: "TestSV-AllItems-TheFistsofFury" value: { - dps: 6886.30111 - tps: 5860.27025 + dps: 7374.4699 + tps: 6347.32817 } } dps_results: { key: "TestSV-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.20413 + tps: 6348.82218 } } dps_results: { key: "TestSV-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 7008.08172 - tps: 5981.67519 + dps: 7518.30357 + tps: 6489.69766 } } dps_results: { key: "TestSV-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7057.97142 - tps: 6012.90256 + dps: 7579.37421 + tps: 6529.1633 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6916.37813 - tps: 5886.05952 + dps: 7383.34652 + tps: 6348.96457 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6916.37813 - tps: 5886.05952 + dps: 7383.34652 + tps: 6348.96457 } } dps_results: { key: "TestSV-AllItems-TirelessSkyflareDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-TirelessStarflareDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6979.93243 - tps: 5942.80811 + dps: 7392.65196 + tps: 6360.30778 } } dps_results: { key: "TestSV-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7029.71614 - tps: 5984.21614 + dps: 7539.39249 + tps: 6488.60663 } } dps_results: { key: "TestSV-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5850.85021 - tps: 4980.55489 + dps: 6183.23266 + tps: 5325.37788 } } dps_results: { key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6892.15979 - tps: 5863.37432 + dps: 7357.2312 + tps: 6329.16741 } } dps_results: { key: "TestSV-AllItems-Windrunner'sPursuit" value: { - dps: 7098.64618 - tps: 6075.49691 + dps: 7512.97004 + tps: 6492.49108 } } dps_results: { key: "TestSV-AllItems-WingedTalisman-37844" value: { - dps: 6916.22563 - tps: 5885.90702 + dps: 7383.21418 + tps: 6348.83222 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7536.38618 - tps: 6480.19385 + dps: 7968.34114 + tps: 6915.0533 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 7633.79843 - tps: 6588.96933 + dps: 8107.73938 + tps: 7061.0234 } } dps_results: { key: "TestSV-Average-Default" value: { - dps: 7230.09495 - tps: 6181.20621 + dps: 7677.28314 + tps: 6628.8889 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19859.37774 - tps: 20186.7193 + dps: 7549.34166 + tps: 7921.78644 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-FullBuffs-LongSingleTarget" value: { - dps: 7167.34644 - tps: 6164.43632 + dps: 6910.34199 + tps: 5914.87171 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 8066.35998 - tps: 6925.76024 + dps: 7712.15925 + tps: 6567.57831 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-NoBuffs-LongMultiTarget" value: { - dps: 11141.50664 - tps: 12080.36608 + dps: 2217.83246 + tps: 2028.49288 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3667.83411 - tps: 3336.21417 + dps: 2023.91399 + tps: 1677.46324 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4324.23646 - tps: 3928.85221 + dps: 4183.19947 + tps: 3787.579 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-FullBuffs-LongMultiTarget" value: { - dps: 7813.54711 - tps: 8182.89136 + dps: 7549.34166 + tps: 7921.78644 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-FullBuffs-LongSingleTarget" value: { - dps: 7171.93299 - tps: 6180.14709 + dps: 6910.34199 + tps: 5914.87171 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8033.21546 - tps: 6884.76988 + dps: 7712.15925 + tps: 6567.57831 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-NoBuffs-LongMultiTarget" value: { - dps: 4104.97814 - tps: 5150.21236 + dps: 2217.83246 + tps: 2028.49288 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-NoBuffs-LongSingleTarget" value: { - dps: 3671.88425 - tps: 3343.48572 + dps: 2023.91399 + tps: 1677.46324 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-P1-Basic-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4307.25152 - tps: 3908.33573 + dps: 4183.19947 + tps: 3787.579 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19965.93809 - tps: 20230.57841 + dps: 7595.48367 + tps: 7907.6924 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-FullBuffs-LongSingleTarget" value: { - dps: 7222.98422 - tps: 6163.48737 + dps: 6957.05112 + tps: 5905.23194 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 8146.68903 - tps: 6938.71439 + dps: 7794.04909 + tps: 6581.84848 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-NoBuffs-LongMultiTarget" value: { - dps: 11184.0504 - tps: 12098.39109 + dps: 2228.93554 + tps: 2014.52725 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3690.31709 - tps: 3337.78165 + dps: 2020.21312 + tps: 1655.79076 } } dps_results: { - key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4364.77937 - tps: 3946.44162 + dps: 4196.63572 + tps: 3776.57354 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-FullBuffs-LongMultiTarget" value: { - dps: 7858.92934 - tps: 8163.86442 + dps: 7595.48367 + tps: 7907.6924 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-FullBuffs-LongSingleTarget" value: { - dps: 7204.64777 - tps: 6157.34301 + dps: 6957.05112 + tps: 5905.23194 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8109.70788 - tps: 6893.66223 + dps: 7794.04909 + tps: 6581.84848 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-NoBuffs-LongMultiTarget" value: { - dps: 4118.65031 - tps: 5160.93976 + dps: 2228.93554 + tps: 2014.52725 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-NoBuffs-LongSingleTarget" value: { - dps: 3691.87933 - tps: 3342.73207 + dps: 2020.21312 + tps: 1655.79076 } } dps_results: { - key: "TestSV-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-P1-Basic-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4347.85226 - tps: 3924.24608 + dps: 4196.63572 + tps: 3776.57354 } } dps_results: { key: "TestSV-SwitchInFrontOfTarget-Default" value: { - dps: 7135.25068 - tps: 6176.26565 + dps: 7612.30541 + tps: 6640.55061 } } diff --git a/sim/hunter/hunter.go b/sim/hunter/hunter.go index 101740bf52..ced877747e 100644 --- a/sim/hunter/hunter.go +++ b/sim/hunter/hunter.go @@ -179,6 +179,9 @@ func NewHunter(character core.Character, options *proto.Player) *Hunter { Options: hunterOptions.Options, Rotation: hunterOptions.Rotation, } + if hunter.Rotation == nil { + hunter.Rotation = &proto.Hunter_Rotation{} + } core.FillTalentsProto(hunter.Talents.ProtoReflect(), options.TalentsString, TalentTreeSizes) hunter.EnableManaBar() diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index 5f974fb72b..b542876c1a 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -22,7 +22,8 @@ func TestBM(t *testing.T) { Talents: BMTalents, Glyphs: BMGlyphs, Consumes: FullConsumes, - SpecOptions: core.SpecOptionsCombo{Label: "BM", SpecOptions: PlayerOptionsBM}, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, + Rotation: core.RotationCombo{Label: "BM", Rotation: BMRotation}, ItemFilter: ItemFilter, })) @@ -38,7 +39,8 @@ func TestMM(t *testing.T) { Talents: MMTalents, Glyphs: MMGlyphs, Consumes: FullConsumes, - SpecOptions: core.SpecOptionsCombo{Label: "MM", SpecOptions: PlayerOptionsMM}, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, + Rotation: core.RotationCombo{Label: "MM", Rotation: MMRotation}, ItemFilter: ItemFilter, })) @@ -54,32 +56,16 @@ func TestSV(t *testing.T) { Talents: SVTalents, Glyphs: SVGlyphs, Consumes: FullConsumes, - SpecOptions: core.SpecOptionsCombo{Label: "SV", SpecOptions: PlayerOptionsSV}, - OtherSpecOptions: []core.SpecOptionsCombo{ - {Label: "AOE", SpecOptions: PlayerOptionsAOE}, + SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, + Rotation: core.RotationCombo{Label: "SV", Rotation: SVRotation}, + OtherRotations: []core.RotationCombo{ + {Label: "AOE", Rotation: AOERotation}, }, ItemFilter: ItemFilter, })) } -func TestAPL(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ - Class: proto.Class_ClassHunter, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - Talents: SVTalents, - Glyphs: SVGlyphs, - Consumes: FullConsumes, - SpecOptions: core.SpecOptionsCombo{Label: "SV", SpecOptions: PlayerOptionsSV}, - Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, - - ItemFilter: ItemFilter, - })) -} - var ItemFilter = core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeMail, WeaponTypes: []proto.WeaponType{ @@ -107,7 +93,7 @@ func BenchmarkSimulate(b *testing.B) { Class: proto.Class_ClassHunter, Equipment: P1Gear, Consumes: FullConsumes, - Spec: PlayerOptionsMM, + Spec: PlayerOptionsBasic, Glyphs: MMGlyphs, TalentsString: MMTalents, Buffs: core.FullIndividualBuffs, @@ -127,6 +113,13 @@ func BenchmarkSimulate(b *testing.B) { core.RaidBenchmark(b, rsr) } +var FullConsumes = &proto.Consumes{ + Flask: proto.Flask_FlaskOfRelentlessAssault, + DefaultPotion: proto.Potions_HastePotion, + DefaultConjured: proto.Conjured_ConjuredFlameCap, + PetFood: proto.PetFood_PetFoodKiblersBits, +} + var BMTalents = "51200201515012233110531351-005305-5" var MMTalents = "502-035335131030013233035031051-5000002" var SVTalents = "-015305101-5000032500033330532135301311" @@ -158,172 +151,126 @@ var FerocityTalents = &proto.HunterPetTalents{ WildHunt: 1, } -var DefaultRotation = core.APLRotationFromJsonString(`{ - "type": "TypeAPL", - "priorityList": [ - {"action": { - "condition": {"not": {"val": {"dotIsActive": {"spellId": { "spellId": 49001 }}}}}, - "castSpell": {"spellId": { "spellId": 49001 }} - }}, - {"action": {"castSpell": {"spellId": { "spellId": 61006 }}}}, - {"action": {"castSpell": {"spellId": { "spellId": 63672 }}}}, - {"action": {"castSpell": {"spellId": { "spellId": 60053 }}}}, - {"action": {"castSpell": {"spellId": { "spellId": 49050 }}}}, - {"action": { - "condition": {"not": {"val": {"dotIsActive": {"spellId": { "spellId": 60053 }}}}}, - "castSpell": {"spellId": { "spellId": 49045 }} - }}, - {"action": {"castSpell": {"spellId": { "spellId": 49052 }}}} - ] -}`) - -var PlayerOptionsMM = &proto.Player_Hunter{ +var PlayerOptionsBasic = &proto.Player_Hunter{ Hunter: &proto.Hunter{ - Options: basicOptions, - Rotation: basicRotation, - }, -} - -var PlayerOptionsBM = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: basicOptions, - Rotation: basicRotation, - }, -} - -var PlayerOptionsSV = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: basicOptions, - Rotation: basicRotation, - }, -} - -var PlayerOptionsAOE = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: basicOptions, - Rotation: aoeRotation, + Options: &proto.Hunter_Options{ + Ammo: proto.Hunter_Options_SaroniteRazorheads, + PetType: proto.Hunter_Options_Wolf, + PetTalents: FerocityTalents, + PetUptime: 0.9, + + TimeToTrapWeaveMs: 2000, + SniperTrainingUptime: 0.8, + UseHuntersMark: true, + }, }, } -var basicRotation = &proto.Hunter_Rotation{ - Sting: proto.Hunter_Rotation_SerpentSting, - - ViperStartManaPercent: 0.2, - ViperStopManaPercent: 0.3, -} - -var aoeRotation = &proto.Hunter_Rotation{ - TrapWeave: true, - - ViperStartManaPercent: 0.2, - ViperStopManaPercent: 0.3, -} +var AOERotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"hide":true,"action":{"multidot":{"spellId":{"spellId":49001},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"tag":1,"spellId":49067}}}}, + {"action":{"castSpell":{"spellId":{"spellId":58434}}}} + ] +}`) -var basicOptions = &proto.Hunter_Options{ - Ammo: proto.Hunter_Options_SaroniteRazorheads, - PetType: proto.Hunter_Options_Wolf, - PetTalents: FerocityTalents, - PetUptime: 0.9, +var BMRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"action":{"castSpell":{"spellId":{"spellId":61006}}}}, + {"hide":true,"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"tag":1,"spellId":49067}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":49001}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49050}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49048}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":49045}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}}} + ] +}`) - TimeToTrapWeaveMs: 2000, - SniperTrainingUptime: 0.8, - UseHuntersMark: true, -} +var MMRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":61847}}},"doAtValue":{"const":{"val":"-25s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49067}}},"doAtValue":{"const":{"val":"-20s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":53517}}},"doAtValue":{"const":{"val":"-3s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1.401s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}},"doAtValue":{"const":{"val":"-1.4s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.35s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"itemId":42641}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"61s"}}}},"castSpell":{"spellId":{"itemId":41119}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"castSpell":{"spellId":{"spellId":34026}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.35s"}}}},"castSpell":{"spellId":{"spellId":34490}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"itemId":41119}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53209}}},"rhs":{"const":{"val":"6s"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49050}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":3045}}},"rhs":{"const":{"val":"167s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":34490}}},"rhs":{"const":{"val":"13s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49067}}},"rhs":{"const":{"val":"23s"}}}}]}},"castSpell":{"spellId":{"spellId":23989}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"itemId":20520}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":61006}}},"rhs":{"const":{"val":"0.21s"}}}},"castSpell":{"spellId":{"spellId":61006}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},"castSpell":{"spellId":{"spellId":49001}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"spellId":49067}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53209}}},"rhs":{"const":{"val":"0.15s"}}}},{"spellCanCast":{"spellId":{"spellId":53209}}}]}},"castSpell":{"spellId":{"spellId":53209}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49050}}},"rhs":{"const":{"val":"0.15s"}}}},{"spellCanCast":{"spellId":{"spellId":49050}}}]}},"castSpell":{"spellId":{"spellId":49050}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}}}, + {"hide":true,"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49045}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":49045}}}]}},"castSpell":{"spellId":{"spellId":49045}}}} + ] +}`) -var FullConsumes = &proto.Consumes{ - Flask: proto.Flask_FlaskOfRelentlessAssault, - DefaultPotion: proto.Potions_HastePotion, - DefaultConjured: proto.Conjured_ConjuredFlameCap, - PetFood: proto.PetFood_PetFoodKiblersBits, -} +var SVRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":49067}}},"doAtValue":{"const":{"val":"-24s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":61847}}},"doAtValue":{"const":{"val":"-20s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1.4s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}},"doAtValue":{"const":{"val":"-1.4s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"itemId":20520}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"castSpell":{"spellId":{"spellId":61006}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":60053}}}}},"castSpell":{"spellId":{"spellId":60053}}}}, + {"action":{"condition":{"dotIsActive":{"spellId":{"spellId":60053}}},"castSpell":{"spellId":{"spellId":60052}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"spellId":49067,"tag":1}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":63672}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":63672}}}]}},"castSpell":{"spellId":{"spellId":63672}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":49001}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":49048}}}]}},"castSpell":{"spellId":{"spellId":49048}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":49048}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}}} + ] +}`) var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40505, - "enchant": 3817, - "gems": [ - 41398, - 42143 - ] - }, - { - "id": 44664, - "gems": [ - 42143 - ] - }, - { - "id": 40507, - "enchant": 3808, - "gems": [ - 39997 - ] - }, - { - "id": 40403, - "enchant": 3605 - }, - { - "id": 43998, - "enchant": 3832, - "gems": [ - 42143, - 39997 - ] - }, - { - "id": 40282, - "enchant": 3845, - "gems": [ - 39997, - 0 - ] - }, - { - "id": 40541, - "enchant": 3604, - "gems": [ - 0 - ] - }, - { - "id": 39762, - "enchant": 3601, - "gems": [ - 39997 - ] - }, - { - "id": 40331, - "enchant": 3823, - "gems": [ - 39997, - 49110 - ] - }, - { - "id": 40549, - "enchant": 3606 - }, - { - "id": 40074 - }, - { - "id": 40474 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 40388, - "enchant": 3827 - }, + {"id":40505,"enchant":3817,"gems":[41398,42143]}, + {"id":44664,"gems":[42143]}, + {"id":40507,"enchant":3808,"gems":[39997]}, + {"id":40403,"enchant":3605}, + {"id":43998,"enchant":3832,"gems":[42143,39997]}, + {"id":40282,"enchant":3845,"gems":[39997,0]}, + {"id":40541,"enchant":3604,"gems":[0]}, + {"id":39762,"enchant":3601,"gems":[39997]}, + {"id":40331,"enchant":3823,"gems":[39997,49110]}, + {"id":40549,"enchant":3606}, + {"id":40074}, + {"id":40474}, + {"id":40684}, + {"id":44253}, + {"id":40388,"enchant":3827}, {}, - { - "id": 40385, - "enchant": 3608 - } + {"id":40385,"enchant":3608} ]}`) diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index a4e93e1fef..075f598364 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5636.84 - final_stats: 469.94995 + final_stats: 469.94994 final_stats: 2072.9756 final_stats: 221 final_stats: 94 diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 371ad19040..ed7361cea4 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5862.3136 - final_stats: 469.94995 + final_stats: 469.94994 final_stats: 2164.78757 final_stats: 221 final_stats: 94 diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts index bc6abcfeaa..fac2f353ab 100644 --- a/ui/hunter/presets.ts +++ b/ui/hunter/presets.ts @@ -1,4 +1,3 @@ -import { CustomRotation, CustomSpell } from '../core/proto/common.js'; import { Consumes } from '../core/proto/common.js'; import { EquipmentSpec } from '../core/proto/common.js'; import { Flask } from '../core/proto/common.js'; @@ -15,7 +14,6 @@ import { Hunter_Rotation as HunterRotation, Hunter_Rotation_RotationType as RotationType, Hunter_Rotation_StingType as StingType, - Hunter_Rotation_SpellOption as SpellOption, Hunter_Options as HunterOptions, Hunter_Options_Ammo as Ammo, Hunter_Options_PetType as PetType, @@ -151,6 +149,43 @@ export const ROTATION_PRESET_MM = { }), }; +export const ROTATION_PRESET_MM_ADVANCED = { + name: 'MM (Advanced)', + rotation: SavedRotation.create({ + specRotationOptionsJson: HunterRotation.toJsonString(HunterRotation.create({ + })), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":61847}}},"doAtValue":{"const":{"val":"-25s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49067}}},"doAtValue":{"const":{"val":"-20s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":53517}}},"doAtValue":{"const":{"val":"-3s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1.401s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}},"doAtValue":{"const":{"val":"-1.4s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.35s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"itemId":42641}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"61s"}}}},"castSpell":{"spellId":{"itemId":41119}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"castSpell":{"spellId":{"spellId":34026}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.35s"}}}},"castSpell":{"spellId":{"spellId":34490}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"itemId":41119}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53209}}},"rhs":{"const":{"val":"6s"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49050}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":3045}}},"rhs":{"const":{"val":"167s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":34490}}},"rhs":{"const":{"val":"13s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49067}}},"rhs":{"const":{"val":"23s"}}}}]}},"castSpell":{"spellId":{"spellId":23989}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"itemId":20520}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":61006}}},"rhs":{"const":{"val":"0.21s"}}}},"castSpell":{"spellId":{"spellId":61006}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},"castSpell":{"spellId":{"spellId":49001}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"spellId":49067}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53209}}},"rhs":{"const":{"val":"0.15s"}}}},{"spellCanCast":{"spellId":{"spellId":53209}}}]}},"castSpell":{"spellId":{"spellId":53209}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49050}}},"rhs":{"const":{"val":"0.15s"}}}},{"spellCanCast":{"spellId":{"spellId":49050}}}]}},"castSpell":{"spellId":{"spellId":49050}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}}}, + {"hide":true,"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49045}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":49045}}}]}},"castSpell":{"spellId":{"spellId":49045}}}} + ] + }`), + }), +}; + export const ROTATION_PRESET_SV = { name: 'SV', rotation: SavedRotation.create({ @@ -179,6 +214,38 @@ export const ROTATION_PRESET_SV = { }), }; +export const ROTATION_PRESET_SV_ADVANCED = { + name: 'SV (Advanced)', + rotation: SavedRotation.create({ + specRotationOptionsJson: HunterRotation.toJsonString(HunterRotation.create({ + })), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":49067}}},"doAtValue":{"const":{"val":"-24s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":61847}}},"doAtValue":{"const":{"val":"-20s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1.4s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}},"doAtValue":{"const":{"val":"-1.4s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"itemId":20520}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}}, + {"action":{"castSpell":{"spellId":{"spellId":61006}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":60053}}}}},"castSpell":{"spellId":{"spellId":60053}}}}, + {"action":{"condition":{"dotIsActive":{"spellId":{"spellId":60053}}},"castSpell":{"spellId":{"spellId":60052}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"spellId":49067,"tag":1}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":63672}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":63672}}}]}},"castSpell":{"spellId":{"spellId":63672}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":49001}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":49048}}}]}},"castSpell":{"spellId":{"spellId":49048}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":49048}}}}, + {"action":{"castSpell":{"spellId":{"spellId":49052}}}} + ] + }`), + }), +}; + export const ROTATION_PRESET_AOE = { name: 'AOE', rotation: SavedRotation.create({ @@ -353,6 +420,31 @@ export const MM_P4_PRESET = { ]}`), }; +export const MM_P5_PRESET = { + name: 'MM P5 Preset', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + enableWhen: (player: Player) => player.getTalentTree() != 2, + gear: EquipmentSpec.fromJsonString(`{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40117]}, + {"id":50633,"gems":[40117]}, + {"id":51288,"enchant":3808,"gems":[40117]}, + {"id":47546,"enchant":3605,"gems":[42153]}, + {"id":51289,"enchant":3832,"gems":[40112,40112]}, + {"id":54580,"enchant":3845,"gems":[40117,0]}, + {"id":51285,"enchant":3604,"gems":[40117,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42153,42153]}, + {"id":50645,"enchant":3823,"gems":[49110,40112,40147]}, + {"id":54577,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[40117]}, + {"id":54576,"gems":[40148]}, + {"id":50363}, + {"id":54590}, + {"id":50735,"enchant":3247,"gems":[40112,40112,40112]}, + {}, + {"id":50733,"enchant":3608,"gems":[40117]} + ]}`), +}; + export const SV_PRERAID_PRESET = { name: 'SV Preraid Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, @@ -477,3 +569,28 @@ export const SV_P4_PRESET = { {"id":50733,"enchant":3608,"gems":[40112]} ]}`), }; + +export const SV_P5_PRESET = { + name: 'SV P5 Preset', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + enableWhen: (player: Player) => player.getTalentTree() == 2, + gear: EquipmentSpec.fromJsonString(`{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40112]}, + {"id":50633,"gems":[40112]}, + {"id":51288,"enchant":3808,"gems":[40112]}, + {"id":47546,"enchant":3605,"gems":[42143]}, + {"id":51289,"enchant":3832,"gems":[40112,40112]}, + {"id":50655,"enchant":3845,"gems":[40112,0]}, + {"id":51285,"enchant":3604,"gems":[40112,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42143,42143]}, + {"id":50645,"enchant":3823,"gems":[49110,40112,40150]}, + {"id":54577,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[45879]}, + {"id":54576,"gems":[40148]}, + {"id":50363}, + {"id":54590}, + {"id":50735,"enchant":3827,"gems":[40112,40112,40112]}, + {}, + {"id":50733,"enchant":3608,"gems":[40112]} + ]}`), +}; diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts index 93ee209712..6ebbf1d50e 100644 --- a/ui/hunter/sim.ts +++ b/ui/hunter/sim.ts @@ -256,7 +256,9 @@ export class HunterSimUI extends IndividualSimUI { Presets.ROTATION_PRESET_LEGACY_DEFAULT, Presets.ROTATION_PRESET_BM, Presets.ROTATION_PRESET_MM, + Presets.ROTATION_PRESET_MM_ADVANCED, Presets.ROTATION_PRESET_SV, + Presets.ROTATION_PRESET_SV_ADVANCED, Presets.ROTATION_PRESET_AOE, ], // Preset gear configurations that the user can quickly select. @@ -266,11 +268,13 @@ export class HunterSimUI extends IndividualSimUI { Presets.MM_P2_PRESET, Presets.MM_P3_PRESET, Presets.MM_P4_PRESET, + Presets.MM_P5_PRESET, Presets.SV_PRERAID_PRESET, Presets.SV_P1_PRESET, Presets.SV_P2_PRESET, Presets.SV_P3_PRESET, Presets.SV_P4_PRESET, + Presets.SV_P5_PRESET, ], },