diff --git a/sim/rogue/ambush.go b/sim/rogue/ambush.go index 55907f04a6..8ec5af7d8b 100644 --- a/sim/rogue/ambush.go +++ b/sim/rogue/ambush.go @@ -17,7 +17,7 @@ func (rogue *Rogue) registerAmbushSpell() { ClassSpellMask: RogueSpellAmbush, EnergyCost: core.EnergyCostOptions{ - Cost: 60 - []float64{0, 7, 14, 20}[rogue.Talents.SlaughterFromTheShadows], + Cost: 60, Refund: 0, }, Cast: core.CastConfig{ diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index 7f314de8c3..83640ffcd9 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -171,6 +171,13 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-BlackfangBattleweave" + value: { + dps: 27833.11682 + tps: 19761.51294 + } +} dps_results: { key: "TestAssassination-AllItems-Blood-SoakedAleMug-63843" value: { @@ -605,6 +612,20 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-FangsoftheFather" + value: { + dps: 34680.62909 + tps: 24623.24665 + } +} +dps_results: { + key: "TestAssassination-AllItems-Fear-77945" + value: { + dps: 29716.51888 + tps: 21098.7284 + } +} dps_results: { key: "TestAssassination-AllItems-FieryQuintessence-69000" value: { @@ -731,6 +752,13 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-Golad,TwilightofAspects-77949" + value: { + dps: 30631.97181 + tps: 21748.69999 + } +} dps_results: { key: "TestAssassination-AllItems-GraceoftheHerald-55266" value: { @@ -948,6 +976,13 @@ dps_results: { tps: 19491.33575 } } +dps_results: { + key: "TestAssassination-AllItems-JawsofRetribution" + value: { + dps: 30102.22856 + tps: 21372.58228 + } +} dps_results: { key: "TestAssassination-AllItems-JujuofNimbleness-63840" value: { @@ -1102,6 +1137,13 @@ dps_results: { tps: 21406.56074 } } +dps_results: { + key: "TestAssassination-AllItems-MawofOblivion" + value: { + dps: 31188.28959 + tps: 22143.68561 + } +} dps_results: { key: "TestAssassination-AllItems-MightoftheOcean-55251" value: { @@ -1706,6 +1748,13 @@ dps_results: { tps: 21121.95679 } } +dps_results: { + key: "TestAssassination-AllItems-TheSleeper-77947" + value: { + dps: 30136.72153 + tps: 21397.07229 + } +} dps_results: { key: "TestAssassination-AllItems-Theralion'sMirror-59519" value: { @@ -2456,171 +2505,171 @@ dps_results: { } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29118.25563 - tps: 20673.9615 + dps: 54499.60733 + tps: 38694.7212 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29118.25563 - tps: 20673.9615 + dps: 54499.60733 + tps: 38694.7212 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38352.29005 - tps: 27230.12594 + dps: 69793.2058 + tps: 49553.17612 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17062.8215 - tps: 12114.60327 + dps: 33205.09094 + tps: 23575.61457 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17062.8215 - tps: 12114.60327 + dps: 33205.09094 + tps: 23575.61457 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19068.52843 - tps: 13538.65518 + dps: 36442.0357 + tps: 25873.84534 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21937.43941 - tps: 15575.58198 + dps: 41793.6737 + tps: 29673.50833 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21937.43941 - tps: 15575.58198 + dps: 41793.6737 + tps: 29673.50833 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 28941.33668 - tps: 20548.34904 + dps: 53464.88687 + tps: 37960.06968 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12921.38819 - tps: 9174.18562 + dps: 25534.59521 + tps: 18129.5626 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12921.38819 - tps: 9174.18562 + dps: 25534.59521 + tps: 18129.5626 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14794.7462 - tps: 10504.2698 + dps: 28327.09226 + tps: 20112.2355 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29687.60087 - tps: 21078.19662 + dps: 55485.05494 + tps: 39394.389 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29687.60087 - tps: 21078.19662 + dps: 55485.05494 + tps: 39394.389 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39203.71571 - tps: 27834.63815 + dps: 71209.64337 + tps: 50558.84679 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17352.54271 - tps: 12320.30532 + dps: 33753.29927 + tps: 23964.84248 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17352.54271 - tps: 12320.30532 + dps: 33753.29927 + tps: 23964.84248 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19429.97715 - tps: 13795.28378 + dps: 37029.19334 + tps: 26290.72727 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 17750.71401 - tps: 12603.00695 + dps: 28199.69053 + tps: 20021.78028 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 17750.71401 - tps: 12603.00695 + dps: 28199.69053 + tps: 20021.78028 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22461.5155 - tps: 15947.67601 + dps: 35994.77997 + tps: 25556.29378 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 10080.61267 - tps: 7157.235 + dps: 16517.95383 + tps: 11727.74722 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 10080.61267 - tps: 7157.235 + dps: 16517.95383 + tps: 11727.74722 } } dps_results: { - key: "TestAssassination-Settings-Human-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 11209.18657 - tps: 7958.52246 + dps: 18812.8833 + tps: 13357.14715 } } dps_results: { @@ -2960,171 +3009,171 @@ dps_results: { } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29402.20215 - tps: 20875.56353 + dps: 54878.55017 + tps: 38963.77062 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29402.20215 - tps: 20875.56353 + dps: 54878.55017 + tps: 38963.77062 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38957.23651 - tps: 27659.63793 + dps: 70531.55198 + tps: 50077.40191 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17237.93047 - tps: 12238.93064 + dps: 33463.59075 + tps: 23759.14943 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17237.93047 - tps: 12238.93064 + dps: 33463.59075 + tps: 23759.14943 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19402.14839 - tps: 13775.52536 + dps: 36868.00399 + tps: 26176.28283 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22154.52942 - tps: 15729.71589 + dps: 42071.8844 + tps: 29871.03792 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22154.52942 - tps: 15729.71589 + dps: 42071.8844 + tps: 29871.03792 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29408.46801 - tps: 20880.01228 + dps: 54023.98863 + tps: 38357.03193 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13053.99443 - tps: 9268.33605 + dps: 25727.64097 + tps: 18266.62509 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13053.99443 - tps: 9268.33605 + dps: 25727.64097 + tps: 18266.62509 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15055.67848 - tps: 10689.53172 + dps: 28655.80416 + tps: 20345.62095 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29980.65088 - tps: 21286.26213 + dps: 55869.26282 + tps: 39667.1766 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29980.65088 - tps: 21286.26213 + dps: 55869.26282 + tps: 39667.1766 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39821.38752 - tps: 28273.18514 + dps: 71966.77245 + tps: 51096.40844 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17530.38067 - tps: 12446.57028 + dps: 34015.2566 + tps: 24150.83218 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17530.38067 - tps: 12446.57028 + dps: 34015.2566 + tps: 24150.83218 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19768.69438 - tps: 14035.77301 + dps: 37465.06298 + tps: 26600.19471 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 17920.41352 - tps: 12723.4936 + dps: 28392.88629 + tps: 20158.94926 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 17920.41352 - tps: 12723.4936 + dps: 28392.88629 + tps: 20158.94926 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22837.96878 - tps: 16214.95783 + dps: 36405.3604 + tps: 25847.80588 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 10188.57775 - tps: 7233.8902 + dps: 16664.21745 + tps: 11831.59439 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 10188.57775 - tps: 7233.8902 + dps: 16664.21745 + tps: 11831.59439 } } dps_results: { - key: "TestAssassination-Settings-Orc-preraid_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p4_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 11426.33012 - tps: 8112.69439 + dps: 19050.45258 + tps: 13525.82133 } } dps_results: { diff --git a/sim/rogue/assassination/assassination_test.go b/sim/rogue/assassination/assassination_test.go index 8b738a89fa..406509930d 100644 --- a/sim/rogue/assassination/assassination_test.go +++ b/sim/rogue/assassination/assassination_test.go @@ -21,8 +21,7 @@ func TestAssassination(t *testing.T) { OtherGearSets: []core.GearSetCombo{ core.GetGearSet("../../../ui/rogue/assassination/gear_sets", "p3_assassination"), - core.GetGearSet("../../../ui/rogue/assassination/gear_sets", "preraid_assassination"), - //core.GetGearSet("../../../ui/rogue/assassination/gear_sets", "p4_assassination"), + core.GetGearSet("../../../ui/rogue/assassination/gear_sets", "p4_assassination"), }, Talents: AssassinationTalents, diff --git a/sim/rogue/assassination/vendetta.go b/sim/rogue/assassination/vendetta.go index b65163cf06..daebe4e48c 100644 --- a/sim/rogue/assassination/vendetta.go +++ b/sim/rogue/assassination/vendetta.go @@ -15,13 +15,14 @@ func (sinRogue *AssassinationRogue) registerVendetta() { actionID := core.ActionID{SpellID: 79140} hasGlyph := sinRogue.HasPrimeGlyph(proto.RoguePrimeGlyph_GlyphOfVendetta) - duration := time.Duration(core.TernaryFloat64(hasGlyph, 36, 30)) + t13Bonus := sinRogue.HasSetBonus(rogue.Tier13, 4) + duration := time.Duration((30.0+core.TernaryFloat64(t13Bonus, 3.0, 0))*core.TernaryFloat64(hasGlyph, 1.2, 1.0)) * time.Second vendettaAura := sinRogue.NewEnemyAuraArray(func(target *core.Unit) *core.Aura { return target.GetOrRegisterAura(core.Aura{ Label: "Vendetta", ActionID: actionID, - Duration: duration * time.Second, + Duration: duration, OnGain: func(aura *core.Aura, sim *core.Simulation) { sinRogue.AttackTables[aura.Unit.UnitIndex].DamageTakenMultiplier *= 1.2 }, diff --git a/sim/rogue/backstab.go b/sim/rogue/backstab.go index cc20c804ea..786c6a4afe 100644 --- a/sim/rogue/backstab.go +++ b/sim/rogue/backstab.go @@ -21,7 +21,7 @@ func (rogue *Rogue) registerBackstabSpell() { ClassSpellMask: RogueSpellBackstab, EnergyCost: core.EnergyCostOptions{ - Cost: 60 - []float64{0, 7, 14, 20}[rogue.Talents.SlaughterFromTheShadows], + Cost: 60, Refund: 0.8, }, Cast: core.CastConfig{ diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results index e4d3fdf44b..c09910087e 100644 --- a/sim/rogue/combat/TestCombat.results +++ b/sim/rogue/combat/TestCombat.results @@ -6,13 +6,13 @@ character_stats_results: { final_stats: 6806.1 final_stats: 69.3 final_stats: 93.73 - final_stats: 848 + final_stats: 1119 final_stats: 723 - final_stats: 2070 - final_stats: 781 + final_stats: 1989 + final_stats: 691 final_stats: 0 final_stats: 0 - final_stats: 1079 + final_stats: 979 final_stats: 22698.40498 final_stats: 209 final_stats: 0 @@ -28,8 +28,8 @@ character_stats_results: { final_stats: 135554.4 final_stats: 0 final_stats: 326 - final_stats: 13.06027 - final_stats: 14.27755 + final_stats: 15.31655 + final_stats: 16.92286 final_stats: 28.36252 final_stats: 9.0328 final_stats: 5 @@ -38,3132 +38,3181 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-AgileShadowspiritDiamond" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-AgonyandTorment" value: { - dps: 26057.99157 - tps: 18501.17401 + dps: 25786.14755 + tps: 18308.16476 } } dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50366" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 29686.97961 - tps: 21077.75552 + dps: 30007.67403 + tps: 21305.44856 } } dps_results: { key: "TestCombat-AllItems-Anhuur'sHymnal-55889" value: { - dps: 28380.47978 - tps: 20150.14064 + dps: 28430.72573 + tps: 20185.81526 } } dps_results: { key: "TestCombat-AllItems-Anhuur'sHymnal-56407" value: { - dps: 28479.22203 - tps: 20220.24764 + dps: 28433.61724 + tps: 20187.86824 } } dps_results: { key: "TestCombat-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 28880.04938 - tps: 20504.83506 + dps: 29238.10574 + tps: 20759.05507 } } dps_results: { key: "TestCombat-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 29147.63888 - tps: 20694.82361 + dps: 29305.72586 + tps: 20807.06536 } } dps_results: { key: "TestCombat-AllItems-ArrowofTime-72897" value: { - dps: 30087.98644 - tps: 21362.47037 + dps: 30572.22496 + tps: 21706.27972 } } dps_results: { key: "TestCombat-AllItems-AustereShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50726" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 hps: 83.99244 } } dps_results: { key: "TestCombat-AllItems-BedrockTalisman-58182" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BellofEnragingResonance-59326" value: { - dps: 28204.79477 - tps: 20025.40429 + dps: 28362.13429 + tps: 20137.11535 } } dps_results: { key: "TestCombat-AllItems-BellofEnragingResonance-65053" value: { - dps: 28257.9845 - tps: 20063.16899 + dps: 28412.91861 + tps: 20173.17221 } } dps_results: { key: "TestCombat-AllItems-BindingPromise-67037" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50692" value: { - dps: 27763.97581 - tps: 19712.42282 + dps: 27822.48047 + tps: 19753.96114 + } +} +dps_results: { + key: "TestCombat-AllItems-BlackfangBattleweave" + value: { + dps: 28289.43672 + tps: 20085.50007 } } dps_results: { key: "TestCombat-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 29444.99449 - tps: 20905.94609 + dps: 29420.25676 + tps: 20888.3823 } } dps_results: { key: "TestCombat-AllItems-BloodofIsiset-55995" value: { - dps: 28338.38692 - tps: 20120.25471 + dps: 28368.21524 + tps: 20141.43282 } } dps_results: { key: "TestCombat-AllItems-BloodofIsiset-56414" value: { - dps: 28252.39486 - tps: 20059.20035 + dps: 28511.34283 + tps: 20243.05341 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 29808.3883 - tps: 21163.95569 + dps: 29951.96997 + tps: 21265.89868 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 28330.75047 - tps: 20114.83283 + dps: 28506.25433 + tps: 20239.44057 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 28177.30906 - tps: 20005.88943 + dps: 28342.45909 + tps: 20123.14596 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 29194.71612 - tps: 20728.24844 + dps: 29387.57026 + tps: 20865.17489 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 28359.17751 - tps: 20135.01603 + dps: 28531.99287 + tps: 20257.71493 } } dps_results: { key: "TestCombat-AllItems-Bone-LinkFetish-77210" value: { - dps: 29722.53252 - tps: 21102.99809 + dps: 29741.58955 + tps: 21116.52858 } } dps_results: { key: "TestCombat-AllItems-Bone-LinkFetish-77982" value: { - dps: 29506.6792 - tps: 20949.74223 + dps: 29521.69531 + tps: 20960.40367 } } dps_results: { key: "TestCombat-AllItems-Bone-LinkFetish-78002" value: { - dps: 30022.2517 - tps: 21315.79871 + dps: 29978.75293 + tps: 21284.91458 } } dps_results: { key: "TestCombat-AllItems-BottledLightning-66879" value: { - dps: 27987.31616 - tps: 19870.99447 + dps: 28154.03495 + tps: 19989.36481 } } dps_results: { key: "TestCombat-AllItems-BottledWishes-77114" value: { - dps: 28525.72544 - tps: 20253.26506 + dps: 28856.73246 + tps: 20488.28004 } } dps_results: { key: "TestCombat-AllItems-BottledWishes-77985" value: { - dps: 28555.88768 - tps: 20274.68025 + dps: 28845.32503 + tps: 20480.18077 } } dps_results: { key: "TestCombat-AllItems-BottledWishes-78005" value: { - dps: 28723.70857 - tps: 20393.83308 + dps: 29056.37822 + tps: 20630.02853 } } dps_results: { key: "TestCombat-AllItems-BracingShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20459.33505 + dps: 29591.62235 + tps: 20589.85083 } } dps_results: { key: "TestCombat-AllItems-Brawler'sTrophy-232015" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-BurningShadowspiritDiamond" value: { - dps: 29756.19126 - tps: 21126.89579 + dps: 29946.42625 + tps: 21261.96264 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" value: { - dps: 29907.70748 - tps: 21234.47231 + dps: 30143.02991 + tps: 21401.55123 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" value: { - dps: 28618.35538 - tps: 20319.03232 + dps: 28804.52112 + tps: 20451.21 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" value: { - dps: 30135.83435 - tps: 21396.44239 + dps: 30309.47249 + tps: 21519.72547 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" value: { - dps: 28742.36461 - tps: 20407.07887 + dps: 28913.71477 + tps: 20528.73749 } } dps_results: { key: "TestCombat-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 29807.2584 - tps: 21163.15346 + dps: 30016.18983 + tps: 21311.49478 } } dps_results: { key: "TestCombat-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 29159.85166 - tps: 20703.49468 + dps: 29329.3065 + tps: 20823.80762 } } dps_results: { key: "TestCombat-AllItems-CoreofRipeness-58184" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50349" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CrecheoftheFinalDragon-77205" value: { - dps: 29347.72105 - tps: 20836.88195 + dps: 29512.05153 + tps: 20953.55658 } } dps_results: { key: "TestCombat-AllItems-CrecheoftheFinalDragon-77972" value: { - dps: 29171.11794 - tps: 20711.49373 + dps: 29332.07 + tps: 20825.7697 } } dps_results: { key: "TestCombat-AllItems-CrecheoftheFinalDragon-77992" value: { - dps: 29538.20041 - tps: 20972.12229 + dps: 29708.05956 + tps: 21092.72229 } } dps_results: { key: "TestCombat-AllItems-CrushingWeight-59506" value: { - dps: 28887.66616 - tps: 20510.24297 + dps: 29138.47471 + tps: 20688.31705 } } dps_results: { key: "TestCombat-AllItems-CrushingWeight-65118" value: { - dps: 29161.11143 - tps: 20704.38911 + dps: 29334.10638 + tps: 20827.21553 } } dps_results: { key: "TestCombat-AllItems-CunningoftheCruel-77208" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CunningoftheCruel-77980" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-CunningoftheCruel-78000" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 29183.4467 - tps: 20720.24716 + dps: 29270.36917 + tps: 20781.96211 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 29948.16638 - tps: 21263.19813 + dps: 30043.41305 + tps: 21330.82327 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 28283.79907 - tps: 20081.49734 + dps: 28583.21339 + tps: 20294.0815 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50363" value: { - dps: 28648.31399 - tps: 20340.30293 + dps: 28921.45684 + tps: 20534.23436 } } dps_results: { key: "TestCombat-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 29452.09996 - tps: 20910.99097 + dps: 29657.30191 + tps: 21056.68436 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50348" value: { - dps: 28146.00994 - tps: 19983.66706 + dps: 28414.26996 + tps: 20174.13167 } } dps_results: { key: "TestCombat-AllItems-Dwyer'sCaber-70141" value: { - dps: 28868.7145 - tps: 20496.78729 + dps: 28999.22491 + tps: 20589.44968 } } dps_results: { key: "TestCombat-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-EmberShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 29452.09996 - tps: 20910.99097 + dps: 29657.30191 + tps: 21056.68436 } } dps_results: { key: "TestCombat-AllItems-EssenceoftheCyclone-59473" value: { - dps: 29572.54144 - tps: 20996.50443 + dps: 29761.76718 + tps: 21130.8547 } } dps_results: { key: "TestCombat-AllItems-EssenceoftheCyclone-65140" value: { - dps: 29797.30082 - tps: 21156.08358 + dps: 29967.62855 + tps: 21277.01627 } } dps_results: { key: "TestCombat-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 28872.691 - tps: 20499.61061 + dps: 29195.80443 + tps: 20729.02115 } } dps_results: { key: "TestCombat-AllItems-EternalShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-EyeofUnmaking-77200" value: { - dps: 29189.66767 - tps: 20724.66404 + dps: 29354.02632 + tps: 20841.35869 } } dps_results: { key: "TestCombat-AllItems-EyeofUnmaking-77977" value: { - dps: 29036.80514 - tps: 20616.13165 + dps: 29200.3818 + tps: 20732.27108 } } dps_results: { key: "TestCombat-AllItems-EyeofUnmaking-77997" value: { - dps: 29357.81645 - tps: 20844.04968 + dps: 29523.0353 + tps: 20961.35506 } } dps_results: { key: "TestCombat-AllItems-FallofMortality-59500" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-FallofMortality-65124" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 + } +} +dps_results: { + key: "TestCombat-AllItems-FangsoftheFather" + value: { + dps: 33628.06003 + tps: 23875.92262 + } +} +dps_results: { + key: "TestCombat-AllItems-Fear-77945" + value: { + dps: 29427.67104 + tps: 20893.64644 } } dps_results: { key: "TestCombat-AllItems-FieryQuintessence-69000" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Figurine-DemonPanther-52199" value: { - dps: 29708.31702 - tps: 21092.90508 + dps: 29727.66485 + tps: 21106.64204 } } dps_results: { key: "TestCombat-AllItems-Figurine-DreamOwl-52354" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Figurine-KingofBoars-52351" value: { - dps: 28717.75338 - tps: 20389.6049 + dps: 28986.31031 + tps: 20580.28032 } } dps_results: { key: "TestCombat-AllItems-FireoftheDeep-77117" value: { - dps: 28640.7683 - tps: 20334.94549 + dps: 28842.74684 + tps: 20478.35025 } } dps_results: { key: "TestCombat-AllItems-FireoftheDeep-77988" value: { - dps: 28426.9263 - tps: 20183.11768 + dps: 28713.71067 + tps: 20386.73458 } } dps_results: { key: "TestCombat-AllItems-FireoftheDeep-78008" value: { - dps: 28673.52444 - tps: 20358.20236 + dps: 28974.62888 + tps: 20571.9865 } } dps_results: { key: "TestCombat-AllItems-FleetShadowspiritDiamond" value: { - dps: 29578.02233 - tps: 21000.39586 + dps: 29608.31277 + tps: 21021.90206 } } dps_results: { key: "TestCombat-AllItems-ForlornShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-FoulGiftoftheDemonLord-72898" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-FuryofAngerforge-59461" value: { - dps: 28790.98821 - tps: 20441.60163 + dps: 28945.65928 + tps: 20551.41809 } } dps_results: { key: "TestCombat-AllItems-GaleofShadows-56138" value: { - dps: 28250.03858 - tps: 20057.52739 + dps: 28576.66467 + tps: 20289.43192 } } dps_results: { key: "TestCombat-AllItems-GaleofShadows-56462" value: { - dps: 28314.01337 - tps: 20102.94949 + dps: 28506.20318 + tps: 20239.40426 } } dps_results: { key: "TestCombat-AllItems-GearDetector-61462" value: { - dps: 28828.06229 - tps: 20467.92423 + dps: 29131.03821 + tps: 20683.03713 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 24027.86941 - tps: 17059.78728 + dps: 23846.16222 + tps: 16930.77518 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54589" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 + } +} +dps_results: { + key: "TestCombat-AllItems-Golad,TwilightofAspects-77949" + value: { + dps: 30592.76127 + tps: 21720.8605 } } dps_results: { key: "TestCombat-AllItems-GraceoftheHerald-55266" value: { - dps: 28728.30395 - tps: 20397.09581 + dps: 28907.13289 + tps: 20524.06435 } } dps_results: { key: "TestCombat-AllItems-GraceoftheHerald-56295" value: { - dps: 29155.55856 - tps: 20700.44658 + dps: 29350.28671 + tps: 20838.70356 } } dps_results: { key: "TestCombat-AllItems-HarmlightToken-63839" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 28526.39455 - tps: 20253.74013 + dps: 28662.33662 + tps: 20350.259 } } dps_results: { key: "TestCombat-AllItems-HeartofIgnacious-59514" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-HeartofIgnacious-65110" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-HeartofRage-59224" value: { - dps: 28478.16373 - tps: 20219.49625 + dps: 28768.2263 + tps: 20425.44067 } } dps_results: { key: "TestCombat-AllItems-HeartofRage-65072" value: { - dps: 28557.50402 - tps: 20275.82785 + dps: 28852.88822 + tps: 20485.55064 } } dps_results: { key: "TestCombat-AllItems-HeartofSolace-55868" value: { - dps: 28751.81201 - tps: 20413.78653 + dps: 29080.1748 + tps: 20646.92411 } } dps_results: { key: "TestCombat-AllItems-HeartofSolace-56393" value: { - dps: 28882.71576 - tps: 20506.72819 + dps: 29075.8494 + tps: 20643.85308 } } dps_results: { key: "TestCombat-AllItems-HeartofThunder-55845" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-HeartofThunder-56370" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-HeartoftheVile-66969" value: { - dps: 28858.00083 - tps: 20489.18059 + dps: 29042.26987 + tps: 20620.01161 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-50641" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 29452.09996 - tps: 20910.99097 + dps: 29657.30191 + tps: 21056.68436 } } dps_results: { key: "TestCombat-AllItems-ImpatienceofYouth-62464" value: { - dps: 28809.6783 - tps: 20454.8716 + dps: 29128.58065 + tps: 20681.29226 } } dps_results: { key: "TestCombat-AllItems-ImpatienceofYouth-62469" value: { - dps: 28809.6783 - tps: 20454.8716 + dps: 29128.58065 + tps: 20681.29226 } } dps_results: { key: "TestCombat-AllItems-ImpetuousQuery-55881" value: { - dps: 28338.38692 - tps: 20120.25471 + dps: 28368.21524 + tps: 20141.43282 } } dps_results: { key: "TestCombat-AllItems-ImpetuousQuery-56406" value: { - dps: 28252.39486 - tps: 20059.20035 + dps: 28511.34283 + tps: 20243.05341 } } dps_results: { key: "TestCombat-AllItems-IndomitablePride-77211" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-IndomitablePride-77983" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-IndomitablePride-78003" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-InsigniaoftheCorruptedMind-77203" value: { - dps: 28736.76738 - tps: 20403.10484 + dps: 28944.40108 + tps: 20550.52476 } } dps_results: { key: "TestCombat-AllItems-InsigniaoftheCorruptedMind-77971" value: { - dps: 28527.27212 - tps: 20254.36321 + dps: 28865.64712 + tps: 20494.60945 } } dps_results: { key: "TestCombat-AllItems-InsigniaoftheCorruptedMind-77991" value: { - dps: 28887.30147 - tps: 20509.98404 + dps: 29138.29698 + tps: 20688.19086 } } dps_results: { key: "TestCombat-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 28212.20379 - tps: 20030.66469 + dps: 28328.27072 + tps: 20113.07221 } } dps_results: { key: "TestCombat-AllItems-JarofAncientRemedies-59354" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-JarofAncientRemedies-65029" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-JawsofDefeat-68926" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-JawsofDefeat-69111" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 + } +} +dps_results: { + key: "TestCombat-AllItems-JawsofRetribution" + value: { + dps: 29963.2902 + tps: 21273.93604 } } dps_results: { key: "TestCombat-AllItems-JujuofNimbleness-63840" value: { - dps: 29444.99449 - tps: 20905.94609 + dps: 29420.25676 + tps: 20888.3823 } } dps_results: { key: "TestCombat-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 29457.46737 - tps: 20914.80183 + dps: 29580.91081 + tps: 21002.44667 } } dps_results: { key: "TestCombat-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 30061.5578 - tps: 21343.70604 + dps: 30019.22241 + tps: 21313.64791 } } dps_results: { key: "TestCombat-AllItems-KiroptyricSigil-77113" value: { - dps: 30863.97899 - tps: 21913.42508 + dps: 31164.43297 + tps: 22126.74741 } } dps_results: { key: "TestCombat-AllItems-KiroptyricSigil-77984" value: { - dps: 30585.89936 - tps: 21715.98854 + dps: 30858.7206 + tps: 21909.69163 } } dps_results: { key: "TestCombat-AllItems-KiroptyricSigil-78004" value: { - dps: 31423.8554 - tps: 22310.93733 + dps: 31742.82321 + tps: 22537.40448 } } dps_results: { key: "TestCombat-AllItems-KvaldirBattleStandard-59685" value: { - dps: 28363.43667 - tps: 20138.04004 + dps: 28666.65777 + tps: 20353.32702 } } dps_results: { key: "TestCombat-AllItems-KvaldirBattleStandard-59689" value: { - dps: 28363.43667 - tps: 20138.04004 + dps: 28666.65777 + tps: 20353.32702 } } dps_results: { key: "TestCombat-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 28049.25254 - tps: 19914.9693 + dps: 28296.4682 + tps: 20090.49242 } } dps_results: { key: "TestCombat-AllItems-LastWord-50708" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-LeadenDespair-55816" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-LeadenDespair-56347" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-LeftEyeofRajh-56102" value: { - dps: 29049.29884 - tps: 20625.00218 + dps: 29362.67147 + tps: 20847.49674 } } dps_results: { key: "TestCombat-AllItems-LeftEyeofRajh-56427" value: { - dps: 29211.80548 - tps: 20740.38189 + dps: 29517.29526 + tps: 20957.27963 } } dps_results: { key: "TestCombat-AllItems-LicensetoSlay-58180" value: { - dps: 29145.67712 - tps: 20693.43075 + dps: 29175.10887 + tps: 20714.3273 } } dps_results: { key: "TestCombat-AllItems-MagnetiteMirror-55814" value: { - dps: 28246.76441 - tps: 20055.20273 + dps: 28521.76388 + tps: 20250.45236 } } dps_results: { key: "TestCombat-AllItems-MagnetiteMirror-56345" value: { - dps: 28377.74156 - tps: 20148.19651 + dps: 28649.52852 + tps: 20341.16525 } } dps_results: { key: "TestCombat-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-MarkofKhardros-56132" value: { - dps: 28710.87862 - tps: 20384.72382 + dps: 28949.50061 + tps: 20554.14543 } } dps_results: { key: "TestCombat-AllItems-MarkofKhardros-56458" value: { - dps: 28882.55846 - tps: 20506.61651 + dps: 29085.72098 + tps: 20650.8619 } } dps_results: { key: "TestCombat-AllItems-MatrixRestabilizer-68994" value: { - dps: 30287.74802 - tps: 21504.30109 + dps: 30387.47883 + tps: 21575.10997 } } dps_results: { key: "TestCombat-AllItems-MatrixRestabilizer-69150" value: { - dps: 30428.26265 - tps: 21604.06648 + dps: 30911.77932 + tps: 21947.36332 + } +} +dps_results: { + key: "TestCombat-AllItems-MawofOblivion" + value: { + dps: 31116.69061 + tps: 22092.85033 } } dps_results: { key: "TestCombat-AllItems-MightoftheOcean-55251" value: { - dps: 28522.92352 - tps: 20251.2757 + dps: 28635.25371 + tps: 20331.03013 } } dps_results: { key: "TestCombat-AllItems-MightoftheOcean-56285" value: { - dps: 29017.551 - tps: 20602.46121 + dps: 28968.04675 + tps: 20567.3132 } } dps_results: { key: "TestCombat-AllItems-MirrorofBrokenImages-62466" value: { - dps: 28283.79907 - tps: 20081.49734 + dps: 28583.21339 + tps: 20294.0815 } } dps_results: { key: "TestCombat-AllItems-MirrorofBrokenImages-62471" value: { - dps: 28283.79907 - tps: 20081.49734 + dps: 28583.21339 + tps: 20294.0815 } } dps_results: { key: "TestCombat-AllItems-MithrilStopwatch-232013" value: { - dps: 28179.32968 - tps: 20007.32407 + dps: 28343.60423 + tps: 20123.959 } } dps_results: { key: "TestCombat-AllItems-MoonwellChalice-70142" value: { - dps: 28485.43111 - tps: 20224.65609 + dps: 28625.61224 + tps: 20324.18469 } } dps_results: { key: "TestCombat-AllItems-MoonwellPhial-70143" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-NecromanticFocus-68982" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-NecromanticFocus-69139" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-No'Kaled,theElementsofDeath-77188" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-No'Kaled,theElementsofDeath-78472" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-No'Kaled,theElementsofDeath-78481" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-Oremantle'sFavor-61448" value: { - dps: 28394.24592 - tps: 20159.9146 + dps: 28564.13558 + tps: 20280.53626 } } dps_results: { key: "TestCombat-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 28034.21437 - tps: 19904.29221 + dps: 28204.07678 + tps: 20024.89451 } } dps_results: { key: "TestCombat-AllItems-PorcelainCrab-55237" value: { - dps: 28097.08353 - tps: 19948.9293 + dps: 28351.97575 + tps: 20129.90278 } } dps_results: { key: "TestCombat-AllItems-PorcelainCrab-56280" value: { - dps: 28520.06747 - tps: 20249.2479 + dps: 28676.96227 + tps: 20360.64321 } } dps_results: { key: "TestCombat-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 29404.04577 - tps: 20876.8725 + dps: 29591.62235 + tps: 21010.05187 } } dps_results: { key: "TestCombat-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 29707.9032 - tps: 21092.61128 + dps: 29933.64844 + tps: 21252.89039 } } dps_results: { key: "TestCombat-AllItems-Rainsong-55854" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Rainsong-56377" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Rathrak,thePoisonousMind-77195" value: { - dps: 26458.18014 - tps: 18785.3079 + dps: 26397.23098 + tps: 18742.03399 } } dps_results: { key: "TestCombat-AllItems-Rathrak,thePoisonousMind-78475" value: { - dps: 26886.90573 - tps: 19089.70307 + dps: 26826.75774 + tps: 19046.99799 } } dps_results: { key: "TestCombat-AllItems-Rathrak,thePoisonousMind-78484" value: { - dps: 26077.27247 - tps: 18514.86345 + dps: 26015.61022 + tps: 18471.08326 } } dps_results: { key: "TestCombat-AllItems-ReflectionoftheLight-77115" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ReflectionoftheLight-77986" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ReflectionoftheLight-78006" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ResolveofUndying-77201" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ResolveofUndying-77978" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ResolveofUndying-77998" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 29841.47797 - tps: 21187.44936 + dps: 30032.30425 + tps: 21322.93602 } } dps_results: { key: "TestCombat-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 29756.19126 - tps: 21126.89579 + dps: 29946.42625 + tps: 21261.96264 } } dps_results: { key: "TestCombat-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 29608.37624 - tps: 21021.94713 + dps: 29792.08826 + tps: 21152.38266 } } dps_results: { key: "TestCombat-AllItems-RightEyeofRajh-56100" value: { - dps: 28870.98937 - tps: 20498.40245 + dps: 28911.92878 + tps: 20527.46943 } } dps_results: { key: "TestCombat-AllItems-RightEyeofRajh-56431" value: { - dps: 29055.31213 - tps: 20629.27161 + dps: 28987.89243 + tps: 20581.40362 } } dps_results: { key: "TestCombat-AllItems-RosaryofLight-72901" value: { - dps: 28985.5997 - tps: 20579.77579 + dps: 29125.58951 + tps: 20679.16855 } } dps_results: { key: "TestCombat-AllItems-RottingSkull-77116" value: { - dps: 29267.53375 - tps: 20779.94896 + dps: 29380.05634 + tps: 20859.84 } } dps_results: { key: "TestCombat-AllItems-RottingSkull-77987" value: { - dps: 29087.29464 - tps: 20651.97919 + dps: 29230.69371 + tps: 20753.79253 } } dps_results: { key: "TestCombat-AllItems-RottingSkull-78007" value: { - dps: 29458.38369 - tps: 20915.45242 + dps: 29568.94456 + tps: 20993.95064 } } dps_results: { key: "TestCombat-AllItems-RuneofZeth-68998" value: { - dps: 28279.77038 - tps: 20078.63697 + dps: 28437.33292 + tps: 20190.50637 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofConquest-70399" value: { - dps: 29567.50966 - tps: 20992.93186 + dps: 29792.09259 + tps: 21152.38574 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofConquest-72304" value: { - dps: 29660.54823 - tps: 21058.98925 + dps: 29891.70838 + tps: 21223.11295 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofDominance-70401" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofDominance-72448" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofVictory-70400" value: { - dps: 28493.58795 - tps: 20230.44745 + dps: 28675.12841 + tps: 20359.34117 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sBadgeofVictory-72450" value: { - dps: 28530.37835 - tps: 20256.56863 + dps: 28713.28267 + tps: 20386.4307 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" value: { - dps: 29823.5389 - tps: 21174.71262 + dps: 29971.71579 + tps: 21279.91821 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" value: { - dps: 29904.6229 - tps: 21232.28226 + dps: 30073.88433 + tps: 21352.45787 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" value: { - dps: 28583.83273 - tps: 20294.52124 + dps: 28765.96873 + tps: 20423.8378 } } dps_results: { key: "TestCombat-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" value: { - dps: 28639.6684 - tps: 20334.16457 + dps: 28818.20115 + tps: 20460.92282 } } dps_results: { key: "TestCombat-AllItems-ScalesofLife-68915" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 hps: 291.12785 } } dps_results: { key: "TestCombat-AllItems-ScalesofLife-69109" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 hps: 328.38949 } } dps_results: { key: "TestCombat-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 29094.85451 - tps: 20657.3467 + dps: 29232.49954 + tps: 20755.07467 } } dps_results: { key: "TestCombat-AllItems-SeaStar-55256" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-SeaStar-56290" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ShardofWoe-60233" value: { - dps: 28347.63487 - tps: 20126.82076 + dps: 28567.23784 + tps: 20282.73887 } } dps_results: { key: "TestCombat-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 28618.35284 - tps: 20319.03051 + dps: 28906.52944 + tps: 20523.6359 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Skardyn'sGrace-56115" value: { - dps: 29270.62992 - tps: 20782.14724 + dps: 29504.71434 + tps: 20948.34718 } } dps_results: { key: "TestCombat-AllItems-Skardyn'sGrace-56440" value: { - dps: 29521.93788 - tps: 20960.5759 + dps: 29696.11273 + tps: 21084.24004 } } dps_results: { key: "TestCombat-AllItems-Sorrowsong-55879" value: { - dps: 28338.38692 - tps: 20120.25471 + dps: 28368.21524 + tps: 20141.43282 } } dps_results: { key: "TestCombat-AllItems-Sorrowsong-56400" value: { - dps: 28252.39486 - tps: 20059.20035 + dps: 28511.34283 + tps: 20243.05341 } } dps_results: { key: "TestCombat-AllItems-Soul'sAnguish-66994" value: { - dps: 28672.03084 - tps: 20357.1419 + dps: 28712.91497 + tps: 20386.16963 } } dps_results: { key: "TestCombat-AllItems-SoulCasket-58183" value: { - dps: 28283.79907 - tps: 20081.49734 + dps: 28583.21339 + tps: 20294.0815 } } dps_results: { key: "TestCombat-AllItems-Souldrinker-77193" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-Souldrinker-78479" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-Souldrinker-78488" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-AllItems-SoulshifterVortex-77206" value: { - dps: 28856.66385 - tps: 20488.23133 + dps: 29070.22025 + tps: 20639.85638 } } dps_results: { key: "TestCombat-AllItems-SoulshifterVortex-77970" value: { - dps: 28693.46937 - tps: 20372.36325 + dps: 29060.90203 + tps: 20633.24044 } } dps_results: { key: "TestCombat-AllItems-SoulshifterVortex-77990" value: { - dps: 29064.64092 - tps: 20635.89506 + dps: 29316.86485 + tps: 20814.97405 } } dps_results: { key: "TestCombat-AllItems-SpidersilkSpindle-68981" value: { - dps: 28368.2538 - tps: 20141.4602 + dps: 28678.17434 + tps: 20361.50378 } } dps_results: { key: "TestCombat-AllItems-SpidersilkSpindle-69138" value: { - dps: 28562.56388 - tps: 20279.42036 + dps: 28724.91824 + tps: 20394.69195 } } dps_results: { key: "TestCombat-AllItems-StarcatcherCompass-77202" value: { - dps: 30561.88129 - tps: 21698.93571 + dps: 30844.65596 + tps: 21899.70573 } } dps_results: { key: "TestCombat-AllItems-StarcatcherCompass-77973" value: { - dps: 30299.39064 - tps: 21512.56736 + dps: 30472.52745 + tps: 21635.49449 } } dps_results: { key: "TestCombat-AllItems-StarcatcherCompass-77993" value: { - dps: 30922.54872 - tps: 21955.00959 + dps: 31287.20825 + tps: 22213.91786 } } dps_results: { key: "TestCombat-AllItems-StayofExecution-68996" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Stonemother'sKiss-61411" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-StumpofTime-62465" value: { - dps: 28549.74701 - tps: 20270.32038 + dps: 28578.55681 + tps: 20290.77534 } } dps_results: { key: "TestCombat-AllItems-StumpofTime-62470" value: { - dps: 28549.74701 - tps: 20270.32038 + dps: 28578.55681 + tps: 20290.77534 } } dps_results: { key: "TestCombat-AllItems-SymbioticWorm-59332" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-SymbioticWorm-65048" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 28561.19618 - tps: 20278.44929 + dps: 28942.52573 + tps: 20549.19327 } } dps_results: { key: "TestCombat-AllItems-TearofBlood-55819" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-TearofBlood-56351" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 28294.92866 - tps: 20089.39935 + dps: 28363.74137 + tps: 20138.25637 } } dps_results: { key: "TestCombat-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 28252.39486 - tps: 20059.20035 + dps: 28511.34283 + tps: 20243.05341 } } dps_results: { key: "TestCombat-AllItems-TheHungerer-68927" value: { - dps: 29969.95407 - tps: 21278.66739 + dps: 30223.16812 + tps: 21458.44937 } } dps_results: { key: "TestCombat-AllItems-TheHungerer-69112" value: { - dps: 30178.65715 - tps: 21426.84658 + dps: 30516.1309 + tps: 21666.45294 + } +} +dps_results: { + key: "TestCombat-AllItems-TheSleeper-77947" + value: { + dps: 29981.1602 + tps: 21286.62374 } } dps_results: { key: "TestCombat-AllItems-Theralion'sMirror-59519" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Theralion'sMirror-65105" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Throngus'sFinger-56121" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Throngus'sFinger-56449" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Tia'sGrace-55874" value: { - dps: 29530.13028 - tps: 20966.3925 + dps: 29537.16835 + tps: 20971.38953 } } dps_results: { key: "TestCombat-AllItems-Tia'sGrace-56394" value: { - dps: 29583.71703 - tps: 21004.43909 + dps: 29859.48109 + tps: 21200.23157 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 29285.87687 - tps: 20792.97258 + dps: 29508.66062 + tps: 20951.14904 } } dps_results: { key: "TestCombat-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 27825.27267 - tps: 19755.9436 + dps: 27993.7916 + tps: 19875.59203 } } dps_results: { key: "TestCombat-AllItems-UnheededWarning-59520" value: { - dps: 29679.68129 - tps: 21072.57371 + dps: 29857.60275 + tps: 21198.89795 } } dps_results: { key: "TestCombat-AllItems-UnquenchableFlame-67101" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-UnsolvableRiddle-62463" value: { - dps: 29683.83359 - tps: 21075.52185 + dps: 30001.0834 + tps: 21300.76922 } } dps_results: { key: "TestCombat-AllItems-UnsolvableRiddle-62468" value: { - dps: 29683.83359 - tps: 21075.52185 + dps: 30001.0834 + tps: 21300.76922 } } dps_results: { key: "TestCombat-AllItems-UnsolvableRiddle-68709" value: { - dps: 29683.83359 - tps: 21075.52185 + dps: 30001.0834 + tps: 21300.76922 } } dps_results: { key: "TestCombat-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 26384.95042 - tps: 18733.3148 + dps: 26341.67825 + tps: 18702.59156 } } dps_results: { key: "TestCombat-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-Varo'then'sBrooch-72899" value: { - dps: 29223.34962 - tps: 20748.57823 + dps: 29592.34057 + tps: 21010.56181 } } dps_results: { key: "TestCombat-AllItems-VeilofLies-72900" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-VesselofAcceleration-68995" value: { - dps: 28951.98808 - tps: 20555.91154 + dps: 29113.24502 + tps: 20670.40396 } } dps_results: { key: "TestCombat-AllItems-VesselofAcceleration-69167" value: { - dps: 29105.27333 - tps: 20664.74406 + dps: 29237.68009 + tps: 20758.75286 } } dps_results: { key: "TestCombat-AllItems-VestmentsoftheDarkPhoenix" value: { - dps: 29492.11673 - tps: 20939.40288 + dps: 29608.83273 + tps: 21022.27124 } } dps_results: { key: "TestCombat-AllItems-VialofShadows-77207" value: { - dps: 30301.61527 - tps: 21514.14684 + dps: 30338.68823 + tps: 21540.46864 } } dps_results: { key: "TestCombat-AllItems-VialofShadows-77979" value: { - dps: 30042.27123 - tps: 21330.01258 + dps: 30058.48174 + tps: 21341.52204 } } dps_results: { key: "TestCombat-AllItems-VialofShadows-77999" value: { - dps: 30606.08551 - tps: 21730.32071 + dps: 30645.83379 + tps: 21758.54199 } } dps_results: { key: "TestCombat-AllItems-VialofStolenMemories-59515" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-VialofStolenMemories-65109" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 29194.53465 - tps: 20728.1196 + dps: 29401.45574 + tps: 20875.03358 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofConquest-70517" value: { - dps: 29353.66721 - tps: 20841.10372 + dps: 29574.56273 + tps: 20997.93954 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofDominance-70518" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 28357.94337 - tps: 20134.13979 + dps: 28534.45531 + tps: 20259.46327 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sBadgeofVictory-70519" value: { - dps: 28418.40758 - tps: 20177.06938 + dps: 28597.16101 + tps: 20303.98431 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28575.31004 - tps: 20288.47013 + dps: 28602.81158 + tps: 20307.99622 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 28328.90083 - tps: 20113.51959 + dps: 28775.70675 + tps: 20430.75179 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 28224.48438 - tps: 20039.38391 + dps: 28387.647 + tps: 20155.22937 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28129.34393 + tps: 19971.83419 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 28336.40695 - tps: 20118.84894 + dps: 28661.83939 + tps: 20349.90597 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 29398.75794 - tps: 20873.11814 + dps: 29549.74083 + tps: 20980.31599 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofConquest-70577" value: { - dps: 29568.95471 - tps: 20993.95785 + dps: 29734.22951 + tps: 21111.30295 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofDominance-70578" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 28430.90655 - tps: 20185.94365 + dps: 28599.92032 + tps: 20305.94343 } } dps_results: { key: "TestCombat-AllItems-ViciousGladiator'sInsigniaofVictory-70579" value: { - dps: 28509.88053 - tps: 20242.01518 + dps: 28678.66555 + tps: 20361.85254 } } dps_results: { key: "TestCombat-AllItems-Vishanka,JawsoftheEarth-78359" value: { - dps: 29914.56723 - tps: 21239.34273 + dps: 30108.09834 + tps: 21376.74982 } } dps_results: { key: "TestCombat-AllItems-Vishanka,JawsoftheEarth-78471" value: { - dps: 29997.61218 - tps: 21298.30464 + dps: 30203.54655 + tps: 21444.51805 } } dps_results: { key: "TestCombat-AllItems-Vishanka,JawsoftheEarth-78480" value: { - dps: 29846.7949 - tps: 21191.22438 + dps: 30038.26539 + tps: 21327.16842 } } dps_results: { key: "TestCombat-AllItems-WillofUnbinding-77198" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-WillofUnbinding-77975" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-WillofUnbinding-77995" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-WindDancer'sRegalia" value: { - dps: 26802.54468 - tps: 19029.80672 + dps: 26872.04855 + tps: 19079.15447 } } dps_results: { key: "TestCombat-AllItems-WitchingHourglass-55787" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-WitchingHourglass-56320" value: { - dps: 27844.47743 - tps: 19769.57898 + dps: 28001.95453 + tps: 19881.38772 } } dps_results: { key: "TestCombat-AllItems-World-QuellerFocus-63842" value: { - dps: 28355.91393 - tps: 20132.69889 + dps: 28359.52594 + tps: 20135.26342 } } dps_results: { key: "TestCombat-AllItems-WrathofUnchaining-77197" value: { - dps: 31320.99153 - tps: 22237.90399 + dps: 31459.65751 + tps: 22336.35683 } } dps_results: { key: "TestCombat-AllItems-WrathofUnchaining-77974" value: { - dps: 30914.31168 - tps: 21949.16129 + dps: 31055.45416 + tps: 22049.37246 } } dps_results: { key: "TestCombat-AllItems-WrathofUnchaining-77994" value: { - dps: 31751.18097 - tps: 22543.33849 + dps: 31897.1742 + tps: 22646.99368 } } dps_results: { key: "TestCombat-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 28295.09951 - tps: 20089.52065 + dps: 28435.39598 + tps: 20189.13114 } } dps_results: { key: "TestCombat-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 28295.09951 - tps: 20089.52065 + dps: 28435.39598 + tps: 20189.13114 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 29961.4452 - tps: 21272.62609 + dps: 30112.54056 + tps: 21379.9038 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29644.29668 - tps: 21047.45064 + dps: 29882.24948 + tps: 21216.39713 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29966.48987 - tps: 21276.20781 + dps: 30156.67815 + tps: 21411.24149 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 36498.48675 - tps: 25913.92559 + dps: 36588.9866 + tps: 25978.18049 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17005.30188 - tps: 12073.76433 + dps: 17050.10833 + tps: 12105.57692 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17139.83185 - tps: 12169.28061 + dps: 17211.4354 + tps: 12220.11914 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17099.96269 - tps: 12140.97351 + dps: 17189.01358 + tps: 12204.19964 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 25931.64521 - tps: 18411.4681 + dps: 25962.40978 + tps: 18433.31094 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 25855.20177 - tps: 18357.19326 + dps: 25888.53227 + tps: 18380.85791 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31529.83275 - tps: 22386.18125 + dps: 31501.42247 + tps: 22366.00995 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15079.51299 - tps: 10706.45422 + dps: 15031.42022 + tps: 10672.30836 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15005.85984 - tps: 10654.16049 + dps: 14959.9265 + tps: 10621.54781 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14985.51255 - tps: 10639.71391 + dps: 15011.74375 + tps: 10658.33806 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28697.04464 - tps: 20374.9017 + dps: 28868.39014 + tps: 20496.557 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28965.41445 - tps: 20565.44426 + dps: 29110.93188 + tps: 20668.76163 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 35176.69468 - tps: 24975.45323 + dps: 35291.51557 + tps: 25056.97606 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16537.25605 - tps: 11741.4518 + dps: 16545.291 + tps: 11747.15661 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16661.95292 - tps: 11829.98658 + dps: 16665.44088 + tps: 11832.46303 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 16509.09509 - tps: 11721.45752 + dps: 16591.64005 + tps: 11780.06444 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 26977.34385 - tps: 19153.91413 + dps: 27122.5906 + tps: 19257.03933 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27293.5097 - tps: 19378.39188 + dps: 27414.30112 + tps: 19464.15379 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 33816.95116 - tps: 24010.03532 + dps: 33968.62615 + tps: 24117.72457 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14923.80918 - tps: 10595.90452 + dps: 14957.96439 + tps: 10620.15472 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15047.23666 - tps: 10683.53803 + dps: 15072.6503 + tps: 10701.58171 } } dps_results: { key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15175.21444 - tps: 10774.40225 + dps: 15261.46226 + tps: 10835.6382 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37734.68665 - tps: 26791.62752 + dps: 38000.46776 + tps: 26980.33211 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 38083.75856 - tps: 27039.46858 + dps: 38380.88409 + tps: 27250.4277 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 45856.7902 - tps: 32558.32104 + dps: 45939.63665 + tps: 32617.14202 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21868.83996 - tps: 15526.87637 + dps: 21984.23943 + tps: 15608.81 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22070.31283 - tps: 15669.92211 + dps: 22143.03498 + tps: 15721.55484 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22407.13367 - tps: 15909.0649 + dps: 22559.10713 + tps: 16016.96606 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 33343.26233 - tps: 23673.71626 + dps: 33463.48548 + tps: 23759.07469 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 33262.77134 - tps: 23616.56765 + dps: 33477.35054 + tps: 23768.91888 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40024.45194 - tps: 28417.36088 + dps: 40119.19857 + tps: 28484.63098 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19553.40221 - tps: 13882.91557 + dps: 19620.12822 + tps: 13930.29104 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19447.90892 - tps: 13808.01534 + dps: 19561.62805 + tps: 13888.75592 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19822.11537 - tps: 14073.70192 + dps: 20007.39855 + tps: 14205.25297 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 36572.10774 - tps: 25966.1965 + dps: 36762.02124 + tps: 26101.03508 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 36898.34376 - tps: 26197.82407 + dps: 37125.90309 + tps: 26359.3912 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 44320.25709 - tps: 31467.38254 + dps: 44384.5274 + tps: 31513.01445 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21297.30349 - tps: 15121.08548 + dps: 21405.2518 + tps: 15197.72877 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21434.70456 - tps: 15218.64024 + dps: 21562.5713 + tps: 15309.42563 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 21687.90515 - tps: 15398.41266 + dps: 21929.36507 + tps: 15569.8492 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 34746.52279 - tps: 24670.03118 + dps: 35012.38836 + tps: 24858.79573 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 35219.38417 - tps: 25005.76276 + dps: 35411.79454 + tps: 25142.37412 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 43015.46258 - tps: 30540.97843 + dps: 43066.10362 + tps: 30576.93357 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19429.46188 - tps: 13794.91794 + dps: 19543.25766 + tps: 13875.71294 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19621.97002 - tps: 13931.59872 + dps: 19718.2986 + tps: 13999.992 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20089.29345 - tps: 14263.39835 + dps: 20292.55681 + tps: 14407.71533 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29408.18836 - tps: 20879.81373 + dps: 53050.26594 + tps: 37665.68882 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29760.01161 - tps: 21129.60824 + dps: 53483.10592 + tps: 37973.0052 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 36392.11724 - tps: 25838.40324 + dps: 61415.21065 + tps: 43604.79956 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16633.83965 - tps: 11810.02615 + dps: 31594.08807 + tps: 22431.80253 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16792.66754 - tps: 11922.79396 + dps: 31861.46471 + tps: 22621.63994 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 16717.824 - tps: 11869.65504 + dps: 31305.65224 + tps: 22227.01309 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 25565.09821 - tps: 18151.21973 + dps: 47291.52185 + tps: 33576.98051 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 25499.48797 - tps: 18104.63646 + dps: 47160.61685 + tps: 33484.03797 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31206.54894 - tps: 22156.64975 + dps: 54049.67912 + tps: 38375.27217 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14625.95823 - tps: 10384.43035 + dps: 28529.58876 + tps: 20256.00802 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 14552.31333 - tps: 10332.14246 + dps: 28353.13763 + tps: 20130.72771 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14531.48939 - tps: 10317.35747 + dps: 27990.37516 + tps: 19873.16636 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28439.74024 - tps: 20192.21557 + dps: 52979.7404 + tps: 37615.61569 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28738.70249 - tps: 20404.47877 + dps: 53379.77655 + tps: 37899.64135 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 35003.63983 - tps: 24852.58428 + dps: 61308.01769 + tps: 43528.69256 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16150.10508 - tps: 11466.57461 + dps: 31655.02054 + tps: 22475.06458 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16279.09972 - tps: 11558.1608 + dps: 31855.43154 + tps: 22617.3564 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 16112.27012 - tps: 11439.71179 + dps: 31312.42513 + tps: 22231.82184 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 26717.96757 - tps: 18969.75697 + dps: 49052.90674 + tps: 34827.56378 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27053.66957 - tps: 19208.1054 + dps: 49521.81321 + tps: 35160.48738 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 33652.02918 - tps: 23892.94072 + dps: 57519.64892 + tps: 40838.95074 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14526.37357 - tps: 10313.72524 + dps: 28148.90711 + tps: 19985.72405 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 14646.21206 - tps: 10398.81057 + dps: 28374.61997 + tps: 20145.98018 } } dps_results: { - key: "TestCombat-Settings-Human-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Human-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14785.01206 - tps: 10497.35856 + dps: 28113.8273 + tps: 19960.81738 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29911.99172 - tps: 21237.51412 + dps: 30153.36198 + tps: 21408.88701 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30236.74089 - tps: 21468.08603 + dps: 30424.80614 + tps: 21601.61236 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37069.47266 - tps: 26319.32559 + dps: 36900.86635 + tps: 26199.61511 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17170.86328 - tps: 12191.31293 + dps: 17256.1623 + tps: 12251.87524 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17306.627 - tps: 12287.70517 + dps: 17425.72277 + tps: 12372.26316 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17433.64847 - tps: 12377.89041 + dps: 17453.99977 + tps: 12392.33983 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 26165.14181 - tps: 18577.25069 + dps: 26213.63927 + tps: 18611.68388 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 26086.41119 - tps: 18521.35194 + dps: 26132.12811 + tps: 18553.81096 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32025.88035 - tps: 22738.37505 + dps: 31768.82105 + tps: 22555.86295 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15225.84988 - tps: 10810.35341 + dps: 15203.4532 + tps: 10794.45177 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15149.55567 - tps: 10756.18452 + dps: 15143.18695 + tps: 10751.66273 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15277.69936 - tps: 10847.16654 + dps: 15236.25934 + tps: 10817.74413 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28955.45937 - tps: 20558.37615 + dps: 29088.70521 + tps: 20652.9807 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29224.64071 - tps: 20749.4949 + dps: 29357.03868 + tps: 20843.49746 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 35728.92765 - tps: 25367.53863 + dps: 35584.29734 + tps: 25264.85111 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16698.93547 - tps: 11856.24418 + dps: 16746.73165 + tps: 11890.17947 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16824.33749 - tps: 11945.27962 + dps: 16877.48046 + tps: 11983.01113 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 16831.22296 - tps: 11950.1683 + dps: 16844.51105 + tps: 11959.60284 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 27223.3743 - tps: 19328.59575 + dps: 27377.41283 + tps: 19437.96311 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27542.35452 - tps: 19555.07171 + dps: 27674.58991 + tps: 19648.95883 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 34366.10495 - tps: 24399.93451 + dps: 34276.20721 + tps: 24336.10712 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15069.12659 - tps: 10699.07988 + dps: 15130.95692 + tps: 10742.97941 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15192.8371 - tps: 10786.91434 + dps: 15257.48852 + tps: 10832.81685 } } dps_results: { key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15483.49802 - tps: 10993.2836 + dps: 15540.11958 + tps: 11033.4849 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 38047.91868 - tps: 27014.02226 + dps: 38307.04278 + tps: 27198.00038 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 38391.64269 - tps: 27258.06631 + dps: 38694.40337 + tps: 27473.02639 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 46477.49952 - tps: 32999.02466 + dps: 46554.04543 + tps: 33053.37225 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 22074.72935 - tps: 15673.05784 + dps: 22187.39856 + tps: 15753.05298 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22275.62251 - tps: 15815.69198 + dps: 22347.9868 + tps: 15867.07063 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22776.7037 - tps: 16171.45962 + dps: 22929.13235 + tps: 16279.68397 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 33619.33761 - tps: 23869.72971 + dps: 33728.04115 + tps: 23946.90922 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 33528.10615 - tps: 23804.95536 + dps: 33747.66215 + tps: 23960.84012 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40567.19155 - tps: 28802.706 + dps: 40657.14247 + tps: 28866.57116 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19735.24979 - tps: 14012.02735 + dps: 19799.45445 + tps: 14057.61266 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19627.08713 - tps: 13935.23186 + dps: 19738.53781 + tps: 14014.36184 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20148.24739 - tps: 14305.25564 + dps: 20333.94591 + tps: 14437.10159 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 36872.00952 - tps: 26179.12676 + dps: 37058.33819 + tps: 26311.42012 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 37194.99067 - tps: 26408.44338 + dps: 37426.73062 + tps: 26572.97874 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 44919.14907 - tps: 31892.59584 + dps: 44978.20715 + tps: 31934.52708 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21497.04163 - tps: 15262.89955 + dps: 21602.46767 + tps: 15337.75205 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21634.37099 - tps: 15360.4034 + dps: 21760.2115 + tps: 15449.75017 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22046.09355 - tps: 15652.72642 + dps: 22287.65519 + tps: 15824.23519 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 35034.77178 - tps: 24874.68797 + dps: 35291.49727 + tps: 25056.96306 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 35510.66376 - tps: 25212.57127 + dps: 35705.70735 + tps: 25351.05222 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 43618.23681 - tps: 30968.94813 + dps: 43662.75797 + tps: 31000.55816 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19613.36628 - tps: 13925.49006 + dps: 19726.33898 + tps: 14005.70068 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19805.82064 - tps: 14062.13265 + dps: 19902.07377 + tps: 14130.47238 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20433.35669 - tps: 14507.68325 + dps: 20637.46955 + tps: 14652.60338 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29667.04295 - tps: 21063.60049 + dps: 53389.61992 + tps: 37906.63014 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30044.98611 - tps: 21331.94014 + dps: 53824.66731 + tps: 38215.51379 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 36971.93748 - tps: 26250.07561 + dps: 62054.00421 + tps: 44058.34299 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16800.02215 - tps: 11928.01573 + dps: 31821.59516 + tps: 22593.33256 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16960.8449 - tps: 12042.19988 + dps: 32089.9671 + tps: 22783.87664 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17047.48555 - tps: 12103.71474 + dps: 31674.62247 + tps: 22488.98195 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 25789.26966 - tps: 18310.38146 + dps: 47589.68965 + tps: 33788.67965 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 25736.12225 - tps: 18272.6468 + dps: 47455.62482 + tps: 33693.49362 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31709.44129 - tps: 22513.70331 + dps: 54609.36493 + tps: 38772.6491 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14772.99424 - tps: 10488.82591 + dps: 28734.09635 + tps: 20401.20841 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 14698.23167 - tps: 10435.74449 + dps: 28553.80657 + tps: 20273.20266 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14819.39664 - tps: 10521.77162 + dps: 28320.4738 + tps: 20107.5364 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28687.52339 - tps: 20368.14161 + dps: 53316.64633 + tps: 37854.81889 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29007.4947 - tps: 20595.32124 + dps: 53719.09557 + tps: 38140.55785 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 35562.7441 - tps: 25249.54831 + dps: 61947.36168 + tps: 43982.62679 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16312.12748 - tps: 11581.61051 + dps: 31883.55731 + tps: 22637.32569 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16443.58025 - tps: 11674.94198 + dps: 32084.16242 + tps: 22779.75532 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 16432.0707 - tps: 11666.7702 + dps: 31683.41356 + tps: 22495.22363 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 26954.57825 - tps: 19137.75056 + dps: 49367.85121 + tps: 35051.17436 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27309.08043 - tps: 19389.44711 + dps: 49838.67186 + tps: 35385.45702 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 34210.14888 - tps: 24289.2057 + dps: 58131.74945 + tps: 41273.54211 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14674.07314 - tps: 10418.59193 + dps: 28354.39438 + tps: 20131.62001 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 14795.48641 - tps: 10504.79535 + dps: 28580.77925 + tps: 20292.35327 } } dps_results: { - key: "TestCombat-Settings-Orc-preraid_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p4_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15090.33126 - tps: 10714.1352 + dps: 28458.32202 + tps: 20205.40863 } } dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 28066.7604 - tps: 19927.39989 + dps: 28045.04854 + tps: 19911.98446 } } diff --git a/sim/rogue/combat/adrenaline_rush.go b/sim/rogue/combat/adrenaline_rush.go index 35dfbc5ce4..82a4e13c29 100644 --- a/sim/rogue/combat/adrenaline_rush.go +++ b/sim/rogue/combat/adrenaline_rush.go @@ -21,7 +21,8 @@ func (comRogue *CombatRogue) registerAdrenalineRushCD() { comRogue.AdrenalineRushAura = comRogue.RegisterAura(core.Aura{ Label: "Adrenaline Rush", ActionID: AdrenalineRushActionID, - Duration: core.TernaryDuration(comRogue.HasPrimeGlyph(proto.RoguePrimeGlyph_GlyphOfAdrenalineRush), time.Second*20, time.Second*15), + Duration: core.TernaryDuration(comRogue.HasPrimeGlyph(proto.RoguePrimeGlyph_GlyphOfAdrenalineRush), time.Second*20, time.Second*15) + + core.TernaryDuration(comRogue.HasSetBonus(rogue.Tier13, 4), time.Second*3, 0), OnGain: func(aura *core.Aura, sim *core.Simulation) { comRogue.ApplyAdditiveEnergyRegenBonus(sim, 1.0) comRogue.MultiplyMeleeSpeed(sim, speedBonus) diff --git a/sim/rogue/combat/combat.go b/sim/rogue/combat/combat.go index 2d0d8e81c6..baf7eaa139 100644 --- a/sim/rogue/combat/combat.go +++ b/sim/rogue/combat/combat.go @@ -38,8 +38,9 @@ func NewCombatRogue(character *core.Character, options *proto.Player) *CombatRog func (combatRogue *CombatRogue) Initialize() { combatRogue.Rogue.Initialize() - // Vitality Passive + // Ambidexterity Passive combatRogue.AutoAttacks.OHConfig().DamageMultiplier *= 1.75 + // Vitality Passive combatRogue.AdditiveEnergyRegenBonus += 0.25 combatRogue.MultiplyStat(stats.AttackPower, 1.3) @@ -51,7 +52,6 @@ func (combatRogue *CombatRogue) Initialize() { combatRogue.registerKillingSpreeCD() combatRogue.registerAdrenalineRushCD() - combatRogue.applyRestlessBlades() combatRogue.applyMastery() } @@ -73,10 +73,6 @@ func (combatRogue *CombatRogue) Reset(sim *core.Simulation) { combatRogue.mainGaucheAura.Activate(sim) - if combatRogue.Talents.RestlessBlades > 0 { - combatRogue.RestlessBladesAura.Activate(sim) - } - if combatRogue.Talents.BanditsGuile > 0 { combatRogue.BanditsGuileAura.Activate(sim) } diff --git a/sim/rogue/combat/combat_test.go b/sim/rogue/combat/combat_test.go index 65aafb8dc5..e5188852c7 100644 --- a/sim/rogue/combat/combat_test.go +++ b/sim/rogue/combat/combat_test.go @@ -20,8 +20,7 @@ func TestCombat(t *testing.T) { GearSet: core.GetGearSet("../../../ui/rogue/combat/gear_sets", "p1_combat"), OtherGearSets: []core.GearSetCombo{ core.GetGearSet("../../../ui/rogue/combat/gear_sets", "p3_combat"), - core.GetGearSet("../../../ui/rogue/combat/gear_sets", "preraid_combat"), - //core.GetGearSet("../../../ui/rogue/combat/gear_sets", "p4_combat"), + core.GetGearSet("../../../ui/rogue/combat/gear_sets", "p4_combat"), }, Talents: CombatTalents, Glyphs: CombatGlyphs, diff --git a/sim/rogue/combat/mastery.go b/sim/rogue/combat/mastery.go index e50ca45b31..681fb286da 100644 --- a/sim/rogue/combat/mastery.go +++ b/sim/rogue/combat/mastery.go @@ -13,7 +13,7 @@ func (comRogue *CombatRogue) applyMastery() { comRogue.mainGauche = comRogue.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 86392}, SpellSchool: core.SpellSchoolPhysical, - ProcMask: core.ProcMaskMeleeMHSpecial, // TODO Thebackstabi 3/20/2024 -- Validate if MG can proc things + ProcMask: core.ProcMaskMeleeMHSpecial, Flags: core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagPassiveSpell, ClassSpellMask: rogue.RogueSpellMainGauche, diff --git a/sim/rogue/combat/restless_blades.go b/sim/rogue/combat/restless_blades.go deleted file mode 100644 index bb69f706b8..0000000000 --- a/sim/rogue/combat/restless_blades.go +++ /dev/null @@ -1,35 +0,0 @@ -package combat - -import ( - "time" - - "github.com/wowsims/cata/sim/core" - "github.com/wowsims/cata/sim/rogue" -) - -func (comRogue *CombatRogue) applyRestlessBlades() { - if comRogue.Talents.RestlessBlades == 0 { - return - } - - comRogue.RestlessBladesAura = comRogue.RegisterAura(core.Aura{ - Label: "Restless Blades", - ActionID: core.ActionID{SpellID: 79096}, - Duration: core.NeverExpires, - - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell.Flags.Matches(rogue.SpellFlagFinisher) { - cdReduction := time.Duration(comRogue.Talents.RestlessBlades) * time.Second * time.Duration(comRogue.ComboPoints()) - - if comRogue.KillingSpree != nil { - ksNewTime := comRogue.KillingSpree.CD.Timer.ReadyAt() - cdReduction - comRogue.KillingSpree.CD.Timer.Set(ksNewTime) - } - if comRogue.AdrenalineRush != nil { - arNewTime := comRogue.AdrenalineRush.CD.Timer.ReadyAt() - cdReduction - comRogue.AdrenalineRush.CD.Timer.Set(arNewTime) - } - } - }, - }) -} diff --git a/sim/rogue/eviscerate.go b/sim/rogue/eviscerate.go index b450895a78..26caac8c75 100644 --- a/sim/rogue/eviscerate.go +++ b/sim/rogue/eviscerate.go @@ -62,7 +62,7 @@ func (rogue *Rogue) registerEviscerate() { damagePerComboPoint*comboPoints + apScalingPerComboPoint*comboPoints*spell.MeleeAttackPower() - result := spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit) + result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit) if result.Landed() { rogue.ApplyFinisher(sim, spell) @@ -70,6 +70,8 @@ func (rogue *Rogue) registerEviscerate() { } else { spell.IssueRefund(sim) } + + spell.DealDamage(sim, result) }, }) } diff --git a/sim/rogue/items.go b/sim/rogue/items.go index 00b80f22f8..467922a0b8 100644 --- a/sim/rogue/items.go +++ b/sim/rogue/items.go @@ -6,6 +6,7 @@ import ( "github.com/wowsims/cata/sim/common/cata" "github.com/wowsims/cata/sim/core" + "github.com/wowsims/cata/sim/core/proto" "github.com/wowsims/cata/sim/core/stats" ) @@ -109,7 +110,7 @@ var Tier12 = core.NewItemSet(core.ItemSet{ // Aura for adding 25% of current rating as extra rating hasteAura := rogue.GetOrRegisterAura(MakeT12StatAura(core.ActionID{SpellID: 99186}, stats.HasteRating, "Future on Fire")) critAura := rogue.GetOrRegisterAura(MakeT12StatAura(core.ActionID{SpellID: 99187}, stats.CritRating, "Fiery Devastation")) - mastAura := rogue.GetOrRegisterAura(MakeT12StatAura(core.ActionID{SpellID: 99188}, stats.MasteryRating, "Master of the Flames")) + mastAura := rogue.GetOrRegisterAura(MakeT12StatAura(core.ActionID{SpellID: 99188}, stats.MasteryRating, "Master of Flames")) auraArray := [3]*core.Aura{hasteAura, critAura, mastAura} // Proc aura watching for ToT threat transfer start @@ -133,6 +134,245 @@ var Tier12 = core.NewItemSet(core.ItemSet{ }, }) +var Tier13 = core.NewItemSet(core.ItemSet{ + Name: "Blackfang Battleweave", + Bonuses: map[int32]core.ApplyEffect{ + // After triggering Tricks of the Trade, your abilities cost 20% less energy for 6 sec. + // This is implemented as it is because the 20% reduction is applied -before- talents/glyphs/passives, which is not how SpellMod_PowerCost_Pct operates + 2: func(agent core.Agent) { + rogue := agent.(RogueAgent).GetRogue() + + bonus60e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -12, + ClassMask: RogueSpellAmbush | RogueSpellBackstab | RogueSpellMutilate, + }) + + bonus45e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -9, + ClassMask: RogueSpellSinisterStrike | RogueSpellGouge | RogueSpellGarrote, + }) + + bonus40e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -8, + ClassMask: RogueSpellRevealingStrike, + }) + + bonus35e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -7, + ClassMask: RogueSpellEviscerate | RogueSpellEnvenom | RogueSpellHemorrhage, + }) + + bonus30e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -6, + ClassMask: RogueSpellRecuperate, + }) + + bonus25e := rogue.AddDynamicMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: -5, + ClassMask: RogueSpellSliceAndDice | RogueSpellRupture, + }) + + aura := rogue.GetOrRegisterAura(core.Aura{ + Label: "Tricks of Time", + ActionID: core.ActionID{SpellID: 105864}, + Duration: time.Second * 6, + OnGain: func(aura *core.Aura, sim *core.Simulation) { + bonus60e.Activate() + bonus45e.Activate() + bonus40e.Activate() + bonus35e.Activate() + bonus30e.Activate() + bonus25e.Activate() + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + bonus60e.Deactivate() + bonus45e.Deactivate() + bonus40e.Deactivate() + bonus35e.Deactivate() + bonus30e.Deactivate() + bonus25e.Deactivate() + }, + }) + + core.MakeProcTriggerAura(&rogue.Unit, core.ProcTrigger{ + Name: "Rogue T13 2P Bonus", + Callback: core.CallbackOnApplyEffects, + ClassSpellMask: RogueSpellTricksOfTheTrade, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + aura.Activate(sim) + }, + }) + }, + // Increases the duration of Shadow Dance by 2 sec, Adrenaline Rush by 3 sec, and Vendetta by 9 sec. + // Implemented in respective spells + 4: func(agent core.Agent) { + + }, + }, +}) + +// Pulled from old Shadowcraft/SimC logic. +// There exists Blizzard sourced numbers, but those were from MoP beta. TBD which is valid. +// The final difference between the Blizzard numbers and old TC numbers is exceedingly small either way. +func getFangsProcRate(character *core.Character) float64 { + switch character.Spec { + case proto.Spec_SpecSubtletyRogue: + return 0.275 + case proto.Spec_SpecAssassinationRogue: + return 0.235 + default: + return 0.095 + } +} + +// Fear + Vengeance +var JawsOfRetribution = core.NewItemSet(core.ItemSet{ + Name: "Jaws of Retribution", + Bonuses: map[int32]core.ApplyEffect{ + // Your melee attacks have a chance to grant Suffering, increasing your Agility by 2, stacking up to 50 times. + 2: func(agent core.Agent) { + agiAura := agent.GetCharacter().GetOrRegisterAura(core.Aura{ + Label: "Suffering", + ActionID: core.ActionID{SpellID: 109959}, + MaxStacks: 50, + Duration: 30 * time.Second, + OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) { + aura.Unit.AddStatDynamic(sim, stats.Agility, -2*float64(oldStacks)) + aura.Unit.AddStatDynamic(sim, stats.Agility, 2*float64(newStacks)) + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + aura.SetStacks(sim, 0) + }, + }) + + core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ + Name: "Rogue Legendary Daggers Stage 1", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskMelee, + Outcome: core.OutcomeLanded, + ProcChance: getFangsProcRate(agent.GetCharacter()), + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + agiAura.Activate(sim) + agiAura.AddStack(sim) + }, + }) + }, + }, +}) + +// Sleeper + Dreamer +var MawOfOblivion = core.NewItemSet(core.ItemSet{ + Name: "Maw of Oblivion", + Bonuses: map[int32]core.ApplyEffect{ + // Your melee attacks have a chance to grant Nightmare, increasing your Agility by 5, stacking up to 50 times. + 2: func(agent core.Agent) { + agiAura := agent.GetCharacter().GetOrRegisterAura(core.Aura{ + Label: "Nightmare", + ActionID: core.ActionID{SpellID: 109955}, + MaxStacks: 50, + Duration: 30 * time.Second, + OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) { + aura.Unit.AddStatDynamic(sim, stats.Agility, -5*float64(oldStacks)) + aura.Unit.AddStatDynamic(sim, stats.Agility, 5*float64(newStacks)) + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + aura.SetStacks(sim, 0) + }, + }) + + core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ + Name: "Rogue Legendary Daggers Stage 2", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskMelee, + Outcome: core.OutcomeLanded, + ProcChance: getFangsProcRate(agent.GetCharacter()), + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + agiAura.Activate(sim) + agiAura.AddStack(sim) + }, + }) + }, + }, +}) + +// Golad + Tiriosh +var FangsOfTheFather = core.NewItemSet(core.ItemSet{ + Name: "Fangs of the Father", + Bonuses: map[int32]core.ApplyEffect{ + // Your melee attacks have a chance to grant Shadows of the Destroyer, increasing your Agility by 17, stacking up to 50 times. + // Each application past 30 grants an increasing chance to trigger Fury of the Destroyer. + // When triggered, this consumes all applications of Shadows of the Destroyer, immediately granting 5 combo points and cause your finishing moves to generate 5 combo points. + // Lasts 6 sec. + + // Tooltip is deceptive. The stacks of Shadows of the Destroyer only clear when the 5 Combo Point effect ends + 2: func(agent core.Agent) { + cpMetrics := agent.GetCharacter().NewComboPointMetrics(core.ActionID{SpellID: 109950}) + + agiAura := agent.GetCharacter().GetOrRegisterAura(core.Aura{ + Label: "Shadows of the Destroyer", + ActionID: core.ActionID{SpellID: 109941}, + MaxStacks: 50, + Duration: 30 * time.Second, + OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) { + aura.Unit.AddStatDynamic(sim, stats.Agility, -17*float64(oldStacks)) + aura.Unit.AddStatDynamic(sim, stats.Agility, 17*float64(newStacks)) + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + aura.SetStacks(sim, 0) + }, + }) + + wingsProc := agent.GetCharacter().GetOrRegisterAura(core.Aura{ + Label: "Fury of the Destroyer", + ActionID: core.ActionID{SpellID: 109949}, + Duration: time.Second * 6, + OnGain: func(aura *core.Aura, sim *core.Simulation) { + aura.Unit.AddComboPoints(sim, 5, cpMetrics) + }, + OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { + if spell.Flags.Matches(SpellFlagFinisher) { + aura.Unit.AddComboPoints(sim, 5, cpMetrics) + } + }, + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + agiAura.SetStacks(sim, 0) + agiAura.Deactivate(sim) + }, + }) + + core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ + Name: "Rogue Legendary Daggers Stage 3", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskMelee, + Outcome: core.OutcomeLanded, + ProcChance: getFangsProcRate(agent.GetCharacter()), + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + // Adding a stack and activating the combo point effect is mutually exclusive. + // Agility bonus is lost when combo point effect ends + stacks := float64(agiAura.GetStacks()) + if stacks > 30 && !wingsProc.IsActive() { + if stacks == 50 || sim.Proc(1.0/(50-stacks), "Fangs of the Father") { + wingsProc.Activate(sim) + } else { + agiAura.Activate(sim) + agiAura.AddStack(sim) + } + } else { + agiAura.Activate(sim) + agiAura.AddStack(sim) + } + }, + }) + }, + }, +}) + var CataPVPSet = core.NewItemSet(core.ItemSet{ Name: "Gladiator's Vestments", ID: 914, @@ -146,3 +386,20 @@ var CataPVPSet = core.NewItemSet(core.ItemSet{ }, }, }) + +// 45% SS/RvS Modifier for Legendary MH Dagger +func makeWeightedBladesModifier(itemID int32) { + core.NewItemEffect(itemID, func(agent core.Agent) { + agent.GetCharacter().AddStaticMod(core.SpellModConfig{ + Kind: core.SpellMod_DamageDone_Pct, + FloatValue: 0.45, + ClassMask: RogueSpellWeightedBlades, + }) + }) +} + +func init() { + makeWeightedBladesModifier(77945) + makeWeightedBladesModifier(77947) + makeWeightedBladesModifier(77949) +} diff --git a/sim/rogue/recuperate.go b/sim/rogue/recuperate.go index 4315caa74f..4fbc4d7eb1 100644 --- a/sim/rogue/recuperate.go +++ b/sim/rogue/recuperate.go @@ -70,8 +70,8 @@ func (rogue *Rogue) registerRecuperate() { aura := spell.Hot(spell.Unit) aura.Duration = time.Duration(rogue.ComboPoints()) * time.Second * 6 aura.BaseTickCount = rogue.ComboPoints() * 2 - aura.Activate(sim) rogue.ApplyFinisher(sim, spell) + aura.Activate(sim) }, }) } diff --git a/sim/rogue/rogue.go b/sim/rogue/rogue.go index 8f1fcf7b4f..82e0e9a122 100644 --- a/sim/rogue/rogue.go +++ b/sim/rogue/rogue.go @@ -95,7 +95,6 @@ type Rogue struct { HonorAmongThieves *core.Aura StealthAura *core.Aura BanditsGuileAura *core.Aura - RestlessBladesAura *core.Aura MasterPoisonerDebuffAuras core.AuraArray SavageCombatDebuffAuras core.AuraArray @@ -123,7 +122,7 @@ func (rogue *Rogue) ApplyFinisher(sim *core.Simulation, spell *core.Spell) { numPoints := rogue.ComboPoints() rogue.SpendComboPoints(sim, spell.ComboPointMetrics()) - if rogue.Talents.Ruthlessness > 0 && (spell.ClassSpellMask&RogueSpellProcRuthlessness != 0) { + if rogue.Talents.Ruthlessness > 0 && (spell.ClassSpellMask&RogueSpellDamagingFinisher != 0) { procChance := 0.2 * float64(rogue.Talents.Ruthlessness) if sim.Proc(procChance, "Ruthlessness") { rogue.AddComboPoints(sim, 1, rogue.ruthlessnessMetrics) @@ -135,6 +134,28 @@ func (rogue *Rogue) ApplyFinisher(sim *core.Simulation, spell *core.Spell) { rogue.AddEnergy(sim, 25, rogue.relentlessStrikesMetrics) } } + if rogue.Talents.RestlessBlades > 0 && (spell.ClassSpellMask&RogueSpellDamagingFinisher != 0) { + cdReduction := time.Duration(rogue.Talents.RestlessBlades) * time.Second * time.Duration(numPoints) + + if rogue.KillingSpree != nil { + ksNewTime := rogue.KillingSpree.CD.Timer.ReadyAt() - cdReduction + rogue.KillingSpree.CD.Timer.Set(ksNewTime) + } + if rogue.AdrenalineRush != nil { + arNewTime := rogue.AdrenalineRush.CD.Timer.ReadyAt() - cdReduction + rogue.AdrenalineRush.CD.Timer.Set(arNewTime) + } + } + if rogue.Talents.SerratedBlades > 0 && spell == rogue.Eviscerate { + chancePerPoint := 0.1 * float64(rogue.Talents.SerratedBlades) + procChance := float64(numPoints) * chancePerPoint + if sim.Proc(procChance, "Serrated Blades") { + rupAura := rogue.Rupture.Dot(spell.Unit.CurrentTarget) + if rupAura.IsActive() { + rupAura.Activate(sim) + } + } + } } func (rogue *Rogue) HasPrimeGlyph(glyph proto.RoguePrimeGlyph) bool { @@ -364,5 +385,6 @@ const ( RogueSpellsAll = RogueSpellLast<<1 - 1 RogueSpellPoisons = RogueSpellVenomousWounds | RogueSpellWoundPoison | RogueSpellInstantPoison | RogueSpellDeadlyPoison - RogueSpellProcRuthlessness = RogueSpellEnvenom | RogueSpellEviscerate | RogueSpellRupture + RogueSpellDamagingFinisher = RogueSpellEnvenom | RogueSpellEviscerate | RogueSpellRupture + RogueSpellWeightedBlades = RogueSpellSinisterStrike | RogueSpellRevealingStrike ) diff --git a/sim/rogue/rupture.go b/sim/rogue/rupture.go index 9147832f42..81dd3905b6 100644 --- a/sim/rogue/rupture.go +++ b/sim/rogue/rupture.go @@ -72,9 +72,8 @@ func (rogue *Rogue) registerRupture() { dot := spell.Dot(target) dot.BaseTickCount = 3 + rogue.ComboPoints() + glyphTicks dot.Apply(sim) - // DealOutcome must come before ApplyFinisher, or it breaks calculations based on spent combo points. - spell.DealOutcome(sim, result) rogue.ApplyFinisher(sim, spell) + spell.DealOutcome(sim, result) } else { spell.DealOutcome(sim, result) spell.IssueRefund(sim) diff --git a/sim/rogue/slice_and_dice.go b/sim/rogue/slice_and_dice.go index e665a9c413..2051ffa31f 100644 --- a/sim/rogue/slice_and_dice.go +++ b/sim/rogue/slice_and_dice.go @@ -61,8 +61,8 @@ func (rogue *Rogue) registerSliceAndDice() { ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) { rogue.SliceAndDiceAura.Duration = rogue.sliceAndDiceDurations[rogue.ComboPoints()] - rogue.SliceAndDiceAura.Activate(sim) rogue.ApplyFinisher(sim, spell) + rogue.SliceAndDiceAura.Activate(sim) }, }) } diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results index 6c1c196bd7..0cf741768a 100644 --- a/sim/rogue/subtlety/TestSubtlety.results +++ b/sim/rogue/subtlety/TestSubtlety.results @@ -38,3062 +38,3111 @@ character_stats_results: { dps_results: { key: "TestSubtlety-AllItems-AgileShadowspiritDiamond" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 26092.78957 + tps: 18525.88059 } } dps_results: { key: "TestSubtlety-AllItems-Althor'sAbacus-50366" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 23793.57265 - tps: 16893.43658 + dps: 26018.31929 + tps: 18473.0067 } } dps_results: { key: "TestSubtlety-AllItems-Anhuur'sHymnal-55889" value: { - dps: 22508.59116 - tps: 15981.09973 + dps: 24136.72951 + tps: 17137.07795 } } dps_results: { key: "TestSubtlety-AllItems-Anhuur'sHymnal-56407" value: { - dps: 22576.04663 - tps: 16028.99311 + dps: 24336.09058 + tps: 17278.62431 } } dps_results: { key: "TestSubtlety-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 23003.10384 - tps: 16332.20372 + dps: 24970.95735 + tps: 17729.37972 } } dps_results: { key: "TestSubtlety-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 23049.54412 - tps: 16365.17633 + dps: 25010.67089 + tps: 17757.57633 } } dps_results: { key: "TestSubtlety-AllItems-ArrowofTime-72897" value: { - dps: 24147.77235 - tps: 17144.91837 + dps: 26050.50013 + tps: 18495.85509 } } dps_results: { key: "TestSubtlety-AllItems-AustereShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-BaubleofTrueBlood-50726" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 hps: 92.67705 } } dps_results: { key: "TestSubtlety-AllItems-BedrockTalisman-58182" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BellofEnragingResonance-59326" value: { - dps: 22355.26837 - tps: 15872.24054 + dps: 24447.38827 + tps: 17357.64567 } } dps_results: { key: "TestSubtlety-AllItems-BellofEnragingResonance-65053" value: { - dps: 22438.68846 - tps: 15931.46881 + dps: 24458.20258 + tps: 17365.32383 } } dps_results: { key: "TestSubtlety-AllItems-BindingPromise-67037" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 + } +} +dps_results: { + key: "TestSubtlety-AllItems-BlackfangBattleweave" + value: { + dps: 24995.53919 + tps: 17746.83282 } } dps_results: { key: "TestSubtlety-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 23359.87336 - tps: 16585.51009 + dps: 25321.17025 + tps: 17978.03088 } } dps_results: { key: "TestSubtlety-AllItems-BloodofIsiset-55995" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 24175.42701 + tps: 17164.55318 } } dps_results: { key: "TestSubtlety-AllItems-BloodofIsiset-56414" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 24064.2053 + tps: 17085.58576 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 23988.38053 - tps: 17031.75018 + dps: 25838.01091 + tps: 18344.98775 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 22564.51762 - tps: 16020.80751 + dps: 24325.40821 + tps: 17271.03983 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 22305.35749 - tps: 15836.80382 + dps: 24397.33496 + tps: 17322.10782 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 23169.04102 - tps: 16450.01913 + dps: 25098.18985 + tps: 17819.71479 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 22465.7098 - tps: 15950.65396 + dps: 24241.19627 + tps: 17211.24935 } } dps_results: { key: "TestSubtlety-AllItems-Bone-LinkFetish-77210" value: { - dps: 23822.56655 - tps: 16914.02225 + dps: 25582.22684 + tps: 18163.38106 } } dps_results: { key: "TestSubtlety-AllItems-Bone-LinkFetish-77982" value: { - dps: 23608.06265 - tps: 16761.72448 + dps: 25557.57897 + tps: 18145.88107 } } dps_results: { key: "TestSubtlety-AllItems-Bone-LinkFetish-78002" value: { - dps: 23994.56413 - tps: 17036.14053 + dps: 25924.64334 + tps: 18406.49677 } } dps_results: { key: "TestSubtlety-AllItems-BottledLightning-66879" value: { - dps: 22365.26764 - tps: 15879.34002 + dps: 24233.61452 + tps: 17205.86631 } } dps_results: { key: "TestSubtlety-AllItems-BottledWishes-77114" value: { - dps: 22649.81642 - tps: 16081.36966 + dps: 24783.72026 + tps: 17596.44138 } } dps_results: { key: "TestSubtlety-AllItems-BottledWishes-77985" value: { - dps: 22654.32928 - tps: 16084.57379 + dps: 24545.02033 + tps: 17426.96443 } } dps_results: { key: "TestSubtlety-AllItems-BottledWishes-78005" value: { - dps: 22851.87144 - tps: 16224.82872 + dps: 24696.72623 + tps: 17534.67563 } } dps_results: { key: "TestSubtlety-AllItems-BracingShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16272.50199 + dps: 25448.98561 + tps: 17707.40419 } } dps_results: { key: "TestSubtlety-AllItems-Brawler'sTrophy-232015" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-BurningShadowspiritDiamond" value: { - dps: 23783.87997 - tps: 16886.55478 + dps: 25902.53887 + tps: 18390.8026 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofConquest-73648" value: { - dps: 24574.18353 - tps: 17447.6703 + dps: 26518.24576 + tps: 18827.95449 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofDominance-73498" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sBadgeofVictory-73496" value: { - dps: 22788.83992 - tps: 16180.07634 + dps: 24557.67264 + tps: 17435.94757 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofConquest-73643" value: { - dps: 24214.17409 - tps: 17192.06361 + dps: 25904.81824 + tps: 18392.42095 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofDominance-73497" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CataclysmicGladiator'sInsigniaofVictory-73491" value: { - dps: 22759.05098 - tps: 16158.9262 + dps: 24528.51691 + tps: 17415.24701 } } dps_results: { key: "TestSubtlety-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 23779.79405 - tps: 16883.65378 + dps: 25843.43478 + tps: 18348.83869 } } dps_results: { key: "TestSubtlety-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 22971.23259 - tps: 16309.57514 + dps: 25139.28014 + tps: 17848.8889 } } dps_results: { key: "TestSubtlety-AllItems-CoreofRipeness-58184" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CorpseTongueCoin-50349" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CrecheoftheFinalDragon-77205" value: { - dps: 23681.23263 - tps: 16813.67517 + dps: 25520.71352 + tps: 18119.7066 } } dps_results: { key: "TestSubtlety-AllItems-CrecheoftheFinalDragon-77972" value: { - dps: 23548.59358 - tps: 16719.50144 + dps: 25151.32898 + tps: 17857.44357 } } dps_results: { key: "TestSubtlety-AllItems-CrecheoftheFinalDragon-77992" value: { - dps: 23840.38248 - tps: 16926.67156 + dps: 25425.20856 + tps: 18051.89808 } } dps_results: { key: "TestSubtlety-AllItems-CrushingWeight-59506" value: { - dps: 22761.15367 - tps: 16160.4191 + dps: 25110.67919 + tps: 17828.58223 } } dps_results: { key: "TestSubtlety-AllItems-CrushingWeight-65118" value: { - dps: 22913.35152 - tps: 16268.47958 + dps: 25038.26202 + tps: 17777.16603 } } dps_results: { key: "TestSubtlety-AllItems-CunningoftheCruel-77208" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CunningoftheCruel-77980" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-CunningoftheCruel-78000" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 22813.27764 - tps: 16197.42712 + dps: 24702.57096 + tps: 17538.82538 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 23614.41957 - tps: 16766.23789 + dps: 25611.37096 + tps: 18184.07338 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 24141.9866 + tps: 17140.81049 } } dps_results: { key: "TestSubtlety-AllItems-Deathbringer'sWill-50363" value: { - dps: 22712.90081 - tps: 16126.15957 + dps: 24764.65057 + tps: 17582.9019 } } dps_results: { key: "TestSubtlety-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 25389.07446 + tps: 18026.24286 } } dps_results: { key: "TestSubtlety-AllItems-DislodgedForeignObject-50348" value: { - dps: 22370.69907 - tps: 15883.19634 + dps: 24280.9886 + tps: 17239.50191 } } dps_results: { key: "TestSubtlety-AllItems-Dwyer'sCaber-70141" value: { - dps: 23092.86839 - tps: 16395.93656 + dps: 24757.00404 + tps: 17577.47287 } } dps_results: { key: "TestSubtlety-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-EmberShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 25389.07446 + tps: 18026.24286 } } dps_results: { key: "TestSubtlety-AllItems-EssenceoftheCyclone-59473" value: { - dps: 23749.51511 - tps: 16862.15573 + dps: 25809.84894 + tps: 18324.99275 } } dps_results: { key: "TestSubtlety-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 22739.91008 - tps: 16145.33616 + dps: 24791.92959 + tps: 17602.27001 } } dps_results: { key: "TestSubtlety-AllItems-EternalShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-EyeofUnmaking-77200" value: { - dps: 23019.40532 - tps: 16343.77778 + dps: 24817.76463 + tps: 17620.61289 } } dps_results: { key: "TestSubtlety-AllItems-EyeofUnmaking-77977" value: { - dps: 22924.61389 - tps: 16276.47586 + dps: 24717.18945 + tps: 17549.20451 } } dps_results: { key: "TestSubtlety-AllItems-EyeofUnmaking-77997" value: { - dps: 23123.67589 - tps: 16417.80988 + dps: 24928.39733 + tps: 17699.1621 } } dps_results: { key: "TestSubtlety-AllItems-FallofMortality-59500" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-FallofMortality-65124" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 + } +} +dps_results: { + key: "TestSubtlety-AllItems-FangsoftheFather" + value: { + dps: 31242.64159 + tps: 22182.27553 + } +} +dps_results: { + key: "TestSubtlety-AllItems-Fear-77945" + value: { + dps: 26645.85926 + tps: 18918.56007 } } dps_results: { key: "TestSubtlety-AllItems-FieryQuintessence-69000" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-DemonPanther-52199" value: { - dps: 24053.81184 - tps: 17078.20641 + dps: 25926.22155 + tps: 18407.6173 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-DreamOwl-52354" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-KingofBoars-52351" value: { - dps: 22845.24588 - tps: 16220.12457 + dps: 24438.76071 + tps: 17351.5201 } } dps_results: { key: "TestSubtlety-AllItems-FireoftheDeep-77117" value: { - dps: 22459.61484 - tps: 15946.32653 + dps: 24326.21999 + tps: 17271.61619 } } dps_results: { key: "TestSubtlety-AllItems-FireoftheDeep-77988" value: { - dps: 22447.013 - tps: 15937.37923 + dps: 24301.92819 + tps: 17254.36902 } } dps_results: { key: "TestSubtlety-AllItems-FireoftheDeep-78008" value: { - dps: 22434.86469 - tps: 15928.75393 + dps: 24283.34237 + tps: 17241.17309 } } dps_results: { key: "TestSubtlety-AllItems-FleetShadowspiritDiamond" value: { - dps: 23472.62232 - tps: 16665.56185 + dps: 25350.62869 + tps: 17998.94637 } } dps_results: { key: "TestSubtlety-AllItems-FluidDeath-58181" value: { - dps: 23773.00511 - tps: 16878.83363 + dps: 25770.2377 + tps: 18296.86877 } } dps_results: { key: "TestSubtlety-AllItems-ForlornShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-FoulGiftoftheDemonLord-72898" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-FuryofAngerforge-59461" value: { - dps: 22718.6455 - tps: 16130.2383 + dps: 24841.23509 + tps: 17637.27691 } } dps_results: { key: "TestSubtlety-AllItems-GaleofShadows-56138" value: { - dps: 22347.02249 - tps: 15866.38597 + dps: 24465.81513 + tps: 17370.72874 } } dps_results: { key: "TestSubtlety-AllItems-GaleofShadows-56462" value: { - dps: 22408.11065 - tps: 15909.75856 + dps: 24374.32837 + tps: 17305.77315 } } dps_results: { key: "TestSubtlety-AllItems-GearDetector-61462" value: { - dps: 23042.54343 - tps: 16360.20584 + dps: 24876.23104 + tps: 17662.12404 } } dps_results: { key: "TestSubtlety-AllItems-Gladiator'sVestments" value: { - dps: 19273.16279 - tps: 13683.94558 + dps: 20969.70352 + tps: 14888.4895 } } dps_results: { key: "TestSubtlety-AllItems-GlowingTwilightScale-54589" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 + } +} +dps_results: { + key: "TestSubtlety-AllItems-Golad,TwilightofAspects-77949" + value: { + dps: 27969.98281 + tps: 19858.68779 } } dps_results: { key: "TestSubtlety-AllItems-GraceoftheHerald-55266" value: { - dps: 23161.08521 - tps: 16444.3705 + dps: 24932.09 + tps: 17701.7839 } } dps_results: { key: "TestSubtlety-AllItems-GraceoftheHerald-56295" value: { - dps: 23402.00958 - tps: 16615.4268 + dps: 25240.68816 + tps: 17920.8886 } } dps_results: { key: "TestSubtlety-AllItems-HarmlightToken-63839" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 22462.26091 - tps: 15948.20524 + dps: 24296.42024 + tps: 17250.45837 } } dps_results: { key: "TestSubtlety-AllItems-HeartofIgnacious-59514" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-HeartofIgnacious-65110" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-HeartofRage-59224" value: { - dps: 22640.17745 - tps: 16074.52599 + dps: 24420.58211 + tps: 17338.6133 } } dps_results: { key: "TestSubtlety-AllItems-HeartofRage-65072" value: { - dps: 22685.81923 - tps: 16106.93165 + dps: 24463.42785 + tps: 17369.03378 } } dps_results: { key: "TestSubtlety-AllItems-HeartofSolace-55868" value: { - dps: 22701.59734 - tps: 16118.13411 + dps: 24868.73544 + tps: 17656.80216 } } dps_results: { key: "TestSubtlety-AllItems-HeartofSolace-56393" value: { - dps: 22823.14758 - tps: 16204.43478 + dps: 24820.72674 + tps: 17622.71599 } } dps_results: { key: "TestSubtlety-AllItems-HeartofThunder-55845" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-HeartofThunder-56370" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-HeartoftheVile-66969" value: { - dps: 23061.79134 - tps: 16373.87185 + dps: 25133.63965 + tps: 17844.88415 } } dps_results: { key: "TestSubtlety-AllItems-Heartpierce-50641" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 26092.78957 + tps: 18525.88059 } } dps_results: { key: "TestSubtlety-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 25389.07446 + tps: 18026.24286 } } dps_results: { key: "TestSubtlety-AllItems-ImpatienceofYouth-62464" value: { - dps: 22741.72301 - tps: 16146.62334 + dps: 24577.22436 + tps: 17449.8293 } } dps_results: { key: "TestSubtlety-AllItems-ImpatienceofYouth-62469" value: { - dps: 22741.72301 - tps: 16146.62334 + dps: 24577.22436 + tps: 17449.8293 } } dps_results: { key: "TestSubtlety-AllItems-ImpetuousQuery-55881" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 24175.42701 + tps: 17164.55318 } } dps_results: { key: "TestSubtlety-AllItems-ImpetuousQuery-56406" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 24064.2053 + tps: 17085.58576 } } dps_results: { key: "TestSubtlety-AllItems-IndomitablePride-77211" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-IndomitablePride-77983" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-IndomitablePride-78003" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-InsigniaoftheCorruptedMind-77203" value: { - dps: 22996.09995 - tps: 16327.23097 + dps: 24841.32422 + tps: 17637.3402 } } dps_results: { key: "TestSubtlety-AllItems-InsigniaoftheCorruptedMind-77971" value: { - dps: 22679.99653 - tps: 16102.79753 + dps: 24719.53392 + tps: 17550.86908 } } dps_results: { key: "TestSubtlety-AllItems-InsigniaoftheCorruptedMind-77991" value: { - dps: 23224.89774 - tps: 16489.67739 + dps: 25058.58825 + tps: 17791.59765 } } dps_results: { key: "TestSubtlety-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 22223.80421 - tps: 15778.90099 + dps: 24123.41648 + tps: 17127.6257 } } dps_results: { key: "TestSubtlety-AllItems-JarofAncientRemedies-59354" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-JarofAncientRemedies-65029" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-JawsofDefeat-68926" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-JawsofDefeat-69111" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 + } +} +dps_results: { + key: "TestSubtlety-AllItems-JawsofRetribution" + value: { + dps: 27090.26275 + tps: 19234.08655 } } dps_results: { key: "TestSubtlety-AllItems-JujuofNimbleness-63840" value: { - dps: 23359.87336 - tps: 16585.51009 + dps: 25321.17025 + tps: 17978.03088 } } dps_results: { key: "TestSubtlety-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 23459.70737 - tps: 16656.39223 + dps: 25429.85871 + tps: 18055.19969 } } dps_results: { key: "TestSubtlety-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 24047.0186 - tps: 17073.3832 + dps: 26007.38118 + tps: 18465.24064 } } dps_results: { key: "TestSubtlety-AllItems-KiroptyricSigil-77113" value: { - dps: 24976.58645 - tps: 17733.37638 + dps: 26764.14222 + tps: 19002.54098 } } dps_results: { key: "TestSubtlety-AllItems-KiroptyricSigil-77984" value: { - dps: 24791.0061 - tps: 17601.61433 + dps: 26744.0279 + tps: 18988.25981 } } dps_results: { key: "TestSubtlety-AllItems-KiroptyricSigil-78004" value: { - dps: 25575.54715 - tps: 18158.63848 + dps: 27481.80395 + tps: 19512.08081 } } dps_results: { key: "TestSubtlety-AllItems-KvaldirBattleStandard-59685" value: { - dps: 22512.68451 - tps: 15984.006 + dps: 24435.64402 + tps: 17349.30725 } } dps_results: { key: "TestSubtlety-AllItems-KvaldirBattleStandard-59689" value: { - dps: 22512.68451 - tps: 15984.006 + dps: 24435.64402 + tps: 17349.30725 } } dps_results: { key: "TestSubtlety-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 22281.38464 - tps: 15819.78309 + dps: 24171.16264 + tps: 17161.52547 } } dps_results: { key: "TestSubtlety-AllItems-LeadenDespair-55816" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-LeadenDespair-56347" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-LeftEyeofRajh-56102" value: { - dps: 23543.98745 - tps: 16716.23109 + dps: 25344.44375 + tps: 17994.55507 } } dps_results: { key: "TestSubtlety-AllItems-LeftEyeofRajh-56427" value: { - dps: 23795.95892 - tps: 16895.13083 + dps: 25537.19463 + tps: 18131.40819 } } dps_results: { key: "TestSubtlety-AllItems-LicensetoSlay-58180" value: { - dps: 22843.80394 - tps: 16219.1008 + dps: 24579.37666 + tps: 17451.35743 } } dps_results: { key: "TestSubtlety-AllItems-MagnetiteMirror-55814" value: { - dps: 22453.79866 - tps: 15942.19705 + dps: 24220.1229 + tps: 17196.28726 } } dps_results: { key: "TestSubtlety-AllItems-MagnetiteMirror-56345" value: { - dps: 22541.23612 - tps: 16004.27765 + dps: 24313.70146 + tps: 17262.72804 } } dps_results: { key: "TestSubtlety-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-MarkofKhardros-56132" value: { - dps: 22355.8304 - tps: 15872.63959 + dps: 24352.78354 + tps: 17290.47631 } } dps_results: { key: "TestSubtlety-AllItems-MarkofKhardros-56458" value: { - dps: 22538.34449 - tps: 16002.22459 + dps: 24382.20884 + tps: 17311.36828 } } dps_results: { key: "TestSubtlety-AllItems-MatrixRestabilizer-68994" value: { - dps: 24239.44051 - tps: 17210.00277 + dps: 26249.06797 + tps: 18636.83826 } } dps_results: { key: "TestSubtlety-AllItems-MatrixRestabilizer-69150" value: { - dps: 24422.54603 - tps: 17340.00768 + dps: 26198.27157 + tps: 18600.77281 + } +} +dps_results: { + key: "TestSubtlety-AllItems-MawofOblivion" + value: { + dps: 28314.7697 + tps: 20103.48649 } } dps_results: { key: "TestSubtlety-AllItems-MightoftheOcean-55251" value: { - dps: 22550.73074 - tps: 16011.01882 + dps: 24422.57097 + tps: 17340.02539 } } dps_results: { key: "TestSubtlety-AllItems-MightoftheOcean-56285" value: { - dps: 22941.11276 - tps: 16288.19006 + dps: 24709.32328 + tps: 17543.61953 } } dps_results: { key: "TestSubtlety-AllItems-MirrorofBrokenImages-62466" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 24141.9866 + tps: 17140.81049 } } dps_results: { key: "TestSubtlety-AllItems-MirrorofBrokenImages-62471" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 24141.9866 + tps: 17140.81049 } } dps_results: { key: "TestSubtlety-AllItems-MithrilStopwatch-232013" value: { - dps: 22305.58115 - tps: 15836.96262 + dps: 24436.19881 + tps: 17349.70116 } } dps_results: { key: "TestSubtlety-AllItems-MoonwellChalice-70142" value: { - dps: 22140.17256 - tps: 15719.52251 + dps: 24304.94158 + tps: 17256.50852 } } dps_results: { key: "TestSubtlety-AllItems-MoonwellPhial-70143" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-NecromanticFocus-68982" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-NecromanticFocus-69139" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Oremantle'sFavor-61448" value: { - dps: 22649.73316 - tps: 16081.31054 + dps: 24517.74106 + tps: 17407.59615 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 22174.8762 - tps: 15744.1621 + dps: 24172.61843 + tps: 17162.55908 } } dps_results: { key: "TestSubtlety-AllItems-PorcelainCrab-55237" value: { - dps: 22172.5878 - tps: 15742.53734 + dps: 23979.63172 + tps: 17025.53852 } } dps_results: { key: "TestSubtlety-AllItems-PorcelainCrab-56280" value: { - dps: 22349.88623 - tps: 15868.41923 + dps: 24292.40512 + tps: 17247.60764 } } dps_results: { key: "TestSubtlety-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 25448.98561 + tps: 18068.77979 } } dps_results: { key: "TestSubtlety-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 23833.22219 - tps: 16921.58775 + dps: 25828.55388 + tps: 18338.27326 } } dps_results: { key: "TestSubtlety-AllItems-Rainsong-55854" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Rainsong-56377" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Rathrak,thePoisonousMind-77195" value: { - dps: 23337.15093 - tps: 16569.37716 + dps: 25483.07098 + tps: 18092.98039 } } dps_results: { key: "TestSubtlety-AllItems-Rathrak,thePoisonousMind-78475" value: { - dps: 23822.46711 - tps: 16913.95165 + dps: 26013.57917 + tps: 18469.64121 } } dps_results: { key: "TestSubtlety-AllItems-Rathrak,thePoisonousMind-78484" value: { - dps: 22905.96023 - tps: 16263.23177 + dps: 25011.74065 + tps: 17758.33586 } } dps_results: { key: "TestSubtlety-AllItems-ReflectionoftheLight-77115" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ReflectionoftheLight-77986" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ReflectionoftheLight-78006" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ResolveofUndying-77201" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ResolveofUndying-77978" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ResolveofUndying-77998" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 23837.2017 - tps: 16924.41321 + dps: 25960.06325 + tps: 18431.6449 } } dps_results: { key: "TestSubtlety-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 23783.87997 - tps: 16886.55478 + dps: 25902.53887 + tps: 18390.8026 } } dps_results: { key: "TestSubtlety-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 23955.16281 - tps: 17008.1656 + dps: 25935.73793 + tps: 18414.37393 } } dps_results: { key: "TestSubtlety-AllItems-RightEyeofRajh-56100" value: { - dps: 22887.37994 - tps: 16250.03976 + dps: 24519.83165 + tps: 17409.08047 } } dps_results: { key: "TestSubtlety-AllItems-RightEyeofRajh-56431" value: { - dps: 22997.89744 - tps: 16328.50718 + dps: 24762.02884 + tps: 17581.04047 } } dps_results: { key: "TestSubtlety-AllItems-RosaryofLight-72901" value: { - dps: 23136.59442 - tps: 16426.98204 + dps: 24881.26814 + tps: 17665.70038 } } dps_results: { key: "TestSubtlety-AllItems-RottingSkull-77116" value: { - dps: 23198.3684 - tps: 16470.84157 + dps: 25092.92387 + tps: 17815.97595 } } dps_results: { key: "TestSubtlety-AllItems-RottingSkull-77987" value: { - dps: 23040.73863 - tps: 16358.92443 + dps: 25046.31347 + tps: 17782.88256 } } dps_results: { key: "TestSubtlety-AllItems-RottingSkull-78007" value: { - dps: 23344.9042 - tps: 16574.88198 + dps: 25304.40083 + tps: 17966.12459 } } dps_results: { key: "TestSubtlety-AllItems-RuneofZeth-68998" value: { - dps: 22491.60705 - tps: 15969.041 + dps: 24514.86243 + tps: 17405.55232 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofConquest-70399" value: { - dps: 24258.35022 - tps: 17223.42865 + dps: 26062.31064 + tps: 18504.24055 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofConquest-72304" value: { - dps: 24355.55737 - tps: 17292.44574 + dps: 26176.77299 + tps: 18585.50882 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofDominance-70401" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofDominance-72448" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofVictory-70400" value: { - dps: 22691.52546 - tps: 16110.98308 + dps: 24456.91276 + tps: 17364.40806 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sBadgeofVictory-72450" value: { - dps: 22720.22075 - tps: 16131.35673 + dps: 24486.62401 + tps: 17385.50305 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofConquest-70404" value: { - dps: 23937.46573 - tps: 16995.60067 + dps: 25848.28728 + tps: 18352.28397 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofConquest-72309" value: { - dps: 23941.76285 - tps: 16998.65162 + dps: 26014.42146 + tps: 18470.23923 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofDominance-70402" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofDominance-72449" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofVictory-70403" value: { - dps: 22644.9101 - tps: 16077.88617 + dps: 24407.9845 + tps: 17329.66899 } } dps_results: { key: "TestSubtlety-AllItems-RuthlessGladiator'sInsigniaofVictory-72455" value: { - dps: 22693.32798 - tps: 16112.26286 + dps: 24457.84692 + tps: 17365.07131 } } dps_results: { key: "TestSubtlety-AllItems-ScalesofLife-68915" value: { - dps: 22185.24075 - tps: 15751.52093 - hps: 309.7614 + dps: 23932.70304 + tps: 16992.21916 + hps: 308.2086 } } dps_results: { key: "TestSubtlety-AllItems-ScalesofLife-69109" value: { - dps: 22185.24075 - tps: 15751.52093 - hps: 349.40796 + dps: 23932.70304 + tps: 16992.21916 + hps: 347.65642 } } dps_results: { key: "TestSubtlety-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 22992.87351 - tps: 16324.94019 + dps: 24970.55995 + tps: 17729.09756 } } dps_results: { key: "TestSubtlety-AllItems-SeaStar-55256" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-SeaStar-56290" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ShardofWoe-60233" value: { - dps: 22612.86239 - tps: 16055.13229 + dps: 24549.23737 + tps: 17429.95853 } } dps_results: { key: "TestSubtlety-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 22602.52376 - tps: 16047.79187 + dps: 24630.18819 + tps: 17487.43362 } } dps_results: { key: "TestSubtlety-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Skardyn'sGrace-56115" value: { - dps: 22841.79871 - tps: 16217.67709 + dps: 25179.60759 + tps: 17877.52139 } } dps_results: { key: "TestSubtlety-AllItems-Skardyn'sGrace-56440" value: { - dps: 23042.71427 - tps: 16360.32713 + dps: 25334.78844 + tps: 17987.69979 } } dps_results: { key: "TestSubtlety-AllItems-Sorrowsong-55879" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 24175.42701 + tps: 17164.55318 } } dps_results: { key: "TestSubtlety-AllItems-Sorrowsong-56400" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 24064.2053 + tps: 17085.58576 } } dps_results: { key: "TestSubtlety-AllItems-Soul'sAnguish-66994" value: { - dps: 22707.76404 - tps: 16122.51247 + dps: 24334.37843 + tps: 17277.40868 } } dps_results: { key: "TestSubtlety-AllItems-SoulCasket-58183" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 24141.9866 + tps: 17140.81049 } } dps_results: { key: "TestSubtlety-AllItems-SoulshifterVortex-77206" value: { - dps: 22248.48568 - tps: 15796.42484 + dps: 24615.75357 + tps: 17477.18503 } } dps_results: { key: "TestSubtlety-AllItems-SoulshifterVortex-77970" value: { - dps: 22325.02532 - tps: 15850.76798 + dps: 24425.72427 + tps: 17342.26423 } } dps_results: { key: "TestSubtlety-AllItems-SoulshifterVortex-77990" value: { - dps: 22368.96464 - tps: 15881.9649 + dps: 24464.60084 + tps: 17369.86659 } } dps_results: { key: "TestSubtlety-AllItems-SpidersilkSpindle-68981" value: { - dps: 22357.54245 - tps: 15873.85514 + dps: 24396.62141 + tps: 17321.6012 } } dps_results: { key: "TestSubtlety-AllItems-SpidersilkSpindle-69138" value: { - dps: 22348.95325 - tps: 15867.75681 + dps: 24354.03802 + tps: 17291.36699 } } dps_results: { key: "TestSubtlety-AllItems-StarcatcherCompass-77202" value: { - dps: 24574.90074 - tps: 17448.17952 + dps: 26833.73158 + tps: 19051.94942 } } dps_results: { key: "TestSubtlety-AllItems-StarcatcherCompass-77973" value: { - dps: 24368.68801 - tps: 17301.76849 + dps: 26313.5835 + tps: 18682.64429 } } dps_results: { key: "TestSubtlety-AllItems-StarcatcherCompass-77993" value: { - dps: 24764.28566 - tps: 17582.64282 + dps: 26886.65451 + tps: 19089.5247 } } dps_results: { key: "TestSubtlety-AllItems-StayofExecution-68996" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Stonemother'sKiss-61411" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-StumpofTime-62465" value: { - dps: 22477.98369 - tps: 15959.36842 + dps: 24190.11905 + tps: 17174.98453 } } dps_results: { key: "TestSubtlety-AllItems-StumpofTime-62470" value: { - dps: 22477.98369 - tps: 15959.36842 + dps: 24190.11905 + tps: 17174.98453 } } dps_results: { key: "TestSubtlety-AllItems-SymbioticWorm-59332" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-SymbioticWorm-65048" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 22568.52512 - tps: 16023.65284 + dps: 24503.32336 + tps: 17397.35959 } } dps_results: { key: "TestSubtlety-AllItems-TearofBlood-55819" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-TearofBlood-56351" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 22094.1542 - tps: 15686.84948 + dps: 24192.83505 + tps: 17176.91288 } } dps_results: { key: "TestSubtlety-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 24064.2053 + tps: 17085.58576 } } dps_results: { key: "TestSubtlety-AllItems-TheHungerer-68927" value: { - dps: 23937.22861 - tps: 16995.43231 + dps: 26050.15631 + tps: 18495.61098 } } dps_results: { key: "TestSubtlety-AllItems-TheHungerer-69112" value: { - dps: 24139.06999 - tps: 17138.73969 + dps: 26220.29823 + tps: 18616.41174 + } +} +dps_results: { + key: "TestSubtlety-AllItems-TheSleeper-77947" + value: { + dps: 27261.10656 + tps: 19355.38566 } } dps_results: { key: "TestSubtlety-AllItems-Theralion'sMirror-59519" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Theralion'sMirror-65105" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Throngus'sFinger-56121" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Throngus'sFinger-56449" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Tia'sGrace-55874" value: { - dps: 23288.24045 - tps: 16534.65072 + dps: 25338.06324 + tps: 17990.0249 } } dps_results: { key: "TestSubtlety-AllItems-Tia'sGrace-56394" value: { - dps: 23573.68489 - tps: 16737.31627 + dps: 25315.08776 + tps: 17973.71231 } } dps_results: { key: "TestSubtlety-AllItems-TinyAbominationinaJar-50706" value: { - dps: 22763.70162 - tps: 16162.22815 + dps: 24542.17027 + tps: 17424.94089 } } dps_results: { key: "TestSubtlety-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 21979.87017 - tps: 15605.70782 + dps: 23819.4011 + tps: 16911.77478 } } dps_results: { key: "TestSubtlety-AllItems-UnheededWarning-59520" value: { - dps: 23543.57992 - tps: 16715.94174 + dps: 25551.21591 + tps: 18141.3633 } } dps_results: { key: "TestSubtlety-AllItems-UnquenchableFlame-67101" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-62463" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 25778.16644 + tps: 18302.49817 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-62468" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 25778.16644 + tps: 18302.49817 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-68709" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 25778.16644 + tps: 18302.49817 } } dps_results: { key: "TestSubtlety-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-Varo'then'sBrooch-72899" value: { - dps: 22721.72901 - tps: 16132.4276 + dps: 24590.77551 + tps: 17459.45062 } } dps_results: { key: "TestSubtlety-AllItems-VeilofLies-72900" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-VesselofAcceleration-68995" value: { - dps: 22949.16452 - tps: 16293.90681 + dps: 24936.80741 + tps: 17705.13326 } } dps_results: { key: "TestSubtlety-AllItems-VesselofAcceleration-69167" value: { - dps: 23082.98565 - tps: 16388.91981 + dps: 24935.78355 + tps: 17704.40632 } } dps_results: { key: "TestSubtlety-AllItems-VestmentsoftheDarkPhoenix" value: { - dps: 23779.85431 - tps: 16883.69656 + dps: 25741.67458 + tps: 18276.58895 } } dps_results: { key: "TestSubtlety-AllItems-VialofShadows-77207" value: { - dps: 24375.30136 - tps: 17306.46397 + dps: 26560.08313 + tps: 18857.65902 } } dps_results: { key: "TestSubtlety-AllItems-VialofShadows-77979" value: { - dps: 24128.63312 - tps: 17131.32952 + dps: 26025.27503 + tps: 18477.94527 } } dps_results: { key: "TestSubtlety-AllItems-VialofShadows-77999" value: { - dps: 24630.60824 - tps: 17487.73185 + dps: 26601.60414 + tps: 18887.13894 } } dps_results: { key: "TestSubtlety-AllItems-VialofStolenMemories-59515" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-VialofStolenMemories-65109" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 23788.68906 - tps: 16889.96923 + dps: 25638.41872 + tps: 18203.27729 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofConquest-70517" value: { - dps: 23986.04085 - tps: 17030.089 + dps: 25798.18462 + tps: 18316.71108 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofDominance-70518" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 22585.72718 - tps: 16035.8663 + dps: 24347.36869 + tps: 17286.63177 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofVictory-70519" value: { - dps: 22632.88726 - tps: 16069.34996 + dps: 24396.19848 + tps: 17321.30092 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 22453.08561 - tps: 15941.69078 + dps: 24222.63532 + tps: 17198.07108 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 22562.97934 - tps: 16019.71533 + dps: 24414.3462 + tps: 17334.1858 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 22443.77887 - tps: 15935.08299 + dps: 24481.24539 + tps: 17381.68423 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 22444.3449 - tps: 15935.48488 + dps: 24176.51173 + tps: 17165.32333 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 23584.62298 - tps: 16745.08232 + dps: 25435.05119 + tps: 18058.88634 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofConquest-70577" value: { - dps: 23654.01733 - tps: 16794.3523 + dps: 25577.80264 + tps: 18160.23988 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofDominance-70578" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 22559.78963 - tps: 16017.45064 + dps: 24309.22955 + tps: 17259.55298 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofVictory-70579" value: { - dps: 22590.7513 - tps: 16039.43343 + dps: 24358.57333 + tps: 17294.58706 } } dps_results: { key: "TestSubtlety-AllItems-Vishanka,JawsoftheEarth-78359" value: { - dps: 23742.42434 - tps: 16857.12128 + dps: 25840.92207 + tps: 18347.05467 } } dps_results: { key: "TestSubtlety-AllItems-Vishanka,JawsoftheEarth-78471" value: { - dps: 23810.31745 - tps: 16905.32539 + dps: 25884.67196 + tps: 18378.11709 } } dps_results: { key: "TestSubtlety-AllItems-Vishanka,JawsoftheEarth-78480" value: { - dps: 23674.99172 - tps: 16809.24412 + dps: 25743.15928 + tps: 18277.64309 } } dps_results: { key: "TestSubtlety-AllItems-WillofUnbinding-77198" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-WillofUnbinding-77975" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-WillofUnbinding-77995" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-WindDancer'sRegalia" value: { - dps: 21375.94345 - tps: 15176.91985 + dps: 23037.56947 + tps: 16356.67432 } } dps_results: { key: "TestSubtlety-AllItems-WitchingHourglass-55787" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-WitchingHourglass-56320" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 23932.70304 + tps: 16992.21916 } } dps_results: { key: "TestSubtlety-AllItems-World-QuellerFocus-63842" value: { - dps: 22193.05242 - tps: 15757.06722 + dps: 24121.75949 + tps: 17126.44924 } } dps_results: { key: "TestSubtlety-AllItems-WrathofUnchaining-77197" value: { - dps: 25201.21727 - tps: 17892.86426 + dps: 27218.79612 + tps: 19325.34524 } } dps_results: { key: "TestSubtlety-AllItems-WrathofUnchaining-77974" value: { - dps: 24918.05131 - tps: 17691.81643 + dps: 26879.0825 + tps: 19084.14858 } } dps_results: { key: "TestSubtlety-AllItems-WrathofUnchaining-77994" value: { - dps: 25532.36221 - tps: 18127.97717 + dps: 27644.66263 + tps: 19627.71047 } } dps_results: { key: "TestSubtlety-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 22160.19615 - tps: 15733.73927 + dps: 24006.70038 + tps: 17044.75727 } } dps_results: { key: "TestSubtlety-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 22160.19615 - tps: 15733.73927 + dps: 24006.70038 + tps: 17044.75727 } } dps_results: { key: "TestSubtlety-Average-Default" value: { - dps: 24117.7856 - tps: 17123.62778 + dps: 26174.97744 + tps: 18584.23398 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21933.95328 - tps: 15573.10683 + dps: 24023.73823 + tps: 17056.85414 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21933.95328 - tps: 15573.10683 + dps: 24023.73823 + tps: 17056.85414 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 28619.49092 - tps: 20319.83855 + dps: 32064.79482 + tps: 22766.00432 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 11990.96754 - tps: 8513.58695 + dps: 13268.15503 + tps: 9420.39007 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 11990.96754 - tps: 8513.58695 + dps: 13268.15503 + tps: 9420.39007 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 13411.7168 - tps: 9522.31893 + dps: 14941.50931 + tps: 10608.47161 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 23934.78443 - tps: 16993.69695 + dps: 26036.27941 + tps: 18485.75838 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 23934.78443 - tps: 16993.69695 + dps: 26036.27941 + tps: 18485.75838 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31204.71132 - tps: 22155.34503 + dps: 34044.86774 + tps: 24171.8561 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13015.82159 - tps: 9241.23333 + dps: 14345.80469 + tps: 10185.52133 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13015.82159 - tps: 9241.23333 + dps: 14345.80469 + tps: 10185.52133 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14636.52477 - tps: 10391.93259 + dps: 15883.32638 + tps: 11277.16173 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21706.75175 - tps: 15411.79374 + dps: 23666.75533 + tps: 16803.39629 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21706.75175 - tps: 15411.79374 + dps: 23666.75533 + tps: 16803.39629 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29367.5109 - tps: 20850.93274 + dps: 32137.80662 + tps: 22817.8427 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 11598.7169 - tps: 8235.089 + dps: 13084.62054 + tps: 9290.08058 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 11598.7169 - tps: 8235.089 + dps: 13084.62054 + tps: 9290.08058 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 13132.80939 - tps: 9324.29467 + dps: 14913.69162 + tps: 10588.72105 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 26092.78957 + tps: 18525.88059 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 26092.78957 + tps: 18525.88059 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31257.32917 - tps: 22192.70371 + dps: 34703.32715 + tps: 24639.36228 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12971.14037 - tps: 9209.50967 + dps: 14205.79937 + tps: 10086.11755 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12971.14037 - tps: 9209.50967 + dps: 14205.79937 + tps: 10086.11755 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14830.33318 - tps: 10529.53656 + dps: 15529.64562 + tps: 11026.04839 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28593.28212 - tps: 20301.23031 + dps: 31167.16498 + tps: 22128.68714 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28593.28212 - tps: 20301.23031 + dps: 31167.16498 + tps: 22128.68714 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37772.8679 - tps: 26818.73621 + dps: 41412.66458 + tps: 29402.99185 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16016.90406 - tps: 11372.00188 + dps: 17587.02102 + tps: 12486.78492 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16016.90406 - tps: 11372.00188 + dps: 17587.02102 + tps: 12486.78492 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18221.09415 - tps: 12936.97684 + dps: 19595.94267 + tps: 13913.11929 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30942.47986 - tps: 21969.1607 + dps: 33377.36016 + tps: 23697.92572 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30942.47986 - tps: 21969.1607 + dps: 33377.36016 + tps: 23697.92572 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40470.25219 - tps: 28733.87905 + dps: 44068.75757 + tps: 31288.81787 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17260.90899 - tps: 12255.24538 + dps: 18926.38902 + tps: 13437.73621 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17260.90899 - tps: 12255.24538 + dps: 18926.38902 + tps: 13437.73621 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19442.67573 - tps: 13804.29977 + dps: 21224.15534 + tps: 15069.15029 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28433.58641 - tps: 20187.84635 + dps: 31137.94816 + tps: 22107.9432 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28433.58641 - tps: 20187.84635 + dps: 31137.94816 + tps: 22107.9432 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38328.6876 - tps: 27213.36819 + dps: 41931.83441 + tps: 29771.60243 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15592.6348 - tps: 11070.77071 + dps: 17397.58295 + tps: 12352.28389 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15592.6348 - tps: 11070.77071 + dps: 17397.58295 + tps: 12352.28389 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17855.09776 - tps: 12677.11941 + dps: 19943.85192 + tps: 14160.13486 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 31217.12027 - tps: 22164.15539 + dps: 33461.0569 + tps: 23757.3504 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31217.12027 - tps: 22164.15539 + dps: 33461.0569 + tps: 23757.3504 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40695.9659 - tps: 28894.13579 + dps: 44305.2215 + tps: 31456.70726 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17370.5812 - tps: 12333.11265 + dps: 19057.25707 + tps: 13530.65252 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17370.5812 - tps: 12333.11265 + dps: 19057.25707 + tps: 13530.65252 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19353.0576 - tps: 13740.6709 + dps: 21225.19117 + tps: 15069.88573 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22300.19411 - tps: 15833.13782 + dps: 45178.62892 + tps: 32076.82653 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22300.19411 - tps: 15833.13782 + dps: 45178.62892 + tps: 32076.82653 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 30254.4844 - tps: 21480.68392 + dps: 56859.46522 + tps: 40370.22031 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12049.52487 - tps: 8555.16266 + dps: 26920.16372 + tps: 19113.31624 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12049.52487 - tps: 8555.16266 + dps: 26920.16372 + tps: 19113.31624 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14294.30333 - tps: 10148.95536 + dps: 29870.29713 + tps: 21207.91096 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24354.12063 - tps: 17291.42565 + dps: 48487.09804 + tps: 34425.83961 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24354.12063 - tps: 17291.42565 + dps: 48487.09804 + tps: 34425.83961 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32286.00164 - tps: 22923.06116 + dps: 60262.54446 + tps: 42786.40657 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12945.99792 - tps: 9191.65852 + dps: 28710.98473 + tps: 20384.79916 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12945.99792 - tps: 9191.65852 + dps: 28710.98473 + tps: 20384.79916 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14879.98214 - tps: 10564.78732 + dps: 31639.61607 + tps: 22464.12741 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21771.11568 - tps: 15457.49213 + dps: 45348.60836 + tps: 32197.51193 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21771.11568 - tps: 15457.49213 + dps: 45348.60836 + tps: 32197.51193 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 30396.45946 - tps: 21581.48622 + dps: 57525.2287 + tps: 40842.91237 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 11670.95409 - tps: 8286.37741 + dps: 26537.66582 + tps: 18841.74273 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 11670.95409 - tps: 8286.37741 + dps: 26537.66582 + tps: 18841.74273 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14073.00942 - tps: 9991.83669 + dps: 29554.61962 + tps: 20983.77993 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24219.47221 - tps: 17195.82527 + dps: 48731.17013 + tps: 34599.13079 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24219.47221 - tps: 17195.82527 + dps: 48731.17013 + tps: 34599.13079 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32721.01733 - tps: 23231.9223 + dps: 60994.88407 + tps: 43306.36769 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12972.35545 - tps: 9210.37237 + dps: 28692.15384 + tps: 20371.42922 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12972.35545 - tps: 9210.37237 + dps: 28692.15384 + tps: 20371.42922 } } dps_results: { - key: "TestSubtlety-Settings-Human-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Human-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15322.83119 - tps: 10879.21014 + dps: 31433.19882 + tps: 22317.57116 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22151.91479 - tps: 15727.8595 + dps: 24259.80678 + tps: 17224.46281 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22151.91479 - tps: 15727.8595 + dps: 24259.80678 + tps: 17224.46281 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29075.33368 - tps: 20643.48691 + dps: 32539.57435 + tps: 23103.09779 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12106.66591 - tps: 8595.7328 + dps: 13389.3626 + tps: 9506.44745 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12106.66591 - tps: 8595.7328 + dps: 13389.3626 + tps: 9506.44745 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 13651.83481 - tps: 9692.80271 + dps: 15199.98813 + tps: 10791.99157 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24161.5393 - tps: 17154.6929 + dps: 26281.22684 + tps: 18659.67105 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24161.5393 - tps: 17154.6929 + dps: 26281.22684 + tps: 18659.67105 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31686.49031 - tps: 22497.40812 + dps: 34551.81894 + tps: 24531.79145 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13140.92884 - tps: 9330.05947 + dps: 14479.69358 + tps: 10280.58244 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13140.92884 - tps: 9330.05947 + dps: 14479.69358 + tps: 10280.58244 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14888.1738 - tps: 10570.6034 + dps: 16146.48035 + tps: 11464.00105 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21907.92329 - tps: 15554.62554 + dps: 23883.84739 + tps: 16957.53164 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21907.92329 - tps: 15554.62554 + dps: 23883.84739 + tps: 16957.53164 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29842.24093 - tps: 21187.99106 + dps: 32627.88795 + tps: 23165.80045 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 11699.67686 - tps: 8306.77057 + dps: 13201.45224 + tps: 9373.03109 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 11699.67686 - tps: 8306.77057 + dps: 13201.45224 + tps: 9373.03109 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 13346.0631 - tps: 9475.7048 + dps: 15159.67022 + tps: 10763.36585 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24196.44674 - tps: 17179.47719 + dps: 26329.62387 + tps: 18694.03295 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24196.44674 - tps: 17179.47719 + dps: 26329.62387 + tps: 18694.03295 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31741.19706 - tps: 22536.24991 + dps: 35207.60752 + tps: 24997.40134 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13096.7651 - tps: 9298.70322 + dps: 14328.46851 + tps: 10173.21264 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13096.7651 - tps: 9298.70322 + dps: 14328.46851 + tps: 10173.21264 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15079.50794 - tps: 10706.45064 + dps: 15775.73823 + tps: 11200.77414 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28846.26624 - tps: 20480.84903 + dps: 31455.00875 + tps: 22333.05621 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28846.26624 - tps: 20480.84903 + dps: 31455.00875 + tps: 22333.05621 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38279.46171 - tps: 27178.41781 + dps: 41932.47562 + tps: 29772.05769 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16161.81704 - tps: 11474.8901 + dps: 17744.5593 + tps: 12598.6371 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16161.81704 - tps: 11474.8901 + dps: 17744.5593 + tps: 12598.6371 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18505.08385 - tps: 13138.60953 + dps: 19893.95477 + tps: 14124.70788 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 31223.35384 - tps: 22168.58122 + dps: 33666.21066 + tps: 23903.00957 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31223.35384 - tps: 22168.58122 + dps: 33666.21066 + tps: 23903.00957 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 41004.36986 - tps: 29113.1026 + dps: 44612.40135 + tps: 31674.80496 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17416.30006 - tps: 12365.57304 + dps: 19093.02293 + tps: 13556.04628 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17416.30006 - tps: 12365.57304 + dps: 19093.02293 + tps: 13556.04628 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19738.6358 - tps: 14014.43142 + dps: 21534.55449 + tps: 15289.53369 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28683.88528 - tps: 20365.55855 + dps: 31391.04381 + tps: 22287.6411 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28683.88528 - tps: 20365.55855 + dps: 31391.04381 + tps: 22287.6411 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38852.12755 - tps: 27585.01056 + dps: 42460.41375 + tps: 30146.89376 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15727.32817 - tps: 11166.403 + dps: 17545.14485 + tps: 12457.05284 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15727.32817 - tps: 11166.403 + dps: 17545.14485 + tps: 12457.05284 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18145.45301 - tps: 12883.27164 + dps: 20254.14477 + tps: 14380.44278 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 31497.10252 - tps: 22362.94279 + dps: 33761.4205 + tps: 23970.60855 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31497.10252 - tps: 22362.94279 + dps: 33761.4205 + tps: 23970.60855 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 41234.48985 - tps: 29276.4878 + dps: 44854.34714 + tps: 31846.58647 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17534.59827 - tps: 12449.56477 + dps: 19222.08013 + tps: 13647.67689 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17534.59827 - tps: 12449.56477 + dps: 19222.08013 + tps: 13647.67689 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19654.27902 - tps: 13954.5381 + dps: 21541.38754 + tps: 15294.38515 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22525.12838 - tps: 15992.84115 + dps: 45493.04743 + tps: 32300.06368 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22525.12838 - tps: 15992.84115 + dps: 45493.04743 + tps: 32300.06368 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 30721.05358 - tps: 21811.94804 + dps: 57412.62904 + tps: 40762.96662 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12172.25695 - tps: 8642.30243 + dps: 27082.61157 + tps: 19228.65422 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12172.25695 - tps: 8642.30243 + dps: 27082.61157 + tps: 19228.65422 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14543.97969 - tps: 10326.22558 + dps: 30177.98045 + tps: 21426.36612 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24597.48905 - tps: 17464.21723 + dps: 48817.7266 + tps: 34660.58588 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24597.48905 - tps: 17464.21723 + dps: 48817.7266 + tps: 34660.58588 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 32775.11916 - tps: 23270.3346 + dps: 60846.88949 + tps: 43201.29154 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13068.58398 - tps: 9278.69463 + dps: 28977.19097 + tps: 20573.80559 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13068.58398 - tps: 9278.69463 + dps: 28977.19097 + tps: 20573.80559 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15137.7647 - tps: 10747.81293 + dps: 31967.46276 + tps: 22696.89856 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21978.56503 - tps: 15604.78117 + dps: 45669.40026 + tps: 32425.27418 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21978.56503 - tps: 15604.78117 + dps: 45669.40026 + tps: 32425.27418 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 30871.19751 - tps: 21918.55023 + dps: 58098.13562 + tps: 41249.67629 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 11789.88887 - tps: 8370.8211 + dps: 26716.80411 + tps: 18968.93092 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 11789.88887 - tps: 8370.8211 + dps: 26716.80411 + tps: 18968.93092 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14322.90348 - tps: 10169.26147 + dps: 29854.27637 + tps: 21196.53622 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24453.25386 - tps: 17361.81024 + dps: 49069.58765 + tps: 34839.40723 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24453.25386 - tps: 17361.81024 + dps: 49069.58765 + tps: 34839.40723 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 33213.43267 - tps: 23581.53719 + dps: 61578.67403 + tps: 43720.85856 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13098.09185 - tps: 9299.64521 + dps: 28875.79312 + tps: 20501.81312 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13098.09185 - tps: 9299.64521 + dps: 28875.79312 + tps: 20501.81312 } } dps_results: { - key: "TestSubtlety-Settings-Orc-preraid_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p4_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15577.93484 - tps: 11060.33374 + dps: 31781.18562 + tps: 22564.64179 } } dps_results: { key: "TestSubtlety-SwitchInFrontOfTarget-Default" value: { - dps: 18818.20043 - tps: 13360.92231 + dps: 17509.65293 + tps: 12431.85358 } } diff --git a/sim/rogue/subtlety/hemorrhage.go b/sim/rogue/subtlety/hemorrhage.go index 0335ba0bf5..26a2c1335d 100644 --- a/sim/rogue/subtlety/hemorrhage.go +++ b/sim/rogue/subtlety/hemorrhage.go @@ -62,7 +62,7 @@ func (subRogue *SubtletyRogue) registerHemorrhageSpell() { ClassSpellMask: rogue.RogueSpellHemorrhage, EnergyCost: core.EnergyCostOptions{ - Cost: 35 - 2*float64(subRogue.Talents.SlaughterFromTheShadows), + Cost: 35, Refund: 0.8, }, Cast: core.CastConfig{ diff --git a/sim/rogue/subtlety/serrated_blades.go b/sim/rogue/subtlety/serrated_blades.go deleted file mode 100644 index a21fe90540..0000000000 --- a/sim/rogue/subtlety/serrated_blades.go +++ /dev/null @@ -1,28 +0,0 @@ -package subtlety - -import "github.com/wowsims/cata/sim/core" - -func (subRogue *SubtletyRogue) applySerratedBlades() { - chancePerPoint := 0.1 * float64(subRogue.Talents.SerratedBlades) - - subRogue.RegisterAura(core.Aura{ - Label: "Serrated Blades", - Duration: core.NeverExpires, - - OnReset: func(aura *core.Aura, sim *core.Simulation) { - aura.Activate(sim) - }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell.Unit == &subRogue.Unit && spell == subRogue.Eviscerate { - procChance := float64(subRogue.ComboPoints()) * chancePerPoint - if sim.Proc(procChance, "Serrated Blades") { - rupAura := subRogue.Rupture.Dot(result.Target) - if rupAura.IsActive() { - // println(rupAura.Duration) - rupAura.Activate(sim) - } - } - } - }, - }) -} diff --git a/sim/rogue/subtlety/shadow_dance.go b/sim/rogue/subtlety/shadow_dance.go index 63411f096b..1919e2bb7c 100644 --- a/sim/rogue/subtlety/shadow_dance.go +++ b/sim/rogue/subtlety/shadow_dance.go @@ -14,10 +14,9 @@ func (subRogue *SubtletyRogue) registerShadowDanceCD() { return } - duration := time.Second * 6 - if subRogue.HasPrimeGlyph(proto.RoguePrimeGlyph_GlyphOfShadowDance) { - duration = time.Second * 8 - } + hasGlyph := subRogue.HasPrimeGlyph(proto.RoguePrimeGlyph_GlyphOfShadowDance) + t13Bonus := subRogue.HasSetBonus(rogue.Tier13, 4) + duration := core.TernaryDuration(hasGlyph, time.Second*8, time.Second*6) + core.TernaryDuration(t13Bonus, time.Second*2, 0) actionID := core.ActionID{SpellID: 51713} diff --git a/sim/rogue/subtlety/subtlety.go b/sim/rogue/subtlety/subtlety.go index 6bd441ca50..eff3e95229 100644 --- a/sim/rogue/subtlety/subtlety.go +++ b/sim/rogue/subtlety/subtlety.go @@ -9,6 +9,7 @@ import ( const masteryDamagePerPoint = .025 const masteryBaseEffect = 0.2 +const masteryFloored = false // Firelands patch appears to have fixed this issue func RegisterSubtletyRogue() { core.RegisterAgentFactory( @@ -36,7 +37,6 @@ func (subRogue *SubtletyRogue) Initialize() { subRogue.registerHonorAmongThieves() subRogue.applyInitiative() - subRogue.applySerratedBlades() subRogue.applyFindWeakness() subRogue.registerMasterOfSubtletyCD() diff --git a/sim/rogue/subtlety/subtlety_test.go b/sim/rogue/subtlety/subtlety_test.go index dbdc2116db..2f1b04b231 100644 --- a/sim/rogue/subtlety/subtlety_test.go +++ b/sim/rogue/subtlety/subtlety_test.go @@ -20,8 +20,7 @@ func TestSubtlety(t *testing.T) { GearSet: core.GetGearSet("../../../ui/rogue/subtlety/gear_sets", "p1_subtlety"), OtherGearSets: []core.GearSetCombo{ core.GetGearSet("../../../ui/rogue/subtlety/gear_sets", "p3_subtlety"), - core.GetGearSet("../../../ui/rogue/subtlety/gear_sets", "preraid_subtlety"), - //core.GetGearSet("../../../ui/rogue/subtlety/gear_sets", "p4_subtlety"), + core.GetGearSet("../../../ui/rogue/subtlety/gear_sets", "p4_subtlety"), }, Talents: SubtletyTalents, Glyphs: SubtletyGlyphs, diff --git a/sim/rogue/talents.go b/sim/rogue/talents.go index 3611096de6..3791e8fe1f 100644 --- a/sim/rogue/talents.go +++ b/sim/rogue/talents.go @@ -24,15 +24,6 @@ func (rogue *Rogue) ApplyTalents() { rogue.relentlessStrikesMetrics = rogue.NewEnergyMetrics(core.ActionID{SpellID: 14179}) } - rogue.applyGlyphOfTricks() -} - -// DWSMultiplier returns the offhand damage multiplier -func (rogue *Rogue) DWSMultiplier() float64 { - // DWS (Now named Ambidexterity) is now a Combat rogue passive - return core.TernaryFloat64(rogue.Spec == proto.Spec_SpecCombatRogue, 1.75, 1) -} -func (rogue *Rogue) applyGlyphOfTricks() { if rogue.HasMajorGlyph(proto.RogueMajorGlyph_GlyphOfTricksOfTheTrade) { rogue.AddStaticMod(core.SpellModConfig{ Kind: core.SpellMod_PowerCost_Flat, @@ -40,4 +31,24 @@ func (rogue *Rogue) applyGlyphOfTricks() { ClassMask: RogueSpellTricksOfTheTrade, }) } + + if rogue.Talents.SlaughterFromTheShadows > 0 { + rogue.AddStaticMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: []float64{-0, -7, -14, -20}[rogue.Talents.SlaughterFromTheShadows], + ClassMask: RogueSpellBackstab | RogueSpellAmbush, + }) + + rogue.AddStaticMod(core.SpellModConfig{ + Kind: core.SpellMod_PowerCost_Flat, + FloatValue: float64(-2 * rogue.Talents.SlaughterFromTheShadows), + ClassMask: RogueSpellHemorrhage | RogueSpellFanOfKnives, + }) + } +} + +// DWSMultiplier returns the offhand damage multiplier +func (rogue *Rogue) DWSMultiplier() float64 { + // DWS (Now named Ambidexterity) is now a Combat rogue passive + return core.TernaryFloat64(rogue.Spec == proto.Spec_SpecCombatRogue, 1.75, 1) } diff --git a/ui/core/constants/item_notices.tsx b/ui/core/constants/item_notices.tsx index d80d6a7e67..1d110a5b1d 100644 --- a/ui/core/constants/item_notices.tsx +++ b/ui/core/constants/item_notices.tsx @@ -166,49 +166,6 @@ export const ITEM_NOTICES = new Map([ [Spec.SpecDestructionWarlock]: DTR_FIRST_IMPLEMENTATION_WARNING, }, ], - // Rogue Legendary Daggers (All Stages) - [ - // Fear - 77945, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], - [ - // Vengeance - 77946, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], - [ - // Sleeper - 77947, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], - [ - // Dreamer - 77948, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], - [ - // Golad - 77949, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], - [ - // Tiriosh - 77950, - { - [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, - }, - ], [ // VPLC - Normal 68925, diff --git a/ui/rogue/assassination/apls/mutilate.apl.json b/ui/rogue/assassination/apls/mutilate.apl.json index 17ef14ab65..5b3e8438a1 100644 --- a/ui/rogue/assassination/apls/mutilate.apl.json +++ b/ui/rogue/assassination/apls/mutilate.apl.json @@ -14,8 +14,8 @@ {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58427}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":703}}}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":703}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":1856}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}}]}},"castSpell":{"spellId":{"spellId":58984}}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":32645}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"55"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":32645}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}}]}},{"not":{"val":{"isExecutePhase":{"threshold":"E35"}}}}]}},"castSpell":{"spellId":{"spellId":32645}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":32645}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"65"}}}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":32645}}}}}]}},{"isExecutePhase":{"threshold":"E35"}}]}},"castSpell":{"spellId":{"spellId":32645}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":32645}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"55"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":32645}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}},{"auraIsActive":{"auraId":{"spellId":109949}}}]}},{"not":{"val":{"isExecutePhase":{"threshold":"E35"}}}}]}},"castSpell":{"spellId":{"spellId":32645}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":32645}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"65"}}}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":32645}}}}},{"auraIsActive":{"auraId":{"spellId":109949}}}]}},{"isExecutePhase":{"threshold":"E35"}}]}},"castSpell":{"spellId":{"spellId":32645}}}}, {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"isExecutePhase":{"threshold":"E35"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"90"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":1329}}}}, {"action":{"condition":{"and":{"vals":[{"isExecutePhase":{"threshold":"E35"}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":53}}}}, {"action":{"castSpell":{"spellId":{"spellId":57934}}}} diff --git a/ui/rogue/assassination/gear_sets/p4_assassination.gear.json b/ui/rogue/assassination/gear_sets/p4_assassination.gear.json new file mode 100644 index 0000000000..b27509eb4e --- /dev/null +++ b/ui/rogue/assassination/gear_sets/p4_assassination.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":78699,"enchant":4209,"gems":[68778,71879],"reforging":147}, + {"id":71610,"reforging":151}, + {"id":78368,"enchant":4204,"gems":[71879,71879],"reforging":151}, + {"id":71415,"enchant":4100,"gems":[71879,71879]}, + {"id":78664,"enchant":4102,"gems":[71879,71879,71879],"reforging":151}, + {"id":78446,"enchant":4258,"gems":[71879,71879],"reforging":147}, + {"id":78679,"enchant":4107,"gems":[71879,71879],"reforging":161}, + {"id":78388,"gems":[71879,71879,71879],"reforging":147}, + {"id":78708,"enchant":4126,"gems":[71879,71879,71852],"reforging":147}, + {"id":78462,"enchant":4076,"gems":[71879,71879],"reforging":161}, + {"id":78489,"gems":[52212],"reforging":160}, + {"id":78413,"gems":[71879],"reforging":147}, + {"id":77993}, + {"id":77994}, + {"id":77949,"enchant":4099,"gems":[71879],"reforging":147}, + {"id":77950,"enchant":4099,"gems":[71879],"reforging":158}, + {"id":78369,"reforging":140} + ] +} diff --git a/ui/rogue/assassination/presets.ts b/ui/rogue/assassination/presets.ts index 94b447820f..78a9f89f1f 100644 --- a/ui/rogue/assassination/presets.ts +++ b/ui/rogue/assassination/presets.ts @@ -6,8 +6,9 @@ import { Stats } from '../../core/proto_utils/stats'; import MutilateApl from './apls/mutilate.apl.json'; import P1AssassinationGear from './gear_sets/p1_assassination.gear.json'; import P1ExpertiseGear from './gear_sets/p1_expertise.gear.json'; -import P3AssassinationGear from './gear_sets/p3_assassination.gear.json' -import PreraidAssassination from './gear_sets/preraid_assassination.gear.json' +import P3AssassinationGear from './gear_sets/p3_assassination.gear.json'; +import P4AssassinationGear from './gear_sets/p4_assassination.gear.json'; +import PreraidAssassination from './gear_sets/preraid_assassination.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -16,7 +17,8 @@ import PreraidAssassination from './gear_sets/preraid_assassination.gear.json' export const P1_PRESET_ASSASSINATION = PresetUtils.makePresetGear('P1 Assassination', P1AssassinationGear); export const P1_PRESET_ASN_EXPERTISE = PresetUtils.makePresetGear('P1 Expertise', P1ExpertiseGear); export const P3_PRESET_ASSASSINATION = PresetUtils.makePresetGear('P3 Assassination', P3AssassinationGear); -export const PRERAID_PRESET_ASSASSINATION = PresetUtils.makePresetGear('Pre-Raid Assassination', PreraidAssassination) +export const PRERAID_PRESET_ASSASSINATION = PresetUtils.makePresetGear('Pre-Raid Assassination', PreraidAssassination); +export const P4_PRESET_ASSASSINATION = PresetUtils.makePresetGear('P4 Assassination', P4AssassinationGear); export const ROTATION_PRESET_MUTILATE = PresetUtils.makePresetAPLRotation('Assassination', MutilateApl); diff --git a/ui/rogue/assassination/sim.ts b/ui/rogue/assassination/sim.ts index b70077db6c..088b90c1c8 100644 --- a/ui/rogue/assassination/sim.ts +++ b/ui/rogue/assassination/sim.ts @@ -149,7 +149,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAssassinationRogue, { // Preset rotations that the user can quickly select. rotations: [Presets.ROTATION_PRESET_MUTILATE], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET_ASSASSINATION, Presets.P1_PRESET_ASSASSINATION, Presets.P1_PRESET_ASN_EXPERTISE, Presets.P3_PRESET_ASSASSINATION], + gear: [Presets.PRERAID_PRESET_ASSASSINATION, Presets.P1_PRESET_ASSASSINATION, Presets.P1_PRESET_ASN_EXPERTISE, Presets.P3_PRESET_ASSASSINATION, Presets.P4_PRESET_ASSASSINATION], }, autoRotation: (player: Player): APLRotation => { diff --git a/ui/rogue/combat/apls/combat.apl.json b/ui/rogue/combat/apls/combat.apl.json index b6ade7d880..08cd8dea49 100644 --- a/ui/rogue/combat/apls/combat.apl.json +++ b/ui/rogue/combat/apls/combat.apl.json @@ -1,15 +1,15 @@ { "type": "TypeAPL", - "prepullActions": [ + "prepullActions": [ {"action":{"castSpell":{"spellId":{"spellId":57934}}},"doAtValue":{"const":{"val":"-1s"}}}, {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":5171}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"0"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":1752}}},{"castSpell":{"spellId":{"spellId":5171}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":5171}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":5171}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},{"auraIsActive":{"auraId":{"spellId":84747}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":51690}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":5171}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":5171}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}},{"auraIsKnown":{"auraId":{"spellId":109949}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsKnown":{"auraId":{"spellId":109949}}}}}]}}]}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":1943}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":84747}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":13877}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":13750}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}}},{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33876}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":16511}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":57386}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":29859}}}]}}]}},"castSpell":{"spellId":{"spellId":1943}}}}, {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":2098}}}}, {"hide":true,"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":96648}}},"rhs":{"const":{"val":"1.5"}}}},"castSpell":{"spellId":{"spellId":5938}}}}, diff --git a/ui/rogue/combat/gear_sets/p1_combat.gear.json b/ui/rogue/combat/gear_sets/p1_combat.gear.json index 290a26114c..e7a07a0d2b 100644 --- a/ui/rogue/combat/gear_sets/p1_combat.gear.json +++ b/ui/rogue/combat/gear_sets/p1_combat.gear.json @@ -1,19 +1,21 @@ -{"items": [ - {"id":65241,"enchant":4209,"gems":[68778,52220],"reforging":146}, - {"id":65107,"reforging":168}, - {"id":65243,"enchant":4204,"gems":[52220],"reforging":147}, - {"id":69884,"randomSuffix":-136,"enchant":1099,"reforging":168}, - {"id":65239,"enchant":4102,"gems":[52212,52220]}, - {"id":65050,"enchant":4258,"gems":[0],"reforging":145}, - {"id":65240,"enchant":4107,"gems":[52212,0],"reforging":153}, - {"id":60231,"gems":[52220,52212,52212],"reforging":145}, - {"id":65381,"randomSuffix":-202,"enchant":4126,"gems":[52212,52220],"reforging":168}, - {"id":65144,"enchant":4105,"gems":[52212],"reforging":168}, - {"id":65367,"randomSuffix":-136,"reforging":168}, - {"id":65082,"reforging":145}, - {"id":65026}, - {"id":58181,"reforging":138}, - {"id":68130,"randomSuffix":-136,"enchant":4099,"reforging":165}, - {"id":68600,"enchant":4099,"reforging":146}, - {"id":65095,"reforging":147} -]} +{ + "items": [ + {"id":65241,"enchant":4209,"gems":[68778,52220],"reforging":145}, + {"id":65107,"reforging":168}, + {"id":65243,"enchant":4204,"gems":[52220],"reforging":144}, + {"id":69884,"randomSuffix":-136,"enchant":1099,"reforging":168}, + {"id":65239,"enchant":4102,"gems":[52212,52220],"reforging":151}, + {"id":65050,"enchant":4258,"gems":[0],"reforging":145}, + {"id":65240,"enchant":4107,"gems":[52212,0],"reforging":153}, + {"id":60231,"gems":[52220,52212,52212],"reforging":146}, + {"id":65381,"randomSuffix":-202,"enchant":4126,"gems":[52212,52220],"reforging":168}, + {"id":65144,"enchant":4105,"gems":[52212],"reforging":168}, + {"id":65367,"randomSuffix":-136,"reforging":165}, + {"id":65082,"reforging":145}, + {"id":65026}, + {"id":58181,"reforging":138}, + {"id":68130,"randomSuffix":-136,"enchant":4099,"reforging":165}, + {"id":68600,"enchant":4099,"reforging":144}, + {"id":65095,"reforging":146} + ] +} diff --git a/ui/rogue/combat/gear_sets/p4_combat.gear.json b/ui/rogue/combat/gear_sets/p4_combat.gear.json new file mode 100644 index 0000000000..559bbf7464 --- /dev/null +++ b/ui/rogue/combat/gear_sets/p4_combat.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":78699,"enchant":4209,"gems":[68778,71879],"reforging":144}, + {"id":71610}, + {"id":78368,"enchant":4204,"gems":[71879,71879]}, + {"id":71415,"enchant":4100,"gems":[71879,71879],"reforging":138}, + {"id":78664,"enchant":4102,"gems":[71879,71879,71879]}, + {"id":78446,"enchant":4258,"gems":[71879,71879],"reforging":147}, + {"id":78679,"enchant":4107,"gems":[71879,71879],"reforging":161}, + {"id":78388,"gems":[71879,71879,71879],"reforging":147}, + {"id":78708,"enchant":4126,"gems":[71879,71879,71848],"reforging":147}, + {"id":78462,"enchant":4105,"gems":[71879,71879],"reforging":161}, + {"id":78489,"gems":[71879],"reforging":160}, + {"id":78413,"gems":[71879],"reforging":147}, + {"id":77994}, + {"id":77993}, + {"id":77949,"enchant":4099,"gems":[71879],"reforging":147}, + {"id":77950,"enchant":4099,"gems":[71879],"reforging":158}, + {"id":78369,"reforging":153} + ] +} diff --git a/ui/rogue/combat/presets.ts b/ui/rogue/combat/presets.ts index 2c8248b942..22d3ed58e3 100644 --- a/ui/rogue/combat/presets.ts +++ b/ui/rogue/combat/presets.ts @@ -1,5 +1,3 @@ -import * as Mechanics from '../../core/constants/mechanics'; -import { Rogue } from '../../core/player_classes/rogue'; import * as PresetUtils from '../../core/preset_utils'; import { Conjured, Consumes, Flask, Food, Glyphs, Potions, PseudoStat, Stat } from '../../core/proto/common'; import { CombatRogue_Options as RogueOptions, RogueMajorGlyph, RogueOptions_PoisonImbue, RoguePrimeGlyph } from '../../core/proto/rogue'; @@ -8,6 +6,7 @@ import { Stats } from '../../core/proto_utils/stats'; import CombatApl from './apls/combat.apl.json'; import P1CombatGear from './gear_sets/p1_combat.gear.json'; import P3CombatGear from './gear_sets/p3_combat.gear.json'; +import P4CombatGear from './gear_sets/p4_combat.gear.json'; import PreraidCombatGear from './gear_sets/preraid_combat.gear.json' // Preset options for this spec. @@ -17,12 +16,13 @@ import PreraidCombatGear from './gear_sets/preraid_combat.gear.json' export const P1_PRESET_COMBAT = PresetUtils.makePresetGear('P1 Combat', P1CombatGear); export const P3_PRESET_COMBAT = PresetUtils.makePresetGear('P3 Combat', P3CombatGear); export const PRERAID_PRESET_COMBAT = PresetUtils.makePresetGear('Pre-Raid Combat', PreraidCombatGear); +export const P4_PRESET_COMBAT = PresetUtils.makePresetGear('P4 Combat', P4CombatGear); export const ROTATION_PRESET_COMBAT = PresetUtils.makePresetAPLRotation('Combat', CombatApl); // Preset options for EP weights -export const CBAT_HASTE_EP_PRESET = PresetUtils.makePresetEpWeights( - 'Combat', +export const CBAT_STANDARD_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Combat Low Gear', Stats.fromMap( { [Stat.StatAgility]: 2.85, @@ -38,12 +38,12 @@ export const CBAT_HASTE_EP_PRESET = PresetUtils.makePresetEpWeights( [PseudoStat.PseudoStatMainHandDps]: 4.31, [PseudoStat.PseudoStatOffHandDps]: 1.32, [PseudoStat.PseudoStatSpellHitPercent]: 46, - [PseudoStat.PseudoStatPhysicalHitPercent]: 210, + [PseudoStat.PseudoStatPhysicalHitPercent]: 220, }, ), ); -// 4PT12 pushes Haste, Mastery, and Crit up moderately (Crit also gains from 2P but has no affect on reforging); Haste and Mastery overtake Hit for reforging +// 4PT12 pushes Haste, Mastery, and Crit up moderately (Crit also gains from 2P but has no affect on reforging); Haste and Mastery overtake Hit for reforging entirely (Trends towards 10%-ish) export const CBAT_4PT12_EP_PRESET = PresetUtils.makePresetEpWeights( 'Combat 4PT12', Stats.fromMap( @@ -61,7 +61,54 @@ export const CBAT_4PT12_EP_PRESET = PresetUtils.makePresetEpWeights( [PseudoStat.PseudoStatMainHandDps]: 4.31, [PseudoStat.PseudoStatOffHandDps]: 1.32, [PseudoStat.PseudoStatSpellHitPercent]: 46, - [PseudoStat.PseudoStatPhysicalHitPercent]: 210, + [PseudoStat.PseudoStatPhysicalHitPercent]: 230, + }, + ), +); + +// By mostly-T12 gear or better, Haste+Mastery overtake capping Spell Hit, but Spell Hit retains enough value to not ignore (Trends towards 15%-ish) +export const CBAT_T13_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Combat High Gear', + Stats.fromMap( + { + [Stat.StatAgility]: 2.85, + [Stat.StatStrength]: 1.05, + [Stat.StatAttackPower]: 1, + [Stat.StatCritRating]: 1.19, + [Stat.StatHitRating]: 2.5, + [Stat.StatHasteRating]: 1.86, + [Stat.StatMasteryRating]: 1.55, + [Stat.StatExpertiseRating]: 2.1, + }, + { + [PseudoStat.PseudoStatMainHandDps]: 4.31, + [PseudoStat.PseudoStatOffHandDps]: 1.32, + [PseudoStat.PseudoStatSpellHitPercent]: 52, + [PseudoStat.PseudoStatPhysicalHitPercent]: 230, + }, + ), +); + + +// No'Kaled MH MASSIVELY inflates Mastery's EP value as Main Gauche procs can proc weapon effects +export const CBAT_NOKALED_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Combat No\'Kaled', + Stats.fromMap( + { + [Stat.StatAgility]: 2.85, + [Stat.StatStrength]: 1.05, + [Stat.StatAttackPower]: 1, + [Stat.StatCritRating]: 1.19, + [Stat.StatHitRating]: 2.5, + [Stat.StatHasteRating]: 1.76, + [Stat.StatMasteryRating]: 1.78, + [Stat.StatExpertiseRating]: 2.1, + }, + { + [PseudoStat.PseudoStatMainHandDps]: 4.31, + [PseudoStat.PseudoStatOffHandDps]: 1.32, + [PseudoStat.PseudoStatSpellHitPercent]: 52, + [PseudoStat.PseudoStatPhysicalHitPercent]: 250, }, ), ); diff --git a/ui/rogue/combat/sim.ts b/ui/rogue/combat/sim.ts index 220d29752e..0ed8030624 100644 --- a/ui/rogue/combat/sim.ts +++ b/ui/rogue/combat/sim.ts @@ -10,6 +10,7 @@ import { Debuffs, Faction, IndividualBuffs, ItemSlot, PartyBuffs, PseudoStat, Ra import { RogueOptions_PoisonImbue } from '../../core/proto/rogue'; import { StatCapType } from '../../core/proto/ui'; import { StatCap, Stats, UnitStat } from '../../core/proto_utils/stats'; +import { Sim } from '../../core/sim'; import * as RogueInputs from '../inputs'; import * as Presets from './presets'; @@ -54,7 +55,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { // Default equipped gear. gear: Presets.P3_PRESET_COMBAT.gear, // Default EP weights for sorting gear in the gear picker. - epWeights: Presets.CBAT_HASTE_EP_PRESET.epWeights, + epWeights: Presets.CBAT_STANDARD_EP_PRESET.epWeights, // Stat caps for reforge optimizer statCaps: (() => { const expCap = new Stats().withStat(Stat.StatExpertiseRating, 6.5 * 4 * Mechanics.EXPERTISE_PER_QUARTER_PERCENT_REDUCTION); @@ -63,23 +64,25 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { softCapBreakpoints: (() => { // Running just under spell cap is typically preferrable to being over. const spellHitSoftCapConfig = StatCap.fromPseudoStat(PseudoStat.PseudoStatSpellHitPercent, { - breakpoints: [16.95, 16.96, 16.97, 16.98, 16.99, 17], + breakpoints: [16.90, 16.95, 16.96, 16.97, 16.98, 16.99, 17], capType: StatCapType.TypeSoftCap, - postCapEPs: [0, 0, 0, 0, 0, 0], + // These are set by the active EP weight in the updateSoftCaps callback + postCapEPs: [0, 0, 0, 0, 0, 0, 0], }); const meleeHitSoftCapConfig = StatCap.fromPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, { breakpoints: [8, 27], capType: StatCapType.TypeSoftCap, - postCapEPs: [110, 0], + // These are set by the active EP weight in the updateSoftCaps callback + postCapEPs: [0, 0], }); const hasteRatingSoftCapConfig = StatCap.fromStat(Stat.StatHasteRating, { - breakpoints: [2070, 2150, 2250], + breakpoints: [2070, 2150, 2250, 2350, 2450], capType: StatCapType.TypeSoftCap, // These are set by the active EP weight in the updateSoftCaps callback - postCapEPs: [0, 0, 0], - }); + postCapEPs: [0, 0, 0, 0, 0], + }) return [meleeHitSoftCapConfig, spellHitSoftCapConfig, hasteRatingSoftCapConfig]; })(), @@ -148,13 +151,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { }, presets: { - epWeights: [Presets.CBAT_HASTE_EP_PRESET, Presets.CBAT_4PT12_EP_PRESET], + epWeights: [Presets.CBAT_STANDARD_EP_PRESET, Presets.CBAT_4PT12_EP_PRESET, Presets.CBAT_T13_EP_PRESET, Presets.CBAT_NOKALED_EP_PRESET], // Preset talents that the user can quickly select. talents: [Presets.CombatTalents], // Preset rotations that the user can quickly select. rotations: [Presets.ROTATION_PRESET_COMBAT], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET_COMBAT, Presets.P1_PRESET_COMBAT, Presets.P3_PRESET_COMBAT], + gear: [Presets.PRERAID_PRESET_COMBAT, Presets.P1_PRESET_COMBAT, Presets.P3_PRESET_COMBAT, Presets.P4_PRESET_COMBAT], }, autoRotation: (player: Player): APLRotation => { @@ -191,6 +194,27 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { ], }); +const getActiveEPWeight = (player: Player, sim: Sim): Stats => { + if (sim.getUseCustomEPValues()) { + return player.getEpWeights(); + } else { + const mhWepId = player.getEquippedItem(ItemSlot.ItemSlotMainHand)?.id; + const playerGear = player.getGear(); + let avgIlvl = 0; + playerGear.asArray().forEach(v => avgIlvl += v?.item.ilvl || 0); + avgIlvl /= playerGear.asArray().length; + if (mhWepId == 78472 || mhWepId == 77188 || mhWepId == 78481) { // No'Kaled MH + return Presets.CBAT_NOKALED_EP_PRESET.epWeights; + } else if (playerGear.getItemSetCount("Vestments of the Dark Phoenix") == 4) { + return Presets.CBAT_4PT12_EP_PRESET.epWeights; + } else if (playerGear.getItemSetCount("Blackfang Battleweave") || avgIlvl >= 380) { // T13, or high enough that Haste+Mastery overtake Spell Hit Cap + return Presets.CBAT_T13_EP_PRESET.epWeights; + } else { + return Presets.CBAT_STANDARD_EP_PRESET.epWeights; + } + } +} + export class CombatRogueSimUI extends IndividualSimUI { constructor(parentElem: HTMLElement, player: Player) { super(parentElem, player, SPEC_CONFIG); @@ -198,15 +222,43 @@ export class CombatRogueSimUI extends IndividualSimUI { player.sim.waitForInit().then(() => { new ReforgeOptimizer(this, { updateSoftCaps: (softCaps: StatCap[]) => { - const hasteEP = player.getEpWeights().getStat(Stat.StatHasteRating); + const activeEPWeight = getActiveEPWeight(player, this.sim); + const mhWepId = player.getEquippedItem(ItemSlot.ItemSlotMainHand)?.id + const hasteEP = activeEPWeight.getStat(Stat.StatHasteRating); const hasteSoftCap = softCaps.find(v => v.unitStat.equalsStat(Stat.StatHasteRating)); if (hasteSoftCap) { - hasteSoftCap.postCapEPs = [hasteEP - 0.1, hasteEP - 0.2, hasteEP - 0.3]; + // If wearing either Fear or Sleeper in MH, Haste EP is never overtaken by Mastery + if (mhWepId == 77945 || mhWepId == 77947) + hasteSoftCap.postCapEPs = [hasteEP, hasteEP, hasteEP, hasteEP, hasteEP] + else + hasteSoftCap.postCapEPs = [hasteEP - 0.1, hasteEP - 0.2, hasteEP - 0.3, hasteEP - 0.4, hasteEP - 0.5]; + } + + // Dynamic adjustments to the static Hit soft cap EP + const meleeSoftCap = softCaps.find(v => v.unitStat.equalsPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent)); + const spellSoftCap = softCaps.find(v => v.unitStat.equalsPseudoStat(PseudoStat.PseudoStatSpellHitPercent)); + if (meleeSoftCap) { + const initialEP = activeEPWeight.getPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent); + // Any dagger MH inflates white hit EP - sufficient to force Spell Hit Cap + if (mhWepId == 77945 || mhWepId == 77947 || mhWepId == 77949) { + meleeSoftCap.postCapEPs = [initialEP/1.75, 0]; + } else { + meleeSoftCap.postCapEPs = [initialEP/2, 0]; + } + + } + if (spellSoftCap) { + const initialEP = activeEPWeight.getPseudoStat(PseudoStat.PseudoStatSpellHitPercent); + player.getEpRatios + spellSoftCap.postCapEPs = [initialEP-5, initialEP/2, initialEP/4, initialEP/8, initialEP/16, initialEP/32, 0]; } - return softCaps; + return softCaps + }, + getEPDefaults: (player: Player) => { + return getActiveEPWeight(player, this.sim); }, - updateGearStatsModifier(baseStats: Stats) { + updateGearStatsModifier: (baseStats: Stats) => { // Human/Orc racials for MH. Maxing Expertise for OH is a DPS loss when the MH matches the racial. const mhWepType = player.getEquippedItem(ItemSlot.ItemSlotMainHand)?.item.weaponType; if ((player.getRace() == Race.RaceHuman && (mhWepType == WeaponType.WeaponTypeSword || mhWepType == WeaponType.WeaponTypeMace) || diff --git a/ui/rogue/subtlety/apls/subtlety.apl.json b/ui/rogue/subtlety/apls/subtlety.apl.json index d4fadc8076..dd9954bce3 100644 --- a/ui/rogue/subtlety/apls/subtlety.apl.json +++ b/ui/rogue/subtlety/apls/subtlety.apl.json @@ -14,14 +14,15 @@ {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":1943}}},"rhs":{"const":{"val":"6"}}}}]}},"castSpell":{"spellId":{"spellId":2098}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":73651}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}},"castSpell":{"spellId":{"spellId":73651}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":5171}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8"}}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":5171}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}}]}}]}},"castSpell":{"spellId":{"spellId":5171}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":109949}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51713}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":8676}}}}, {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":2098}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":89775}}},"rhs":{"const":{"val":"3"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":51713}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":16511}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":89775}}},"rhs":{"const":{"val":"3"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":51713}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}},{"cmp":{"op":"OpGe","lhs":{"auraInternalCooldown":{"auraId":{"spellId":51701}}},"rhs":{"const":{"val":"1"}}}}]}}]}}]}}]}},"castSpell":{"spellId":{"spellId":16511}}}}, {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},{"auraIsActive":{"auraId":{"spellId":51713}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":1784}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":36554}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58984}}}}}]}},"castSpell":{"spellId":{"spellId":51713}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":51713}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58984}}}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58984}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"strictSequence":{"actions":[{"waitUntil":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}}}},{"castSpell":{"spellId":{"spellId":51713}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":51713}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58984}}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":91023}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":51713}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1784}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":51713}}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":58984}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":14183}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":1943}}},"rhs":{"const":{"val":"8"}}}},"waitUntil":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":1943}}},"rhs":{"const":{"val":"8"}}}},{"dotIsActive":{"spellId":{"spellId":1943}}}]}},"waitUntil":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"95"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51713}}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraInternalCooldown":{"auraId":{"spellId":51701}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}}]}},"castSpell":{"spellId":{"spellId":8676}}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"95"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraInternalCooldown":{"auraId":{"spellId":51701}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}}]}},"castSpell":{"spellId":{"spellId":53}}}}, {"action":{"castSpell":{"spellId":{"spellId":57934}}}}, diff --git a/ui/rogue/subtlety/gear_sets/p4_subtlety.gear.json b/ui/rogue/subtlety/gear_sets/p4_subtlety.gear.json new file mode 100644 index 0000000000..192eefb8b0 --- /dev/null +++ b/ui/rogue/subtlety/gear_sets/p4_subtlety.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":71539,"enchant":4209,"gems":[68778,71848],"reforging":137}, + {"id":77091,"reforging":139}, + {"id":78368,"enchant":4204,"gems":[71879,71879],"reforging":166}, + {"id":71415,"enchant":4100,"gems":[71879,71879],"reforging":138}, + {"id":78664,"enchant":4102,"gems":[71879,71879,71879],"reforging":166}, + {"id":78446,"enchant":4258,"gems":[71879,0]}, + {"id":71538,"enchant":4068,"gems":[71879,0]}, + {"id":78388,"gems":[71879,71879,71879],"reforging":160}, + {"id":78708,"enchant":4126,"gems":[71879,71879,71848],"reforging":138}, + {"id":78462,"enchant":4105,"gems":[71879,71879],"reforging":159}, + {"id":78413,"gems":[71879]}, + {"id":78489,"gems":[71879],"reforging":167}, + {"id":77993}, + {"id":77994}, + {"id":77949,"enchant":4099,"gems":[71879],"reforging":139}, + {"id":77950,"enchant":4083,"gems":[71879],"reforging":166}, + {"id":78369,"reforging":139} + ] +} diff --git a/ui/rogue/subtlety/presets.ts b/ui/rogue/subtlety/presets.ts index 3e57be6b58..d578eafe54 100644 --- a/ui/rogue/subtlety/presets.ts +++ b/ui/rogue/subtlety/presets.ts @@ -7,6 +7,7 @@ import { Stats } from '../../core/proto_utils/stats'; import SubtletyApl from './apls/subtlety.apl.json'; import P1SubtletyGear from './gear_sets/p1_subtlety.gear.json'; import P3SubtletyGear from './gear_sets/p3_subtlety.gear.json'; +import P4SubtletyGear from './gear_sets/p4_subtlety.gear.json'; import PreraidSubtletyGear from './gear_sets/preraid_subtlety.gear.json'; // Preset options for this spec. @@ -16,12 +17,13 @@ import PreraidSubtletyGear from './gear_sets/preraid_subtlety.gear.json'; export const P1_PRESET_SUB = PresetUtils.makePresetGear('P1 Sub', P1SubtletyGear); export const P3_PRESET_SUB = PresetUtils.makePresetGear('P3 Sub', P3SubtletyGear); export const PRERAID_PRESET_SUB = PresetUtils.makePresetGear('Pre-Raid Sub', PreraidSubtletyGear); +export const P4_PRESET_SUB = PresetUtils.makePresetGear('P4 Sub', P4SubtletyGear); export const ROTATION_PRESET_SUBTLETY = PresetUtils.makePresetAPLRotation('Subtlety', SubtletyApl); // Preset options for EP weights export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( - 'Subtlety', + 'Sub Default', Stats.fromMap( { [Stat.StatAgility]: 3.84, @@ -42,6 +44,28 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( ), ); +export const P4_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Sub Legendary Dags', + Stats.fromMap( + { + [Stat.StatAgility]: 3.84, + [Stat.StatStrength]: 1.05, + [Stat.StatAttackPower]: 1, + [Stat.StatCritRating]: 1.42, + [Stat.StatHitRating]: 2.19, + [Stat.StatHasteRating]: 1.67, + [Stat.StatMasteryRating]: 1.32, + [Stat.StatExpertiseRating]: 1.76, + }, + { + [PseudoStat.PseudoStatMainHandDps]: 7.16, + [PseudoStat.PseudoStatOffHandDps]: 1.07, + [PseudoStat.PseudoStatSpellHitPercent]: 49.09, + [PseudoStat.PseudoStatPhysicalHitPercent]: 216.76, + }, + ), +); + // 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/rogue/subtlety/sim.ts b/ui/rogue/subtlety/sim.ts index 7beeee5484..3866e0ed2e 100644 --- a/ui/rogue/subtlety/sim.ts +++ b/ui/rogue/subtlety/sim.ts @@ -143,13 +143,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecSubtletyRogue, { }, presets: { - epWeights: [Presets.P1_EP_PRESET], + epWeights: [Presets.P1_EP_PRESET, Presets.P4_EP_PRESET], // Preset talents that the user can quickly select. talents: [Presets.SubtletyTalents], // Preset rotations that the user can quickly select. rotations: [Presets.ROTATION_PRESET_SUBTLETY], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET_SUB, Presets.P1_PRESET_SUB, Presets.P3_PRESET_SUB], + gear: [Presets.PRERAID_PRESET_SUB, Presets.P1_PRESET_SUB, Presets.P3_PRESET_SUB, Presets.P4_PRESET_SUB], }, autoRotation: (player: Player): APLRotation => { @@ -193,7 +193,15 @@ export class SubtletyRogueSimUI extends IndividualSimUI // Auto Reforging player.sim.waitForInit().then(() => { - new ReforgeOptimizer(this); + new ReforgeOptimizer(this, { + getEPDefaults: (player: Player) => { + if (player.getEquippedItem(ItemSlot.ItemSlotMainHand)?.id == 77949) { + return Presets.P4_EP_PRESET.epWeights; + } else { + return Presets.P1_EP_PRESET.epWeights; + } + } + }); }); this.player.changeEmitter.on(c => {