diff --git a/assets/database/db.bin b/assets/database/db.bin index 45d483d4a0..5965780d9e 100644 Binary files a/assets/database/db.bin and b/assets/database/db.bin differ diff --git a/assets/database/db.json b/assets/database/db.json index 0e64313837..e63a2bc5fd 100644 --- a/assets/database/db.json +++ b/assets/database/db.json @@ -10677,6 +10677,7 @@ {"id":26022,"name":"Pursuit of Justice","icon":"spell_holy_persuitofjustice"}, {"id":26023,"name":"Pursuit of Justice","icon":"spell_holy_persuitofjustice"}, {"id":26279,"name":"Stormshroud Gloves","icon":"inv_gauntlets_05"}, +{"id":26297,"name":"Berserking","icon":"racial_troll_berserk"}, {"id":26889,"name":"Vanish","icon":"ability_vanish"}, {"id":26982,"name":"Rejuvenation","icon":"spell_nature_rejuvenation"}, {"id":27013,"name":"Insect Swarm","icon":"spell_nature_insectswarm"}, @@ -10719,6 +10720,7 @@ {"id":28574,"name":"Arcane Fortitude","icon":"spell_arcane_arcaneresilience"}, {"id":28592,"name":"Winter's Chill","icon":"spell_frost_chillingblast"}, {"id":28593,"name":"Winter's Chill","icon":"spell_frost_chillingblast"}, +{"id":28730,"name":"Arcane Torrent","icon":"spell_shadow_teleport"}, {"id":28996,"name":"Elemental Warding","icon":"spell_nature_spiritarmor"}, {"id":28997,"name":"Elemental Warding","icon":"spell_nature_spiritarmor"}, {"id":28998,"name":"Elemental Warding","icon":"spell_nature_spiritarmor"}, @@ -11227,8 +11229,10 @@ {"id":42897,"name":"Arcane Blast","icon":"spell_arcane_blast"}, {"id":42914,"name":"Ice Lance","icon":"spell_frost_frostblast"}, {"id":42921,"name":"Arcane Explosion","icon":"spell_nature_wispsplode"}, +{"id":42925,"name":"Flamestrike","icon":"spell_fire_selfdestruct"}, {"id":42926,"name":"Flamestrike","icon":"spell_fire_selfdestruct"}, -{"id":42939,"name":"Blizzard","icon":"spell_frost_icestorm"}, +{"id":42938,"name":"Blizzard","icon":"spell_frost_icestorm"}, +{"id":42940,"name":"Blizzard","icon":"spell_frost_icestorm"}, {"id":42974,"name":"Enchant Weapon - Executioner","icon":"inv_enchant_formulasuperior_01"}, {"id":43002,"name":"Arcane Brilliance","icon":"spell_holy_arcaneintellect"}, {"id":43338,"name":"Shamanistic Focus","icon":"spell_nature_elementalabsorption"}, @@ -12177,7 +12181,6 @@ {"id":55236,"name":"Outbreak","icon":"spell_shadow_plaguecloud"}, {"id":55237,"name":"Outbreak","icon":"spell_shadow_plaguecloud"}, {"id":55243,"name":"Bracers of Deflection","icon":"inv_bracer_10"}, -{"id":55268,"name":"Frost Strike","icon":"spell_deathknight_empowerruneblade2"}, {"id":55298,"name":"Vengeance Bindings","icon":"inv_bracer_09"}, {"id":55300,"name":"Righteous Gauntlets","icon":"inv_gauntlets_26"}, {"id":55301,"name":"Daunting Handguards","icon":"inv_gauntlets_26"}, diff --git a/sim/common/wotlk/capacitors.go b/sim/common/wotlk/capacitors.go index b2ff4ecea7..e06b25df58 100644 --- a/sim/common/wotlk/capacitors.go +++ b/sim/common/wotlk/capacitors.go @@ -101,7 +101,7 @@ func init() { MaxStacks: 3, Trigger: core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, Outcome: core.OutcomeCrit, ICD: time.Millisecond * 2000, ActionID: core.ActionID{ItemID: 47182}, @@ -116,7 +116,7 @@ func init() { MaxStacks: 3, Trigger: core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, Outcome: core.OutcomeCrit, ICD: time.Millisecond * 2000, ActionID: core.ActionID{ItemID: 47188}, @@ -134,7 +134,7 @@ func init() { MaxStacks: 3, Trigger: core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, Outcome: core.OutcomeCrit, ICD: time.Millisecond * 2000, ActionID: core.ActionID{ItemID: 47316}, @@ -149,7 +149,7 @@ func init() { MaxStacks: 3, Trigger: core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, Outcome: core.OutcomeCrit, ICD: time.Millisecond * 2000, ActionID: core.ActionID{ItemID: 47477}, diff --git a/sim/common/wotlk/nibelung.go b/sim/common/wotlk/nibelung.go index a2b2e058f9..463f99e568 100644 --- a/sim/common/wotlk/nibelung.go +++ b/sim/common/wotlk/nibelung.go @@ -102,19 +102,15 @@ func MakeNibelungTriggerAura(agent core.Agent, isHeroic bool) { }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Nibelung Proc", - Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrProc, - Harmful: true, - ProcChance: 0.02, - ICD: time.Millisecond * 250, - ActionID: core.ActionID{SpellID: procSpellId}, + Name: "Nibelung Proc", + Callback: core.CallbackOnCastComplete, + ProcMask: core.ProcMaskSpellOrProc, + ProcMaskExclude: core.ProcMaskNotInSpellbook, + Harmful: true, + ProcChance: 0.02, + ICD: time.Millisecond * 250, + ActionID: core.ActionID{SpellID: procSpellId}, Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) { - // dummy proc spell can't proc nibelung - if spell == spell.Unit.GetDummyProcSpell() { - return - } - for _, petAgent := range character.PetAgents { if valkyr, ok := petAgent.(*ValkyrPet); ok && !valkyr.IsEnabled() { valkyr.registerSmite(isHeroic) diff --git a/sim/common/wotlk/stat_bonus_stacking.go b/sim/common/wotlk/stat_bonus_stacking.go index 0c4078b775..e134d46125 100644 --- a/sim/common/wotlk/stat_bonus_stacking.go +++ b/sim/common/wotlk/stat_bonus_stacking.go @@ -366,7 +366,7 @@ func init() { Bonus: stats.Stats{stats.MeleeHaste: 57, stats.SpellHaste: 57}, CD: time.Minute * 2, Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, }) newStackingStatBonusCD(StackingStatBonusCD{ Name: "Talisman of Volatile Power H", @@ -377,7 +377,7 @@ func init() { Bonus: stats.Stats{stats.MeleeHaste: 64, stats.SpellHaste: 64}, CD: time.Minute * 2, Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, }) newStackingStatBonusCD(StackingStatBonusCD{ Name: "Fervor of the Frostborn", @@ -434,7 +434,7 @@ func init() { Bonus: stats.Stats{stats.MeleeHaste: 57, stats.SpellHaste: 57}, CD: time.Minute * 2, Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, }) newStackingStatBonusCD(StackingStatBonusCD{ Name: "Fetish of Volatile Power H", @@ -445,7 +445,7 @@ func init() { Bonus: stats.Stats{stats.MeleeHaste: 64, stats.SpellHaste: 64}, CD: time.Minute * 2, Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, }) newStackingStatBonusCD(StackingStatBonusCD{ Name: "Binding Stone", diff --git a/sim/core/apl_actions_casting.go b/sim/core/apl_actions_casting.go index 39280c3eaf..dd17d23907 100644 --- a/sim/core/apl_actions_casting.go +++ b/sim/core/apl_actions_casting.go @@ -2,7 +2,6 @@ package core import ( "fmt" - "github.com/wowsims/wotlk/sim/core/proto" ) diff --git a/sim/core/aura_helpers.go b/sim/core/aura_helpers.go index a4ac0e16f4..756c697985 100644 --- a/sim/core/aura_helpers.go +++ b/sim/core/aura_helpers.go @@ -28,18 +28,19 @@ const ( type ProcHandler func(sim *Simulation, spell *Spell, result *SpellResult) type ProcTrigger struct { - Name string - ActionID ActionID - Duration time.Duration - Callback AuraCallback - ProcMask ProcMask - SpellFlags SpellFlag - Outcome HitOutcome - Harmful bool - ProcChance float64 - PPM float64 - ICD time.Duration - Handler ProcHandler + Name string + ActionID ActionID + Duration time.Duration + Callback AuraCallback + ProcMask ProcMask + ProcMaskExclude ProcMask + SpellFlags SpellFlag + Outcome HitOutcome + Harmful bool + ProcChance float64 + PPM float64 + ICD time.Duration + Handler ProcHandler } func ApplyProcTriggerCallback(unit *Unit, aura *Aura, config ProcTrigger) { @@ -62,6 +63,9 @@ func ApplyProcTriggerCallback(unit *Unit, aura *Aura, config ProcTrigger) { if config.SpellFlags != SpellFlagNone && !spell.Flags.Matches(config.SpellFlags) { return } + if config.ProcMaskExclude != ProcMaskUnknown && spell.ProcMask.Matches(config.ProcMaskExclude) { + return + } if config.ProcMask != ProcMaskUnknown && !spell.ProcMask.Matches(config.ProcMask) { return } @@ -113,6 +117,9 @@ func ApplyProcTriggerCallback(unit *Unit, aura *Aura, config ProcTrigger) { if config.ProcMask != ProcMaskUnknown && !spell.ProcMask.Matches(config.ProcMask) { return } + if config.ProcMaskExclude != ProcMaskUnknown && spell.ProcMask.Matches(config.ProcMaskExclude) { + return + } if icd.Duration != 0 && !icd.IsReady(sim) { return } diff --git a/sim/core/cast.go b/sim/core/cast.go index 8deccda11b..6a1964f15d 100644 --- a/sim/core/cast.go +++ b/sim/core/cast.go @@ -226,7 +226,7 @@ func (spell *Spell) makeCastFuncSimple() CastSuccessFunc { if sim.Log != nil && !spell.Flags.Matches(SpellFlagNoLogs) { spell.Unit.Log(sim, "Casting %s (Cost = %0.03f, Cast Time = %s, Effective Time = %s)", - spell.ActionID, 0, 0, 0) + spell.ActionID, 0.0, "0s", "0s") spell.Unit.Log(sim, "Completed cast %s", spell.ActionID) } @@ -244,7 +244,7 @@ func (spell *Spell) makeCastFuncAutosOrProcs() CastSuccessFunc { return func(sim *Simulation, target *Unit) bool { if sim.Log != nil && !spell.Flags.Matches(SpellFlagNoLogs) { spell.Unit.Log(sim, "Casting %s (Cost = %0.03f, Cast Time = %s, Effective Time = %s)", - spell.ActionID, 0, 0, 0) + spell.ActionID, 0.0, "0s", "0s") spell.Unit.Log(sim, "Completed cast %s", spell.ActionID) } diff --git a/sim/core/energy.go b/sim/core/energy.go index 1366def16b..af452e2b77 100644 --- a/sim/core/energy.go +++ b/sim/core/energy.go @@ -38,6 +38,10 @@ func (unit *Unit) EnableEnergyBar(maxEnergy float64, onEnergyGain OnEnergyGain) unit: unit, maxEnergy: MaxFloat(100, maxEnergy), onEnergyGain: func(sim *Simulation) { + if sim.CurrentTime < 0 { + return + } + if !sim.Options.Interactive && (!unit.IsWaitingForEnergy() || unit.DoneWaitingForEnergy(sim)) { if unit.IsUsingAPL { unit.Rotation.DoNextAction(sim) diff --git a/sim/core/flags.go b/sim/core/flags.go index 55e93199ca..28e3619517 100644 --- a/sim/core/flags.go +++ b/sim/core/flags.go @@ -59,6 +59,10 @@ const ( ProcMaskProc // Mask for FT weapon and rogue poisons, seems to be spell procs from a weapon imbue ProcMaskWeaponProc + // Mind Flay + ProcMaskNotInSpellbook + // Can proc Talisman of Volatile power, but nothing else? + ProcMaskSuppressedProc ) const ( diff --git a/sim/core/major_cooldown.go b/sim/core/major_cooldown.go index d22de2fe69..2aaca3d917 100644 --- a/sim/core/major_cooldown.go +++ b/sim/core/major_cooldown.go @@ -421,9 +421,9 @@ func (mcdm *majorCooldownManager) GetMajorCooldown(actionID ActionID) *MajorCool return nil } func (mcdm *majorCooldownManager) GetMajorCooldownIgnoreTag(actionID ActionID) *MajorCooldown { - for _, mcd := range mcdm.majorCooldowns { + for _, mcd := range mcdm.initialMajorCooldowns { if mcd.Spell.SameActionIgnoreTag(actionID) { - return mcd + return &mcd } } return nil @@ -449,7 +449,7 @@ func (mcdm *majorCooldownManager) getFirstReadyMCD(sim *Simulation) *MajorCooldo for _, mcd := range mcdm.majorCooldowns { if !mcd.IsReady(sim) { - return nil + continue } if mcd.shouldActivateHelper(sim, mcdm.character) { return mcd diff --git a/sim/core/spell.go b/sim/core/spell.go index ef5cbe3292..b50405d9ac 100644 --- a/sim/core/spell.go +++ b/sim/core/spell.go @@ -148,17 +148,6 @@ func (unit *Unit) OnSpellRegistered(handler SpellRegisteredHandler) { unit.spellRegistrationHandlers = append(unit.spellRegistrationHandlers, handler) } -func (unit *Unit) GetDummyProcSpell() *Spell { - if unit.DummyProcSpell == nil { - unit.DummyProcSpell = unit.RegisterSpell(SpellConfig{ - ActionID: ActionID{SpellID: -1}, - Flags: SpellFlagNoLogs | SpellFlagNoMetrics, - ProcMask: ProcMaskProc, - }) - } - return unit.DummyProcSpell -} - // Registers a new spell to the unit. Returns the newly created spell. func (unit *Unit) RegisterSpell(config SpellConfig) *Spell { if len(unit.Spellbook) > 100 { diff --git a/sim/core/unit.go b/sim/core/unit.go index 3f9a97f92e..87e2887750 100644 --- a/sim/core/unit.go +++ b/sim/core/unit.go @@ -159,8 +159,6 @@ type Unit struct { // The currently-channeled DOT spell, otherwise nil. ChanneledDot *Dot - - DummyProcSpell *Spell } // Units can be disabled for several reasons: diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 5fa94d07c2..b9b0ab96ad 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -46,981 +46,981 @@ character_stats_results: { dps_results: { key: "TestBalance-AllItems-Althor'sAbacus-50359" value: { - dps: 7835.91958 - tps: 7611.5459 + dps: 7810.25136 + tps: 7580.43138 } } dps_results: { key: "TestBalance-AllItems-Althor'sAbacus-50366" value: { - dps: 7873.80928 - tps: 7648.38414 + dps: 7848.14107 + tps: 7617.26962 } } dps_results: { key: "TestBalance-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 7624.12361 - tps: 7407.64364 + dps: 7598.45539 + tps: 7376.52911 } } dps_results: { key: "TestBalance-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-Bandit'sInsignia-40371" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7642.83087 - tps: 7425.55024 + dps: 7618.27775 + tps: 7395.60372 } } dps_results: { key: "TestBalance-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5508.69594 - tps: 5266.94013 + dps: 5442.37754 + tps: 5199.7886 } } dps_results: { key: "TestBalance-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7663.79087 - tps: 7297.44897 + dps: 7639.71785 + tps: 7268.64368 } } dps_results: { key: "TestBalance-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-CorpseTongueCoin-50349" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-CorpseTongueCoin-50352" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7722.23047 - tps: 7509.08506 + dps: 7694.18838 + tps: 7475.93199 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7709.73007 - tps: 7495.30144 + dps: 7670.7233 + tps: 7454.79311 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7705.78841 - tps: 7498.5337 + dps: 7679.80607 + tps: 7467.35878 } } dps_results: { key: "TestBalance-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-Death'sChoice-47464" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7593.74197 - tps: 7378.82403 + dps: 7565.26803 + tps: 7345.03794 } } dps_results: { key: "TestBalance-AllItems-Deathbringer'sWill-50362" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-Deathbringer'sWill-50363" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-Defender'sCode-40257" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7654.24278 - tps: 7436.08556 + dps: 7627.84507 + tps: 7404.43618 } } dps_results: { key: "TestBalance-AllItems-DislodgedForeignObject-50348" value: { - dps: 8192.99413 - tps: 7970.96651 + dps: 8127.95569 + tps: 7904.36494 } } dps_results: { key: "TestBalance-AllItems-DislodgedForeignObject-50353" value: { - dps: 8132.12827 - tps: 7913.67872 + dps: 8088.47549 + tps: 7866.38524 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerBattlegear" value: { - dps: 3798.10652 - tps: 3549.79734 + dps: 3753.48298 + tps: 3510.10846 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerGarb" value: { - dps: 6800.18201 - tps: 6588.33623 + dps: 6778.09576 + tps: 6563.65683 } } dps_results: { key: "TestBalance-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-EmberSkyflareDiamond" value: { - dps: 7674.32895 - tps: 7455.22471 + dps: 7650.90525 + tps: 7426.59288 } } dps_results: { key: "TestBalance-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7642.83087 - tps: 7424.81892 + dps: 7618.27775 + tps: 7394.86497 } } dps_results: { key: "TestBalance-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7632.07154 - tps: 7413.77832 + dps: 7609.78771 + tps: 7386.16427 } } dps_results: { key: "TestBalance-AllItems-EphemeralSnowflake-50260" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-EssenceofGossamer-37220" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7721.07731 - tps: 7507.06131 + dps: 7687.43905 + tps: 7471.15062 } } dps_results: { key: "TestBalance-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7932.35527 - tps: 7713.64159 + dps: 7902.15697 + tps: 7678.32926 } } dps_results: { key: "TestBalance-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7557.27596 - tps: 7342.29781 + dps: 7529.27856 + tps: 7308.86909 } } dps_results: { key: "TestBalance-AllItems-ForethoughtTalisman-40258" value: { - dps: 7718.80594 - tps: 7497.68226 + dps: 7693.13772 + tps: 7466.56773 } } dps_results: { key: "TestBalance-AllItems-ForgeEmber-37660" value: { - dps: 7864.31042 - tps: 7643.03449 + dps: 7810.46724 + tps: 7586.33425 } } dps_results: { key: "TestBalance-AllItems-ForlornSkyflareDiamond" value: { - dps: 7663.79087 - tps: 7443.91835 + dps: 7639.71785 + tps: 7414.54078 } } dps_results: { key: "TestBalance-AllItems-ForlornStarflareDiamond" value: { - dps: 7655.44351 - tps: 7435.80741 + dps: 7631.37049 + tps: 7406.42983 } } dps_results: { key: "TestBalance-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-FuturesightRune-38763" value: { - dps: 7634.41523 - tps: 7415.63345 + dps: 7608.74701 + tps: 7384.51893 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sSanctuary" value: { - dps: 4185.25459 - tps: 3943.92534 + dps: 4070.10857 + tps: 3829.95514 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sWildhide" value: { - dps: 7270.68117 - tps: 7036.88577 + dps: 7241.94161 + tps: 7009.19809 } } dps_results: { key: "TestBalance-AllItems-GlowingTwilightScale-54573" value: { - dps: 7854.86443 - tps: 7629.96502 + dps: 7829.19621 + tps: 7598.8505 } } dps_results: { key: "TestBalance-AllItems-GlowingTwilightScale-54589" value: { - dps: 7897.92091 - tps: 7671.82666 + dps: 7872.2527 + tps: 7640.71213 } } dps_results: { key: "TestBalance-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7695.89481 - tps: 7482.39029 + dps: 7666.14217 + tps: 7447.49524 } } dps_results: { key: "TestBalance-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-Heartpierce-49982" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-Heartpierce-50641" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-IdolofLunarFury-47670" value: { - dps: 8068.7689 - tps: 7851.32479 + dps: 8045.11885 + tps: 7823.45782 } } dps_results: { key: "TestBalance-AllItems-IdolofMutilation-47668" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-IdoloftheCorruptor-45509" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 8103.38735 - tps: 7886.10886 + dps: 8077.9644 + tps: 7855.8465 } } dps_results: { key: "TestBalance-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 7871.62603 - tps: 7651.51724 + dps: 7838.68311 + tps: 7613.32303 } } dps_results: { key: "TestBalance-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 7802.62749 - tps: 7578.66319 + dps: 7776.95927 + tps: 7547.54866 } } dps_results: { key: "TestBalance-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7642.83087 - tps: 7424.81892 + dps: 7618.27775 + tps: 7394.86497 } } dps_results: { key: "TestBalance-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7632.07154 - tps: 7413.77832 + dps: 7609.78771 + tps: 7386.16427 } } dps_results: { key: "TestBalance-AllItems-IncisorFragment-37723" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7632.56872 - tps: 7417.43504 + dps: 7609.14502 + tps: 7390.57771 } } dps_results: { key: "TestBalance-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-LasherweaveBattlegear" value: { - dps: 3720.24165 - tps: 3474.29366 + dps: 3728.05119 + tps: 3482.09994 } } dps_results: { key: "TestBalance-AllItems-LasherweaveRegalia" value: { - dps: 8112.16117 - tps: 7898.87633 + dps: 8085.0006 + tps: 7870.46011 } } dps_results: { key: "TestBalance-AllItems-LastWord-50179" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-LastWord-50708" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7630.4149 - tps: 7412.52967 + dps: 7604.74668 + tps: 7381.39121 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sBattlegear" value: { - dps: 4202.90258 - tps: 3964.35809 + dps: 4225.97118 + tps: 3989.61165 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sRegalia" value: { - dps: 7322.59281 - tps: 7105.65833 + dps: 7296.15808 + tps: 7076.52262 } } dps_results: { key: "TestBalance-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7687.17225 - tps: 7473.41633 + dps: 7656.44393 + tps: 7437.45824 } } dps_results: { key: "TestBalance-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7718.80594 - tps: 7497.68226 + dps: 7693.13772 + tps: 7466.56773 } } dps_results: { key: "TestBalance-AllItems-Nibelung-49992" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-Nibelung-50648" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-AllItems-NightsongBattlegear" value: { - dps: 3966.04843 - tps: 3723.09536 + dps: 4034.72989 + tps: 3795.73684 } } dps_results: { key: "TestBalance-AllItems-NightsongGarb" value: { - dps: 7051.66239 - tps: 6832.15038 + dps: 7030.19653 + tps: 6808.6202 } } dps_results: { key: "TestBalance-AllItems-OfferingofSacrifice-37638" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-PetrifiedScarab-21685" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-PurifiedShardoftheGods" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47316" value: { - dps: 7997.19981 - tps: 7772.72759 + dps: 7960.33563 + tps: 7734.31848 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47477" value: { - dps: 8057.05946 - tps: 7831.72695 + dps: 8020.19528 + tps: 7793.31784 } } dps_results: { key: "TestBalance-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7837.82612 - tps: 7615.49196 + dps: 7812.68818 + tps: 7585.00397 } } dps_results: { key: "TestBalance-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7622.05407 - tps: 7402.81839 + dps: 7597.98105 + tps: 7373.51722 } } dps_results: { key: "TestBalance-AllItems-RuneofRepulsion-40372" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-SealofthePantheon-36993" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-ShinyShardoftheGods" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-SliverofPureIce-50339" value: { - dps: 7799.75213 - tps: 7576.38213 + dps: 7774.08391 + tps: 7545.26761 } } dps_results: { key: "TestBalance-AllItems-SliverofPureIce-50346" value: { - dps: 7834.19732 - tps: 7609.87144 + dps: 7808.5291 + tps: 7578.75691 } } dps_results: { key: "TestBalance-AllItems-SoulPreserver-37111" value: { - dps: 7656.8046 - tps: 7437.4015 + dps: 7631.13638 + tps: 7406.28698 } } dps_results: { key: "TestBalance-AllItems-SouloftheDead-40382" value: { - dps: 7707.88997 - tps: 7497.79124 + dps: 7677.50285 + tps: 7462.2653 } } dps_results: { key: "TestBalance-AllItems-SparkofLife-37657" value: { - dps: 7691.52376 - tps: 7474.38952 + dps: 7658.96239 + tps: 7438.1738 } } dps_results: { key: "TestBalance-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-StormshroudArmor" value: { - dps: 4597.15531 - tps: 4346.39941 + dps: 4567.5027 + tps: 4320.34454 } } dps_results: { key: "TestBalance-AllItems-SwiftSkyflareDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-SwiftStarflareDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-SwiftWindfireDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7569.95416 - tps: 7352.95794 + dps: 7544.28594 + tps: 7321.83356 } } dps_results: { key: "TestBalance-AllItems-TearsoftheVanquished-47215" value: { - dps: 7614.56811 - tps: 7400.78895 + dps: 7586.07209 + tps: 7366.85491 } } dps_results: { key: "TestBalance-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-ThunderheartHarness" value: { - dps: 3093.98658 - tps: 2856.19345 + dps: 3095.38862 + tps: 2862.34768 } } dps_results: { key: "TestBalance-AllItems-ThunderheartRegalia" value: { - dps: 4942.19615 - tps: 4708.24201 + dps: 4907.50091 + tps: 4675.62261 } } dps_results: { key: "TestBalance-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7622.05407 - tps: 7403.36363 + dps: 7597.98105 + tps: 7373.98605 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-TirelessSkyflareDiamond" value: { - dps: 7663.79087 - tps: 7443.91835 + dps: 7639.71785 + tps: 7414.54078 } } dps_results: { key: "TestBalance-AllItems-TirelessStarflareDiamond" value: { - dps: 7655.44351 - tps: 7435.80741 + dps: 7631.37049 + tps: 7406.42983 } } dps_results: { key: "TestBalance-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7644.74879 - tps: 7425.68024 + dps: 7619.08057 + tps: 7394.56572 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7655.44351 - tps: 7435.80741 + dps: 7631.37049 + tps: 7406.42983 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7663.79087 - tps: 7443.91835 + dps: 7639.71785 + tps: 7414.54078 } } dps_results: { key: "TestBalance-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 4570.82288 - tps: 4323.50361 + dps: 4468.83958 + tps: 4220.44415 } } dps_results: { key: "TestBalance-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 8206.60266 - tps: 7982.15843 + dps: 8177.43421 + tps: 7948.18975 } } dps_results: { key: "TestBalance-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-AllItems-WingedTalisman-37844" value: { - dps: 7527.63515 - tps: 7311.81659 + dps: 7501.96693 + tps: 7280.70207 } } dps_results: { key: "TestBalance-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 7756.92051 - tps: 7535.26484 + dps: 7731.25229 + tps: 7504.15032 } } dps_results: { key: "TestBalance-Average-Default" value: { - dps: 7977.58365 - tps: 7756.23718 + dps: 7948.37854 + tps: 7727.36119 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-FullBuffs-LongMultiTarget" value: { - dps: 11349.47927 - tps: 13483.2941 + dps: 11311.8607 + tps: 13440.67098 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-FullBuffs-LongSingleTarget" value: { - dps: 7860.28433 - tps: 7638.62866 + dps: 7834.61611 + tps: 7607.51414 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-FullBuffs-ShortSingleTarget" value: { - dps: 9047.2893 - tps: 8173.30912 + dps: 8949.33577 + tps: 8080.54313 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-NoBuffs-LongMultiTarget" value: { - dps: 2968.86565 - tps: 3219.94634 + dps: 2926.24552 + tps: 3185.7271 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-NoBuffs-LongSingleTarget" value: { - dps: 2050.15782 - tps: 1938.48489 + dps: 2092.48999 + tps: 1983.82492 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Default-Default-NoBuffs-ShortSingleTarget" value: { - dps: 5471.77648 - tps: 5189.87789 + dps: 5386.09596 + tps: 5111.1911 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-4P-Default-Default-FullBuffs-LongMultiTarget" value: { dps: 13402.27971 - tps: 15649.03052 + tps: 15636.4354 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-4P-Default-Default-FullBuffs-LongSingleTarget" value: { dps: 9287.99668 - tps: 9043.26992 + tps: 9043.12273 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-4P-Default-Default-FullBuffs-ShortSingleTarget" value: { dps: 10547.68131 - tps: 9629.80098 + tps: 9629.07317 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-4P-Default-Default-NoBuffs-LongMultiTarget" value: { - dps: 4618.51862 - tps: 5158.93047 + dps: 4621.31399 + tps: 5168.01464 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-4P-Default-Default-NoBuffs-LongSingleTarget" value: { - dps: 3154.50424 - tps: 3041.84318 + dps: 3137.6367 + tps: 3024.20581 } } dps_results: { @@ -1034,35 +1034,35 @@ dps_results: { key: "TestBalance-Settings-Tauren-P2-Default-Default-FullBuffs-LongMultiTarget" value: { dps: 13814.42102 - tps: 16076.47534 + tps: 16092.33422 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-Default-Default-FullBuffs-LongSingleTarget" value: { dps: 9493.50123 - tps: 9247.59746 + tps: 9246.66588 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-Default-Default-FullBuffs-ShortSingleTarget" value: { dps: 10757.84444 - tps: 9833.08408 + tps: 9833.28124 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-Default-Default-NoBuffs-LongMultiTarget" value: { - dps: 5089.11223 - tps: 5712.45058 + dps: 4921.66103 + tps: 5515.31598 } } dps_results: { key: "TestBalance-Settings-Tauren-P2-Default-Default-NoBuffs-LongSingleTarget" value: { - dps: 3489.74662 - tps: 3381.31858 + dps: 3487.46814 + tps: 3379.19652 } } dps_results: { @@ -1076,35 +1076,35 @@ dps_results: { key: "TestBalance-Settings-Tauren-P3-Default-Default-FullBuffs-LongMultiTarget" value: { dps: 16073.78456 - tps: 18567.45479 + tps: 18564.73994 } } dps_results: { key: "TestBalance-Settings-Tauren-P3-Default-Default-FullBuffs-LongSingleTarget" value: { dps: 11292.18427 - tps: 11039.42781 + tps: 11038.94976 } } dps_results: { key: "TestBalance-Settings-Tauren-P3-Default-Default-FullBuffs-ShortSingleTarget" value: { dps: 12502.93599 - tps: 11542.05332 + tps: 11540.33889 } } dps_results: { key: "TestBalance-Settings-Tauren-P3-Default-Default-NoBuffs-LongMultiTarget" value: { - dps: 7084.79889 - tps: 8071.20099 + dps: 7036.35002 + tps: 8043.58253 } } dps_results: { key: "TestBalance-Settings-Tauren-P3-Default-Default-NoBuffs-LongSingleTarget" value: { - dps: 4991.89829 - tps: 4894.63715 + dps: 5048.77489 + tps: 4952.3195 } } dps_results: { @@ -1117,7 +1117,7 @@ dps_results: { dps_results: { key: "TestBalance-SwitchInFrontOfTarget-Default" value: { - dps: 7821.72101 - tps: 7638.62866 + dps: 7795.45977 + tps: 7607.51414 } } diff --git a/sim/druid/balance/TestBalancePhase3.results b/sim/druid/balance/TestBalancePhase3.results index 4b5d1c18eb..c7c1047580 100644 --- a/sim/druid/balance/TestBalancePhase3.results +++ b/sim/druid/balance/TestBalancePhase3.results @@ -165,8 +165,8 @@ dps_results: { dps_results: { key: "TestBalancePhase3-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 11166.34989 - tps: 10886.16498 + dps: 11160.37083 + tps: 10880.4051 } } dps_results: { @@ -221,15 +221,15 @@ dps_results: { dps_results: { key: "TestBalancePhase3-AllItems-DislodgedForeignObject-50348" value: { - dps: 11673.47762 - tps: 11378.72128 + dps: 11620.1212 + tps: 11327.85975 } } dps_results: { key: "TestBalancePhase3-AllItems-DislodgedForeignObject-50353" value: { - dps: 11520.25694 - tps: 11228.79499 + dps: 11488.75579 + tps: 11196.80515 } } dps_results: { @@ -326,8 +326,8 @@ dps_results: { dps_results: { key: "TestBalancePhase3-AllItems-ForgeEmber-37660" value: { - dps: 11299.67463 - tps: 11006.03567 + dps: 11282.76588 + tps: 10991.67413 } } dps_results: { @@ -502,7 +502,7 @@ dps_results: { key: "TestBalancePhase3-AllItems-InsightfulEarthsiegeDiamond" value: { dps: 11165.65857 - tps: 10871.65393 + tps: 10873.18602 } } dps_results: { @@ -768,14 +768,14 @@ dps_results: { key: "TestBalancePhase3-AllItems-SouloftheDead-40382" value: { dps: 11159.36656 - tps: 10876.18353 + tps: 10875.79974 } } dps_results: { key: "TestBalancePhase3-AllItems-SparkofLife-37657" value: { dps: 10981.65364 - tps: 10688.40163 + tps: 10688.3534 } } dps_results: { diff --git a/sim/druid/druid.go b/sim/druid/druid.go index 550fbee037..2cadfa9a67 100644 --- a/sim/druid/druid.go +++ b/sim/druid/druid.go @@ -41,6 +41,7 @@ type Druid struct { ForceOfNature *DruidSpell FrenziedRegeneration *DruidSpell Hurricane *DruidSpell + HurricaneTickSpell *DruidSpell InsectSwarm *DruidSpell GiftOfTheWild *DruidSpell Lacerate *DruidSpell diff --git a/sim/druid/hurricane.go b/sim/druid/hurricane.go index 429ca1d2c0..7ccedd3433 100644 --- a/sim/druid/hurricane.go +++ b/sim/druid/hurricane.go @@ -7,12 +7,30 @@ import ( ) func (druid *Druid) registerHurricaneSpell() { + druid.HurricaneTickSpell = druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 48466}, + SpellSchool: core.SpellSchoolNature, + ProcMask: core.ProcMaskProc, + Flags: SpellFlagOmenTrigger, + CritMultiplier: 1, + DamageMultiplier: 1 + + 0.15*float64(druid.Talents.GaleWinds) + + 0.01*float64(druid.Talents.Genesis), + ThreatMultiplier: 1, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + damage := 451 + 0.129*spell.SpellPower() + damage *= sim.Encounter.AOECapMultiplier() + for _, aoeTarget := range sim.Encounter.TargetUnits { + spell.CalcAndDealDamage(sim, aoeTarget, damage, spell.OutcomeMagicHitAndCrit) + } + }, + }) + druid.Hurricane = druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ ActionID: core.ActionID{SpellID: 48467}, SpellSchool: core.SpellSchoolNature, ProcMask: core.ProcMaskSpellDamage, - Flags: core.SpellFlagChanneled | SpellFlagOmenTrigger | core.SpellFlagAPL, - + Flags: core.SpellFlagChanneled | core.SpellFlagAPL, ManaCost: core.ManaCostOptions{ BaseCost: 0.81, Multiplier: 1, @@ -23,13 +41,6 @@ func (druid *Druid) registerHurricaneSpell() { ChannelTime: time.Second * 10, }, }, - - DamageMultiplier: 1 + - 0.15*float64(druid.Talents.GaleWinds) + - 0.01*float64(druid.Talents.Genesis), - ThreatMultiplier: 1, - CritMultiplier: 1, - Dot: core.DotConfig{ IsAOE: true, Aura: core.Aura{ @@ -38,19 +49,8 @@ func (druid *Druid) registerHurricaneSpell() { NumberOfTicks: 10, TickLength: time.Second * 1, AffectedByCastSpeed: true, - - OnSnapshot: func(sim *core.Simulation, _ *core.Unit, dot *core.Dot, _ bool) { - target := druid.CurrentTarget - dot.SnapshotBaseDamage = 451 + 0.129*dot.Spell.SpellPower() - dot.SnapshotBaseDamage *= sim.Encounter.AOECapMultiplier() - dot.SnapshotCritChance = dot.Spell.SpellCritChance(target) - attackTable := dot.Spell.Unit.AttackTables[target.UnitIndex] - dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(attackTable) - }, OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - for _, aoeTarget := range sim.Encounter.TargetUnits { - dot.CalcAndDealPeriodicSnapshotDamage(sim, aoeTarget, dot.OutcomeMagicHitAndSnapshotCrit) - } + druid.HurricaneTickSpell.Cast(sim, target) }, }, diff --git a/sim/druid/starfall.go b/sim/druid/starfall.go index 5efdd4a422..d55cbcdbe7 100644 --- a/sim/druid/starfall.go +++ b/sim/druid/starfall.go @@ -16,12 +16,26 @@ func (druid *Druid) registerStarfallSpell() { numberOfTicks := core.TernaryInt32(druid.Env.GetNumTargets() > 1, 20, 10) tickLength := time.Second + starfallTickSpell := druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 53195}, + SpellSchool: core.SpellSchoolArcane, + ProcMask: core.ProcMaskSuppressedProc, + Flags: SpellFlagNaturesGrace | SpellFlagOmenTrigger, + BonusCritRating: 2 * float64(druid.Talents.NaturesMajesty) * core.CritRatingPerCritChance, + DamageMultiplier: 1 * (1 + core.TernaryFloat64(druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfFocus), 0.1, 0)), + CritMultiplier: druid.BalanceCritMultiplier(), + ThreatMultiplier: 1, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + baseDamage := sim.Roll(563, 653) + 0.3*spell.SpellPower() + spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) + }, + }) + druid.Starfall = druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ ActionID: core.ActionID{SpellID: 53201}, SpellSchool: core.SpellSchoolArcane, ProcMask: core.ProcMaskSpellDamage, - Flags: SpellFlagNaturesGrace | SpellFlagOmenTrigger | core.SpellFlagAPL, - + Flags: core.SpellFlagAPL, ManaCost: core.ManaCostOptions{ BaseCost: 0.35, Multiplier: 1 - 0.03*float64(druid.Talents.Moonglow), @@ -35,24 +49,14 @@ func (druid *Druid) registerStarfallSpell() { Duration: time.Second * (90 - core.TernaryDuration(druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfStarfall), 30, 0)), }, }, - - BonusCritRating: 2 * float64(druid.Talents.NaturesMajesty) * core.CritRatingPerCritChance, - DamageMultiplier: 1 * (1 + core.TernaryFloat64(druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfFocus), 0.1, 0)), - CritMultiplier: druid.BalanceCritMultiplier(), - ThreatMultiplier: 1, - Dot: core.DotConfig{ Aura: core.Aura{ Label: "Starfall", }, NumberOfTicks: numberOfTicks, TickLength: tickLength, - OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - baseDamage := sim.Roll(563, 653) + 0.3*dot.Spell.SpellPower() - dot.Spell.CalcAndDealDamage(sim, target, baseDamage, dot.Spell.OutcomeMagicHitAndCrit) - // can proc canProcFromProc on-cast trinkets - druid.GetDummyProcSpell().Cast(sim, target) + starfallTickSpell.Cast(sim, target) }, }, @@ -65,16 +69,25 @@ func (druid *Druid) registerStarfallSpell() { }, }) - druid.StarfallSplash = druid.RegisterSpell(Any, core.SpellConfig{ - ActionID: core.ActionID{SpellID: 53190}, - SpellSchool: core.SpellSchoolArcane, - ProcMask: core.ProcMaskSpellDamage, - + starfallSplashTickSpell := druid.RegisterSpell(Any, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 53190}, + SpellSchool: core.SpellSchoolArcane, + ProcMask: core.ProcMaskSuppressedProc, BonusCritRating: 2 * float64(druid.Talents.NaturesMajesty) * core.CritRatingPerCritChance, DamageMultiplier: 1 * (1 + core.TernaryFloat64(druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfFocus), 0.1, 0)), CritMultiplier: druid.BalanceCritMultiplier(), ThreatMultiplier: 1, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + baseDamage := 101 + 0.13*spell.SpellPower() + baseDamage *= sim.Encounter.AOECapMultiplier() + for _, aoeTarget := range sim.Encounter.TargetUnits { + spell.CalcAndDealDamage(sim, aoeTarget, baseDamage, spell.OutcomeMagicHitAndCrit) + } + }, + }) + druid.StarfallSplash = druid.RegisterSpell(Any, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 53190}, Dot: core.DotConfig{ Aura: core.Aura{ Label: "StarfallSplash", @@ -82,13 +95,7 @@ func (druid *Druid) registerStarfallSpell() { NumberOfTicks: numberOfTicks, TickLength: tickLength, OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - baseDamage := 101 + 0.13*dot.Spell.SpellPower() - baseDamage *= sim.Encounter.AOECapMultiplier() - for _, aoeTarget := range sim.Encounter.TargetUnits { - dot.Spell.CalcAndDealDamage(sim, aoeTarget, baseDamage, dot.Spell.OutcomeMagicHitAndCrit) - // can proc canProcFromProc on-cast trinkets - druid.GetDummyProcSpell().Cast(sim, aoeTarget) - } + starfallSplashTickSpell.Cast(sim, target) }, }, }) diff --git a/sim/druid/starfire.go b/sim/druid/starfire.go index c9f5c4d769..927e9ad667 100644 --- a/sim/druid/starfire.go +++ b/sim/druid/starfire.go @@ -17,6 +17,20 @@ func (druid *Druid) registerStarfireSpell() { hasGlyph := druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfStarfire) + starfireGlyphSpell := druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 54845}, + ProcMask: core.ProcMaskSuppressedProc, + Flags: core.SpellFlagNoLogs, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + moonfireDot := druid.Moonfire.Dot(target) + + if moonfireDot.IsActive() && druid.ExtendingMoonfireStacks > 0 { + druid.ExtendingMoonfireStacks -= 1 + moonfireDot.UpdateExpires(moonfireDot.ExpiresAt() + time.Second*3) + } + }, + }) + druid.Starfire = druid.RegisterSpell(Humanoid|Moonkin, core.SpellConfig{ ActionID: core.ActionID{SpellID: 48465}, SpellSchool: core.SpellSchoolArcane, @@ -46,15 +60,8 @@ func (druid *Druid) registerStarfireSpell() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { baseDamage := sim.Roll(1038, 1222) + ((spell.SpellPower() + idolSpellPower) * spellCoeff) + (spell.SpellPower() * bonusCoeff) result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) - if result.Landed() { - moonfireDot := druid.Moonfire.Dot(target) - if hasGlyph && moonfireDot.IsActive() && druid.ExtendingMoonfireStacks > 0 { - druid.ExtendingMoonfireStacks -= 1 - moonfireDot.UpdateExpires(moonfireDot.ExpiresAt() + time.Second*3) - - // can proc canProcFromProc on-cast trinkets - druid.GetDummyProcSpell().Cast(sim, target) - } + if result.Landed() && hasGlyph { + starfireGlyphSpell.Cast(sim, target) } spell.DealDamage(sim, result) }, diff --git a/sim/druid/talents.go b/sim/druid/talents.go index 904bc0de2d..f90238dbae 100644 --- a/sim/druid/talents.go +++ b/sim/druid/talents.go @@ -210,6 +210,15 @@ func (druid *Druid) applyEarthAndMoon() { } }) + earthAndMoonSpell := druid.RegisterSpell(Any, core.SpellConfig{ + ActionID: core.ActionID{SpellID: 60432}, + ProcMask: core.ProcMaskSuppressedProc, + Flags: core.SpellFlagNoLogs, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + eamAuras.Get(target).Activate(sim) + }, + }) + druid.RegisterAura(core.Aura{ Label: "Earth And Moon Talent", Duration: core.NeverExpires, @@ -218,9 +227,7 @@ func (druid *Druid) applyEarthAndMoon() { }, OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { if result.Landed() && (druid.Starfire.IsEqual(spell) || druid.Wrath.IsEqual(spell)) { - eamAuras.Get(result.Target).Activate(sim) - // can proc canProcFromProc on-cast trinkets - druid.GetDummyProcSpell().Cast(sim, result.Target) + earthAndMoonSpell.Cast(sim, result.Target) } }, }) @@ -388,9 +395,12 @@ func (druid *Druid) applyOmenOfClarity() { OnReset: func(aura *core.Aura, sim *core.Simulation) { aura.Activate(sim) }, - OnPeriodicDamageDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if !result.Landed() { + return + } // https://github.com/JamminL/wotlk-classic-bugs/issues/66#issuecomment-1182017571 - if druid.Hurricane.IsEqual(spell) { + if druid.HurricaneTickSpell.IsEqual(spell) { curCastTickSpeed := spell.CurCast.ChannelTime.Seconds() / 10 hurricaneCoeff := 1.0 - (7.0 / 9.0) spellCoeff := hurricaneCoeff * curCastTickSpeed @@ -398,13 +408,7 @@ func (druid *Druid) applyOmenOfClarity() { if sim.RandomFloat("Clearcasting") < chanceToProc { druid.ProcOoc(sim) } - } - }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if !result.Landed() { - return - } - if druid.AutoAttacks.PPMProc(sim, 3.5, core.ProcMaskMeleeWhiteHit, "Omen of Clarity", spell) { // Melee + } else if druid.AutoAttacks.PPMProc(sim, 3.5, core.ProcMaskMeleeWhiteHit, "Omen of Clarity", spell) { // Melee druid.ProcOoc(sim) } else if spell.Flags.Matches(SpellFlagOmenTrigger) { // Spells // Heavily based on comment here diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 5b190aef62..b2b6eaa529 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -46,808 +46,808 @@ character_stats_results: { dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50359" value: { - dps: 12834.19111 - tps: 7816.05923 + dps: 13938.32602 + tps: 8515.21349 } } dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50366" value: { - dps: 12878.93285 - tps: 7842.54498 + dps: 13986.96467 + tps: 8544.10281 } } dps_results: { key: "TestArcane-AllItems-AustereEarthsiegeDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-Bandit'sInsignia-40371" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50354" value: { - dps: 12475.10226 - tps: 7605.11222 - hps: 103.16878 + dps: 13559.98892 + tps: 8289.46584 + hps: 103.0427 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50726" value: { - dps: 12475.10226 - tps: 7605.11222 - hps: 103.16878 + dps: 13559.98892 + tps: 8289.46584 + hps: 103.0427 } } dps_results: { key: "TestArcane-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 12851.70002 - tps: 7828.25874 + dps: 14142.64249 + tps: 8641.10327 } } dps_results: { key: "TestArcane-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8535.12891 - tps: 5214.00042 + dps: 9334.70587 + tps: 5716.91556 } } dps_results: { key: "TestArcane-AllItems-Bloodmage'sRegalia" value: { - dps: 11069.59239 - tps: 6760.62376 + dps: 11967.58124 + tps: 7323.72867 } } dps_results: { key: "TestArcane-AllItems-BracingEarthsiegeDiamond" value: { - dps: 12802.2088 - tps: 7645.85546 + dps: 14159.52251 + tps: 8477.86294 } } dps_results: { key: "TestArcane-AllItems-ChaoticSkyflareDiamond" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50349" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50352" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 hps: 64 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 12610.48567 - tps: 7684.11469 + dps: 13778.25981 + tps: 8425.23462 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Death-42990" value: { - dps: 12632.31064 - tps: 7723.25529 + dps: 13792.59404 + tps: 8455.86564 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 12763.6108 - tps: 7778.916 + dps: 13893.53775 + tps: 8496.34724 } } dps_results: { key: "TestArcane-AllItems-Death'sChoice-47464" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 12513.28757 - tps: 7626.31093 + dps: 13603.25438 + tps: 8318.32377 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50362" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50363" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-Defender'sCode-40257" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-DestructiveSkyflareDiamond" value: { - dps: 12791.24628 - tps: 7793.93262 + dps: 14157.3308 + tps: 8647.90173 } } dps_results: { key: "TestArcane-AllItems-DislodgedForeignObject-50353" value: { - dps: 13108.32179 - tps: 7989.83102 + dps: 14451.08585 + tps: 8829.62346 } } dps_results: { key: "TestArcane-AllItems-EffulgentSkyflareDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-EmberSkyflareDiamond" value: { - dps: 12896.0634 - tps: 7853.88794 + dps: 14184.3949 + tps: 8665.07195 } } dps_results: { key: "TestArcane-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 12786.32094 - tps: 7790.88024 + dps: 14155.50628 + tps: 8646.80701 } } dps_results: { key: "TestArcane-AllItems-EnigmaticStarflareDiamond" value: { - dps: 12768.34301 - tps: 7780.13023 + dps: 14147.21443 + tps: 8641.68686 } } dps_results: { key: "TestArcane-AllItems-EphemeralSnowflake-50260" value: { - dps: 12704.9781 - tps: 7751.23777 + dps: 13768.92115 + tps: 8421.33184 } } dps_results: { key: "TestArcane-AllItems-EssenceofGossamer-37220" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-EternalEarthsiegeDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 12616.54492 - tps: 7688.3552 + dps: 13770.88267 + tps: 8421.59271 } } dps_results: { key: "TestArcane-AllItems-EyeoftheBroodmother-45308" value: { - dps: 12874.24648 - tps: 7841.58289 + dps: 14038.63341 + tps: 8582.8258 } } dps_results: { key: "TestArcane-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 12582.40651 - tps: 7669.66287 + dps: 13617.74017 + tps: 8330.18313 } } dps_results: { key: "TestArcane-AllItems-ForethoughtTalisman-40258" value: { - dps: 12695.89845 - tps: 7734.19419 + dps: 13787.98838 + tps: 8425.91926 } } dps_results: { key: "TestArcane-AllItems-ForgeEmber-37660" value: { - dps: 12761.83017 - tps: 7774.3017 + dps: 13907.93505 + tps: 8503.38421 } } dps_results: { key: "TestArcane-AllItems-ForlornSkyflareDiamond" value: { - dps: 12802.2088 - tps: 7799.86184 + dps: 14159.52251 + tps: 8648.59798 } } dps_results: { key: "TestArcane-AllItems-ForlornStarflareDiamond" value: { - dps: 12792.22095 - tps: 7793.95066 + dps: 14148.47754 + tps: 8642.0378 } } dps_results: { key: "TestArcane-AllItems-FrostfireGarb" value: { - dps: 8983.93795 - tps: 5474.53088 + dps: 9853.75252 + tps: 6039.54481 } } dps_results: { key: "TestArcane-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-FuturesightRune-38763" value: { - dps: 12705.68354 - tps: 7741.51542 + dps: 13816.96554 + tps: 8444.8346 } } dps_results: { key: "TestArcane-AllItems-Gladiator'sRegalia" value: { - dps: 9377.4157 - tps: 5713.6332 + dps: 10131.7584 + tps: 6192.73828 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54573" value: { - dps: 12856.56198 - tps: 7829.30211 + dps: 13962.64535 + tps: 8529.65815 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54589" value: { - dps: 12907.40487 - tps: 7859.39955 + dps: 14017.91654 + tps: 8562.48691 } } dps_results: { key: "TestArcane-AllItems-GnomishLightningGenerator-41121" value: { - dps: 12632.07148 - tps: 7716.26469 + dps: 13777.39562 + tps: 8440.71706 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-49982" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-50641" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 12861.70933 - tps: 7833.88763 + dps: 13973.78383 + tps: 8537.56268 } } dps_results: { key: "TestArcane-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 12786.32094 - tps: 7790.88024 + dps: 14155.50628 + tps: 8646.80701 } } dps_results: { key: "TestArcane-AllItems-ImpassiveStarflareDiamond" value: { - dps: 12768.34301 - tps: 7780.13023 + dps: 14147.21443 + tps: 8641.68686 } } dps_results: { key: "TestArcane-AllItems-IncisorFragment-37723" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 12870.09652 - tps: 7839.8163 + dps: 14225.42132 + tps: 8696.66585 } } dps_results: { key: "TestArcane-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-Khadgar'sRegalia" value: { - dps: 9742.42343 - tps: 5941.19216 + dps: 10738.89761 + tps: 6579.70596 } } dps_results: { key: "TestArcane-AllItems-KirinTorGarb" value: { - dps: 9507.59434 - tps: 5789.31499 + dps: 10430.54648 + tps: 6379.75743 } } dps_results: { key: "TestArcane-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-MajesticDragonFigurine-40430" value: { - dps: 12754.65653 - tps: 7769.98862 + dps: 13899.64044 + tps: 8498.50668 } } dps_results: { key: "TestArcane-AllItems-MeteoriteWhetstone-37390" value: { - dps: 12584.07392 - tps: 7668.48606 + dps: 13678.60862 + tps: 8366.40953 } } dps_results: { key: "TestArcane-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 12760.37361 - tps: 7773.85288 + dps: 13883.52841 + tps: 8482.31614 } } dps_results: { key: "TestArcane-AllItems-Nibelung-49992" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-AllItems-Nibelung-50648" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-AllItems-OfferingofSacrifice-37638" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthshatterDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-PetrifiedScarab-21685" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-PurifiedShardoftheGods" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47316" value: { - dps: 13073.00127 - tps: 8078.65948 + dps: 14241.14565 + tps: 8807.62564 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47477" value: { - dps: 13145.11995 - tps: 8135.8376 + dps: 14317.4029 + tps: 8867.61484 } } dps_results: { key: "TestArcane-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 13125.03292 - tps: 7996.50934 + dps: 14524.89834 + tps: 8870.8018 } } dps_results: { key: "TestArcane-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 12806.12513 - tps: 7800.18034 + dps: 14153.58156 + tps: 8646.96679 } } dps_results: { key: "TestArcane-AllItems-RuneofRepulsion-40372" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-SealofthePantheon-36993" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-ShinyShardoftheGods" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50339" value: { - dps: 12845.98173 - tps: 7826.90298 + dps: 13990.03288 + tps: 8551.78125 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50346" value: { - dps: 12892.50114 - tps: 7855.57613 + dps: 14043.97943 + tps: 8584.41223 } } dps_results: { key: "TestArcane-AllItems-SoulPreserver-37111" value: { - dps: 12622.68469 - tps: 7690.85387 + dps: 13708.39786 + tps: 8378.64584 } } dps_results: { key: "TestArcane-AllItems-SouloftheDead-40382" value: { - dps: 12702.00539 - tps: 7743.42935 + dps: 13860.05674 + tps: 8484.45382 } } dps_results: { key: "TestArcane-AllItems-SparkofLife-37657" value: { - dps: 12637.87261 - tps: 7695.97438 + dps: 13736.70742 + tps: 8399.2697 } } dps_results: { key: "TestArcane-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 12481.77869 - tps: 7608.43508 + dps: 13590.27478 + tps: 8310.65814 } } dps_results: { key: "TestArcane-AllItems-SwiftSkyflareDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-SwiftStarflareDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-SwiftWindfireDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 12591.22803 - tps: 7670.77487 + dps: 13659.24748 + tps: 8350.78269 } } dps_results: { key: "TestArcane-AllItems-TearsoftheVanquished-47215" value: { - dps: 12617.97245 - tps: 7690.89947 + dps: 13743.10061 + tps: 8406.31242 } } dps_results: { key: "TestArcane-AllItems-TempestRegalia" value: { - dps: 6987.03183 - tps: 4286.78086 + dps: 7573.09901 + tps: 4654.42593 } } dps_results: { key: "TestArcane-AllItems-TheGeneral'sHeart-45507" value: { - dps: 12470.15602 - tps: 7600.56154 + dps: 13542.58428 + tps: 8280.15955 } } dps_results: { key: "TestArcane-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 10297.38877 - tps: 6309.54817 + dps: 11225.85621 + tps: 6891.95057 } } dps_results: { key: "TestArcane-AllItems-ThunderingSkyflareDiamond" value: { - dps: 12752.26959 - tps: 7770.30597 + dps: 14104.29768 + tps: 8615.79706 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50351" value: { - dps: 12476.59273 - tps: 7605.20203 + dps: 13613.424 + tps: 8323.13689 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50706" value: { - dps: 12476.59273 - tps: 7605.20203 + dps: 13613.424 + tps: 8323.13689 } } dps_results: { key: "TestArcane-AllItems-TirelessSkyflareDiamond" value: { - dps: 12802.2088 - tps: 7799.86184 + dps: 14159.52251 + tps: 8648.59798 } } dps_results: { key: "TestArcane-AllItems-TirelessStarflareDiamond" value: { - dps: 12792.22095 - tps: 7793.95066 + dps: 14148.47754 + tps: 8642.0378 } } dps_results: { key: "TestArcane-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 12853.13546 - tps: 7840.66802 + dps: 13840.3577 + tps: 8460.30046 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 12792.22095 - tps: 7793.95066 + dps: 14148.47754 + tps: 8642.0378 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 12802.2088 - tps: 7799.86184 + dps: 14159.52251 + tps: 8648.59798 } } dps_results: { key: "TestArcane-AllItems-WingedTalisman-37844" value: { - dps: 12620.80045 - tps: 7690.9482 + dps: 13712.14553 + tps: 8381.8963 } } dps_results: { key: "TestArcane-Average-Default" value: { - dps: 13260.73072 - tps: 8080.20787 + dps: 14576.21601 + tps: 8905.34511 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-LongMultiTarget" value: { - dps: 34730.07602 - tps: 21076.49212 + dps: 34692.43207 + tps: 21076.17427 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-LongSingleTarget" value: { - dps: 2854.83804 + dps: 2825.0981 tps: 1849.16181 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 4287.71911 + dps: 4210.25884 tps: 2592.73302 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-LongMultiTarget" value: { - dps: 25840.51292 - tps: 15914.7983 + dps: 25818.17289 + tps: 15916.09678 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-LongSingleTarget" value: { - dps: 1441.08307 - tps: 934.23463 + dps: 1421.25724 + tps: 933.82882 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 2942.03567 - tps: 1736.96021 + dps: 2903.66492 + tps: 1739.02387 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-LongMultiTarget" value: { - dps: 13162.2539 - tps: 9910.00084 + dps: 14579.67222 + tps: 11028.85127 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-LongSingleTarget" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-ShortSingleTarget" value: { - dps: 17145.6478 - tps: 10276.21701 + dps: 19100.24729 + tps: 11510.87056 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-LongMultiTarget" value: { - dps: 6817.85376 - tps: 5700.68156 + dps: 7202.86274 + tps: 5958.16943 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-LongSingleTarget" value: { - dps: 6817.85376 - tps: 4168.8512 + dps: 7202.86274 + tps: 4409.90549 } } dps_results: { key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-ShortSingleTarget" value: { - dps: 8658.88561 - tps: 5121.74378 + dps: 10273.25669 + tps: 6124.54192 } } dps_results: { key: "TestArcane-SwitchInFrontOfTarget-Default" value: { - dps: 13162.2539 - tps: 8018.98262 + dps: 14579.67222 + tps: 8903.98584 } } diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index ec00a61cb9..40ff95c25a 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -46,808 +46,808 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50359" value: { - dps: 13028.84061 - tps: 10452.60303 + dps: 13009.73246 + tps: 10459.13959 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 13080.07824 - tps: 10493.1364 + dps: 13060.92184 + tps: 10499.71648 } } dps_results: { key: "TestFire-AllItems-AustereEarthsiegeDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-Bandit'sInsignia-40371" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50354" value: { - dps: 12615.52853 - tps: 10124.27905 - hps: 102.00333 + dps: 12653.24553 + tps: 10177.90318 + hps: 101.8257 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 12615.52853 - tps: 10124.27905 - hps: 102.00333 + dps: 12653.24553 + tps: 10177.90318 + hps: 101.8257 } } dps_results: { key: "TestFire-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 13099.35327 - tps: 10508.93796 + dps: 13120.6107 + tps: 10551.222 } } dps_results: { key: "TestFire-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8304.77334 - tps: 6668.09173 + dps: 8376.74771 + tps: 6737.17047 } } dps_results: { key: "TestFire-AllItems-Bloodmage'sRegalia" value: { - dps: 10896.05331 - tps: 8748.76377 + dps: 10963.9819 + tps: 8818.71782 } } dps_results: { key: "TestFire-AllItems-BracingEarthsiegeDiamond" value: { - dps: 13202.57359 - tps: 10383.73084 + dps: 13180.75461 + tps: 10385.42742 } } dps_results: { key: "TestFire-AllItems-ChaoticSkyflareDiamond" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50352" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 hps: 64 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 12888.63045 - tps: 10347.66742 + dps: 12844.66173 + tps: 10333.46112 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Death-42990" value: { - dps: 12916.28896 - tps: 10378.11898 + dps: 12916.82644 + tps: 10398.42727 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 12793.08195 - tps: 10273.98352 + dps: 12767.28909 + tps: 10274.31783 } } dps_results: { key: "TestFire-AllItems-Death'sChoice-47464" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 12700.79121 - tps: 10193.01699 + dps: 12671.84412 + tps: 10192.04844 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50362" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-Defender'sCode-40257" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-DestructiveSkyflareDiamond" value: { - dps: 13124.05923 - tps: 10530.74469 + dps: 13115.35479 + tps: 10543.24497 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50353" value: { - dps: 13567.2238 - tps: 10888.19491 + dps: 13477.76119 + tps: 10836.26716 } } dps_results: { key: "TestFire-AllItems-EffulgentSkyflareDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-EmberSkyflareDiamond" value: { - dps: 13158.79644 - tps: 10557.67839 + dps: 13163.30327 + tps: 10585.5611 } } dps_results: { key: "TestFire-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 13126.92195 - tps: 10532.6048 + dps: 13108.6436 + tps: 10537.7239 } } dps_results: { key: "TestFire-AllItems-EnigmaticStarflareDiamond" value: { - dps: 13131.41086 - tps: 10537.26032 + dps: 13063.68609 + tps: 10501.55465 } } dps_results: { key: "TestFire-AllItems-EphemeralSnowflake-50260" value: { - dps: 12753.05075 - tps: 10236.32987 + dps: 12743.86845 + tps: 10249.68141 } } dps_results: { key: "TestFire-AllItems-EssenceofGossamer-37220" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-EternalEarthsiegeDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 13025.38937 - tps: 10465.65184 + dps: 12919.82202 + tps: 10401.16455 } } dps_results: { key: "TestFire-AllItems-EyeoftheBroodmother-45308" value: { - dps: 13143.96839 - tps: 10551.21513 + dps: 13146.52339 + tps: 10574.94741 } } dps_results: { key: "TestFire-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 12742.5806 - tps: 10231.79776 + dps: 12663.45091 + tps: 10190.52371 } } dps_results: { key: "TestFire-AllItems-ForethoughtTalisman-40258" value: { - dps: 12870.46974 - tps: 10327.31807 + dps: 12851.51075 + tps: 10333.72011 } } dps_results: { key: "TestFire-AllItems-ForgeEmber-37660" value: { - dps: 12988.14279 - tps: 10424.89054 + dps: 12992.89334 + tps: 10449.8256 } } dps_results: { key: "TestFire-AllItems-ForlornSkyflareDiamond" value: { - dps: 13202.57359 - tps: 10593.47874 + dps: 13180.75461 + tps: 10595.22082 } } dps_results: { key: "TestFire-AllItems-ForlornStarflareDiamond" value: { - dps: 13190.90603 - tps: 10584.24874 + dps: 13169.10044 + tps: 10585.98406 } } dps_results: { key: "TestFire-AllItems-FrostfireGarb" value: { - dps: 9123.47966 - tps: 7337.49908 + dps: 9106.53393 + tps: 7338.18356 } } dps_results: { key: "TestFire-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-FuturesightRune-38763" value: { - dps: 12908.63665 - tps: 10361.02508 + dps: 12836.40884 + tps: 10322.7898 } } dps_results: { key: "TestFire-AllItems-Gladiator'sRegalia" value: { - dps: 9568.24702 - tps: 7679.23651 + dps: 9521.61548 + tps: 7659.30909 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54573" value: { - dps: 13054.45942 - tps: 10472.86972 + dps: 13035.32715 + tps: 10479.42804 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 13112.68401 - tps: 10518.93036 + dps: 13093.49689 + tps: 10525.53814 } } dps_results: { key: "TestFire-AllItems-GnomishLightningGenerator-41121" value: { - dps: 12938.66617 - tps: 10394.26786 + dps: 12899.36965 + tps: 10384.66521 } } dps_results: { key: "TestFire-AllItems-Heartpierce-49982" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 13059.18159 - tps: 10478.50787 + dps: 13040.50003 + tps: 10485.08597 } } dps_results: { key: "TestFire-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 13126.92195 - tps: 10532.6048 + dps: 13108.6436 + tps: 10537.7239 } } dps_results: { key: "TestFire-AllItems-ImpassiveStarflareDiamond" value: { - dps: 13131.41086 - tps: 10537.26032 + dps: 13063.68609 + tps: 10501.55465 } } dps_results: { key: "TestFire-AllItems-IncisorFragment-37723" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 13112.19826 - tps: 10530.16139 + dps: 13182.14408 + tps: 10608.57418 } } dps_results: { key: "TestFire-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-Khadgar'sRegalia" value: { - dps: 10018.53961 - tps: 8058.82798 + dps: 10025.50245 + tps: 8080.74667 } } dps_results: { key: "TestFire-AllItems-KirinTorGarb" value: { - dps: 10189.80669 - tps: 8183.44719 + dps: 10227.11852 + tps: 8229.29745 } } dps_results: { key: "TestFire-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-MajesticDragonFigurine-40430" value: { - dps: 12998.92124 - tps: 10434.46546 + dps: 12947.07014 + tps: 10414.65918 } } dps_results: { key: "TestFire-AllItems-MeteoriteWhetstone-37390" value: { - dps: 12768.27319 - tps: 10250.30251 + dps: 12774.40385 + tps: 10276.11025 } } dps_results: { key: "TestFire-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 12965.95491 - tps: 10404.61806 + dps: 12979.74604 + tps: 10438.52779 } } dps_results: { key: "TestFire-AllItems-Nibelung-49992" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-AllItems-Nibelung-50648" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-AllItems-OfferingofSacrifice-37638" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-PersistentEarthshatterDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-PetrifiedScarab-21685" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-PurifiedShardoftheGods" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47316" value: { - dps: 13169.41462 - tps: 10608.87838 + dps: 13173.48746 + tps: 10637.00144 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47477" value: { - dps: 13238.6363 - tps: 10669.34937 + dps: 13243.01567 + tps: 10697.84982 } } dps_results: { key: "TestFire-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 13553.65593 - tps: 10875.81418 + dps: 13533.11397 + tps: 10878.42679 } } dps_results: { key: "TestFire-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 13098.47938 - tps: 10511.18673 + dps: 13068.95017 + tps: 10507.88141 } } dps_results: { key: "TestFire-AllItems-RuneofRepulsion-40372" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-SealofthePantheon-36993" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-ShinyShardoftheGods" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50339" value: { - dps: 13034.42366 - tps: 10464.0804 + dps: 12998.59317 + tps: 10456.22661 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50346" value: { - dps: 13056.25583 - tps: 10480.57517 + dps: 12986.69493 + tps: 10447.58126 } } dps_results: { key: "TestFire-AllItems-SoulPreserver-37111" value: { - dps: 12786.62634 - tps: 10260.99074 + dps: 12767.74632 + tps: 10267.32157 } } dps_results: { key: "TestFire-AllItems-SouloftheDead-40382" value: { - dps: 12928.81406 - tps: 10388.29645 + dps: 12893.59421 + tps: 10381.32094 } } dps_results: { key: "TestFire-AllItems-SparkofLife-37657" value: { - dps: 12751.48663 - tps: 10237.29762 + dps: 12742.45058 + tps: 10251.94786 } } dps_results: { key: "TestFire-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 13057.05832 - tps: 10479.78658 + dps: 13021.57212 + tps: 10473.82207 } } dps_results: { key: "TestFire-AllItems-SwiftSkyflareDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-SwiftStarflareDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-SwiftWindfireDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 12728.32061 - tps: 10217.71982 + dps: 12757.82678 + tps: 10262.04594 } } dps_results: { key: "TestFire-AllItems-TearsoftheVanquished-47215" value: { - dps: 12697.85392 - tps: 10192.65683 + dps: 12715.43529 + tps: 10230.5827 } } dps_results: { key: "TestFire-AllItems-TempestRegalia" value: { - dps: 6671.22957 - tps: 5364.40795 + dps: 6742.83264 + tps: 5432.56053 } } dps_results: { key: "TestFire-AllItems-TheGeneral'sHeart-45507" value: { - dps: 12611.95259 - tps: 10122.8088 + dps: 12593.23709 + tps: 10128.99126 } } dps_results: { key: "TestFire-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 10234.83154 - tps: 8234.30648 + dps: 10311.1849 + tps: 8313.26244 } } dps_results: { key: "TestFire-AllItems-ThunderingSkyflareDiamond" value: { - dps: 13144.2358 - tps: 10547.32873 + dps: 13122.48378 + tps: 10549.03702 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50351" value: { - dps: 13222.67691 - tps: 10614.59313 + dps: 13210.95227 + tps: 10624.73369 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 13222.67691 - tps: 10614.59313 + dps: 13210.95227 + tps: 10624.73369 } } dps_results: { key: "TestFire-AllItems-TirelessSkyflareDiamond" value: { - dps: 13202.57359 - tps: 10593.47874 + dps: 13180.75461 + tps: 10595.22082 } } dps_results: { key: "TestFire-AllItems-TirelessStarflareDiamond" value: { - dps: 13190.90603 - tps: 10584.24874 + dps: 13169.10044 + tps: 10585.98406 } } dps_results: { key: "TestFire-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 12940.85165 - tps: 10386.79224 + dps: 12902.27585 + tps: 10374.25295 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 13190.90603 - tps: 10584.24874 + dps: 13169.10044 + tps: 10585.98406 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 13202.57359 - tps: 10593.47874 + dps: 13180.75461 + tps: 10595.22082 } } dps_results: { key: "TestFire-AllItems-WingedTalisman-37844" value: { - dps: 12805.60721 - tps: 10277.7325 + dps: 12787.79649 + tps: 10284.63878 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 13570.89308 - tps: 10888.66106 + dps: 13539.21556 + tps: 10883.66645 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-LongMultiTarget" value: { - dps: 73309.58146 - tps: 66029.54464 + dps: 73286.23353 + tps: 61995.78783 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-LongSingleTarget" value: { - dps: 4749.16727 - tps: 3730.80045 + dps: 4889.85275 + tps: 3864.36789 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 6494.54896 - tps: 4928.39197 + dps: 6433.16827 + tps: 4921.9397 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-LongMultiTarget" value: { - dps: 45021.98204 - tps: 42628.06037 + dps: 45253.19102 + tps: 39113.7221 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-LongSingleTarget" value: { - dps: 2071.43814 - tps: 1624.67343 + dps: 2120.65992 + tps: 1679.6451 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4031.35307 - tps: 3009.02945 + dps: 4012.30181 + tps: 3016.54411 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-LongMultiTarget" value: { - dps: 43550.54114 - tps: 38979.67235 + dps: 46366.54494 + tps: 39572.13845 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-LongSingleTarget" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-ShortSingleTarget" value: { - dps: 16243.3696 - tps: 12886.20774 + dps: 16175.94397 + tps: 12885.94902 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-LongMultiTarget" value: { - dps: 20312.74777 - tps: 19464.00325 + dps: 31299.82426 + tps: 28314.1489 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-LongSingleTarget" value: { - dps: 5354.68123 - tps: 4285.09981 + dps: 5434.89757 + tps: 4362.36175 } } dps_results: { key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-ShortSingleTarget" value: { - dps: 8648.49365 - tps: 6804.2063 + dps: 8613.44367 + tps: 6804.38206 } } dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 13537.01064 - tps: 10861.62758 + dps: 13519.43021 + tps: 10867.28582 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 5f3e48af4d..ccec5b828f 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -46,35 +46,35 @@ character_stats_results: { dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50359" value: { - dps: 10373.47493 + dps: 10351.89539 tps: 8570.38605 } } dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50366" value: { - dps: 10414.1201 + dps: 10392.46196 tps: 8604.19582 } } dps_results: { key: "TestFrost-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-Bandit'sInsignia-40371" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10043.54449 + dps: 10022.60449 tps: 8296.31856 hps: 100.90859 } @@ -82,7 +82,7 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10043.54449 + dps: 10022.60449 tps: 8296.31856 hps: 100.90859 } @@ -90,56 +90,56 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10346.15133 + dps: 10321.26892 tps: 8554.93468 } } dps_results: { key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7508.14041 - tps: 6112.57919 + dps: 7490.36637 + tps: 6111.2145 } } dps_results: { key: "TestFrost-AllItems-Bloodmage'sRegalia" value: { - dps: 9094.0907 + dps: 9074.72856 tps: 7497.70523 } } dps_results: { key: "TestFrost-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10356.38021 + dps: 10331.38638 tps: 8390.59089 } } dps_results: { key: "TestFrost-AllItems-ChaoticSkyflareDiamond" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50349" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50352" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 hps: 64 } @@ -147,707 +147,701 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10096.80526 + dps: 10073.08382 tps: 8344.06018 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10089.80132 - tps: 8329.77579 + dps: 10060.97546 + tps: 8326.30257 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10078.94588 + dps: 10056.33025 tps: 8339.4118 } } dps_results: { key: "TestFrost-AllItems-Death'sChoice-47464" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10050.87834 + dps: 10028.56885 tps: 8302.15318 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50362" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50363" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-Defender'sCode-40257" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10348.85069 + dps: 10323.60019 tps: 8558.37205 } } dps_results: { key: "TestFrost-AllItems-DislodgedForeignObject-50353" value: { - dps: 10553.86596 + dps: 10529.25831 tps: 8738.25744 } } dps_results: { key: "TestFrost-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-EmberSkyflareDiamond" value: { - dps: 10366.00089 + dps: 10341.14851 tps: 8567.22459 } } dps_results: { key: "TestFrost-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10346.1715 + dps: 10321.28909 tps: 8555.61669 } } dps_results: { key: "TestFrost-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10326.97655 + dps: 10302.05039 tps: 8536.73575 } } dps_results: { key: "TestFrost-AllItems-EphemeralSnowflake-50260" value: { - dps: 10129.77938 + dps: 10106.79083 tps: 8370.1159 } } dps_results: { key: "TestFrost-AllItems-EssenceofGossamer-37220" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10101.40893 + dps: 10075.9938 tps: 8343.64054 } } dps_results: { key: "TestFrost-AllItems-EyeoftheBroodmother-45308" value: { - dps: 10322.02486 + dps: 10298.02163 tps: 8544.29858 } } dps_results: { key: "TestFrost-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10048.16094 + dps: 10026.87874 tps: 8299.36962 } } dps_results: { key: "TestFrost-AllItems-ForethoughtTalisman-40258" value: { - dps: 10247.8444 + dps: 10226.50781 tps: 8465.88311 } } dps_results: { key: "TestFrost-AllItems-ForgeEmber-37660" value: { - dps: 10238.83787 + dps: 10215.33699 tps: 8470.80732 } } dps_results: { key: "TestFrost-AllItems-ForlornSkyflareDiamond" value: { - dps: 10356.38021 + dps: 10331.38638 tps: 8561.31825 } } dps_results: { key: "TestFrost-AllItems-ForlornStarflareDiamond" value: { - dps: 10347.27679 + dps: 10322.30331 tps: 8553.76241 } } dps_results: { key: "TestFrost-AllItems-FrostfireGarb" value: { - dps: 7452.5413 + dps: 7436.53224 tps: 6059.05183 } } dps_results: { key: "TestFrost-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-FuturesightRune-38763" value: { - dps: 10157.57373 + dps: 10136.41222 tps: 8389.89329 } } dps_results: { key: "TestFrost-AllItems-Gladiator'sRegalia" value: { - dps: 7951.70996 - tps: 6444.82423 + dps: 7937.86211 + tps: 6452.33881 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54573" value: { - dps: 10393.79751 + dps: 10372.17867 tps: 8587.29094 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54589" value: { - dps: 10439.98521 + dps: 10418.27704 tps: 8625.71113 } } dps_results: { key: "TestFrost-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10081.10047 - tps: 8326.25353 + dps: 10058.40262 + tps: 8326.44827 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-49982" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-50641" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 10379.57156 + dps: 10358.24533 tps: 8594.71981 } } dps_results: { key: "TestFrost-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10346.1715 + dps: 10321.28909 tps: 8555.61669 } } dps_results: { key: "TestFrost-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10326.97655 + dps: 10302.05039 tps: 8536.73575 } } dps_results: { key: "TestFrost-AllItems-IncisorFragment-37723" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10320.34087 + dps: 10295.58134 tps: 8533.48878 } } dps_results: { key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-Khadgar'sRegalia" value: { - dps: 8121.42889 + dps: 8102.91586 tps: 6630.66485 } } dps_results: { key: "TestFrost-AllItems-KirinTorGarb" value: { - dps: 8053.70613 + dps: 8037.02208 tps: 6570.78797 } } dps_results: { key: "TestFrost-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10043.39073 + dps: 10022.45073 tps: 8291.17489 } } dps_results: { key: "TestFrost-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10072.09869 + dps: 10048.85985 tps: 8322.64708 } } dps_results: { key: "TestFrost-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10295.23056 + dps: 10272.06217 tps: 8511.4276 } } dps_results: { key: "TestFrost-AllItems-Nibelung-49992" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-AllItems-Nibelung-50648" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-AllItems-OfferingofSacrifice-37638" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-PetrifiedScarab-21685" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-PurifiedShardoftheGods" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47316" value: { - dps: 10447.68327 + dps: 10421.89104 tps: 8646.88526 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47477" value: { - dps: 10508.65409 + dps: 10482.78463 tps: 8702.25018 } } dps_results: { key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 10627.83327 + dps: 10602.94117 tps: 8808.15006 } } dps_results: { key: "TestFrost-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10310.74901 + dps: 10285.85691 tps: 8522.65734 } } dps_results: { key: "TestFrost-AllItems-RuneofRepulsion-40372" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-SealofthePantheon-36993" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-ShinyShardoftheGods" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50339" value: { - dps: 10335.14951 + dps: 10313.645 tps: 8541.60581 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50346" value: { - dps: 10372.09456 + dps: 10350.51859 tps: 8572.59573 } } dps_results: { key: "TestFrost-AllItems-SoulPreserver-37111" value: { - dps: 10181.33412 + dps: 10160.12616 tps: 8410.55803 } } dps_results: { key: "TestFrost-AllItems-SouloftheDead-40382" value: { - dps: 10104.76364 + dps: 10081.1189 tps: 8353.52438 } } dps_results: { key: "TestFrost-AllItems-SparkofLife-37657" value: { - dps: 10084.94839 + dps: 10062.67481 tps: 8336.68862 } } dps_results: { key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10132.52109 - tps: 8367.25669 + dps: 10105.23759 + tps: 8364.85196 } } dps_results: { key: "TestFrost-AllItems-SwiftSkyflareDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-SwiftStarflareDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-SwiftWindfireDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10043.32975 + dps: 10022.38975 tps: 8294.65829 } } dps_results: { key: "TestFrost-AllItems-TearsoftheVanquished-47215" value: { - dps: 10056.04105 + dps: 10034.68387 tps: 8306.22478 } } dps_results: { key: "TestFrost-AllItems-TempestRegalia" value: { - dps: 6045.41983 + dps: 6034.13476 tps: 4866.09121 } } dps_results: { key: "TestFrost-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10042.77104 + dps: 10021.83104 tps: 8295.29743 } } dps_results: { key: "TestFrost-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 8267.62797 + dps: 8250.30709 tps: 6831.43539 } } dps_results: { key: "TestFrost-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10310.86312 + dps: 10285.97102 tps: 8523.53904 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10181.35436 + dps: 10154.94586 tps: 8411.35821 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10181.35436 + dps: 10154.94586 tps: 8411.35821 } } dps_results: { key: "TestFrost-AllItems-TirelessSkyflareDiamond" value: { - dps: 10356.38021 + dps: 10331.38638 tps: 8561.31825 } } dps_results: { key: "TestFrost-AllItems-TirelessStarflareDiamond" value: { - dps: 10347.27679 + dps: 10322.30331 tps: 8553.76241 } } dps_results: { key: "TestFrost-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10254.86499 + dps: 10234.22453 tps: 8480.0837 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10347.27679 + dps: 10322.30331 tps: 8553.76241 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10356.38021 + dps: 10331.38638 tps: 8561.31825 } } dps_results: { key: "TestFrost-AllItems-WingedTalisman-37844" value: { - dps: 10169.59192 + dps: 10148.65192 tps: 8408.90705 } } dps_results: { key: "TestFrost-Average-Default" value: { - dps: 10765.42518 - tps: 8937.88862 + dps: 10741.81689 + tps: 8937.8668 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19084.08525 - tps: 17635.61761 + dps: 820.82217 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-LongSingleTarget" value: { - dps: 2663.11151 - tps: 1701.21147 + dps: 820.82217 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 4203.99418 - tps: 2919.45313 + dps: 1019.83911 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-LongMultiTarget" value: { - dps: 9091.55483 - tps: 8530.3094 + dps: 603.42878 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-LongSingleTarget" value: { - dps: 1462.15638 - tps: 808.37765 + dps: 603.42878 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 2551.80109 - tps: 1621.28385 + dps: 758.58038 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-LongMultiTarget" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 9311.0682 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-LongSingleTarget" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-ShortSingleTarget" value: { - dps: 13061.96101 + dps: 13012.26338 tps: 10797.27816 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-LongMultiTarget" value: { - dps: 6616.1424 - tps: 5776.65904 + dps: 6613.33947 + tps: 5788.46348 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-LongSingleTarget" value: { - dps: 6616.1424 - tps: 5399.26122 + dps: 6613.33947 + tps: 5411.12438 } } dps_results: { key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-ShortSingleTarget" value: { - dps: 7539.69394 - tps: 6097.0305 + dps: 7526.1884 + tps: 6115.38317 } } dps_results: { key: "TestFrost-SwitchInFrontOfTarget-Default" value: { - dps: 10666.20431 + dps: 10641.32189 tps: 8842.98368 } } diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results index 5f6f1be1cd..326045f225 100644 --- a/sim/mage/TestFrostFire.results +++ b/sim/mage/TestFrostFire.results @@ -46,766 +46,766 @@ character_stats_results: { dps_results: { key: "TestFrostFire-AllItems-Althor'sAbacus-50359" value: { - dps: 12202.37061 - tps: 9765.61242 + dps: 12186.98379 + tps: 9772.23107 } } dps_results: { key: "TestFrostFire-AllItems-Althor'sAbacus-50366" value: { - dps: 12250.59587 - tps: 9803.72114 + dps: 12235.15751 + tps: 9810.37983 } } dps_results: { key: "TestFrostFire-AllItems-AustereEarthsiegeDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-Bandit'sInsignia-40371" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-BaubleofTrueBlood-50354" value: { - dps: 11819.26866 - tps: 9461.52885 + dps: 11797.13635 + tps: 9463.45912 hps: 101.94314 } } dps_results: { key: "TestFrostFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 11819.26866 - tps: 9461.52885 + dps: 11797.13635 + tps: 9463.45912 hps: 101.94314 } } dps_results: { key: "TestFrostFire-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 12254.1878 - tps: 9814.49692 + dps: 12255.22767 + tps: 9830.1331 } } dps_results: { key: "TestFrostFire-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8024.04552 - tps: 6452.89931 + dps: 8005.17251 + tps: 6450.47184 } } dps_results: { key: "TestFrostFire-AllItems-Bloodmage'sRegalia" value: { - dps: 10273.38545 - tps: 8258.97302 + dps: 10297.59532 + tps: 8289.11807 } } dps_results: { key: "TestFrostFire-AllItems-BracingEarthsiegeDiamond" value: { - dps: 12191.98927 - tps: 9573.73022 + dps: 12200.70879 + tps: 9594.46617 } } dps_results: { key: "TestFrostFire-AllItems-ChaoticSkyflareDiamond" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-CorpseTongueCoin-50352" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 hps: 64 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 12065.55473 - tps: 9659.88709 + dps: 12054.852 + tps: 9670.31502 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Death-42990" value: { - dps: 12094.82815 - tps: 9704.56973 + dps: 12089.10909 + tps: 9716.53844 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 11969.72851 - tps: 9584.11903 + dps: 11943.65424 + tps: 9583.63736 } } dps_results: { key: "TestFrostFire-AllItems-Death'sChoice-47464" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 11877.64248 - tps: 9506.23509 + dps: 11851.0747 + tps: 9505.8688 } } dps_results: { key: "TestFrostFire-AllItems-Deathbringer'sWill-50362" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-Defender'sCode-40257" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-DestructiveSkyflareDiamond" value: { - dps: 12227.93848 - tps: 9800.34578 + dps: 12234.9141 + tps: 9817.83221 } } dps_results: { key: "TestFrostFire-AllItems-DislodgedForeignObject-50353" value: { - dps: 12552.11775 - tps: 10060.3793 + dps: 12602.71877 + tps: 10110.14032 } } dps_results: { key: "TestFrostFire-AllItems-EffulgentSkyflareDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-EmberSkyflareDiamond" value: { - dps: 12292.28695 - tps: 9844.47412 + dps: 12291.62095 + tps: 9858.63775 } } dps_results: { key: "TestFrostFire-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 12224.27139 - tps: 9798.85074 + dps: 12232.68878 + tps: 9816.19232 } } dps_results: { key: "TestFrostFire-AllItems-EnigmaticStarflareDiamond" value: { - dps: 12198.34884 - tps: 9779.51362 + dps: 12226.12227 + tps: 9810.74464 } } dps_results: { key: "TestFrostFire-AllItems-EphemeralSnowflake-50260" value: { - dps: 12047.14394 - tps: 9647.20795 + dps: 12038.01559 + tps: 9657.34751 } } dps_results: { key: "TestFrostFire-AllItems-EssenceofGossamer-37220" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-EternalEarthsiegeDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 12153.81159 - tps: 9747.5587 + dps: 12134.60998 + tps: 9751.90644 } } dps_results: { key: "TestFrostFire-AllItems-EyeoftheBroodmother-45308" value: { - dps: 12316.57636 - tps: 9860.96996 + dps: 12305.21571 + tps: 9871.04414 } } dps_results: { key: "TestFrostFire-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 11789.73442 - tps: 9439.14953 + dps: 11762.68938 + tps: 9438.2012 } } dps_results: { key: "TestFrostFire-AllItems-ForethoughtTalisman-40258" value: { - dps: 12053.31072 - tps: 9647.82181 + dps: 12038.08321 + tps: 9654.31672 } } dps_results: { key: "TestFrostFire-AllItems-ForgeEmber-37660" value: { - dps: 12210.0419 - tps: 9773.00812 + dps: 12182.96005 + tps: 9772.65707 } } dps_results: { key: "TestFrostFire-AllItems-ForlornSkyflareDiamond" value: { - dps: 12191.98927 - tps: 9767.4605 + dps: 12200.70879 + tps: 9788.75206 } } dps_results: { key: "TestFrostFire-AllItems-ForlornStarflareDiamond" value: { - dps: 12181.1449 - tps: 9758.88747 + dps: 12189.8553 + tps: 9780.15452 } } dps_results: { key: "TestFrostFire-AllItems-FrostfireGarb" value: { - dps: 8677.88231 - tps: 6960.03015 + dps: 8662.17581 + tps: 6959.59995 } } dps_results: { key: "TestFrostFire-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-FuturesightRune-38763" value: { - dps: 12013.04697 - tps: 9615.91357 + dps: 11987.23034 + tps: 9615.65554 } } dps_results: { key: "TestFrostFire-AllItems-Gladiator'sRegalia" value: { - dps: 8997.68478 - tps: 7202.92782 + dps: 8982.01434 + tps: 7204.45975 } } dps_results: { key: "TestFrostFire-AllItems-GlowingTwilightScale-54573" value: { - dps: 12226.48324 - tps: 9784.66678 + dps: 12211.07065 + tps: 9791.30545 } } dps_results: { key: "TestFrostFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 12281.28467 - tps: 9827.97215 + dps: 12265.81351 + tps: 9834.65632 } } dps_results: { key: "TestFrostFire-AllItems-GnomishLightningGenerator-41121" value: { - dps: 12141.03923 - tps: 9734.9791 + dps: 12138.93613 + tps: 9749.86312 } } dps_results: { key: "TestFrostFire-AllItems-Heartpierce-49982" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-AllItems-Heartpierce-50641" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 12232.0677 - tps: 9791.06347 + dps: 12217.08196 + tps: 9797.72034 } } dps_results: { key: "TestFrostFire-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 12224.27139 - tps: 9798.85074 + dps: 12232.68878 + tps: 9816.19232 } } dps_results: { key: "TestFrostFire-AllItems-ImpassiveStarflareDiamond" value: { - dps: 12198.34884 - tps: 9779.51362 + dps: 12226.12227 + tps: 9810.74464 } } dps_results: { key: "TestFrostFire-AllItems-IncisorFragment-37723" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 12232.96155 - tps: 9798.89427 + dps: 12206.81922 + tps: 9798.47182 } } dps_results: { key: "TestFrostFire-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-Khadgar'sRegalia" value: { - dps: 9335.29131 - tps: 7483.02136 + dps: 9315.357 + tps: 7482.88746 } } dps_results: { key: "TestFrostFire-AllItems-KirinTorGarb" value: { - dps: 9523.50226 - tps: 7627.21137 + dps: 9505.32159 + tps: 7626.8912 } } dps_results: { key: "TestFrostFire-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-MajesticDragonFigurine-40430" value: { - dps: 12099.49511 - tps: 9685.96978 + dps: 12072.16793 + tps: 9685.53018 } } dps_results: { key: "TestFrostFire-AllItems-MeteoriteWhetstone-37390" value: { - dps: 12002.65187 - tps: 9607.60452 + dps: 11975.67743 + tps: 9607.25347 } } dps_results: { key: "TestFrostFire-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 12185.35279 - tps: 9756.71566 + dps: 12180.51332 + tps: 9770.32853 } } dps_results: { key: "TestFrostFire-AllItems-Nibelung-49992" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-AllItems-Nibelung-50648" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-AllItems-OfferingofSacrifice-37638" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-PersistentEarthshatterDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedScarab-21685" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-PurifiedShardoftheGods" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-ReignoftheDead-47316" value: { - dps: 12399.74295 - tps: 9978.21783 + dps: 12380.70403 + tps: 9982.70358 } } dps_results: { key: "TestFrostFire-AllItems-ReignoftheDead-47477" value: { - dps: 12472.41141 - tps: 10042.61285 + dps: 12453.22257 + tps: 10047.02466 } } dps_results: { key: "TestFrostFire-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 12526.04783 - tps: 10036.35222 + dps: 12535.8987 + tps: 10058.46285 } } dps_results: { key: "TestFrostFire-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 12151.25332 - tps: 9732.51938 + dps: 12159.58557 + tps: 9753.37274 } } dps_results: { key: "TestFrostFire-AllItems-RuneofRepulsion-40372" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-SealofthePantheon-36993" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-ShinyShardoftheGods" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-SliverofPureIce-50339" value: { - dps: 12168.86134 - tps: 9742.2589 + dps: 12140.95028 + tps: 9741.72463 } } dps_results: { key: "TestFrostFire-AllItems-SliverofPureIce-50346" value: { - dps: 12212.74798 - tps: 9777.62293 + dps: 12184.74457 + tps: 9777.08865 } } dps_results: { key: "TestFrostFire-AllItems-SoulPreserver-37111" value: { - dps: 11974.39666 - tps: 9585.46207 + dps: 11959.25349 + tps: 9591.89148 } } dps_results: { key: "TestFrostFire-AllItems-SouloftheDead-40382" value: { - dps: 12045.4573 - tps: 9651.20503 + dps: 12017.40137 + tps: 9650.73734 } } dps_results: { key: "TestFrostFire-AllItems-SparkofLife-37657" value: { - dps: 12012.90044 - tps: 9616.76211 + dps: 11985.4194 + tps: 9616.30739 } } dps_results: { key: "TestFrostFire-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 12253.45856 - tps: 9815.22391 + dps: 12229.92714 + tps: 9816.70395 } } dps_results: { key: "TestFrostFire-AllItems-SwiftSkyflareDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-SwiftStarflareDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-SwiftWindfireDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 11900.75202 - tps: 9525.83573 + dps: 11874.6174 + tps: 9525.47767 } } dps_results: { key: "TestFrostFire-AllItems-TearsoftheVanquished-47215" value: { - dps: 11854.20463 - tps: 9488.62326 + dps: 11827.58773 + tps: 9488.2023 } } dps_results: { key: "TestFrostFire-AllItems-TempestRegalia" value: { - dps: 6263.84318 - tps: 5042.68569 + dps: 6228.95348 + tps: 5025.19501 } } dps_results: { key: "TestFrostFire-AllItems-TheGeneral'sHeart-45507" value: { - dps: 11809.99236 - tps: 9455.54596 + dps: 11795.02491 + tps: 9461.83889 } } dps_results: { key: "TestFrostFire-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 9608.49994 - tps: 7738.56657 + dps: 9615.59269 + tps: 7758.26239 } } dps_results: { key: "TestFrostFire-AllItems-ThunderingSkyflareDiamond" value: { - dps: 12137.76742 - tps: 9724.59535 + dps: 12146.44136 + tps: 9745.76435 } } dps_results: { key: "TestFrostFire-AllItems-TinyAbominationinaJar-50351" value: { - dps: 12336.51009 - tps: 9879.51995 + dps: 12307.6654 + tps: 9876.66599 } } dps_results: { key: "TestFrostFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 12336.51009 - tps: 9879.51995 + dps: 12307.6654 + tps: 9876.66599 } } dps_results: { key: "TestFrostFire-AllItems-TirelessSkyflareDiamond" value: { - dps: 12191.98927 - tps: 9767.4605 + dps: 12200.70879 + tps: 9788.75206 } } dps_results: { key: "TestFrostFire-AllItems-TirelessStarflareDiamond" value: { - dps: 12181.1449 - tps: 9758.88747 + dps: 12189.8553 + tps: 9780.15452 } } dps_results: { key: "TestFrostFire-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 12105.66238 - tps: 9693.26057 + dps: 12096.70116 + tps: 9703.82847 } } dps_results: { key: "TestFrostFire-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 12181.1449 - tps: 9758.88747 + dps: 12189.8553 + tps: 9780.15452 } } dps_results: { key: "TestFrostFire-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 12191.98927 - tps: 9767.4605 + dps: 12200.70879 + tps: 9788.75206 } } dps_results: { key: "TestFrostFire-AllItems-WingedTalisman-37844" value: { - dps: 11983.9262 - tps: 9594.69302 + dps: 11968.95069 + tps: 9600.97951 } } dps_results: { key: "TestFrostFire-Average-Default" value: { - dps: 12594.70061 - tps: 10095.09701 + dps: 12630.14632 + tps: 10133.77869 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-LongMultiTarget" value: { - dps: 16790.24247 - tps: 15725.73292 + dps: 16762.59809 + tps: 15648.23676 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-LongSingleTarget" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-ShortSingleTarget" value: { - dps: 14755.83852 - tps: 11681.39844 + dps: 14690.26847 + tps: 11679.18109 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-LongMultiTarget" value: { - dps: 10074.24648 - tps: 10247.32687 + dps: 9972.2522 + tps: 10151.3672 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-LongSingleTarget" value: { - dps: 6007.1619 - tps: 4817.89668 + dps: 6150.50165 + tps: 4946.8326 } } dps_results: { key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-ShortSingleTarget" value: { - dps: 7641.91815 - tps: 5985.51808 + dps: 7604.10976 + tps: 5985.2982 } } dps_results: { key: "TestFrostFire-SwitchInFrontOfTarget-Default" value: { - dps: 12617.27832 - tps: 10114.35882 + dps: 12627.00615 + tps: 10132.75745 } } diff --git a/sim/mage/arcane_missiles.go b/sim/mage/arcane_missiles.go index 65261cd75d..f7048c163a 100644 --- a/sim/mage/arcane_missiles.go +++ b/sim/mage/arcane_missiles.go @@ -11,13 +11,38 @@ func (mage *Mage) registerArcaneMissilesSpell() { spellCoeff := 1/3.5 + 0.03*float64(mage.Talents.ArcaneEmpowerment) hasT8_4pc := mage.HasSetBonus(ItemSetKirinTorGarb, 4) - mage.ArcaneMissiles = mage.RegisterSpell(core.SpellConfig{ - ActionID: core.ActionID{SpellID: 42846}, - SpellSchool: core.SpellSchoolArcane, - ProcMask: core.ProcMaskSpellDamage, - Flags: SpellFlagMage | core.SpellFlagChanneled | core.SpellFlagAPL, - MissileSpeed: 20, + mage.ArcaneMissilesTickSpell = mage.GetOrRegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 42845}, + SpellSchool: core.SpellSchoolArcane, + // unlike Mind Flay, this CAN proc JoW. It can also proc trinkets without the "can proc from proc" flag + // such as illustration of the dragon soul + // however, it cannot proc Nibelung so we add the ProcMaskNotInSpellbook flag + ProcMask: core.ProcMaskSpellDamage | core.ProcMaskNotInSpellbook, + Flags: SpellFlagMage, + MissileSpeed: 20, + BonusHitRating: float64(mage.Talents.ArcaneFocus) * core.SpellHitRatingPerHitChance, + BonusCritRating: core.TernaryFloat64(mage.HasSetBonus(ItemSetKhadgarsRegalia, 4), 5*core.CritRatingPerCritChance, 0), + DamageMultiplier: 1 + .04*float64(mage.Talents.TormentTheWeak), + DamageMultiplierAdditive: 1 + + core.TernaryFloat64(mage.HasSetBonus(ItemSetTempestRegalia, 4), .05, 0), + CritMultiplier: mage.SpellCritMultiplier(1, mage.bonusCritDamage+core.TernaryFloat64(mage.HasMajorGlyph(proto.MageMajorGlyph_GlyphOfArcaneMissiles), .25, 0)), + ThreatMultiplier: 1 - 0.2*float64(mage.Talents.ArcaneSubtlety), + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + damage := 362 + spellCoeff*spell.SpellPower() + result := spell.CalcDamage(sim, target, damage, spell.OutcomeMagicHitAndCrit) + + spell.WaitTravelTime(sim, func(sim *core.Simulation) { + spell.DealDamage(sim, result) + }) + }, + }) + mage.ArcaneMissiles = mage.RegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 42846}, + SpellSchool: core.SpellSchoolArcane, + ProcMask: core.ProcMaskSpellDamage, + Flags: SpellFlagMage | core.SpellFlagChanneled | core.SpellFlagAPL, + BonusHitRating: float64(mage.Talents.ArcaneFocus) * core.SpellHitRatingPerHitChance, ManaCost: core.ManaCostOptions{ BaseCost: 0.31, Multiplier: 1 - .01*float64(mage.Talents.ArcaneFocus), @@ -28,15 +53,6 @@ func (mage *Mage) registerArcaneMissilesSpell() { ChannelTime: time.Second * 5, }, }, - - BonusHitRating: float64(mage.Talents.ArcaneFocus) * core.SpellHitRatingPerHitChance, - BonusCritRating: core.TernaryFloat64(mage.HasSetBonus(ItemSetKhadgarsRegalia, 4), 5*core.CritRatingPerCritChance, 0), - DamageMultiplier: 1 + .04*float64(mage.Talents.TormentTheWeak), - DamageMultiplierAdditive: 1 + - core.TernaryFloat64(mage.HasSetBonus(ItemSetTempestRegalia, 4), .05, 0), - CritMultiplier: mage.SpellCritMultiplier(1, mage.bonusCritDamage+core.TernaryFloat64(mage.HasMajorGlyph(proto.MageMajorGlyph_GlyphOfArcaneMissiles), .25, 0)), - ThreatMultiplier: 1 - 0.2*float64(mage.Talents.ArcaneSubtlety), - Dot: core.DotConfig{ Aura: core.Aura{ Label: "ArcaneMissiles", @@ -52,38 +68,22 @@ func (mage *Mage) registerArcaneMissilesSpell() { // occur before aura expirations. dot := mage.ArcaneMissiles.Dot(aura.Unit) if dot.TickCount < dot.NumberOfTicks { + dot.TickCount++ dot.TickOnce(sim) } mage.ArcaneBlastAura.Deactivate(sim) }, }, - NumberOfTicks: 5, TickLength: time.Second, AffectedByCastSpeed: true, - OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - baseDamage := 362 + spellCoeff*dot.Spell.SpellPower() - result := dot.Spell.CalcDamage(sim, target, baseDamage, dot.Spell.OutcomeMagicHitAndCrit) - dot.Spell.WaitTravelTime(sim, func(sim *core.Simulation) { - // TODO: THIS IS A HACK TRY TO FIGURE OUT A BETTER WAY TO DO THIS. - // Arcane Missiles is like mind flay in that its dmg ticks can proc things like a normal cast would. - // However, ticks do not proc JoW. Since the dmg portion and the initial application are the same Spell - // we can't set one without impacting the other. - // For now as a hack, set proc mask to prevent JoW, cast the tick dmg, and then unset it. - // This also handles trinkets that can proc from proc (or not) - oldMask := dot.Spell.ProcMask - dot.Spell.ProcMask = core.ProcMaskProc - dot.Spell.DealDamage(sim, result) - dot.Spell.ProcMask = oldMask - }) + mage.ArcaneMissilesTickSpell.Cast(sim, target) }, }, - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { result := spell.CalcOutcome(sim, target, spell.OutcomeMagicHit) if result.Landed() { - spell.SpellMetrics[target.UnitIndex].Hits-- spell.Dot(target).Apply(sim) } spell.DealOutcome(sim, result) diff --git a/sim/mage/blizzard.go b/sim/mage/blizzard.go index 7deecdcb9a..1b64af2720 100644 --- a/sim/mage/blizzard.go +++ b/sim/mage/blizzard.go @@ -7,14 +7,51 @@ import ( ) func (mage *Mage) registerBlizzardSpell() { - results := make([]*core.SpellResult, len(mage.Env.Encounter.TargetUnits)) + var improvedBlizzardProcApplication *core.Spell + if mage.Talents.ImprovedBlizzard > 0 { + auras := mage.NewEnemyAuraArray(func(unit *core.Unit) *core.Aura { + return unit.GetOrRegisterAura(core.Aura{ + ActionID: core.ActionID{SpellID: 12488}, + Label: "Improved Blizzard", + Duration: time.Millisecond * 1500, + }) + }) + improvedBlizzardProcApplication = mage.RegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 12488}, + ProcMask: core.ProcMaskProc, + Flags: SpellFlagMage | core.SpellFlagNoLogs, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + auras.Get(target).Activate(sim) + }, + }) + } + + blizzardTickSpell := mage.RegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 42938}, + SpellSchool: core.SpellSchoolFrost, + ProcMask: core.ProcMaskSpellDamage, + Flags: SpellFlagMage, + CritMultiplier: mage.SpellCritMultiplier(1, mage.bonusCritDamage+float64(mage.Talents.IceShards)/3), + DamageMultiplier: 1, + ThreatMultiplier: 1 - (0.1/3)*float64(mage.Talents.FrostChanneling), + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + damage := 426 + (4.0/3.5/8)*spell.SpellPower() + damage *= sim.Encounter.AOECapMultiplier() + for _, aoeTarget := range sim.Encounter.TargetUnits { + spell.CalcAndDealDamage(sim, aoeTarget, damage, spell.OutcomeMagicHitAndCrit) + + if improvedBlizzardProcApplication != nil { + improvedBlizzardProcApplication.Cast(sim, aoeTarget) + } + } + }, + }) mage.Blizzard = mage.RegisterSpell(core.SpellConfig{ - ActionID: core.ActionID{SpellID: 42939}, + ActionID: core.ActionID{SpellID: 42940}, SpellSchool: core.SpellSchoolFrost, ProcMask: core.ProcMaskSpellDamage, Flags: SpellFlagMage | core.SpellFlagChanneled | core.SpellFlagAPL, - ManaCost: core.ManaCostOptions{ BaseCost: 0.74, }, @@ -24,10 +61,6 @@ func (mage *Mage) registerBlizzardSpell() { ChannelTime: time.Second * 8, }, }, - - DamageMultiplier: 1, - ThreatMultiplier: 1 - (0.1/3)*float64(mage.Talents.FrostChanneling), - Dot: core.DotConfig{ IsAOE: true, Aura: core.Aura{ @@ -36,19 +69,8 @@ func (mage *Mage) registerBlizzardSpell() { NumberOfTicks: 8, TickLength: time.Second * 1, AffectedByCastSpeed: true, - OnSnapshot: func(sim *core.Simulation, _ *core.Unit, dot *core.Dot, _ bool) { - target := mage.CurrentTarget - dot.SnapshotBaseDamage = 426 + (4.0/3.5/8)*dot.Spell.SpellPower() - dot.SnapshotBaseDamage *= sim.Encounter.AOECapMultiplier() - dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(dot.Spell.Unit.AttackTables[target.UnitIndex]) - }, OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - for i, aoeTarget := range sim.Encounter.TargetUnits { - results[i] = dot.CalcSnapshotDamage(sim, aoeTarget, dot.OutcomeTick) - } - for i := range sim.Encounter.TargetUnits { - dot.Spell.DealPeriodicDamage(sim, results[i]) - } + blizzardTickSpell.Cast(sim, target) }, }, diff --git a/sim/mage/mage.go b/sim/mage/mage.go index 9f087e4510..250b5ce081 100644 --- a/sim/mage/mage.go +++ b/sim/mage/mage.go @@ -54,26 +54,27 @@ type Mage struct { // Cached values for a few mechanics. bonusCritDamage float64 - ArcaneBarrage *core.Spell - ArcaneBlast *core.Spell - ArcaneExplosion *core.Spell - ArcaneMissiles *core.Spell - Blizzard *core.Spell - DeepFreeze *core.Spell - Ignite *core.Spell - LivingBomb *core.Spell - Fireball *core.Spell - FireBlast *core.Spell - Flamestrike *core.Spell - FlamestrikeRank8 *core.Spell - Frostbolt *core.Spell - FrostfireBolt *core.Spell - IceLance *core.Spell - Pyroblast *core.Spell - Scorch *core.Spell - MirrorImage *core.Spell - BlastWave *core.Spell - DragonsBreath *core.Spell + ArcaneBarrage *core.Spell + ArcaneBlast *core.Spell + ArcaneExplosion *core.Spell + ArcaneMissiles *core.Spell + ArcaneMissilesTickSpell *core.Spell + Blizzard *core.Spell + DeepFreeze *core.Spell + Ignite *core.Spell + LivingBomb *core.Spell + Fireball *core.Spell + FireBlast *core.Spell + Flamestrike *core.Spell + FlamestrikeRank8 *core.Spell + Frostbolt *core.Spell + FrostfireBolt *core.Spell + IceLance *core.Spell + Pyroblast *core.Spell + Scorch *core.Spell + MirrorImage *core.Spell + BlastWave *core.Spell + DragonsBreath *core.Spell IcyVeins *core.Spell SummonWaterElemental *core.Spell @@ -140,9 +141,9 @@ func (mage *Mage) Initialize() { mage.registerBlastWaveSpell() mage.registerDragonsBreathSpell() - if mirrorImageMCD := mage.GetMajorCooldownIgnoreTag(mage.MirrorImage.ActionID); mirrorImageMCD != nil { + if mirrorImageMCD := mage.GetMajorCooldownIgnoreTag(mage.MirrorImage.ActionID); !mage.IsUsingAPL && mirrorImageMCD != nil { if len(mirrorImageMCD.GetTimings()) == 0 { - mage.RegisterPrepullAction(-1500*time.Millisecond, func(sim *core.Simulation) { + mage.RegisterPrepullAction(-2000*time.Millisecond, func(sim *core.Simulation) { mage.MirrorImage.Cast(sim, nil) }) } diff --git a/sim/mage/mirror_image.go b/sim/mage/mirror_image.go index 6bb46f7b91..8c861634c0 100644 --- a/sim/mage/mirror_image.go +++ b/sim/mage/mirror_image.go @@ -69,7 +69,7 @@ type MirrorImage struct { func (mage *Mage) NewMirrorImage() *MirrorImage { mirrorImage := &MirrorImage{ - Pet: core.NewPet("Mirror Image", &mage.Character, mirrorImageBaseStats, mirrorImageInheritance, false, true), + Pet: core.NewPet("Mirror Image", &mage.Character, mirrorImageBaseStats, createMirrorImageInheritance(mage), false, true), mageOwner: mage, } mirrorImage.EnableManaBar() @@ -106,11 +106,14 @@ var mirrorImageBaseStats = stats.Stats{ stats.Mana: 3000, // Unknown } -var mirrorImageInheritance = func(ownerStats stats.Stats) stats.Stats { - return stats.Stats{ - stats.SpellHit: ownerStats[stats.SpellHit], - stats.SpellCrit: ownerStats[stats.SpellCrit], - stats.SpellPower: ownerStats[stats.SpellPower] * 0.33, +var createMirrorImageInheritance = func(mage *Mage) func(stats.Stats) stats.Stats { + return func(ownerStats stats.Stats) stats.Stats { + return stats.Stats{ + stats.SpellHit: ownerStats[stats.SpellHit] - float64(mage.Talents.Precision), + // seems to be about 8% baseline + stats.SpellCrit: 8 * core.CritRatingPerCritChance, + stats.SpellPower: ownerStats[stats.SpellPower] * 0.33, + } } } diff --git a/sim/mage/talents.go b/sim/mage/talents.go index c14a003c56..36facd426c 100644 --- a/sim/mage/talents.go +++ b/sim/mage/talents.go @@ -139,7 +139,6 @@ func (mage *Mage) applyArcaneConcentration() { return } - procChance := 0.02 * float64(mage.Talents.ArcaneConcentration) bonusCrit := float64(mage.Talents.ArcanePotency) * 15 * core.CritRatingPerCritChance // The result that caused the proc. Used to check we don't deactivate from the same proc. @@ -184,6 +183,9 @@ func (mage *Mage) applyArcaneConcentration() { if !spell.Flags.Matches(SpellFlagMage) { return } + if spell.DefaultCast.Cost == 0 { + return + } if spell == mage.ArcaneMissiles && mage.MissileBarrageAura.IsActive() { return } @@ -210,6 +212,13 @@ func (mage *Mage) applyArcaneConcentration() { return } + procChance := 0.02 * float64(mage.Talents.ArcaneConcentration) + + // Arcane Missile ticks can proc CC, just at a low rate of about 1.5% with 5/5 Arcane Concentration + if spell == mage.ArcaneMissilesTickSpell { + procChance *= 0.15 + } + if sim.RandomFloat("Arcane Concentration") > procChance { return } @@ -410,6 +419,9 @@ func (mage *Mage) applyMasterOfElements() { if spell.ProcMask.Matches(core.ProcMaskMeleeOrRanged) { return } + if spell.CurCast.Cost == 0 { + return + } if result.DidCrit() { if refundCoeff < 0 { mage.SpendMana(sim, -1*spell.DefaultCast.Cost*refundCoeff, manaMetrics) diff --git a/sim/priest/mind_blast.go b/sim/priest/mind_blast.go index 5471aec596..721eb6d5dc 100644 --- a/sim/priest/mind_blast.go +++ b/sim/priest/mind_blast.go @@ -60,6 +60,7 @@ func (priest *Priest) registerMindBlastSpell() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { baseDamage := sim.Roll(997, 1053) + spellCoeff*spell.SpellPower() + baseDamage *= priest.MindBlastModifier result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) if result.Landed() { diff --git a/sim/priest/mind_flay.go b/sim/priest/mind_flay.go index d498721702..63a62da790 100644 --- a/sim/priest/mind_flay.go +++ b/sim/priest/mind_flay.go @@ -8,12 +8,59 @@ import ( "github.com/wowsims/wotlk/sim/core/proto" ) -// TODO Mind Flay (48156) now "periodically triggers" Mind Flay (58381), probably to allow haste to work. -// The first never deals damage, so the latter should probably be used as ActionID here. +func (priest *Priest) getMiseryCoefficient() float64 { + return 0.257 * (1 + 0.05*float64(priest.Talents.Misery)) +} + +func (priest *Priest) getMindFlayTickSpell(numTicks int32) *core.Spell { + hasGlyphOfShadow := priest.HasGlyph(int32(proto.PriestMajorGlyph_GlyphOfShadow)) + miseryCoeff := priest.getMiseryCoefficient() + + return priest.GetOrRegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 58381}.WithTag(numTicks), + SpellSchool: core.SpellSchoolShadow, + ProcMask: core.ProcMaskProc | core.ProcMaskNotInSpellbook, + BonusHitRating: float64(priest.Talents.ShadowFocus) * 1 * core.SpellHitRatingPerHitChance, + BonusCritRating: 0 + + float64(priest.Talents.MindMelt)*2*core.CritRatingPerCritChance + + core.TernaryFloat64(priest.HasSetBonus(ItemSetZabras, 4), 5, 0)*core.CritRatingPerCritChance, + DamageMultiplier: 1 + + 0.02*float64(priest.Talents.Darkness) + + 0.01*float64(priest.Talents.TwinDisciplines), + CritMultiplier: priest.SpellCritMultiplier(1, float64(priest.Talents.ShadowPower)/5), + ThreatMultiplier: 1 - 0.08*float64(priest.Talents.ShadowAffinity), + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + damage := 588.0/3 + miseryCoeff*spell.SpellPower() + damage *= priest.MindFlayModifier + result := spell.CalcAndDealDamage(sim, target, damage, spell.OutcomeMagicHitAndCrit) + + if result.Landed() { + priest.AddShadowWeavingStack(sim) + if result.DidCrit() && hasGlyphOfShadow { + priest.ShadowyInsightAura.Activate(sim) + } + if result.DidCrit() && priest.ImprovedSpiritTap != nil && sim.RandomFloat("Improved Spirit Tap") > 0.5 { + priest.ImprovedSpiritTap.Activate(sim) + } + } + }, + }) +} + +func (priest *Priest) getPainAndSufferingSpell() *core.Spell { + return priest.RegisterSpell(core.SpellConfig{ + ActionID: core.ActionID{SpellID: 47948}, + ProcMask: core.ProcMaskSuppressedProc, + Flags: core.SpellFlagNoLogs, + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + priest.ShadowWordPain.Dot(target).Rollover(sim) + }, + }) +} func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell { numTicks := numTicksIdx - flags := core.SpellFlagChanneled + flags := core.SpellFlagChanneled | core.SpellFlagNoMetrics if numTicksIdx == 0 { numTicks = 3 flags |= core.SpellFlagAPL @@ -27,17 +74,18 @@ func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell { channelTime := tickLength * time.Duration(numTicks) rolloverChance := float64(priest.Talents.PainAndSuffering) / 3.0 - miseryCoeff := 0.257 * (1 + 0.05*float64(priest.Talents.Misery)) - hasGlyphOfShadow := priest.HasGlyph(int32(proto.PriestMajorGlyph_GlyphOfShadow)) shadowFocus := 0.02 * float64(priest.Talents.ShadowFocus) focusedMind := 0.05 * float64(priest.Talents.FocusedMind) + miseryCoeff := priest.getMiseryCoefficient() + + painAndSufferingSpell := priest.getPainAndSufferingSpell() + mindFlayTickSpell := priest.getMindFlayTickSpell(numTicksIdx) return priest.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 48156}.WithTag(numTicksIdx), SpellSchool: core.SpellSchoolShadow, ProcMask: core.ProcMaskSpellDamage, Flags: flags, - ManaCost: core.ManaCostOptions{ BaseCost: 0.09, Multiplier: 1 - (shadowFocus + focusedMind), @@ -64,7 +112,6 @@ func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell { } }, }, - BonusHitRating: float64(priest.Talents.ShadowFocus) * 1 * core.SpellHitRatingPerHitChance, BonusCritRating: 0 + float64(priest.Talents.MindMelt)*2*core.CritRatingPerCritChance + @@ -72,9 +119,7 @@ func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell { DamageMultiplier: 1 + 0.02*float64(priest.Talents.Darkness) + 0.01*float64(priest.Talents.TwinDisciplines), - CritMultiplier: priest.SpellCritMultiplier(1, float64(priest.Talents.ShadowPower)/5), - ThreatMultiplier: 1 - 0.08*float64(priest.Talents.ShadowAffinity), - + CritMultiplier: priest.SpellCritMultiplier(1, float64(priest.Talents.ShadowPower)/5), Dot: core.DotConfig{ Aura: core.Aura{ Label: "MindFlay-" + strconv.Itoa(int(numTicksIdx)), @@ -82,46 +127,19 @@ func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell { NumberOfTicks: numTicks, TickLength: tickLength, AffectedByCastSpeed: true, - - OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, _ bool) { - dot.SnapshotBaseDamage = 588.0/3 + miseryCoeff*dot.Spell.SpellPower() - dot.SnapshotCritChance = dot.Spell.SpellCritChance(target) - dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(dot.Spell.Unit.AttackTables[target.UnitIndex]) - }, OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) { - result := dot.CalcSnapshotDamage(sim, target, dot.OutcomeMagicHitAndSnapshotCrit) - - // TODO: THIS IS A HACK TRY TO FIGURE OUT A BETTER WAY TO DO THIS. - // MF is slightly different than other channeled spells in that its dmg ticks can proc things like a normal cast would. - // However, ticks do not proc JoW. Since the dmg portion and the initial application are the same Spell - // we can't set one without impacting the other. - // For now as a hack, set proc mask to prevent JoW, cast the tick dmg, and then unset it. - oldMask := dot.Spell.ProcMask - dot.Spell.ProcMask = core.ProcMaskProc - dot.Spell.DealDamage(sim, result) - dot.Spell.ProcMask = oldMask - - if result.Landed() { - priest.AddShadowWeavingStack(sim) - if result.DidCrit() && hasGlyphOfShadow { - priest.ShadowyInsightAura.Activate(sim) - } - if result.DidCrit() && priest.ImprovedSpiritTap != nil && sim.RandomFloat("Improved Spirit Tap") > 0.5 { - priest.ImprovedSpiritTap.Activate(sim) - } - } + mindFlayTickSpell.Cast(sim, target) + mindFlayTickSpell.SpellMetrics[target.UnitIndex].Casts -= 1 }, }, - ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { result := spell.CalcOutcome(sim, target, spell.OutcomeMagicHit) + mindFlayTickSpell.SpellMetrics[target.UnitIndex].Casts += 1 + if result.Landed() { - spell.SpellMetrics[target.UnitIndex].Hits-- if priest.ShadowWordPain.Dot(target).IsActive() { if rolloverChance == 1 || sim.RandomFloat("Pain and Suffering") < rolloverChance { - priest.ShadowWordPain.Dot(target).Rollover(sim) - // trinkets can proc from the re-application - priest.GetDummyProcSpell().Cast(sim, target) + painAndSufferingSpell.Cast(sim, target) } } spell.Dot(target).Apply(sim) diff --git a/sim/priest/priest.go b/sim/priest/priest.go index 80f7cb92b2..50956f2699 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -32,31 +32,33 @@ type Priest struct { SurgeOfLightProcAura *core.Aura - BindingHeal *core.Spell - CircleOfHealing *core.Spell - DevouringPlague *core.Spell - FlashHeal *core.Spell - GreaterHeal *core.Spell - HolyFire *core.Spell - InnerFocus *core.Spell - ShadowWordPain *core.Spell - MindBlast *core.Spell - MindFlay []*core.Spell - MindFlayAPL *core.Spell - MindSear []*core.Spell - MindSearAPL *core.Spell - Penance *core.Spell - PenanceHeal *core.Spell - PowerWordShield *core.Spell - PrayerOfHealing *core.Spell - PrayerOfMending *core.Spell - Renew *core.Spell - EmpoweredRenew *core.Spell - ShadowWordDeath *core.Spell - Shadowfiend *core.Spell - Smite *core.Spell - VampiricTouch *core.Spell - Dispersion *core.Spell + BindingHeal *core.Spell + CircleOfHealing *core.Spell + DevouringPlague *core.Spell + FlashHeal *core.Spell + GreaterHeal *core.Spell + HolyFire *core.Spell + InnerFocus *core.Spell + ShadowWordPain *core.Spell + MindBlast *core.Spell + MindFlay []*core.Spell + MindFlayModifier float64 + MindBlastModifier float64 + MindFlayAPL *core.Spell + MindSear []*core.Spell + MindSearAPL *core.Spell + Penance *core.Spell + PenanceHeal *core.Spell + PowerWordShield *core.Spell + PrayerOfHealing *core.Spell + PrayerOfMending *core.Spell + Renew *core.Spell + EmpoweredRenew *core.Spell + ShadowWordDeath *core.Spell + Shadowfiend *core.Spell + Smite *core.Spell + VampiricTouch *core.Spell + Dispersion *core.Spell WeakenedSouls core.AuraArray @@ -175,6 +177,8 @@ func (priest *Priest) AddShadowWeavingStack(sim *core.Simulation) { } func (priest *Priest) Reset(_ *core.Simulation) { + priest.MindFlayModifier = 1 + priest.MindBlastModifier = 1 } func New(char core.Character, selfBuffs SelfBuffs, talents string) *Priest { diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index ac15bee101..a55960874e 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -46,1158 +46,1158 @@ character_stats_results: { dps_results: { key: "TestShadow-AllItems-AbsolutionRegalia" value: { - dps: 5361.15198 - tps: 5229.55052 + dps: 5340.39921 + tps: 5208.29603 } } dps_results: { key: "TestShadow-AllItems-Althor'sAbacus-50359" value: { - dps: 7239.6256 - tps: 7184.45689 + dps: 7134.37294 + tps: 7103.15998 } } dps_results: { key: "TestShadow-AllItems-Althor'sAbacus-50366" value: { - dps: 7309.7482 - tps: 7246.60315 + dps: 7168.54783 + tps: 7136.87585 } } dps_results: { key: "TestShadow-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-Bandit'sInsignia-40371" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6949.14206 - tps: 6898.24552 - hps: 88.09348 + dps: 6852.81798 + tps: 6808.70324 + hps: 88.34279 } } dps_results: { key: "TestShadow-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6949.14206 - tps: 6898.24552 - hps: 88.09348 + dps: 6852.81798 + tps: 6808.70324 + hps: 88.34279 } } dps_results: { key: "TestShadow-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7181.44772 - tps: 7112.8071 + dps: 7092.80354 + tps: 7042.20806 } } dps_results: { key: "TestShadow-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6053.91017 - tps: 5892.11366 + dps: 6026.61376 + tps: 5871.31084 } } dps_results: { key: "TestShadow-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7175.23704 - tps: 6973.47846 + dps: 7028.70666 + tps: 6864.53589 } } dps_results: { key: "TestShadow-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-CorpseTongueCoin-50349" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-CorpseTongueCoin-50352" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 hps: 64 } } dps_results: { key: "TestShadow-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 6889.25904 - tps: 6802.72269 + dps: 6861.993 + tps: 6777.59417 } } dps_results: { key: "TestShadow-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 7960.18574 - tps: 7884.52925 + dps: 7792.0156 + tps: 7666.37977 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7060.42568 - tps: 7012.28519 + dps: 6971.5129 + tps: 6941.13772 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7110.92267 - tps: 7060.50141 + dps: 7024.49212 + tps: 6996.82188 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7128.37228 - tps: 7058.51049 + dps: 7110.34326 + tps: 6986.66952 } } dps_results: { key: "TestShadow-AllItems-Death'sChoice-47464" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6972.32853 - tps: 6929.36157 + dps: 6893.38409 + tps: 6852.96513 } } dps_results: { key: "TestShadow-AllItems-Deathbringer'sWill-50362" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-Deathbringer'sWill-50363" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-Defender'sCode-40257" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7139.99609 - tps: 7082.99659 + dps: 7019.02357 + tps: 6988.66934 } } dps_results: { key: "TestShadow-AllItems-DislodgedForeignObject-50348" value: { - dps: 7574.98001 - tps: 7510.18079 + dps: 7657.89849 + tps: 7462.94054 } } dps_results: { key: "TestShadow-AllItems-DislodgedForeignObject-50353" value: { - dps: 7517.30187 - tps: 7445.08656 + dps: 7571.57471 + tps: 7374.62075 } } dps_results: { key: "TestShadow-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-EmberSkyflareDiamond" value: { - dps: 7202.80038 - tps: 7133.36361 + dps: 7116.72773 + tps: 7060.79938 } } dps_results: { key: "TestShadow-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7121.76365 - tps: 7064.35093 + dps: 7015.56651 + tps: 6985.21229 } } dps_results: { key: "TestShadow-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7118.98625 - tps: 7061.33748 + dps: 7015.48684 + tps: 6985.34852 } } dps_results: { key: "TestShadow-AllItems-EphemeralSnowflake-50260" value: { - dps: 7115.64213 - tps: 7041.71225 + dps: 7104.20564 + tps: 6969.28563 } } dps_results: { key: "TestShadow-AllItems-EssenceofGossamer-37220" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7101.29637 - tps: 7063.00375 + dps: 7095.31798 + tps: 7053.18889 } } dps_results: { key: "TestShadow-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7249.80988 - tps: 7201.37011 + dps: 7183.31169 + tps: 7150.7884 } } dps_results: { key: "TestShadow-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7058.94231 - tps: 6988.80341 + dps: 6998.57382 + tps: 6927.25111 } } dps_results: { key: "TestShadow-AllItems-ForethoughtTalisman-40258" value: { - dps: 7129.14926 - tps: 7075.59082 + dps: 7020.47065 + tps: 6995.23986 } } dps_results: { key: "TestShadow-AllItems-ForgeEmber-37660" value: { - dps: 7122.9888 - tps: 7080.10191 + dps: 7028.00807 + tps: 6996.82479 } } dps_results: { key: "TestShadow-AllItems-ForlornSkyflareDiamond" value: { - dps: 7175.23704 - tps: 7114.77503 + dps: 7028.70666 + tps: 7003.53654 } } dps_results: { key: "TestShadow-AllItems-ForlornStarflareDiamond" value: { - dps: 7134.91902 - tps: 7076.65859 + dps: 7021.56301 + tps: 6996.44083 } } dps_results: { key: "TestShadow-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-FuturesightRune-38763" value: { - dps: 7129.1241 - tps: 7062.39926 + dps: 7058.85532 + tps: 6996.38278 } } dps_results: { key: "TestShadow-AllItems-GarbofFaith" value: { - dps: 6481.26721 - tps: 6377.07084 + dps: 6460.16673 + tps: 6326.67703 } } dps_results: { key: "TestShadow-AllItems-Gladiator'sInvestiture" value: { - dps: 6777.75349 - tps: 6681.73087 + dps: 6787.21826 + tps: 6683.78574 } } dps_results: { key: "TestShadow-AllItems-Gladiator'sRaiment" value: { - dps: 6995.087 - tps: 6859.42614 + dps: 6972.55256 + tps: 6767.09358 } } dps_results: { key: "TestShadow-AllItems-GlowingTwilightScale-54573" value: { - dps: 7292.11855 - tps: 7234.49383 + dps: 7150.93125 + tps: 7119.45182 } } dps_results: { key: "TestShadow-AllItems-GlowingTwilightScale-54589" value: { - dps: 7332.64 - tps: 7269.12848 + dps: 7196.49039 + tps: 7164.77955 } } dps_results: { key: "TestShadow-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7059.55234 - tps: 7017.96153 + dps: 6998.38145 + tps: 6960.0157 } } dps_results: { key: "TestShadow-AllItems-Heartpierce-49982" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-Heartpierce-50641" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7121.76365 - tps: 7064.35093 + dps: 7015.56651 + tps: 6985.21229 } } dps_results: { key: "TestShadow-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7118.98625 - tps: 7061.33748 + dps: 7015.48684 + tps: 6985.34852 } } dps_results: { key: "TestShadow-AllItems-IncisorFragment-37723" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7199.08385 - tps: 7125.15049 + dps: 7137.07349 + tps: 7063.19124 } } dps_results: { key: "TestShadow-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-LastWord-50179" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-LastWord-50708" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7108.94585 - tps: 7032.47748 + dps: 7044.64652 + tps: 6966.01066 } } dps_results: { key: "TestShadow-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7021.92397 - tps: 6983.12454 + dps: 6946.74048 + tps: 6917.6311 } } dps_results: { key: "TestShadow-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7356.0808 - tps: 7307.96916 + dps: 7244.0832 + tps: 7214.75383 } } dps_results: { key: "TestShadow-AllItems-Nibelung-49992" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-Nibelung-50648" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-AllItems-OfferingofSacrifice-37638" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-PetrifiedScarab-21685" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-PurifiedShardoftheGods" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-RegaliaofFaith" value: { - dps: 6194.25209 - tps: 6110.52339 + dps: 6197.09032 + tps: 6085.61137 } } dps_results: { key: "TestShadow-AllItems-ReignoftheDead-47316" value: { - dps: 7330.2158 - tps: 7289.23546 + dps: 7257.83359 + tps: 7238.67861 } } dps_results: { key: "TestShadow-AllItems-ReignoftheDead-47477" value: { - dps: 7377.18804 - tps: 7335.853 + dps: 7298.92142 + tps: 7280.25618 } } dps_results: { key: "TestShadow-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7274.75658 - tps: 7209.83122 + dps: 7126.72841 + tps: 7102.11532 } } dps_results: { key: "TestShadow-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7134.17335 - tps: 7072.29423 + dps: 7048.09601 + tps: 7001.64032 } } dps_results: { key: "TestShadow-AllItems-RuneofRepulsion-40372" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-SanctificationGarb" value: { - dps: 6987.90623 - tps: 6935.99324 + dps: 7118.20689 + tps: 6949.38857 } } dps_results: { key: "TestShadow-AllItems-SanctificationRegalia" value: { - dps: 6614.59733 - tps: 6526.98023 + dps: 6616.77375 + tps: 6514.22558 } } dps_results: { key: "TestShadow-AllItems-SealofthePantheon-36993" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-ShinyShardoftheGods" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-SliverofPureIce-50339" value: { - dps: 7287.45339 - tps: 7217.5803 + dps: 7202.11742 + tps: 7150.48681 } } dps_results: { key: "TestShadow-AllItems-SliverofPureIce-50346" value: { - dps: 7322.51279 - tps: 7251.8358 + dps: 7236.28633 + tps: 7191.8235 } } dps_results: { key: "TestShadow-AllItems-SoulPreserver-37111" value: { - dps: 7070.66178 - tps: 7017.95584 + dps: 6964.22634 + tps: 6939.55354 } } dps_results: { key: "TestShadow-AllItems-SouloftheDead-40382" value: { - dps: 7133.52265 - tps: 7064.95696 + dps: 7088.40453 + tps: 7013.81502 } } dps_results: { key: "TestShadow-AllItems-SparkofLife-37657" value: { - dps: 7134.05121 - tps: 7057.78587 + dps: 7086.56572 + tps: 7009.01865 } } dps_results: { key: "TestShadow-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6955.11268 - tps: 6904.1867 + dps: 6867.23308 + tps: 6831.70382 } } dps_results: { key: "TestShadow-AllItems-SwiftSkyflareDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-SwiftStarflareDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-SwiftWindfireDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7089.79177 - tps: 7011.19157 + dps: 6994.57078 + tps: 6938.36551 } } dps_results: { key: "TestShadow-AllItems-TearsoftheVanquished-47215" value: { - dps: 7066.53756 - tps: 6994.36798 + dps: 7002.88642 + tps: 6926.77501 } } dps_results: { key: "TestShadow-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6949.24067 - tps: 6898.31076 + dps: 6851.85438 + tps: 6807.92315 } } dps_results: { key: "TestShadow-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7103.1458 - tps: 7045.35855 + dps: 6989.94434 + tps: 6960.42529 } } dps_results: { key: "TestShadow-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6955.11268 - tps: 6904.1867 + dps: 6867.23308 + tps: 6831.70382 } } dps_results: { key: "TestShadow-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6955.11268 - tps: 6904.1867 + dps: 6867.23308 + tps: 6831.70382 } } dps_results: { key: "TestShadow-AllItems-TirelessSkyflareDiamond" value: { - dps: 7175.23704 - tps: 7114.77503 + dps: 7028.70666 + tps: 7003.53654 } } dps_results: { key: "TestShadow-AllItems-TirelessStarflareDiamond" value: { - dps: 7134.91902 - tps: 7076.65859 + dps: 7021.56301 + tps: 6996.44083 } } dps_results: { key: "TestShadow-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7174.23038 - tps: 7115.93063 + dps: 7228.21925 + tps: 7043.99365 } } dps_results: { key: "TestShadow-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7134.91902 - tps: 7076.65859 + dps: 7021.56301 + tps: 6996.44083 } } dps_results: { key: "TestShadow-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7175.23704 - tps: 7114.77503 + dps: 7028.70666 + tps: 7003.53654 } } dps_results: { key: "TestShadow-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7506.51799 - tps: 7460.78079 + dps: 7402.71595 + tps: 7383.66038 } } dps_results: { key: "TestShadow-AllItems-VestmentsofAbsolution" value: { - dps: 5147.90749 - tps: 5010.15025 + dps: 5167.23507 + tps: 5029.86656 } } dps_results: { key: "TestShadow-AllItems-WingedTalisman-37844" value: { - dps: 7086.05589 - tps: 7032.25508 + dps: 6979.29132 + tps: 6926.79478 } } dps_results: { key: "TestShadow-AllItems-Zabra'sRaiment" value: { - dps: 6532.34373 - tps: 6452.67515 + dps: 6547.53586 + tps: 6457.10903 } } dps_results: { key: "TestShadow-AllItems-Zabra'sRegalia" value: { - dps: 6939.21831 - tps: 6861.87011 + dps: 6880.21607 + tps: 6802.43268 } } dps_results: { key: "TestShadow-Average-Default" value: { - dps: 7322.55802 - tps: 7262.27609 + dps: 7271.60457 + tps: 7213.8219 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--FullBuffs-LongMultiTarget" value: { - dps: 7295.30456 - tps: 8044.11229 + dps: 7277.00773 + tps: 8015.99789 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--FullBuffs-LongSingleTarget" value: { - dps: 7295.30456 - tps: 7217.81331 + dps: 7277.00773 + tps: 7196.30479 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 7882.05762 - tps: 7960.81577 + dps: 7899.22649 + tps: 7976.81529 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--NoBuffs-LongMultiTarget" value: { - dps: 3756.14691 - tps: 4630.56815 + dps: 3755.15205 + tps: 4645.31823 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--NoBuffs-LongSingleTarget" value: { - dps: 3756.14691 - tps: 3680.88786 + dps: 3755.15205 + tps: 3678.45434 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 3767.13107 - tps: 3757.52686 + dps: 3713.44939 + tps: 3701.04956 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--FullBuffs-LongMultiTarget" value: { - dps: 6853.47779 - tps: 7769.80172 + dps: 6831.44009 + tps: 7722.57691 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--FullBuffs-LongSingleTarget" value: { - dps: 6853.47779 - tps: 6816.59393 + dps: 6831.44009 + tps: 6778.93818 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--FullBuffs-ShortSingleTarget" value: { - dps: 7643.54562 - tps: 7722.5935 + dps: 7564.40608 + tps: 7643.45395 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--NoBuffs-LongMultiTarget" value: { - dps: 3544.07965 - tps: 4496.91722 + dps: 3545.54944 + tps: 4490.90891 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--NoBuffs-LongSingleTarget" value: { - dps: 3544.07965 - tps: 3475.06581 + dps: 3545.54944 + tps: 3472.49421 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping--NoBuffs-ShortSingleTarget" value: { - dps: 3866.32439 - tps: 3673.34993 + dps: 3763.63335 + tps: 3634.92771 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--FullBuffs-LongMultiTarget" value: { - dps: 7276.82912 - tps: 8184.50902 + dps: 7164.56936 + tps: 8173.82255 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--FullBuffs-LongSingleTarget" value: { - dps: 7276.82912 - tps: 7219.48057 + dps: 7164.56936 + tps: 7145.1875 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--FullBuffs-ShortSingleTarget" value: { - dps: 8085.64572 - tps: 8165.0799 + dps: 8006.71042 + tps: 8086.24117 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--NoBuffs-LongMultiTarget" value: { - dps: 3656.97717 - tps: 4612.28254 + dps: 3644.45213 + tps: 4605.97925 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--NoBuffs-LongSingleTarget" value: { - dps: 3656.97717 - tps: 3586.99441 + dps: 3644.45213 + tps: 3573.81768 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal--NoBuffs-ShortSingleTarget" value: { - dps: 4116.35464 - tps: 3914.8625 + dps: 4069.06257 + tps: 3845.82139 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--FullBuffs-LongMultiTarget" value: { - dps: 7285.46672 - tps: 8033.46445 + dps: 7259.91567 + tps: 8000.06853 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--FullBuffs-LongSingleTarget" value: { - dps: 7285.46672 - tps: 7208.43706 + dps: 7259.91567 + tps: 7179.14478 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 7881.24864 - tps: 7960.03899 + dps: 7884.68438 + tps: 7962.30537 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--NoBuffs-LongMultiTarget" value: { - dps: 3744.17239 - tps: 4608.24386 + dps: 3751.95779 + tps: 4612.5661 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--NoBuffs-LongSingleTarget" value: { - dps: 3744.17239 - tps: 3668.87372 + dps: 3751.95779 + tps: 3673.19597 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 3758.37331 - tps: 3750.12264 + dps: 3706.94277 + tps: 3695.86903 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--FullBuffs-LongMultiTarget" value: { - dps: 6852.03204 - tps: 7759.3767 + dps: 6793.32296 + tps: 7748.01403 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--FullBuffs-LongSingleTarget" value: { - dps: 6852.03204 - tps: 6809.47177 + dps: 6793.32296 + tps: 6762.62597 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--FullBuffs-ShortSingleTarget" value: { - dps: 7638.36121 - tps: 7717.40908 + dps: 7557.39363 + tps: 7636.4415 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--NoBuffs-LongMultiTarget" value: { - dps: 3546.92649 - tps: 4520.96329 + dps: 3521.70157 + tps: 4475.80026 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--NoBuffs-LongSingleTarget" value: { - dps: 3546.92649 - tps: 3478.49156 + dps: 3521.70157 + tps: 3448.79377 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping--NoBuffs-ShortSingleTarget" value: { - dps: 3858.06418 - tps: 3666.50465 + dps: 3755.32093 + tps: 3627.94993 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--FullBuffs-LongMultiTarget" value: { - dps: 7288.39974 - tps: 8176.23169 + dps: 7156.71411 + tps: 8138.44292 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--FullBuffs-LongSingleTarget" value: { - dps: 7288.39974 - tps: 7224.12311 + dps: 7156.71411 + tps: 7122.25391 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--FullBuffs-ShortSingleTarget" value: { - dps: 8070.42799 - tps: 8149.86217 + dps: 8000.84015 + tps: 8080.37091 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--NoBuffs-LongMultiTarget" value: { - dps: 3658.30569 - tps: 4621.00358 + dps: 3650.70875 + tps: 4622.53473 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--NoBuffs-LongSingleTarget" value: { - dps: 3658.30569 - tps: 3588.842 + dps: 3650.70875 + tps: 3580.063 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal--NoBuffs-ShortSingleTarget" value: { - dps: 4111.50989 - tps: 3911.24107 + dps: 4067.46451 + tps: 3845.41017 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--FullBuffs-LongMultiTarget" value: { - dps: 7290.05214 - tps: 8026.11688 + dps: 7266.67509 + tps: 7999.12625 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--FullBuffs-LongSingleTarget" value: { - dps: 7290.05214 - tps: 7212.414 + dps: 7266.67509 + tps: 7185.44295 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 7881.68817 - tps: 7959.64875 + dps: 7889.16618 + tps: 7966.72117 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--NoBuffs-LongMultiTarget" value: { - dps: 3743.33943 - tps: 4598.28746 + dps: 3760.03719 + tps: 4626.51515 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--NoBuffs-LongSingleTarget" value: { - dps: 3743.33943 - tps: 3667.33737 + dps: 3760.03719 + tps: 3681.84098 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 3760.48331 - tps: 3752.03932 + dps: 3708.93419 + tps: 3697.66948 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--FullBuffs-LongMultiTarget" value: { - dps: 6859.55335 - tps: 7766.58264 + dps: 6802.66091 + tps: 7731.23935 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--FullBuffs-LongSingleTarget" value: { - dps: 6859.55335 - tps: 6816.83348 + dps: 6802.66091 + tps: 6766.53192 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--FullBuffs-ShortSingleTarget" value: { - dps: 7640.38248 - tps: 7719.36436 + dps: 7561.61334 + tps: 7640.59522 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--NoBuffs-LongMultiTarget" value: { - dps: 3551.38333 - tps: 4523.70736 + dps: 3518.84746 + tps: 4467.37091 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--NoBuffs-LongSingleTarget" value: { - dps: 3551.38333 - tps: 3482.96462 + dps: 3518.84746 + tps: 3445.49878 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping--NoBuffs-ShortSingleTarget" value: { - dps: 3860.1957 - tps: 3668.32556 + dps: 3757.25166 + tps: 3629.63259 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--FullBuffs-LongMultiTarget" value: { - dps: 7299.94354 - tps: 8186.30318 + dps: 7161.34564 + tps: 8141.36228 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--FullBuffs-LongSingleTarget" value: { - dps: 7299.94354 - tps: 7235.66473 + dps: 7161.34564 + tps: 7126.63785 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--FullBuffs-ShortSingleTarget" value: { - dps: 8072.89263 - tps: 8152.26081 + dps: 8005.35458 + tps: 8084.81933 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--NoBuffs-LongMultiTarget" value: { - dps: 3658.03024 - tps: 4629.97135 + dps: 3637.09443 + tps: 4596.32053 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--NoBuffs-LongSingleTarget" value: { - dps: 3658.03024 - tps: 3589.22862 + dps: 3637.09443 + tps: 3565.87086 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal--NoBuffs-ShortSingleTarget" value: { - dps: 4113.76812 - tps: 3913.1787 + dps: 4069.64375 + tps: 3847.25567 } } dps_results: { key: "TestShadow-SwitchInFrontOfTarget-Default" value: { - dps: 7287.0436 - tps: 7235.66473 + dps: 7149.75637 + tps: 7126.63785 } } diff --git a/sim/priest/shadow_word_pain.go b/sim/priest/shadow_word_pain.go index 4c998cb81f..24ecf88858 100644 --- a/sim/priest/shadow_word_pain.go +++ b/sim/priest/shadow_word_pain.go @@ -48,26 +48,12 @@ func (priest *Priest) registerShadowWordPainSpell() { Aura: core.Aura{ Label: "ShadowWordPain", OnGain: func(_ *core.Aura, _ *core.Simulation) { - priest.MindBlast.DamageMultiplier *= twistedFaithMultiplier - if priest.MindFlayAPL != nil { - priest.MindFlayAPL.DamageMultiplier *= mindFlayMod - } - for _, spell := range priest.MindFlay { - if spell != nil { - spell.DamageMultiplier *= mindFlayMod - } - } + priest.MindBlastModifier *= twistedFaithMultiplier + priest.MindFlayModifier *= mindFlayMod }, OnExpire: func(_ *core.Aura, _ *core.Simulation) { - priest.MindBlast.DamageMultiplier /= twistedFaithMultiplier - if priest.MindFlayAPL != nil { - priest.MindFlayAPL.DamageMultiplier /= mindFlayMod - } - for _, spell := range priest.MindFlay { - if spell != nil { - spell.DamageMultiplier /= mindFlayMod - } - } + priest.MindBlastModifier /= twistedFaithMultiplier + priest.MindFlayModifier /= mindFlayMod }, }, diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 4f02661ae7..019b3efbc2 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -46,1089 +46,1089 @@ character_stats_results: { dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50359" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50366" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 6580.95744 - tps: 4672.47978 + dps: 6589.05335 + tps: 4678.22788 } } dps_results: { key: "TestAssassination-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-Bandit'sInsignia-40371" value: { - dps: 6762.75421 - tps: 4801.55549 + dps: 6742.74812 + tps: 4787.35117 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6556.21069 - tps: 4654.90959 - hps: 88.32485 + dps: 6536.83395 + tps: 4641.1521 + hps: 88.34261 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6556.21069 - tps: 4654.90959 - hps: 88.32485 + dps: 6536.83395 + tps: 4641.1521 + hps: 88.34261 } } dps_results: { key: "TestAssassination-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6781.39858 - tps: 4814.79299 + dps: 6744.64507 + tps: 4788.698 } } dps_results: { key: "TestAssassination-AllItems-BlackBruise-50035" value: { - dps: 6564.85473 - tps: 4661.04686 + dps: 6583.35536 + tps: 4674.1823 } } dps_results: { key: "TestAssassination-AllItems-BlackBruise-50692" value: { - dps: 6620.0939 - tps: 4700.26667 + dps: 6652.46479 + tps: 4723.25 } } dps_results: { key: "TestAssassination-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5017.35757 - tps: 3562.32387 + dps: 4969.32185 + tps: 3528.21852 } } dps_results: { key: "TestAssassination-AllItems-BonescytheBattlegear" value: { - dps: 6171.60391 - tps: 4381.83878 + dps: 6151.65361 + tps: 4367.67406 } } dps_results: { key: "TestAssassination-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4691.48859 + dps: 6717.49389 + tps: 4674.03225 } } dps_results: { key: "TestAssassination-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6890.9945 - tps: 4892.6061 + dps: 6853.57959 + tps: 4866.04151 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50349" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50352" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 hps: 64 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6693.33497 - tps: 4752.26783 + dps: 6705.20884 + tps: 4760.69827 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6733.1874 - tps: 4780.56306 + dps: 6731.28903 + tps: 4779.21521 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6707.11673 - tps: 4762.05288 + dps: 6696.01025 + tps: 4754.16728 } } dps_results: { key: "TestAssassination-AllItems-Death'sChoice-47464" value: { - dps: 7078.84194 - tps: 5025.97777 + dps: 7083.95142 + tps: 5029.6055 } } dps_results: { key: "TestAssassination-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6635.60587 - tps: 4711.28017 + dps: 6657.35972 + tps: 4726.7254 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50362" value: { - dps: 6962.64002 - tps: 4943.47441 + dps: 6939.93033 + tps: 4927.35053 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50363" value: { - dps: 7032.12354 - tps: 4992.80771 + dps: 7006.81701 + tps: 4974.84008 } } dps_results: { key: "TestAssassination-AllItems-Defender'sCode-40257" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6771.22256 - tps: 4807.56802 + dps: 6758.84404 + tps: 4798.77927 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50348" value: { - dps: 6766.54454 - tps: 4804.24663 + dps: 6755.03432 + tps: 4796.07437 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50353" value: { - dps: 6710.87833 - tps: 4764.72362 + dps: 6749.47759 + tps: 4792.12909 } } dps_results: { key: "TestAssassination-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-EmberSkyflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6781.39858 - tps: 4814.79299 + dps: 6744.64507 + tps: 4788.698 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6787.47959 - tps: 4819.11051 + dps: 6756.88982 + tps: 4797.39177 } } dps_results: { key: "TestAssassination-AllItems-EphemeralSnowflake-50260" value: { - dps: 6696.73617 - tps: 4754.68268 + dps: 6634.64383 + tps: 4710.59712 } } dps_results: { key: "TestAssassination-AllItems-EssenceofGossamer-37220" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6716.47395 - tps: 4768.6965 + dps: 6730.2666 + tps: 4778.48929 } } dps_results: { key: "TestAssassination-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6673.6112 - tps: 4738.26395 + dps: 6683.11998 + tps: 4745.01518 } } dps_results: { key: "TestAssassination-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6531.24038 + tps: 4637.18067 } } dps_results: { key: "TestAssassination-AllItems-ForethoughtTalisman-40258" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-ForgeEmber-37660" value: { - dps: 6667.04099 - tps: 4733.5991 + dps: 6628.97671 + tps: 4706.57347 } } dps_results: { key: "TestAssassination-AllItems-ForlornSkyflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-ForlornStarflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6802.61484 - tps: 4829.85654 + dps: 6782.28505 + tps: 4815.42239 } } dps_results: { key: "TestAssassination-AllItems-FuturesightRune-38763" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-Gladiator'sVestments" value: { - dps: 6625.40493 - tps: 4704.0375 + dps: 6574.44674 + tps: 4667.85719 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54573" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54589" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6717.19953 - tps: 4769.21167 + dps: 6696.2889 + tps: 4754.36512 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-49982" value: { - dps: 6881.52109 - tps: 4885.87998 + dps: 6872.67315 + tps: 4879.59794 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-50641" value: { - dps: 6881.52109 - tps: 4885.87998 + dps: 6872.67315 + tps: 4879.59794 } } dps_results: { key: "TestAssassination-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6781.39858 - tps: 4814.79299 + dps: 6744.64507 + tps: 4788.698 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6787.47959 - tps: 4819.11051 + dps: 6756.88982 + tps: 4797.39177 } } dps_results: { key: "TestAssassination-AllItems-IncisorFragment-37723" value: { - dps: 6724.15775 - tps: 4774.152 + dps: 6703.67205 + tps: 4759.60716 } } dps_results: { key: "TestAssassination-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6771.59546 - tps: 4807.83278 + dps: 6753.21864 + tps: 4794.78523 hps: 11.11293 } } dps_results: { key: "TestAssassination-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6784.64401 - tps: 4817.09725 + dps: 6801.41404 + tps: 4829.00397 } } dps_results: { key: "TestAssassination-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6785.43915 - tps: 4817.6618 + dps: 6777.97405 + tps: 4812.36158 } } dps_results: { key: "TestAssassination-AllItems-OfferingofSacrifice-37638" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6769.13889 - tps: 4806.08861 + dps: 6743.93574 + tps: 4788.19438 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6775.38755 - tps: 4810.52516 + dps: 6750.15736 + tps: 4792.61172 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedScarab-21685" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-PurifiedShardoftheGods" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47316" value: { - dps: 6734.44479 - tps: 4781.4558 + dps: 6713.03414 + tps: 4766.25424 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47477" value: { - dps: 6756.86436 - tps: 4797.37369 + dps: 6735.21172 + tps: 4782.00032 } } dps_results: { key: "TestAssassination-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6881.52109 - tps: 4885.87998 + dps: 6872.67315 + tps: 4879.59794 } } dps_results: { key: "TestAssassination-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-RuneofRepulsion-40372" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-SealofthePantheon-36993" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-Shadowblade'sBattlegear" value: { - dps: 7366.01802 - tps: 5229.87279 + dps: 7333.56889 + tps: 5206.83391 } } dps_results: { key: "TestAssassination-AllItems-ShinyShardoftheGods" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-Slayer'sArmor" value: { - dps: 4930.43023 - tps: 3500.60547 + dps: 4927.46372 + tps: 3498.49924 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50339" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50346" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-SoulPreserver-37111" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-SouloftheDead-40382" value: { - dps: 6671.85022 - tps: 4737.01365 + dps: 6680.56117 + tps: 4743.19843 } } dps_results: { key: "TestAssassination-AllItems-SparkofLife-37657" value: { - dps: 6646.64041 - tps: 4719.11469 + dps: 6608.72109 + tps: 4692.19197 } } dps_results: { key: "TestAssassination-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6691.35437 - tps: 4750.8616 + dps: 6668.18318 + tps: 4734.41006 } } dps_results: { key: "TestAssassination-AllItems-StormshroudArmor" value: { - dps: 5401.69002 - tps: 3835.19991 + dps: 5369.05647 + tps: 3812.03009 } } dps_results: { key: "TestAssassination-AllItems-SwiftSkyflareDiamond" value: { - dps: 6775.38755 - tps: 4810.52516 + dps: 6750.15736 + tps: 4792.61172 } } dps_results: { key: "TestAssassination-AllItems-SwiftStarflareDiamond" value: { - dps: 6769.13889 - tps: 4806.08861 + dps: 6743.93574 + tps: 4788.19438 } } dps_results: { key: "TestAssassination-AllItems-SwiftWindfireDiamond" value: { - dps: 6758.20372 - tps: 4798.32464 + dps: 6733.04792 + tps: 4780.46402 } } dps_results: { key: "TestAssassination-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-TearsoftheVanquished-47215" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-TerrorbladeBattlegear" value: { - dps: 6618.87148 - tps: 4699.39875 + dps: 6610.43478 + tps: 4693.40869 } } dps_results: { key: "TestAssassination-AllItems-TheFistsofFury" value: { - dps: 5759.06495 - tps: 4088.93611 + dps: 5740.83162 + tps: 4075.99045 } } dps_results: { key: "TestAssassination-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6808.65207 - tps: 4834.14297 + dps: 6803.41684 + tps: 4830.42596 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6914.46606 - tps: 4909.2709 + dps: 6896.67473 + tps: 4896.63906 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7037.26261 - tps: 4996.45645 + dps: 7006.53258 + tps: 4974.63813 } } dps_results: { key: "TestAssassination-AllItems-TirelessSkyflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-TirelessStarflareDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6632.82688 - tps: 4709.30708 + dps: 6623.84813 + tps: 4702.93217 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6742.58205 - tps: 4787.23325 + dps: 6717.49389 + tps: 4769.42066 } } dps_results: { key: "TestAssassination-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5332.8872 - tps: 3786.34991 + dps: 5311.62633 + tps: 3771.2547 } } dps_results: { key: "TestAssassination-AllItems-VanCleef'sBattlegear" value: { - dps: 6380.57261 - tps: 4530.20655 + dps: 6408.34081 + tps: 4549.92197 } } dps_results: { key: "TestAssassination-AllItems-WingedTalisman-37844" value: { - dps: 6555.99746 - tps: 4654.75819 + dps: 6536.60034 + tps: 4640.98624 } } dps_results: { key: "TestAssassination-Average-Default" value: { - dps: 6870.63311 - tps: 4878.14951 + dps: 6856.42159 + tps: 4868.05933 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 6881.52109 - tps: 4885.87998 + dps: 6872.67315 + tps: 4879.59794 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 6881.52109 - tps: 4885.87998 + dps: 6872.67315 + tps: 4879.59794 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 8163.19938 - tps: 5795.87156 + dps: 8150.39592 + tps: 5786.7811 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 3519.31915 - tps: 2498.7166 + dps: 3526.89629 + tps: 2504.09636 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3519.31915 - tps: 2498.7166 + dps: 3526.89629 + tps: 2504.09636 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3753.45735 - tps: 2664.95472 + dps: 3679.37655 + tps: 2612.35735 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 4642.01915 - tps: 3295.8336 + dps: 4625.25466 + tps: 3283.93081 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 4642.01915 - tps: 3295.8336 + dps: 4625.25466 + tps: 3283.93081 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5492.35461 - tps: 3899.57177 + dps: 5467.05099 + tps: 3881.6062 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 2417.92916 - tps: 1716.7297 + dps: 2426.06105 + tps: 1722.50334 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2417.92916 - tps: 1716.7297 + dps: 2426.06105 + tps: 1722.50334 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2632.47856 - tps: 1869.05978 + dps: 2586.18354 + tps: 1836.19031 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 6519.7203 - tps: 4629.00141 + dps: 6500.84953 + tps: 4615.60317 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 6519.7203 - tps: 4629.00141 + dps: 6500.84953 + tps: 4615.60317 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 7704.73798 - tps: 5470.36396 + dps: 7670.43146 + tps: 5446.00634 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 3339.88441 - tps: 2371.31793 + dps: 3348.40359 + tps: 2377.36655 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3339.88441 - tps: 2371.31793 + dps: 3348.40359 + tps: 2377.36655 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3536.26176 - tps: 2510.74585 + dps: 3476.89877 + tps: 2468.59813 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 5081.10525 - tps: 3607.58473 + dps: 5075.65882 + tps: 3603.71776 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 5081.10525 - tps: 3607.58473 + dps: 5075.65882 + tps: 3603.71776 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5847.33392 - tps: 4151.60708 + dps: 5791.75816 + tps: 4112.14829 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 2555.01882 - tps: 1814.06336 + dps: 2535.13794 + tps: 1799.94794 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2555.01882 - tps: 1814.06336 + dps: 2535.13794 + tps: 1799.94794 } } dps_results: { key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2711.91782 - tps: 1925.46165 + dps: 2670.39361 + tps: 1895.97946 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 6920.96973 - tps: 4913.88851 + dps: 6918.50506 + tps: 4912.13859 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 6920.96973 - tps: 4913.88851 + dps: 6918.50506 + tps: 4912.13859 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 8246.18822 - tps: 5854.79363 + dps: 8230.60202 + tps: 5843.72743 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 3551.74143 - tps: 2521.73642 + dps: 3546.27051 + tps: 2517.85206 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3551.74143 - tps: 2521.73642 + dps: 3546.27051 + tps: 2517.85206 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3795.70474 - tps: 2694.95037 + dps: 3724.17015 + tps: 2644.16081 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 4669.16398 - tps: 3315.10643 + dps: 4653.34813 + tps: 3303.87718 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 4669.16398 - tps: 3315.10643 + dps: 4653.34813 + tps: 3303.87718 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5545.66292 - tps: 3937.42067 + dps: 5524.71018 + tps: 3922.54423 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 2439.77407 - tps: 1732.23959 + dps: 2439.13693 + tps: 1731.78722 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2439.77407 - tps: 1732.23959 + dps: 2439.13693 + tps: 1731.78722 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2666.21298 - tps: 1893.01122 + dps: 2619.05101 + tps: 1859.52622 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 6559.37346 - tps: 4657.15515 + dps: 6540.56507 + tps: 4643.8012 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 6559.37346 - tps: 4657.15515 + dps: 6540.56507 + tps: 4643.8012 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 7774.64689 - tps: 5519.99929 + dps: 7743.92772 + tps: 5498.18868 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 3365.69631 - tps: 2389.64438 + dps: 3364.50167 + tps: 2388.79619 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3365.69631 - tps: 2389.64438 + dps: 3364.50167 + tps: 2388.79619 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3570.15603 - tps: 2534.81078 + dps: 3513.70596 + tps: 2494.73123 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 5112.58936 - tps: 3629.93844 + dps: 5103.7403 + tps: 3623.65561 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 5112.58936 - tps: 3629.93844 + dps: 5103.7403 + tps: 3623.65561 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5908.17085 - tps: 4194.8013 + dps: 5853.51701 + tps: 4155.99708 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 2573.94761 - tps: 1827.5028 + dps: 2557.26199 + tps: 1815.65601 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2573.94761 - tps: 1827.5028 + dps: 2557.26199 + tps: 1815.65601 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2743.01479 - tps: 1947.5405 + dps: 2701.62673 + tps: 1918.15498 } } dps_results: { key: "TestAssassination-SwitchInFrontOfTarget-Default" value: { - dps: 6471.0495 - tps: 4594.44514 + dps: 6414.02532 + tps: 4553.95798 } } diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index ab21acff0c..6a380a4d61 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -46,810 +46,810 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50359" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50366" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 5892.68414 - tps: 4183.80574 + dps: 6020.19555 + tps: 4274.33884 } } dps_results: { key: "TestCombat-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-Bandit'sInsignia-40371" value: { - dps: 6065.86651 - tps: 4306.76522 + dps: 6196.90597 + tps: 4399.80324 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50354" value: { - dps: 5875.51939 - tps: 4171.61877 - hps: 87.65983 + dps: 6003.03667 + tps: 4262.15604 + hps: 87.95431 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50726" value: { - dps: 5875.51939 - tps: 4171.61877 - hps: 87.65983 + dps: 6003.03667 + tps: 4262.15604 + hps: 87.95431 } } dps_results: { key: "TestCombat-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6029.94776 - tps: 4281.26291 + dps: 6162.97574 + tps: 4375.71277 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50035" value: { - dps: 6338.44772 - tps: 4500.29788 + dps: 6481.085 + tps: 4601.57035 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50692" value: { - dps: 6446.09685 - tps: 4576.72876 + dps: 6590.36517 + tps: 4679.15927 } } dps_results: { key: "TestCombat-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4693.25718 - tps: 3332.2126 + dps: 4806.21089 + tps: 3412.40973 } } dps_results: { key: "TestCombat-AllItems-BonescytheBattlegear" value: { - dps: 5612.80191 - tps: 3985.08935 + dps: 5751.59648 + tps: 4083.6335 } } dps_results: { key: "TestCombat-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4178.81382 + dps: 6136.71979 + tps: 4269.92963 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6135.75143 - tps: 4356.38352 + dps: 6271.38405 + tps: 4452.68268 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50349" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50352" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 hps: 64 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 5993.73374 - tps: 4255.55095 + dps: 6125.60611 + tps: 4349.18034 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6029.87132 - tps: 4281.20864 + dps: 6161.28481 + tps: 4374.51221 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6017.90963 - tps: 4272.71584 + dps: 6148.16937 + tps: 4365.20025 } } dps_results: { key: "TestCombat-AllItems-Death'sChoice-47464" value: { - dps: 6330.44671 - tps: 4494.61717 + dps: 6469.89957 + tps: 4593.62869 } } dps_results: { key: "TestCombat-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 5973.19949 - tps: 4240.97164 + dps: 6104.9259 + tps: 4334.49739 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50362" value: { - dps: 6288.08479 - tps: 4464.5402 + dps: 6421.86442 + tps: 4559.52374 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50363" value: { - dps: 6331.45818 - tps: 4495.33531 + dps: 6473.4777 + tps: 4596.16917 } } dps_results: { key: "TestCombat-AllItems-Defender'sCode-40257" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6033.47193 - tps: 4283.76507 + dps: 6165.85471 + tps: 4377.75684 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50348" value: { - dps: 6105.21706 - tps: 4334.70411 + dps: 6222.38409 + tps: 4417.8927 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50353" value: { - dps: 6073.38478 - tps: 4312.1032 + dps: 6209.98064 + tps: 4409.08626 } } dps_results: { key: "TestCombat-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-EmberSkyflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6029.94776 - tps: 4281.26291 + dps: 6162.97574 + tps: 4375.71277 } } dps_results: { key: "TestCombat-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6025.96141 - tps: 4278.4326 + dps: 6159.53177 + tps: 4373.26756 } } dps_results: { key: "TestCombat-AllItems-EphemeralSnowflake-50260" value: { - dps: 6021.10738 - tps: 4274.98624 + dps: 6149.04727 + tps: 4365.82356 } } dps_results: { key: "TestCombat-AllItems-EssenceofGossamer-37220" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6019.75994 - tps: 4274.02956 + dps: 6154.82091 + tps: 4369.92285 } } dps_results: { key: "TestCombat-AllItems-EyeoftheBroodmother-45308" value: { - dps: 5978.92332 - tps: 4245.03556 + dps: 6110.89855 + tps: 4338.73797 } } dps_results: { key: "TestCombat-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-ForethoughtTalisman-40258" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-ForgeEmber-37660" value: { - dps: 5957.62119 - tps: 4229.91105 + dps: 6089.25673 + tps: 4323.37228 } } dps_results: { key: "TestCombat-AllItems-ForlornSkyflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-ForlornStarflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6104.52203 - tps: 4334.21064 + dps: 6236.19852 + tps: 4427.70095 } } dps_results: { key: "TestCombat-AllItems-FuturesightRune-38763" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 5983.92044 - tps: 4248.58351 + dps: 6125.10702 + tps: 4348.82598 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54573" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54589" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6009.40182 - tps: 4266.67529 + dps: 6136.31215 + tps: 4356.78162 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-49982" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-50641" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6029.94776 - tps: 4281.26291 + dps: 6162.97574 + tps: 4375.71277 } } dps_results: { key: "TestCombat-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6025.96141 - tps: 4278.4326 + dps: 6159.53177 + tps: 4373.26756 } } dps_results: { key: "TestCombat-AllItems-IncisorFragment-37723" value: { - dps: 6047.15909 - tps: 4293.48295 + dps: 6177.98062 + tps: 4386.36624 } } dps_results: { key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6035.69902 - tps: 4285.3463 + dps: 6166.80386 + tps: 4378.43074 hps: 11.11293 } } dps_results: { key: "TestCombat-AllItems-LastWord-50179" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-LastWord-50708" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-MajesticDragonFigurine-40430" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6090.65086 - tps: 4324.36211 + dps: 6231.86002 + tps: 4424.62061 } } dps_results: { key: "TestCombat-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6032.31656 - tps: 4282.94476 + dps: 6172.25491 + tps: 4382.30099 } } dps_results: { key: "TestCombat-AllItems-Nibelung-49992" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-Nibelung-50648" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-OfferingofSacrifice-37638" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6030.34674 - tps: 4281.54618 + dps: 6161.72843 + tps: 4374.82718 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6036.12982 - tps: 4285.65217 + dps: 6167.61281 + tps: 4379.0051 } } dps_results: { key: "TestCombat-AllItems-PetrifiedScarab-21685" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-PurifiedShardoftheGods" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47316" value: { - dps: 6015.35996 - tps: 4270.90557 + dps: 6140.37485 + tps: 4359.66614 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47477" value: { - dps: 6033.05957 - tps: 4283.47229 + dps: 6157.83425 + tps: 4372.06232 } } dps_results: { key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-RuneofRepulsion-40372" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-SealofthePantheon-36993" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-Shadowblade'sBattlegear" value: { - dps: 6359.27517 - tps: 4515.08537 + dps: 6457.0654 + tps: 4584.51643 } } dps_results: { key: "TestCombat-AllItems-Shadowmourne-49623" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-AllItems-ShinyShardoftheGods" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-Slayer'sArmor" value: { - dps: 4633.77158 - tps: 3289.97782 + dps: 4746.01154 + tps: 3369.66819 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50339" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50346" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-SoulPreserver-37111" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-SouloftheDead-40382" value: { - dps: 5983.38315 - tps: 4248.20204 + dps: 6115.98421 + tps: 4342.34879 } } dps_results: { key: "TestCombat-AllItems-SparkofLife-37657" value: { - dps: 5976.11925 - tps: 4243.04467 + dps: 6111.51455 + tps: 4339.17533 } } dps_results: { key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6046.36633 - tps: 4292.9201 + dps: 6184.23049 + tps: 4390.80365 } } dps_results: { key: "TestCombat-AllItems-StormshroudArmor" value: { - dps: 4811.97007 - tps: 3416.49875 + dps: 4895.70314 + tps: 3475.94923 } } dps_results: { key: "TestCombat-AllItems-SwiftSkyflareDiamond" value: { - dps: 6036.12982 - tps: 4285.65217 + dps: 6167.61281 + tps: 4379.0051 } } dps_results: { key: "TestCombat-AllItems-SwiftStarflareDiamond" value: { - dps: 6030.34674 - tps: 4281.54618 + dps: 6161.72843 + tps: 4374.82718 } } dps_results: { key: "TestCombat-AllItems-SwiftWindfireDiamond" value: { - dps: 6020.22635 - tps: 4274.36071 + dps: 6151.43076 + tps: 4367.51584 } } dps_results: { key: "TestCombat-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-TearsoftheVanquished-47215" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-TerrorbladeBattlegear" value: { - dps: 5981.24451 - tps: 4246.6836 + dps: 6126.14351 + tps: 4349.56189 } } dps_results: { key: "TestCombat-AllItems-TheFistsofFury" value: { - dps: 5356.68377 - tps: 3803.24548 + dps: 5466.14749 + tps: 3880.96472 } } dps_results: { key: "TestCombat-AllItems-TheGeneral'sHeart-45507" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5481.13306 - tps: 3891.60448 + dps: 5614.22095 + tps: 3986.09687 } } dps_results: { key: "TestCombat-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6089.59321 - tps: 4323.61118 + dps: 6215.00327 + tps: 4412.65232 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6192.52172 - tps: 4396.69042 + dps: 6319.81241 + tps: 4487.06681 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6213.72984 - tps: 4411.74818 + dps: 6346.17622 + tps: 4505.78512 } } dps_results: { key: "TestCombat-AllItems-TirelessSkyflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-TirelessStarflareDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 5967.59286 - tps: 4236.99093 + dps: 6078.93125 + tps: 4316.04119 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6005.76864 - tps: 4264.09574 + dps: 6136.71979 + tps: 4357.07105 } } dps_results: { key: "TestCombat-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 4990.56233 - tps: 3543.29925 + dps: 5115.81058 + tps: 3632.22551 } } dps_results: { key: "TestCombat-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 5767.56688 - tps: 4094.97249 + dps: 5896.89789 + tps: 4186.7975 } } dps_results: { key: "TestCombat-AllItems-VanCleef'sBattlegear" value: { - dps: 5788.52159 - tps: 4109.85033 + dps: 5901.50169 + tps: 4190.0662 } } dps_results: { key: "TestCombat-AllItems-WingedTalisman-37844" value: { - dps: 5874.7981 - tps: 4171.10665 + dps: 6002.39962 + tps: 4261.70373 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 6123.22826 - tps: 4347.49206 + dps: 6282.69047 + tps: 4460.71024 } } dps_results: { @@ -897,22 +897,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11092.18164 - tps: 7875.44897 + dps: 11003.65983 + tps: 7812.59848 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 3842.72122 - tps: 2728.33207 + dps: 3832.62421 + tps: 2721.16319 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 4659.77048 - tps: 3308.43704 + dps: 4650.41989 + tps: 3301.79812 } } dps_results: { @@ -939,22 +939,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongMultiTarget" value: { - dps: 5200.93845 - tps: 3692.6663 + dps: 5336.95498 + tps: 3789.23804 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongSingleTarget" value: { - dps: 4448.56224 - tps: 3158.47919 + dps: 4586.81037 + tps: 3256.63536 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 5301.95789 - tps: 3764.3901 + dps: 5393.65124 + tps: 3829.49238 } } dps_results: { @@ -1023,22 +1023,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11885.77014 - tps: 8438.8968 + dps: 11789.28212 + tps: 8370.3903 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 5551.07296 - tps: 3941.26181 + dps: 5542.47854 + tps: 3935.15977 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 6678.83741 - tps: 4741.97456 + dps: 6662.9462 + tps: 4730.6918 } } dps_results: { @@ -1065,22 +1065,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-LongMultiTarget" value: { - dps: 6809.89924 - tps: 4835.02846 + dps: 6943.91425 + tps: 4930.17912 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-LongSingleTarget" value: { - dps: 6140.87137 - tps: 4360.01867 + dps: 6276.26347 + tps: 4456.14706 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 7292.76713 - tps: 5177.86466 + dps: 7382.0816 + tps: 5241.27793 } } dps_results: { @@ -1149,22 +1149,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11329.56118 - tps: 8043.98844 + dps: 11272.85555 + tps: 8003.72744 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 5270.46936 - tps: 3742.03324 + dps: 5255.3221 + tps: 3731.27869 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 6295.37965 - tps: 4469.71955 + dps: 6293.34636 + tps: 4468.27592 } } dps_results: { @@ -1191,22 +1191,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-LongMultiTarget" value: { - dps: 6507.63726 - tps: 4620.42245 + dps: 6642.81607 + tps: 4716.39941 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-LongSingleTarget" value: { - dps: 5834.95109 - tps: 4142.81527 + dps: 5969.65522 + tps: 4238.4552 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 6900.73177 - tps: 4899.51956 + dps: 6981.73182 + tps: 4957.02959 } } dps_results: { @@ -1275,22 +1275,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 10007.14849 - tps: 7105.07543 + dps: 9891.49677 + tps: 7022.96271 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 4619.02643 - tps: 3279.50876 + dps: 4618.04619 + tps: 3278.8128 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 5726.04095 - tps: 4065.48907 + dps: 5722.8025 + tps: 4063.18978 } } dps_results: { @@ -1317,22 +1317,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-LongMultiTarget" value: { - dps: 5873.67315 - tps: 4170.30794 + dps: 6015.80689 + tps: 4271.22289 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-LongSingleTarget" value: { - dps: 5194.74379 - tps: 3688.26809 + dps: 5333.58144 + tps: 3786.84282 } } dps_results: { key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 6347.72723 - tps: 4506.88634 + dps: 6453.64552 + tps: 4582.08832 } } dps_results: { @@ -1401,22 +1401,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11179.24397 - tps: 7937.26322 + dps: 11088.0452 + tps: 7872.51209 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 3870.40533 - tps: 2747.98778 + dps: 3860.52519 + tps: 2740.97288 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 4724.85137 - tps: 3354.64447 + dps: 4716.04146 + tps: 3348.38944 } } dps_results: { @@ -1443,22 +1443,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongMultiTarget" value: { - dps: 5249.6736 - tps: 3727.26826 + dps: 5389.87541 + tps: 3826.81154 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongSingleTarget" value: { - dps: 4477.41413 - tps: 3178.96403 + dps: 4617.45617 + tps: 3278.39388 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 5366.81996 - tps: 3810.44217 + dps: 5463.23802 + tps: 3878.89899 } } dps_results: { @@ -1527,22 +1527,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11981.00483 - tps: 8506.51343 + dps: 11879.58506 + tps: 8434.50539 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 5589.84446 - tps: 3968.78957 + dps: 5580.99571 + tps: 3962.50695 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 6766.74762 - tps: 4804.39081 + dps: 6751.41524 + tps: 4793.50482 } } dps_results: { @@ -1569,22 +1569,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-LongMultiTarget" value: { - dps: 6868.16467 - tps: 4876.39691 + dps: 7006.43724 + tps: 4974.57044 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-LongSingleTarget" value: { - dps: 6180.13271 - tps: 4387.89422 + dps: 6317.36723 + tps: 4485.33073 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 7380.18383 - tps: 5239.93052 + dps: 7474.3977 + tps: 5306.82237 } } dps_results: { @@ -1653,22 +1653,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 11420.83197 - tps: 8108.7907 + dps: 11361.72555 + tps: 8066.82514 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 5307.10023 - tps: 3768.04116 + dps: 5291.96202 + tps: 3757.29303 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 6378.34363 - tps: 4528.62398 + dps: 6376.80287 + tps: 4527.53004 } } dps_results: { @@ -1695,22 +1695,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-LongMultiTarget" value: { - dps: 6564.13954 - tps: 4660.53907 + dps: 6703.90345 + tps: 4759.77145 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-LongSingleTarget" value: { - dps: 5872.2614 - tps: 4169.30559 + dps: 6009.29355 + tps: 4266.59842 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 6982.45693 - tps: 4957.54442 + dps: 7069.23391 + tps: 5019.15608 } } dps_results: { @@ -1779,22 +1779,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 10093.1547 - tps: 7166.13984 + dps: 9973.6211 + tps: 7081.27098 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 4652.20331 - tps: 3303.06435 + dps: 4650.96282 + tps: 3302.1836 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 5805.90033 - tps: 4122.18924 + dps: 5802.68623 + tps: 4119.90722 } } dps_results: { @@ -1821,22 +1821,22 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-LongMultiTarget" value: { - dps: 5926.87301 - tps: 4208.07984 + dps: 6073.00607 + tps: 4311.83431 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-LongSingleTarget" value: { - dps: 5228.81664 - tps: 3712.45981 + dps: 5369.42163 + tps: 3812.28936 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 6426.79049 - tps: 4563.02125 + dps: 6538.00228 + tps: 4641.98162 } } dps_results: { @@ -1863,7 +1863,7 @@ dps_results: { dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 5892.27434 - tps: 4183.51478 + dps: 6063.15968 + tps: 4304.84337 } } diff --git a/tools/database/gen_db/main.go b/tools/database/gen_db/main.go index 29fe05e4da..3e33f6e355 100644 --- a/tools/database/gen_db/main.go +++ b/tools/database/gen_db/main.go @@ -457,26 +457,31 @@ func GetAllRotationSpellIds() map[string][]int32 { }, &proto.Player_RestorationDruid{RestorationDruid: &proto.RestorationDruid{Options: &proto.RestorationDruid_Options{}, Rotation: &proto.RestorationDruid_Rotation{}}}), nil, nil, nil)}, {Name: "elemental", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassShaman, + Race: proto.Race_RaceTroll, Equipment: &proto.EquipmentSpec{}, TalentsString: "0532001523212351322301351-005052031", }, &proto.Player_ElementalShaman{ElementalShaman: &proto.ElementalShaman{Options: &proto.ElementalShaman_Options{}, Rotation: &proto.ElementalShaman_Rotation{}}}), nil, nil, nil)}, {Name: "enhance", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassShaman, + Race: proto.Race_RaceTroll, Equipment: &proto.EquipmentSpec{}, TalentsString: "053030152-30405003105021333031131031051", }, &proto.Player_EnhancementShaman{EnhancementShaman: &proto.EnhancementShaman{Options: &proto.EnhancementShaman_Options{}, Rotation: &proto.EnhancementShaman_Rotation{}}}), nil, nil, nil)}, {Name: "restosham", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassShaman, + Race: proto.Race_RaceTroll, Equipment: &proto.EquipmentSpec{}, TalentsString: "-3020503-50005331335310501122331251", }, &proto.Player_RestorationShaman{RestorationShaman: &proto.RestorationShaman{Options: &proto.RestorationShaman_Options{}, Rotation: &proto.RestorationShaman_Rotation{}}}), nil, nil, nil)}, {Name: "hunter", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassHunter, + Race: proto.Race_RaceTroll, Equipment: &proto.EquipmentSpec{}, TalentsString: "-015305101-5000032500033330532135301311", }, &proto.Player_Hunter{Hunter: &proto.Hunter{Options: &proto.Hunter_Options{}, Rotation: &proto.Hunter_Rotation{}}}), nil, nil, nil)}, {Name: "mage", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassMage, + Race: proto.Race_RaceTroll, Equipment: &proto.EquipmentSpec{}, TalentsString: "23000513310033015032310250532-03-023303001", }, &proto.Player_Mage{Mage: &proto.Mage{Options: &proto.Mage_Options{}, Rotation: &proto.Mage_Rotation{}}}), nil, nil, nil)}, @@ -517,6 +522,7 @@ func GetAllRotationSpellIds() map[string][]int32 { }, &proto.Player_ProtectionPaladin{ProtectionPaladin: &proto.ProtectionPaladin{Options: &proto.ProtectionPaladin_Options{}, Rotation: &proto.ProtectionPaladin_Rotation{}}}), nil, nil, nil)}, {Name: "ret", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{ Class: proto.Class_ClassPaladin, + Race: proto.Race_RaceBloodElf, Equipment: &proto.EquipmentSpec{}, TalentsString: "050501-05-05232051203331302133231331", }, &proto.Player_RetributionPaladin{RetributionPaladin: &proto.RetributionPaladin{Options: &proto.RetributionPaladin_Options{}, Rotation: &proto.RetributionPaladin_Rotation{}}}), nil, nil, nil)}, diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index b93ff665b3..1e870c6763 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -190,6 +190,7 @@ export const ARCANE_ROTATION_PRESET_DEFAULT = { rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":55342}}},"doAtValue":{"const":{"val":"-2s"}}}, {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ @@ -214,6 +215,7 @@ export const FIRE_ROTATION_PRESET_DEFAULT = { rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":55342}}},"doAtValue":{"const":{"val":"-2s"}}}, {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ @@ -236,7 +238,8 @@ export const FROSTFIRE_ROTATION_PRESET_DEFAULT = { rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", "prepullActions": [ - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + {"action":{"castSpell":{"spellId":{"spellId":55342}}},"doAtValue":{"const":{"val":"-2s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ {"action":{"autocastOtherCooldowns":{}}}, @@ -258,7 +261,8 @@ export const FROST_ROTATION_PRESET_DEFAULT = { rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", "prepullActions": [ - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + {"action":{"castSpell":{"spellId":{"spellId":55342}}},"doAtValue":{"const":{"val":"-2s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} ], "priorityList": [ {"action":{"autocastOtherCooldowns":{}}}, @@ -279,9 +283,7 @@ export const ARCANE_ROTATION_PRESET_AOE = { specRotationOptionsJson: MageRotation.toJsonString(DefaultFrostRotation), rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} - ], + "prepullActions": [], "priorityList": [ {"action":{"autocastOtherCooldowns":{}}}, {"action":{"castSpell":{"spellId":{"spellId":42921}}}} @@ -319,9 +321,7 @@ export const FROST_ROTATION_PRESET_AOE = { specRotationOptionsJson: MageRotation.toJsonString(DefaultFrostRotation), rotation: APLRotation.fromJsonString(`{ "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} - ], + "prepullActions": [], "priorityList": [ {"action":{"autocastOtherCooldowns":{}}}, {"action":{"castSpell":{"spellId":{"spellId":42939}}}} diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts index 039c808c5a..eb8ac69b3a 100644 --- a/ui/mage/sim.ts +++ b/ui/mage/sim.ts @@ -1,17 +1,5 @@ -import { - Debuffs, - IndividualBuffs, - PartyBuffs, - RaidBuffs, - Spec, - Stat, - TristateEffect -} from '../core/proto/common.js'; -import { - APLAction, - APLListItem, - APLRotation, -} from '../core/proto/apl.js'; +import {Debuffs, IndividualBuffs, PartyBuffs, RaidBuffs, Spec, Stat, TristateEffect} from '../core/proto/common.js'; +import {APLRotation, APLRotation_Type,} from '../core/proto/apl.js'; import {Stats} from '../core/proto_utils/stats.js'; import {Player} from '../core/player.js'; import {IndividualSimUI} from '../core/individual_sim_ui.js'; @@ -59,7 +47,8 @@ export class MageSimUI extends IndividualSimUI { ], modifyDisplayStats: (player: Player) => { let stats = new Stats(); - if (player.getRotation().type == RotationType.Arcane) { + + if (player.getTalentTree() === 0) { stats = stats.addStat(Stat.StatSpellHit, player.getTalents().arcaneFocus * 1 * Mechanics.SPELL_HIT_RATING_PER_HIT_CHANCE); }