diff --git a/sim/mage/combustion.go b/sim/mage/combustion.go index 12fc1ec2b5..bcc85d9d00 100644 --- a/sim/mage/combustion.go +++ b/sim/mage/combustion.go @@ -36,6 +36,9 @@ func (mage *Mage) registerCombustionSpell() { spell.DealDamage(sim, result) spell.RelatedDotSpell.Cast(sim, target) } + if mage.t13ProcAura != nil { + spell.CD.Reduce(time.Second * time.Duration(5*mage.t13ProcAura.GetStacks())) + } }, }) @@ -58,6 +61,11 @@ func (mage *Mage) registerCombustionSpell() { Dot: core.DotConfig{ Aura: core.Aura{ Label: "Combustion Dot", + OnExpire: func(aura *core.Aura, sim *core.Simulation) { + if mage.t13ProcAura != nil { + mage.t13ProcAura.Deactivate(sim) + } + }, }, NumberOfTicks: 10, TickLength: time.Second, diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index f0d9128b17..62ef03e340 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -1574,8 +1574,8 @@ dps_results: { dps_results: { key: "TestFire-AllItems-TimeLord'sRegalia" value: { - dps: 25696.78104 - tps: 25273.4801 + dps: 26698.06292 + tps: 26232.03683 } } dps_results: { diff --git a/sim/mage/items.go b/sim/mage/items.go index 2c016eb419..ed37fdc9c0 100644 --- a/sim/mage/items.go +++ b/sim/mage/items.go @@ -4,6 +4,7 @@ import ( "time" "github.com/wowsims/cata/sim/core" + "github.com/wowsims/cata/sim/core/stats" ) // T11 @@ -83,11 +84,47 @@ var ItemSetTimeLordsRegalia = core.NewItemSet(core.ItemSet{ // Your Arcane Blast has a 100% chance and your Fireball, Pyroblast, Frostfire Bolt, and Frostbolt spells have a 50% chance to grant Stolen Time, increasing your haste rating by 50 for 30 sec and stacking up to 10 times. // When Arcane Power, Combustion, or Icy Veins expires, all stacks of Stolen Time are lost. 2: func(agent core.Agent) { - // mage := agent.(MageAgent).GetMage() + character := agent.GetCharacter() + mage := agent.(MageAgent).GetMage() + + // Stack reset handlers can be found in: + // combustion.go + // talents_arcane.go + // talents_frost.go + mage.t13ProcAura = core.MakeStackingAura(character, core.StackingStatAura{ + Aura: core.Aura{ + Label: "Stolen Time", + ActionID: core.ActionID{SpellID: 105785}, + Duration: time.Second * 30, + MaxStacks: 10, + }, + BonusPerStack: stats.Stats{stats.HasteRating: 50}, + }) + + newStolenTimeTrigger := func(procChance float64, spellMask int64) { + core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ + Name: "Stolen Time Trigger", + ActionID: core.ActionID{ItemID: 105788}, + Callback: core.CallbackOnSpellHitDealt, + ClassSpellMask: spellMask, + ProcChance: procChance, + Outcome: core.OutcomeLanded, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + mage.t13ProcAura.Activate(sim) + mage.t13ProcAura.AddStack(sim) + }, + }) + } + + newStolenTimeTrigger(1, MageSpellArcaneBlast) + newStolenTimeTrigger(0.5, MageSpellFireball|MageSpellPyroblast|MageSpellFrostfireBolt|MageSpellFrostbolt) }, // Each stack of Stolen Time also reduces the cooldown of Arcane Power by 7 sec, Combustion by 5 sec, and Icy Veins by 15 sec. 4: func(agent core.Agent) { - // mage := agent.(MageAgent).GetMage() + // Cooldown reduction handlers can be found in: + // combustion.go + // talents_arcane.go + // talents_frost.go }, }, }) diff --git a/sim/mage/mage.go b/sim/mage/mage.go index 749ec3c828..b72a32107a 100644 --- a/sim/mage/mage.go +++ b/sim/mage/mage.go @@ -24,6 +24,7 @@ type Mage struct { frostfireOrb *FrostfireOrb t12MirrorImage *T12MirrorImage + t13ProcAura *core.Aura arcaneMissilesTickSpell *core.Spell Combustion *core.Spell diff --git a/sim/mage/talents_arcane.go b/sim/mage/talents_arcane.go index 536618dba2..7f5ca4f814 100644 --- a/sim/mage/talents_arcane.go +++ b/sim/mage/talents_arcane.go @@ -305,12 +305,15 @@ func (mage *Mage) registerArcanePowerCD() { mage.arcanePowerCostMod.Activate() arcanePowerDmgMod.Activate() }, - OnExpire: func(aura *core.Aura, sim *core.Simulation) { + OnExpire: func(_ *core.Aura, sim *core.Simulation) { if mage.arcanePowerGCDmod != nil { mage.arcanePowerGCDmod.Deactivate() } mage.arcanePowerCostMod.Deactivate() arcanePowerDmgMod.Deactivate() + if mage.t13ProcAura != nil { + mage.t13ProcAura.Deactivate(sim) + } }, }) @@ -323,8 +326,11 @@ func (mage *Mage) registerArcanePowerCD() { Duration: time.Second * 120, }, }, - ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) { + ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) { arcanePowerAura.Activate(sim) + if mage.t13ProcAura != nil { + spell.CD.Reduce(time.Second * time.Duration(7*mage.t13ProcAura.GetStacks())) + } }, }) mage.AddMajorCooldown(core.MajorCooldown{ diff --git a/sim/mage/talents_frost.go b/sim/mage/talents_frost.go index cc86acba19..78d9fc7a2e 100644 --- a/sim/mage/talents_frost.go +++ b/sim/mage/talents_frost.go @@ -91,8 +91,11 @@ func (mage *Mage) registerIcyVeinsCD() { OnGain: func(aura *core.Aura, sim *core.Simulation) { icyVeinsMod.Activate() }, - OnExpire: func(aura *core.Aura, sim *core.Simulation) { + OnExpire: func(_ *core.Aura, sim *core.Simulation) { icyVeinsMod.Deactivate() + if mage.t13ProcAura != nil { + mage.t13ProcAura.Deactivate(sim) + } }, }) @@ -106,7 +109,6 @@ func (mage *Mage) registerIcyVeinsCD() { }, Cast: core.CastConfig{ - CD: core.Cooldown{ Timer: mage.NewTimer(), Duration: time.Second * time.Duration(180*[]float64{1, .93, .86, .80}[mage.Talents.IceFloes]), @@ -121,8 +123,11 @@ func (mage *Mage) registerIcyVeinsCD() { return !icyVeinsAura.IsActive() && !mage.frostfireOrb.IsEnabled() }, - ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) { + ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) { icyVeinsAura.Activate(sim) + if mage.t13ProcAura != nil { + spell.CD.Reduce(time.Second * time.Duration(15*mage.t13ProcAura.GetStacks())) + } }, }) diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index 67addd34fa..58e20408f9 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -44,7 +44,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.34082 + weights: 0.34087 weights: 0 weights: 0 weights: 0 @@ -67,58 +67,58 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 44.56727 - weights: 16.53449 + weights: 44.58619 + weights: 16.52439 weights: 0 } } dps_results: { key: "TestAssassination-AllItems-AgileShadowspiritDiamond" value: { - dps: 29457.18496 - tps: 20914.60132 + dps: 29437.31976 + tps: 20900.49703 } } dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50366" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 29056.06718 - tps: 20629.8077 + dps: 28997.41845 + tps: 20588.1671 } } dps_results: { key: "TestAssassination-AllItems-Anhuur'sHymnal-55889" value: { - dps: 27866.12439 - tps: 19784.94832 + dps: 27847.33835 + tps: 19771.61023 } } dps_results: { key: "TestAssassination-AllItems-Anhuur'sHymnal-56407" value: { - dps: 27902.14557 - tps: 19810.52335 + dps: 27883.32141 + tps: 19797.1582 } } dps_results: { key: "TestAssassination-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 28276.34432 - tps: 20076.20446 + dps: 28255.22897 + tps: 20061.21257 } } dps_results: { key: "TestAssassination-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 28473.49777 - tps: 20216.18342 + dps: 28452.97687 + tps: 20201.61357 } } dps_results: { @@ -131,128 +131,128 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-AustereShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50726" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 hps: 83.99244 } } dps_results: { key: "TestAssassination-AllItems-BedrockTalisman-58182" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BellofEnragingResonance-59326" value: { - dps: 27549.34581 - tps: 19560.03553 + dps: 27531.06087 + tps: 19547.05322 } } dps_results: { key: "TestAssassination-AllItems-BellofEnragingResonance-65053" value: { - dps: 27639.96697 - tps: 19624.37655 + dps: 27621.63927 + tps: 19611.36388 } } dps_results: { key: "TestAssassination-AllItems-BindingPromise-67037" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 28481.47045 - tps: 20221.84402 + dps: 28440.04652 + tps: 20192.43303 } } dps_results: { key: "TestAssassination-AllItems-BloodofIsiset-55995" value: { - dps: 27589.87708 - tps: 19588.81273 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-BloodofIsiset-56414" value: { - dps: 27641.181 - tps: 19625.23851 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 28822.45508 - tps: 20463.94311 + dps: 28803.28354 + tps: 20450.33132 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 27735.89028 - tps: 19692.4821 + dps: 27717.40902 + tps: 19679.36041 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 27533.31625 - tps: 19548.65454 + dps: 27515.03921 + tps: 19535.67784 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 28399.55554 - tps: 20163.68443 + dps: 28380.64735 + tps: 20150.25962 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 27691.85352 - tps: 19661.216 + dps: 27673.39162 + tps: 19648.10805 } } dps_results: { @@ -279,8 +279,8 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-BottledLightning-66879" value: { - dps: 27340.38923 - tps: 19411.67635 + dps: 27322.20726 + tps: 19398.76715 } } dps_results: { @@ -307,50 +307,50 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-BracingShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20093.54675 + dps: 28858.75897 + tps: 20079.92449 } } dps_results: { key: "TestAssassination-AllItems-Brawler'sTrophy-232015" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-BurningShadowspiritDiamond" value: { - dps: 29219.40028 - tps: 20745.7742 + dps: 29199.69342 + tps: 20731.78233 } } dps_results: { key: "TestAssassination-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 29338.11975 - tps: 20830.06502 + dps: 29318.32843 + tps: 20816.01319 } } dps_results: { key: "TestAssassination-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 28475.22859 - tps: 20217.4123 + dps: 28456.26847 + tps: 20203.95061 } } dps_results: { key: "TestAssassination-AllItems-CoreofRipeness-58184" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50349" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { @@ -377,15 +377,15 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-CrushingWeight-59506" value: { - dps: 28368.6823 - tps: 20141.76444 + dps: 28349.83959 + tps: 20128.38611 } } dps_results: { key: "TestAssassination-AllItems-CrushingWeight-65118" value: { - dps: 28561.48908 - tps: 20278.65725 + dps: 28542.49735 + tps: 20265.17312 } } dps_results: { @@ -412,120 +412,120 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 28203.86353 - tps: 20024.74311 + dps: 28185.40106 + tps: 20011.63475 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 28991.29904 - tps: 20583.82232 + dps: 28972.28799 + tps: 20570.32447 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 27734.43697 - tps: 19691.45025 + dps: 27695.07388 + tps: 19663.50246 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50363" value: { - dps: 28091.77395 - tps: 19945.15951 + dps: 28073.08287 + tps: 19931.88884 } } dps_results: { key: "TestAssassination-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 28990.79265 - tps: 20583.46278 + dps: 28971.13386 + tps: 20569.50504 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50348" value: { - dps: 27487.2864 - tps: 19515.97334 + dps: 27469.01108 + tps: 19502.99786 } } dps_results: { key: "TestAssassination-AllItems-Dwyer'sCaber-70141" value: { - dps: 28342.4064 - tps: 20123.10854 + dps: 28323.56021 + tps: 20109.72775 } } dps_results: { key: "TestAssassination-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { key: "TestAssassination-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-EmberShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 28990.79265 - tps: 20583.46278 + dps: 28971.13386 + tps: 20569.50504 } } dps_results: { key: "TestAssassination-AllItems-EssenceoftheCyclone-59473" value: { - dps: 28877.33294 - tps: 20502.90639 + dps: 28858.17486 + tps: 20489.30415 } } dps_results: { key: "TestAssassination-AllItems-EssenceoftheCyclone-65140" value: { - dps: 29128.38054 - tps: 20681.15019 + dps: 29108.98867 + tps: 20667.38195 } } dps_results: { key: "TestAssassination-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 28284.32944 - tps: 20081.87391 + dps: 28227.16282 + tps: 20041.2856 } } dps_results: { key: "TestAssassination-AllItems-EternalShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { @@ -552,57 +552,57 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-FallofMortality-59500" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-FallofMortality-65124" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-FieryQuintessence-69000" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Figurine-DemonPanther-52199" value: { - dps: 29262.01988 - tps: 20776.03411 + dps: 29242.32985 + tps: 20762.05419 } } dps_results: { key: "TestAssassination-AllItems-Figurine-DreamOwl-52354" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Figurine-KingofBoars-52351" value: { - dps: 28153.99989 - tps: 19989.33992 + dps: 28089.75878 + tps: 19943.72873 } } dps_results: { @@ -629,15 +629,15 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-FleetShadowspiritDiamond" value: { - dps: 28969.12017 - tps: 20568.07532 + dps: 28944.8735 + tps: 20550.86018 } } dps_results: { key: "TestAssassination-AllItems-ForlornShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { @@ -650,176 +650,176 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-FuryofAngerforge-59461" value: { - dps: 28202.88489 - tps: 20024.04827 + dps: 28184.11712 + tps: 20010.72316 } } dps_results: { key: "TestAssassination-AllItems-GaleofShadows-56138" value: { - dps: 27658.08864 - tps: 19637.24293 + dps: 27639.73503 + tps: 19624.21187 } } dps_results: { key: "TestAssassination-AllItems-GaleofShadows-56462" value: { - dps: 27639.38716 - tps: 19623.96488 + dps: 27621.04336 + tps: 19610.94078 } } dps_results: { key: "TestAssassination-AllItems-GearDetector-61462" value: { - dps: 28248.58803 - tps: 20056.4975 + dps: 28229.80604 + tps: 20043.16229 } } dps_results: { key: "TestAssassination-AllItems-Gladiator'sVestments" value: { - dps: 23570.7238 - tps: 16735.2139 + dps: 23546.12168 + tps: 16717.74639 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54589" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-GraceoftheHerald-55266" value: { - dps: 28088.161 - tps: 19942.59431 + dps: 28069.43271 + tps: 19929.29722 } } dps_results: { key: "TestAssassination-AllItems-GraceoftheHerald-56295" value: { - dps: 28561.12071 - tps: 20278.39571 + dps: 28542.09288 + tps: 20264.88595 } } dps_results: { key: "TestAssassination-AllItems-HarmlightToken-63839" value: { - dps: 27310.73291 - tps: 19390.62037 + dps: 27292.62076 + tps: 19377.76074 } } dps_results: { key: "TestAssassination-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 27873.27009 - tps: 19790.02177 + dps: 27856.34894 + tps: 19778.00774 } } dps_results: { key: "TestAssassination-AllItems-HeartofIgnacious-59514" value: { - dps: 27821.07863 - tps: 19752.96583 + dps: 27802.58728 + tps: 19739.83697 } } dps_results: { key: "TestAssassination-AllItems-HeartofIgnacious-65110" value: { - dps: 27900.29558 - tps: 19809.20986 + dps: 27881.74551 + tps: 19796.03931 } } dps_results: { key: "TestAssassination-AllItems-HeartofRage-59224" value: { - dps: 28314.59903 - tps: 20103.36531 + dps: 28295.70577 + tps: 20089.95109 } } dps_results: { key: "TestAssassination-AllItems-HeartofRage-65072" value: { - dps: 28524.86965 - tps: 20252.65745 + dps: 28505.83648 + tps: 20239.1439 } } dps_results: { key: "TestAssassination-AllItems-HeartofSolace-55868" value: { - dps: 27658.08864 - tps: 19637.24293 + dps: 27639.73503 + tps: 19624.21187 } } dps_results: { key: "TestAssassination-AllItems-HeartofSolace-56393" value: { - dps: 28204.6276 - tps: 20025.2856 + dps: 28185.8832 + tps: 20011.97707 } } dps_results: { key: "TestAssassination-AllItems-HeartofThunder-55845" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-HeartofThunder-56370" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-HeartoftheVile-66969" value: { - dps: 28212.91111 - tps: 20031.16689 + dps: 28194.09748 + tps: 20017.80921 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-50641" value: { - dps: 29457.18496 - tps: 20914.60132 + dps: 29437.31976 + tps: 20900.49703 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 28990.79265 - tps: 20583.46278 + dps: 28971.13386 + tps: 20569.50504 } } dps_results: { key: "TestAssassination-AllItems-ImpatienceofYouth-62464" value: { - dps: 28275.97445 - tps: 20075.94186 + dps: 28235.76446 + tps: 20047.39276 } } dps_results: { key: "TestAssassination-AllItems-ImpatienceofYouth-62469" value: { - dps: 28275.97445 - tps: 20075.94186 + dps: 28235.76446 + tps: 20047.39276 } } dps_results: { key: "TestAssassination-AllItems-ImpetuousQuery-55881" value: { - dps: 27589.87708 - tps: 19588.81273 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-ImpetuousQuery-56406" value: { - dps: 27641.181 - tps: 19625.23851 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { @@ -846,8 +846,8 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { @@ -874,57 +874,57 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 27499.70656 - tps: 19524.79166 + dps: 27498.53456 + tps: 19523.95954 } } dps_results: { key: "TestAssassination-AllItems-JarofAncientRemedies-59354" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-JarofAncientRemedies-65029" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-JawsofDefeat-68926" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-JawsofDefeat-69111" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-JujuofNimbleness-63840" value: { - dps: 28481.47045 - tps: 20221.84402 + dps: 28440.04652 + tps: 20192.43303 } } dps_results: { key: "TestAssassination-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 28873.06458 - tps: 20499.87585 + dps: 28853.66748 + tps: 20486.10391 } } dps_results: { key: "TestAssassination-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 29428.47736 - tps: 20894.21893 + dps: 29408.69693 + tps: 20880.17482 } } dps_results: { @@ -951,246 +951,246 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-KvaldirBattleStandard-59685" value: { - dps: 27628.91554 - tps: 19616.53003 + dps: 27610.57806 + tps: 19603.51042 } } dps_results: { key: "TestAssassination-AllItems-KvaldirBattleStandard-59689" value: { - dps: 27628.91554 - tps: 19616.53003 + dps: 27610.57806 + tps: 19603.51042 } } dps_results: { key: "TestAssassination-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 27506.58516 - tps: 19529.67547 + dps: 27488.31516 + tps: 19516.70377 } } dps_results: { key: "TestAssassination-AllItems-LeadenDespair-55816" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-LeadenDespair-56347" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-LeftEyeofRajh-56102" value: { - dps: 28605.30165 - tps: 20309.76417 + dps: 28586.29917 + tps: 20296.27241 } } dps_results: { key: "TestAssassination-AllItems-LeftEyeofRajh-56427" value: { - dps: 28983.99334 - tps: 20578.63527 + dps: 28964.71896 + tps: 20564.95046 } } dps_results: { key: "TestAssassination-AllItems-LicensetoSlay-58180" value: { - dps: 28576.79694 - tps: 20289.52583 + dps: 28557.46643 + tps: 20275.80116 } } dps_results: { key: "TestAssassination-AllItems-MagnetiteMirror-55814" value: { - dps: 27780.0817 - tps: 19723.85801 + dps: 27761.59335 + tps: 19710.73128 } } dps_results: { key: "TestAssassination-AllItems-MagnetiteMirror-56345" value: { - dps: 28039.58441 - tps: 19908.10493 + dps: 28020.9206 + tps: 19894.85362 } } dps_results: { key: "TestAssassination-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-MarkofKhardros-56132" value: { - dps: 27985.96319 - tps: 19870.03386 + dps: 27957.51604 + tps: 19849.83639 } } dps_results: { key: "TestAssassination-AllItems-MarkofKhardros-56458" value: { - dps: 28090.00828 - tps: 19943.90588 + dps: 28074.6412 + tps: 19932.99525 } } dps_results: { key: "TestAssassination-AllItems-MatrixRestabilizer-68994" value: { - dps: 29539.47261 - tps: 20973.02555 + dps: 29503.03341 + tps: 20947.15372 } } dps_results: { key: "TestAssassination-AllItems-MatrixRestabilizer-69150" value: { - dps: 30014.9213 - tps: 21310.59412 + dps: 30000.43136 + tps: 21300.30627 } } dps_results: { key: "TestAssassination-AllItems-MightoftheOcean-55251" value: { - dps: 27924.61343 - tps: 19826.47553 + dps: 27905.87322 + tps: 19813.16999 } } dps_results: { key: "TestAssassination-AllItems-MightoftheOcean-56285" value: { - dps: 28347.86609 - tps: 20126.98492 + dps: 28328.71998 + tps: 20113.39118 } } dps_results: { key: "TestAssassination-AllItems-MirrorofBrokenImages-62466" value: { - dps: 27697.14891 - tps: 19664.97573 + dps: 27657.80328 + tps: 19637.04033 } } dps_results: { key: "TestAssassination-AllItems-MirrorofBrokenImages-62471" value: { - dps: 27697.14891 - tps: 19664.97573 + dps: 27657.80328 + tps: 19637.04033 } } dps_results: { key: "TestAssassination-AllItems-MithrilStopwatch-232013" value: { - dps: 27536.96866 - tps: 19551.24775 + dps: 27518.69075 + tps: 19538.27043 } } dps_results: { key: "TestAssassination-AllItems-MoonwellChalice-70142" value: { - dps: 27835.6871 - tps: 19763.33784 + dps: 27813.96502 + tps: 19747.91516 } } dps_results: { key: "TestAssassination-AllItems-MoonwellPhial-70143" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-NecromanticFocus-68982" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-NecromanticFocus-69139" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Oremantle'sFavor-61448" value: { - dps: 27728.90155 - tps: 19687.5201 + dps: 27710.44164 + tps: 19674.41356 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 27341.749 - tps: 19412.64179 + dps: 27323.56581 + tps: 19399.73173 } } dps_results: { key: "TestAssassination-AllItems-PorcelainCrab-55237" value: { - dps: 27529.8067 - tps: 19546.16276 + dps: 27513.15166 + tps: 19534.33768 } } dps_results: { key: "TestAssassination-AllItems-PorcelainCrab-56280" value: { - dps: 27817.84321 - tps: 19750.66868 + dps: 27792.61872 + tps: 19732.75929 } } dps_results: { key: "TestAssassination-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 28878.3368 - tps: 20503.61913 + dps: 28858.75897 + tps: 20489.71887 } } dps_results: { key: "TestAssassination-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 29124.92629 - tps: 20678.69767 + dps: 29105.57097 + tps: 20664.95539 } } dps_results: { key: "TestAssassination-AllItems-Rainsong-55854" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Rainsong-56377" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { @@ -1238,36 +1238,36 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 29302.35289 - tps: 20804.67055 + dps: 29282.58568 + tps: 20790.63583 } } dps_results: { key: "TestAssassination-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 29219.40028 - tps: 20745.7742 + dps: 29199.69342 + tps: 20731.78233 } } dps_results: { key: "TestAssassination-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 28987.38936 - tps: 20581.04644 + dps: 28968.15132 + tps: 20567.38744 } } dps_results: { key: "TestAssassination-AllItems-RightEyeofRajh-56100" value: { - dps: 28330.77973 - tps: 20114.85361 + dps: 28311.65692 + tps: 20101.27642 } } dps_results: { key: "TestAssassination-AllItems-RightEyeofRajh-56431" value: { - dps: 28426.65609 - tps: 20182.92582 + dps: 28407.44671 + tps: 20169.28716 } } dps_results: { @@ -1301,108 +1301,108 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-RuneofZeth-68998" value: { - dps: 27761.57902 - tps: 19710.72111 + dps: 27743.16932 + tps: 19697.65022 } } dps_results: { key: "TestAssassination-AllItems-ScalesofLife-68915" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 hps: 291.12785 } } dps_results: { key: "TestAssassination-AllItems-ScalesofLife-69109" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 hps: 328.38949 } } dps_results: { key: "TestAssassination-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 28338.35005 - tps: 20120.22853 + dps: 28321.17485 + tps: 20108.03415 } } dps_results: { key: "TestAssassination-AllItems-SeaStar-55256" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-SeaStar-56290" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-ShardofWoe-60233" value: { - dps: 27684.873 - tps: 19656.25983 + dps: 27666.49036 + tps: 19643.20816 } } dps_results: { key: "TestAssassination-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 27883.68519 - tps: 19797.41649 + dps: 27865.16408 + tps: 19784.2665 } } dps_results: { key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Skardyn'sGrace-56115" value: { - dps: 28573.54513 - tps: 20287.21704 + dps: 28543.16159 + tps: 20265.64473 } } dps_results: { key: "TestAssassination-AllItems-Skardyn'sGrace-56440" value: { - dps: 28725.47881 - tps: 20395.08995 + dps: 28710.25811 + tps: 20384.28326 } } dps_results: { key: "TestAssassination-AllItems-Sorrowsong-55879" value: { - dps: 27589.87708 - tps: 19588.81273 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-Sorrowsong-56400" value: { - dps: 27641.181 - tps: 19625.23851 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-Soul'sAnguish-66994" value: { - dps: 28105.5525 - tps: 19954.94227 + dps: 28086.59334 + tps: 19941.48127 } } dps_results: { key: "TestAssassination-AllItems-SoulCasket-58183" value: { - dps: 27697.14891 - tps: 19664.97573 + dps: 27657.80328 + tps: 19637.04033 } } dps_results: { @@ -1429,15 +1429,15 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-SpidersilkSpindle-68981" value: { - dps: 27793.53809 - tps: 19733.41204 + dps: 27737.43763 + tps: 19693.58072 } } dps_results: { key: "TestAssassination-AllItems-SpidersilkSpindle-69138" value: { - dps: 27871.2713 - tps: 19788.60262 + dps: 27817.07199 + tps: 19750.12112 } } dps_results: { @@ -1464,204 +1464,204 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-StayofExecution-68996" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Stonemother'sKiss-61411" value: { - dps: 27428.69264 - tps: 19474.37178 + dps: 27410.48929 + tps: 19461.4474 } } dps_results: { key: "TestAssassination-AllItems-StumpofTime-62465" value: { - dps: 27999.09302 - tps: 19879.35605 + dps: 27980.1864 + tps: 19865.93234 } } dps_results: { key: "TestAssassination-AllItems-StumpofTime-62470" value: { - dps: 27999.09302 - tps: 19879.35605 + dps: 27980.1864 + tps: 19865.93234 } } dps_results: { key: "TestAssassination-AllItems-SymbioticWorm-59332" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-SymbioticWorm-65048" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 27466.78668 - tps: 19501.41855 + dps: 27449.85624 + tps: 19489.39793 } } dps_results: { key: "TestAssassination-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 27883.37482 - tps: 19797.19613 + dps: 27864.81247 + tps: 19784.01685 } } dps_results: { key: "TestAssassination-AllItems-TearofBlood-55819" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-TearofBlood-56351" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 27532.35451 - tps: 19547.9717 + dps: 27498.53456 + tps: 19523.95954 } } dps_results: { key: "TestAssassination-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 27641.181 - tps: 19625.23851 + dps: 27578.16892 + tps: 19580.49993 } } dps_results: { key: "TestAssassination-AllItems-TheHungerer-68927" value: { - dps: 29210.62589 - tps: 20739.54438 + dps: 29191.2334 + tps: 20725.77572 } } dps_results: { key: "TestAssassination-AllItems-TheHungerer-69112" value: { - dps: 29491.47198 - tps: 20938.94511 + dps: 29471.80111 + tps: 20924.97879 } } dps_results: { key: "TestAssassination-AllItems-Theralion'sMirror-59519" value: { - dps: 27732.35202 - tps: 19689.96994 + dps: 27705.71667 + tps: 19671.05883 } } dps_results: { key: "TestAssassination-AllItems-Theralion'sMirror-65105" value: { - dps: 27801.357 - tps: 19738.96347 + dps: 27775.87388 + tps: 19720.87046 } } dps_results: { key: "TestAssassination-AllItems-Throngus'sFinger-56121" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Throngus'sFinger-56449" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-Tia'sGrace-55874" value: { - dps: 28639.63317 - tps: 20334.13955 + dps: 28627.47957 + tps: 20325.51049 } } dps_results: { key: "TestAssassination-AllItems-Tia'sGrace-56394" value: { - dps: 28855.88689 - tps: 20487.67969 + dps: 28790.12184 + tps: 20440.98651 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50706" value: { - dps: 28334.88915 - tps: 20117.7713 + dps: 28315.98256 + tps: 20104.34762 } } dps_results: { key: "TestAssassination-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 27203.7225 - tps: 19314.64298 + dps: 27185.57767 + tps: 19301.76015 } } dps_results: { key: "TestAssassination-AllItems-UnheededWarning-59520" value: { - dps: 28862.20016 - tps: 20492.16211 + dps: 28842.97091 + tps: 20478.50935 } } dps_results: { key: "TestAssassination-AllItems-UnquenchableFlame-67101" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-UnsolvableRiddle-62463" value: { - dps: 29121.24768 - tps: 20676.08585 + dps: 29079.92525 + tps: 20646.74693 } } dps_results: { key: "TestAssassination-AllItems-UnsolvableRiddle-62468" value: { - dps: 29121.24768 - tps: 20676.08585 + dps: 29079.92525 + tps: 20646.74693 } } dps_results: { key: "TestAssassination-AllItems-UnsolvableRiddle-68709" value: { - dps: 29121.24768 - tps: 20676.08585 + dps: 29079.92525 + tps: 20646.74693 } } dps_results: { key: "TestAssassination-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 27439.14421 - tps: 19481.79239 + dps: 27420.89307 + tps: 19468.83408 } } dps_results: { key: "TestAssassination-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 27377.08303 - tps: 19437.72895 + dps: 27358.91319 + tps: 19424.82836 } } dps_results: { @@ -1681,22 +1681,22 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-VesselofAcceleration-68995" value: { - dps: 28413.49697 - tps: 20173.58285 + dps: 28394.59436 + tps: 20160.162 } } dps_results: { key: "TestAssassination-AllItems-VesselofAcceleration-69167" value: { - dps: 28541.17625 - tps: 20264.23514 + dps: 28522.19352 + tps: 20250.7574 } } dps_results: { key: "TestAssassination-AllItems-VestmentsoftheDarkPhoenix" value: { - dps: 28579.06097 - tps: 20291.13329 + dps: 28535.44291 + tps: 20260.16446 } } dps_results: { @@ -1723,99 +1723,99 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-VialofStolenMemories-59515" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-VialofStolenMemories-65109" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 28597.12748 - tps: 20303.96051 + dps: 28578.11328 + tps: 20290.46043 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 27765.96398 - tps: 19713.83443 + dps: 27747.46166 + tps: 19700.69778 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28042.48004 - tps: 19910.16083 + dps: 28023.53638 + tps: 19896.71083 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 27707.69261 - tps: 19672.46175 + dps: 27689.19262 + tps: 19659.32676 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 27595.25888 - tps: 19592.63381 + dps: 27576.9658 + tps: 19579.64571 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 27742.3269 - tps: 19697.0521 + dps: 27723.85007 + tps: 19683.93355 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 27726.68753 - tps: 19685.94815 + dps: 27657.80328 + tps: 19637.04033 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 28499.30872 - tps: 20234.50919 + dps: 28480.31965 + tps: 20221.02695 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 27198.10171 - tps: 19310.65222 + dps: 27179.99713 + tps: 19297.79796 } } dps_results: { key: "TestAssassination-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 27730.15709 - tps: 19688.41154 + dps: 27711.66936 + tps: 19675.28524 } } dps_results: { @@ -1842,29 +1842,29 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-WindDancer'sRegalia" value: { - dps: 26382.36003 - tps: 18731.47562 + dps: 26352.53831 + tps: 18710.3022 } } dps_results: { key: "TestAssassination-AllItems-WitchingHourglass-55787" value: { - dps: 27465.29284 - tps: 19500.35792 + dps: 27447.03443 + tps: 19487.39444 } } dps_results: { key: "TestAssassination-AllItems-WitchingHourglass-56320" value: { - dps: 27696.72774 - tps: 19664.6767 + dps: 27678.32657 + tps: 19651.61186 } } dps_results: { key: "TestAssassination-AllItems-World-QuellerFocus-63842" value: { - dps: 27538.57317 - tps: 19552.38695 + dps: 27498.53456 + tps: 19523.95954 } } dps_results: { @@ -1891,700 +1891,700 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 27552.83472 - tps: 19562.51265 + dps: 27528.47136 + tps: 19545.21467 } } dps_results: { key: "TestAssassination-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 27552.83472 - tps: 19562.51265 + dps: 27528.47136 + tps: 19545.21467 } } dps_results: { key: "TestAssassination-Average-Default" value: { - dps: 29708.85134 - tps: 21093.28445 + dps: 29688.86898 + tps: 21079.09697 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29457.18496 - tps: 20914.60132 + dps: 29437.31976 + tps: 20900.49703 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29457.18496 - tps: 20914.60132 + dps: 29437.31976 + tps: 20900.49703 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 38789.99519 - tps: 27540.89658 + dps: 38764.20098 + tps: 27522.5827 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17428.84716 - tps: 12374.48149 + dps: 17416.73649 + tps: 12365.88291 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17428.84716 - tps: 12374.48149 + dps: 17416.73649 + tps: 12365.88291 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19382.04462 - tps: 13761.25168 + dps: 19368.62307 + tps: 13751.72238 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22215.60423 - tps: 15773.079 + dps: 22204.07624 + tps: 15764.89413 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22215.60423 - tps: 15773.079 + dps: 22204.07624 + tps: 15764.89413 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29325.32041 - tps: 20820.97749 + dps: 29310.42552 + tps: 20810.40212 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13262.15989 - tps: 9416.13352 + dps: 13254.85922 + tps: 9410.95004 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13262.15989 - tps: 9416.13352 + dps: 13254.85922 + tps: 9410.95004 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15048.17014 - tps: 10684.2008 + dps: 15039.73887 + tps: 10678.2146 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29939.8796 - tps: 21257.31451 + dps: 29919.4547 + tps: 21242.81284 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29939.8796 - tps: 21257.31451 + dps: 29919.4547 + tps: 21242.81284 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39678.81109 - tps: 28171.95587 + dps: 39651.9647 + tps: 28152.89494 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17726.27648 - tps: 12585.6563 + dps: 17713.82069 + tps: 12576.81269 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17726.27648 - tps: 12585.6563 + dps: 17713.82069 + tps: 12576.81269 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19713.62895 - tps: 13996.67655 + dps: 19699.83323 + tps: 13986.88159 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 17716.64646 - tps: 12578.81899 + dps: 17707.57357 + tps: 12572.37724 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 17716.64646 - tps: 12578.81899 + dps: 17707.57357 + tps: 12572.37724 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22361.43974 - tps: 15876.62221 + dps: 22349.8553 + tps: 15868.39726 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 10079.96487 - tps: 7156.77506 + dps: 10074.87288 + tps: 7153.15975 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 10079.96487 - tps: 7156.77506 + dps: 10074.87288 + tps: 7153.15975 } } dps_results: { key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 11058.07293 - tps: 7851.23178 + dps: 11052.30946 + tps: 7847.13972 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 36724.13768 - tps: 26074.13775 + dps: 36691.74379 + tps: 26051.13809 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 36724.13768 - tps: 26074.13775 + dps: 36691.74379 + tps: 26051.13809 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 48632.14491 - tps: 34528.82289 + dps: 48596.43867 + tps: 34503.47146 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21776.74148 - tps: 15461.48645 + dps: 21756.90338 + tps: 15447.4014 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21776.74148 - tps: 15461.48645 + dps: 21756.90338 + tps: 15447.4014 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 24551.63783 - tps: 17431.66286 + dps: 24532.40284 + tps: 17418.00602 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 27516.94457 - tps: 19537.03064 + dps: 27498.09937 + tps: 19523.65056 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27516.94457 - tps: 19537.03064 + dps: 27498.09937 + tps: 19523.65056 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 36515.43999 - tps: 25925.9624 + dps: 36495.14395 + tps: 25911.5522 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16412.43065 - tps: 11652.82576 + dps: 16400.567 + tps: 11644.40257 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16412.43065 - tps: 11652.82576 + dps: 16400.567 + tps: 11644.40257 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18839.33001 - tps: 13375.92431 + dps: 18827.3589 + tps: 13367.42482 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37531.68322 - tps: 26647.49509 + dps: 37498.44624 + tps: 26623.89683 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 37531.68322 - tps: 26647.49509 + dps: 37498.44624 + tps: 26623.89683 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 49798.61865 - tps: 35357.01924 + dps: 49761.68595 + tps: 35330.79703 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 22208.16235 - tps: 15767.79527 + dps: 22187.71878 + tps: 15753.28033 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22208.16235 - tps: 15767.79527 + dps: 22187.71878 + tps: 15753.28033 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 25055.51893 - tps: 17789.41844 + dps: 25035.48855 + tps: 17775.19687 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21753.18477 - tps: 15444.76119 + dps: 21738.59015 + tps: 15434.39901 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21753.18477 - tps: 15444.76119 + dps: 21738.59015 + tps: 15434.39901 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 27551.89415 - tps: 19561.84484 + dps: 27536.09706 + tps: 19550.62891 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12634.28369 - tps: 8970.34142 + dps: 12625.89624 + tps: 8964.38633 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12634.28369 - tps: 8970.34142 + dps: 12625.89624 + tps: 8964.38633 } } dps_results: { key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14009.10269 - tps: 9946.46291 + dps: 14000.7462 + tps: 9940.5298 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 29749.68132 - tps: 21122.27373 + dps: 29729.6093 + tps: 21108.0226 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 29749.68132 - tps: 21122.27373 + dps: 29729.6093 + tps: 21108.0226 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39384.20899 - tps: 27962.78838 + dps: 39358.00712 + tps: 27944.18506 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17600.0725 - tps: 12496.05147 + dps: 17587.83195 + tps: 12487.36068 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17600.0725 - tps: 12496.05147 + dps: 17587.83195 + tps: 12487.36068 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19715.299 - tps: 13997.86229 + dps: 19701.63348 + tps: 13988.15977 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 22436.10184 - tps: 15929.63231 + dps: 22424.44991 + tps: 15921.35944 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 22436.10184 - tps: 15929.63231 + dps: 22424.44991 + tps: 15921.35944 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 29782.16753 - tps: 21145.33895 + dps: 29767.02202 + tps: 21134.58563 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13392.00635 - tps: 9508.32451 + dps: 13384.62418 + tps: 9503.08317 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13392.00635 - tps: 9508.32451 + dps: 13384.62418 + tps: 9503.08317 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15309.84179 - tps: 10869.98767 + dps: 15301.24942 + tps: 10863.88709 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30233.2611 - tps: 21465.61538 + dps: 30212.62808 + tps: 21450.96594 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30233.2611 - tps: 21465.61538 + dps: 30212.62808 + tps: 21450.96594 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40287.14526 - tps: 28603.87313 + dps: 40259.87423 + tps: 28584.51071 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17902.38089 - tps: 12710.69043 + dps: 17889.78988 + tps: 12701.75081 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17902.38089 - tps: 12710.69043 + dps: 17889.78988 + tps: 12701.75081 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20052.25923 - tps: 14237.10406 + dps: 20038.21418 + tps: 14227.13207 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 17884.82077 - tps: 12698.22275 + dps: 17875.65406 + tps: 12691.71438 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 17884.82077 - tps: 12698.22275 + dps: 17875.65406 + tps: 12691.71438 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22733.67392 - tps: 16140.90849 + dps: 22721.90109 + tps: 16132.54978 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 10184.45819 - tps: 7230.96532 + dps: 10179.30715 + tps: 7227.30808 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 10184.45819 - tps: 7230.96532 + dps: 10179.30715 + tps: 7227.30808 } } dps_results: { key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 11272.1145 - tps: 8003.20129 + dps: 11266.23474 + tps: 7999.02667 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37074.19012 - tps: 26322.67498 + dps: 37041.40975 + tps: 26299.40092 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 37074.19012 - tps: 26322.67498 + dps: 37041.40975 + tps: 26299.40092 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 49334.17976 - tps: 35027.26763 + dps: 49297.99834 + tps: 35001.57882 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21985.33873 - tps: 15609.5905 + dps: 21965.24229 + tps: 15595.32202 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21985.33873 - tps: 15609.5905 + dps: 21965.24229 + tps: 15595.32202 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 24932.70012 - tps: 17702.21709 + dps: 24913.19354 + tps: 17688.36741 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 27776.22729 - tps: 19721.12138 + dps: 27757.14066 + tps: 19707.56987 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 27776.22729 - tps: 19721.12138 + dps: 27757.14066 + tps: 19707.56987 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37048.69558 - tps: 26304.57386 + dps: 37028.11234 + tps: 26289.95976 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16567.17153 - tps: 11762.69179 + dps: 16555.15158 + tps: 11754.15762 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 16567.17153 - tps: 11762.69179 + dps: 16555.15158 + tps: 11754.15762 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19134.52951 - tps: 13585.51595 + dps: 19122.37909 + tps: 13576.88915 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37872.36406 - tps: 26889.37848 + dps: 37838.75871 + tps: 26865.51868 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 37872.36406 - tps: 26889.37848 + dps: 37838.75871 + tps: 26865.51868 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 50518.91557 - tps: 35868.43006 + dps: 50481.48795 + tps: 35841.85644 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 22420.78276 - tps: 15918.75576 + dps: 22400.07753 + tps: 15904.05505 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22420.78276 - tps: 15918.75576 + dps: 22400.07753 + tps: 15904.05505 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 25446.13367 - tps: 18066.75491 + dps: 25425.818 + tps: 18052.33078 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21945.56796 - tps: 15581.35325 + dps: 21930.84414 + tps: 15570.89934 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 21945.56796 - tps: 15581.35325 + dps: 21930.84414 + tps: 15570.89934 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 27962.69986 - tps: 19853.5169 + dps: 27946.69396 + tps: 19842.15271 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12756.24116 - tps: 9056.93122 + dps: 12747.74204 + tps: 9050.89685 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12756.24116 - tps: 9056.93122 + dps: 12747.74204 + tps: 9050.89685 } } dps_results: { key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14244.20139 - tps: 10113.38299 + dps: 14235.71586 + tps: 10107.35826 } } dps_results: { key: "TestAssassination-SwitchInFrontOfTarget-Default" value: { - dps: 24324.9878 - tps: 17270.74134 + dps: 24307.93551 + tps: 17258.63421 } } diff --git a/sim/rogue/assassination/assassination.go b/sim/rogue/assassination/assassination.go index b020e446a7..6d5cdb9232 100644 --- a/sim/rogue/assassination/assassination.go +++ b/sim/rogue/assassination/assassination.go @@ -1,6 +1,8 @@ package assassination import ( + "math" + "github.com/wowsims/cata/sim/core" "github.com/wowsims/cata/sim/core/proto" "github.com/wowsims/cata/sim/core/stats" @@ -9,6 +11,7 @@ import ( const masteryDamagePerPoint = 0.035 const masteryBaseEffect = 0.28 +const masteryFloored = true // Toggled locally for stat weight calculations func RegisterAssassinationRogue() { core.RegisterAgentFactory( @@ -81,7 +84,11 @@ func (sinRogue *AssassinationRogue) Initialize() { } func getMasteryBonus(masteryRating float64) float64 { - return masteryBaseEffect + core.MasteryRatingToMasteryPoints(masteryRating)*masteryDamagePerPoint + var effect = masteryBaseEffect + core.MasteryRatingToMasteryPoints(masteryRating)*masteryDamagePerPoint + if masteryFloored { + return math.Floor(effect*100) / 100 + } + return effect } func NewAssassinationRogue(character *core.Character, options *proto.Player) *AssassinationRogue { diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results index 2530c0718c..6fbca40dd0 100644 --- a/sim/rogue/combat/TestCombat.results +++ b/sim/rogue/combat/TestCombat.results @@ -2085,169 +2085,169 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37567.44149 - tps: 26672.88346 + dps: 37495.77302 + tps: 26621.99884 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 37892.48339 - tps: 26903.6632 + dps: 37949.62106 + tps: 26944.23095 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 45659.06172 - tps: 32417.93382 + dps: 45737.77081 + tps: 32473.81727 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21790.20477 - tps: 15471.04539 + dps: 21770.15688 + tps: 15456.81139 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22008.96227 - tps: 15626.36321 + dps: 21983.43184 + tps: 15608.23661 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22630.05868 - tps: 16067.34167 + dps: 22403.62869 + tps: 15906.57637 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 33061.29948 - tps: 23473.52263 + dps: 33065.75927 + tps: 23476.68908 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 33047.8885 - tps: 23464.00084 + dps: 33078.62925 + tps: 23485.82677 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39749.84241 - tps: 28222.38811 + dps: 39750.56599 + tps: 28222.90185 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19443.24416 - tps: 13804.70335 + dps: 19449.21519 + tps: 13808.94279 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19386.60758 - tps: 13764.49138 + dps: 19341.01438 + tps: 13732.12021 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19951.08574 - tps: 14165.27088 + dps: 19839.52891 + tps: 14086.06553 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 36337.39831 - tps: 25799.5528 + dps: 36302.61997 + tps: 25774.86018 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 36668.73868 - tps: 26034.80446 + dps: 36630.85835 + tps: 26007.90943 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 44024.25217 - tps: 31257.21904 + dps: 44044.88686 + tps: 31271.86967 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21214.1208 - tps: 15062.02577 + dps: 21192.35355 + tps: 15046.57102 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21357.46026 - tps: 15163.79678 + dps: 21343.081 + tps: 15153.58751 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 21817.12296 - tps: 15490.15731 + dps: 21726.01849 + tps: 15425.47313 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 34508.80773 - tps: 24501.25349 + dps: 34576.88625 + tps: 24549.58924 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 34929.1201 - tps: 24799.67527 + dps: 35019.12207 + tps: 24863.57667 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 42762.15832 - tps: 30361.1324 + dps: 42825.71935 + tps: 30406.26074 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19398.70176 - tps: 13773.07825 + dps: 19333.68136 + tps: 13726.91376 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19570.84559 - tps: 13895.30037 + dps: 19511.60593 + tps: 13853.24021 } } dps_results: { key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20317.6387 - tps: 14425.52348 + dps: 20119.55174 + tps: 14284.88173 } } dps_results: { @@ -2421,169 +2421,169 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 37868.6449 - tps: 26886.73788 + dps: 37798.85367 + tps: 26837.18611 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 38197.34797 - tps: 27120.11706 + dps: 38257.67308 + tps: 27162.94789 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 46267.1143 - tps: 32849.65115 + dps: 46353.71383 + tps: 32911.13682 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21963.85376 - tps: 15594.33617 + dps: 21970.21449 + tps: 15598.85229 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 22184.00581 - tps: 15750.64413 + dps: 22185.41575 + tps: 15751.64519 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22997.71323 - tps: 16328.3764 + dps: 22773.43868 + tps: 16169.14146 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 33322.76391 - tps: 23659.16237 + dps: 33333.97576 + tps: 23667.12279 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 33311.0999 - tps: 23650.88093 + dps: 33344.36764 + tps: 23674.50102 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40282.21867 - tps: 28600.37525 + dps: 40286.06975 + tps: 28603.10952 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19632.6413 - tps: 13939.17533 + dps: 19625.5217 + tps: 13934.1204 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19573.16684 - tps: 13896.94846 + dps: 19515.96166 + tps: 13856.33278 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20275.83126 - tps: 14395.84019 + dps: 20164.85253 + tps: 14317.0453 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 36627.78435 - tps: 26005.72689 + dps: 36596.05848 + tps: 25983.20152 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 36959.54756 - tps: 26241.27877 + dps: 36929.2946 + tps: 26219.79917 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 44612.77173 - tps: 31675.06793 + dps: 44636.21912 + tps: 31691.71557 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 21423.32511 - tps: 15210.56083 + dps: 21387.00447 + tps: 15184.77318 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 21564.90541 - tps: 15311.08284 + dps: 21538.84477 + tps: 15292.57979 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 22173.78294 - tps: 15743.38589 + dps: 22083.89235 + tps: 15679.56357 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 34788.6484 - tps: 24699.94037 + dps: 34859.14661 + tps: 24749.99409 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 35211.7324 - tps: 25000.33001 + dps: 35304.44722 + tps: 25066.15753 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 43351.3743 - tps: 30779.47575 + dps: 43422.4779 + tps: 30829.95931 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 19557.74559 - tps: 13885.99937 + dps: 19514.82622 + tps: 13855.52662 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 19730.37214 - tps: 14008.56422 + dps: 19693.48805 + tps: 13982.37651 } } dps_results: { key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 20660.30313 - tps: 14668.81523 + dps: 20464.00447 + tps: 14529.44317 } } dps_results: { diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results index faff85e8a7..b1f88ed14d 100644 --- a/sim/rogue/subtlety/TestSubtlety.results +++ b/sim/rogue/subtlety/TestSubtlety.results @@ -38,50 +38,50 @@ character_stats_results: { dps_results: { key: "TestSubtlety-AllItems-AgileShadowspiritDiamond" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 24089.70048 + tps: 17103.68734 } } dps_results: { key: "TestSubtlety-AllItems-Althor'sAbacus-50366" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 23793.57265 - tps: 16893.43658 + dps: 23832.50325 + tps: 16921.07731 } } dps_results: { key: "TestSubtlety-AllItems-Anhuur'sHymnal-55889" value: { - dps: 22508.59116 - tps: 15981.09973 + dps: 22355.18094 + tps: 15872.17846 } } dps_results: { key: "TestSubtlety-AllItems-Anhuur'sHymnal-56407" value: { - dps: 22576.04663 - tps: 16028.99311 + dps: 22400.64231 + tps: 15904.45604 } } dps_results: { key: "TestSubtlety-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 23003.10384 - tps: 16332.20372 + dps: 22948.07895 + tps: 16293.13605 } } dps_results: { key: "TestSubtlety-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 23049.54412 - tps: 16365.17633 + dps: 23108.93668 + tps: 16407.34504 } } dps_results: { @@ -94,128 +94,128 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-AustereShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { key: "TestSubtlety-AllItems-BaubleofTrueBlood-50726" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 hps: 92.67705 } } dps_results: { key: "TestSubtlety-AllItems-BedrockTalisman-58182" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BellofEnragingResonance-59326" value: { - dps: 22355.26837 - tps: 15872.24054 + dps: 22350.03775 + tps: 15868.5268 } } dps_results: { key: "TestSubtlety-AllItems-BellofEnragingResonance-65053" value: { - dps: 22438.68846 - tps: 15931.46881 + dps: 22479.39728 + tps: 15960.37207 } } dps_results: { key: "TestSubtlety-AllItems-BindingPromise-67037" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 23359.87336 - tps: 16585.51009 + dps: 23050.96199 + tps: 16366.18302 } } dps_results: { key: "TestSubtlety-AllItems-BloodofIsiset-55995" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { key: "TestSubtlety-AllItems-BloodofIsiset-56414" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 23988.38053 - tps: 17031.75018 + dps: 23867.71067 + tps: 16946.07458 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 22564.51762 - tps: 16020.80751 + dps: 22392.64134 + tps: 15898.77535 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 22305.35749 - tps: 15836.80382 + dps: 22338.97496 + tps: 15860.67222 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 23169.04102 - tps: 16450.01913 + dps: 23067.30897 + tps: 16377.78937 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 22465.7098 - tps: 15950.65396 + dps: 22311.78135 + tps: 15841.36476 } } dps_results: { @@ -242,8 +242,8 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-BottledLightning-66879" value: { - dps: 22365.26764 - tps: 15879.34002 + dps: 22194.65076 + tps: 15758.20204 } } dps_results: { @@ -270,50 +270,50 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-BracingShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16272.50199 + dps: 23530.91192 + tps: 16372.80851 } } dps_results: { key: "TestSubtlety-AllItems-Brawler'sTrophy-232015" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-BurningShadowspiritDiamond" value: { - dps: 23783.87997 - tps: 16886.55478 + dps: 23930.03493 + tps: 16990.3248 } } dps_results: { key: "TestSubtlety-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 23779.79405 - tps: 16883.65378 + dps: 24017.7962 + tps: 17052.6353 } } dps_results: { key: "TestSubtlety-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 22971.23259 - tps: 16309.57514 + dps: 23006.02189 + tps: 16334.27554 } } dps_results: { key: "TestSubtlety-AllItems-CoreofRipeness-58184" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-CorpseTongueCoin-50349" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { @@ -340,15 +340,15 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-CrushingWeight-59506" value: { - dps: 22761.15367 - tps: 16160.4191 + dps: 22935.65658 + tps: 16284.31617 } } dps_results: { key: "TestSubtlety-AllItems-CrushingWeight-65118" value: { - dps: 22913.35152 - tps: 16268.47958 + dps: 22964.09757 + tps: 16304.50928 } } dps_results: { @@ -375,113 +375,113 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 22813.27764 - tps: 16197.42712 + dps: 22799.56495 + tps: 16187.69111 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 23614.41957 - tps: 16766.23789 + dps: 23629.8258 + tps: 16777.17632 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-Deathbringer'sWill-50363" value: { - dps: 22712.90081 - tps: 16126.15957 + dps: 22719.81031 + tps: 16131.06532 } } dps_results: { key: "TestSubtlety-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 23614.78849 + tps: 16766.49983 } } dps_results: { key: "TestSubtlety-AllItems-DislodgedForeignObject-50348" value: { - dps: 22370.69907 - tps: 15883.19634 + dps: 22301.61077 + tps: 15834.14365 } } dps_results: { key: "TestSubtlety-AllItems-Dwyer'sCaber-70141" value: { - dps: 23092.86839 - tps: 16395.93656 + dps: 23087.88627 + tps: 16392.39925 } } dps_results: { key: "TestSubtlety-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { key: "TestSubtlety-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-EmberShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { key: "TestSubtlety-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 23614.78849 + tps: 16766.49983 } } dps_results: { key: "TestSubtlety-AllItems-EssenceoftheCyclone-59473" value: { - dps: 23749.51511 - tps: 16862.15573 + dps: 23824.78103 + tps: 16915.59453 } } dps_results: { key: "TestSubtlety-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 22739.91008 - tps: 16145.33616 + dps: 22734.64239 + tps: 16141.59609 } } dps_results: { key: "TestSubtlety-AllItems-EternalShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { @@ -508,57 +508,57 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-FallofMortality-59500" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-FallofMortality-65124" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-FieryQuintessence-69000" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-DemonPanther-52199" value: { - dps: 24053.81184 - tps: 17078.20641 + dps: 23819.71108 + tps: 16911.99487 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-DreamOwl-52354" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-KingofBoars-52351" value: { - dps: 22845.24588 - tps: 16220.12457 + dps: 22739.57449 + tps: 16145.09788 } } dps_results: { @@ -585,22 +585,22 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-FleetShadowspiritDiamond" value: { - dps: 23472.62232 - tps: 16665.56185 + dps: 23327.92989 + tps: 16562.83022 } } dps_results: { key: "TestSubtlety-AllItems-FluidDeath-58181" value: { - dps: 23773.00511 - tps: 16878.83363 + dps: 23770.19443 + tps: 16876.83805 } } dps_results: { key: "TestSubtlety-AllItems-ForlornShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { @@ -613,176 +613,176 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-FuryofAngerforge-59461" value: { - dps: 22718.6455 - tps: 16130.2383 + dps: 22714.74961 + tps: 16127.47222 } } dps_results: { key: "TestSubtlety-AllItems-GaleofShadows-56138" value: { - dps: 22347.02249 - tps: 15866.38597 + dps: 22245.38869 + tps: 15794.22597 } } dps_results: { key: "TestSubtlety-AllItems-GaleofShadows-56462" value: { - dps: 22408.11065 - tps: 15909.75856 + dps: 22407.13227 + tps: 15909.06391 } } dps_results: { key: "TestSubtlety-AllItems-GearDetector-61462" value: { - dps: 23042.54343 - tps: 16360.20584 + dps: 22942.49629 + tps: 16289.17237 } } dps_results: { key: "TestSubtlety-AllItems-Gladiator'sVestments" value: { - dps: 19273.16279 - tps: 13683.94558 + dps: 19444.18361 + tps: 13805.37036 } } dps_results: { key: "TestSubtlety-AllItems-GlowingTwilightScale-54589" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-GraceoftheHerald-55266" value: { - dps: 23161.08521 - tps: 16444.3705 + dps: 23108.56728 + tps: 16407.08277 } } dps_results: { key: "TestSubtlety-AllItems-GraceoftheHerald-56295" value: { - dps: 23402.00958 - tps: 16615.4268 + dps: 23441.35085 + tps: 16643.3591 } } dps_results: { key: "TestSubtlety-AllItems-HarmlightToken-63839" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 22462.26091 - tps: 15948.20524 + dps: 22597.49679 + tps: 16044.22272 } } dps_results: { key: "TestSubtlety-AllItems-HeartofIgnacious-59514" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-HeartofIgnacious-65110" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-HeartofRage-59224" value: { - dps: 22640.17745 - tps: 16074.52599 + dps: 22483.3648 + tps: 15963.18901 } } dps_results: { key: "TestSubtlety-AllItems-HeartofRage-65072" value: { - dps: 22685.81923 - tps: 16106.93165 + dps: 22533.76564 + tps: 15998.97361 } } dps_results: { key: "TestSubtlety-AllItems-HeartofSolace-55868" value: { - dps: 22347.02249 - tps: 15866.38597 + dps: 22245.38869 + tps: 15794.22597 } } dps_results: { key: "TestSubtlety-AllItems-HeartofSolace-56393" value: { - dps: 22823.14758 - tps: 16204.43478 + dps: 22824.27649 + tps: 16205.23631 } } dps_results: { key: "TestSubtlety-AllItems-HeartofThunder-55845" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-HeartofThunder-56370" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-HeartoftheVile-66969" value: { - dps: 23061.79134 - tps: 16373.87185 + dps: 22988.74695 + tps: 16322.01034 } } dps_results: { key: "TestSubtlety-AllItems-Heartpierce-50641" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 24089.70048 + tps: 17103.68734 } } dps_results: { key: "TestSubtlety-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 23379.64424 - tps: 16599.54741 + dps: 23614.78849 + tps: 16766.49983 } } dps_results: { key: "TestSubtlety-AllItems-ImpatienceofYouth-62464" value: { - dps: 22741.72301 - tps: 16146.62334 + dps: 22786.66047 + tps: 16178.52894 } } dps_results: { key: "TestSubtlety-AllItems-ImpatienceofYouth-62469" value: { - dps: 22741.72301 - tps: 16146.62334 + dps: 22786.66047 + tps: 16178.52894 } } dps_results: { key: "TestSubtlety-AllItems-ImpetuousQuery-55881" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { key: "TestSubtlety-AllItems-ImpetuousQuery-56406" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { @@ -809,8 +809,8 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { @@ -837,57 +837,57 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 22223.80421 - tps: 15778.90099 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { key: "TestSubtlety-AllItems-JarofAncientRemedies-59354" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-JarofAncientRemedies-65029" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-JawsofDefeat-68926" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-JawsofDefeat-69111" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-JujuofNimbleness-63840" value: { - dps: 23359.87336 - tps: 16585.51009 + dps: 23050.96199 + tps: 16366.18302 } } dps_results: { key: "TestSubtlety-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 23459.70737 - tps: 16656.39223 + dps: 23415.90689 + tps: 16625.2939 } } dps_results: { key: "TestSubtlety-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 24047.0186 - tps: 17073.3832 + dps: 23901.61861 + tps: 16970.14922 } } dps_results: { @@ -914,246 +914,246 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-KvaldirBattleStandard-59685" value: { - dps: 22512.68451 - tps: 15984.006 + dps: 22592.28978 + tps: 16040.52575 } } dps_results: { key: "TestSubtlety-AllItems-KvaldirBattleStandard-59689" value: { - dps: 22512.68451 - tps: 15984.006 + dps: 22592.28978 + tps: 16040.52575 } } dps_results: { key: "TestSubtlety-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 22281.38464 - tps: 15819.78309 + dps: 22152.57849 + tps: 15728.33073 } } dps_results: { key: "TestSubtlety-AllItems-LeadenDespair-55816" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-LeadenDespair-56347" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-LeftEyeofRajh-56102" value: { - dps: 23543.98745 - tps: 16716.23109 + dps: 23395.53257 + tps: 16610.82813 } } dps_results: { key: "TestSubtlety-AllItems-LeftEyeofRajh-56427" value: { - dps: 23795.95892 - tps: 16895.13083 + dps: 23598.42748 + tps: 16754.88351 } } dps_results: { key: "TestSubtlety-AllItems-LicensetoSlay-58180" value: { - dps: 22843.80394 - tps: 16219.1008 + dps: 22741.983 + tps: 16146.80793 } } dps_results: { key: "TestSubtlety-AllItems-MagnetiteMirror-55814" value: { - dps: 22453.79866 - tps: 15942.19705 + dps: 22289.96406 + tps: 15825.87448 } } dps_results: { key: "TestSubtlety-AllItems-MagnetiteMirror-56345" value: { - dps: 22541.23612 - tps: 16004.27765 + dps: 22375.22168 + tps: 15886.40739 } } dps_results: { key: "TestSubtlety-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-MarkofKhardros-56132" value: { - dps: 22355.8304 - tps: 15872.63959 + dps: 22469.11378 + tps: 15953.07079 } } dps_results: { key: "TestSubtlety-AllItems-MarkofKhardros-56458" value: { - dps: 22538.34449 - tps: 16002.22459 + dps: 22463.2681 + tps: 15948.92035 } } dps_results: { key: "TestSubtlety-AllItems-MatrixRestabilizer-68994" value: { - dps: 24239.44051 - tps: 17210.00277 + dps: 24305.28202 + tps: 17256.75023 } } dps_results: { key: "TestSubtlety-AllItems-MatrixRestabilizer-69150" value: { - dps: 24422.54603 - tps: 17340.00768 + dps: 24584.97412 + tps: 17455.33163 } } dps_results: { key: "TestSubtlety-AllItems-MightoftheOcean-55251" value: { - dps: 22550.73074 - tps: 16011.01882 + dps: 22452.29142 + tps: 15941.12691 } } dps_results: { key: "TestSubtlety-AllItems-MightoftheOcean-56285" value: { - dps: 22941.11276 - tps: 16288.19006 + dps: 22763.4059 + tps: 16162.01819 } } dps_results: { key: "TestSubtlety-AllItems-MirrorofBrokenImages-62466" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-MirrorofBrokenImages-62471" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-MithrilStopwatch-232013" value: { - dps: 22305.58115 - tps: 15836.96262 + dps: 22339.42167 + tps: 15860.98939 } } dps_results: { key: "TestSubtlety-AllItems-MoonwellChalice-70142" value: { - dps: 22140.17256 - tps: 15719.52251 + dps: 22201.10397 + tps: 15762.78382 } } dps_results: { key: "TestSubtlety-AllItems-MoonwellPhial-70143" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-NecromanticFocus-68982" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-NecromanticFocus-69139" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Oremantle'sFavor-61448" value: { - dps: 22649.73316 - tps: 16081.31054 + dps: 22696.69007 + tps: 16114.64995 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 22174.8762 - tps: 15744.1621 + dps: 22274.54175 + tps: 15814.92464 } } dps_results: { key: "TestSubtlety-AllItems-PorcelainCrab-55237" value: { - dps: 22172.5878 - tps: 15742.53734 + dps: 22344.85864 + tps: 15864.84964 } } dps_results: { key: "TestSubtlety-AllItems-PorcelainCrab-56280" value: { - dps: 22349.88623 - tps: 15868.41923 + dps: 22471.57658 + tps: 15954.81937 } } dps_results: { key: "TestSubtlety-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 23386.75193 - tps: 16604.59387 + dps: 23530.91192 + tps: 16706.94746 } } dps_results: { key: "TestSubtlety-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 23833.22219 - tps: 16921.58775 + dps: 23754.33044 + tps: 16865.57462 } } dps_results: { key: "TestSubtlety-AllItems-Rainsong-55854" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Rainsong-56377" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { @@ -1201,36 +1201,36 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 23837.2017 - tps: 16924.41321 + dps: 23983.62213 + tps: 17028.37171 } } dps_results: { key: "TestSubtlety-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 23783.87997 - tps: 16886.55478 + dps: 23930.03493 + tps: 16990.3248 } } dps_results: { key: "TestSubtlety-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 23955.16281 - tps: 17008.1656 + dps: 23751.09886 + tps: 16863.28019 } } dps_results: { key: "TestSubtlety-AllItems-RightEyeofRajh-56100" value: { - dps: 22887.37994 - tps: 16250.03976 + dps: 22722.52934 + tps: 16132.99583 } } dps_results: { key: "TestSubtlety-AllItems-RightEyeofRajh-56431" value: { - dps: 22997.89744 - tps: 16328.50718 + dps: 22810.58648 + tps: 16195.5164 } } dps_results: { @@ -1264,108 +1264,108 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-RuneofZeth-68998" value: { - dps: 22491.60705 - tps: 15969.041 + dps: 22455.76917 + tps: 15943.59611 } } dps_results: { key: "TestSubtlety-AllItems-ScalesofLife-68915" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 hps: 309.7614 } } dps_results: { key: "TestSubtlety-AllItems-ScalesofLife-69109" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 hps: 349.40796 } } dps_results: { key: "TestSubtlety-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 22992.87351 - tps: 16324.94019 + dps: 23134.60836 + tps: 16425.57194 } } dps_results: { key: "TestSubtlety-AllItems-SeaStar-55256" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-SeaStar-56290" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ShardofWoe-60233" value: { - dps: 22612.86239 - tps: 16055.13229 + dps: 22666.91333 + tps: 16093.50846 } } dps_results: { key: "TestSubtlety-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 22602.52376 - tps: 16047.79187 + dps: 22630.27065 + tps: 16067.49216 } } dps_results: { key: "TestSubtlety-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Skardyn'sGrace-56115" value: { - dps: 22841.79871 - tps: 16217.67709 + dps: 23065.46108 + tps: 16376.47737 } } dps_results: { key: "TestSubtlety-AllItems-Skardyn'sGrace-56440" value: { - dps: 23042.71427 - tps: 16360.32713 + dps: 23149.94977 + tps: 16436.46434 } } dps_results: { key: "TestSubtlety-AllItems-Sorrowsong-55879" value: { - dps: 22282.84593 - tps: 15820.82061 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { key: "TestSubtlety-AllItems-Sorrowsong-56400" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-Soul'sAnguish-66994" value: { - dps: 22707.76404 - tps: 16122.51247 + dps: 22548.58394 + tps: 16009.49459 } } dps_results: { key: "TestSubtlety-AllItems-SoulCasket-58183" value: { - dps: 22331.90641 - tps: 15855.65355 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { @@ -1392,15 +1392,15 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-SpidersilkSpindle-68981" value: { - dps: 22357.54245 - tps: 15873.85514 + dps: 22353.40665 + tps: 15870.91872 } } dps_results: { key: "TestSubtlety-AllItems-SpidersilkSpindle-69138" value: { - dps: 22348.95325 - tps: 15867.75681 + dps: 22292.32587 + tps: 15827.55136 } } dps_results: { @@ -1427,204 +1427,204 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-StayofExecution-68996" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Stonemother'sKiss-61411" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-StumpofTime-62465" value: { - dps: 22477.98369 - tps: 15959.36842 + dps: 22377.81274 + tps: 15888.24705 } } dps_results: { key: "TestSubtlety-AllItems-StumpofTime-62470" value: { - dps: 22477.98369 - tps: 15959.36842 + dps: 22377.81274 + tps: 15888.24705 } } dps_results: { key: "TestSubtlety-AllItems-SymbioticWorm-59332" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-SymbioticWorm-65048" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 22568.52512 - tps: 16023.65284 + dps: 22716.93877 + tps: 16129.02652 } } dps_results: { key: "TestSubtlety-AllItems-TearofBlood-55819" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-TearofBlood-56351" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 22094.1542 - tps: 15686.84948 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { key: "TestSubtlety-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 22477.92914 - tps: 15959.32969 + dps: 22366.81041 + tps: 15880.43539 } } dps_results: { key: "TestSubtlety-AllItems-TheHungerer-68927" value: { - dps: 23937.22861 - tps: 16995.43231 + dps: 23948.69067 + tps: 17003.57038 } } dps_results: { key: "TestSubtlety-AllItems-TheHungerer-69112" value: { - dps: 24139.06999 - tps: 17138.73969 + dps: 24219.61678 + tps: 17195.92792 } } dps_results: { key: "TestSubtlety-AllItems-Theralion'sMirror-59519" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Theralion'sMirror-65105" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Throngus'sFinger-56121" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Throngus'sFinger-56449" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-Tia'sGrace-55874" value: { - dps: 23288.24045 - tps: 16534.65072 + dps: 23197.57786 + tps: 16470.28028 } } dps_results: { key: "TestSubtlety-AllItems-Tia'sGrace-56394" value: { - dps: 23573.68489 - tps: 16737.31627 + dps: 23565.26475 + tps: 16731.33798 } } dps_results: { key: "TestSubtlety-AllItems-TinyAbominationinaJar-50706" value: { - dps: 22763.70162 - tps: 16162.22815 + dps: 22867.57593 + tps: 16235.97891 } } dps_results: { key: "TestSubtlety-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 21979.87017 - tps: 15605.70782 + dps: 22129.42957 + tps: 15711.89499 } } dps_results: { key: "TestSubtlety-AllItems-UnheededWarning-59520" value: { - dps: 23543.57992 - tps: 16715.94174 + dps: 23642.51382 + tps: 16786.18482 } } dps_results: { key: "TestSubtlety-AllItems-UnquenchableFlame-67101" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-62463" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 23986.92288 + tps: 17030.71524 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-62468" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 23986.92288 + tps: 17030.71524 } } dps_results: { key: "TestSubtlety-AllItems-UnsolvableRiddle-68709" value: { - dps: 23987.06516 - tps: 17030.81626 + dps: 23986.92288 + tps: 17030.71524 } } dps_results: { key: "TestSubtlety-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { @@ -1644,22 +1644,22 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-VesselofAcceleration-68995" value: { - dps: 22949.16452 - tps: 16293.90681 + dps: 22910.14687 + tps: 16266.20428 } } dps_results: { key: "TestSubtlety-AllItems-VesselofAcceleration-69167" value: { - dps: 23082.98565 - tps: 16388.91981 + dps: 22936.73462 + tps: 16285.08158 } } dps_results: { key: "TestSubtlety-AllItems-VestmentsoftheDarkPhoenix" value: { - dps: 23483.30208 - tps: 16673.14447 + dps: 23505.35261 + tps: 16688.80035 } } dps_results: { @@ -1686,99 +1686,99 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-VialofStolenMemories-59515" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-VialofStolenMemories-65109" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 23788.68906 - tps: 16889.96923 + dps: 23581.77055 + tps: 16743.05709 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 22585.72718 - tps: 16035.8663 + dps: 22413.0268 + tps: 15913.24903 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 22453.08561 - tps: 15941.69078 + dps: 22375.48842 + tps: 15886.59678 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 22562.97934 - tps: 16019.71533 + dps: 22636.612 + tps: 16071.99452 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 22443.77887 - tps: 15935.08299 + dps: 22442.07542 + tps: 15933.87355 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 22444.3449 - tps: 15935.48488 + dps: 22353.40665 + tps: 15870.91872 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 23614.13142 - tps: 16766.03331 + dps: 23504.44572 + tps: 16688.15646 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 22559.29937 - tps: 16017.10255 + dps: 22392.72437 + tps: 15898.83431 } } dps_results: { @@ -1805,29 +1805,29 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-WindDancer'sRegalia" value: { - dps: 21375.94345 - tps: 15176.91985 + dps: 21147.93913 + tps: 15015.03678 } } dps_results: { key: "TestSubtlety-AllItems-WitchingHourglass-55787" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-WitchingHourglass-56320" value: { - dps: 22185.24075 - tps: 15751.52093 + dps: 22028.10137 + tps: 15639.95197 } } dps_results: { key: "TestSubtlety-AllItems-World-QuellerFocus-63842" value: { - dps: 22193.05242 - tps: 15757.06722 + dps: 22041.55533 + tps: 15649.50429 } } dps_results: { @@ -1854,700 +1854,700 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 22160.19615 - tps: 15733.73927 + dps: 22205.88028 + tps: 15766.175 } } dps_results: { key: "TestSubtlety-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 22160.19615 - tps: 15733.73927 + dps: 22205.88028 + tps: 15766.175 } } dps_results: { key: "TestSubtlety-Average-Default" value: { - dps: 24117.7856 - tps: 17123.62778 + dps: 24083.30642 + tps: 17099.14756 } } 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: 21963.3855 + tps: 15594.00371 } } 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: 21963.3855 + tps: 15594.00371 } } 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: 28807.23711 + tps: 20453.13835 } } 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: 12025.51458 + tps: 8538.11535 } } 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: 12025.51458 + tps: 8538.11535 } } 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: 13402.7665 + tps: 9515.96422 } } 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: 23881.78805 + tps: 16956.06951 } } 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: 23881.78805 + tps: 16956.06951 } } 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: 31280.68108 + tps: 22209.28357 } } 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: 12999.73699 + tps: 9229.81326 } } 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: 12999.73699 + tps: 9229.81326 } } 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: 14636.37568 + tps: 10391.82673 } } 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: 21691.02685 + tps: 15400.62906 } } 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: 21691.02685 + tps: 15400.62906 } } 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: 29177.91951 + tps: 20716.32286 } } 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: 11621.21988 + tps: 8251.06611 } } 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: 11621.21988 + tps: 8251.06611 } } 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: 13221.17565 + tps: 9387.03471 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 24089.70048 + tps: 17103.68734 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 23967.70258 - tps: 17017.06883 + dps: 24089.70048 + tps: 17103.68734 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31257.32917 - tps: 22192.70371 + dps: 31176.55986 + tps: 22135.3575 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 12971.14037 - tps: 9209.50967 + dps: 12920.87657 + tps: 9173.82237 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 12971.14037 - tps: 9209.50967 + dps: 12920.87657 + tps: 9173.82237 } } dps_results: { key: "TestSubtlety-Settings-Human-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 14830.33318 - tps: 10529.53656 + dps: 14537.6021 + tps: 10321.69749 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28102.24981 - tps: 19952.59737 + dps: 27954.64227 + tps: 19847.79601 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28102.24981 - tps: 19952.59737 + dps: 27954.64227 + tps: 19847.79601 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 36746.74083 - tps: 26090.18599 + dps: 36689.74738 + tps: 26049.72064 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15775.69732 - tps: 11200.7451 + dps: 15782.7413 + tps: 11205.74632 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15775.69732 - tps: 11200.7451 + dps: 15782.7413 + tps: 11205.74632 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17984.35823 - tps: 12768.89435 + dps: 17981.26504 + tps: 12766.69818 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30422.39444 - tps: 21599.90005 + dps: 30575.53481 + tps: 21708.62971 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30422.39444 - tps: 21599.90005 + dps: 30575.53481 + tps: 21708.62971 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39483.49411 - tps: 28033.28082 + dps: 39510.73059 + tps: 28052.61872 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17181.45254 - tps: 12198.8313 + dps: 17126.04377 + tps: 12159.49108 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17181.45254 - tps: 12198.8313 + dps: 17126.04377 + tps: 12159.49108 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19369.9625 - tps: 13752.67338 + dps: 19369.31841 + tps: 13752.21607 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28101.81656 - tps: 19952.28976 + dps: 28074.67729 + tps: 19933.02088 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28101.81656 - tps: 19952.28976 + dps: 28074.67729 + tps: 19933.02088 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37333.2849 - tps: 26506.63228 + dps: 37045.7714 + tps: 26302.4977 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15558.68784 - tps: 11046.66836 + dps: 15587.07501 + tps: 11066.82326 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15558.68784 - tps: 11046.66836 + dps: 15587.07501 + tps: 11066.82326 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 17788.6539 - tps: 12629.94427 + dps: 17783.36439 + tps: 12626.18872 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30704.06069 - tps: 21799.88309 + dps: 30684.33732 + tps: 21785.8795 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30704.06069 - tps: 21799.88309 + dps: 30684.33732 + tps: 21785.8795 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39898.93826 - tps: 28328.24616 + dps: 39853.23685 + tps: 28295.79816 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17079.49434 - tps: 12126.44098 + dps: 17175.59514 + tps: 12194.67255 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17079.49434 - tps: 12126.44098 + dps: 17175.59514 + tps: 12194.67255 } } dps_results: { key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18979.71656 - tps: 13475.59876 + dps: 19236.9141 + tps: 13658.20901 } } 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: 22189.62015 + tps: 15754.63031 } } 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: 22189.62015 + tps: 15754.63031 } } 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: 29261.84412 + tps: 20775.90933 } } 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: 12142.45572 + tps: 8621.14356 } } 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: 12142.45572 + tps: 8621.14356 } } 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: 13642.22963 + tps: 9685.98303 } } 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: 24109.69847 + tps: 17117.88591 } } 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: 24109.69847 + tps: 17117.88591 } } 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: 31761.12135 + tps: 22550.39616 } } 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: 13125.65426 + tps: 9319.21452 } } 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: 13125.65426 + tps: 9319.21452 } } 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: 14886.59686 + tps: 10569.48377 } } 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: 21902.55322 + tps: 15550.81279 } } 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: 21902.55322 + tps: 15550.81279 } } 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: 29651.14891 + tps: 21052.31573 } } 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: 11699.22377 + tps: 8306.44887 } } 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: 11699.22377 + tps: 8306.44887 } } 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: 13436.02684 + tps: 9539.57905 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24196.44674 - tps: 17179.47719 + dps: 24328.42881 + tps: 17273.18445 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 24196.44674 - tps: 17179.47719 + dps: 24328.42881 + tps: 17273.18445 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 31741.19706 - tps: 22536.24991 + dps: 31659.42489 + tps: 22478.19167 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 13096.7651 - tps: 9298.70322 + dps: 13042.39973 + tps: 9260.10381 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 13096.7651 - tps: 9298.70322 + dps: 13042.39973 + tps: 9260.10381 } } dps_results: { key: "TestSubtlety-Settings-Orc-p1_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 15079.50794 - tps: 10706.45064 + dps: 14786.21257 + tps: 10498.21093 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28346.21347 - tps: 20125.81156 + dps: 28222.74517 + tps: 20038.14907 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28346.21347 - tps: 20125.81156 + dps: 28222.74517 + tps: 20038.14907 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37231.58214 - tps: 26434.42332 + dps: 37172.38106 + tps: 26392.39055 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15915.79962 - tps: 11300.21773 + dps: 15920.41762 + tps: 11303.49651 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15915.79962 - tps: 11300.21773 + dps: 15920.41762 + tps: 11303.49651 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18260.64836 - tps: 12965.06034 + dps: 18257.38172 + tps: 12962.74102 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30658.16918 - tps: 21767.30012 + dps: 30859.68693 + tps: 21910.37772 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30658.16918 - tps: 21767.30012 + dps: 30859.68693 + tps: 21910.37772 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 39998.14166 - tps: 28398.68058 + dps: 40021.39097 + tps: 28415.18759 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17338.67393 - tps: 12310.45849 + dps: 17282.97348 + tps: 12270.91117 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17338.67393 - tps: 12310.45849 + dps: 17282.97348 + tps: 12270.91117 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19659.58021 - tps: 13958.30195 + dps: 19658.74626 + tps: 13957.70984 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 28352.91558 - tps: 20130.57006 + dps: 28315.26033 + tps: 20103.83483 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 28352.91558 - tps: 20130.57006 + dps: 28315.26033 + tps: 20103.83483 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 37840.30745 - tps: 26866.61829 + dps: 37552.41849 + tps: 26662.21713 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 15695.16003 - tps: 11143.56362 + dps: 15719.7356 + tps: 11161.01228 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 15695.16003 - tps: 11143.56362 + dps: 15719.7356 + tps: 11161.01228 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 18074.68452 - tps: 12833.02601 + dps: 18068.19626 + tps: 12828.41934 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 30982.74861 - tps: 21997.75151 + dps: 30915.21161 + tps: 21949.80024 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 30982.74861 - tps: 21997.75151 + dps: 30915.21161 + tps: 21949.80024 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 40423.73882 - tps: 28700.85456 + dps: 40364.14097 + tps: 28658.54009 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 17230.12882 - tps: 12233.39146 + dps: 17330.47051 + tps: 12304.63406 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 17230.12882 - tps: 12233.39146 + dps: 17330.47051 + tps: 12304.63406 } } dps_results: { key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 19273.35502 - tps: 13684.08207 + dps: 19530.60371 + tps: 13866.72863 } } dps_results: { key: "TestSubtlety-SwitchInFrontOfTarget-Default" value: { - dps: 18818.20043 - tps: 13360.92231 + dps: 18984.76617 + tps: 13479.18398 } } diff --git a/sim/rogue/subtlety/subtlety.go b/sim/rogue/subtlety/subtlety.go index 6bd441ca50..a378e0143d 100644 --- a/sim/rogue/subtlety/subtlety.go +++ b/sim/rogue/subtlety/subtlety.go @@ -1,6 +1,8 @@ package subtlety import ( + "math" + "github.com/wowsims/cata/sim/core" "github.com/wowsims/cata/sim/core/proto" "github.com/wowsims/cata/sim/core/stats" @@ -9,6 +11,7 @@ import ( const masteryDamagePerPoint = .025 const masteryBaseEffect = 0.2 +const masteryFloored = true // Toggled locally for stat weight calculations func RegisterSubtletyRogue() { core.RegisterAgentFactory( @@ -66,7 +69,11 @@ func (subRogue *SubtletyRogue) Initialize() { } func getMasteryBonus(masteryRating float64) float64 { - return masteryBaseEffect + core.MasteryRatingToMasteryPoints(masteryRating)*masteryDamagePerPoint + var effect = masteryBaseEffect + core.MasteryRatingToMasteryPoints(masteryRating)*masteryDamagePerPoint + if masteryFloored { + return math.Floor(effect*100) / 100 + } + return effect } func NewSubtletyRogue(character *core.Character, options *proto.Player) *SubtletyRogue { diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results index a744f6bb51..48f1c9d1c5 100644 --- a/sim/warlock/affliction/TestAffliction.results +++ b/sim/warlock/affliction/TestAffliction.results @@ -3,19 +3,19 @@ character_stats_results: { value: { final_stats: 666.75 final_stats: 668.85 - final_stats: 7057.05 - final_stats: 5543.37 + final_stats: 8311.8 + final_stats: 7126.56 final_stats: 183 - final_stats: 1748 - final_stats: 989 - final_stats: 2200 + final_stats: 1750 + final_stats: 1028 + final_stats: 2510 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 991 + final_stats: 1049 final_stats: 788.1 final_stats: 0 - final_stats: 9216.207 + final_stats: 11594.616 final_stats: 0 final_stats: 0 final_stats: 0 @@ -23,65 +23,65 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 8479 + final_stats: 9372 final_stats: 0 - final_stats: 136722.7 - final_stats: 105549.55 + final_stats: 154289.2 + final_stats: 129297.4 final_stats: 1353.65 - final_stats: 14.55347 - final_stats: 17.06269 - final_stats: 13.13851 - final_stats: 20.53156 + final_stats: 14.57012 + final_stats: 17.08221 + final_stats: 13.35605 + final_stats: 23.12389 final_stats: 5 } } dps_results: { key: "TestAffliction-AllItems-AgileShadowspiritDiamond" value: { - dps: 28439.17184 - tps: 20697.51094 + dps: 35969.57138 + tps: 26258.5514 } } dps_results: { key: "TestAffliction-AllItems-Althor'sAbacus-50366" value: { - dps: 27268.62357 - tps: 19848.84803 + dps: 34493.16883 + tps: 25310.24545 } } dps_results: { key: "TestAffliction-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 26965.58532 - tps: 19774.80515 + dps: 34403.80663 + tps: 25311.89842 } } dps_results: { key: "TestAffliction-AllItems-Anhuur'sHymnal-55889" value: { - dps: 27483.99094 - tps: 20065.75473 + dps: 34732.66224 + tps: 25338.1397 } } dps_results: { key: "TestAffliction-AllItems-Anhuur'sHymnal-56407" value: { - dps: 27531.33118 - tps: 20094.16219 + dps: 34785.29734 + tps: 25376.9615 } } dps_results: { key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -94,128 +94,135 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-AustereShadowspiritDiamond" value: { - dps: 28106.00317 - tps: 20369.14877 + dps: 35659.13114 + tps: 25959.58315 } } dps_results: { key: "TestAffliction-AllItems-Balespider'sBurningVestments" value: { - dps: 28406.96593 - tps: 20430.64678 + dps: 33268.19898 + tps: 24356.54466 } } dps_results: { key: "TestAffliction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 26702.85293 - tps: 19503.89226 - hps: 100.63102 + dps: 33871.79364 + tps: 24696.32383 + hps: 101.77201 } } dps_results: { key: "TestAffliction-AllItems-BedrockTalisman-58182" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-BellofEnragingResonance-59326" value: { - dps: 28207.89867 - tps: 20527.59106 + dps: 35479.77457 + tps: 25905.84208 + } +} +dps_results: { + key: "TestAffliction-AllItems-BellofEnragingResonance-65053" + value: { + dps: 35692.37464 + tps: 26064.58378 } } dps_results: { key: "TestAffliction-AllItems-BindingPromise-67037" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 26799.45893 - tps: 19610.6177 + dps: 34122.24182 + tps: 25020.63104 } } dps_results: { key: "TestAffliction-AllItems-BloodofIsiset-55995" value: { - dps: 26939.71672 - tps: 19724.5727 + dps: 34320.80553 + tps: 25255.31528 } } dps_results: { key: "TestAffliction-AllItems-BloodofIsiset-56414" value: { - dps: 26939.71672 - tps: 19724.5727 + dps: 34320.80553 + tps: 25255.31528 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 26616.27835 - tps: 19441.28086 + dps: 33871.63776 + tps: 24775.07313 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 27524.4432 - tps: 20075.7356 + dps: 34798.44982 + tps: 25423.70579 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 26632.48919 - tps: 19449.56118 + dps: 33853.3422 + tps: 24750.23347 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 27046.86331 - tps: 19730.94751 + dps: 34305.76588 + tps: 25116.3178 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 26711.57293 - tps: 19493.93678 + dps: 33830.82055 + tps: 24710.98624 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 26711.57293 - tps: 19493.93678 + dps: 33894.53999 + tps: 24795.75037 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 27539.25361 - tps: 20091.83967 + dps: 34786.26199 + tps: 25482.26803 } } dps_results: { key: "TestAffliction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -242,8 +249,8 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-BottledLightning-66879" value: { - dps: 27362.63211 - tps: 19963.68126 + dps: 34733.20423 + tps: 25380.94647 } } dps_results: { @@ -270,50 +277,50 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-BracingShadowspiritDiamond" value: { - dps: 28302.79172 - tps: 20127.36617 + dps: 35752.42264 + tps: 25511.24536 } } dps_results: { key: "TestAffliction-AllItems-Brawler'sTrophy-232015" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-BurningShadowspiritDiamond" value: { - dps: 28594.00145 - tps: 20812.54946 + dps: 36142.77119 + tps: 26402.55888 } } dps_results: { key: "TestAffliction-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 28528.87856 - tps: 20757.42108 + dps: 36055.83534 + tps: 26322.55486 } } dps_results: { key: "TestAffliction-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 27083.23129 - tps: 19760.61353 + dps: 34307.92673 + tps: 25099.78979 } } dps_results: { key: "TestAffliction-AllItems-CoreofRipeness-58184" value: { - dps: 27652.51007 - tps: 20154.17527 + dps: 35028.24675 + tps: 25486.49844 } } dps_results: { key: "TestAffliction-AllItems-CorpseTongueCoin-50349" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -340,15 +347,15 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-CrushingWeight-59506" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-CrushingWeight-65118" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -375,113 +382,113 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 26710.75416 - tps: 19490.6276 + dps: 33898.79626 + tps: 24799.62147 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 27700.03127 - tps: 20155.47846 + dps: 34933.9772 + tps: 25434.00986 } } dps_results: { key: "TestAffliction-AllItems-Deathbringer'sWill-50363" value: { - dps: 26917.5728 - tps: 19649.32675 + dps: 34147.36109 + tps: 25007.76426 } } dps_results: { key: "TestAffliction-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 28235.48538 - tps: 20472.99453 + dps: 35665.20776 + tps: 25944.93985 } } dps_results: { key: "TestAffliction-AllItems-DislodgedForeignObject-50348" value: { - dps: 27325.56714 - tps: 19948.92187 + dps: 34912.05439 + tps: 25539.48518 } } dps_results: { key: "TestAffliction-AllItems-Dwyer'sCaber-70141" value: { - dps: 27087.75324 - tps: 19780.59326 + dps: 34361.59047 + tps: 25134.72197 } } dps_results: { key: "TestAffliction-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 28106.00317 - tps: 20369.14877 + dps: 35659.13114 + tps: 25959.58315 } } dps_results: { key: "TestAffliction-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 27070.39378 - tps: 19767.86265 + dps: 34301.0675 + tps: 25093.80856 } } dps_results: { key: "TestAffliction-AllItems-EmberShadowspiritDiamond" value: { - dps: 28280.36381 - tps: 20540.79816 + dps: 35834.34886 + tps: 26004.31069 } } dps_results: { key: "TestAffliction-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 28235.48538 - tps: 20472.99453 + dps: 35665.20776 + tps: 25944.93985 } } dps_results: { key: "TestAffliction-AllItems-EssenceoftheCyclone-59473" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-EssenceoftheCyclone-65140" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 26965.58532 - tps: 19774.80515 + dps: 34403.80663 + tps: 25311.89842 } } dps_results: { key: "TestAffliction-AllItems-EternalShadowspiritDiamond" value: { - dps: 28106.00317 - tps: 20369.14877 + dps: 35659.13114 + tps: 25959.58315 } } dps_results: { @@ -508,57 +515,57 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-FallofMortality-59500" value: { - dps: 27700.03127 - tps: 20155.47846 + dps: 34933.9772 + tps: 25434.00986 } } dps_results: { key: "TestAffliction-AllItems-FallofMortality-65124" value: { - dps: 27873.34305 - tps: 20291.99334 + dps: 35131.73214 + tps: 25639.32267 } } dps_results: { key: "TestAffliction-AllItems-FieryQuintessence-69000" value: { - dps: 27700.67369 - tps: 20184.94843 + dps: 35127.61301 + tps: 25670.91504 } } dps_results: { key: "TestAffliction-AllItems-Figurine-DemonPanther-52199" value: { - dps: 26831.30867 - tps: 19570.26272 + dps: 34177.34604 + tps: 24961.46078 } } dps_results: { key: "TestAffliction-AllItems-Figurine-DreamOwl-52354" value: { - dps: 27473.81994 - tps: 20000.93337 + dps: 34882.7013 + tps: 25418.44731 } } dps_results: { key: "TestAffliction-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 26678.6325 - tps: 19492.20745 + dps: 33814.37233 + tps: 24723.5376 } } dps_results: { key: "TestAffliction-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 28316.75124 - tps: 20594.50162 + dps: 35783.57179 + tps: 26059.8949 } } dps_results: { key: "TestAffliction-AllItems-Figurine-KingofBoars-52351" value: { - dps: 26828.94988 - tps: 19646.02187 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { @@ -585,22 +592,22 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-FleetShadowspiritDiamond" value: { - dps: 28251.552 - tps: 20518.70188 + dps: 35582.52588 + tps: 25884.44956 } } dps_results: { key: "TestAffliction-AllItems-FluidDeath-58181" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { key: "TestAffliction-AllItems-ForlornShadowspiritDiamond" value: { - dps: 28302.79172 - tps: 20530.39414 + dps: 35752.42264 + tps: 26025.0817 } } dps_results: { @@ -613,169 +620,169 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-FuryofAngerforge-59461" value: { - dps: 27091.51607 - tps: 19766.96832 + dps: 34333.50535 + tps: 25114.17136 } } dps_results: { key: "TestAffliction-AllItems-GaleofShadows-56138" value: { - dps: 27633.05432 - tps: 20224.21014 + dps: 35142.46491 + tps: 25750.2589 } } dps_results: { key: "TestAffliction-AllItems-GaleofShadows-56462" value: { - dps: 27874.83145 - tps: 20413.52625 + dps: 35188.97481 + tps: 25762.01708 } } dps_results: { key: "TestAffliction-AllItems-GearDetector-61462" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Gladiator'sFelshroud" value: { - dps: 23441.06483 - tps: 16982.27515 + dps: 27955.83224 + tps: 20586.34827 } } dps_results: { key: "TestAffliction-AllItems-GlowingTwilightScale-54589" value: { - dps: 27216.73288 - tps: 19802.7539 + dps: 34516.06854 + tps: 25324.48642 } } dps_results: { key: "TestAffliction-AllItems-GraceoftheHerald-55266" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-GraceoftheHerald-56295" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-HarmlightToken-63839" value: { - dps: 27732.89052 - tps: 20105.79409 + dps: 35160.10665 + tps: 25617.14301 } } dps_results: { key: "TestAffliction-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-HeartofIgnacious-59514" value: { - dps: 27891.56793 - tps: 20490.86798 + dps: 35312.88911 + tps: 25871.45544 } } dps_results: { key: "TestAffliction-AllItems-HeartofIgnacious-65110" value: { - dps: 28050.78684 - tps: 20676.93872 + dps: 35573.51015 + tps: 26049.57348 } } dps_results: { key: "TestAffliction-AllItems-HeartofRage-59224" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-HeartofRage-65072" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-HeartofSolace-55868" value: { - dps: 26939.90628 - tps: 19713.16052 + dps: 34412.12939 + tps: 25208.49157 } } dps_results: { key: "TestAffliction-AllItems-HeartofSolace-56393" value: { - dps: 27084.8466 - tps: 19830.81441 + dps: 34361.4844 + tps: 25148.40688 } } dps_results: { key: "TestAffliction-AllItems-HeartofThunder-55845" value: { - dps: 26715.39161 - tps: 19522.84199 + dps: 33924.73911 + tps: 24841.70906 } } dps_results: { key: "TestAffliction-AllItems-HeartofThunder-56370" value: { - dps: 26703.83163 - tps: 19514.87845 + dps: 33931.41727 + tps: 24850.2813 } } dps_results: { key: "TestAffliction-AllItems-HeartoftheVile-66969" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 28235.48538 - tps: 20472.99453 + dps: 35665.20776 + tps: 25944.93985 } } dps_results: { key: "TestAffliction-AllItems-ImpatienceofYouth-62464" value: { - dps: 26927.18023 - tps: 19744.25222 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { key: "TestAffliction-AllItems-ImpatienceofYouth-62469" value: { - dps: 26927.18023 - tps: 19744.25222 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { key: "TestAffliction-AllItems-ImpetuousQuery-55881" value: { - dps: 26949.91888 - tps: 19734.44387 + dps: 34321.88383 + tps: 25273.05091 } } dps_results: { key: "TestAffliction-AllItems-ImpetuousQuery-56406" value: { - dps: 26949.91888 - tps: 19734.44387 + dps: 34321.88383 + tps: 25273.05091 } } dps_results: { @@ -802,8 +809,8 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 26722.42083 - tps: 19534.39437 + dps: 33924.73911 + tps: 24841.54598 } } dps_results: { @@ -830,57 +837,57 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 27226.78636 - tps: 19881.43487 + dps: 34686.00593 + tps: 25411.03914 } } dps_results: { key: "TestAffliction-AllItems-JarofAncientRemedies-59354" value: { - dps: 26729.77369 - tps: 19528.66048 + dps: 33864.16089 + tps: 24733.45482 } } dps_results: { key: "TestAffliction-AllItems-JarofAncientRemedies-65029" value: { - dps: 26792.79396 - tps: 19590.35862 + dps: 33816.81241 + tps: 24666.4982 } } dps_results: { key: "TestAffliction-AllItems-JawsofDefeat-68926" value: { - dps: 27832.64175 - tps: 20284.68809 + dps: 35194.26423 + tps: 25663.06853 } } dps_results: { key: "TestAffliction-AllItems-JawsofDefeat-69111" value: { - dps: 27940.09765 - tps: 20379.69507 + dps: 35305.63442 + tps: 25741.13959 } } dps_results: { key: "TestAffliction-AllItems-JujuofNimbleness-63840" value: { - dps: 26799.45893 - tps: 19610.6177 + dps: 34122.24182 + tps: 25020.63104 } } dps_results: { key: "TestAffliction-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { key: "TestAffliction-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { @@ -907,253 +914,253 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-KvaldirBattleStandard-59685" value: { - dps: 26779.43953 - tps: 19610.80255 + dps: 34133.28567 + tps: 24982.86775 } } dps_results: { key: "TestAffliction-AllItems-KvaldirBattleStandard-59689" value: { - dps: 26779.43953 - tps: 19610.80255 + dps: 34133.28567 + tps: 24982.86775 } } dps_results: { key: "TestAffliction-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 26724.72364 - tps: 19524.38624 + dps: 34185.43194 + tps: 24921.97519 } } dps_results: { key: "TestAffliction-AllItems-LeadenDespair-55816" value: { - dps: 26727.66794 - tps: 19511.5979 + dps: 33875.38988 + tps: 24815.69117 } } dps_results: { key: "TestAffliction-AllItems-LeadenDespair-56347" value: { - dps: 26678.6325 - tps: 19492.20745 + dps: 33814.37233 + tps: 24723.5376 } } dps_results: { key: "TestAffliction-AllItems-LeftEyeofRajh-56102" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-LeftEyeofRajh-56427" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-LicensetoSlay-58180" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { key: "TestAffliction-AllItems-MagnetiteMirror-55814" value: { - dps: 26603.8647 - tps: 19415.02346 + dps: 33877.53891 + tps: 24775.92814 } } dps_results: { key: "TestAffliction-AllItems-MagnetiteMirror-56345" value: { - dps: 26603.8647 - tps: 19415.02346 + dps: 33877.53891 + tps: 24775.92814 } } dps_results: { key: "TestAffliction-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33868.75628 + tps: 24771.55439 } } dps_results: { key: "TestAffliction-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33868.75628 + tps: 24771.55439 } } dps_results: { key: "TestAffliction-AllItems-MarkofKhardros-56132" value: { - dps: 26837.84304 - tps: 19649.0018 + dps: 34191.92565 + tps: 25090.31487 } } dps_results: { key: "TestAffliction-AllItems-MarkofKhardros-56458" value: { - dps: 26880.38455 - tps: 19691.54332 + dps: 34218.12454 + tps: 25116.51376 } } dps_results: { key: "TestAffliction-AllItems-MatrixRestabilizer-68994" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-MatrixRestabilizer-69150" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-MightoftheOcean-55251" value: { - dps: 26825.99892 - tps: 19655.68848 + dps: 34165.31262 + tps: 25015.41035 } } dps_results: { key: "TestAffliction-AllItems-MightoftheOcean-56285" value: { - dps: 26825.99892 - tps: 19655.68848 + dps: 34165.31262 + tps: 25015.41035 } } dps_results: { key: "TestAffliction-AllItems-MirrorofBrokenImages-62466" value: { - dps: 27048.80306 - tps: 19833.32804 + dps: 34321.88383 + tps: 25273.05091 } } dps_results: { key: "TestAffliction-AllItems-MirrorofBrokenImages-62471" value: { - dps: 27048.80306 - tps: 19833.32804 + dps: 34321.88383 + tps: 25273.05091 } } dps_results: { key: "TestAffliction-AllItems-MithrilStopwatch-232013" value: { - dps: 28094.60015 - tps: 20471.26157 + dps: 35364.211 + tps: 25845.89216 } } dps_results: { key: "TestAffliction-AllItems-MoonwellChalice-70142" value: { - dps: 28146.83264 - tps: 20624.0029 + dps: 35575.12173 + tps: 26011.21325 } } dps_results: { key: "TestAffliction-AllItems-MoonwellPhial-70143" value: { - dps: 26723.72413 - tps: 19552.95543 + dps: 33846.02254 + tps: 24781.50266 } } dps_results: { key: "TestAffliction-AllItems-NecromanticFocus-68982" value: { - dps: 28185.62387 - tps: 20587.15915 + dps: 35656.72203 + tps: 26140.59532 } } dps_results: { key: "TestAffliction-AllItems-NecromanticFocus-69139" value: { - dps: 28383.43036 - tps: 20803.07399 + dps: 35736.66288 + tps: 26180.71199 } } dps_results: { key: "TestAffliction-AllItems-Oremantle'sFavor-61448" value: { - dps: 26955.50877 - tps: 19667.38389 + dps: 34231.03901 + tps: 25033.48039 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 27629.00623 - tps: 20113.47083 + dps: 34824.29663 + tps: 25400.92352 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 27572.91231 - tps: 20108.20775 + dps: 34826.63501 + tps: 25480.93969 } } dps_results: { key: "TestAffliction-AllItems-PorcelainCrab-55237" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-PorcelainCrab-56280" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 28106.00317 - tps: 20369.14877 + dps: 35659.13114 + tps: 25959.58315 } } dps_results: { key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Rainsong-55854" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33888.39973 + tps: 24794.17532 } } dps_results: { key: "TestAffliction-AllItems-Rainsong-56377" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33820.88968 + tps: 24748.92613 } } dps_results: { @@ -1201,36 +1208,36 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 28439.17184 - tps: 20697.51094 + dps: 35969.57138 + tps: 26258.5514 } } dps_results: { key: "TestAffliction-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 28439.17184 - tps: 20697.51094 + dps: 35997.40428 + tps: 26296.49642 } } dps_results: { key: "TestAffliction-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 27141.36348 - tps: 19781.18818 + dps: 34476.20782 + tps: 25216.44783 } } dps_results: { key: "TestAffliction-AllItems-RightEyeofRajh-56100" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { key: "TestAffliction-AllItems-RightEyeofRajh-56431" value: { - dps: 26905.77013 - tps: 19670.83471 + dps: 34161.82384 + tps: 24945.65116 } } dps_results: { @@ -1264,115 +1271,115 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-RuneofZeth-68998" value: { - dps: 28094.38357 - tps: 20422.26897 + dps: 35446.13481 + tps: 25872.59563 } } dps_results: { key: "TestAffliction-AllItems-ScalesofLife-68915" value: { - dps: 26641.68512 - tps: 19521.80503 - hps: 354.04187 + dps: 33825.5427 + tps: 24757.99289 + hps: 357.04731 } } dps_results: { key: "TestAffliction-AllItems-ScalesofLife-69109" value: { - dps: 26640.35472 - tps: 19530.31362 - hps: 399.35591 + dps: 33821.76338 + tps: 24760.94716 + hps: 402.74602 } } dps_results: { key: "TestAffliction-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-SeaStar-55256" value: { - dps: 27081.40025 - tps: 19764.70817 + dps: 34315.64923 + tps: 25045.17114 } } dps_results: { key: "TestAffliction-AllItems-SeaStar-56290" value: { - dps: 27468.69607 - tps: 20036.5997 + dps: 34725.65707 + tps: 25336.92241 } } dps_results: { key: "TestAffliction-AllItems-ShadowflameRegalia" value: { - dps: 25946.47428 - tps: 18962.54722 + dps: 30613.70472 + tps: 22752.61448 } } dps_results: { key: "TestAffliction-AllItems-ShardofWoe-60233" value: { - dps: 27101.58259 - tps: 19800.84217 + dps: 34486.66808 + tps: 25176.6125 } } dps_results: { key: "TestAffliction-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 26662.37405 - tps: 19451.54228 + dps: 33891.37521 + tps: 24809.7108 } } dps_results: { key: "TestAffliction-AllItems-Skardyn'sGrace-56115" value: { - dps: 26895.9765 - tps: 19713.04848 + dps: 34204.12323 + tps: 25101.0145 } } dps_results: { key: "TestAffliction-AllItems-Skardyn'sGrace-56440" value: { - dps: 26943.88328 - tps: 19760.95527 + dps: 34233.35499 + tps: 25130.24626 } } dps_results: { key: "TestAffliction-AllItems-Sorrowsong-55879" value: { - dps: 27575.28938 - tps: 20184.48661 + dps: 34995.8213 + tps: 25762.57691 } } dps_results: { key: "TestAffliction-AllItems-Sorrowsong-56400" value: { - dps: 27658.51913 - tps: 20244.71343 + dps: 35084.21623 + tps: 25829.00403 } } dps_results: { key: "TestAffliction-AllItems-Soul'sAnguish-66994" value: { - dps: 26825.99892 - tps: 19655.68848 + dps: 34165.31262 + tps: 25015.41035 } } dps_results: { key: "TestAffliction-AllItems-SoulCasket-58183" value: { - dps: 28069.76717 - tps: 20550.06844 + dps: 35431.6239 + tps: 25984.32464 } } dps_results: { @@ -1399,15 +1406,15 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-SpidersilkSpindle-68981" value: { - dps: 27038.56737 - tps: 19823.42335 + dps: 34443.54292 + tps: 25378.05267 } } dps_results: { key: "TestAffliction-AllItems-SpidersilkSpindle-69138" value: { - dps: 27137.41802 - tps: 19922.274 + dps: 34443.54292 + tps: 25378.05267 } } dps_results: { @@ -1434,204 +1441,197 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-StayofExecution-68996" value: { - dps: 26632.48919 - tps: 19449.56118 + dps: 33853.3422 + tps: 24750.23347 } } dps_results: { key: "TestAffliction-AllItems-Stonemother'sKiss-61411" value: { - dps: 27476.49322 - tps: 19991.71989 + dps: 34957.95785 + tps: 25631.93436 } } dps_results: { key: "TestAffliction-AllItems-StumpofTime-62465" value: { - dps: 27947.19006 - tps: 20423.23455 + dps: 35263.14065 + tps: 25760.72805 } } dps_results: { key: "TestAffliction-AllItems-StumpofTime-62470" value: { - dps: 27972.32965 - tps: 20417.28377 + dps: 35267.55701 + tps: 25731.70857 } } dps_results: { key: "TestAffliction-AllItems-SymbioticWorm-59332" value: { - dps: 26704.41039 - tps: 19527.16122 + dps: 33862.02014 + tps: 24802.16967 } } dps_results: { key: "TestAffliction-AllItems-SymbioticWorm-65048" value: { - dps: 26613.39898 - tps: 19473.91301 + dps: 33879.29024 + tps: 24782.47176 } } dps_results: { key: "TestAffliction-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 27593.92998 - tps: 20138.45385 + dps: 34913.78956 + tps: 25610.91045 } } dps_results: { key: "TestAffliction-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-TearofBlood-55819" value: { - dps: 27377.89711 - tps: 19936.59338 + dps: 34630.10174 + tps: 25338.22407 } } dps_results: { key: "TestAffliction-AllItems-TearofBlood-56351" value: { - dps: 27575.35416 - tps: 20072.05166 + dps: 34779.70067 + tps: 25390.07861 } } dps_results: { key: "TestAffliction-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 27466.81067 - tps: 20089.29405 + dps: 34749.62886 + tps: 25518.84065 } } dps_results: { key: "TestAffliction-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 27624.96611 - tps: 20194.23513 + dps: 35015.08404 + tps: 25727.68434 } } dps_results: { key: "TestAffliction-AllItems-TheHungerer-68927" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-TheHungerer-69112" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Theralion'sMirror-59519" value: { - dps: 28022.43306 - tps: 20477.88026 + dps: 35352.22477 + tps: 25852.25743 } } dps_results: { key: "TestAffliction-AllItems-Theralion'sMirror-65105" value: { - dps: 28234.78326 - tps: 20653.43355 + dps: 35583.51303 + tps: 26091.10356 } } dps_results: { key: "TestAffliction-AllItems-Throngus'sFinger-56121" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Throngus'sFinger-56449" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-Tia'sGrace-55874" value: { - dps: 26939.71672 - tps: 19724.5727 + dps: 34320.80553 + tps: 25255.31528 } } dps_results: { key: "TestAffliction-AllItems-Tia'sGrace-56394" value: { - dps: 26939.71672 - tps: 19724.5727 + dps: 34320.80553 + tps: 25255.31528 } } dps_results: { key: "TestAffliction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 26812.18985 - tps: 19588.46488 + dps: 34098.88257 + tps: 24955.41711 } } dps_results: { key: "TestAffliction-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 27472.20524 - tps: 20098.83631 + dps: 34700.2981 + tps: 25413.24276 } } dps_results: { key: "TestAffliction-AllItems-UnheededWarning-59520" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-UnquenchableFlame-67101" value: { - dps: 26632.48919 - tps: 19449.56118 + dps: 33839.81901 + tps: 24706.54275 } } dps_results: { key: "TestAffliction-AllItems-UnsolvableRiddle-62463" value: { - dps: 26927.18023 - tps: 19744.25222 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { key: "TestAffliction-AllItems-UnsolvableRiddle-62468" value: { - dps: 26927.18023 - tps: 19744.25222 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { key: "TestAffliction-AllItems-UnsolvableRiddle-68709" value: { - dps: 26927.18023 - tps: 19744.25222 + dps: 34220.61576 + tps: 25117.50703 } } dps_results: { key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 28835.12644 - tps: 21227.21658 - } -} -dps_results: { - key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-69110" - value: { - dps: 29065.94318 - tps: 21473.97478 + dps: 35192.01567 + tps: 25633.34994 } } dps_results: { @@ -1651,15 +1651,15 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-VesselofAcceleration-68995" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-VesselofAcceleration-69167" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -1686,99 +1686,99 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-VialofStolenMemories-59515" value: { - dps: 26704.41039 - tps: 19527.16122 + dps: 33862.02014 + tps: 24802.16967 } } dps_results: { key: "TestAffliction-AllItems-VialofStolenMemories-65109" value: { - dps: 26613.39898 - tps: 19473.91301 + dps: 33879.29024 + tps: 24782.47176 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 26632.48919 - tps: 19449.56118 + dps: 33853.3422 + tps: 24750.23347 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 27574.3222 - tps: 20110.75193 + dps: 34851.30124 + tps: 25461.36707 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 26632.48919 - tps: 19449.56118 + dps: 33853.3422 + tps: 24750.23347 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 26920.54153 - tps: 19669.97924 + dps: 34133.78541 + tps: 24937.11276 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 27106.20479 - tps: 19838.25018 + dps: 34711.49844 + tps: 25468.42727 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 27025.39339 - tps: 19711.01269 + dps: 34392.58825 + tps: 25182.24067 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 26665.7019 - tps: 19461.35482 + dps: 33892.5296 + tps: 24792.27029 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 26960.42099 - tps: 19756.07391 + dps: 34259.76782 + tps: 25159.50851 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 26665.7019 - tps: 19461.35482 + dps: 33892.5296 + tps: 24792.27029 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 27502.29217 - tps: 20052.27381 + dps: 34728.03259 + tps: 25427.02755 } } dps_results: { key: "TestAffliction-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 26742.01542 - tps: 19526.8714 + dps: 33952.59335 + tps: 24887.1031 } } dps_results: { @@ -1805,22 +1805,22 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-WitchingHourglass-55787" value: { - dps: 27364.04673 - tps: 19950.88097 + dps: 35086.09274 + tps: 25625.94708 } } dps_results: { key: "TestAffliction-AllItems-WitchingHourglass-56320" value: { - dps: 27977.08829 - tps: 20565.40571 + dps: 35246.65578 + tps: 25812.00084 } } dps_results: { key: "TestAffliction-AllItems-World-QuellerFocus-63842" value: { - dps: 26828.94988 - tps: 19646.02187 + dps: 34098.19124 + tps: 24995.08251 } } dps_results: { @@ -1847,196 +1847,196 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 26766.20056 - tps: 19636.81264 + dps: 34151.56546 + tps: 25060.2696 } } dps_results: { key: "TestAffliction-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 26766.20056 - tps: 19636.81264 + dps: 34151.56546 + tps: 25060.2696 } } dps_results: { key: "TestAffliction-Average-Default" value: { - dps: 28869.55198 - tps: 21120.5262 + dps: 36540.04285 + tps: 26772.37498 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 29113.17302 - tps: 29218.98089 + dps: 36923.58849 + tps: 33937.72303 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 28155.00762 - tps: 20820.23236 + dps: 35712.60246 + tps: 26509.33583 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36203.89684 - tps: 24030.34939 + dps: 44048.91466 + tps: 29837.4703 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 18756.75236 - tps: 21430.54223 + dps: 24024.6838 + tps: 24938.52913 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 18756.75236 - tps: 13634.63719 + dps: 24024.6838 + tps: 17507.44916 } } dps_results: { - key: "TestAffliction-Settings-Goblin-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Goblin-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 21454.50588 - tps: 13102.80665 + dps: 26757.22841 + tps: 16991.31026 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 28857.22827 - tps: 28822.1486 + dps: 36607.66354 + tps: 33597.04493 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 27987.8943 - tps: 20631.97224 + dps: 35429.47038 + tps: 26196.63049 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36336.994 - tps: 24279.60919 + dps: 43947.27566 + tps: 29452.02236 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 18578.75999 - tps: 21262.41576 + dps: 23819.91149 + tps: 24659.9235 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 18578.75999 - tps: 13466.51071 + dps: 23819.91149 + tps: 17371.74891 } } dps_results: { - key: "TestAffliction-Settings-Human-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Human-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 21349.6781 - tps: 12983.68593 + dps: 26559.75554 + tps: 16883.62501 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 29462.49181 - tps: 29001.53663 + dps: 37310.33903 + tps: 33801.23651 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 28594.00145 - tps: 20812.54946 + dps: 36142.77119 + tps: 26402.55888 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 35879.16502 - tps: 24304.69141 + dps: 43431.11869 + tps: 29225.83081 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 19012.56226 - tps: 21383.66914 + dps: 24336.36174 + tps: 24805.73774 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 19012.56226 - tps: 13586.87353 + dps: 24336.36174 + tps: 17516.83059 } } dps_results: { - key: "TestAffliction-Settings-Orc-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 21139.88727 - tps: 13187.81581 + dps: 26455.64881 + tps: 16784.11757 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 29174.24651 - tps: 29197.93427 + dps: 36951.62542 + tps: 34008.96839 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 28249.11976 - tps: 20916.83947 + dps: 35911.15781 + tps: 26717.61309 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36884.08018 - tps: 24700.98745 + dps: 44768.92024 + tps: 30693.9623 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 18844.16514 - tps: 21518.22038 + dps: 24138.83905 + tps: 25104.284 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 18844.16514 - tps: 13680.40186 + dps: 24138.83905 + tps: 17530.29865 } } dps_results: { - key: "TestAffliction-Settings-Troll-p1-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestAffliction-Settings-Troll-p3-Affliction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 22034.09878 - tps: 13694.56474 + dps: 27283.59655 + tps: 17404.03061 } } dps_results: { key: "TestAffliction-SwitchInFrontOfTarget-Default" value: { - dps: 28480.94417 - tps: 20812.54946 + dps: 36009.29189 + tps: 26402.55888 } } diff --git a/sim/warlock/affliction/affliction_test.go b/sim/warlock/affliction/affliction_test.go index abc1b09842..3cf5d06912 100644 --- a/sim/warlock/affliction/affliction_test.go +++ b/sim/warlock/affliction/affliction_test.go @@ -403,7 +403,7 @@ func TestAffliction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman}, - GearSet: core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p1"), + GearSet: core.GetGearSet("../../../ui/warlock/affliction/gear_sets", "p3"), Talents: afflictionTalents, Glyphs: afflictionGlyphs, Consumes: fullConsumes, diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results index 311751c5f6..d5f70798f6 100644 --- a/sim/warlock/demonology/TestDemonology.results +++ b/sim/warlock/demonology/TestDemonology.results @@ -3,19 +3,19 @@ character_stats_results: { value: { final_stats: 666.75 final_stats: 668.85 - final_stats: 7762.755 - final_stats: 5543.37 + final_stats: 9142.98 + final_stats: 7126.56 final_stats: 183 + final_stats: 1744 + final_stats: 846 final_stats: 1743 - final_stats: 767 - final_stats: 1733 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 1685 + final_stats: 2003 final_stats: 788.1 final_stats: 0 - final_stats: 9216.207 + final_stats: 11594.616 final_stats: 0 final_stats: 0 final_stats: 0 @@ -23,65 +23,65 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 8479 + final_stats: 9372 final_stats: 0 - final_stats: 146602.57 - final_stats: 105549.55 + final_stats: 165925.72 + final_stats: 129297.4 final_stats: 1353.65 - final_stats: 14.51184 - final_stats: 17.01388 - final_stats: 11.90022 - final_stats: 19.29328 + final_stats: 14.52017 + final_stats: 17.02365 + final_stats: 12.34087 + final_stats: 22.10871 final_stats: 5 } } dps_results: { key: "TestDemonology-AllItems-AgileShadowspiritDiamond" value: { - dps: 30489.77521 - tps: 15381.80905 + dps: 37797.77205 + tps: 19325.35925 } } dps_results: { key: "TestDemonology-AllItems-Althor'sAbacus-50366" value: { - dps: 28465.29552 - tps: 14485.79173 + dps: 35693.07533 + tps: 18504.28139 } } dps_results: { key: "TestDemonology-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 26910.26271 - tps: 14532.53103 + dps: 35992.29056 + tps: 18549.95349 } } dps_results: { key: "TestDemonology-AllItems-Anhuur'sHymnal-55889" value: { - dps: 28887.2511 - tps: 14716.79873 + dps: 36153.11891 + tps: 18812.45007 } } dps_results: { key: "TestDemonology-AllItems-Anhuur'sHymnal-56407" value: { - dps: 28973.39151 - tps: 14752.05404 + dps: 36448.17726 + tps: 18779.13632 } } dps_results: { key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -94,128 +94,135 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-AustereShadowspiritDiamond" value: { - dps: 30288.90239 - tps: 15229.4454 + dps: 37521.64998 + tps: 19116.21917 } } dps_results: { key: "TestDemonology-AllItems-Balespider'sBurningVestments" value: { - dps: 30419.12072 - tps: 15043.30705 + dps: 34891.44075 + tps: 18065.64938 } } dps_results: { key: "TestDemonology-AllItems-BaubleofTrueBlood-50726" value: { - dps: 27916.60447 - tps: 14236.49973 - hps: 98.14692 + dps: 35167.10467 + tps: 18231.9179 + hps: 101.33224 } } dps_results: { key: "TestDemonology-AllItems-BedrockTalisman-58182" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-BellofEnragingResonance-59326" value: { - dps: 29647.4296 - tps: 15079.6097 + dps: 36734.53797 + tps: 19100.99947 + } +} +dps_results: { + key: "TestDemonology-AllItems-BellofEnragingResonance-65053" + value: { + dps: 37221.39562 + tps: 19020.95863 } } dps_results: { key: "TestDemonology-AllItems-BindingPromise-67037" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 26642.93221 - tps: 14443.03994 + dps: 35663.13234 + tps: 18423.96689 } } dps_results: { key: "TestDemonology-AllItems-BloodofIsiset-55995" value: { - dps: 28332.22435 - tps: 14380.23944 + dps: 35663.13234 + tps: 18423.96689 } } dps_results: { key: "TestDemonology-AllItems-BloodofIsiset-56414" value: { - dps: 28470.94664 - tps: 14431.52165 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 26270.23162 - tps: 14275.83032 + dps: 35164.48342 + tps: 18234.05293 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 27283.20806 - tps: 14851.44996 + dps: 36233.03039 + tps: 18718.90539 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 26255.46545 - tps: 14252.99982 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 28336.84612 - tps: 14459.156 + dps: 35539.74209 + tps: 18448.04274 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 27925.8677 - tps: 14229.04946 + dps: 35169.39502 + tps: 18234.42099 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 28831.76245 - tps: 14680.88452 + dps: 36086.78839 + tps: 18711.51203 } } dps_results: { key: "TestDemonology-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -242,8 +249,8 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-BottledLightning-66879" value: { - dps: 26956.16491 - tps: 14612.75593 + dps: 35841.54188 + tps: 18519.99466 } } dps_results: { @@ -270,50 +277,50 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-BracingShadowspiritDiamond" value: { - dps: 30458.11473 - tps: 15019.1519 + dps: 37694.1046 + tps: 18831.26472 } } dps_results: { key: "TestDemonology-AllItems-Brawler'sTrophy-232015" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-BurningShadowspiritDiamond" value: { - dps: 30660.70476 - tps: 15467.34719 + dps: 37972.1958 + tps: 19413.78082 } } dps_results: { key: "TestDemonology-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 30561.41692 - tps: 15414.37581 + dps: 37871.69009 + tps: 19365.41905 } } dps_results: { key: "TestDemonology-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 28344.52721 - tps: 14464.78213 + dps: 35544.1289 + tps: 18450.55464 } } dps_results: { key: "TestDemonology-AllItems-CoreofRipeness-58184" value: { - dps: 27236.8997 - tps: 14759.7303 + dps: 36158.50793 + tps: 18752.46353 } } dps_results: { key: "TestDemonology-AllItems-CorpseTongueCoin-50349" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -340,15 +347,15 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-CrushingWeight-59506" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-CrushingWeight-65118" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -375,113 +382,113 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 28906.89323 - tps: 14729.51275 + dps: 36158.50793 + tps: 18752.46353 } } dps_results: { key: "TestDemonology-AllItems-Deathbringer'sWill-50363" value: { - dps: 28112.64916 - tps: 14322.60634 + dps: 35390.99569 + tps: 18366.43591 } } dps_results: { key: "TestDemonology-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 30357.92339 - tps: 15260.4425 + dps: 37592.9287 + tps: 19154.73221 } } dps_results: { key: "TestDemonology-AllItems-DislodgedForeignObject-50348" value: { - dps: 28796.74041 - tps: 14738.91774 + dps: 35953.65495 + tps: 18582.55603 } } dps_results: { key: "TestDemonology-AllItems-Dwyer'sCaber-70141" value: { - dps: 28416.35076 - tps: 14477.61266 + dps: 35616.78113 + tps: 18552.01548 } } dps_results: { key: "TestDemonology-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 30288.90239 - tps: 15229.4454 + dps: 37521.64998 + tps: 19116.21917 } } dps_results: { key: "TestDemonology-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 26762.20891 - tps: 14533.19909 + dps: 35571.7466 + tps: 18402.34037 } } dps_results: { key: "TestDemonology-AllItems-EmberShadowspiritDiamond" value: { - dps: 30458.11473 - tps: 15319.63049 + dps: 37694.1046 + tps: 19208.77133 } } dps_results: { key: "TestDemonology-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 30357.92339 - tps: 15260.4425 + dps: 37592.9287 + tps: 19154.73221 } } dps_results: { key: "TestDemonology-AllItems-EssenceoftheCyclone-59473" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-EssenceoftheCyclone-65140" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 26910.26271 - tps: 14532.53103 + dps: 35992.29056 + tps: 18549.95349 } } dps_results: { key: "TestDemonology-AllItems-EternalShadowspiritDiamond" value: { - dps: 30288.90239 - tps: 15229.4454 + dps: 37521.64998 + tps: 19116.21917 } } dps_results: { @@ -508,57 +515,57 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-FallofMortality-59500" value: { - dps: 28906.89323 - tps: 14729.51275 + dps: 36158.50793 + tps: 18752.46353 } } dps_results: { key: "TestDemonology-AllItems-FallofMortality-65124" value: { - dps: 29040.46858 - tps: 14808.4035 + dps: 36318.6378 + tps: 18826.63086 } } dps_results: { key: "TestDemonology-AllItems-FieryQuintessence-69000" value: { - dps: 27312.35274 - tps: 14837.4142 + dps: 36268.45028 + tps: 18732.92687 } } dps_results: { key: "TestDemonology-AllItems-Figurine-DemonPanther-52199" value: { - dps: 26543.66274 - tps: 14386.42894 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-Figurine-DreamOwl-52354" value: { - dps: 27129.58727 - tps: 14704.16979 + dps: 36021.99346 + tps: 18681.21816 } } dps_results: { key: "TestDemonology-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 27925.84242 - tps: 14230.54593 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 28099.36609 - tps: 15270.10036 + dps: 36983.34885 + tps: 19188.62844 } } dps_results: { key: "TestDemonology-AllItems-Figurine-KingofBoars-52351" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { @@ -585,22 +592,22 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-FleetShadowspiritDiamond" value: { - dps: 30288.90239 - tps: 15229.42575 + dps: 37521.64998 + tps: 19116.21917 } } dps_results: { key: "TestDemonology-AllItems-FluidDeath-58181" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-ForlornShadowspiritDiamond" value: { - dps: 30458.11473 - tps: 15313.74269 + dps: 37694.1046 + tps: 19203.15251 } } dps_results: { @@ -613,169 +620,169 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-FuryofAngerforge-59461" value: { - dps: 28387.60159 - tps: 14481.2875 + dps: 35589.35061 + tps: 18470.70907 } } dps_results: { key: "TestDemonology-AllItems-GaleofShadows-56138" value: { - dps: 29033.22463 - tps: 14840.26185 + dps: 36136.79839 + tps: 18801.38548 } } dps_results: { key: "TestDemonology-AllItems-GaleofShadows-56462" value: { - dps: 29155.68549 - tps: 14906.61073 + dps: 36223.36872 + tps: 18798.02109 } } dps_results: { key: "TestDemonology-AllItems-GearDetector-61462" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Gladiator'sFelshroud" value: { - dps: 24760.90595 - tps: 12373.99268 + dps: 28470.20972 + tps: 14929.78212 } } dps_results: { key: "TestDemonology-AllItems-GlowingTwilightScale-54589" value: { - dps: 28498.43363 - tps: 14502.12471 + dps: 35728.74798 + tps: 18521.98042 } } dps_results: { key: "TestDemonology-AllItems-GraceoftheHerald-55266" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-GraceoftheHerald-56295" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HarmlightToken-63839" value: { - dps: 29079.36814 - tps: 14769.17049 + dps: 36418.55126 + tps: 18800.57518 } } dps_results: { key: "TestDemonology-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HeartofIgnacious-59514" value: { - dps: 29134.52897 - tps: 14876.06813 + dps: 36684.08456 + tps: 19087.6537 } } dps_results: { key: "TestDemonology-AllItems-HeartofIgnacious-65110" value: { - dps: 29277.15885 - tps: 14961.96753 + dps: 36974.79948 + tps: 19243.11123 } } dps_results: { key: "TestDemonology-AllItems-HeartofRage-59224" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HeartofRage-65072" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HeartofSolace-55868" value: { - dps: 28364.86864 - tps: 14501.38258 + dps: 35356.24779 + tps: 18422.99189 } } dps_results: { key: "TestDemonology-AllItems-HeartofSolace-56393" value: { - dps: 28398.04523 - tps: 14522.11642 + dps: 35400.89483 + tps: 18401.88005 } } dps_results: { key: "TestDemonology-AllItems-HeartofThunder-55845" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HeartofThunder-56370" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-HeartoftheVile-66969" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 30357.92339 - tps: 15260.4425 + dps: 37592.9287 + tps: 19154.73221 } } dps_results: { key: "TestDemonology-AllItems-ImpatienceofYouth-62464" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-ImpatienceofYouth-62469" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-ImpetuousQuery-55881" value: { - dps: 28332.22435 - tps: 14380.23944 + dps: 35663.15527 + tps: 18423.98982 } } dps_results: { key: "TestDemonology-AllItems-ImpetuousQuery-56406" value: { - dps: 28470.94664 - tps: 14431.52165 + dps: 35827.73452 + tps: 18486.98326 } } dps_results: { @@ -802,8 +809,8 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -830,57 +837,57 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 27105.57291 - tps: 14696.0777 + dps: 36210.92476 + tps: 18626.67131 } } dps_results: { key: "TestDemonology-AllItems-JarofAncientRemedies-59354" value: { - dps: 27923.64617 - tps: 14237.73706 + dps: 35169.39502 + tps: 18244.47723 } } dps_results: { key: "TestDemonology-AllItems-JarofAncientRemedies-65029" value: { - dps: 27930.4906 - tps: 14242.46703 + dps: 35169.39502 + tps: 18245.52862 } } dps_results: { key: "TestDemonology-AllItems-JawsofDefeat-68926" value: { - dps: 27430.49636 - tps: 14874.07642 + dps: 36395.13681 + tps: 18855.28567 } } dps_results: { key: "TestDemonology-AllItems-JawsofDefeat-69111" value: { - dps: 27556.51612 - tps: 14944.56798 + dps: 36554.09544 + tps: 18933.94484 } } dps_results: { key: "TestDemonology-AllItems-JujuofNimbleness-63840" value: { - dps: 26642.93221 - tps: 14443.03994 + dps: 35663.13234 + tps: 18423.96689 } } dps_results: { key: "TestDemonology-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { @@ -907,253 +914,253 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-KvaldirBattleStandard-59685" value: { - dps: 28203.40587 - tps: 14426.47723 + dps: 35389.63127 + tps: 18330.71959 } } dps_results: { key: "TestDemonology-AllItems-KvaldirBattleStandard-59689" value: { - dps: 28203.40587 - tps: 14426.47723 + dps: 35389.63127 + tps: 18330.71959 } } dps_results: { key: "TestDemonology-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 26650.71393 - tps: 14520.41323 + dps: 35381.78912 + tps: 18474.0437 } } dps_results: { key: "TestDemonology-AllItems-LeadenDespair-55816" value: { - dps: 27925.84242 - tps: 14230.19277 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-LeadenDespair-56347" value: { - dps: 27925.84242 - tps: 14230.54593 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-LeftEyeofRajh-56102" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-LeftEyeofRajh-56427" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-LicensetoSlay-58180" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-MagnetiteMirror-55814" value: { - dps: 26263.22377 - tps: 14287.78435 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MagnetiteMirror-56345" value: { - dps: 26263.22377 - tps: 14287.78435 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 27925.88966 - tps: 14229.05066 + dps: 35169.39502 + tps: 18234.38111 } } dps_results: { key: "TestDemonology-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 27925.88966 - tps: 14229.05066 + dps: 35169.39502 + tps: 18234.38111 } } dps_results: { key: "TestDemonology-AllItems-MarkofKhardros-56132" value: { - dps: 26450.04443 - tps: 14287.78435 + dps: 35587.79983 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MarkofKhardros-56458" value: { - dps: 26473.39701 - tps: 14287.78435 + dps: 35640.10043 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MatrixRestabilizer-68994" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MatrixRestabilizer-69150" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-MightoftheOcean-55251" value: { - dps: 26534.63831 - tps: 14411.2772 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-MightoftheOcean-56285" value: { - dps: 26534.63831 - tps: 14411.2772 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-MirrorofBrokenImages-62466" value: { - dps: 28470.94664 - tps: 14431.52165 + dps: 35827.73452 + tps: 18486.98326 } } dps_results: { key: "TestDemonology-AllItems-MirrorofBrokenImages-62471" value: { - dps: 28470.94664 - tps: 14431.52165 + dps: 35827.73452 + tps: 18486.98326 } } dps_results: { key: "TestDemonology-AllItems-MithrilStopwatch-232013" value: { - dps: 29353.7925 - tps: 14946.38756 + dps: 36533.37956 + tps: 18949.68638 } } dps_results: { key: "TestDemonology-AllItems-MoonwellChalice-70142" value: { - dps: 27666.06611 - tps: 14834.9185 + dps: 36820.58295 + tps: 18785.35568 } } dps_results: { key: "TestDemonology-AllItems-MoonwellPhial-70143" value: { - dps: 27925.84242 - tps: 14230.82777 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-NecromanticFocus-68982" value: { - dps: 29612.57309 - tps: 14970.55897 + dps: 37072.12058 + tps: 19053.7476 } } dps_results: { key: "TestDemonology-AllItems-NecromanticFocus-69139" value: { - dps: 29901.05133 - tps: 15094.27079 + dps: 37370.67459 + tps: 19173.13399 } } dps_results: { key: "TestDemonology-AllItems-Oremantle'sFavor-61448" value: { - dps: 26543.18385 - tps: 14405.65542 + dps: 35399.88409 + tps: 18358.82219 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 28859.33882 - tps: 14707.20021 + dps: 36093.03112 + tps: 18715.46298 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 28838.77144 - tps: 14684.30584 + dps: 36059.23151 + tps: 18708.02588 } } dps_results: { key: "TestDemonology-AllItems-PorcelainCrab-55237" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-PorcelainCrab-56280" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 30288.90239 - tps: 15229.4454 + dps: 37521.64998 + tps: 19116.21917 } } dps_results: { key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Rainsong-55854" value: { - dps: 27916.05747 - tps: 14226.16972 + dps: 35169.39502 + tps: 18234.59246 } } dps_results: { key: "TestDemonology-AllItems-Rainsong-56377" value: { - dps: 27925.88966 - tps: 14229.08801 + dps: 35169.39502 + tps: 18234.45289 } } dps_results: { @@ -1201,36 +1208,36 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 30489.77521 - tps: 15381.80905 + dps: 37797.77205 + tps: 19325.35925 } } dps_results: { key: "TestDemonology-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 30489.77521 - tps: 15381.72657 + dps: 37797.77205 + tps: 19325.24434 } } dps_results: { key: "TestDemonology-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 26801.57166 - tps: 14560.50848 + dps: 35717.80715 + tps: 18554.74009 } } dps_results: { key: "TestDemonology-AllItems-RightEyeofRajh-56100" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-RightEyeofRajh-56431" value: { - dps: 28231.92508 - tps: 14411.75695 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { @@ -1264,115 +1271,115 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-RuneofZeth-68998" value: { - dps: 27705.2427 - tps: 15041.79796 + dps: 36769.42207 + tps: 19132.97757 } } dps_results: { key: "TestDemonology-AllItems-ScalesofLife-68915" value: { - dps: 27924.88434 - tps: 14239.28694 - hps: 351.03642 + dps: 35172.91892 + tps: 18238.62203 + hps: 354.04187 } } dps_results: { key: "TestDemonology-AllItems-ScalesofLife-69109" value: { - dps: 27925.16463 - tps: 14239.75588 - hps: 395.9658 + dps: 35172.91892 + tps: 18238.62203 + hps: 399.35591 } } dps_results: { key: "TestDemonology-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-SeaStar-55256" value: { - dps: 26769.55 - tps: 14551.54582 + dps: 35704.7115 + tps: 18478.1734 } } dps_results: { key: "TestDemonology-AllItems-SeaStar-56290" value: { - dps: 27217.34061 - tps: 14810.95453 + dps: 36049.16163 + tps: 18719.49802 } } dps_results: { key: "TestDemonology-AllItems-ShadowflameRegalia" value: { - dps: 27755.58853 - tps: 14011.28846 + dps: 32196.78785 + tps: 17028.79607 } } dps_results: { key: "TestDemonology-AllItems-ShardofWoe-60233" value: { - dps: 28645.41931 - tps: 14634.46481 + dps: 35669.49595 + tps: 18610.14193 } } dps_results: { key: "TestDemonology-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 27925.84242 - tps: 14229.97205 + dps: 35169.41753 + tps: 18235.0095 } } dps_results: { key: "TestDemonology-AllItems-Skardyn'sGrace-56115" value: { - dps: 26516.25625 - tps: 14286.27206 + dps: 35586.49569 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Skardyn'sGrace-56440" value: { - dps: 26548.85511 - tps: 14290.43109 + dps: 35638.63327 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Sorrowsong-55879" value: { - dps: 28936.28129 - tps: 14682.60848 + dps: 36315.5654 + tps: 18747.08365 } } dps_results: { key: "TestDemonology-AllItems-Sorrowsong-56400" value: { - dps: 29157.34628 - tps: 14774.67867 + dps: 36568.9901 + tps: 18853.63513 } } dps_results: { key: "TestDemonology-AllItems-Soul'sAnguish-66994" value: { - dps: 26534.63831 - tps: 14411.2772 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-SoulCasket-58183" value: { - dps: 28098.05792 - tps: 15236.62584 + dps: 37102.5784 + tps: 19200.3463 } } dps_results: { @@ -1399,15 +1406,15 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-SpidersilkSpindle-68981" value: { - dps: 28609.66893 - tps: 14482.80385 + dps: 35992.29056 + tps: 18549.95349 } } dps_results: { key: "TestDemonology-AllItems-SpidersilkSpindle-69138" value: { - dps: 28748.39123 - tps: 14534.08606 + dps: 36156.86966 + tps: 18612.94679 } } dps_results: { @@ -1434,204 +1441,197 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-StayofExecution-68996" value: { - dps: 26255.46545 - tps: 14252.99982 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Stonemother'sKiss-61411" value: { - dps: 28907.54744 - tps: 14720.59803 + dps: 36185.92638 + tps: 18740.58542 } } dps_results: { key: "TestDemonology-AllItems-StumpofTime-62465" value: { - dps: 29339.50138 - tps: 14984.44069 + dps: 36838.72951 + tps: 18874.40156 } } dps_results: { key: "TestDemonology-AllItems-StumpofTime-62470" value: { - dps: 29398.67304 - tps: 14979.54953 + dps: 36983.32098 + tps: 18939.22517 } } dps_results: { key: "TestDemonology-AllItems-SymbioticWorm-59332" value: { - dps: 27925.84242 - tps: 14230.73269 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-SymbioticWorm-65048" value: { - dps: 27925.84242 - tps: 14230.94322 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 29128.11196 - tps: 14778.22151 + dps: 36467.74028 + tps: 18850.74575 } } dps_results: { key: "TestDemonology-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-TearofBlood-55819" value: { - dps: 28599.02041 - tps: 14558.58277 + dps: 35824.89689 + tps: 18561.63827 } } dps_results: { key: "TestDemonology-AllItems-TearofBlood-56351" value: { - dps: 28793.86209 - tps: 14675.49074 + dps: 36021.99346 + tps: 18681.21816 } } dps_results: { key: "TestDemonology-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 28943.27145 - tps: 14674.82292 + dps: 36288.04926 + tps: 18727.18676 } } dps_results: { key: "TestDemonology-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 29336.43542 - tps: 14837.05233 + dps: 37057.40369 + tps: 18957.48252 } } dps_results: { key: "TestDemonology-AllItems-TheHungerer-68927" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-TheHungerer-69112" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Theralion'sMirror-59519" value: { - dps: 29480.50348 - tps: 14864.62798 + dps: 36869.20695 + tps: 18950.30728 } } dps_results: { key: "TestDemonology-AllItems-Theralion'sMirror-65105" value: { - dps: 29774.63179 - tps: 15040.1821 + dps: 37564.69027 + tps: 19114.86175 } } dps_results: { key: "TestDemonology-AllItems-Throngus'sFinger-56121" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Throngus'sFinger-56449" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Tia'sGrace-55874" value: { - dps: 28332.22435 - tps: 14380.23944 + dps: 35663.13234 + tps: 18423.96689 } } dps_results: { key: "TestDemonology-AllItems-Tia'sGrace-56394" value: { - dps: 28470.94664 - tps: 14431.52165 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-TinyAbominationinaJar-50706" value: { - dps: 28125.6855 - tps: 14315.42019 + dps: 35321.21955 + tps: 18286.74542 } } dps_results: { key: "TestDemonology-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 27226.02019 - tps: 14831.35136 + dps: 36283.74749 + tps: 18886.55358 } } dps_results: { key: "TestDemonology-AllItems-UnheededWarning-59520" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-UnquenchableFlame-67101" value: { - dps: 26252.34809 - tps: 14250.45227 + dps: 35169.39502 + tps: 18234.67819 } } dps_results: { key: "TestDemonology-AllItems-UnsolvableRiddle-62463" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-UnsolvableRiddle-62468" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-UnsolvableRiddle-68709" value: { - dps: 26761.50384 - tps: 14459.04498 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 30170.24618 - tps: 15893.21597 - } -} -dps_results: { - key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-69110" - value: { - dps: 30543.11822 - tps: 16063.28205 + dps: 36275.36518 + tps: 18636.38878 } } dps_results: { @@ -1651,15 +1651,15 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-VesselofAcceleration-68995" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-VesselofAcceleration-69167" value: { - dps: 27916.05747 - tps: 14226.39282 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -1686,99 +1686,99 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-VialofStolenMemories-59515" value: { - dps: 27925.84242 - tps: 14230.73269 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-VialofStolenMemories-65109" value: { - dps: 27925.84242 - tps: 14230.94322 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 26255.46545 - tps: 14252.99982 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 27340.68051 - tps: 14884.91592 + dps: 36292.51 + tps: 18745.96661 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 26255.46545 - tps: 14252.99982 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28231.90313 - tps: 14411.735 + dps: 35496.9307 + tps: 18485.63669 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 28555.69238 - tps: 14610.86645 + dps: 35560.09348 + tps: 18582.0721 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 28412.59395 - tps: 14483.93157 + dps: 35599.59016 + tps: 18478.9874 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 28470.92413 - tps: 14431.49914 + dps: 35827.71145 + tps: 18486.96019 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 27916.03551 - tps: 14226.37087 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 28850.77663 - tps: 14678.11672 + dps: 36087.22252 + tps: 18706.92908 } } dps_results: { key: "TestDemonology-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 27916.07942 - tps: 14226.41478 + dps: 35169.39502 + tps: 18234.98699 } } dps_results: { @@ -1805,22 +1805,22 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-WitchingHourglass-55787" value: { - dps: 28982.38187 - tps: 14812.12342 + dps: 36008.27932 + tps: 18708.22787 } } dps_results: { key: "TestDemonology-AllItems-WitchingHourglass-56320" value: { - dps: 29483.02442 - tps: 15129.93557 + dps: 36547.18811 + tps: 18971.7992 } } dps_results: { key: "TestDemonology-AllItems-World-QuellerFocus-63842" value: { - dps: 26634.99424 - tps: 14407.53369 + dps: 35663.13234 + tps: 18423.96689 } } dps_results: { @@ -1847,196 +1847,700 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 26433.23503 - tps: 14291.0311 + dps: 35535.49922 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 26433.23503 - tps: 14291.0311 + dps: 35535.49922 + tps: 18234.98699 } } dps_results: { key: "TestDemonology-Average-Default" value: { - dps: 30795.87059 - tps: 15628.18803 + dps: 38322.6298 + tps: 19750.90932 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 56978.38274 + tps: 52757.9214 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37361.03322 + tps: 18713.76203 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55345.62602 + tps: 25572.48667 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 37715.99836 + tps: 37302.39249 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26459.98494 + tps: 12907.60148 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34148.78603 + tps: 14687.72222 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 55103.30846 + tps: 48908.57458 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37072.1686 + tps: 19334.71952 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55676.45646 + tps: 27570.75318 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 37612.81793 + tps: 34991.6638 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26647.75252 + tps: 13642.11169 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34187.30042 + tps: 15287.27899 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 57645.8836 + tps: 52878.92206 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37739.40722 + tps: 19138.01908 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55883.6184 + tps: 26184.42044 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 38302.15329 + tps: 37693.85733 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26922.54128 + tps: 13301.71692 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34931.12764 + tps: 15247.608 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 53853.11885 + tps: 47801.07199 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 36366.86122 + tps: 18700.64304 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 54276.86977 + tps: 26314.90857 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 37144.365 + tps: 34251.63344 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 25846.50711 + tps: 12927.45946 + } +} +dps_results: { + key: "TestDemonology-Settings-Goblin-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 33553.86967 + tps: 14806.10368 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 56886.60111 + tps: 52558.63234 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37158.07469 + tps: 18557.96838 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 54923.23005 + tps: 25399.80194 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 38112.95136 + tps: 37784.39554 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26528.47895 + tps: 12938.88435 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34294.06651 + tps: 14702.83345 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 54659.96159 + tps: 48653.44993 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 36953.18363 + tps: 19245.25224 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55457.87912 + tps: 27389.26484 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 37434.45128 + tps: 34603.32422 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26446.73778 + tps: 13562.22849 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34058.96626 + tps: 15247.81011 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 57531.40572 + tps: 53426.50374 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37650.99789 + tps: 18999.34742 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55533.50953 + tps: 26120.48332 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 38654.01977 + tps: 38020.35108 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26945.65192 + tps: 13355.55184 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34745.10141 + tps: 15220.4569 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 53472.51883 + tps: 47854.18047 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 36134.36117 + tps: 18430.70197 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 53790.28076 + tps: 25725.26079 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 37084.83846 + tps: 34070.23205 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 25816.20282 + tps: 12929.38213 + } +} +dps_results: { + key: "TestDemonology-Settings-Human-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 33336.58965 + tps: 14632.58938 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 58135.59274 + tps: 52902.77586 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 38130.01098 + tps: 18694.42761 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 56914.00895 + tps: 25750.06774 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 39119.67785 + tps: 38103.23196 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 27283.72893 + tps: 13028.98341 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 35733.36141 + tps: 14916.37735 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 56132.72223 + tps: 49276.74751 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37972.1958 + tps: 19413.78082 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 57418.43273 + tps: 27756.46617 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 38530.17285 + tps: 35015.49631 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 27222.22796 + tps: 13671.87065 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 35492.27669 + tps: 15458.70076 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 58828.93947 + tps: 54058.3999 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 38643.87882 + tps: 19136.90977 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 57526.50945 + tps: 26478.00105 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 39582.67266 + tps: 38322.51194 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 27691.94287 + tps: 13433.59935 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 36187.07377 + tps: 15437.7278 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 54815.85602 + tps: 48380.58017 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 37031.82893 + tps: 18533.05979 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 55600.51896 + tps: 26041.49256 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 38209.92549 + tps: 34495.89334 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 26598.70029 + tps: 13049.36027 + } +} +dps_results: { + key: "TestDemonology-Settings-Orc-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34770.89526 + tps: 14861.43877 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 45340.25643 - tps: 41408.06347 + dps: 59689.18311 + tps: 54935.55073 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29861.59026 - tps: 15419.74897 + dps: 37719.31506 + tps: 19063.14635 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 47659.09751 - tps: 22987.10184 + dps: 56782.03303 + tps: 26804.58016 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 30542.37808 - tps: 30136.51835 + dps: 39482.54312 + tps: 38848.95835 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 21192.75742 - tps: 10760.21052 + dps: 26778.95581 + tps: 13155.30007 } } dps_results: { - key: "TestDemonology-Settings-Goblin-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 29181.26077 - tps: 12928.14114 + dps: 35726.93269 + tps: 15755.12898 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 44816.99412 - tps: 40816.79874 + dps: 56806.29345 + tps: 50855.18942 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29704.95269 - tps: 15257.70393 + dps: 37314.26298 + tps: 19631.9639 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 47145.77666 - tps: 22772.14371 + dps: 57581.84692 + tps: 28976.37543 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 30254.46746 - tps: 29844.80542 + dps: 38587.87269 + tps: 35958.73561 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 20997.60934 - tps: 10643.64679 + dps: 26785.3862 + tps: 13808.69583 } } dps_results: { - key: "TestDemonology-Settings-Human-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-DefaultTalents-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 28837.54465 - tps: 12663.60355 + dps: 35790.84648 + tps: 16585.06137 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 46209.93205 - tps: 41393.79972 + dps: 59976.54445 + tps: 55301.78215 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 30660.70476 - tps: 15467.34719 + dps: 38199.75371 + tps: 19504.29854 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 48929.00306 - tps: 23110.10063 + dps: 57617.24888 + tps: 27624.81878 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31317.7704 - tps: 30377.76748 + dps: 39465.01807 + tps: 38691.41865 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 21697.33886 - tps: 10772.36341 + dps: 27102.61914 + tps: 13434.1261 } } dps_results: { - key: "TestDemonology-Settings-Orc-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-incinerate-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 30104.43343 - tps: 12872.30214 + dps: 36130.36018 + tps: 16116.77008 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 46786.8964 - tps: 42671.63051 + dps: 55351.93625 + tps: 48668.02524 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 30051.61476 - tps: 15629.67784 + dps: 36638.34972 + tps: 18816.66643 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 48753.06695 - tps: 23936.54713 + dps: 55735.28977 + tps: 26951.30994 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31524.20207 - tps: 30929.88156 + dps: 38407.26621 + tps: 35594.65747 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 21384.48227 - tps: 10866.19759 + dps: 26205.35879 + tps: 13134.3396 } } dps_results: { - key: "TestDemonology-Settings-Troll-p1-Demonology Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDemonology-Settings-Troll-p3-Incinerate-Demonology Warlock-shadow-bolt-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 30496.52683 - tps: 13784.72839 + dps: 34706.60345 + tps: 15519.08298 } } dps_results: { key: "TestDemonology-SwitchInFrontOfTarget-Default" value: { - dps: 30511.43575 - tps: 15467.34719 + dps: 37799.89585 + tps: 19413.78082 } } diff --git a/sim/warlock/demonology/demonology_test.go b/sim/warlock/demonology/demonology_test.go index c73aabb881..e25ad34d6e 100644 --- a/sim/warlock/demonology/demonology_test.go +++ b/sim/warlock/demonology/demonology_test.go @@ -435,28 +435,49 @@ func TestDemonology(t *testing.T) { TinkerHands: proto.TinkerHands_TinkerHandsSynapseSprings, } - var demonologyTalents = "-3312222300310212211-33202" - var demonologyGlyphs = &proto.Glyphs{ + // Shadow Bolt + var demonologyTalentsShadowBolt = "-3312222300310212211-33202" + var demonologyGlyphsShadowBolt = &proto.Glyphs{ Prime1: int32(proto.WarlockPrimeGlyph_GlyphOfImmolate), Prime2: int32(proto.WarlockPrimeGlyph_GlyphOfCorruption), Prime3: int32(proto.WarlockPrimeGlyph_GlyphOfMetamorphosis), - Major1: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), - Major2: int32(proto.WarlockMajorGlyph_GlyphOfShadowBolt), + Major1: int32(proto.WarlockMajorGlyph_GlyphOfShadowBolt), + Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), + Major3: int32(proto.WarlockMajorGlyph_GlyphOfFelhunter), + } + + // Incinerate + var demonologyTalentsIncenerate = "003-3312222300310212211-03202" + var demonologyGlyphsIncenerate = &proto.Glyphs{ + Prime1: int32(proto.WarlockPrimeGlyph_GlyphOfImmolate), + Prime2: int32(proto.WarlockPrimeGlyph_GlyphOfIncinerate), + Prime3: int32(proto.WarlockPrimeGlyph_GlyphOfMetamorphosis), + Major1: int32(proto.WarlockMajorGlyph_GlyphOfSoulstone), + Major2: int32(proto.WarlockMajorGlyph_GlyphOfLifeTap), Major3: int32(proto.WarlockMajorGlyph_GlyphOfFelhunter), } core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator(core.CharacterSuiteConfig{ - Class: proto.Class_ClassWarlock, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman}, - GearSet: core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p1"), - Talents: demonologyTalents, - Glyphs: demonologyGlyphs, + Class: proto.Class_ClassWarlock, + Race: proto.Race_RaceOrc, + OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman}, + GearSet: core.GetGearSet("../../../ui/warlock/demonology/gear_sets", "p3"), + Talents: demonologyTalentsShadowBolt, + Glyphs: demonologyGlyphsShadowBolt, + OtherTalentSets: []core.TalentsCombo{ + { + Label: "Incinerate", + Talents: demonologyTalentsIncenerate, + Glyphs: demonologyGlyphsIncenerate, + }, + }, Consumes: fullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Demonology Warlock", SpecOptions: defaultDemonologyWarlock}, OtherSpecOptions: []core.SpecOptionsCombo{}, - Rotation: core.GetAplRotation("../../../ui/warlock/demonology/apls", "default"), - OtherRotations: []core.RotationCombo{}, + Rotation: core.GetAplRotation("../../../ui/warlock/demonology/apls", "shadow-bolt"), + OtherRotations: []core.RotationCombo{ + core.GetAplRotation("../../../ui/warlock/demonology/apls", "incinerate"), + }, ItemFilter: itemFilter, StartingDistance: 25, })) diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results index 566096f151..2de7b83f9b 100644 --- a/sim/warlock/destruction/TestDestruction.results +++ b/sim/warlock/destruction/TestDestruction.results @@ -3,19 +3,19 @@ character_stats_results: { value: { final_stats: 666.75 final_stats: 668.85 - final_stats: 7057.05 - final_stats: 5554.395 + final_stats: 8311.8 + final_stats: 7071.435 final_stats: 183 - final_stats: 1749 - final_stats: 853 - final_stats: 2259 + final_stats: 1744 + final_stats: 1009 + final_stats: 2605 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 1047 + final_stats: 1054 final_stats: 788.1 final_stats: 0 - final_stats: 9228.3345 + final_stats: 11533.9785 final_stats: 0 final_stats: 0 final_stats: 0 @@ -23,65 +23,65 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 8479 + final_stats: 9372 final_stats: 0 - final_stats: 136722.7 - final_stats: 105714.925 + final_stats: 154289.2 + final_stats: 128470.525 final_stats: 1353.65 - final_stats: 14.5618 - final_stats: 17.07245 - final_stats: 12.37992 - final_stats: 19.78951 + final_stats: 14.52017 + final_stats: 17.02365 + final_stats: 13.25007 + final_stats: 22.93522 final_stats: 5 } } dps_results: { key: "TestDestruction-AllItems-AgileShadowspiritDiamond" value: { - dps: 29432.34848 - tps: 19070.40015 + dps: 37227.16767 + tps: 23784.87689 } } dps_results: { key: "TestDestruction-AllItems-Althor'sAbacus-50366" value: { - dps: 27925.07891 - tps: 18127.33141 + dps: 35751.24505 + tps: 22825.03897 } } dps_results: { key: "TestDestruction-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 27755.91531 - tps: 18049.72555 + dps: 35605.9104 + tps: 22749.06455 } } dps_results: { key: "TestDestruction-AllItems-Anhuur'sHymnal-55889" value: { - dps: 28385.34738 - tps: 18432.60373 + dps: 35848.92258 + tps: 22874.64291 } } dps_results: { key: "TestDestruction-AllItems-Anhuur'sHymnal-56407" value: { - dps: 28443.02202 - tps: 18473.90541 + dps: 35921.86896 + tps: 22926.94027 } } dps_results: { key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -94,128 +94,135 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-AustereShadowspiritDiamond" value: { - dps: 29147.43659 - tps: 18861.01969 + dps: 36838.27116 + tps: 23498.3806 } } dps_results: { key: "TestDestruction-AllItems-Balespider'sBurningVestments" value: { - dps: 25350.89583 - tps: 15539.82612 + dps: 34333.28691 + tps: 21951.03685 } } dps_results: { key: "TestDestruction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 27394.86647 - tps: 17780.10707 - hps: 98.89602 + dps: 35204.55799 + tps: 22461.8239 + hps: 99.98853 } } dps_results: { key: "TestDestruction-AllItems-BedrockTalisman-58182" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-BellofEnragingResonance-59326" value: { - dps: 28862.37223 - tps: 18677.82983 + dps: 36729.14841 + tps: 23394.35474 + } +} +dps_results: { + key: "TestDestruction-AllItems-BellofEnragingResonance-65053" + value: { + dps: 36974.09908 + tps: 23546.1074 } } dps_results: { key: "TestDestruction-AllItems-BindingPromise-67037" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 27571.10045 - tps: 17918.24186 + dps: 35383.60127 + tps: 22611.5977 } } dps_results: { key: "TestDestruction-AllItems-BloodofIsiset-55995" value: { - dps: 27636.41855 - tps: 17943.03251 + dps: 35508.86833 + tps: 22697.9614 } } dps_results: { key: "TestDestruction-AllItems-BloodofIsiset-56414" value: { - dps: 27673.27792 - tps: 17969.10109 + dps: 35554.52739 + tps: 22729.3921 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 27305.9733 - tps: 17729.40124 + dps: 35046.59985 + tps: 22354.60151 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 28235.12996 - tps: 18267.84155 + dps: 36047.68821 + tps: 22913.36882 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 27307.11696 - tps: 17730.66788 + dps: 35046.3841 + tps: 22353.69483 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 27718.5653 - tps: 17988.61133 + dps: 35524.05242 + tps: 22673.13366 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 27354.947 - tps: 17744.36023 + dps: 35165.98017 + tps: 22458.94366 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 27354.947 - tps: 17744.42276 + dps: 35160.19912 + tps: 22458.40465 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 28221.85124 - tps: 18269.43608 + dps: 36086.55988 + tps: 23020.01347 } } dps_results: { key: "TestDestruction-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -242,8 +249,8 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-BottledLightning-66879" value: { - dps: 28053.96676 - tps: 18240.24938 + dps: 35801.76804 + tps: 22843.46051 } } dps_results: { @@ -270,50 +277,50 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-BracingShadowspiritDiamond" value: { - dps: 29303.12994 - tps: 18597.43489 + dps: 37076.69648 + tps: 23201.22593 } } dps_results: { key: "TestDestruction-AllItems-Brawler'sTrophy-232015" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-BurningShadowspiritDiamond" value: { - dps: 29589.57194 - tps: 19175.05687 + dps: 37471.1179 + tps: 23948.5721 } } dps_results: { key: "TestDestruction-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 29491.33634 - tps: 19113.20836 + dps: 37339.57504 + tps: 23878.18486 } } dps_results: { key: "TestDestruction-AllItems-Coren'sChilledChromiumCoaster-232012" value: { - dps: 27726.50244 - tps: 17996.56547 + dps: 35527.2651 + tps: 22673.33217 } } dps_results: { key: "TestDestruction-AllItems-CoreofRipeness-58184" value: { - dps: 28345.81456 - tps: 18417.10145 + dps: 36120.04805 + tps: 23050.39807 } } dps_results: { key: "TestDestruction-AllItems-CorpseTongueCoin-50349" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -340,15 +347,15 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-CrushingWeight-59506" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-CrushingWeight-65118" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -375,113 +382,113 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 27354.947 - tps: 17744.42831 + dps: 35160.19912 + tps: 22458.4102 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 28388.45904 - tps: 18423.63923 + dps: 36174.4002 + tps: 23073.00432 } } dps_results: { key: "TestDestruction-AllItems-Deathbringer'sWill-50363" value: { - dps: 27563.79452 - tps: 17888.5978 + dps: 35350.43577 + tps: 22590.06717 } } dps_results: { key: "TestDestruction-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 29203.62839 - tps: 18898.5117 + dps: 36945.05749 + tps: 23586.55177 } } dps_results: { key: "TestDestruction-AllItems-DislodgedForeignObject-50348" value: { - dps: 28264.5317 - tps: 18434.441 + dps: 35824.65271 + tps: 22783.46774 } } dps_results: { key: "TestDestruction-AllItems-Dwyer'sCaber-70141" value: { - dps: 27867.15464 - tps: 18101.33764 + dps: 35667.72512 + tps: 22747.27434 } } dps_results: { key: "TestDestruction-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 29147.43659 - tps: 18861.01969 + dps: 36838.27116 + tps: 23498.3806 } } dps_results: { key: "TestDestruction-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 27775.54108 - tps: 18036.93229 + dps: 35573.92891 + tps: 22683.27346 } } dps_results: { key: "TestDestruction-AllItems-EmberShadowspiritDiamond" value: { - dps: 29327.73364 - tps: 18996.40675 + dps: 37053.31796 + tps: 23662.60187 } } dps_results: { key: "TestDestruction-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 29203.62839 - tps: 18898.5117 + dps: 36945.05749 + tps: 23586.55177 } } dps_results: { key: "TestDestruction-AllItems-EssenceoftheCyclone-59473" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-EssenceoftheCyclone-65140" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 27755.91531 - tps: 18049.72555 + dps: 35605.9104 + tps: 22749.06455 } } dps_results: { key: "TestDestruction-AllItems-EternalShadowspiritDiamond" value: { - dps: 29147.43659 - tps: 18861.01969 + dps: 36838.27116 + tps: 23498.3806 } } dps_results: { @@ -508,57 +515,57 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-FallofMortality-59500" value: { - dps: 28388.45904 - tps: 18423.63923 + dps: 36174.4002 + tps: 23073.00432 } } dps_results: { key: "TestDestruction-AllItems-FallofMortality-65124" value: { - dps: 28536.74767 - tps: 18520.64363 + dps: 36310.35673 + tps: 23160.50207 } } dps_results: { key: "TestDestruction-AllItems-FieryQuintessence-69000" value: { - dps: 28500.68484 - tps: 18495.35244 + dps: 36316.9493 + tps: 23148.69585 } } dps_results: { key: "TestDestruction-AllItems-Figurine-DemonPanther-52199" value: { - dps: 27708.93218 - tps: 18058.67278 + dps: 35046.3841 + tps: 22353.69483 } } dps_results: { key: "TestDestruction-AllItems-Figurine-DreamOwl-52354" value: { - dps: 28238.11014 - tps: 18350.60913 + dps: 36047.87082 + tps: 23012.17499 } } dps_results: { key: "TestDestruction-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 27346.23782 - tps: 17734.28991 + dps: 35139.26715 + tps: 22444.3041 } } dps_results: { key: "TestDestruction-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 29109.5833 - tps: 18853.23008 + dps: 36988.53892 + tps: 23537.8358 } } dps_results: { key: "TestDestruction-AllItems-Figurine-KingofBoars-52351" value: { - dps: 27624.92672 - tps: 17955.41441 + dps: 35439.26361 + tps: 22623.58486 } } dps_results: { @@ -585,22 +592,22 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-FleetShadowspiritDiamond" value: { - dps: 29211.1331 - tps: 18903.15148 + dps: 36915.78356 + tps: 23551.80104 } } dps_results: { key: "TestDestruction-AllItems-FluidDeath-58181" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-ForlornShadowspiritDiamond" value: { - dps: 29303.12994 - tps: 18961.32918 + dps: 37076.69648 + tps: 23657.61108 } } dps_results: { @@ -613,169 +620,169 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-FuryofAngerforge-59461" value: { - dps: 27748.68796 - tps: 18015.72298 + dps: 35546.94747 + tps: 22689.56302 } } dps_results: { key: "TestDestruction-AllItems-GaleofShadows-56138" value: { - dps: 28569.58148 - tps: 18571.33082 + dps: 36196.07415 + tps: 23132.55561 } } dps_results: { key: "TestDestruction-AllItems-GaleofShadows-56462" value: { - dps: 28634.61393 - tps: 18648.335 + dps: 36296.56445 + tps: 23185.8151 } } dps_results: { key: "TestDestruction-AllItems-GearDetector-61462" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Gladiator'sFelshroud" value: { - dps: 21450.06553 - tps: 13535.35159 + dps: 28123.49529 + tps: 18282.18876 } } dps_results: { key: "TestDestruction-AllItems-GlowingTwilightScale-54589" value: { - dps: 27952.07306 - tps: 18142.54454 + dps: 35774.99845 + tps: 22835.01541 } } dps_results: { key: "TestDestruction-AllItems-GraceoftheHerald-55266" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-GraceoftheHerald-56295" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HarmlightToken-63839" value: { - dps: 28206.46928 - tps: 18363.51203 + dps: 36053.80008 + tps: 23064.08405 } } dps_results: { key: "TestDestruction-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HeartofIgnacious-59514" value: { - dps: 28698.12373 - tps: 18669.73937 + dps: 36705.14701 + tps: 23484.52166 } } dps_results: { key: "TestDestruction-AllItems-HeartofIgnacious-65110" value: { - dps: 28873.72675 - tps: 18791.19138 + dps: 36830.07228 + tps: 23610.11008 } } dps_results: { key: "TestDestruction-AllItems-HeartofRage-59224" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HeartofRage-65072" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HeartofSolace-55868" value: { - dps: 27861.4534 - tps: 18122.05382 + dps: 35444.78491 + tps: 22661.90463 } } dps_results: { key: "TestDestruction-AllItems-HeartofSolace-56393" value: { - dps: 27833.54983 - tps: 18138.77358 + dps: 35445.28372 + tps: 22652.68748 } } dps_results: { key: "TestDestruction-AllItems-HeartofThunder-55845" value: { - dps: 27351.67881 - tps: 17741.99807 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HeartofThunder-56370" value: { - dps: 27351.67881 - tps: 17742.03587 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-HeartoftheVile-66969" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 29203.62839 - tps: 18898.5117 + dps: 36945.05749 + tps: 23586.55177 } } dps_results: { key: "TestDestruction-AllItems-ImpatienceofYouth-62464" value: { - dps: 27665.07112 - tps: 17983.80344 + dps: 35488.89049 + tps: 22657.67624 } } dps_results: { key: "TestDestruction-AllItems-ImpatienceofYouth-62469" value: { - dps: 27665.07112 - tps: 17983.80344 + dps: 35488.89049 + tps: 22657.67624 } } dps_results: { key: "TestDestruction-AllItems-ImpetuousQuery-55881" value: { - dps: 27636.41855 - tps: 17943.03251 + dps: 35508.86833 + tps: 22697.9614 } } dps_results: { key: "TestDestruction-AllItems-ImpetuousQuery-56406" value: { - dps: 27673.27792 - tps: 17969.10109 + dps: 35554.52739 + tps: 22729.3921 } } dps_results: { @@ -802,8 +809,8 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 27351.67881 - tps: 17741.98674 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -830,57 +837,57 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 28072.60666 - tps: 18203.23474 + dps: 35934.69067 + tps: 22908.97269 } } dps_results: { key: "TestDestruction-AllItems-JarofAncientRemedies-59354" value: { - dps: 27380.33154 - tps: 17792.37712 + dps: 35136.48536 + tps: 22447.02075 } } dps_results: { key: "TestDestruction-AllItems-JarofAncientRemedies-65029" value: { - dps: 27394.74583 - tps: 17803.35678 + dps: 35152.84831 + tps: 22469.6681 } } dps_results: { key: "TestDestruction-AllItems-JawsofDefeat-68926" value: { - dps: 28549.4818 - tps: 18551.73159 + dps: 36343.7903 + tps: 23192.55065 } } dps_results: { key: "TestDestruction-AllItems-JawsofDefeat-69111" value: { - dps: 28724.12617 - tps: 18669.45348 + dps: 36519.80253 + tps: 23305.03078 } } dps_results: { key: "TestDestruction-AllItems-JujuofNimbleness-63840" value: { - dps: 27571.10045 - tps: 17918.24186 + dps: 35383.60127 + tps: 22611.5977 } } dps_results: { key: "TestDestruction-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -907,253 +914,253 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-KvaldirBattleStandard-59685" value: { - dps: 27622.17076 - tps: 18041.95641 + dps: 35189.46766 + tps: 22400.46175 } } dps_results: { key: "TestDestruction-AllItems-KvaldirBattleStandard-59689" value: { - dps: 27622.17076 - tps: 18041.95641 + dps: 35189.46766 + tps: 22400.46175 } } dps_results: { key: "TestDestruction-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 27589.12742 - tps: 17947.15919 + dps: 35387.23461 + tps: 22585.02031 } } dps_results: { key: "TestDestruction-AllItems-LeadenDespair-55816" value: { - dps: 27351.67881 - tps: 17742.87907 + dps: 35139.26715 + tps: 22444.05185 } } dps_results: { key: "TestDestruction-AllItems-LeadenDespair-56347" value: { - dps: 27346.23782 - tps: 17734.28991 + dps: 35139.26715 + tps: 22444.3041 } } dps_results: { key: "TestDestruction-AllItems-LeftEyeofRajh-56102" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-LeftEyeofRajh-56427" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-LicensetoSlay-58180" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-MagnetiteMirror-55814" value: { - dps: 27326.59678 - tps: 17745.36294 + dps: 35081.26832 + tps: 22403.55766 } } dps_results: { key: "TestDestruction-AllItems-MagnetiteMirror-56345" value: { - dps: 27326.59678 - tps: 17745.36294 + dps: 35081.26832 + tps: 22403.55766 } } dps_results: { key: "TestDestruction-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 27354.947 - tps: 17743.89662 + dps: 35165.98017 + tps: 22458.70925 } } dps_results: { key: "TestDestruction-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 27354.947 - tps: 17743.89662 + dps: 35165.98017 + tps: 22458.70925 } } dps_results: { key: "TestDestruction-AllItems-MarkofKhardros-56132" value: { - dps: 27638.10258 - tps: 17967.39221 + dps: 35474.53809 + tps: 22660.68265 } } dps_results: { key: "TestDestruction-AllItems-MarkofKhardros-56458" value: { - dps: 27678.895 - tps: 17996.46747 + dps: 35526.03771 + tps: 22694.35378 } } dps_results: { key: "TestDestruction-AllItems-MatrixRestabilizer-68994" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-MatrixRestabilizer-69150" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-MightoftheOcean-55251" value: { - dps: 27722.67593 - tps: 18061.55026 + dps: 35081.26832 + tps: 22403.55766 } } dps_results: { key: "TestDestruction-AllItems-MightoftheOcean-56285" value: { - dps: 27722.67593 - tps: 18061.55026 + dps: 35081.26832 + tps: 22403.55766 } } dps_results: { key: "TestDestruction-AllItems-MirrorofBrokenImages-62466" value: { - dps: 27713.48815 - tps: 17997.53955 + dps: 35604.33728 + tps: 22763.68012 } } dps_results: { key: "TestDestruction-AllItems-MirrorofBrokenImages-62471" value: { - dps: 27713.48815 - tps: 17997.53955 + dps: 35604.33728 + tps: 22763.68012 } } dps_results: { key: "TestDestruction-AllItems-MithrilStopwatch-232013" value: { - dps: 28760.80243 - tps: 18625.38771 + dps: 36631.57874 + tps: 23348.49626 } } dps_results: { key: "TestDestruction-AllItems-MoonwellChalice-70142" value: { - dps: 28955.55 - tps: 18844.22874 + dps: 36849.74274 + tps: 23535.08083 } } dps_results: { key: "TestDestruction-AllItems-MoonwellPhial-70143" value: { - dps: 27348.31666 - tps: 17736.01838 + dps: 35139.26715 + tps: 22444.50541 } } dps_results: { key: "TestDestruction-AllItems-NecromanticFocus-68982" value: { - dps: 29034.89566 - tps: 18870.78085 + dps: 36919.97402 + tps: 23582.01692 } } dps_results: { key: "TestDestruction-AllItems-NecromanticFocus-69139" value: { - dps: 29261.41619 - tps: 19024.95855 + dps: 37170.85742 + tps: 23753.48773 } } dps_results: { key: "TestDestruction-AllItems-Oremantle'sFavor-61448" value: { - dps: 27636.87868 - tps: 17955.40867 + dps: 35367.74244 + tps: 22545.91656 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedPickledEgg-232014" value: { - dps: 28345.43219 - tps: 18394.39912 + dps: 36111.98161 + tps: 23024.72474 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 28252.8998 - tps: 18301.54281 + dps: 36082.47187 + tps: 23041.48968 } } dps_results: { key: "TestDestruction-AllItems-PorcelainCrab-55237" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-PorcelainCrab-56280" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 29147.43659 - tps: 18861.01969 + dps: 36838.27116 + tps: 23498.3806 } } dps_results: { key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Rainsong-55854" value: { - dps: 27354.947 - tps: 17743.91864 + dps: 35165.98017 + tps: 22458.7341 } } dps_results: { key: "TestDestruction-AllItems-Rainsong-56377" value: { - dps: 27354.947 - tps: 17743.9041 + dps: 35165.98017 + tps: 22458.71769 } } dps_results: { @@ -1201,36 +1208,36 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 29432.34848 - tps: 19070.40015 + dps: 37227.16767 + tps: 23784.87689 } } dps_results: { key: "TestDestruction-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 29432.34848 - tps: 19070.39122 + dps: 37227.16767 + tps: 23784.8626 } } dps_results: { key: "TestDestruction-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 27830.56895 - tps: 18059.40121 + dps: 35661.36494 + tps: 22717.37684 } } dps_results: { key: "TestDestruction-AllItems-RightEyeofRajh-56100" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-RightEyeofRajh-56431" value: { - dps: 27740.57809 - tps: 18041.52817 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -1264,115 +1271,115 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-RuneofZeth-68998" value: { - dps: 28946.4329 - tps: 18790.14475 + dps: 36883.9316 + tps: 23497.47556 } } dps_results: { key: "TestDestruction-AllItems-ScalesofLife-68915" value: { - dps: 27402.1002 - tps: 17790.10306 - hps: 351.03642 + dps: 35189.28808 + tps: 22451.5131 + hps: 357.04731 } } dps_results: { key: "TestDestruction-AllItems-ScalesofLife-69109" value: { - dps: 27402.1002 - tps: 17790.35112 - hps: 395.9658 + dps: 35189.28808 + tps: 22451.67848 + hps: 402.74602 } } dps_results: { key: "TestDestruction-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-SeaStar-55256" value: { - dps: 27774.17614 - tps: 18000.98018 + dps: 35560.66161 + tps: 22651.44381 } } dps_results: { key: "TestDestruction-AllItems-SeaStar-56290" value: { - dps: 28177.12914 - tps: 18234.20899 + dps: 35995.35626 + tps: 22894.55165 } } dps_results: { key: "TestDestruction-AllItems-ShadowflameRegalia" value: { - dps: 26754.26642 - tps: 17350.8202 + dps: 31021.52776 + tps: 20184.20732 } } dps_results: { key: "TestDestruction-AllItems-ShardofWoe-60233" value: { - dps: 28089.12586 - tps: 18271.86849 + dps: 35948.85634 + tps: 22935.73617 } } dps_results: { key: "TestDestruction-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 27357.66024 - tps: 17747.02285 + dps: 35139.26715 + tps: 22443.89419 } } dps_results: { key: "TestDestruction-AllItems-Skardyn'sGrace-56115" value: { - dps: 27696.49136 - tps: 18003.23842 + dps: 35511.31637 + tps: 22661.32734 } } dps_results: { key: "TestDestruction-AllItems-Skardyn'sGrace-56440" value: { - dps: 27747.48087 - tps: 18038.93218 + dps: 35572.20036 + tps: 22701.61255 } } dps_results: { key: "TestDestruction-AllItems-Sorrowsong-55879" value: { - dps: 28251.78612 - tps: 18329.9142 + dps: 36154.60091 + tps: 23097.88459 } } dps_results: { key: "TestDestruction-AllItems-Sorrowsong-56400" value: { - dps: 28370.19506 - tps: 18407.342 + dps: 36285.90024 + tps: 23182.46584 } } dps_results: { key: "TestDestruction-AllItems-Soul'sAnguish-66994" value: { - dps: 27722.67593 - tps: 18061.55026 + dps: 35081.26832 + tps: 22403.55766 } } dps_results: { key: "TestDestruction-AllItems-SoulCasket-58183" value: { - dps: 28856.2224 - tps: 18675.07756 + dps: 36774.30392 + tps: 23377.79834 } } dps_results: { @@ -1399,15 +1406,15 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-SpidersilkSpindle-68981" value: { - dps: 27782.73908 - tps: 18046.51689 + dps: 35690.12097 + tps: 22822.73173 } } dps_results: { key: "TestDestruction-AllItems-SpidersilkSpindle-69138" value: { - dps: 27838.58661 - tps: 18086.01475 + dps: 35759.30137 + tps: 22870.35399 } } dps_results: { @@ -1434,204 +1441,197 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-StayofExecution-68996" value: { - dps: 27307.11696 - tps: 17730.66788 + dps: 35046.3841 + tps: 22353.69483 } } dps_results: { key: "TestDestruction-AllItems-Stonemother'sKiss-61411" value: { - dps: 28304.47635 - tps: 18375.71228 + dps: 36148.16776 + tps: 23075.56984 } } dps_results: { key: "TestDestruction-AllItems-StumpofTime-62465" value: { - dps: 28762.78574 - tps: 18670.08544 + dps: 36253.31235 + tps: 23121.33141 } } dps_results: { key: "TestDestruction-AllItems-StumpofTime-62470" value: { - dps: 28802.44158 - tps: 18684.65714 + dps: 36298.12816 + tps: 23125.7527 } } dps_results: { key: "TestDestruction-AllItems-SymbioticWorm-59332" value: { - dps: 27348.31666 - tps: 17735.93812 + dps: 35139.26715 + tps: 22444.4375 } } dps_results: { key: "TestDestruction-AllItems-SymbioticWorm-65048" value: { - dps: 27353.05069 - tps: 17742.2818 + dps: 35139.26715 + tps: 22444.58788 } } dps_results: { key: "TestDestruction-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 28373.116 - tps: 18433.73977 + dps: 36242.40397 + tps: 23145.62105 } } dps_results: { key: "TestDestruction-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-TearofBlood-55819" value: { - dps: 28077.40616 - tps: 18228.18916 + dps: 35901.78343 + tps: 22927.42989 } } dps_results: { key: "TestDestruction-AllItems-TearofBlood-56351" value: { - dps: 28284.29631 - tps: 18362.83857 + dps: 36059.04467 + tps: 22994.72014 } } dps_results: { key: "TestDestruction-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 28211.69893 - tps: 18292.15387 + dps: 36128.40318 + tps: 23065.32505 } } dps_results: { key: "TestDestruction-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 28504.37778 - tps: 18472.36667 + dps: 36450.81964 + tps: 23263.80158 } } dps_results: { key: "TestDestruction-AllItems-TheHungerer-68927" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-TheHungerer-69112" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Theralion'sMirror-59519" value: { - dps: 28903.8408 - tps: 18791.20343 + dps: 36766.45094 + tps: 23476.10956 } } dps_results: { key: "TestDestruction-AllItems-Theralion'sMirror-65105" value: { - dps: 29111.89045 - tps: 18924.66732 + dps: 36988.4058 + tps: 23622.86159 } } dps_results: { key: "TestDestruction-AllItems-Throngus'sFinger-56121" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Throngus'sFinger-56449" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Tia'sGrace-55874" value: { - dps: 27636.41855 - tps: 17943.03251 + dps: 35508.86833 + tps: 22697.9614 } } dps_results: { key: "TestDestruction-AllItems-Tia'sGrace-56394" value: { - dps: 27673.27792 - tps: 17969.10109 + dps: 35554.52739 + tps: 22729.3921 } } dps_results: { key: "TestDestruction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 27626.17583 - tps: 17992.0306 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 28242.0869 - tps: 18403.73128 + dps: 36029.73562 + tps: 23006.41748 } } dps_results: { key: "TestDestruction-AllItems-UnheededWarning-59520" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-UnquenchableFlame-67101" value: { - dps: 27307.11696 - tps: 17730.63215 + dps: 35056.81098 + tps: 22369.64319 } } dps_results: { key: "TestDestruction-AllItems-UnsolvableRiddle-62463" value: { - dps: 27665.07112 - tps: 17983.80344 + dps: 35488.89049 + tps: 22657.67624 } } dps_results: { key: "TestDestruction-AllItems-UnsolvableRiddle-62468" value: { - dps: 27665.07112 - tps: 17983.80344 + dps: 35488.89049 + tps: 22657.67624 } } dps_results: { key: "TestDestruction-AllItems-UnsolvableRiddle-68709" value: { - dps: 27665.07112 - tps: 17983.80344 + dps: 35488.89049 + tps: 22657.67624 } } dps_results: { key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29599.57252 - tps: 19545.66115 - } -} -dps_results: { - key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-69110" - value: { - dps: 29824.60529 - tps: 19659.108 + dps: 36429.58373 + tps: 23209.8915 } } dps_results: { @@ -1651,15 +1651,15 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-VesselofAcceleration-68995" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-VesselofAcceleration-69167" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -1686,99 +1686,99 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-VialofStolenMemories-59515" value: { - dps: 27348.31666 - tps: 17735.93812 + dps: 35139.26715 + tps: 22444.4375 } } dps_results: { key: "TestDestruction-AllItems-VialofStolenMemories-65109" value: { - dps: 27353.05069 - tps: 17742.2818 + dps: 35139.26715 + tps: 22444.58788 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 27307.11696 - tps: 17730.66788 + dps: 35046.3841 + tps: 22353.69483 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 28287.02542 - tps: 18297.88086 + dps: 36103.68219 + tps: 22944.66638 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 27307.11696 - tps: 17730.66788 + dps: 35046.3841 + tps: 22353.69483 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 27740.57809 - tps: 18041.77111 + dps: 35160.19912 + tps: 22458.43108 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 27930.14154 - tps: 18169.45316 + dps: 35539.30595 + tps: 22680.08942 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 27778.1743 - tps: 18031.90047 + dps: 35576.89404 + tps: 22705.83569 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 27354.947 - tps: 17744.44919 + dps: 35160.19912 + tps: 22458.43108 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 27734.71021 - tps: 18013.03461 + dps: 35630.62583 + tps: 22782.26246 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 27354.947 - tps: 17744.44919 + dps: 35160.19912 + tps: 22458.43108 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 28209.37841 - tps: 18255.73469 + dps: 36077.43339 + tps: 23000.72749 } } dps_results: { key: "TestDestruction-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 27354.947 - tps: 17743.96331 + dps: 35160.19912 + tps: 22457.9452 } } dps_results: { @@ -1805,22 +1805,22 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-WitchingHourglass-55787" value: { - dps: 28412.79736 - tps: 18554.42317 + dps: 36318.15686 + tps: 23207.57367 } } dps_results: { key: "TestDestruction-AllItems-WitchingHourglass-56320" value: { - dps: 28763.74711 - tps: 18694.53493 + dps: 36637.73106 + tps: 23442.2022 } } dps_results: { key: "TestDestruction-AllItems-World-QuellerFocus-63842" value: { - dps: 27551.32867 - tps: 17903.36784 + dps: 35348.28098 + tps: 22561.08401 } } dps_results: { @@ -1847,196 +1847,196 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 27606.42576 - tps: 17950.1169 + dps: 35402.38575 + tps: 22613.01311 } } dps_results: { key: "TestDestruction-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 27606.42576 - tps: 17950.1169 + dps: 35402.38575 + tps: 22613.01311 } } dps_results: { key: "TestDestruction-Average-Default" value: { - dps: 29988.9574 - tps: 19527.79483 + dps: 37826.0349 + tps: 24266.98313 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 30944.55015 - tps: 35553.94797 + dps: 38906.61121 + tps: 41696.1233 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29243.24577 - tps: 19127.87924 + dps: 36965.63125 + tps: 23904.62495 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 39628.43095 - tps: 23833.4509 + dps: 47213.43282 + tps: 28618.47819 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 18878.3363 - tps: 26037.2245 + dps: 24194.62937 + tps: 29956.69904 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 18878.3363 - tps: 12421.21542 + dps: 24194.62937 + tps: 15567.26683 } } dps_results: { - key: "TestDestruction-Settings-Goblin-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Goblin-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 22023.66669 - tps: 13083.18104 + dps: 27312.8549 + tps: 16128.63053 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 30788.26856 - tps: 35350.25733 + dps: 38697.85247 + tps: 41441.14129 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29049.20842 - tps: 19019.91918 + dps: 36828.89299 + tps: 23795.20702 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 39644.20571 - tps: 23805.5196 + dps: 47191.29275 + tps: 28554.52167 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 18811.39643 - tps: 25781.20452 + dps: 23816.18364 + tps: 29334.93587 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 18811.39643 - tps: 12462.11256 + dps: 23816.18364 + tps: 15271.6767 } } dps_results: { - key: "TestDestruction-Settings-Human-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Human-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 21879.11477 - tps: 13049.56207 + dps: 26777.97606 + tps: 15612.96937 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 31331.13957 - tps: 35501.27991 + dps: 39345.08301 + tps: 41581.35051 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29589.57194 - tps: 19175.05687 + dps: 37471.1179 + tps: 23948.5721 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 40744.3767 - tps: 24107.53598 + dps: 48442.0541 + tps: 28874.3529 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 19187.0579 - tps: 25806.62518 + dps: 24295.34805 + tps: 29490.26596 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 19187.0579 - tps: 12556.49334 + dps: 24295.34805 + tps: 15413.65719 } } dps_results: { - key: "TestDestruction-Settings-Orc-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 22589.74275 - tps: 13224.88738 + dps: 27553.80535 + tps: 15776.4083 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 31084.99479 - tps: 35914.24842 + dps: 39050.55105 + tps: 41686.0048 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 29399.58917 - tps: 19272.90715 + dps: 37257.22442 + tps: 24125.37667 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 40336.6087 - tps: 24222.36944 + dps: 48398.90128 + tps: 29388.62699 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 19049.27039 - tps: 26192.54997 + dps: 24263.41712 + tps: 30124.10859 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 19049.27039 - tps: 12576.59316 + dps: 24263.41712 + tps: 15620.07003 } } dps_results: { - key: "TestDestruction-Settings-Troll-p1-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" + key: "TestDestruction-Settings-Troll-p3-Destruction Warlock-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 22824.72289 - tps: 13662.46545 + dps: 28177.92885 + tps: 16698.77121 } } dps_results: { key: "TestDestruction-SwitchInFrontOfTarget-Default" value: { - dps: 29582.41307 - tps: 19175.05687 + dps: 37461.35439 + tps: 23948.5721 } } diff --git a/sim/warlock/destruction/destruction_test.go b/sim/warlock/destruction/destruction_test.go index 3dfc4af40b..8c3629d0a6 100644 --- a/sim/warlock/destruction/destruction_test.go +++ b/sim/warlock/destruction/destruction_test.go @@ -358,14 +358,13 @@ func TestDestruction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceTroll, proto.Race_RaceGoblin, proto.Race_RaceHuman}, - GearSet: core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p1"), + GearSet: core.GetGearSet("../../../ui/warlock/destruction/gear_sets", "p3"), Talents: destructionTalents, Glyphs: destructionGlyphs, Consumes: fullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Destruction Warlock", SpecOptions: defaultDestructionWarlock}, OtherSpecOptions: []core.SpecOptionsCombo{}, Rotation: core.GetAplRotation("../../../ui/warlock/destruction/apls", "default"), - OtherRotations: []core.RotationCombo{}, ItemFilter: itemFilter, StartingDistance: 25, })) diff --git a/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx b/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx index 709642fcb6..9204a218e1 100644 --- a/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx +++ b/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx @@ -5,6 +5,7 @@ import { IndividualSimUI } from '../../individual_sim_ui'; import { PresetBuild } from '../../preset_utils'; import { APLRotation, APLRotation_Type } from '../../proto/apl'; import { Encounter, EquipmentSpec, Glyphs, HealingModel, Spec } from '../../proto/common'; +import { SavedTalents } from '../../proto/ui'; import { TypedEvent } from '../../typed_event'; import { Component } from '../component'; import { ContentBlock } from '../content_block'; @@ -108,8 +109,15 @@ export class PresetConfigurationPicker extends Component { private isBuildActive({ gear, rotation, talents, epWeights, encounter }: PresetBuild): boolean { const hasGear = gear ? EquipmentSpec.equals(gear.gear, this.simUI.player.getGear().asSpec()) : true; - const hasTalents = talents ? talents.data.talentsString == this.simUI.player.getTalentsString() : true; - const hasGlyphs = talents?.data.glyphs ? Glyphs.equals(this.simUI.player.getGlyphs(), talents.data.glyphs) : true; + const hasTalents = talents + ? SavedTalents.equals( + talents.data, + SavedTalents.create({ + talentsString: this.simUI.player.getTalentsString(), + glyphs: this.simUI.player.getGlyphs(), + }), + ) + : true; let hasRotation = true; if (rotation) { const activeRotation = this.simUI.player.getResolvedAplRotation(); @@ -121,6 +129,6 @@ export class PresetConfigurationPicker extends Component { const hasEncounter = encounter?.encounter ? Encounter.equals(encounter.encounter, this.simUI.sim.encounter.toProto()) : true; const hasHealingModel = encounter?.healingModel ? HealingModel.equals(encounter.healingModel, this.simUI.player.getHealingModel()) : true; - return hasGear && hasTalents && hasGlyphs && hasRotation && hasEpWeights && hasEncounter && hasHealingModel; + return hasGear && hasTalents && hasRotation && hasEpWeights && hasEncounter && hasHealingModel; } } diff --git a/ui/rogue/assassination/presets.ts b/ui/rogue/assassination/presets.ts index 06a224e2ed..93ea712995 100644 --- a/ui/rogue/assassination/presets.ts +++ b/ui/rogue/assassination/presets.ts @@ -1,4 +1,3 @@ -import * as Mechanics from '../../core/constants/mechanics'; import * as PresetUtils from '../../core/preset_utils'; import { Conjured, Consumes, Flask, Food, Glyphs, Potions, PseudoStat, Stat } from '../../core/proto/common'; import { AssassinationRogue_Options as RogueOptions, RogueMajorGlyph, RogueOptions_PoisonImbue, RoguePrimeGlyph } from '../../core/proto/rogue'; @@ -15,7 +14,7 @@ import P3AssassinationGear from './gear_sets/p3_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 Asn', P3AssassinationGear); +export const P3_PRESET_ASSASSINATION = PresetUtils.makePresetGear('P3 Assassination', P3AssassinationGear); export const ROTATION_PRESET_MUTILATE = PresetUtils.makePresetAPLRotation('Assassination', MutilateApl); diff --git a/ui/rogue/combat/gear_sets/p3_combat.gear.json b/ui/rogue/combat/gear_sets/p3_combat.gear.json index a188d4030a..1945d914c4 100644 --- a/ui/rogue/combat/gear_sets/p3_combat.gear.json +++ b/ui/rogue/combat/gear_sets/p3_combat.gear.json @@ -1,16 +1,16 @@ {"items": [ - {"id":71539,"enchant":4209,"gems":[68778,52211],"reforging":139}, + {"id":71539,"enchant":4209,"gems":[68778,52211],"reforging":140}, {"id":71610}, - {"id":71541,"enchant":4204,"gems":[52212]}, - {"id":71415,"enchant":4100,"gems":[52212,52212],"reforging":139}, - {"id":71455,"enchant":4102,"gems":[52212,52212],"reforging":168}, + {"id":71541,"enchant":4204,"gems":[52212],"reforging":168}, + {"id":71415,"enchant":4100,"gems":[52212,52212],"reforging":138}, + {"id":71455,"enchant":4102,"gems":[52212,52212],"reforging":153}, {"id":71428,"randomSuffix":-136,"enchant":4258,"gems":[0],"reforging":168}, {"id":71538,"enchant":4107,"gems":[52212,0],"reforging":147}, - {"id":71641,"gems":[52220,52212],"reforging":147}, + {"id":71641,"gems":[52220,52212],"reforging":145}, {"id":71540,"enchant":4126,"gems":[52212,52220],"reforging":145}, {"id":71467,"enchant":4105,"gems":[52212],"reforging":145}, - {"id":71216,"gems":[52212],"reforging":168}, - {"id":71401}, + {"id":71216,"gems":[52212],"reforging":153}, + {"id":71401,"reforging":153}, {"id":69150}, {"id":69112}, {"id":71454,"enchant":4099,"reforging":145}, diff --git a/ui/rogue/combat/presets.ts b/ui/rogue/combat/presets.ts index 15ec1dc081..97e2d2ac67 100644 --- a/ui/rogue/combat/presets.ts +++ b/ui/rogue/combat/presets.ts @@ -26,21 +26,22 @@ export const CBAT_HASTE_EP_PRESET = PresetUtils.makePresetEpWeights( [Stat.StatAgility]: 2.85, [Stat.StatStrength]: 1.05, [Stat.StatAttackPower]: 1, - [Stat.StatCritRating]: 1.2, + [Stat.StatCritRating]: 0.9, [Stat.StatHitRating]: 2.21, - [Stat.StatHasteRating]: 1.44, - [Stat.StatMasteryRating]: 1.42, + [Stat.StatHasteRating]: 1.36, + [Stat.StatMasteryRating]: 1.33, [Stat.StatExpertiseRating]: 1.74, }, { - [PseudoStat.PseudoStatMainHandDps]: 4.18, - [PseudoStat.PseudoStatOffHandDps]: 1.4, + [PseudoStat.PseudoStatMainHandDps]: 4.31, + [PseudoStat.PseudoStatOffHandDps]: 1.32, [PseudoStat.PseudoStatSpellHitPercent]: 46, [PseudoStat.PseudoStatPhysicalHitPercent]: 210, }, ), ); +// 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 export const CBAT_4PT12_EP_PRESET = PresetUtils.makePresetEpWeights( 'Combat 4PT12', Stats.fromMap( @@ -48,15 +49,15 @@ export const CBAT_4PT12_EP_PRESET = PresetUtils.makePresetEpWeights( [Stat.StatAgility]: 2.85, [Stat.StatStrength]: 1.05, [Stat.StatAttackPower]: 1, - [Stat.StatCritRating]: 1.2, + [Stat.StatCritRating]: 1.09, [Stat.StatHitRating]: 2.21, - [Stat.StatHasteRating]: 1.44, - [Stat.StatMasteryRating]: 1.44, + [Stat.StatHasteRating]: 1.52, + [Stat.StatMasteryRating]: 1.41, [Stat.StatExpertiseRating]: 1.74, }, { - [PseudoStat.PseudoStatMainHandDps]: 4.18, - [PseudoStat.PseudoStatOffHandDps]: 1.4, + [PseudoStat.PseudoStatMainHandDps]: 4.31, + [PseudoStat.PseudoStatOffHandDps]: 1.32, [PseudoStat.PseudoStatSpellHitPercent]: 46, [PseudoStat.PseudoStatPhysicalHitPercent]: 210, }, diff --git a/ui/rogue/combat/sim.ts b/ui/rogue/combat/sim.ts index 0fcf27f8b1..e4794151b9 100644 --- a/ui/rogue/combat/sim.ts +++ b/ui/rogue/combat/sim.ts @@ -11,14 +11,13 @@ import { RogueOptions_PoisonImbue } from '../../core/proto/rogue'; import { StatCapType } from '../../core/proto/ui'; import { StatCap, Stats, UnitStat } from '../../core/proto_utils/stats'; import * as RogueInputs from '../inputs'; -// import * as CombatInputs from './inputs'; import * as Presets from './presets'; const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { cssClass: 'combat-rogue-sim-ui', cssScheme: PlayerClasses.getCssClass(PlayerClasses.Rogue), // List any known bugs / issues here and they'll be shown on the site. - knownIssues: ['Mastery - Main Gauche is likely rounded down to the closest whole number. You can enable "Show Experimental" via the gear button to optimize reforging for these breakpoints, but it will take significantly longer to complete.'], + knownIssues: ['Mastery - Main Gauche is potentially rounded down to the closest whole number. You can enable "Show Experimental" via the gear button to optimize reforging for these breakpoints, but it will take significantly longer to complete.'], // All stats for which EP should be calculated. epStats: [ @@ -75,10 +74,17 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecCombatRogue, { const meleeHitSoftCapConfig = StatCap.fromPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, { breakpoints: [8, 27], capType: StatCapType.TypeSoftCap, - postCapEPs: [115, 0], + postCapEPs: [110, 0], }); - return [meleeHitSoftCapConfig, spellHitSoftCapConfig]; + const hasteRatingSoftCapConfig = StatCap.fromStat(Stat.StatHasteRating, { + breakpoints: [2070, 2150, 2250], + capType: StatCapType.TypeSoftCap, + // These are set by the active EP weight in the updateSoftCaps callback + postCapEPs: [0, 0, 0], + }) + + return [meleeHitSoftCapConfig, spellHitSoftCapConfig, hasteRatingSoftCapConfig]; })(), other: Presets.OtherDefaults, // Default consumes settings. @@ -208,7 +214,7 @@ const addOrRemoveMasteryBreakpoint = (softCaps: StatCap[], isShown: boolean): vo } else { - softCaps.splice(2, 1); + softCaps.splice(3, 1); } } @@ -219,6 +225,12 @@ export class CombatRogueSimUI extends IndividualSimUI { player.sim.waitForInit().then(() => { new ReforgeOptimizer(this, { updateSoftCaps: (softCaps: StatCap[]) => { + const hasteEP = player.getEpWeights().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] + } + addOrRemoveMasteryBreakpoint(softCaps, this.sim.getShowExperimental()) return softCaps } diff --git a/ui/warlock/affliction/apls/default.apl.json b/ui/warlock/affliction/apls/default.apl.json index 3839dca004..463577194f 100644 --- a/ui/warlock/affliction/apls/default.apl.json +++ b/ui/warlock/affliction/apls/default.apl.json @@ -1,4 +1,5 @@ -{ "type": "TypeAPL", +{ + "type": "TypeAPL", "prepullActions": [ {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-4.0s"}}}, {"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-3.0s"}}}, @@ -10,13 +11,13 @@ {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"136s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"141s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":77801}}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"26s"}}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"itemId":58091}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":92318}}}]}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":33697}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":18540}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}}]}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":33697}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":18540}}}}, {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}}, {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":30108}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotTickFrequency":{"spellId":{"spellId":30108}}},"rhs":{"spellCastTime":{"spellId":{"spellId":30108}}}}}}},"castSpell":{"spellId":{"spellId":30108}}}}, {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":48181}}},"castSpell":{"spellId":{"spellId":48181}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"isExecutePhase":{"threshold":"E25"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":89937}}},"castSpell":{"spellId":{"spellId":77799}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}}, {"action":{"condition":{"isExecutePhase":{"threshold":"E25"}},"channelSpell":{"spellId":{"spellId":1120},"interruptIf":{"const":{"val":"true"}}}}}, {"action":{"castSpell":{"spellId":{"spellId":47897}}}}, {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":74434}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}}}]}},"castSpell":{"spellId":{"spellId":74434}}}}, diff --git a/ui/warlock/affliction/gear_sets/p3.gear.json b/ui/warlock/affliction/gear_sets/p3.gear.json new file mode 100644 index 0000000000..ad13618ea8 --- /dev/null +++ b/ui/warlock/affliction/gear_sets/p3.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + { "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 165 }, + { "id": 71472, "gems": [52207], "reforging": 165 }, + { "id": 71598, "enchant": 4200, "gems": [52207] }, + { "id": 71434, "enchant": 4115, "reforging": 167 }, + { "id": 71597, "enchant": 4102, "gems": [52207, 52207] }, + { "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 }, + { "id": 71614, "enchant": 4107, "gems": [52207, 0], "reforging": 144 }, + { "id": 71613, "gems": [52207, 52207], "reforging": 165 }, + { "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 165 }, + { "id": 71447, "enchant": 4104, "gems": [52207], "reforging": 144 }, + { "id": 71217, "gems": [52207] }, + { "id": 71449, "reforging": 167 }, + { "id": 69110 }, + { "id": 62047, "reforging": 165 }, + { "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207] }, + {}, + { "id": 71575 } + ] +} diff --git a/ui/warlock/affliction/gear_sets/p4_wrath.gear.json b/ui/warlock/affliction/gear_sets/p4_wrath.gear.json deleted file mode 100644 index defb80e9d3..0000000000 --- a/ui/warlock/affliction/gear_sets/p4_wrath.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":51231,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40113]}, - {"id":51234,"enchant":3810,"gems":[40155]}, - {"id":50628,"enchant":3722,"gems":[40155]}, - {"id":51233,"enchant":1144,"gems":[40113,40155]}, - {"id":50651,"enchant":2332,"gems":[40155,0]}, - {"id":51230,"enchant":3604,"gems":[40113,0]}, - {"id":50613,"gems":[40133,40113,40113]}, - {"id":50694,"enchant":3872,"gems":[40113,40133,40155]}, - {"id":50699,"enchant":4223,"gems":[40133,40113]}, - {"id":50398,"gems":[40155]}, - {"id":50664,"gems":[40113]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40155]} -]} diff --git a/ui/warlock/affliction/presets.ts b/ui/warlock/affliction/presets.ts index 892f8b7862..76a45d5085 100644 --- a/ui/warlock/affliction/presets.ts +++ b/ui/warlock/affliction/presets.ts @@ -12,24 +12,22 @@ import { Stats } from '../../core/proto_utils/stats'; import { WARLOCK_BREAKPOINTS } from '../presets'; import DefaultApl from './apls/default.apl.json'; import P1Gear from './gear_sets/p1.gear.json'; -import P4WrathGear from './gear_sets/p4_wrath.gear.json'; +import P3Gear from './gear_sets/p3.gear.json'; import PreraidGear from './gear_sets/preraid.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. -export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/"; - export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear); -export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); -export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP }); +export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear); +export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear); export const APL_Default = PresetUtils.makePresetAPLRotation('Affliction', DefaultApl); // Preset options for EP weights -export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( - 'P1', +export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Default', Stats.fromMap({ [Stat.StatIntellect]: 1.26, [Stat.StatSpellPower]: 1.0, @@ -52,7 +50,7 @@ export const AfflictionTalents = { prime2: PrimeGlyph.GlyphOfUnstableAffliction, prime3: PrimeGlyph.GlyphOfCorruption, major1: MajorGlyph.GlyphOfShadowBolt, - major2: MajorGlyph.GlyphOfLifeTap, + major2: MajorGlyph.GlyphOfSoulLink, major3: MajorGlyph.GlyphOfSoulSwap, minor1: MinorGlyph.GlyphOfDrainSoul, minor2: MinorGlyph.GlyphOfRitualOfSouls, diff --git a/ui/warlock/affliction/sim.ts b/ui/warlock/affliction/sim.ts index 6303b70b03..ca341fd5db 100644 --- a/ui/warlock/affliction/sim.ts +++ b/ui/warlock/affliction/sim.ts @@ -45,7 +45,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, { gear: Presets.P1_PRESET.gear, // Default EP weights for sorting gear in the gear picker. - epWeights: Presets.P1_EP_PRESET.epWeights, + epWeights: Presets.DEFAULT_EP_PRESET.epWeights, // Default stat caps for the Reforge optimizer statCaps: (() => { return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17); @@ -125,14 +125,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, { }, presets: { - epWeights: [Presets.P1_EP_PRESET], + epWeights: [Presets.DEFAULT_EP_PRESET], // Preset talents that the user can quickly select. talents: [Presets.AfflictionTalents], // Preset rotations that the user can quickly select. rotations: [Presets.APL_Default], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET], + gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET], }, autoRotation: (_player: Player): APLRotation => { @@ -155,12 +155,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecAfflictionWarlock, { [Faction.Alliance]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, [Faction.Horde]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, }, otherDefaults: Presets.OtherDefaults, diff --git a/ui/warlock/demonology/apls/default.apl.json b/ui/warlock/demonology/apls/default.apl.json deleted file mode 100644 index a8643985fa..0000000000 --- a/ui/warlock/demonology/apls/default.apl.json +++ /dev/null @@ -1,35 +0,0 @@ -{ "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}}, - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}}]}},"sequence":{"name":"doomguard","actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"spellId":82174}}},{"castSpell":{"spellId":{"spellId":18540}}}]}}}, - {"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59672}}},"castSpell":{"spellId":{"itemId":58091}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"61s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":82174}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}}, - {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":89937}}},"castSpell":{"spellId":{"spellId":77799}}}}, - {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}}, - {"action":{"castSpell":{"spellId":{"spellId":50589}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":17941}}},"castSpell":{"spellId":{"spellId":686}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":71165}}},"castSpell":{"spellId":{"spellId":29722}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":63167}}},"castSpell":{"spellId":{"spellId":6353}}}}, - {"action":{"castSpell":{"spellId":{"spellId":686}}}}, - {"action":{"castSpell":{"spellId":{"spellId":1454}}}} - ] -} diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json new file mode 100644 index 0000000000..61f7468000 --- /dev/null +++ b/ui/warlock/demonology/apls/incinerate.apl.json @@ -0,0 +1,43 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":29722}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":58183}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":56290}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":52353}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":68998}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":69000}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.7s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":90953}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92318}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91047}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":89091}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90898}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91002}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90992}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91024}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91024}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":90985}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":91024}}}]}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"3s"}}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":18540}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59672}}},"castSpell":{"spellId":{"itemId":58091}}}}, + {"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":59672}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":77801}}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"60"}}}}]}},"castSpell":{"spellId":{"spellId":59672}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":77801}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":59672}}},"rhs":{"remainingTime":{}}}}]}},"castSpell":{"spellId":{"spellId":77801}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":77801}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":59672}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"30"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}}, + {"action":{"castSpell":{"spellId":{"spellId":50589}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":71165}}},{"auraIsActive":{"auraId":{"spellId":71165}}}]}},"castSpell":{"spellId":{"spellId":29722}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":63167}}},{"auraIsActive":{"auraId":{"spellId":63167}}}]}},"castSpell":{"spellId":{"spellId":6353}}}}, + {"action":{"castSpell":{"spellId":{"spellId":29722}}}}, + {"action":{"castSpell":{"spellId":{"spellId":1454}}}} + ] +} diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json new file mode 100644 index 0000000000..17a7f25842 --- /dev/null +++ b/ui/warlock/demonology/apls/shadow-bolt.apl.json @@ -0,0 +1,42 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.0s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":58183}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":56290}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":52353}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":68998}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":69000}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-0.7s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.7s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":90953}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":92318}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92318}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91047}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":89091}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90898}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90898}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":91002}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":90992}}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":92320}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":90898}}},{"auraIsActive":{"auraId":{"spellId":92318}}},{"auraIsActive":{"auraId":{"spellId":91047}}},{"auraIsActive":{"auraId":{"spellId":90992}}},{"auraIsActive":{"auraId":{"spellId":91002}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":92325}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":90985}}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"auraId":{"spellId":92320}}}]}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"3s"}}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":18540}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}}, + {"action":{"condition":{"and":{}},"sequence":{"name":"burst","actions":[{"castSpell":{"spellId":{"spellId":77801}}},{"castSpell":{"spellId":{"spellId":74434}}},{"castSpell":{"spellId":{"spellId":691}}},{"castSpell":{"spellId":{"spellId":59672}}},{"castSpell":{"spellId":{"spellId":603}}},{"castSpell":{"spellId":{"spellId":348}}},{"castSpell":{"spellId":{"spellId":172}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"burst"}},{"spellCanCast":{"spellId":{"spellId":77801}}},{"spellCanCast":{"spellId":{"spellId":59672}}}]}},"resetSequence":{"sequenceName":"burst"}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":59672}}},{"auraIsKnown":{"auraId":{"spellId":59672}}}]}},"castSpell":{"spellId":{"itemId":58091}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"67000"}}}},{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":1454}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"const":{"val":"121s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"sequenceTimeToReady":{"sequenceName":"burst"}},"rhs":{"spellCastTime":{"spellId":{"spellId":30146}}}}},{"cmp":{"op":"OpLe","lhs":{"spellCpm":{"spellId":{"spellId":30146}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":30146}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},"castSpell":{"spellId":{"spellId":348}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":71521}}},"castSpell":{"spellId":{"spellId":71521}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":603}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":603}}}}, + {"action":{"castSpell":{"spellId":{"spellId":50589}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17941}}},{"auraIsActive":{"auraId":{"spellId":17941}}}]}},"castSpell":{"spellId":{"spellId":686}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":71165}}},{"auraIsActive":{"auraId":{"spellId":71165}}}]}},"castSpell":{"spellId":{"spellId":29722}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":63167}}},{"auraIsActive":{"auraId":{"spellId":63167}}}]}},"castSpell":{"spellId":{"spellId":6353}}}}, + {"action":{"castSpell":{"spellId":{"spellId":686}}}}, + {"action":{"castSpell":{"spellId":{"spellId":1454}}}} + ] +} diff --git a/ui/warlock/demonology/gear_sets/p3.gear.json b/ui/warlock/demonology/gear_sets/p3.gear.json new file mode 100644 index 0000000000..08473d114a --- /dev/null +++ b/ui/warlock/demonology/gear_sets/p3.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + { "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 151 }, + { "id": 71472, "gems": [52207], "reforging": 165 }, + { "id": 71598, "enchant": 4200, "gems": [52207], "reforging": 154 }, + { "id": 71434, "enchant": 4115, "reforging": 144 }, + { "id": 71597, "enchant": 4102, "gems": [52207, 52207], "reforging": 154 }, + { "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 }, + { "id": 71614, "enchant": 4107, "gems": [52207, 0], "reforging": 147 }, + { "id": 71613, "gems": [52207, 52207], "reforging": 151 }, + { "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 144 }, + { "id": 71447, "enchant": 4104, "gems": [52207], "reforging": 144 }, + { "id": 71217, "gems": [52207] }, + { "id": 71449, "reforging": 144 }, + { "id": 69110 }, + { "id": 62047, "reforging": 165 }, + { "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207], "reforging": 154 }, + {}, + { "id": 71473, "reforging": 144 } + ] +} diff --git a/ui/warlock/demonology/gear_sets/p4_wrath.gear.json b/ui/warlock/demonology/gear_sets/p4_wrath.gear.json deleted file mode 100644 index d6da3c5752..0000000000 --- a/ui/warlock/demonology/gear_sets/p4_wrath.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":51231,"enchant":3820,"gems":[41285,40133]}, - {"id":50658,"gems":[40153]}, - {"id":51234,"enchant":3810,"gems":[40153]}, - {"id":50668,"enchant":3722,"gems":[40133]}, - {"id":50717,"enchant":1144,"gems":[40133,40113,40153]}, - {"id":50686,"enchant":2332,"gems":[40133,0]}, - {"id":51230,"enchant":3604,"gems":[40133,0]}, - {"id":50702,"gems":[40153,40113,40113]}, - {"id":51232,"enchant":3872,"gems":[40113,40113]}, - {"id":50699,"enchant":4223,"gems":[40133,40113]}, - {"id":50398,"gems":[40153]}, - {"id":50636,"gems":[40153]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50635}, - {"id":50631,"gems":[40153]} -]} diff --git a/ui/warlock/demonology/gear_sets/preraid.gear.json b/ui/warlock/demonology/gear_sets/preraid.gear.json index 9c35c9c159..d7e5b6b2a5 100644 --- a/ui/warlock/demonology/gear_sets/preraid.gear.json +++ b/ui/warlock/demonology/gear_sets/preraid.gear.json @@ -1,3 +1 @@ -{"items": [ - ]} - \ No newline at end of file +{ "items": [] } diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts index 3f00f46458..f2a42b8bcc 100644 --- a/ui/warlock/demonology/presets.ts +++ b/ui/warlock/demonology/presets.ts @@ -23,26 +23,26 @@ import { } from '../../core/proto/warlock'; import { Stats, UnitStat } from '../../core/proto_utils/stats'; import { WARLOCK_BREAKPOINTS } from '../presets'; -import DefaultApl from './apls/default.apl.json'; +import IncinerateAPL from './apls/incinerate.apl.json'; +import ShadowBoltAPL from './apls/shadow-bolt.apl.json'; import P1Gear from './gear_sets/p1.gear.json'; -import P4WrathGear from './gear_sets/p4_wrath.gear.json'; +import P3Gear from './gear_sets/p3.gear.json'; import PreraidGear from './gear_sets/preraid.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. -export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/"; +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear); +export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear); -export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear); -export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); -export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP }); - -export const APL_Default = PresetUtils.makePresetAPLRotation('Demo', DefaultApl); +export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', ShadowBoltAPL); +export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL); // Preset options for EP weights -export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( - 'P1', +export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Default', Stats.fromMap({ [Stat.StatIntellect]: 1.27, [Stat.StatSpellPower]: 1.0, @@ -56,8 +56,8 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( // Default talents. Uses the wowhead calculator format, make the talents on // https://wotlk.wowhead.com/talent-calc and copy the numbers in the url. -export const DemonologyTalents = { - name: 'Demonology', +export const DemonologyTalentsShadowBolt = { + name: 'Shadow bolt', data: SavedTalents.create({ talentsString: '-3312222300310212211-33202', glyphs: Glyphs.create({ @@ -66,6 +66,23 @@ export const DemonologyTalents = { prime3: PrimeGlyph.GlyphOfMetamorphosis, major1: MajorGlyph.GlyphOfShadowBolt, major2: MajorGlyph.GlyphOfLifeTap, + major3: MajorGlyph.GlyphOfFelhunter, + minor1: MinorGlyph.GlyphOfDrainSoul, + minor2: MinorGlyph.GlyphOfRitualOfSouls, + minor3: MinorGlyph.GlyphOfUnendingBreath, + }), + }), +}; +export const DemonologyTalentsIncinerate = { + name: 'Incinerate', + data: SavedTalents.create({ + talentsString: '003-3312222300310212211-03202', + glyphs: Glyphs.create({ + prime1: PrimeGlyph.GlyphOfImmolate, + prime2: PrimeGlyph.GlyphOfIncinerate, + prime3: PrimeGlyph.GlyphOfMetamorphosis, + major1: MajorGlyph.GlyphOfSoulstone, + major2: MajorGlyph.GlyphOfLifeTap, major3: MajorGlyph.GlyphOfSoulLink, minor1: MinorGlyph.GlyphOfDrainSoul, minor2: MinorGlyph.GlyphOfRitualOfSouls, @@ -134,6 +151,16 @@ export const OtherDefaults = { darkIntentUptime: 90, }; +export const PRESET_BUILD_SHADOWBOLT = PresetUtils.makePresetBuild('Shadow Bolt', { + talents: DemonologyTalentsShadowBolt, + rotation: APL_ShadowBolt, +}); + +export const PRESET_BUILD_INCINERATE = PresetUtils.makePresetBuild('Incinerate', { + talents: DemonologyTalentsIncinerate, + rotation: APL_Incinerate, +}); + export const DEMONOLOGY_BREAKPOINTS = [ { unitStat: UnitStat.fromPseudoStat(PseudoStat.PseudoStatSpellHastePercent), diff --git a/ui/warlock/demonology/sim.ts b/ui/warlock/demonology/sim.ts index dfb3a354d1..d810409aa9 100644 --- a/ui/warlock/demonology/sim.ts +++ b/ui/warlock/demonology/sim.ts @@ -24,20 +24,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, { epReferenceStat: Stat.StatSpellPower, // Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar. displayStats: UnitStat.createDisplayStatArray( - [ - Stat.StatHealth, - Stat.StatMana, - Stat.StatStamina, - Stat.StatIntellect, - Stat.StatSpellPower, - Stat.StatMasteryRating, - Stat.StatMP5, - ], - [ - PseudoStat.PseudoStatSpellHitPercent, - PseudoStat.PseudoStatSpellCritPercent, - PseudoStat.PseudoStatSpellHastePercent, - ], + [Stat.StatHealth, Stat.StatMana, Stat.StatStamina, Stat.StatIntellect, Stat.StatSpellPower, Stat.StatMasteryRating, Stat.StatMP5], + [PseudoStat.PseudoStatSpellHitPercent, PseudoStat.PseudoStatSpellCritPercent, PseudoStat.PseudoStatSpellHastePercent], ), defaults: { @@ -45,7 +33,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, { gear: Presets.P1_PRESET.gear, // Default EP weights for sorting gear in the gear picker. - epWeights: Presets.P1_EP_PRESET.epWeights, + epWeights: Presets.DEFAULT_EP_PRESET.epWeights, // Default stat caps for the Reforge optimizer statCaps: (() => { return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17); @@ -79,7 +67,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, { consumes: Presets.DefaultConsumes, // Default talents. - talents: Presets.DemonologyTalents.data, + talents: Presets.DemonologyTalentsShadowBolt.data, // Default spec-specific settings. specOptions: Presets.DefaultOptions, @@ -132,24 +120,26 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, { }, presets: { - epWeights: [Presets.P1_EP_PRESET], + epWeights: [Presets.DEFAULT_EP_PRESET], // Preset talents that the user can quickly select. - talents: [Presets.DemonologyTalents], + talents: [Presets.DemonologyTalentsShadowBolt, Presets.DemonologyTalentsIncinerate], // Preset rotations that the user can quickly select. - rotations: [Presets.APL_Default], + rotations: [Presets.APL_ShadowBolt, Presets.APL_Incinerate], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET], + gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET], + + builds: [Presets.PRESET_BUILD_SHADOWBOLT, Presets.PRESET_BUILD_INCINERATE], }, autoRotation: (_player: Player): APLRotation => { - return Presets.APL_Default.rotation.rotation!; + return Presets.APL_ShadowBolt.rotation.rotation!; }, raidSimPresets: [ { spec: Spec.SpecDemonologyWarlock, - talents: Presets.DemonologyTalents.data, + talents: Presets.DemonologyTalentsShadowBolt.data, specOptions: Presets.DefaultOptions, consumes: Presets.DefaultConsumes, defaultFactionRaces: { @@ -162,12 +152,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, { [Faction.Alliance]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, [Faction.Horde]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, }, otherDefaults: Presets.OtherDefaults, diff --git a/ui/warlock/destruction/apls/default.apl.json b/ui/warlock/destruction/apls/default.apl.json index c73b18d80f..528f6f1e01 100644 --- a/ui/warlock/destruction/apls/default.apl.json +++ b/ui/warlock/destruction/apls/default.apl.json @@ -1,151 +1,26 @@ { "type": "TypeAPL", "prepullActions": [ - { "action": { "castSpell": { "spellId": { "spellId": 74434 } } }, "doAtValue": { "const": { "val": "-8.0s" } } }, - { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-2.5s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 29722 } } }, "doAtValue": { "const": { "val": "-2.5s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 6353 } } }, "doAtValue": { "const": { "val": "-0.5s" } } } + {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-8.0s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":29722}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":6353}}},"doAtValue":{"const":{"val":"-0.5s"}}} ], "priorityList": [ - { "action": { "autocastOtherCooldowns": {} } }, - { - "action": { - "condition": { - "or": { - "vals": [{ "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } }, { "spellCanCast": { "spellId": { "spellId": 77801 } } }] - } - }, - "castSpell": { "spellId": { "spellId": 77801 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 74241 } } }, - { "auraIsActive": { "auraId": { "spellId": 89091 } } }, - { "auraIsActive": { "auraId": { "spellId": 75170 } } } - ] - } - }, - "sequence": { "name": "Doomguard", "actions": [{ "castSpell": { "spellId": { "spellId": 18540 } } }] } - } - }, - { "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 74434 } } }, "castSpell": { "spellId": { "spellId": 74434 } } } }, - { - "action": { - "condition": { - "or": { - "vals": [ - { "auraIsActive": { "auraId": { "spellId": 74434 } } }, - { "auraIsActive": { "auraId": { "spellId": 47221 } } }, - { "cmp": { "op": "OpLt", "lhs": { "auraRemainingTime": { "auraId": { "spellId": 18120 } } }, "rhs": { "const": { "val": "3s" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 6353 } } - } - }, - { - "action": { - "condition": { - "cmp": { - "op": "OpLt", - "lhs": { "dotRemainingTime": { "spellId": { "spellId": 603 } } }, - "rhs": { "dotTickFrequency": { "spellId": { "spellId": 603 } } } - } - }, - "castSpell": { "spellId": { "spellId": 603 } } - } - }, - { - "action": { - "condition": { - "or": { - "vals": [ - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } }, - "rhs": { - "math": { - "op": "OpAdd", - "lhs": { "spellCastTime": { "spellId": { "spellId": 348 } } }, - "rhs": { "dotTickFrequency": { "spellId": { "spellId": 348, "tag": 1 } } } - } - } - } - }, - { "cmp": { "op": "OpGt", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "5s" } } } } - ] - } - }, - { - "and": { - "vals": [ - { - "cmp": { - "op": "OpLt", - "lhs": { "auraRemainingTime": { "auraId": { "spellId": 2825, "tag": -1 } } }, - "rhs": { "const": { "val": "2s" } } - } - }, - { - "cmp": { - "op": "OpLt", - "lhs": { "dotRemainingTime": { "spellId": { "spellId": 348, "tag": 1 } } }, - "rhs": { "const": { "val": "12s" } } - } - }, - { "auraIsActive": { "auraId": { "spellId": 2825, "tag": -1 } } } - ] - } - } - ] - } - }, - "castSpell": { "spellId": { "spellId": 348 } } - } - }, - { "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 17962 } } }, "castSpell": { "spellId": { "spellId": 17962 } } } }, - { - "action": { - "condition": { - "cmp": { - "op": "OpLt", - "lhs": { "dotRemainingTime": { "spellId": { "spellId": 172 } } }, - "rhs": { "dotTickFrequency": { "spellId": { "spellId": 172 } } } - } - }, - "castSpell": { "spellId": { "spellId": 172 } } - } - }, - { "action": { "condition": { "spellIsReady": { "spellId": { "spellId": 50796 } } }, "castSpell": { "spellId": { "spellId": 50796 } } } }, - { "action": { "condition": { "spellCanCast": { "spellId": { "spellId": 47897 } } }, "castSpell": { "spellId": { "spellId": 47897 } } } }, - { - "action": { - "condition": { "and": { "vals": [{ "isExecutePhase": { "threshold": "E20" } }, { "spellCanCast": { "spellId": { "spellId": 17877 } } }] } }, - "castSpell": { "spellId": { "spellId": 17877 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { "auraIsKnown": { "auraId": { "spellId": 89937 } } }, - { "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 89937 } } }, "rhs": { "const": { "val": "1" } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 77799 } } - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 29722 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 1454 } } } } + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}},{"spellCanCast":{"spellId":{"spellId":77801}}}]}},"castSpell":{"spellId":{"spellId":77801}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":74241}}},{"auraIsActive":{"auraId":{"spellId":89091}}},{"auraIsActive":{"auraId":{"spellId":75170}}}]}},"sequence":{"name":"Doomguard","actions":[{"castSpell":{"spellId":{"spellId":18540}}}]}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":74434}}},"castSpell":{"spellId":{"spellId":74434}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":74434}}},{"auraIsActive":{"auraId":{"spellId":47221}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":18120}}},"rhs":{"const":{"val":"3s"}}}}]}},"castSpell":{"spellId":{"spellId":6353}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":348}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":348,"tag":1}}}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":2825,"tag":-1}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":348,"tag":1}}},"rhs":{"const":{"val":"12s"}}}},{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}]}}]}},"castSpell":{"spellId":{"spellId":348}}}}, + {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":17962}}},"castSpell":{"spellId":{"spellId":17962}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":603}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":603}}}}},"castSpell":{"spellId":{"spellId":603}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":172}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":172}}}}},"castSpell":{"spellId":{"spellId":172}}}}, + {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":47897}}},"castSpell":{"spellId":{"spellId":47897}}}}, + {"action":{"condition":{"and":{"vals":[{"isExecutePhase":{"threshold":"E20"}},{"spellCanCast":{"spellId":{"spellId":17877}}}]}},"castSpell":{"spellId":{"spellId":17877}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":50796}}},{"auraIsInactiveWithReactionTime":{"auraId":{"spellId":54277}}}]}},"castSpell":{"spellId":{"spellId":50796}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":89937}}},{"auraIsActive":{"auraId":{"spellId":89937}}}]}},"castSpell":{"spellId":{"spellId":77799}}}}, + {"action":{"castSpell":{"spellId":{"spellId":29722}}}}, + {"action":{"castSpell":{"spellId":{"spellId":1454}}}} ] } diff --git a/ui/warlock/destruction/gear_sets/p3.gear.json b/ui/warlock/destruction/gear_sets/p3.gear.json new file mode 100644 index 0000000000..911cc46e0e --- /dev/null +++ b/ui/warlock/destruction/gear_sets/p3.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + { "id": 71595, "enchant": 4207, "gems": [68780, 52207], "reforging": 165 }, + { "id": 71472, "gems": [52207], "reforging": 165 }, + { "id": 71598, "enchant": 4200, "gems": [52208] }, + { "id": 71434, "enchant": 4115, "reforging": 144 }, + { "id": 71597, "enchant": 4102, "gems": [52208, 52217] }, + { "id": 71471, "enchant": 4257, "gems": [0], "reforging": 144 }, + { "id": 71614, "enchant": 4068, "gems": [52207, 0], "reforging": 144 }, + { "id": 71613, "gems": [52207, 52207], "reforging": 165 }, + { "id": 71596, "enchant": 4112, "gems": [52207, 52207], "reforging": 165 }, + { "id": 71447, "enchant": 4104, "gems": [52208], "reforging": 144 }, + { "id": 71217, "gems": [52207] }, + { "id": 71449, "reforging": 165 }, + { "id": 69110 }, + { "id": 62047, "reforging": 167 }, + { "id": 71086, "enchant": 4097, "gems": [52207, 52207, 52207] }, + {}, + { "id": 71575, "reforging": 137 } + ] +} diff --git a/ui/warlock/destruction/gear_sets/p4_wrath.gear.json b/ui/warlock/destruction/gear_sets/p4_wrath.gear.json deleted file mode 100644 index a1c24a9a8f..0000000000 --- a/ui/warlock/destruction/gear_sets/p4_wrath.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":51231,"enchant":3820,"gems":[41285,40133]}, - {"id":50658,"gems":[40153]}, - {"id":51234,"enchant":3810,"gems":[40152]}, - {"id":50628,"enchant":3722,"gems":[40152]}, - {"id":51233,"enchant":3832,"gems":[40113,40155]}, - {"id":50651,"enchant":2332,"gems":[40155,0]}, - {"id":51230,"enchant":3604,"gems":[40113,0]}, - {"id":50613,"gems":[40133,40113,40113]}, - {"id":50694,"enchant":3719,"gems":[40113,40113,40113]}, - {"id":50699,"enchant":4223,"gems":[40133,40113]}, - {"id":50664,"gems":[40113]}, - {"id":50398,"gems":[40155]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40153]} -]} diff --git a/ui/warlock/destruction/presets.ts b/ui/warlock/destruction/presets.ts index 922934aca0..cdedf09fa6 100644 --- a/ui/warlock/destruction/presets.ts +++ b/ui/warlock/destruction/presets.ts @@ -12,7 +12,7 @@ import { Stats } from '../../core/proto_utils/stats'; import { WARLOCK_BREAKPOINTS } from '../presets'; import DefaultApl from './apls/default.apl.json'; import P1Gear from './gear_sets/p1.gear.json'; -import P4WrathGear from './gear_sets/p4_wrath.gear.json'; +import P3Gear from './gear_sets/p3.gear.json'; import PreraidGear from './gear_sets/preraid.gear.json'; // Preset options for this spec. @@ -21,15 +21,15 @@ import PreraidGear from './gear_sets/preraid.gear.json'; export const BIS_TOOLTIP = "This gear preset is inspired from Zephan's Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/"; -export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear); -export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); -export const P4_WOTLK_PRESET = PresetUtils.makePresetGear('P4 Wrath', P4WrathGear, { tooltip: BIS_TOOLTIP }); +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear); +export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear); -export const APL_Default = PresetUtils.makePresetAPLRotation('Destro', DefaultApl); +export const DEFAULT_APL = PresetUtils.makePresetAPLRotation('Default', DefaultApl); // Preset options for EP weights -export const P1_EP_PRESET = PresetUtils.makePresetEpWeights( - 'P1', +export const DEFAULT_EP_PRESET = PresetUtils.makePresetEpWeights( + 'Default', Stats.fromMap({ [Stat.StatIntellect]: 1.25, [Stat.StatSpellPower]: 1, diff --git a/ui/warlock/destruction/sim.ts b/ui/warlock/destruction/sim.ts index f852f12529..643c5c67f8 100644 --- a/ui/warlock/destruction/sim.ts +++ b/ui/warlock/destruction/sim.ts @@ -1,7 +1,6 @@ import * as BuffDebuffInputs from '../../core/components/inputs/buffs_debuffs'; import * as OtherInputs from '../../core/components/inputs/other_inputs'; import { ReforgeOptimizer } from '../../core/components/suggest_reforges_action'; -import * as Mechanics from '../../core/constants/mechanics.js'; import { IndividualSimUI, registerSpecConfig } from '../../core/individual_sim_ui'; import { Player } from '../../core/player'; import { PlayerClasses } from '../../core/player_classes'; @@ -23,20 +22,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, { epReferenceStat: Stat.StatSpellPower, // Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar. displayStats: UnitStat.createDisplayStatArray( - [ - Stat.StatHealth, - Stat.StatMana, - Stat.StatStamina, - Stat.StatIntellect, - Stat.StatSpellPower, - Stat.StatMasteryRating, - Stat.StatMP5, - ], - [ - PseudoStat.PseudoStatSpellHitPercent, - PseudoStat.PseudoStatSpellCritPercent, - PseudoStat.PseudoStatSpellHastePercent, - ], + [Stat.StatHealth, Stat.StatMana, Stat.StatStamina, Stat.StatIntellect, Stat.StatSpellPower, Stat.StatMasteryRating, Stat.StatMP5], + [PseudoStat.PseudoStatSpellHitPercent, PseudoStat.PseudoStatSpellCritPercent, PseudoStat.PseudoStatSpellHastePercent], ), defaults: { @@ -44,7 +31,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, { gear: Presets.P1_PRESET.gear, // Default EP weights for sorting gear in the gear picker. - epWeights: Presets.P1_EP_PRESET.epWeights, + epWeights: Presets.DEFAULT_EP_PRESET.epWeights, // Default stat caps for the Reforge optimizer statCaps: (() => { return new Stats().withPseudoStat(PseudoStat.PseudoStatSpellHitPercent, 17); @@ -104,18 +91,18 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, { }, presets: { - epWeights: [Presets.P1_EP_PRESET], + epWeights: [Presets.DEFAULT_EP_PRESET], // Preset talents that the user can quickly select. talents: [Presets.DestructionTalents], // Preset rotations that the user can quickly select. - rotations: [Presets.APL_Default], + rotations: [Presets.DEFAULT_APL], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P4_WOTLK_PRESET], + gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET], }, autoRotation: (_player: Player): APLRotation => { - return Presets.APL_Default.rotation.rotation!; + return Presets.DEFAULT_APL.rotation.rotation!; }, raidSimPresets: [ @@ -134,12 +121,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDestructionWarlock, { [Faction.Alliance]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, [Faction.Horde]: { 1: Presets.PRERAID_PRESET.gear, 2: Presets.P1_PRESET.gear, - 3: Presets.P4_WOTLK_PRESET.gear, + 3: Presets.P3_PRESET.gear, }, }, otherDefaults: Presets.OtherDefaults,