diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go index 2bb76ac9ea..7b50682563 100644 --- a/sim/deathknight/dancing_rune_weapon.go +++ b/sim/deathknight/dancing_rune_weapon.go @@ -178,6 +178,7 @@ func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet { }) runeWeapon.PseudoStats.DamageTakenMultiplier = 0 + runeWeapon.PseudoStats.MeleeHasteRatingPerHastePercent = dk.PseudoStats.MeleeHasteRatingPerHastePercent dk.AddPet(runeWeapon) diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results index 212855fb79..2fe368f482 100644 --- a/sim/deathknight/dps/TestBlood.results +++ b/sim/deathknight/dps/TestBlood.results @@ -46,1040 +46,1040 @@ character_stats_results: { dps_results: { key: "TestBlood-AllItems-Althor'sAbacus-50359" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-Althor'sAbacus-50366" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10685.43217 - tps: 5370.29389 + dps: 10739.58168 + tps: 5400.1528 } } dps_results: { key: "TestBlood-AllItems-Bandit'sInsignia-40371" value: { - dps: 10420.61386 - tps: 5274.19025 + dps: 10453.28965 + tps: 5290.29797 } } dps_results: { key: "TestBlood-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10226.36465 - tps: 5174.16182 + dps: 10273.55258 + tps: 5200.42225 hps: 94.38579 } } dps_results: { key: "TestBlood-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10226.36465 - tps: 5174.16182 + dps: 10273.55258 + tps: 5200.42225 hps: 94.38579 } } dps_results: { key: "TestBlood-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10716.53455 - tps: 5386.76019 + dps: 10767.53164 + tps: 5415.09831 } } dps_results: { key: "TestBlood-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 10228.0427 - tps: 5143.81902 + dps: 10217.72821 + tps: 5135.69749 } } dps_results: { key: "TestBlood-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 8079.8777 - tps: 4078.58475 + dps: 8054.46811 + tps: 4068.23945 } } dps_results: { key: "TestBlood-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 7942.89759 - tps: 4017.07236 + dps: 7964.45643 + tps: 4014.61106 } } dps_results: { key: "TestBlood-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7658.96346 - tps: 3858.58246 + dps: 7656.78528 + tps: 3858.70972 } } dps_results: { key: "TestBlood-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10679.15016 - tps: 5259.67062 + dps: 10733.26981 + tps: 5288.91677 } } dps_results: { key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 12516.09121 - tps: 6396.27009 + dps: 12587.4826 + tps: 6434.98695 } } dps_results: { key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 12627.53967 - tps: 6462.86241 + dps: 12650.0376 + tps: 6470.27191 } } dps_results: { key: "TestBlood-AllItems-ChaoticSkyflareDiamond" value: { - dps: 10910.86893 - tps: 5491.65247 + dps: 10963.90338 + tps: 5521.25581 } } dps_results: { key: "TestBlood-AllItems-CorpseTongueCoin-50349" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-CorpseTongueCoin-50352" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 hps: 64 } } dps_results: { key: "TestBlood-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10378.90982 - tps: 5255.6124 + dps: 10417.96388 + tps: 5276.00948 } } dps_results: { key: "TestBlood-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10433.34189 - tps: 5285.43379 + dps: 10461.50974 + tps: 5298.64486 } } dps_results: { key: "TestBlood-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10501.86915 - tps: 5291.84858 + dps: 10551.10607 + tps: 5319.25445 } } dps_results: { key: "TestBlood-AllItems-DarkrunedBattlegear" value: { - dps: 8979.07789 - tps: 4531.0386 + dps: 8991.05824 + tps: 4533.35621 } } dps_results: { key: "TestBlood-AllItems-DarkrunedPlate" value: { - dps: 7906.88413 - tps: 3983.46103 + dps: 7956.51999 + tps: 4002.8062 } } dps_results: { key: "TestBlood-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10324.7071 - tps: 5227.70339 + dps: 10370.09946 + tps: 5251.52815 } } dps_results: { key: "TestBlood-AllItems-Deathbringer'sWill-50362" value: { - dps: 10907.6957 - tps: 5557.47398 + dps: 10950.44078 + tps: 5578.76152 } } dps_results: { key: "TestBlood-AllItems-Deathbringer'sWill-50363" value: { - dps: 10964.89547 - tps: 5590.87746 + dps: 11000.29493 + tps: 5607.27662 } } dps_results: { key: "TestBlood-AllItems-Defender'sCode-40257" value: { - dps: 10244.55558 - tps: 5183.67496 + dps: 10291.82545 + tps: 5209.97944 } } dps_results: { key: "TestBlood-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10721.42952 - tps: 5389.69717 + dps: 10771.64747 + tps: 5417.5678 } } dps_results: { key: "TestBlood-AllItems-DislodgedForeignObject-50348" value: { - dps: 10507.10527 - tps: 5317.92222 + dps: 10530.4602 + tps: 5325.52699 } } dps_results: { key: "TestBlood-AllItems-DislodgedForeignObject-50353" value: { - dps: 10453.26207 - tps: 5296.92551 + dps: 10474.95147 + tps: 5310.30154 } } dps_results: { key: "TestBlood-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-EmberSkyflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10716.53455 - tps: 5386.76019 + dps: 10767.53164 + tps: 5415.09831 } } dps_results: { key: "TestBlood-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10711.60453 - tps: 5384.59169 + dps: 10761.71324 + tps: 5412.37463 } } dps_results: { key: "TestBlood-AllItems-EphemeralSnowflake-50260" value: { - dps: 10365.82333 - tps: 5230.37906 + dps: 10401.00289 + tps: 5241.10427 } } dps_results: { key: "TestBlood-AllItems-EssenceofGossamer-37220" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10411.77496 - tps: 5272.65133 + dps: 10448.5033 + tps: 5291.2511 } } dps_results: { key: "TestBlood-AllItems-EyeoftheBroodmother-45308" value: { - dps: 10364.53184 - tps: 5248.11349 + dps: 10408.22212 + tps: 5271.64204 } } dps_results: { key: "TestBlood-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-ForethoughtTalisman-40258" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-ForgeEmber-37660" value: { - dps: 10335.14895 - tps: 5233.15335 + dps: 10376.16664 + tps: 5254.38513 } } dps_results: { key: "TestBlood-AllItems-ForlornSkyflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-ForlornStarflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10457.61586 - tps: 5297.49405 + dps: 10505.86987 + tps: 5324.34851 } } dps_results: { key: "TestBlood-AllItems-FuturesightRune-38763" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-GlowingTwilightScale-54573" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-GlowingTwilightScale-54589" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10401.02236 - tps: 5265.15036 + dps: 10421.65706 + tps: 5273.56265 } } dps_results: { key: "TestBlood-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10716.53455 - tps: 5386.76019 + dps: 10767.53164 + tps: 5415.09831 } } dps_results: { key: "TestBlood-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10711.60453 - tps: 5384.59169 + dps: 10761.71324 + tps: 5412.37463 } } dps_results: { key: "TestBlood-AllItems-IncisorFragment-37723" value: { - dps: 10462.34723 - tps: 5306.96693 + dps: 10510.14937 + tps: 5333.56383 } } dps_results: { key: "TestBlood-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10710.8474 - tps: 5383.57619 - hps: 16.22345 + dps: 10765.11773 + tps: 5413.49941 + hps: 16.44049 } } dps_results: { key: "TestBlood-AllItems-LastWord-50179" value: { - dps: 12246.6253 - tps: 6238.35902 + dps: 12210.67921 + tps: 6205.42881 } } dps_results: { key: "TestBlood-AllItems-LastWord-50708" value: { - dps: 12316.88052 - tps: 6277.49127 + dps: 12280.41202 + tps: 6244.22166 } } dps_results: { key: "TestBlood-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10451.42701 - tps: 5307.78965 + dps: 10513.95177 + tps: 5326.11573 } } dps_results: { key: "TestBlood-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10569.14796 - tps: 5335.86871 + dps: 10621.62611 + tps: 5361.3445 } } dps_results: { key: "TestBlood-AllItems-OfferingofSacrifice-37638" value: { - dps: 10238.131 - tps: 5180.31483 + dps: 10285.37195 + tps: 5206.60376 } } dps_results: { key: "TestBlood-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10704.80983 - tps: 5380.42088 + dps: 10759.05146 + tps: 5410.32883 } } dps_results: { key: "TestBlood-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10710.8474 - tps: 5383.57619 + dps: 10765.11773 + tps: 5413.49941 } } dps_results: { key: "TestBlood-AllItems-PetrifiedScarab-21685" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10275.22223 - tps: 5199.71396 + dps: 10322.63015 + tps: 5226.09266 } } dps_results: { key: "TestBlood-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10281.51832 - tps: 5203.00689 + dps: 10328.95457 + tps: 5229.40082 } } dps_results: { key: "TestBlood-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-PurifiedShardoftheGods" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-ReignoftheDead-47316" value: { - dps: 10276.0991 - tps: 5205.44109 + dps: 10331.40223 + tps: 5236.55523 } } dps_results: { key: "TestBlood-AllItems-ReignoftheDead-47477" value: { - dps: 10284.60916 - tps: 5210.54713 + dps: 10339.91229 + tps: 5241.66126 } } dps_results: { key: "TestBlood-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 10901.90641 - tps: 5487.08994 + dps: 10954.00355 + tps: 5516.10713 } } dps_results: { key: "TestBlood-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-RuneofRepulsion-40372" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-ScourgeborneBattlegear" value: { - dps: 8562.55078 - tps: 4295.76211 + dps: 8597.50429 + tps: 4321.96848 } } dps_results: { key: "TestBlood-AllItems-ScourgebornePlate" value: { - dps: 7886.72142 - tps: 3966.91949 + dps: 7918.42228 + tps: 3972.01755 } } dps_results: { key: "TestBlood-AllItems-Scourgelord'sBattlegear" value: { - dps: 10606.77936 - tps: 5431.9225 + dps: 10625.29982 + tps: 5436.49585 } } dps_results: { key: "TestBlood-AllItems-Scourgelord'sPlate" value: { - dps: 8596.69869 - tps: 4326.96835 + dps: 8614.70939 + tps: 4325.60733 } } dps_results: { key: "TestBlood-AllItems-SealofthePantheon-36993" value: { - dps: 10243.86162 - tps: 5183.03567 + dps: 10291.07675 + tps: 5209.29787 } } dps_results: { key: "TestBlood-AllItems-Shadowmourne-49623" value: { - dps: 13743.33766 - tps: 7064.28282 + dps: 13699.8788 + tps: 7035.58301 } } dps_results: { key: "TestBlood-AllItems-ShinyShardoftheGods" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-SliverofPureIce-50339" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-SliverofPureIce-50346" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-SoulPreserver-37111" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-SouloftheDead-40382" value: { - dps: 10369.77187 - tps: 5250.98828 + dps: 10411.63291 + tps: 5273.03344 } } dps_results: { key: "TestBlood-AllItems-SparkofLife-37657" value: { - dps: 10396.1354 - tps: 5264.36666 + dps: 10337.92958 + tps: 5230.89431 } } dps_results: { key: "TestBlood-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10334.41377 - tps: 5217.37026 + dps: 10384.0868 + tps: 5242.94494 } } dps_results: { key: "TestBlood-AllItems-StormshroudArmor" value: { - dps: 7607.94687 - tps: 3833.22979 + dps: 7659.93801 + tps: 3866.47082 } } dps_results: { key: "TestBlood-AllItems-SwiftSkyflareDiamond" value: { - dps: 10710.8474 - tps: 5383.57619 + dps: 10765.11773 + tps: 5413.49941 } } dps_results: { key: "TestBlood-AllItems-SwiftStarflareDiamond" value: { - dps: 10704.80983 - tps: 5380.42088 + dps: 10759.05146 + tps: 5410.32883 } } dps_results: { key: "TestBlood-AllItems-SwiftWindfireDiamond" value: { - dps: 10694.24408 - tps: 5374.8991 + dps: 10748.43549 + tps: 5404.78031 } } dps_results: { key: "TestBlood-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-TearsoftheVanquished-47215" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-Thassarian'sBattlegear" value: { - dps: 9195.60019 - tps: 4641.06603 + dps: 9203.92773 + tps: 4644.85713 } } dps_results: { key: "TestBlood-AllItems-Thassarian'sPlate" value: { - dps: 8140.70779 - tps: 4091.89634 + dps: 8151.23824 + tps: 4088.58957 } } dps_results: { key: "TestBlood-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 8808.52697 - tps: 4359.13194 + dps: 8812.14209 + tps: 4352.50279 } } dps_results: { key: "TestBlood-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10784.9975 - tps: 5421.56869 + dps: 10749.81852 + tps: 5397.82508 } } dps_results: { key: "TestBlood-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10461.17956 - tps: 5312.73865 + dps: 10428.52045 + tps: 5288.56818 } } dps_results: { key: "TestBlood-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10552.88369 - tps: 5363.87028 + dps: 10508.59227 + tps: 5331.40314 } } dps_results: { key: "TestBlood-AllItems-TirelessSkyflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-TirelessStarflareDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10302.84435 - tps: 5205.12286 + dps: 10275.32458 + tps: 5170.52766 } } dps_results: { key: "TestBlood-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10679.15016 - tps: 5367.01084 + dps: 10733.26981 + tps: 5396.85385 } } dps_results: { key: "TestBlood-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 7962.04242 - tps: 4017.75546 + dps: 7930.29354 + tps: 3995.13956 } } dps_results: { key: "TestBlood-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7732.59218 - tps: 3737.02993 + dps: 7734.38428 + tps: 3735.89869 } } dps_results: { key: "TestBlood-AllItems-WingedTalisman-37844" value: { - dps: 10226.35261 - tps: 5174.15459 + dps: 10273.54054 + tps: 5200.41503 } } dps_results: { key: "TestBlood-Average-Default" value: { - dps: 10989.47785 - tps: 5538.16286 + dps: 10992.9446 + tps: 5533.89196 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-LongMultiTarget" value: { - dps: 32355.4811 - tps: 16625.70265 + dps: 32362.32946 + tps: 16622.40187 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-LongSingleTarget" value: { - dps: 10789.55646 - tps: 5473.59409 + dps: 10841.22885 + tps: 5502.55532 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 13905.29361 - tps: 6331.64065 + dps: 13857.25864 + tps: 6295.7422 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-LongMultiTarget" value: { - dps: 17382.66113 - tps: 8930.31297 + dps: 17435.69834 + tps: 8946.78245 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-LongSingleTarget" value: { - dps: 6192.69235 - tps: 3160.20188 + dps: 6215.88567 + tps: 3161.10732 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 7277.55406 - tps: 3280.28162 + dps: 7320.77269 + tps: 3294.65954 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget" value: { - dps: 29257.16356 - tps: 15899.79735 + dps: 29291.75448 + tps: 15917.56598 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget" value: { - dps: 10265.65235 - tps: 5437.21163 + dps: 10271.35316 + tps: 5436.03545 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget" value: { - dps: 13849.93823 - tps: 6325.29666 + dps: 13933.2926 + tps: 6349.76629 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget" value: { - dps: 15770.48272 - tps: 8591.87621 + dps: 15778.49815 + tps: 8589.95723 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget" value: { - dps: 5858.22178 - tps: 3127.9245 + dps: 5874.81045 + tps: 3130.82318 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget" value: { - dps: 7375.77827 - tps: 3368.5709 + dps: 7411.19778 + tps: 3364.94429 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" value: { - dps: 27046.17374 - tps: 15383.23602 + dps: 27092.01493 + tps: 15401.58281 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" value: { - dps: 10239.59835 - tps: 5415.4484 + dps: 10240.61961 + tps: 5409.11645 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" value: { - dps: 13815.05222 - tps: 6269.23694 + dps: 13788.6821 + tps: 6220.07927 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" value: { - dps: 14608.71885 - tps: 8284.54007 + dps: 14599.23302 + tps: 8270.25477 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" value: { - dps: 5877.47053 - tps: 3127.58904 + dps: 5870.99519 + tps: 3115.83437 } } dps_results: { key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" value: { - dps: 7273.87283 - tps: 3290.73318 + dps: 7289.00682 + tps: 3277.10021 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-LongMultiTarget" value: { - dps: 32770.2236 - tps: 16701.89053 + dps: 32779.33421 + tps: 16699.48458 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-LongSingleTarget" value: { - dps: 10910.86893 - tps: 5491.65247 + dps: 10963.90338 + tps: 5521.25581 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 14162.45259 - tps: 6383.75347 + dps: 14115.52217 + tps: 6347.89933 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-LongMultiTarget" value: { - dps: 17616.03119 - tps: 8973.93636 + dps: 17672.48999 + tps: 8991.52961 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-LongSingleTarget" value: { - dps: 6260.77165 - tps: 3170.95861 + dps: 6286.27457 + tps: 3172.37897 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 7412.9864 - tps: 3308.50991 + dps: 7457.81485 + tps: 3322.89455 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget" value: { - dps: 29503.17836 - tps: 15933.24769 + dps: 29536.63816 + tps: 15950.09279 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget" value: { - dps: 10343.03405 - tps: 5444.48924 + dps: 10372.15126 + tps: 5456.69732 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget" value: { - dps: 14087.9152 - tps: 6371.73653 + dps: 14176.24909 + tps: 6395.88592 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget" value: { - dps: 15893.3449 - tps: 8602.93567 + dps: 15916.88055 + tps: 8610.10421 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget" value: { - dps: 5900.97558 - tps: 3132.84 + dps: 5933.00839 + tps: 3144.35845 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget" value: { - dps: 7500.42357 - tps: 3394.06772 + dps: 7539.16195 + tps: 3390.43801 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" value: { - dps: 27162.63885 - tps: 15405.12568 + dps: 27241.62253 + tps: 15442.65966 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" value: { - dps: 10353.49459 - tps: 5444.25577 + dps: 10339.2293 + tps: 5427.70172 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" value: { - dps: 14054.97267 - tps: 6314.21966 + dps: 14033.96542 + tps: 6264.51512 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" value: { - dps: 14669.68796 - tps: 8292.85939 + dps: 14675.68601 + tps: 8287.33792 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" value: { - dps: 5935.25203 - tps: 3140.47164 + dps: 5914.45433 + tps: 3119.37515 } } dps_results: { key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" value: { - dps: 7403.87166 - tps: 3318.1758 + dps: 7422.04604 + tps: 3304.53501 } } dps_results: { key: "TestBlood-SwitchInFrontOfTarget-Default" value: { - dps: 10479.42643 - tps: 5296.21264 + dps: 10508.24104 + tps: 5310.21111 } } diff --git a/ui/core/player.ts b/ui/core/player.ts index 2dda11dda0..dfb021353c 100644 --- a/ui/core/player.ts +++ b/ui/core/player.ts @@ -687,10 +687,14 @@ export class Player { const hasOffhandWeapon = this.getGear().getEquippedItem(ItemSlot.ItemSlotOffHand)?.item.weaponSpeed !== undefined; // Due to warrior HS bug, hit cap for crit cap calculation should be 8% instead of 27% const meleeHitCap = hasOffhandWeapon && this.spec != Spec.SpecWarrior ? 27.0 : 8.0; - const expertiseCap = this.getInFrontOfTarget() ? 20.5 : 6.5; + const dodgeCap = 6.5 + const parryCap = this.getInFrontOfTarget() ? 14.0 : 0 + const expertiseCap = dodgeCap + parryCap const remainingMeleeHitCap = Math.max(meleeHitCap - meleeHit, 0.0); - const remainingExpertiseCap = Math.max(expertiseCap - expertise, 0.0) + const remainingDodgeCap = Math.max(dodgeCap - expertise, 0.0) + const remainingParryCap = Math.max(parryCap - expertise, 0.0) + const remainingExpertiseCap = remainingDodgeCap + remainingParryCap let specSpecificOffset = 0.0; diff --git a/ui/shadow_priest/apls/aoe_2_4.apl.json b/ui/shadow_priest/apls/aoe_2_4.apl.json new file mode 100644 index 0000000000..7dd3300273 --- /dev/null +++ b/ui/shadow_priest/apls/aoe_2_4.apl.json @@ -0,0 +1,16 @@ +{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"castSpell":{"spellId":{"spellId":34433}}}}, + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"0.75s"}}}},"castSpell":{"spellId":{"spellId":48300}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target","index":2},"spellId":{"spellId":48125}}},"rhs":{"const":{"val":"3s"}}}},{"dotIsActive":{"targetUnit":{"type":"Target","index":2},"spellId":{"spellId":48125}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}}]}},"channelSpell":{"spellId":{"spellId":48156},"target":{"type":"Target","index":2},"interruptIf":{"const":{"val":"true"}}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":48125}}},"rhs":{"const":{"val":"3s"}}}},{"dotIsActive":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":48125}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}}]}},"channelSpell":{"spellId":{"spellId":48156},"target":{"type":"Target","index":1},"interruptIf":{"const":{"val":"true"}}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target"},"spellId":{"spellId":48125}}},"rhs":{"const":{"val":"5s"}}}},{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":48125}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}}]}},"channelSpell":{"spellId":{"spellId":48156},"target":{"type":"Target"},"interruptIf":{"const":{"val":"true"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}},"multidot":{"spellId":{"spellId":48160},"maxDots":4,"maxOverlap":{"spellCastTime":{"spellId":{"spellId":48160}}}}}}, + {"action":{"multidot":{"spellId":{"spellId":48300},"maxDots":1,"maxOverlap":{}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12s"}}}},"multidot":{"spellId":{"spellId":48125},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}},"channelSpell":{"spellId":{"spellId":53023},"interruptIf":{"const":{"val":"true"}}}}}, + {"action":{"channelSpell":{"spellId":{"spellId":48156},"interruptIf":{"const":{"val":"true"}}}}} + ] +} \ No newline at end of file diff --git a/ui/shadow_priest/apls/aoe_4_plus.apl.json b/ui/shadow_priest/apls/aoe_4_plus.apl.json new file mode 100644 index 0000000000..4c812dc20f --- /dev/null +++ b/ui/shadow_priest/apls/aoe_4_plus.apl.json @@ -0,0 +1,12 @@ +{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"castSpell":{"spellId":{"spellId":34433}}}}, + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"6"}}}},"channelSpell":{"spellId":{"spellId":53023},"interruptIf":{"const":{"val":"true"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"0.75s"}}}},"castSpell":{"spellId":{"spellId":48300}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}},"multidot":{"spellId":{"spellId":48160},"maxDots":10,"maxOverlap":{"spellCastTime":{"spellId":{"spellId":48160}}}}}}, + {"action":{"multidot":{"spellId":{"spellId":48300},"maxDots":1,"maxOverlap":{}}}}, + {"action":{"channelSpell":{"spellId":{"spellId":53023},"interruptIf":{"const":{"val":"true"}}}}} + ] +} \ No newline at end of file diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index e16ac8ef07..5cf2e13126 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -30,6 +30,8 @@ import P3Gear from './gear_sets/p3.gear.json'; import P4Gear from './gear_sets/p4.gear.json'; import DefaultApl from './apls/default.apl.json' +import AOE24Apl from './apls/aoe_2_4.apl.json' +import AOE4PlusApl from './apls/aoe_4_plus.apl.json' // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -46,6 +48,8 @@ export const DefaultRotation = Rotation.create({ }); export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); +export const ROTATION_PRESET_AOE24 = PresetUtils.makePresetAPLRotation('AOE (2 to 4 targets)', AOE24Apl); +export const ROTATION_PRESET_AOE4PLUS = PresetUtils.makePresetAPLRotation('AOE (4+ targets)', AOE4PlusApl); // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts index 2f43d57249..ec3d6f7831 100644 --- a/ui/shadow_priest/sim.ts +++ b/ui/shadow_priest/sim.ts @@ -133,6 +133,8 @@ export class ShadowPriestSimUI extends IndividualSimUI { ], rotations: [ Presets.ROTATION_PRESET_DEFAULT, + Presets.ROTATION_PRESET_AOE4PLUS, + Presets.ROTATION_PRESET_AOE24, ], // Preset gear configurations that the user can quickly select. gear: [