From 1c41d260db784242cd28dfb5fa1dccf70e3acb13 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 2 Jul 2023 12:08:07 -0400 Subject: [PATCH] SS multi-dot + update hunter ST rotations to match best-known custom rotations (#3233) * update hunter ST rotations to match best-known custom rotations * multi-dot SS * simpler --- proto/hunter.proto | 2 + sim/hunter/TestAPL.results | 48 ++-- sim/hunter/TestBM.results | 514 ++++++++++++++++----------------- sim/hunter/TestMM.results | 518 +++++++++++++++++----------------- sim/hunter/TestSV.results | 562 ++++++++++++++++++------------------- sim/hunter/hunter.go | 5 +- sim/hunter/rotation.go | 160 +++++++++-- ui/hunter/inputs.ts | 7 + 8 files changed, 967 insertions(+), 849 deletions(-) diff --git a/proto/hunter.proto b/proto/hunter.proto index d375dcf139..28ab47cefb 100644 --- a/proto/hunter.proto +++ b/proto/hunter.proto @@ -224,6 +224,8 @@ message Hunter { // Allow use of Explosive Shot Rank 3 during LNL procs. bool allow_explosive_shot_downrank = 10; + + bool multi_dot_serpent_sting = 11; } Rotation rotation = 1; diff --git a/sim/hunter/TestAPL.results b/sim/hunter/TestAPL.results index a0abee07d9..3668231338 100644 --- a/sim/hunter/TestAPL.results +++ b/sim/hunter/TestAPL.results @@ -855,85 +855,85 @@ dps_results: { dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 7172.39789 - tps: 7394.01093 + dps: 7814.03408 + tps: 8183.20283 } } dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 7172.39789 - tps: 6180.43806 + dps: 7158.52001 + tps: 6166.19635 } } dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8033.57756 - tps: 6884.92977 + dps: 8016.04733 + tps: 6869.97343 } } dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3672.17949 - tps: 4683.55299 + dps: 4105.29846 + tps: 5150.44326 } } dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3672.17949 - tps: 3343.69167 + dps: 3650.28305 + tps: 3322.40778 } } dps_results: { key: "TestAPL-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4307.59114 - tps: 3908.58227 + dps: 4325.4632 + tps: 3928.09592 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 7204.8402 - tps: 7365.91136 + dps: 7859.12519 + tps: 8163.96818 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 7204.8402 - tps: 6157.44416 + dps: 7190.97168 + tps: 6143.25203 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8109.76009 - tps: 6893.60828 + dps: 8089.40805 + tps: 6875.8988 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3692.02852 - tps: 4687.68614 + dps: 4118.81187 + tps: 5161.0544 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3692.02852 - tps: 3342.83443 + dps: 3663.02322 + tps: 3314.23694 } } dps_results: { key: "TestAPL-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4348.02388 - tps: 3924.36882 + dps: 4360.42196 + tps: 3938.65388 } } dps_results: { diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index b1cca88ab0..55ff363a5e 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -46,900 +46,900 @@ character_stats_results: { dps_results: { key: "TestBM-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 6550.86332 - tps: 4579.61263 + dps: 6427.83511 + tps: 4454.43226 } } dps_results: { key: "TestBM-AllItems-Althor'sAbacus-50359" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-Althor'sAbacus-50366" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6295.21904 - tps: 4211.76024 + dps: 6176.62285 + tps: 4082.63865 } } dps_results: { key: "TestBM-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-Bandit'sInsignia-40371" value: { - dps: 6403.23481 - tps: 4307.61097 + dps: 6268.20595 + tps: 4166.02461 } } dps_results: { key: "TestBM-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6244.10198 - tps: 4173.29374 + dps: 6114.96774 + tps: 4037.80642 hps: 90.67931 } } dps_results: { key: "TestBM-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6244.10198 - tps: 4173.29374 + dps: 6114.96774 + tps: 4037.80642 hps: 90.67931 } } dps_results: { key: "TestBM-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6351.26468 - tps: 4236.96775 + dps: 6207.55667 + tps: 4112.54604 } } dps_results: { key: "TestBM-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6218.00508 - tps: 4153.29209 + dps: 6073.12921 + tps: 4007.36749 } } dps_results: { key: "TestBM-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 5940.8188 - tps: 3853.03361 + dps: 5773.96796 + tps: 3677.18945 } } dps_results: { key: "TestBM-AllItems-BlackBruise-50035" value: { - dps: 6129.50242 - tps: 4073.95721 + dps: 5973.43527 + tps: 3916.47479 } } dps_results: { key: "TestBM-AllItems-BlackBruise-50692" value: { - dps: 6118.86769 - tps: 4066.07664 + dps: 5963.48312 + tps: 3909.2779 } } dps_results: { key: "TestBM-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5242.48658 - tps: 3488.88822 + dps: 5165.85118 + tps: 3408.02377 } } dps_results: { key: "TestBM-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5100.5751 - tps: 3372.108 + dps: 5003.05012 + tps: 3275.27206 } } dps_results: { key: "TestBM-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6314.83896 - tps: 4123.63465 + dps: 6184.71543 + tps: 4004.85573 } } dps_results: { key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6430.96521 - tps: 4314.74061 + dps: 6290.12282 + tps: 4191.58177 } } dps_results: { key: "TestBM-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6430.96521 - tps: 4314.74061 + dps: 6290.12282 + tps: 4191.58177 } } dps_results: { key: "TestBM-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6426.10979 - tps: 4312.03956 + dps: 6282.3581 + tps: 4187.06194 } } dps_results: { key: "TestBM-AllItems-CorpseTongueCoin-50349" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-CorpseTongueCoin-50352" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 hps: 64 } } dps_results: { key: "TestBM-AllItems-CryptstalkerBattlegear" value: { - dps: 5816.71728 - tps: 3850.78017 + dps: 5724.96689 + tps: 3750.24608 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6322.84273 - tps: 4245.3703 + dps: 6189.71159 + tps: 4104.63477 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6379.02566 - tps: 4298.249 + dps: 6233.32539 + tps: 4153.91943 } } dps_results: { key: "TestBM-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6391.74647 - tps: 4284.98918 + dps: 6256.8969 + tps: 4148.4603 } } dps_results: { key: "TestBM-AllItems-Death'sChoice-47464" value: { - dps: 6553.15967 - tps: 4410.51743 + dps: 6405.85902 + tps: 4273.07231 } } dps_results: { key: "TestBM-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6297.85956 - tps: 4224.34907 + dps: 6164.56005 + tps: 4088.87166 } } dps_results: { key: "TestBM-AllItems-Deathbringer'sWill-50362" value: { - dps: 6548.50446 - tps: 4445.61666 + dps: 6450.26142 + tps: 4332.42675 } } dps_results: { key: "TestBM-AllItems-Deathbringer'sWill-50363" value: { - dps: 6595.87176 - tps: 4491.19794 + dps: 6489.03805 + tps: 4368.83264 } } dps_results: { key: "TestBM-AllItems-Defender'sCode-40257" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6347.8717 - tps: 4234.22446 + dps: 6206.46727 + tps: 4110.98241 } } dps_results: { key: "TestBM-AllItems-DislodgedForeignObject-50348" value: { - dps: 6321.92955 - tps: 4246.53008 + dps: 6175.59917 + tps: 4094.39889 } } dps_results: { key: "TestBM-AllItems-DislodgedForeignObject-50353" value: { - dps: 6301.02922 - tps: 4220.80746 + dps: 6165.62392 + tps: 4089.44043 } } dps_results: { key: "TestBM-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-EmberSkyflareDiamond" value: { - dps: 6325.73962 - tps: 4216.05924 + dps: 6194.55644 + tps: 4093.93956 } } dps_results: { key: "TestBM-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6342.98054 - tps: 4228.91031 + dps: 6201.59133 + tps: 4106.29517 } } dps_results: { key: "TestBM-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6340.26816 - tps: 4226.94329 + dps: 6200.57794 + tps: 4104.87197 } } dps_results: { key: "TestBM-AllItems-EphemeralSnowflake-50260" value: { - dps: 6277.40545 - tps: 4203.45908 + dps: 6141.61188 + tps: 4068.97181 } } dps_results: { key: "TestBM-AllItems-EssenceofGossamer-37220" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6353.16974 - tps: 4271.99332 + dps: 6214.14931 + tps: 4127.96594 } } dps_results: { key: "TestBM-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6319.68588 - tps: 4238.65482 + dps: 6176.85953 + tps: 4094.73898 } } dps_results: { key: "TestBM-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6277.40919 - tps: 4201.2665 + dps: 6145.565 + tps: 4063.07348 } } dps_results: { key: "TestBM-AllItems-ForethoughtTalisman-40258" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-ForgeEmber-37660" value: { - dps: 6302.99862 - tps: 4221.6989 + dps: 6163.33187 + tps: 4079.3152 } } dps_results: { key: "TestBM-AllItems-ForlornSkyflareDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-ForlornStarflareDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6402.66342 - tps: 4291.3147 + dps: 6264.49484 + tps: 4146.59915 } } dps_results: { key: "TestBM-AllItems-FuturesightRune-38763" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-Gladiator'sPursuit" value: { - dps: 6161.88099 - tps: 4228.6724 + dps: 6008.7563 + tps: 4088.30919 } } dps_results: { key: "TestBM-AllItems-GlowingTwilightScale-54573" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-GlowingTwilightScale-54589" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6355.66819 - tps: 4274.85387 + dps: 6210.24133 + tps: 4130.8174 } } dps_results: { key: "TestBM-AllItems-Gronnstalker'sArmor" value: { - dps: 4873.74848 - tps: 3187.2684 + dps: 4826.14368 + tps: 3131.17758 } } dps_results: { key: "TestBM-AllItems-Heartpierce-49982" value: { - dps: 6479.0345 - tps: 4350.52906 + dps: 6335.4672 + tps: 4224.74137 } } dps_results: { key: "TestBM-AllItems-Heartpierce-50641" value: { - dps: 6480.06825 - tps: 4351.2987 + dps: 6336.44235 + tps: 4225.45448 } } dps_results: { key: "TestBM-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6342.98054 - tps: 4228.91031 + dps: 6201.59133 + tps: 4106.29517 } } dps_results: { key: "TestBM-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6340.26816 - tps: 4226.94329 + dps: 6200.57794 + tps: 4104.87197 } } dps_results: { key: "TestBM-AllItems-IncisorFragment-37723" value: { - dps: 6384.76605 - tps: 4294.7301 + dps: 6256.25852 + tps: 4159.7254 } } dps_results: { key: "TestBM-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6344.00435 - tps: 4239.10048 + dps: 6213.26049 + tps: 4117.14817 } } dps_results: { key: "TestBM-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6336.66397 - tps: 4223.32416 - hps: 11.26034 + dps: 6205.79548 + tps: 4101.14392 + hps: 11.18675 } } dps_results: { key: "TestBM-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6329.94262 - tps: 4245.11236 + dps: 6197.49592 + tps: 4111.96765 } } dps_results: { key: "TestBM-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6341.94133 - tps: 4260.72384 + dps: 6223.42565 + tps: 4140.76577 } } dps_results: { key: "TestBM-AllItems-OfferingofSacrifice-37638" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6332.09855 - tps: 4219.49514 + dps: 6201.01053 + tps: 4097.35008 } } dps_results: { key: "TestBM-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6336.15963 - tps: 4222.50237 + dps: 6204.84467 + tps: 4100.13436 } } dps_results: { key: "TestBM-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-PurifiedShardoftheGods" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-ReignoftheDead-47316" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-ReignoftheDead-47477" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6430.96521 - tps: 4314.74061 + dps: 6290.12282 + tps: 4191.58177 } } dps_results: { key: "TestBM-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6319.24828 - tps: 4210.86731 + dps: 6189.6095 + tps: 4090.06442 } } dps_results: { key: "TestBM-AllItems-RuneofRepulsion-40372" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-ScourgestalkerBattlegear" value: { - dps: 6278.03057 - tps: 4226.95119 + dps: 6155.34266 + tps: 4108.25542 } } dps_results: { key: "TestBM-AllItems-SealofthePantheon-36993" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-Shadowmourne-49623" value: { - dps: 6613.89434 - tps: 4496.80901 + dps: 6490.64836 + tps: 4382.99794 } } dps_results: { key: "TestBM-AllItems-ShinyShardoftheGods" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-SliverofPureIce-50339" value: { - dps: 6260.94048 - tps: 4194.57151 + dps: 6130.44446 + tps: 4057.98567 } } dps_results: { key: "TestBM-AllItems-SliverofPureIce-50346" value: { - dps: 6261.48873 - tps: 4195.70443 + dps: 6131.69948 + tps: 4059.75957 } } dps_results: { key: "TestBM-AllItems-SoulPreserver-37111" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-SouloftheDead-40382" value: { - dps: 6321.36004 - tps: 4240.3431 + dps: 6182.25922 + tps: 4096.24964 } } dps_results: { key: "TestBM-AllItems-SparkofLife-37657" value: { - dps: 6259.9577 - tps: 4188.72923 + dps: 6141.09671 + tps: 4059.43003 } } dps_results: { key: "TestBM-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6371.36664 - tps: 4240.73366 + dps: 6239.05792 + tps: 4100.36723 } } dps_results: { key: "TestBM-AllItems-StormshroudArmor" value: { - dps: 4932.09824 - tps: 3211.4888 + dps: 4862.88001 + tps: 3143.27306 } } dps_results: { key: "TestBM-AllItems-SwiftSkyflareDiamond" value: { - dps: 6336.15963 - tps: 4222.50237 + dps: 6204.84467 + tps: 4100.13436 } } dps_results: { key: "TestBM-AllItems-SwiftStarflareDiamond" value: { - dps: 6332.09855 - tps: 4219.49514 + dps: 6201.01053 + tps: 4097.35008 } } dps_results: { key: "TestBM-AllItems-SwiftWindfireDiamond" value: { - dps: 6324.99166 - tps: 4214.23247 + dps: 6194.30078 + tps: 4092.47759 } } dps_results: { key: "TestBM-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-TearsoftheVanquished-47215" value: { - dps: 6304.23453 - tps: 4220.74401 + dps: 6172.79534 + tps: 4083.02976 } } dps_results: { key: "TestBM-AllItems-TheFistsofFury" value: { - dps: 6158.50005 - tps: 4096.78923 + dps: 6000.88874 + tps: 3939.20632 } } dps_results: { key: "TestBM-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 6287.33094 - tps: 4203.303 + dps: 6148.22638 + tps: 4063.55567 } } dps_results: { key: "TestBM-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6342.59139 - tps: 4228.73918 + dps: 6209.14333 + tps: 4093.13484 } } dps_results: { key: "TestBM-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6286.81056 - tps: 4178.60356 + dps: 6159.18879 + tps: 4043.10793 } } dps_results: { key: "TestBM-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6286.81056 - tps: 4178.60356 + dps: 6159.18879 + tps: 4043.10793 } } dps_results: { key: "TestBM-AllItems-TirelessSkyflareDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-TirelessStarflareDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6262.08878 - tps: 4188.3938 + dps: 6150.92755 + tps: 4070.33485 } } dps_results: { key: "TestBM-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6314.83896 - tps: 4206.71437 + dps: 6184.71543 + tps: 4085.51689 } } dps_results: { key: "TestBM-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5191.38985 - tps: 3443.29841 + dps: 5093.03954 + tps: 3342.09472 } } dps_results: { key: "TestBM-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6218.31867 - tps: 4158.34316 + dps: 6074.44289 + tps: 4016.31925 } } dps_results: { key: "TestBM-AllItems-Windrunner'sPursuit" value: { - dps: 6390.92028 - tps: 4327.63689 + dps: 6263.63289 + tps: 4210.72724 } } dps_results: { key: "TestBM-AllItems-WingedTalisman-37844" value: { - dps: 6243.95449 - tps: 4173.29374 + dps: 6114.88893 + tps: 4037.80642 } } dps_results: { key: "TestBM-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 6749.00365 - tps: 4658.2414 + dps: 6677.04673 + tps: 4581.512 } } dps_results: { key: "TestBM-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 6934.52996 - tps: 4858.54609 + dps: 6892.84512 + tps: 4805.2683 } } dps_results: { key: "TestBM-Average-Default" value: { - dps: 6366.75926 - tps: 4267.15645 + dps: 6222.17357 + tps: 4122.20296 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongMultiTarget" value: { - dps: 6976.43375 - tps: 5998.16359 + dps: 6842.37401 + tps: 5848.8431 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-LongSingleTarget" value: { - dps: 6340.58516 - tps: 4334.32502 + dps: 6195.42887 + tps: 4196.10237 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-FullBuffs-ShortSingleTarget" value: { - dps: 7528.68479 - tps: 5061.20117 + dps: 7407.42134 + tps: 4938.12938 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongMultiTarget" value: { - dps: 3526.92597 - tps: 4383.75257 + dps: 3468.60274 + tps: 4320.19411 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-LongSingleTarget" value: { - dps: 3077.09484 - tps: 2422.13954 + dps: 3011.47165 + tps: 2355.35463 } } dps_results: { key: "TestBM-Settings-Dwarf-P1-BM-NoBuffs-ShortSingleTarget" value: { - dps: 3606.16053 - tps: 2821.08151 + dps: 3519.51814 + tps: 2740.86768 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongMultiTarget" value: { - dps: 7073.54558 - tps: 5986.62486 + dps: 6947.41448 + tps: 5842.17172 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-FullBuffs-LongSingleTarget" value: { - dps: 6430.96521 - tps: 4314.74061 + dps: 6290.12282 + tps: 4191.58177 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-FullBuffs-ShortSingleTarget" value: { - dps: 7703.56432 - tps: 5090.71499 + dps: 7571.73865 + tps: 4959.42206 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongMultiTarget" value: { - dps: 3560.07357 - tps: 4382.92912 + dps: 3496.63561 + tps: 4310.93305 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-NoBuffs-LongSingleTarget" value: { - dps: 3099.48088 - tps: 2408.7296 + dps: 3047.6321 + tps: 2355.51769 } } dps_results: { key: "TestBM-Settings-Orc-P1-BM-NoBuffs-ShortSingleTarget" value: { - dps: 3660.61409 - tps: 2828.70901 + dps: 3566.6841 + tps: 2740.75773 } } dps_results: { key: "TestBM-SwitchInFrontOfTarget-Default" value: { - dps: 6252.79255 - tps: 4305.42633 + dps: 6120.42139 + tps: 4169.34514 } } diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results index 1e985515ac..f7bf829fe4 100644 --- a/sim/hunter/TestMM.results +++ b/sim/hunter/TestMM.results @@ -46,900 +46,900 @@ character_stats_results: { dps_results: { key: "TestMM-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 7667.86392 - tps: 6767.20893 + dps: 7561.22937 + tps: 6654.01049 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50359" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50366" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 7013.73649 - tps: 6093.62195 + dps: 6901.06561 + tps: 5979.54251 } } dps_results: { key: "TestMM-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-Bandit'sInsignia-40371" value: { - dps: 7133.4137 - tps: 6206.99286 + dps: 6994.2196 + tps: 6068.37442 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6962.43222 - tps: 6046.98669 - hps: 90.78718 + dps: 6833.71418 + tps: 5918.52842 + hps: 90.0153 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6962.43222 - tps: 6046.98669 - hps: 90.78718 + dps: 6833.71418 + tps: 5918.52842 + hps: 90.0153 } } dps_results: { key: "TestMM-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7089.31791 - tps: 6163.95736 + dps: 6946.25469 + tps: 6020.30942 } } dps_results: { key: "TestMM-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7030.84801 - tps: 6110.85591 + dps: 6918.75424 + tps: 6004.4521 } } dps_results: { key: "TestMM-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6560.55062 - tps: 5650.39354 + dps: 6390.91304 + tps: 5470.61625 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50035" value: { - dps: 6844.46727 - tps: 5932.92279 + dps: 6747.66464 + tps: 5827.95088 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50692" value: { - dps: 6831.76831 - tps: 5921.42456 + dps: 6735.60231 + tps: 5817.09781 } } dps_results: { key: "TestMM-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6084.55052 - tps: 5282.71141 + dps: 6020.63295 + tps: 5218.57211 } } dps_results: { key: "TestMM-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5865.18193 - tps: 5076.67665 + dps: 5773.99482 + tps: 4988.23346 } } dps_results: { key: "TestMM-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7063.087 - tps: 6017.15108 + dps: 6908.98067 + tps: 5866.30386 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7244.85128 - tps: 6319.18364 + dps: 7098.24364 + tps: 6170.99145 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7244.85128 - tps: 6319.18364 + dps: 7098.24364 + tps: 6170.99145 } } dps_results: { key: "TestMM-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7237.00017 - tps: 6311.72872 + dps: 7090.77387 + tps: 6164.88728 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50349" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50352" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 hps: 64 } } dps_results: { key: "TestMM-AllItems-CryptstalkerBattlegear" value: { - dps: 6629.50696 - tps: 5728.29401 + dps: 6512.87251 + tps: 5613.09208 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7076.60299 - tps: 6161.65789 + dps: 6945.20062 + tps: 6029.7055 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7123.17765 - tps: 6207.06921 + dps: 6998.2345 + tps: 6081.32264 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7183.78959 - tps: 6259.22137 + dps: 7017.05857 + tps: 6090.42281 } } dps_results: { key: "TestMM-AllItems-Death'sChoice-47464" value: { - dps: 7398.83344 - tps: 6457.2233 + dps: 7240.72502 + tps: 6298.92587 } } dps_results: { key: "TestMM-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7041.84802 - tps: 6127.8184 + dps: 6928.67207 + tps: 6013.01333 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50362" value: { - dps: 7344.81839 - tps: 6417.34715 + dps: 7232.52585 + tps: 6306.49171 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50363" value: { - dps: 7397.1205 - tps: 6469.17685 + dps: 7287.65825 + tps: 6360.16653 } } dps_results: { key: "TestMM-AllItems-Defender'sCode-40257" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7090.91006 - tps: 6165.63861 + dps: 6949.74555 + tps: 6023.85895 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50348" value: { - dps: 7079.47445 - tps: 6158.84717 + dps: 6991.77533 + tps: 6070.11141 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50353" value: { - dps: 7090.75184 - tps: 6175.73823 + dps: 6978.30687 + tps: 6057.81278 } } dps_results: { key: "TestMM-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-EmberSkyflareDiamond" value: { - dps: 7070.95683 - tps: 6145.88836 + dps: 6916.00779 + tps: 5991.17656 } } dps_results: { key: "TestMM-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7088.99748 - tps: 6163.72602 + dps: 6946.25469 + tps: 6020.36809 } } dps_results: { key: "TestMM-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7082.88244 - tps: 6158.58056 + dps: 6940.70473 + tps: 6014.81814 } } dps_results: { key: "TestMM-AllItems-EphemeralSnowflake-50260" value: { - dps: 7051.31019 - tps: 6136.57485 + dps: 6928.84463 + tps: 6004.91061 } } dps_results: { key: "TestMM-AllItems-EssenceofGossamer-37220" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7127.26908 - tps: 6212.00609 + dps: 6997.76319 + tps: 6082.28138 } } dps_results: { key: "TestMM-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7064.42288 - tps: 6149.19822 + dps: 6940.78722 + tps: 6024.76741 } } dps_results: { key: "TestMM-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6992.66642 - tps: 6074.6023 + dps: 6861.21914 + tps: 5943.72694 } } dps_results: { key: "TestMM-AllItems-ForethoughtTalisman-40258" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-ForgeEmber-37660" value: { - dps: 7039.48976 - tps: 6123.30703 + dps: 6928.84199 + tps: 6012.01128 } } dps_results: { key: "TestMM-AllItems-ForlornSkyflareDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-ForlornStarflareDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7152.179 - tps: 6219.00336 + dps: 7013.06588 + tps: 6080.33538 } } dps_results: { key: "TestMM-AllItems-FuturesightRune-38763" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-Gladiator'sPursuit" value: { - dps: 7204.28506 - tps: 6329.42256 + dps: 7051.56009 + tps: 6170.23245 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54573" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54589" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7087.50418 - tps: 6171.24111 + dps: 6977.04521 + tps: 6059.96805 } } dps_results: { key: "TestMM-AllItems-Gronnstalker'sArmor" value: { - dps: 5477.55552 - tps: 4709.90321 + dps: 5445.21349 + tps: 4676.3762 } } dps_results: { key: "TestMM-AllItems-Heartpierce-49982" value: { - dps: 7302.67665 - tps: 6371.72197 + dps: 7152.88142 + tps: 6220.34279 } } dps_results: { key: "TestMM-AllItems-Heartpierce-50641" value: { - dps: 7303.92021 - tps: 6372.85183 + dps: 7154.05643 + tps: 6221.40411 } } dps_results: { key: "TestMM-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7088.99748 - tps: 6163.72602 + dps: 6946.25469 + tps: 6020.36809 } } dps_results: { key: "TestMM-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7082.88244 - tps: 6158.58056 + dps: 6940.70473 + tps: 6014.81814 } } dps_results: { key: "TestMM-AllItems-IncisorFragment-37723" value: { - dps: 7119.16444 - tps: 6195.33618 + dps: 6993.24781 + tps: 6069.83473 } } dps_results: { key: "TestMM-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7078.65529 - tps: 6160.209 + dps: 6922.7432 + tps: 6004.62512 } } dps_results: { key: "TestMM-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7088.05741 - tps: 6161.75939 - hps: 11.22172 + dps: 6937.73514 + tps: 6011.28462 + hps: 11.29459 } } dps_results: { key: "TestMM-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7126.89022 - tps: 6215.55241 + dps: 7003.59952 + tps: 6087.30885 } } dps_results: { key: "TestMM-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7136.79016 - tps: 6221.88617 + dps: 6993.41389 + tps: 6078.49894 } } dps_results: { key: "TestMM-AllItems-OfferingofSacrifice-37638" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7083.71661 - tps: 6157.48184 + dps: 6928.45326 + tps: 6002.4278 } } dps_results: { key: "TestMM-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7088.57064 - tps: 6161.88107 + dps: 6933.03505 + tps: 6006.55569 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-PurifiedShardoftheGods" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47316" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47477" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7244.85128 - tps: 6319.18364 + dps: 7098.24364 + tps: 6170.99145 } } dps_results: { key: "TestMM-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7063.72302 - tps: 6139.10617 + dps: 6908.98067 + tps: 5984.65041 } } dps_results: { key: "TestMM-AllItems-RuneofRepulsion-40372" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-ScourgestalkerBattlegear" value: { - dps: 6981.77781 - tps: 6094.10098 + dps: 6880.85788 + tps: 5991.18642 } } dps_results: { key: "TestMM-AllItems-SealofthePantheon-36993" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-Shadowmourne-49623" value: { - dps: 7475.42422 - tps: 6549.7508 + dps: 7360.41105 + tps: 6433.23011 } } dps_results: { key: "TestMM-AllItems-ShinyShardoftheGods" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50339" value: { - dps: 6963.40466 - tps: 6053.18092 + dps: 6833.52604 + tps: 5923.49402 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50346" value: { - dps: 6963.40466 - tps: 6053.74147 + dps: 6833.52604 + tps: 5923.90244 } } dps_results: { key: "TestMM-AllItems-SoulPreserver-37111" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-SouloftheDead-40382" value: { - dps: 7065.73314 - tps: 6150.47306 + dps: 6938.636 + tps: 6023.22183 } } dps_results: { key: "TestMM-AllItems-SparkofLife-37657" value: { - dps: 7012.01718 - tps: 6096.60538 + dps: 6926.38195 + tps: 6010.27153 } } dps_results: { key: "TestMM-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7060.40282 - tps: 6135.29571 + dps: 6926.40557 + tps: 6001.63984 } } dps_results: { key: "TestMM-AllItems-StormshroudArmor" value: { - dps: 5712.67803 - tps: 4928.89973 + dps: 5678.32948 + tps: 4890.49297 } } dps_results: { key: "TestMM-AllItems-SwiftSkyflareDiamond" value: { - dps: 7088.57064 - tps: 6161.88107 + dps: 6933.03505 + tps: 6006.55569 } } dps_results: { key: "TestMM-AllItems-SwiftStarflareDiamond" value: { - dps: 7083.71661 - tps: 6157.48184 + dps: 6928.45326 + tps: 6002.4278 } } dps_results: { key: "TestMM-AllItems-SwiftWindfireDiamond" value: { - dps: 7075.22207 - tps: 6149.78319 + dps: 6920.43514 + tps: 5995.20399 } } dps_results: { key: "TestMM-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-TearsoftheVanquished-47215" value: { - dps: 7021.92444 - tps: 6100.64605 + dps: 6888.9085 + tps: 5968.16254 } } dps_results: { key: "TestMM-AllItems-TheFistsofFury" value: { - dps: 6882.8614 - tps: 5970.1513 + dps: 6783.05798 + tps: 5862.09921 } } dps_results: { key: "TestMM-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 7007.56513 - tps: 6092.44189 + dps: 6903.41101 + tps: 5980.57758 } } dps_results: { key: "TestMM-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7117.09075 - tps: 6189.38767 + dps: 6951.10064 + tps: 6019.12934 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6962.59241 - tps: 6047.19971 + dps: 6833.73328 + tps: 5918.73567 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6962.59241 - tps: 6047.19971 + dps: 6833.73328 + tps: 5918.73567 } } dps_results: { key: "TestMM-AllItems-TirelessSkyflareDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-TirelessStarflareDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7032.77436 - tps: 6110.58418 + dps: 6913.26895 + tps: 5991.86453 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7063.087 - tps: 6138.78512 + dps: 6908.98067 + tps: 5984.88425 } } dps_results: { key: "TestMM-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6004.44976 - tps: 5202.18032 + dps: 5994.71217 + tps: 5198.18374 } } dps_results: { key: "TestMM-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6895.60339 - tps: 5994.89151 + dps: 6829.21662 + tps: 5927.99003 } } dps_results: { key: "TestMM-AllItems-Windrunner'sPursuit" value: { - dps: 7185.07401 - tps: 6263.89369 + dps: 7074.4822 + tps: 6153.83283 } } dps_results: { key: "TestMM-AllItems-WingedTalisman-37844" value: { - dps: 6962.37939 - tps: 6046.98669 + dps: 6833.52604 + tps: 5918.52842 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7733.27407 - tps: 6802.3325 + dps: 7674.97047 + tps: 6746.23688 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 7911.009 - tps: 6995.06528 + dps: 7893.56698 + tps: 6974.04491 } } dps_results: { key: "TestMM-Average-Default" value: { - dps: 7230.69919 - tps: 6306.90123 + dps: 7111.01213 + tps: 6185.03624 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongMultiTarget" value: { - dps: 7209.83384 - tps: 7417.5309 + dps: 7061.98483 + tps: 7245.99309 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-LongSingleTarget" value: { - dps: 7209.83384 - tps: 6333.07195 + dps: 7061.98483 + tps: 6184.71229 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-FullBuffs-ShortSingleTarget" value: { - dps: 8167.97318 - tps: 7156.31495 + dps: 8032.79038 + tps: 7020.87835 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongMultiTarget" value: { - dps: 3545.6313 - tps: 4796.83192 + dps: 3484.69958 + tps: 4630.95381 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-LongSingleTarget" value: { - dps: 3545.6313 - tps: 3279.20359 + dps: 3484.69958 + tps: 3211.8784 } } dps_results: { key: "TestMM-Settings-Dwarf-P1-MM-NoBuffs-ShortSingleTarget" value: { - dps: 4261.55402 - tps: 3900.62568 + dps: 4146.19849 + tps: 3784.56535 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongMultiTarget" value: { - dps: 7244.85128 - tps: 7403.76462 + dps: 7098.24364 + tps: 7232.42048 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-FullBuffs-LongSingleTarget" value: { - dps: 7244.85128 - tps: 6319.18364 + dps: 7098.24364 + tps: 6170.99145 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-FullBuffs-ShortSingleTarget" value: { - dps: 8237.645 - tps: 7161.4547 + dps: 8122.72413 + tps: 7048.76714 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongMultiTarget" value: { - dps: 3572.50749 - tps: 4804.87192 + dps: 3510.55818 + tps: 4644.58924 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-NoBuffs-LongSingleTarget" value: { - dps: 3572.50749 - tps: 3286.38911 + dps: 3510.55818 + tps: 3219.84328 } } dps_results: { key: "TestMM-Settings-Orc-P1-MM-NoBuffs-ShortSingleTarget" value: { - dps: 4283.99131 - tps: 3903.1172 + dps: 4183.2087 + tps: 3800.62106 } } dps_results: { key: "TestMM-SwitchInFrontOfTarget-Default" value: { - dps: 7191.70655 - tps: 6321.40249 + dps: 7049.03457 + tps: 6172.55894 } } diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 47f859a280..c007c13913 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -46,984 +46,984 @@ character_stats_results: { dps_results: { key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 7465.98252 - tps: 6466.74403 + dps: 7447.54646 + tps: 6454.34517 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50359" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50366" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6963.65607 - tps: 5928.92873 + dps: 6946.25489 + tps: 5912.11325 } } dps_results: { key: "TestSV-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7038.64666 - tps: 5990.13461 + dps: 7026.68072 + tps: 5977.80056 } } dps_results: { key: "TestSV-AllItems-Bandit'sInsignia-40371" value: { - dps: 7075.15103 - tps: 6034.18426 + dps: 7057.83609 + tps: 6017.47879 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6916.38904 - tps: 5885.95961 + dps: 6899.32623 + tps: 5869.51971 hps: 90.56904 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6916.38904 - tps: 5885.95961 + dps: 6899.32623 + tps: 5869.51971 hps: 90.56904 } } dps_results: { key: "TestSV-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7050.54804 - tps: 6005.15496 + dps: 7035.44028 + tps: 5989.69586 } } dps_results: { key: "TestSV-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7029.62466 - tps: 5990.63424 + dps: 7020.114 + tps: 5981.79243 } } dps_results: { key: "TestSV-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6805.84312 - tps: 5765.48197 + dps: 6788.92242 + tps: 5750.39207 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50035" value: { - dps: 6842.41228 - tps: 5817.59342 + dps: 6831.26008 + tps: 5808.49092 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50692" value: { - dps: 6833.15933 - tps: 5808.67802 + dps: 6822.0232 + tps: 5799.59126 } } dps_results: { key: "TestSV-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5905.1909 - tps: 5037.8417 + dps: 5913.92162 + tps: 5042.98943 } } dps_results: { key: "TestSV-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5632.33248 - tps: 4780.49476 + dps: 5624.48315 + tps: 4776.50669 } } dps_results: { key: "TestSV-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7029.91077 - tps: 5865.90316 + dps: 7017.95436 + tps: 5853.84821 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7249.57508 - tps: 6187.48389 + dps: 7235.65484 + tps: 6173.219 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7252.90936 - tps: 6189.72288 + dps: 7238.98526 + tps: 6175.45256 } } dps_results: { key: "TestSV-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7193.60061 - tps: 6148.25773 + dps: 7178.12799 + tps: 6132.43733 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50349" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50352" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6978.9616 - tps: 5927.75484 + dps: 6961.84702 + tps: 5911.22387 hps: 64 } } dps_results: { key: "TestSV-AllItems-CryptstalkerBattlegear" value: { - dps: 6461.05143 - tps: 5483.92965 + dps: 6437.56443 + tps: 5460.49484 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7014.1855 - tps: 5984.16253 + dps: 7000.09682 + tps: 5970.05108 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7062.10481 - tps: 6031.24583 + dps: 7045.80243 + tps: 6015.14549 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7122.46623 - tps: 6078.98799 + dps: 7109.11538 + tps: 6066.05627 } } dps_results: { key: "TestSV-AllItems-Death'sChoice-47464" value: { - dps: 7342.73732 - tps: 6279.01357 + dps: 7328.03921 + tps: 6264.82745 } } dps_results: { key: "TestSV-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6992.60467 - tps: 5962.56675 + dps: 6981.33033 + tps: 5951.23538 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50362" value: { - dps: 7257.16164 - tps: 6214.21556 + dps: 7240.28187 + tps: 6197.32128 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50363" value: { - dps: 7292.96399 - tps: 6248.83245 + dps: 7276.0577 + tps: 6232.00979 } } dps_results: { key: "TestSV-AllItems-Defender'sCode-40257" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7054.22327 - tps: 6008.90734 + dps: 7039.34812 + tps: 5993.66926 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50348" value: { - dps: 7070.13892 - tps: 6033.30963 + dps: 7055.89153 + tps: 6019.1563 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50353" value: { - dps: 7072.70958 - tps: 6037.09266 + dps: 7062.66698 + tps: 6029.19623 } } dps_results: { key: "TestSV-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7038.64666 - tps: 5990.13461 + dps: 7026.68072 + tps: 5977.80056 } } dps_results: { key: "TestSV-AllItems-EmberSkyflareDiamond" value: { - dps: 7036.46462 - tps: 5990.18856 + dps: 7024.49521 + tps: 5977.85364 } } dps_results: { key: "TestSV-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7050.54804 - tps: 6005.20516 + dps: 7035.44028 + tps: 5989.74962 } } dps_results: { key: "TestSV-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7045.74472 - tps: 6000.19925 + dps: 7031.53754 + tps: 5985.64707 } } dps_results: { key: "TestSV-AllItems-EphemeralSnowflake-50260" value: { - dps: 7004.40429 - tps: 5970.53148 + dps: 6979.32188 + tps: 5943.6934 } } dps_results: { key: "TestSV-AllItems-EssenceofGossamer-37220" value: { - dps: 6946.86508 - tps: 5906.33043 + dps: 6929.80978 + tps: 5889.86286 } } dps_results: { key: "TestSV-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7072.51425 - tps: 6041.78911 + dps: 7056.06183 + tps: 6025.55973 } } dps_results: { key: "TestSV-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7003.07045 - tps: 5972.35477 + dps: 6986.56001 + tps: 5956.00749 } } dps_results: { key: "TestSV-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6942.26748 - tps: 5909.97543 + dps: 6925.20042 + tps: 5893.43463 } } dps_results: { key: "TestSV-AllItems-ForethoughtTalisman-40258" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-ForgeEmber-37660" value: { - dps: 6982.20512 - tps: 5951.85552 + dps: 6965.5693 + tps: 5935.47313 } } dps_results: { key: "TestSV-AllItems-ForlornSkyflareDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-ForlornStarflareDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7087.81396 - tps: 6040.55746 + dps: 7070.3464 + tps: 6023.67692 } } dps_results: { key: "TestSV-AllItems-FuturesightRune-38763" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-Gladiator'sPursuit" value: { - dps: 6991.06466 - tps: 5997.3533 + dps: 6990.47194 + tps: 6004.14375 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54573" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54589" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7034.26924 - tps: 6003.52582 + dps: 7017.78516 + tps: 5987.27966 } } dps_results: { key: "TestSV-AllItems-Gronnstalker'sArmor" value: { - dps: 5245.52168 - tps: 4425.08898 + dps: 5236.59165 + tps: 4416.55301 } } dps_results: { key: "TestSV-AllItems-Heartpierce-49982" value: { - dps: 7276.94565 - tps: 6218.12038 + dps: 7262.94642 + tps: 6203.78127 } } dps_results: { key: "TestSV-AllItems-Heartpierce-50641" value: { - dps: 7280.58471 - tps: 6220.82762 + dps: 7266.58025 + tps: 6206.48195 } } dps_results: { key: "TestSV-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7050.54804 - tps: 6005.20516 + dps: 7035.44028 + tps: 5989.74962 } } dps_results: { key: "TestSV-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7045.74472 - tps: 6000.19925 + dps: 7031.53754 + tps: 5985.64707 } } dps_results: { key: "TestSV-AllItems-IncisorFragment-37723" value: { - dps: 7056.52155 - tps: 6017.95105 + dps: 7039.21864 + tps: 6001.23672 } } dps_results: { key: "TestSV-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7042.74948 - tps: 6002.07633 + dps: 7030.76759 + tps: 5989.87997 } } dps_results: { key: "TestSV-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7057.79642 - tps: 6010.00366 - hps: 12.04564 + dps: 7045.81319 + tps: 5997.65967 + hps: 11.96793 } } dps_results: { key: "TestSV-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7099.15406 - tps: 6071.1527 + dps: 7083.07294 + tps: 6056.03621 } } dps_results: { key: "TestSV-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7033.77482 - tps: 6003.79745 + dps: 7016.44883 + tps: 5987.10189 } } dps_results: { key: "TestSV-AllItems-OfferingofSacrifice-37638" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7048.80757 - tps: 6001.34033 + dps: 7036.81366 + tps: 5988.97984 } } dps_results: { key: "TestSV-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7053.25388 - tps: 6005.34524 + dps: 7041.25114 + tps: 5992.97529 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7037.00868 - tps: 5989.04428 + dps: 7025.04453 + tps: 5976.7128 } } dps_results: { key: "TestSV-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7038.64666 - tps: 5990.13461 + dps: 7026.68072 + tps: 5977.80056 } } dps_results: { key: "TestSV-AllItems-PurifiedShardoftheGods" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-ReignoftheDead-47316" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-ReignoftheDead-47477" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7204.8402 - tps: 6157.44416 + dps: 7190.97168 + tps: 6143.25203 } } dps_results: { key: "TestSV-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7029.91077 - tps: 5984.10821 + dps: 7017.95436 + tps: 5971.78815 } } dps_results: { key: "TestSV-AllItems-RuneofRepulsion-40372" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-ScourgestalkerBattlegear" value: { - dps: 6939.65308 - tps: 5945.6053 + dps: 6922.75687 + tps: 5925.25054 } } dps_results: { key: "TestSV-AllItems-SealofthePantheon-36993" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-Shadowmourne-49623" value: { - dps: 7480.24148 - tps: 6412.18763 + dps: 7464.97324 + tps: 6396.65407 } } dps_results: { key: "TestSV-AllItems-ShinyShardoftheGods" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6978.9616 - tps: 5927.75484 + dps: 6961.84702 + tps: 5911.22387 } } dps_results: { key: "TestSV-AllItems-SliverofPureIce-50339" value: { - dps: 6916.41454 - tps: 5890.20356 + dps: 6899.41548 + tps: 5874.01175 } } dps_results: { key: "TestSV-AllItems-SliverofPureIce-50346" value: { - dps: 6916.41454 - tps: 5890.54522 + dps: 6899.41548 + tps: 5874.36587 } } dps_results: { key: "TestSV-AllItems-SoulPreserver-37111" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-SouloftheDead-40382" value: { - dps: 7008.88685 - tps: 5978.15729 + dps: 6992.97488 + tps: 5962.44009 } } dps_results: { key: "TestSV-AllItems-SparkofLife-37657" value: { - dps: 7023.86474 - tps: 5985.46932 + dps: 7012.31867 + tps: 5975.53438 } } dps_results: { key: "TestSV-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7006.37575 - tps: 5966.77159 + dps: 6989.30595 + tps: 5950.29288 } } dps_results: { key: "TestSV-AllItems-StormshroudArmor" value: { - dps: 5489.32914 - tps: 4650.41158 + dps: 5495.18782 + tps: 4659.64135 } } dps_results: { key: "TestSV-AllItems-SwiftSkyflareDiamond" value: { - dps: 7053.25388 - tps: 6005.34524 + dps: 7041.25114 + tps: 5992.97529 } } dps_results: { key: "TestSV-AllItems-SwiftStarflareDiamond" value: { - dps: 7048.80757 - tps: 6001.34033 + dps: 7036.81366 + tps: 5988.97984 } } dps_results: { key: "TestSV-AllItems-SwiftWindfireDiamond" value: { - dps: 7041.02654 - tps: 5994.33175 + dps: 7029.04806 + tps: 5981.9878 } } dps_results: { key: "TestSV-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-TearsoftheVanquished-47215" value: { - dps: 6968.12492 - tps: 5932.34913 + dps: 6950.98984 + tps: 5915.7998 } } dps_results: { key: "TestSV-AllItems-TheFistsofFury" value: { - dps: 6886.48627 - tps: 5860.36404 + dps: 6875.02152 + tps: 5851.01968 } } dps_results: { key: "TestSV-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 7008.27585 - tps: 5981.778 + dps: 6996.11838 + tps: 5971.67948 } } dps_results: { key: "TestSV-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7058.16523 - tps: 6013.00509 + dps: 7041.52369 + tps: 5998.35821 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6916.56306 - tps: 5886.15324 + dps: 6899.56401 + tps: 5869.74581 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6916.56306 - tps: 5886.15324 + dps: 6899.56401 + tps: 5869.74581 } } dps_results: { key: "TestSV-AllItems-TirelessSkyflareDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-TirelessStarflareDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6980.12445 - tps: 5942.90832 + dps: 6968.73448 + tps: 5932.44132 } } dps_results: { key: "TestSV-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7029.91077 - tps: 5984.31949 + dps: 7017.95436 + tps: 5971.99916 } } dps_results: { key: "TestSV-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5851.0354 - tps: 4980.65822 + dps: 5862.6858 + tps: 5001.18449 } } dps_results: { key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6892.3461 - tps: 5863.46862 + dps: 6881.96818 + tps: 5855.12582 } } dps_results: { key: "TestSV-AllItems-Windrunner'sPursuit" value: { - dps: 7098.83075 - tps: 6075.59466 + dps: 7089.01894 + tps: 6065.56283 } } dps_results: { key: "TestSV-AllItems-WingedTalisman-37844" value: { - dps: 6916.41454 - tps: 5886.00471 + dps: 6899.41548 + tps: 5869.59728 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7536.56578 - tps: 6480.28106 + dps: 7516.95586 + tps: 6461.85209 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 7633.98517 - tps: 6589.06468 + dps: 7620.34845 + tps: 6576.14638 } } dps_results: { key: "TestSV-Average-Default" value: { - dps: 7230.36044 - tps: 6181.38125 + dps: 7212.10116 + tps: 6163.69131 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19273.02149 - tps: 19460.18273 + dps: 19860.92105 + tps: 20188.08849 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-LongSingleTarget" value: { - dps: 7167.83745 - tps: 6164.75162 + dps: 7148.45777 + tps: 6145.61062 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 8066.75192 - tps: 6925.95101 + dps: 8055.31216 + tps: 6917.73977 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongMultiTarget" value: { - dps: 10426.3238 - tps: 11326.91754 + dps: 11142.51886 + tps: 12081.28906 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3668.14735 - tps: 3336.4381 + dps: 3637.69534 + tps: 3307.14216 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4324.59667 - tps: 3929.12025 + dps: 4311.499 + tps: 3912.41311 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 7172.39789 - tps: 7394.01093 + dps: 7814.03408 + tps: 8183.20283 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 7172.39789 - tps: 6180.43806 + dps: 7158.52001 + tps: 6166.19635 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8033.57756 - tps: 6884.92977 + dps: 8016.04733 + tps: 6869.97343 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3672.17949 - tps: 4683.55299 + dps: 4105.29846 + tps: 5150.44326 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3672.17949 - tps: 3343.69167 + dps: 3650.28305 + tps: 3322.40778 } } dps_results: { key: "TestSV-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4307.59114 - tps: 3908.58227 + dps: 4325.4632 + tps: 3928.09592 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19387.47522 - tps: 19513.28161 + dps: 19966.66695 + tps: 20231.2158 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-LongSingleTarget" value: { - dps: 7223.19209 - tps: 6163.60298 + dps: 7201.26627 + tps: 6142.65978 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 8146.75981 - tps: 6938.67955 + dps: 8135.16469 + tps: 6930.29711 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongMultiTarget" value: { - dps: 10505.18914 - tps: 11390.13178 + dps: 11184.55663 + tps: 12098.85039 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3690.47544 - tps: 3337.89315 + dps: 3657.60658 + tps: 3306.63011 } } dps_results: { key: "TestSV-Settings-Orc-P1-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4364.96109 - tps: 3946.575 + dps: 4354.54267 + tps: 3931.91923 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 7204.8402 - tps: 7365.91136 + dps: 7859.12519 + tps: 8163.96818 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 7204.8402 - tps: 6157.44416 + dps: 7190.97168 + tps: 6143.25203 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 8109.76009 - tps: 6893.60828 + dps: 8089.40805 + tps: 6875.8988 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3692.02852 - tps: 4687.68614 + dps: 4118.81187 + tps: 5161.0544 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3692.02852 - tps: 3342.83443 + dps: 3663.02322 + tps: 3314.23694 } } dps_results: { key: "TestSV-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4348.02388 - tps: 3924.36882 + dps: 4360.42196 + tps: 3938.65388 } } dps_results: { key: "TestSV-SwitchInFrontOfTarget-Default" value: { - dps: 7135.43685 - tps: 6176.36751 + dps: 7107.191 + tps: 6145.2098 } } diff --git a/sim/hunter/hunter.go b/sim/hunter/hunter.go index 2a800b6c80..c5b5b9a24d 100644 --- a/sim/hunter/hunter.go +++ b/sim/hunter/hunter.go @@ -84,7 +84,9 @@ type Hunter struct { ScorpidStingAuras core.AuraArray TalonOfAlarAura *core.Aura - CustomRotation *common.CustomRotation + CustomRotation *common.CustomRotation + rotationConditions map[*core.Spell]RotationCondition + rotationPriority []*core.Spell } func (hunter *Hunter) GetCharacter() *core.Character { @@ -146,6 +148,7 @@ func (hunter *Hunter) Initialize() { hunter.DelayDPSCooldownsForArmorDebuffs(time.Second * 10) + hunter.initRotation() hunter.CustomRotation = hunter.makeCustomRotation() if hunter.CustomRotation == nil { hunter.Rotation.Type = proto.Hunter_Rotation_SingleTarget diff --git a/sim/hunter/rotation.go b/sim/hunter/rotation.go index 329d8fb089..8cfd8fb002 100644 --- a/sim/hunter/rotation.go +++ b/sim/hunter/rotation.go @@ -35,9 +35,9 @@ func (hunter *Hunter) rotation(sim *core.Simulation) { hunter.WaitForMana(sim, spell.CurCast.Cost) } } else { - spell := hunter.singleTargetChooseSpell(sim) + spell, target := hunter.singleTargetChooseSpell(sim) - success := spell.Cast(sim, hunter.CurrentTarget) + success := spell.Cast(sim, target) if !success { hunter.WaitForMana(sim, spell.CurCast.Cost) } @@ -52,32 +52,19 @@ func (hunter *Hunter) aoeChooseSpell(sim *core.Simulation) *core.Spell { } } -func (hunter *Hunter) singleTargetChooseSpell(sim *core.Simulation) *core.Spell { - if sim.IsExecutePhase20() && hunter.KillShot.IsReady(sim) { - return hunter.KillShot - } else if hunter.ExplosiveShotR4.IsReady(sim) && !hunter.ExplosiveShotR4.CurDot().IsActive() { - return hunter.ExplosiveShotR4 - } else if hunter.Rotation.AllowExplosiveShotDownrank && hunter.ExplosiveShotR3.IsReady(sim) && !hunter.ExplosiveShotR3.CurDot().IsActive() { - return hunter.ExplosiveShotR3 - } else if hunter.Rotation.Sting == proto.Hunter_Rotation_ScorpidSting && !hunter.ScorpidStingAuras.Get(hunter.CurrentTarget).IsActive() { - return hunter.ScorpidSting - } else if hunter.Rotation.Sting == proto.Hunter_Rotation_SerpentSting && !hunter.SerpentSting.CurDot().IsActive() { - return hunter.SerpentSting - } else if hunter.ChimeraShot.IsReady(sim) { - return hunter.ChimeraShot - } else if !hunter.Rotation.TrapWeave && hunter.BlackArrow.IsReady(sim) { - return hunter.BlackArrow - } else if hunter.Rotation.TrapWeave && hunter.ExplosiveTrap.IsReady(sim) && !hunter.ExplosiveTrap.AOEDot().IsActive() { - return hunter.TrapWeaveSpell - } else if hunter.AimedShot.IsReady(sim) { - return hunter.AimedShot - } else if hunter.MultiShot.IsReady(sim) { - return hunter.MultiShot - } else if hunter.ArcaneShot.IsReady(sim) && (hunter.ExplosiveShotR4 == nil || (!hunter.ExplosiveShotR4.CurDot().IsActive() && !hunter.ExplosiveShotR3.CurDot().IsActive())) { - return hunter.ArcaneShot - } else { - return hunter.SteadyShot +func (hunter *Hunter) singleTargetChooseSpell(sim *core.Simulation) (*core.Spell, *core.Unit) { + for _, spell := range hunter.rotationPriority { + if spell == nil { + continue + } + + for i := int32(0); i < hunter.Env.GetNumTargets(); i++ { + if hunter.rotationConditions[spell].CanUse(sim, hunter.Env.GetTargetUnit(i)) { + return spell, hunter.Env.GetTargetUnit(i) + } + } } + panic("No spell found to cast!") } // Returns whether an aspect was swapped. @@ -227,3 +214,122 @@ func (hunter *Hunter) makeCustomRotation() *common.CustomRotation { }, }) } + +type RotationCondition struct { + CanUse func(sim *core.Simulation, target *core.Unit) bool +} + +func (hunter *Hunter) initRotation() { + hunter.rotationConditions = map[*core.Spell]RotationCondition{ + hunter.KillShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return sim.IsExecutePhase20() && hunter.KillShot.IsReady(sim) + }, + }, + hunter.ExplosiveShotR4: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + if target != hunter.CurrentTarget { + return false + } + return hunter.ExplosiveShotR4.IsReady(sim) && !hunter.ExplosiveShotR4.CurDot().IsActive() + }, + }, + hunter.ExplosiveShotR3: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + if target != hunter.CurrentTarget { + return false + } + return hunter.Rotation.AllowExplosiveShotDownrank && hunter.ExplosiveShotR3.IsReady(sim) && !hunter.ExplosiveShotR3.CurDot().IsActive() + }, + }, + hunter.ScorpidSting: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + if target != hunter.CurrentTarget { + return false + } + return hunter.Rotation.Sting == proto.Hunter_Rotation_ScorpidSting && !hunter.ScorpidStingAuras.Get(hunter.CurrentTarget).IsActive() + }, + }, + hunter.SerpentSting: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + if target != hunter.CurrentTarget && !hunter.Rotation.MultiDotSerpentSting { + return false + } + return hunter.Rotation.Sting == proto.Hunter_Rotation_SerpentSting && !hunter.SerpentSting.Dot(target).IsActive() + }, + }, + hunter.ChimeraShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.ChimeraShot.IsReady(sim) + }, + }, + hunter.BlackArrow: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return !hunter.Rotation.TrapWeave && hunter.BlackArrow.IsReady(sim) + }, + }, + hunter.TrapWeaveSpell: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.Rotation.TrapWeave && hunter.ExplosiveTrap.IsReady(sim) && !hunter.ExplosiveTrap.AOEDot().IsActive() + }, + }, + hunter.AimedShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.AimedShot.IsReady(sim) + }, + }, + hunter.MultiShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.MultiShot.IsReady(sim) + }, + }, + hunter.ArcaneShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.ArcaneShot.IsReady(sim) && (!hunter.ExplosiveShotR4.CurDot().IsActive() && !hunter.ExplosiveShotR3.CurDot().IsActive()) + }, + }, + hunter.SteadyShot: RotationCondition{ + func(sim *core.Simulation, target *core.Unit) bool { + return hunter.SteadyShot.IsReady(sim) + }, + }, + } + + if hunter.PrimaryTalentTree == 0 { + // BM + hunter.rotationPriority = []*core.Spell{ + hunter.KillShot, + hunter.TrapWeaveSpell, + hunter.SerpentSting, + hunter.ScorpidSting, + hunter.AimedShot, + hunter.MultiShot, + hunter.SteadyShot, + } + } else if hunter.PrimaryTalentTree == 1 { + // MM + hunter.rotationPriority = []*core.Spell{ + hunter.KillShot, + hunter.SerpentSting, + hunter.ScorpidSting, + hunter.TrapWeaveSpell, + hunter.ChimeraShot, + hunter.AimedShot, + hunter.MultiShot, + hunter.SteadyShot, + } + } else { + // SV + hunter.rotationPriority = []*core.Spell{ + hunter.KillShot, + hunter.ExplosiveShotR4, + hunter.ExplosiveShotR3, + hunter.TrapWeaveSpell, + hunter.SerpentSting, + hunter.ScorpidSting, + hunter.BlackArrow, + hunter.MultiShot, + hunter.SteadyShot, + } + } +} diff --git a/ui/hunter/inputs.ts b/ui/hunter/inputs.ts index 0df3ba0686..1ea36b413d 100644 --- a/ui/hunter/inputs.ts +++ b/ui/hunter/inputs.ts @@ -99,6 +99,13 @@ export const HunterRotationConfig = { showWhen: (player: Player) => player.getRotation().type != RotationType.Custom && player.getTalents().explosiveShot && player.getTalents().lockAndLoad > 0, changeEmitter: (player: Player) => TypedEvent.onAny([player.rotationChangeEmitter, player.talentsChangeEmitter]), }), + InputHelpers.makeRotationBooleanInput({ + fieldName: 'multiDotSerpentSting', + label: 'Multi-Dot Serpent Sting', + labelTooltip: 'Casts Serpent Sting on multiple targets', + showWhen: (player: Player) => player.getRotation().type != RotationType.Custom, + changeEmitter: (player: Player) => TypedEvent.onAny([player.rotationChangeEmitter, player.talentsChangeEmitter]), + }), InputHelpers.makeCustomRotationInput({ fieldName: 'customRotation', numColumns: 2,