From 74651219b7d34eace940d08049477b94aff94415 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Tue, 31 Dec 2024 15:24:43 -0500 Subject: [PATCH 1/5] fix missing proc trigger suppress flags, fix enhance t2.5 4p procs from overloads, using proc triggers for enhance t2.5 4p, msw, wfw --- sim/common/itemhelpers/stat_bonus_procs.go | 46 +- sim/common/sod/crafted/phase_3.go | 30 +- sim/common/sod/crafted/phase_4.go | 11 +- sim/common/sod/item_effects.go | 7 +- sim/common/sod/item_effects/phase_3.go | 54 +- sim/common/sod/item_effects/phase_5.go | 18 +- sim/common/sod/item_effects/phase_6.go | 26 +- sim/common/sod/items_sets/dungeon_set_1.go | 28 +- sim/common/sod/items_sets/phase_3.go | 38 +- sim/common/sod/items_sets/phase_4.go | 51 +- sim/common/sod/items_sets/phase_5.go | 13 +- sim/common/vanilla/item_effects.go | 52 +- sim/common/vanilla/item_sets/crafted.go | 11 +- sim/core/aura_helpers.go | 4 + sim/druid/feral/TestFeral.results | 166 +-- sim/mage/TestArcane.results | 16 +- sim/mage/TestFire.results | 84 +- sim/mage/TestFrost.results | 82 +- sim/mage/item_sets_pve_phase_4.go | 2 +- sim/paladin/item_sets_pve.go | 2 - sim/paladin/retribution/TestExodin.results | 116 +-- .../retribution/TestRetribution.results | 124 +-- sim/priest/shadow/TestShadow.results | 12 +- sim/shaman/elemental/TestElemental.results | 134 +-- .../enhancement/TestEnhancement.results | 976 +++++++++--------- sim/shaman/item_sets_pve_phase_6.go | 17 +- sim/shaman/runes.go | 16 +- sim/shaman/shaman.go | 1 + sim/shaman/stormstrike.go | 7 +- sim/shaman/warden/TestWardenShaman.results | 96 +- sim/shaman/windfury_weapon.go | 51 +- sim/warlock/dps/TestAffliction.results | 18 +- sim/warlock/dps/TestDemonology.results | 8 +- sim/warlock/dps/TestDestruction.results | 52 +- sim/warlock/tank/TestAffliction.results | 4 +- sim/warlock/tank/TestDemonology.results | 6 +- sim/warlock/tank/TestDestruction.results | 4 +- .../dps_warrior/TestDualWieldWarrior.results | 84 +- .../dps_warrior/TestTwoHandedWarrior.results | 40 +- sim/warrior/item_sets_pve_phase_4.go | 13 +- 40 files changed, 1265 insertions(+), 1255 deletions(-) diff --git a/sim/common/itemhelpers/stat_bonus_procs.go b/sim/common/itemhelpers/stat_bonus_procs.go index 71d709f215..a15475a21a 100644 --- a/sim/common/itemhelpers/stat_bonus_procs.go +++ b/sim/common/itemhelpers/stat_bonus_procs.go @@ -8,18 +8,19 @@ import ( ) type ProcStatBonusEffect struct { - Name string - ID int32 - AuraID int32 - Bonus stats.Stats - Duration time.Duration - Callback core.AuraCallback - ProcMask core.ProcMask - Outcome core.HitOutcome - Harmful bool - ProcChance float64 - PPM float64 - ICD time.Duration + Name string + ID int32 + AuraID int32 + Bonus stats.Stats + Duration time.Duration + Callback core.AuraCallback + ProcMask core.ProcMask + CanProcFromProcs bool // Can Proc From Procs flag + Outcome core.HitOutcome + Harmful bool + ProcChance float64 + PPM float64 + ICD time.Duration // For ignoring a hardcoded spell. IgnoreSpellID int32 @@ -48,16 +49,17 @@ func newProcStatBonusEffect(config ProcStatBonusEffect) { } triggerAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{ItemID: config.ID}, - Name: config.Name, - Callback: config.Callback, - ProcMask: config.ProcMask, - Outcome: config.Outcome, - Harmful: config.Harmful, - ProcChance: config.ProcChance, - PPM: config.PPM, - ICD: config.ICD, - Handler: handler, + ActionID: core.ActionID{ItemID: config.ID}, + Name: config.Name, + Callback: config.Callback, + ProcMask: config.ProcMask, + CanProcFromProcs: config.CanProcFromProcs, + Outcome: config.Outcome, + Harmful: config.Harmful, + ProcChance: config.ProcChance, + PPM: config.PPM, + ICD: config.ICD, + Handler: handler, }) procAura.Icd = triggerAura.Icd }) diff --git a/sim/common/sod/crafted/phase_3.go b/sim/common/sod/crafted/phase_3.go index 0e66d3f685..0ab8d65112 100644 --- a/sim/common/sod/crafted/phase_3.go +++ b/sim/common/sod/crafted/phase_3.go @@ -96,13 +96,14 @@ func init() { } core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446620}, - Name: "Echoes of the Damned", - Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskMeleeOrRanged, - ProcChance: 0.3, - ICD: time.Second * 40, - Handler: handler, + ActionID: core.ActionID{SpellID: 446620}, + Name: "Echoes of the Damned", + Callback: core.CallbackOnCastComplete, + ProcMask: core.ProcMaskMeleeOrRanged, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.3, + ICD: time.Second * 40, + Handler: handler, }) }) @@ -239,12 +240,13 @@ func echoesOfDreadEffect(agent core.Agent) { } core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446579}, - Name: "Echoes of Dread", - Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskMelee, - ProcChance: 0.3, - ICD: time.Second * 40, - Handler: handler, + ActionID: core.ActionID{SpellID: 446579}, + Name: "Echoes of Dread", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.3, + ICD: time.Second * 40, + Handler: handler, }) } diff --git a/sim/common/sod/crafted/phase_4.go b/sim/common/sod/crafted/phase_4.go index a0a69e755e..c5f1045426 100644 --- a/sim/common/sod/crafted/phase_4.go +++ b/sim/common/sod/crafted/phase_4.go @@ -112,11 +112,12 @@ var ItemSetVolcanicArmor = core.NewItemSet(core.ItemSet{ }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Firebolt Trigger (Volcanic Armor)", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: .05, + Name: "Firebolt Trigger (Volcanic Armor)", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: .05, Handler: func(sim *core.Simulation, _ *core.Spell, result *core.SpellResult) { procSpell.Cast(sim, result.Target) }, diff --git a/sim/common/sod/item_effects.go b/sim/common/sod/item_effects.go index c8e3bf4cd5..efa3529221 100644 --- a/sim/common/sod/item_effects.go +++ b/sim/common/sod/item_effects.go @@ -98,11 +98,10 @@ func StormhammerChainLightningProcAura(agent core.Agent) { ProcMask: core.ProcMaskSpellDamage, ProcChance: .1, Handler: func(sim *core.Simulation, _ *core.Spell, result *core.SpellResult) { - if !icd.IsReady(sim) { - return + if icd.IsReady(sim) { + procSpell.Cast(sim, result.Target) + icd.Use(sim) } - procSpell.Cast(sim, result.Target) - icd.Use(sim) }, }) } diff --git a/sim/common/sod/item_effects/phase_3.go b/sim/common/sod/item_effects/phase_3.go index b5c98b2efe..c758ef1f26 100644 --- a/sim/common/sod/item_effects/phase_3.go +++ b/sim/common/sod/item_effects/phase_3.go @@ -59,11 +59,12 @@ func init() { procAura := character.NewTemporaryStatsAura("Roar of the Dream", core.ActionID{SpellID: 446706}, stats.Stats{stats.SpellDamage: 66}, time.Second*10) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446705}, - Name: "Roar of the Dream Trigger", - Callback: core.CallbackOnCastComplete, - ProcMask: core.ProcMaskSpellOrSpellProc, - ProcChance: 0.05, + ActionID: core.ActionID{SpellID: 446705}, + Name: "Roar of the Dream Trigger", + Callback: core.CallbackOnCastComplete, + ProcMask: core.ProcMaskSpellDamage, + CanProcFromProcs: true, + ProcChance: 0.05, Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) { procAura.Activate(sim) }, @@ -298,13 +299,14 @@ func init() { } hitAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446392}, - Name: "DMC Decay Spell Hit", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee | core.ProcMaskRanged, - PPM: 7.0, // Estimate from log - Handler: handler, + ActionID: core.ActionID{SpellID: 446392}, + Name: "DMC Decay Spell Hit", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee | core.ProcMaskRanged, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + PPM: 7.0, // Estimate from log + Handler: handler, }) hitAura.Icd = &icd @@ -385,13 +387,14 @@ func init() { } hitAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446389}, - Name: "Sandstorm Spell Hit", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee | core.ProcMaskRanged, - PPM: 10.0, // Estimate from log - Handler: handler, + ActionID: core.ActionID{SpellID: 446389}, + Name: "Sandstorm Spell Hit", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee | core.ProcMaskRanged, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + PPM: 10.0, // Estimate from log + Handler: handler, }) hitAura.Icd = &icd @@ -438,12 +441,13 @@ func init() { procMask := character.GetProcMaskForItem(DragonsCry) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Emerald Dragon Whelp Proc", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: procMask, - PPM: 1.0, // Reported by armaments discord - ICD: time.Minute * 1, + Name: "Emerald Dragon Whelp Proc", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: procMask, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + PPM: 1.0, // Reported by armaments discord + ICD: time.Minute * 1, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { for _, petAgent := range character.PetAgents { if whelp, ok := petAgent.(*guardians.EmeraldDragonWhelp); ok { diff --git a/sim/common/sod/item_effects/phase_5.go b/sim/common/sod/item_effects/phase_5.go index 7064909d26..bb07a332ab 100644 --- a/sim/common/sod/item_effects/phase_5.go +++ b/sim/common/sod/item_effects/phase_5.go @@ -172,11 +172,12 @@ func init() { }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Lightning's Cell Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeCrit, - ProcMask: core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc, // Procs on procs - ICD: time.Millisecond * 2000, + Name: "Lightning's Cell Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeCrit, + ProcMask: core.ProcMaskSpellDamage, + CanProcFromProcs: true, + ICD: time.Millisecond * 2000, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { chargeAura.Activate(sim) chargeAura.AddStack(sim) @@ -185,7 +186,7 @@ func init() { }) // https://www.wowhead.com/classic/item=230253/hearstriker - // Equip: 2% chance on ranged hit to gain 1 extra attack. (Proc chance: 1%, 1s cooldown) // obviously something wrong here lol + // Equip: 2% chance on ranged hit to gain 1 extra attack. (Proc chance: 2%, 1s cooldown) core.NewItemEffect(Heartstriker, func(agent core.Agent) { character := agent.GetCharacter() if !character.AutoAttacks.AutoSwingRanged { @@ -197,10 +198,9 @@ func init() { Callback: core.CallbackOnSpellHitDealt, Outcome: core.OutcomeLanded, ProcMask: core.ProcMaskRanged, + SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs, ProcChance: 0.02, ICD: time.Second * 1, - SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, - Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { spell.Unit.AutoAttacks.ExtraRangedAttack(sim, 1, core.ActionID{SpellID: 461164}, spell.ActionID) }, @@ -371,7 +371,7 @@ func ClawOfChromaggusEffect(character *core.Character) { } core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Claw of the Chromatic Trigger", + Name: "Claw of the Chromaggus Trigger", Callback: core.CallbackOnCastComplete, ProcMask: core.ProcMaskSpellDamage, ICD: time.Millisecond * 9500, diff --git a/sim/common/sod/item_effects/phase_6.go b/sim/common/sod/item_effects/phase_6.go index be80dc0bd0..43e699d3f5 100644 --- a/sim/common/sod/item_effects/phase_6.go +++ b/sim/common/sod/item_effects/phase_6.go @@ -190,12 +190,13 @@ func init() { }) core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ - Name: "Swarming Thoughts Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskSpellDamage, - ProcChance: 1.00, - ICD: time.Second * 15, + Name: "Swarming Thoughts Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskSpellDamage, + CanProcFromProcs: true, + ProcChance: 1.00, + ICD: time.Second * 15, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { buffAura.Activate(sim) }, @@ -309,12 +310,13 @@ func init() { }) core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ - Name: "Resolve of the Battleguard Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskSpellDamage, - ProcChance: 1.00, - ICD: time.Second * 15, + Name: "Resolve of the Battleguard Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskSpellDamage, + CanProcFromProcs: true, + ProcChance: 1.00, + ICD: time.Second * 15, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { buffAura.Activate(sim) }, diff --git a/sim/common/sod/items_sets/dungeon_set_1.go b/sim/common/sod/items_sets/dungeon_set_1.go index 76dc0e2b50..afa3985fec 100644 --- a/sim/common/sod/items_sets/dungeon_set_1.go +++ b/sim/common/sod/items_sets/dungeon_set_1.go @@ -330,13 +330,14 @@ var ItemSetTheElements = core.NewItemSet(core.ItemSet{ } core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ - ActionID: actionID, - Name: "Item - The Furious Storm Proc (MH Auto)", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMeleeMHAuto, - ProcChance: 0.06, - Handler: handler, + ActionID: actionID, + Name: "Item - The Furious Storm Proc (MH Auto)", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMeleeMHAuto, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.06, + Handler: handler, }) core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ ActionID: actionID, @@ -429,12 +430,13 @@ var ItemSetBattlegearOfValor = core.NewItemSet(core.ItemSet{ rageMetrics := c.NewRageMetrics(core.ActionID{SpellID: 450589}) core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ - ActionID: actionID, - Name: "S03 - Warrior Armor Heal Trigger - Battlegear of Valor", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - PPM: 1, + ActionID: actionID, + Name: "S03 - Warrior Armor Heal Trigger - Battlegear of Valor", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + PPM: 1, Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) { c.GainHealth(sim, sim.Roll(88, 132), healthMetrics) if c.HasRageBar() { diff --git a/sim/common/sod/items_sets/phase_3.go b/sim/common/sod/items_sets/phase_3.go index 2d0dbdb67a..b54a740416 100644 --- a/sim/common/sod/items_sets/phase_3.go +++ b/sim/common/sod/items_sets/phase_3.go @@ -60,7 +60,7 @@ var ItemSetMalevolentProphetsVestments = core.NewItemSet(core.ItemSet{ core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ ActionID: core.ActionID{SpellID: 449919}, - Name: "Malelovance", + Name: "Malevolence", Callback: core.CallbackOnSpellHitDealt, Outcome: core.OutcomeLanded, ProcMask: core.ProcMaskSpellDamage, @@ -261,9 +261,9 @@ var ItemSetWailingBerserkersPlateArmor = core.NewItemSet(core.ItemSet{ c := agent.GetCharacter() handler := func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) { - c.AutoAttacks.ExtraMHAttackProc(sim , 1, core.ActionID{SpellID: 449970}, spell) + c.AutoAttacks.ExtraMHAttackProc(sim, 1, core.ActionID{SpellID: 449970}, spell) } - + core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ ActionID: core.ActionID{SpellID: 449970}, Name: "Extra Attack", @@ -297,13 +297,14 @@ var ItemSetBanishedMartyrsFullPlate = core.NewItemSet(core.ItemSet{ } core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 449974}, - Name: "Stalwart Block", - Callback: core.CallbackOnSpellHitTaken, - ProcMask: core.ProcMaskMelee, - Outcome: core.OutcomeBlock, - ProcChance: 1, - Handler: handler, + ActionID: core.ActionID{SpellID: 449974}, + Name: "Stalwart Block", + Callback: core.CallbackOnSpellHitTaken, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + Outcome: core.OutcomeBlock, + ProcChance: 1, + Handler: handler, }) }, }, @@ -370,14 +371,15 @@ var ItemSetSerpentsAscension = core.NewItemSet(core.ItemSet{ } core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446233}, - Name: "Serpent's Ascension", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMeleeOrRanged, - ProcChance: 0.03, - ICD: time.Second * 120, - Handler: handler, + ActionID: core.ActionID{SpellID: 446233}, + Name: "Serpent's Ascension", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMeleeOrRanged, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.03, + ICD: time.Second * 120, + Handler: handler, }) }, }, diff --git a/sim/common/sod/items_sets/phase_4.go b/sim/common/sod/items_sets/phase_4.go index 13a1d16ddb..03e6d649dd 100644 --- a/sim/common/sod/items_sets/phase_4.go +++ b/sim/common/sod/items_sets/phase_4.go @@ -401,12 +401,13 @@ var ItemSetSpidersKiss = core.NewItemSet(core.ItemSet{ character := agent.GetCharacter() procAura := character.NewTemporaryStatsAura("Spider's Kiss", core.ActionID{SpellID: 17333}, stats.Stats{stats.Armor: -100}, time.Second*10) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - ActionID: core.ActionID{SpellID: 446570}, - Name: "Echoes of the Depraved", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: 0.05, + ActionID: core.ActionID{SpellID: 446570}, + Name: "Echoes of the Depraved", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.05, Handler: func(sim *core.Simulation, _ *core.Spell, result *core.SpellResult) { procAura.Activate(sim) }, @@ -462,12 +463,13 @@ var ItemSetSpiritOfEskhandar = core.NewItemSet(core.ItemSet{ 4: func(agent core.Agent) { character := agent.GetCharacter() core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Call of Eskhandar Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: 1, - ICD: time.Minute * 1, + Name: "Call of Eskhandar Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 1, + ICD: time.Minute * 1, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { for _, petAgent := range character.PetAgents { if eskhandar, ok := petAgent.(*guardians.Eskhandar); ok { @@ -488,12 +490,13 @@ var ItemSetCoreHoundsCall = core.NewItemSet(core.ItemSet{ 2: func(agent core.Agent) { character := agent.GetCharacter() core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Core Hound's Call Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: 1, - ICD: time.Minute * 1, + Name: "Core Hound's Call Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 1, + ICD: time.Minute * 1, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { for _, petAgent := range character.PetAgents { if coreHound, ok := petAgent.(*guardians.CoreHound); ok { @@ -519,12 +522,12 @@ var ItemSetCoreHoundsCall = core.NewItemSet(core.ItemSet{ }, }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Magmadar's Return Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: 1, - ICD: time.Minute * 1, + Name: "Magmadar's Return Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ICD: time.Minute * 1, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { procAura.Activate(sim) }, diff --git a/sim/common/sod/items_sets/phase_5.go b/sim/common/sod/items_sets/phase_5.go index b1a3bf5523..529b8e4a92 100644 --- a/sim/common/sod/items_sets/phase_5.go +++ b/sim/common/sod/items_sets/phase_5.go @@ -93,12 +93,13 @@ var ItemSetPrimalBlessing = core.NewItemSet(core.ItemSet{ }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Primal Blessing Trigger", - Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskMeleeOrRanged, - Outcome: core.OutcomeLanded, - ProcChance: 0.05, - ICD: time.Second * 72, + Name: "Primal Blessing Trigger", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: core.ProcMaskMeleeOrRanged, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + Outcome: core.OutcomeLanded, + ProcChance: 0.05, + ICD: time.Second * 72, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { aura.Activate(sim) }, diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go index b482911a15..3b47f51a02 100644 --- a/sim/common/vanilla/item_effects.go +++ b/sim/common/vanilla/item_effects.go @@ -681,7 +681,7 @@ func init() { Aura: core.Aura{ Label: "Fiery War Axe Fireball", }, - TickLength: 2 * time.Second, + TickLength: time.Second * 2, NumberOfTicks: 3, OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) { @@ -1679,7 +1679,7 @@ func init() { Aura: core.Aura{ Label: "Purged By Fire", }, - TickLength: 2 * time.Second, + TickLength: time.Second * 2, NumberOfTicks: 5, OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) { @@ -1761,7 +1761,7 @@ func init() { // Aura: core.Aura{ // Label: "Fireball (Hand of Ragnaros)", // }, - // TickLength: 2 * time.Second, + // TickLength: time.Second * 2, // NumberOfTicks: 5, // OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) { @@ -1836,7 +1836,7 @@ func init() { Aura: core.Aura{ Label: "Fireball (Sulfuron Hammer)", }, - TickLength: 2 * time.Second, + TickLength: time.Second * 2, NumberOfTicks: 4, OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) { @@ -2388,9 +2388,9 @@ func init() { Callback: core.CallbackOnSpellHitDealt, Outcome: core.OutcomeLanded, ProcMask: core.ProcMaskRanged, - ProcChance: 0.02, - ICD: 2 * time.Second, SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.02, + ICD: time.Second * 2, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { // Extra ranged attacks do not reset the swing timer confirmed by Zirene character.AutoAttacks.StoreExtraRangedAttack(sim, 1, core.ActionID{SpellID: 1213381}, spell.ActionID) @@ -2404,25 +2404,16 @@ func init() { return } - icd := core.Cooldown{ - Timer: character.NewTimer(), - Duration: time.Second * 2, - } - - character.GetOrRegisterAura(core.Aura{ - Label: "Hand of Justice", - Duration: core.NeverExpires, - OnReset: func(aura *core.Aura, sim *core.Simulation) { - aura.Activate(sim) - }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if spell.Flags.Matches(core.SpellFlagSuppressEquipProcs) { - return - } - if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee) && icd.IsReady(sim) && sim.Proc(0.02, "HandOfJustice") { - icd.Use(sim) - aura.Unit.AutoAttacks.ExtraMHAttackProc(sim, 1, core.ActionID{SpellID: 15600}, spell) - } + core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ + Name: "Hand of Justice Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: 0.02, + ICD: time.Second * 2, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + spell.Unit.AutoAttacks.ExtraMHAttackProc(sim, 1, core.ActionID{SpellID: 15600}, spell) }, }) }) @@ -2982,11 +2973,12 @@ func init() { }) core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{ - Name: "Spell Blasting Trigger", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskSpellDamage, - ProcChance: 0.05, + Name: "Spell Blasting Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskSpellDamage, + CanProcFromProcs: true, + ProcChance: 0.05, Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { buffAura.Activate(sim) }, diff --git a/sim/common/vanilla/item_sets/crafted.go b/sim/common/vanilla/item_sets/crafted.go index b8e9747f53..1db898225c 100644 --- a/sim/common/vanilla/item_sets/crafted.go +++ b/sim/common/vanilla/item_sets/crafted.go @@ -256,11 +256,12 @@ var ItemSetVolcanicArmor = core.NewItemSet(core.ItemSet{ }) core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{ - Name: "Firebolt Trigger (Volcanic Armor)", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - ProcChance: .05, + Name: "Firebolt Trigger (Volcanic Armor)", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: .05, Handler: func(sim *core.Simulation, _ *core.Spell, result *core.SpellResult) { procSpell.Cast(sim, result.Target) }, diff --git a/sim/core/aura_helpers.go b/sim/core/aura_helpers.go index 5c26fbb761..226ebd1151 100644 --- a/sim/core/aura_helpers.go +++ b/sim/core/aura_helpers.go @@ -33,6 +33,7 @@ type ProcTrigger struct { Duration time.Duration Callback AuraCallback ProcMask ProcMask + CanProcFromProcs bool // Can Proc From Procs flag SpellFlagsExclude SpellFlag SpellFlags SpellFlag Outcome HitOutcome @@ -69,6 +70,9 @@ func ApplyProcTriggerCallback(unit *Unit, aura *Aura, config ProcTrigger) { if config.ProcMask != ProcMaskUnknown && !spell.ProcMask.Matches(config.ProcMask) { return } + if !config.CanProcFromProcs && spell.ProcMask.Matches(ProcMaskProc) { + return + } if config.Outcome != OutcomeEmpty && !result.Outcome.Matches(config.Outcome) { return } diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 584ceb9358..047ea29d0c 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -344,8 +344,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.57233 - weights: 1.64057 + weights: 1.56974 + weights: 1.62001 weights: 0 weights: 0 weights: 0 @@ -361,9 +361,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.66176 - weights: 18.31058 - weights: 11.97502 + weights: 0.66067 + weights: 21.5586 + weights: 12.03091 weights: 0 weights: 0 weights: 0 @@ -1045,305 +1045,305 @@ dps_results: { dps_results: { key: "TestFeral-Phase3-Lvl50-Average-Default" value: { - dps: 1965.15702 - tps: 1405.87914 - hps: 10.23983 + dps: 1965.23757 + tps: 1405.95674 + hps: 10.25412 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1419.12529 - tps: 1127.46437 + dps: 1419.13263 + tps: 1127.46958 hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1345.84578 - tps: 961.66086 + dps: 1345.85312 + tps: 961.66607 hps: 7.00506 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1476.1892 - tps: 1051.40724 + dps: 1476.19717 + tps: 1051.4129 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 677.65668 - tps: 559.71949 + dps: 677.66323 + tps: 559.72414 hps: 4.16533 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 651.63929 - tps: 466.75914 + dps: 651.64583 + tps: 466.76378 hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 768.25438 - tps: 548.86587 + dps: 768.26024 + tps: 548.87003 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1419.12529 - tps: 1127.46437 + dps: 1419.13263 + tps: 1127.46958 hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1345.84578 - tps: 961.66086 + dps: 1345.85312 + tps: 961.66607 hps: 7.00506 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1476.1892 - tps: 1051.40724 + dps: 1476.19717 + tps: 1051.4129 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 677.65668 - tps: 559.71949 + dps: 677.66323 + tps: 559.72414 hps: 4.16533 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 651.63929 - tps: 466.75914 + dps: 651.64583 + tps: 466.76378 hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 768.25438 - tps: 548.86587 + dps: 768.26024 + tps: 548.87003 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1419.12529 - tps: 1127.46437 + dps: 1419.13263 + tps: 1127.46958 hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1345.84578 - tps: 961.66086 + dps: 1345.85312 + tps: 961.66607 hps: 7.00506 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1476.1892 - tps: 1051.40724 + dps: 1476.19717 + tps: 1051.4129 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 677.65668 - tps: 559.71949 + dps: 677.66323 + tps: 559.72414 hps: 4.16533 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 651.63929 - tps: 466.75914 + dps: 651.64583 + tps: 466.76378 hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 768.25438 - tps: 548.86587 + dps: 768.26024 + tps: 548.87003 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1452.39681 - tps: 1155.04065 + dps: 1452.40489 + tps: 1155.04638 hps: 6.98702 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1379.80092 - tps: 985.98255 + dps: 1379.809 + tps: 985.98829 hps: 7.01307 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1514.97723 - tps: 1078.95421 + dps: 1514.9889 + tps: 1078.9625 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 671.78672 - tps: 556.89045 + dps: 671.79227 + tps: 556.89439 hps: 4.10667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 646.3416 - tps: 463.09008 + dps: 646.34715 + tps: 463.09402 hps: 4.158 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 764.7589 - tps: 547.17211 + dps: 764.76476 + tps: 547.17627 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1452.39681 - tps: 1155.04065 + dps: 1452.40489 + tps: 1155.04638 hps: 6.98702 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1379.80092 - tps: 985.98255 + dps: 1379.809 + tps: 985.98829 hps: 7.01307 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1514.97723 - tps: 1078.95421 + dps: 1514.9889 + tps: 1078.9625 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 671.78672 - tps: 556.89045 + dps: 671.79227 + tps: 556.89439 hps: 4.10667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 646.3416 - tps: 463.09008 + dps: 646.34715 + tps: 463.09402 hps: 4.158 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 764.7589 - tps: 547.17211 + dps: 764.76476 + tps: 547.17627 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1452.39681 - tps: 1155.04065 + dps: 1452.40489 + tps: 1155.04638 hps: 6.98702 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1379.80092 - tps: 985.98255 + dps: 1379.809 + tps: 985.98829 hps: 7.01307 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1514.97723 - tps: 1078.95421 + dps: 1514.9889 + tps: 1078.9625 hps: 7.3734 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 671.78672 - tps: 556.89045 + dps: 671.79227 + tps: 556.89439 hps: 4.10667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 646.3416 - tps: 463.09008 + dps: 646.34715 + tps: 463.09402 hps: 4.158 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 764.7589 - tps: 547.17211 + dps: 764.76476 + tps: 547.17627 hps: 4.98667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1244.35 - tps: 887.23097 - hps: 9.35676 + dps: 1241.88294 + tps: 885.5957 + hps: 9.5411 } } dps_results: { diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index e8f86d9f75..aa0ce0a59a 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -638,15 +638,15 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1526.48854 - tps: 1546.2207 + dps: 1525.8735 + tps: 1545.60566 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 731.61619 - tps: 763.0493 + dps: 739.13505 + tps: 772.01787 } } dps_results: { @@ -799,15 +799,15 @@ dps_results: { dps_results: { key: "TestArcane-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1429.38013 - tps: 870.46751 + dps: 1428.398 + tps: 869.87823 } } dps_results: { key: "TestArcane-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 998.2521 - tps: 939.90433 + dps: 999.56193 + tps: 941.39622 } } dps_results: { diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index c54c45da4a..cacf2d968f 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -396,7 +396,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.67622 + weights: -0.71157 weights: 0 weights: 1.34473 weights: 0 @@ -407,7 +407,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 12.10516 + weights: 12.06666 weights: 0 weights: 0 weights: 0 @@ -785,99 +785,99 @@ dps_results: { dps_results: { key: "TestFire-Phase3-Lvl50-Average-Default" value: { - dps: 1276.3597 - tps: 909.46581 + dps: 1276.24852 + tps: 909.38799 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2938.13026 - tps: 2389.36563 + dps: 2938.4971 + tps: 2389.62242 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1268.87487 - tps: 904.58313 + dps: 1268.27837 + tps: 904.16558 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1330.11659 - tps: 955.67709 + dps: 1327.77119 + tps: 954.03531 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1194.07717 - tps: 1046.85276 + dps: 1194.3812 + tps: 1047.06559 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 573.76286 - tps: 412.5327 + dps: 573.53061 + tps: 412.37012 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Gnome-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 793.4264 - tps: 573.40406 + dps: 793.92277 + tps: 573.75151 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2821.44991 - tps: 2317.53366 + dps: 2822.14656 + tps: 2318.02131 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1273.87004 - tps: 907.80411 + dps: 1273.24998 + tps: 907.37007 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1351.22421 - tps: 971.34935 + dps: 1350.53813 + tps: 970.86909 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1157.896 - tps: 1020.72891 + dps: 1158.19867 + tps: 1020.94077 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 555.15588 - tps: 399.45199 + dps: 554.77142 + tps: 399.18287 } } dps_results: { key: "TestFire-Phase3-Lvl50-Settings-Troll-p3_fire-Fire-p3_fire-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 800.08838 - tps: 578.08578 + dps: 800.68132 + tps: 578.50084 } } dps_results: { key: "TestFire-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1279.50267 - tps: 911.79095 + dps: 1279.16921 + tps: 911.55753 } } dps_results: { @@ -932,15 +932,15 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1981.45173 - tps: 1298.95096 + dps: 1980.0383 + tps: 1298.0493 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 791.29152 - tps: 753.27231 + dps: 793.41579 + tps: 755.44308 } } dps_results: { @@ -1093,15 +1093,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2764.46296 - tps: 1634.93359 + dps: 2762.82619 + tps: 1633.95766 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 1187.62316 - tps: 865.45843 + dps: 1187.72747 + tps: 865.62648 } } dps_results: { @@ -1254,15 +1254,15 @@ dps_results: { dps_results: { key: "TestFire-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 3541.68519 - tps: 2505.02548 + dps: 3539.23808 + tps: 2503.3125 } } dps_results: { key: "TestFire-Phase6-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 1078.54938 - tps: 778.91603 + dps: 1075.20069 + tps: 776.57561 } } dps_results: { diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 1504e177de..ec64e522b5 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -200,7 +200,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.4103 + weights: 0.40792 weights: 0 weights: 1.23099 weights: 0 @@ -211,7 +211,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 11.6054 + weights: 11.6035 weights: 0 weights: 0 weights: 0 @@ -393,99 +393,99 @@ stat_weights_results: { dps_results: { key: "TestFrost-Phase3-Lvl50-Average-Default" value: { - dps: 1124.13042 - tps: 880.16299 + dps: 1124.01771 + tps: 880.07695 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1128.25463 - tps: 1074.93412 + dps: 1128.06169 + tps: 1074.75852 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1128.25463 - tps: 884.09332 + dps: 1128.06169 + tps: 883.91772 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1224.32999 - tps: 945.8339 + dps: 1221.27519 + tps: 943.37361 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 564.83916 - tps: 600.41463 + dps: 564.51051 + tps: 600.16348 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 564.83916 - tps: 430.88082 + dps: 564.51051 + tps: 430.62968 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Gnome-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 668.44873 - tps: 511.31692 + dps: 666.95667 + tps: 510.15612 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1111.25758 - tps: 1060.4872 + dps: 1111.01271 + tps: 1060.26744 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1111.25758 - tps: 870.07492 + dps: 1111.01271 + tps: 869.85516 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1251.69877 - tps: 973.271 + dps: 1248.37138 + tps: 970.59245 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 554.18754 - tps: 594.53786 + dps: 554.0817 + tps: 594.4514 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 554.18754 - tps: 422.82837 + dps: 554.0817 + tps: 422.74191 } } dps_results: { key: "TestFrost-Phase3-Lvl50-Settings-Troll-p3_frost_ffb-Frost-p3_frost-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 685.26296 - tps: 523.39289 + dps: 683.61101 + tps: 522.11593 } } dps_results: { key: "TestFrost-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1112.63651 - tps: 871.11539 + dps: 1112.34588 + tps: 870.86307 } } dps_results: { @@ -540,15 +540,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1777.6648 - tps: 1460.64931 + dps: 1776.04018 + tps: 1459.29378 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 836.66303 - tps: 666.18892 + dps: 837.10875 + tps: 666.26372 } } dps_results: { @@ -701,15 +701,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1362.74248 - tps: 584.99602 + dps: 1361.72687 + tps: 584.56947 } } dps_results: { key: "TestFrost-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" value: { dps: 1099.77673 - tps: 738.67912 + tps: 738.70895 } } dps_results: { @@ -862,15 +862,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1453.81197 - tps: 1031.4004 + dps: 1452.64993 + tps: 1030.58696 } } dps_results: { key: "TestFrost-Phase6-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 992.72183 - tps: 710.60888 + dps: 993.17082 + tps: 711.0888 } } dps_results: { diff --git a/sim/mage/item_sets_pve_phase_4.go b/sim/mage/item_sets_pve_phase_4.go index 325f82b18d..3d74bc44af 100644 --- a/sim/mage/item_sets_pve_phase_4.go +++ b/sim/mage/item_sets_pve_phase_4.go @@ -24,7 +24,7 @@ var ItemSetSorcerersRegalia = core.NewItemSet(core.ItemSet{ core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ Name: "S03 - Mana Proc on Cast - Magister's Regalia", - Callback: core.CallbackOnSpellHitDealt, + Callback: core.CallbackOnCastComplete, Outcome: core.OutcomeLanded, ProcMask: core.ProcMaskSpellDamage | core.ProcMaskSpellHealing, ProcChance: 0.06, diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index d45ad372eb..a28adce6c6 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -229,7 +229,6 @@ func (paladin *Paladin) applyPaladinT1Prot2P() { } func (paladin *Paladin) applyPaladinT1Prot4P() { - bonusLabel := "S03 - Item - T1 - Paladin - Protection 4P Bonus" if paladin.HasAura(bonusLabel) { @@ -395,7 +394,6 @@ func (paladin *Paladin) applyPaladinT2Prot4P() { } func (paladin *Paladin) applyPaladinT2Prot6P() { - bonusLabel := "S03 - Item - T2 - Paladin - Protection 6P Bonus" if paladin.HasAura(bonusLabel) { diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results index 06d00acaf8..6ad70d885e 100644 --- a/sim/paladin/retribution/TestExodin.results +++ b/sim/paladin/retribution/TestExodin.results @@ -99,12 +99,12 @@ character_stats_results: { stat_weights_results: { key: "TestExodin-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.08944 - weights: 1.32219 + weights: 2.09204 + weights: 0.93862 weights: 0 weights: 0 weights: 0 - weights: 0.71332 + weights: 0.71587 weights: 0 weights: 0 weights: 0 @@ -112,13 +112,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.64458 - weights: 1.75293 + weights: 9.0492 + weights: 2.24297 weights: 0 weights: 0 - weights: 0.86341 + weights: 0.86448 weights: 0 - weights: 20.55232 + weights: 25.72435 weights: 0 weights: 0 weights: 0 @@ -148,12 +148,12 @@ stat_weights_results: { stat_weights_results: { key: "TestExodin-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.92389 - weights: 1.33437 + weights: 2.9302 + weights: 1.28625 weights: 0 weights: 0 weights: 0 - weights: 0.9338 + weights: 0.93307 weights: 0 weights: 0 weights: 0 @@ -161,13 +161,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 17.35673 - weights: 2.74674 + weights: 8.94438 + weights: 2.18643 weights: 0 weights: 0 - weights: 1.05063 + weights: 1.05289 weights: 0 - weights: 31.40756 + weights: 25.77599 weights: 0 weights: 0 weights: 0 @@ -197,43 +197,43 @@ stat_weights_results: { dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1364.96806 - tps: 1400.16796 + dps: 1361.13826 + tps: 1396.31172 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-Hero'sBrand-231328" value: { - dps: 3262.34247 - tps: 3294.89201 + dps: 3276.06496 + tps: 3308.10764 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1365.11214 - tps: 1401.16748 + dps: 1361.28234 + tps: 1397.31274 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1464.15123 - tps: 1501.5096 + dps: 1459.93475 + tps: 1497.24317 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457" value: { - dps: 3307.06545 - tps: 3339.12982 + dps: 3312.9158 + tps: 3345.10222 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 1608.39591 - tps: 1646.14201 + dps: 1611.68725 + tps: 1649.49284 } } dps_results: { @@ -246,29 +246,29 @@ dps_results: { dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1240.02823 - tps: 1276.52587 + dps: 1236.21041 + tps: 1272.68029 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 1443.71624 - tps: 1481.57599 + dps: 1443.77434 + tps: 1481.54149 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" value: { - dps: 1691.82984 - tps: 1729.68007 + dps: 1691.37941 + tps: 1729.1364 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Average-Default" value: { - dps: 3290.301 - tps: 3322.29344 + dps: 3292.275 + tps: 3324.31814 } } dps_results: { @@ -358,50 +358,50 @@ dps_results: { dps_results: { key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2722.03995 - tps: 2756.83955 + dps: 2735.31524 + tps: 2770.43384 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1700.08414 - tps: 1735.86231 + dps: 1718.13579 + tps: 1753.86678 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-Hero'sBrand-231328" value: { - dps: 4603.81751 - tps: 4642.86408 + dps: 4649.39947 + tps: 4687.44132 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1700.36844 - tps: 1736.9658 + dps: 1718.48135 + tps: 1755.01363 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1821.15375 - tps: 1858.97342 + dps: 1840.14516 + tps: 1877.87903 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" value: { - dps: 4689.53104 - tps: 4728.05491 + dps: 4724.77518 + tps: 4762.4636 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 1988.31531 - tps: 2026.21129 + dps: 1997.9368 + tps: 2035.86598 } } dps_results: { @@ -414,29 +414,29 @@ dps_results: { dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1538.71107 - tps: 1575.69119 + dps: 1538.58764 + tps: 1575.49637 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 1838.29441 - tps: 1876.37952 + dps: 1852.52022 + tps: 1890.58341 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" value: { - dps: 2115.91618 - tps: 2153.99378 + dps: 2133.32791 + tps: 2171.38486 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Average-Default" value: { - dps: 4677.8119 - tps: 4715.85566 + dps: 4678.39316 + tps: 4716.39644 } } dps_results: { @@ -526,7 +526,7 @@ dps_results: { dps_results: { key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3848.65749 - tps: 3890.40868 + dps: 3861.68938 + tps: 3903.8602 } } diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index fbc609d35c..0a17b72d6a 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.63908 - weights: 2.13154 + weights: 2.63374 + weights: 1.84889 weights: 0 weights: 0 weights: 0 - weights: 0.40961 + weights: 0.40908 weights: 0 weights: 0 weights: 0 @@ -406,13 +406,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 8.20358 - weights: 0.78553 + weights: 3.79226 + weights: 0.83492 weights: 0 weights: 0 - weights: 0.94829 - weights: 1.45683 - weights: 26.95934 + weights: 0.94637 + weights: 1.53225 + weights: 30.9707 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.99447 - weights: 2.60673 + weights: 2.90185 + weights: 3.52058 weights: 0 weights: 0 weights: 0 - weights: 0.51187 + weights: 0.51272 weights: 0 weights: 0 weights: 0 @@ -455,13 +455,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 11.5797 - weights: 0.72035 + weights: 10.60199 + weights: 0.7195 weights: 0 weights: 0 - weights: 1.05013 - weights: 2.14054 - weights: 40.87926 + weights: 1.12304 + weights: 2.51547 + weights: 36.29456 weights: 0 weights: 0 weights: 0 @@ -806,78 +806,78 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1764.76558 - tps: 1804.38493 + dps: 1751.9258 + tps: 1790.87492 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-Hero'sBrand-231328" value: { - dps: 3772.8464 - tps: 3822.0264 + dps: 3764.89515 + tps: 3814.41474 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1733.93628 - tps: 1772.88668 + dps: 1752.9087 + tps: 1792.02265 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1859.89748 - tps: 1900.00537 + dps: 1831.47665 + tps: 1871.28195 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457" value: { - dps: 3815.672 - tps: 3864.82193 + dps: 3819.96585 + tps: 3869.43136 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 2340.3397 - tps: 2391.45019 + dps: 2332.36887 + tps: 2383.8642 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 3714.32765 - tps: 3763.32216 + dps: 3711.38377 + tps: 3760.4415 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1609.20285 - tps: 1648.15954 + dps: 1611.84795 + tps: 1651.0681 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 3319.85068 - tps: 3368.89728 + dps: 3310.91777 + tps: 3360.3849 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" value: { - dps: 2452.10438 - tps: 2494.99074 + dps: 2446.01938 + tps: 2489.69232 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Average-Default" value: { - dps: 3815.52713 - tps: 3864.70383 + dps: 3798.62523 + tps: 3847.87017 } } dps_results: { @@ -1217,50 +1217,50 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3065.42422 - tps: 3114.10171 + dps: 3116.90867 + tps: 3166.06959 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 2484.4423 - tps: 2541.65465 + dps: 2441.79346 + tps: 2498.91283 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Hero'sBrand-231328" value: { - dps: 4610.87253 - tps: 4667.07605 + dps: 4578.80848 + tps: 4635.23107 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 2482.45111 - tps: 2540.2925 + dps: 2439.92774 + tps: 2497.72347 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 2638.62476 - tps: 2698.01528 + dps: 2592.73871 + tps: 2652.12788 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" value: { - dps: 4705.5772 - tps: 4761.87646 + dps: 4662.78404 + tps: 4718.99949 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 4033.52054 - tps: 4096.95899 + dps: 4005.12339 + tps: 4068.99198 } } dps_results: { @@ -1273,29 +1273,29 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1982.79704 - tps: 2034.59381 + dps: 1977.18335 + tps: 2029.88316 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 3934.52498 - tps: 3990.952 + dps: 3876.3282 + tps: 3932.60901 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" value: { - dps: 4256.91541 - tps: 4314.61205 + dps: 4315.04339 + tps: 4372.78289 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Average-Default" value: { - dps: 4660.67139 - tps: 4717.11307 + dps: 4649.4772 + tps: 4705.99569 } } dps_results: { @@ -1467,7 +1467,7 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3782.58563 - tps: 3837.98684 + dps: 3798.82931 + tps: 3853.58972 } } diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index c131a1944d..21886e2273 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -975,8 +975,8 @@ dps_results: { dps_results: { key: "TestShadow-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2254.67408 - tps: 2154.47919 + dps: 2253.9893 + tps: 2153.81967 } } dps_results: { @@ -1143,8 +1143,8 @@ dps_results: { dps_results: { key: "TestShadow-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2465.57958 - tps: 2350.70846 + dps: 2464.95254 + tps: 2350.10339 } } dps_results: { @@ -1395,8 +1395,8 @@ dps_results: { dps_results: { key: "TestShadow-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 3095.61548 - tps: 2946.80911 + dps: 3093.72959 + tps: 2944.99698 } } dps_results: { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 2ba4d3705f..e7dd100d60 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -445,18 +445,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.40234 + weights: 4.29711 weights: 0 - weights: 1.74954 + weights: 1.74212 weights: 0 - weights: 0.56493 + weights: 0.56638 weights: 0 weights: 0 - weights: 1.18461 + weights: 1.17574 weights: 0 weights: 0 - weights: 33.09089 - weights: 20.54688 + weights: 37.00367 + weights: 22.52755 weights: 0 weights: 0 weights: 0 @@ -494,18 +494,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 4.51838 + weights: 4.51282 weights: 0 - weights: 2.13097 + weights: 2.11559 weights: 0 - weights: 0.53504 + weights: 0.53333 weights: 0 weights: 0 - weights: 1.59593 + weights: 1.58226 weights: 0 weights: 0 weights: 0 - weights: 27.30716 + weights: 28.4393 weights: 0 weights: 0 weights: 0 @@ -946,99 +946,99 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-Average-Default" value: { - dps: 3603.59828 - tps: 2151.32446 + dps: 3589.30843 + tps: 2141.13055 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6365.64579 - tps: 4218.68553 + dps: 6346.7166 + tps: 4220.48467 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3491.44777 - tps: 2082.47343 + dps: 3464.92542 + tps: 2063.74884 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3507.26063 - tps: 2121.26711 + dps: 3514.58911 + tps: 2131.03142 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2590.81171 - tps: 1999.84434 + dps: 2588.02478 + tps: 2004.15398 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1668.56302 - tps: 1015.00791 + dps: 1660.91177 + tps: 1012.28852 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1695.19388 - tps: 1044.5711 + dps: 1695.24797 + tps: 1038.24985 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6377.17242 - tps: 4197.80603 + dps: 6401.60906 + tps: 4238.92835 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3550.00558 - tps: 2123.3093 + dps: 3515.80451 + tps: 2096.58268 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3594.9744 - tps: 2180.14178 + dps: 3542.93691 + tps: 2136.84238 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2481.26435 - tps: 1939.22479 + dps: 2506.02682 + tps: 1948.00882 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1692.12081 - tps: 1035.7158 + dps: 1681.21116 + tps: 1027.78168 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1739.55281 - tps: 1076.04822 + dps: 1733.35178 + tps: 1073.09077 } } dps_results: { key: "TestElemental-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3567.49937 - tps: 2124.97603 + dps: 3522.6835 + tps: 2104.05651 } } dps_results: { @@ -1107,99 +1107,99 @@ dps_results: { dps_results: { key: "TestElemental-Phase5-Lvl60-Average-Default" value: { - dps: 4717.8987 - tps: 2831.90629 + dps: 4686.70844 + tps: 2809.73861 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8955.02197 - tps: 4447.86555 + dps: 8892.19714 + tps: 4400.98107 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4562.20873 - tps: 2738.51244 + dps: 4534.45948 + tps: 2731.9858 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4897.98603 - tps: 3003.91825 + dps: 4854.68878 + tps: 2993.27123 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4588.60929 - tps: 2417.16542 + dps: 4538.3702 + tps: 2390.85578 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2014.04976 - tps: 1216.88879 + dps: 2014.95113 + tps: 1219.83762 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2164.4603 - tps: 1341.18392 + dps: 2160.34439 + tps: 1337.29696 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8902.54364 - tps: 4433.43261 + dps: 8853.07776 + tps: 4405.07336 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4572.03838 - tps: 2736.03038 + dps: 4578.8635 + tps: 2751.49712 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4912.17985 - tps: 3010.27181 + dps: 4884.19962 + tps: 2993.50937 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4534.18515 - tps: 2417.40324 + dps: 4522.53989 + tps: 2403.35794 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2034.48389 - tps: 1228.36651 + dps: 2017.62337 + tps: 1216.89038 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2179.77704 - tps: 1346.26383 + dps: 2175.82737 + tps: 1344.46786 } } dps_results: { key: "TestElemental-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4661.5383 - tps: 2811.43881 + dps: 4585.26956 + tps: 2751.7729 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 3e8db3da0f..083dbe28a5 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -344,12 +344,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase2-Lvl40-StatWeights-Default" value: { - weights: 1.01275 - weights: 0.4163 + weights: 0.99995 + weights: 0.61785 weights: 0 weights: 0 weights: 0 - weights: 0.37191 + weights: 0.37144 weights: 0 weights: 0 weights: 0 @@ -361,9 +361,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.46034 - weights: 3.17227 - weights: 6.77902 + weights: 0.45452 + weights: 3.11375 + weights: 6.85946 weights: 0 weights: 0 weights: 0 @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.60363 - weights: 0.89583 + weights: 1.58957 + weights: 0.8135 weights: 0 weights: 0 weights: 0 - weights: 0.43178 + weights: 0.43148 weights: 0 weights: 0 weights: 0 @@ -410,9 +410,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.67493 - weights: 5.76419 - weights: 10.79769 + weights: 0.66901 + weights: 7.84642 + weights: 10.7407 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.07186 - weights: 0.45434 + weights: 2.06877 + weights: 0.50799 weights: 0 weights: 0 weights: 0 - weights: 0.7593 + weights: 0.75804 weights: 0 weights: 0 weights: 0 @@ -459,9 +459,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94176 - weights: 27.33827 - weights: 10.56181 + weights: 0.94035 + weights: 27.77891 + weights: 12.07149 weights: 0 weights: 0 weights: 0 @@ -491,12 +491,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.53261 - weights: 1.35923 + weights: 2.52327 + weights: 0.85909 weights: 0 weights: 0 weights: 0 - weights: 0.83964 + weights: 0.83552 weights: 0 weights: 0 weights: 0 @@ -508,9 +508,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.00103 - weights: 30.40206 - weights: 11.38987 + weights: 0.99734 + weights: 28.49909 + weights: 13.43586 weights: 0 weights: 0 weights: 0 @@ -540,12 +540,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase6-Lvl60-StatWeights-Default" value: { - weights: 3.10329 - weights: 2.38384 + weights: 3.09634 + weights: 2.84598 weights: 0 weights: 0 weights: 0 - weights: 0.81547 + weights: 0.81389 weights: 0 weights: 0 weights: 0 @@ -557,9 +557,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.2266 - weights: 32.2852 - weights: 30.00647 + weights: 1.22385 + weights: 38.31898 + weights: 28.95672 weights: 0 weights: 0 weights: 0 @@ -771,1603 +771,1603 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase2-Lvl40-Average-Default" value: { - dps: 811.64558 - tps: 862.75434 + dps: 802.30573 + tps: 852.28754 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 376.31125 - tps: 415.03088 + dps: 376.54751 + tps: 414.29784 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 374.34623 - tps: 422.84618 + dps: 371.11805 + tps: 416.18355 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 382.68873 - tps: 434.51802 + dps: 355.9933 + tps: 402.10066 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 214.9522 - tps: 242.77209 + dps: 212.86247 + tps: 239.00272 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 235.58082 - tps: 277.10813 + dps: 234.69856 + tps: 274.05907 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 237.0815 - tps: 278.73282 + dps: 221.39545 + tps: 261.7371 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 376.31125 - tps: 415.03088 + dps: 376.54751 + tps: 414.29784 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 374.34623 - tps: 422.84618 + dps: 371.11805 + tps: 416.18355 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 382.68873 - tps: 434.51802 + dps: 355.9933 + tps: 402.10066 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 214.9522 - tps: 242.77209 + dps: 212.86247 + tps: 239.00272 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 235.58082 - tps: 277.10813 + dps: 234.69856 + tps: 274.05907 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 237.0815 - tps: 278.73282 + dps: 221.39545 + tps: 261.7371 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 377.95197 - tps: 418.97329 + dps: 378.49599 + tps: 418.50212 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 381.26713 - tps: 428.65438 + dps: 381.39272 + tps: 425.73032 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 393.47553 - tps: 443.60522 + dps: 366.49473 + tps: 412.12855 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 212.14959 - tps: 239.37948 + dps: 211.74232 + tps: 238.26246 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 239.23934 - tps: 280.29351 + dps: 239.35143 + tps: 278.33867 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 242.48748 - tps: 283.54525 + dps: 226.32227 + tps: 265.54771 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 377.95197 - tps: 418.97329 + dps: 378.49599 + tps: 418.50212 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 381.26713 - tps: 428.65438 + dps: 381.39272 + tps: 425.73032 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 393.47553 - tps: 443.60522 + dps: 366.49473 + tps: 412.12855 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 212.14959 - tps: 239.37948 + dps: 211.74232 + tps: 238.26246 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget" value: { - dps: 239.23934 - tps: 280.29351 + dps: 239.35143 + tps: 278.33867 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget" value: { - dps: 242.48748 - tps: 283.54525 + dps: 226.32227 + tps: 265.54771 } } dps_results: { key: "TestEnhancement-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 749.68462 - tps: 797.37648 + dps: 746.52292 + tps: 794.62529 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Average-Default" value: { - dps: 1807.08804 - tps: 1320.96705 + dps: 1789.74405 + tps: 1307.1966 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 909.84179 - tps: 671.56265 + dps: 910.46329 + tps: 673.03534 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 912.78663 - tps: 677.20495 + dps: 906.68751 + tps: 670.99074 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 939.03281 - tps: 698.08277 + dps: 870.02087 + tps: 648.84234 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 432.29121 - tps: 327.72839 + dps: 433.99286 + tps: 329.41699 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 481.92392 - tps: 372.74094 + dps: 477.91226 + tps: 369.41473 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 499.45683 - tps: 385.56841 + dps: 463.66917 + tps: 361.7243 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 909.84179 - tps: 671.56265 + dps: 910.46329 + tps: 673.03534 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 912.78663 - tps: 677.20495 + dps: 906.68751 + tps: 670.99074 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 939.03281 - tps: 698.08277 + dps: 870.02087 + tps: 648.84234 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 432.29121 - tps: 327.72839 + dps: 433.99286 + tps: 329.41699 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 481.92392 - tps: 372.74094 + dps: 477.91226 + tps: 369.41473 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 499.45683 - tps: 385.56841 + dps: 463.66917 + tps: 361.7243 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 907.50103 - tps: 675.14962 + dps: 907.96422 + tps: 675.43324 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 922.99067 - tps: 685.3979 + dps: 924.61028 + tps: 684.53744 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 950.54765 - tps: 705.27408 + dps: 886.25949 + tps: 659.75652 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 423.41385 - tps: 322.06331 + dps: 426.36645 + tps: 323.93231 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 486.14491 - tps: 377.18232 + dps: 484.25644 + tps: 374.5648 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 501.61957 - tps: 385.91147 + dps: 468.40037 + tps: 363.9019 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 907.50103 - tps: 675.14962 + dps: 907.96422 + tps: 675.43324 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 922.99067 - tps: 685.3979 + dps: 924.61028 + tps: 684.53744 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 950.54765 - tps: 705.27408 + dps: 886.25949 + tps: 659.75652 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 423.41385 - tps: 322.06331 + dps: 426.36645 + tps: 323.93231 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget" value: { - dps: 486.14491 - tps: 377.18232 + dps: 484.25644 + tps: 374.5648 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget" value: { - dps: 501.61957 - tps: 385.91147 + dps: 468.40037 + tps: 363.9019 } } dps_results: { key: "TestEnhancement-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1677.4737 - tps: 1225.54106 + dps: 1671.05272 + tps: 1218.76767 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1879.53622 - tps: 1904.4132 + dps: 1900.6539 + tps: 1924.87531 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1948.152 - tps: 1971.76041 + dps: 1970.70477 + tps: 1993.67846 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 1985.54568 - tps: 2011.23408 + dps: 2011.08597 + tps: 2037.1328 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 1924.38712 - tps: 1949.4715 + dps: 1945.96187 + tps: 1970.29276 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1878.36658 - tps: 1903.48059 + dps: 1900.2286 + tps: 1924.58843 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 1925.18724 - tps: 1949.388 + dps: 1948.1473 + tps: 1971.58707 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 2952.18831 - tps: 3013.54548 + dps: 2962.98221 + tps: 3021.17259 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 2897.88286 - tps: 2961.81829 + dps: 2907.70865 + tps: 2969.81532 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1552.94784 - tps: 1585.66459 + dps: 1558.10609 + tps: 1590.14784 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Average-Default" value: { - dps: 3916.51229 - tps: 2793.0848 + dps: 3874.65003 + tps: 2762.28397 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1745.02401 - tps: 1736.07995 + dps: 1794.99018 + tps: 1774.45639 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1076.19067 - tps: 775.55526 + dps: 1080.18849 + tps: 778.06453 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1175.4844 - tps: 776.73029 + dps: 1174.86644 + tps: 778.5345 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 715.12994 - tps: 942.38971 + dps: 727.76744 + tps: 952.20966 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 458.7698 - tps: 338.71431 + dps: 457.72403 + tps: 338.91003 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 569.50703 - tps: 386.27737 + dps: 563.94135 + tps: 383.2409 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1745.02401 - tps: 1736.07995 + dps: 1794.99018 + tps: 1774.45639 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1076.19067 - tps: 775.55526 + dps: 1080.18849 + tps: 778.06453 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1175.4844 - tps: 776.73029 + dps: 1174.86644 + tps: 778.5345 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 715.12994 - tps: 942.38971 + dps: 727.76744 + tps: 952.20966 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 458.7698 - tps: 338.71431 + dps: 457.72403 + tps: 338.91003 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 569.50703 - tps: 386.27737 + dps: 563.94135 + tps: 383.2409 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3075.38371 - tps: 2674.41662 + dps: 2886.73844 + tps: 2541.60778 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1535.90006 - tps: 1095.60188 + dps: 1455.60227 + tps: 1042.82607 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1619.51861 - tps: 1087.25193 + dps: 1531.75177 + tps: 1020.63646 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1244.59566 - tps: 1323.83856 + dps: 1166.00049 + tps: 1269.72096 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 628.49078 - tps: 457.74339 + dps: 588.31591 + tps: 429.44576 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 752.14699 - tps: 514.01939 + dps: 710.06402 + tps: 481.68485 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3075.38371 - tps: 2674.41662 + dps: 2886.73844 + tps: 2541.60778 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1535.90006 - tps: 1095.60188 + dps: 1455.60227 + tps: 1042.82607 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1619.51861 - tps: 1087.25193 + dps: 1531.75177 + tps: 1020.63646 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1244.59566 - tps: 1323.83856 + dps: 1166.00049 + tps: 1269.72096 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 628.49078 - tps: 457.74339 + dps: 588.31591 + tps: 429.44576 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 752.14699 - tps: 514.01939 + dps: 710.06402 + tps: 481.68485 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1748.60187 - tps: 1741.64857 + dps: 1787.16692 + tps: 1772.79751 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1082.49945 - tps: 779.93963 + dps: 1081.65605 + tps: 779.08729 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1175.78674 - tps: 777.69264 + dps: 1174.9292 + tps: 780.34881 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 712.44103 - tps: 941.402 + dps: 704.47306 + tps: 936.70089 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 453.83439 - tps: 334.9893 + dps: 456.37861 + tps: 338.06775 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 569.08239 - tps: 386.36441 + dps: 563.12313 + tps: 382.69041 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1748.60187 - tps: 1741.64857 + dps: 1787.16692 + tps: 1772.79751 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1082.49945 - tps: 779.93963 + dps: 1081.65605 + tps: 779.08729 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1175.78674 - tps: 777.69264 + dps: 1174.9292 + tps: 780.34881 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 712.44103 - tps: 941.402 + dps: 704.47306 + tps: 936.70089 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 453.83439 - tps: 334.9893 + dps: 456.37861 + tps: 338.06775 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 569.08239 - tps: 386.36441 + dps: 563.12313 + tps: 382.69041 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3064.06041 - tps: 2670.70842 + dps: 2872.40567 + tps: 2541.77091 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1522.84475 - tps: 1086.2114 + dps: 1447.47534 + tps: 1036.86724 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1618.45218 - tps: 1085.84864 + dps: 1529.9488 + tps: 1018.95481 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1228.35114 - tps: 1313.67307 + dps: 1152.32249 + tps: 1261.29941 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 621.308 - tps: 452.95176 + dps: 579.94602 + tps: 423.91936 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 751.89054 - tps: 514.3421 + dps: 709.88073 + tps: 482.11804 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3064.06041 - tps: 2670.70842 + dps: 2872.40567 + tps: 2541.77091 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1522.84475 - tps: 1086.2114 + dps: 1447.47534 + tps: 1036.86724 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1618.45218 - tps: 1085.84864 + dps: 1529.9488 + tps: 1018.95481 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1228.35114 - tps: 1313.67307 + dps: 1152.32249 + tps: 1261.29941 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 621.308 - tps: 452.95176 + dps: 579.94602 + tps: 423.91936 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 751.89054 - tps: 514.3421 + dps: 709.88073 + tps: 482.11804 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3166.36511 - tps: 2254.3351 + dps: 3176.64766 + tps: 2264.90361 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 2004.35599 - tps: 2018.10964 + dps: 2052.07472 + tps: 2066.35934 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 2080.94272 - tps: 2093.27791 + dps: 2130.68143 + tps: 2143.42509 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 2136.86054 - tps: 2149.679 + dps: 2168.86282 + tps: 2186.00835 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 2053.30608 - tps: 2066.60698 + dps: 2101.29433 + tps: 2114.99385 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 2004.13401 - tps: 2017.95981 + dps: 2051.69703 + tps: 2065.91825 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 2050.69239 - tps: 2063.58912 + dps: 2099.56284 + tps: 2112.86596 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 3408.64031 - tps: 3455.01977 + dps: 3457.90133 + tps: 3511.31897 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 3345.2657 - tps: 3391.6205 + dps: 3392.08348 + tps: 3450.17958 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1656.68535 - tps: 1684.44568 + dps: 1676.20346 + tps: 1704.83225 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Average-Default" value: { - dps: 4653.74415 - tps: 3311.99872 + dps: 4633.57244 + tps: 3295.14737 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2319.8951 - tps: 2164.46582 + dps: 2306.05363 + tps: 2157.04119 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1444.68675 - tps: 1028.5373 + dps: 1432.54343 + tps: 1020.63213 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1545.38006 - tps: 1028.50448 + dps: 1512.04369 + tps: 1005.23613 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 895.75947 - tps: 1087.9711 + dps: 897.13765 + tps: 1089.67749 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 586.99605 - tps: 428.56242 + dps: 581.05042 + tps: 425.06956 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 709.24388 - tps: 485.51328 + dps: 690.90045 + tps: 471.85755 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2319.8951 - tps: 2164.46582 + dps: 2306.05363 + tps: 2157.04119 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1444.68675 - tps: 1028.5373 + dps: 1432.54343 + tps: 1020.63213 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1545.38006 - tps: 1028.50448 + dps: 1512.04369 + tps: 1005.23613 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 895.75947 - tps: 1087.9711 + dps: 897.13765 + tps: 1089.67749 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 586.99605 - tps: 428.56242 + dps: 581.05042 + tps: 425.06956 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 709.24388 - tps: 485.51328 + dps: 690.90045 + tps: 471.85755 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3705.15027 - tps: 3129.51072 + dps: 3502.67798 + tps: 3002.32222 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1724.32104 - tps: 1228.99631 + dps: 1647.68289 + tps: 1175.98271 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1935.13332 - tps: 1307.66674 + dps: 1853.69329 + tps: 1250.31016 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1535.00791 - tps: 1640.47779 + dps: 1437.63293 + tps: 1568.31129 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 685.95574 - tps: 500.47966 + dps: 651.75405 + tps: 476.40739 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 863.37576 - tps: 589.58341 + dps: 825.67635 + tps: 564.95973 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3705.15027 - tps: 3129.51072 + dps: 3502.67798 + tps: 3002.32222 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1724.32104 - tps: 1228.99631 + dps: 1647.68289 + tps: 1175.98271 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1935.13332 - tps: 1307.66674 + dps: 1853.69329 + tps: 1250.31016 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1535.00791 - tps: 1640.47779 + dps: 1437.63293 + tps: 1568.31129 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 685.95574 - tps: 500.47966 + dps: 651.75405 + tps: 476.40739 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 863.37576 - tps: 589.58341 + dps: 825.67635 + tps: 564.95973 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2292.99106 - tps: 2146.75072 + dps: 2279.07653 + tps: 2142.44087 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1438.59526 - tps: 1027.00141 + dps: 1426.89128 + tps: 1019.84604 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1547.19778 - tps: 1028.98265 + dps: 1512.06586 + tps: 1004.25462 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 874.9272 - tps: 1074.01421 + dps: 883.10186 + tps: 1079.98774 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 578.54812 - tps: 422.20035 + dps: 575.07797 + tps: 420.28055 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 709.29248 - tps: 486.04033 + dps: 690.88455 + tps: 472.39798 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2292.99106 - tps: 2146.75072 + dps: 2279.07653 + tps: 2142.44087 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1438.59526 - tps: 1027.00141 + dps: 1426.89128 + tps: 1019.84604 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1547.19778 - tps: 1028.98265 + dps: 1512.06586 + tps: 1004.25462 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 874.9272 - tps: 1074.01421 + dps: 883.10186 + tps: 1079.98774 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 578.54812 - tps: 422.20035 + dps: 575.07797 + tps: 420.28055 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 709.29248 - tps: 486.04033 + dps: 690.88455 + tps: 472.39798 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3683.90191 - tps: 3124.04252 + dps: 3457.45556 + tps: 2976.00209 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1711.03571 - tps: 1219.95909 + dps: 1636.91544 + tps: 1168.07365 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1934.90308 - tps: 1307.89418 + dps: 1853.83126 + tps: 1250.74262 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1524.48645 - tps: 1635.83732 + dps: 1422.51203 + tps: 1560.11257 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 680.40488 - tps: 495.33861 + dps: 646.89708 + tps: 472.33015 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 862.9546 - tps: 589.78789 + dps: 826.15778 + tps: 565.69105 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 3683.90191 - tps: 3124.04252 + dps: 3457.45556 + tps: 2976.00209 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 1711.03571 - tps: 1219.95909 + dps: 1636.91544 + tps: 1168.07365 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 1934.90308 - tps: 1307.89418 + dps: 1853.83126 + tps: 1250.74262 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1524.48645 - tps: 1635.83732 + dps: 1422.51203 + tps: 1560.11257 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 680.40488 - tps: 495.33861 + dps: 646.89708 + tps: 472.33015 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" value: { - dps: 862.9546 - tps: 589.78789 + dps: 826.15778 + tps: 565.69105 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3825.15234 - tps: 2722.11112 + dps: 3821.89906 + tps: 2709.08543 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1635.1316 - tps: 1664.29308 + dps: 1663.5496 + tps: 1693.27551 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1688.84923 - tps: 1716.29692 + dps: 1718.01149 + tps: 1745.97283 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 1795.97952 - tps: 1823.8466 + dps: 1799.73162 + tps: 1827.48582 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 1682.25991 - tps: 1711.09254 + dps: 1710.57898 + tps: 1740.12413 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1634.69698 - tps: 1663.58176 + dps: 1662.58416 + tps: 1692.10518 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 1667.57865 - tps: 1695.54813 + dps: 1696.18629 + tps: 1724.80139 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 3538.08908 - tps: 3558.36299 + dps: 3557.90386 + tps: 3573.37139 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 3473.07793 - tps: 3496.37511 + dps: 3486.27592 + tps: 3502.48816 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1384.87958 - tps: 1420.98889 + dps: 1394.00749 + tps: 1427.94147 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Average-Default" value: { - dps: 5872.94559 - tps: 4129.03136 + dps: 5868.04229 + tps: 4125.43329 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3498.3147 - tps: 2955.61625 + dps: 3451.81802 + tps: 2926.16686 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2577.68316 - tps: 1822.524 + dps: 2540.06202 + tps: 1796.037 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2660.49482 - tps: 1829.00517 + dps: 2692.13087 + tps: 1846.53051 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1358.53748 - tps: 1466.9944 + dps: 1346.3342 + tps: 1455.76998 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 998.07897 - tps: 726.84838 + dps: 987.38019 + tps: 719.33123 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1140.00888 - tps: 797.49689 + dps: 1151.4608 + tps: 803.37279 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3498.3147 - tps: 2955.61625 + dps: 3451.81802 + tps: 2926.16686 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2577.68316 - tps: 1822.524 + dps: 2540.06202 + tps: 1796.037 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2660.49482 - tps: 1829.00517 + dps: 2692.13087 + tps: 1846.53051 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1358.53748 - tps: 1466.9944 + dps: 1346.3342 + tps: 1455.76998 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 998.07897 - tps: 726.84838 + dps: 987.38019 + tps: 719.33123 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1140.00888 - tps: 797.49689 + dps: 1151.4608 + tps: 803.37279 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5105.94431 - tps: 4096.32327 + dps: 5081.86636 + tps: 4086.16414 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3418.0269 - tps: 2412.84233 + dps: 3426.02617 + tps: 2418.43594 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3550.71145 - tps: 2451.38359 + dps: 3551.92046 + tps: 2451.89637 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1880.85432 - tps: 1849.56535 + dps: 1867.19738 + tps: 1843.10187 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1193.80555 - tps: 865.08332 + dps: 1197.82376 + tps: 866.89704 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1381.92141 - tps: 966.39888 + dps: 1375.87614 + tps: 958.77818 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5105.94431 - tps: 4096.32327 + dps: 5081.86636 + tps: 4086.16414 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3418.0269 - tps: 2412.84233 + dps: 3426.02617 + tps: 2418.43594 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3550.71145 - tps: 2451.38359 + dps: 3551.92046 + tps: 2451.89637 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1880.85432 - tps: 1849.56535 + dps: 1867.19738 + tps: 1843.10187 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1193.80555 - tps: 865.08332 + dps: 1197.82376 + tps: 866.89704 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1381.92141 - tps: 966.39888 + dps: 1375.87614 + tps: 958.77818 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3339.85788 - tps: 2846.24752 + dps: 3334.85902 + tps: 2846.65 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2498.80309 - tps: 1773.30893 + dps: 2466.32321 + tps: 1750.56997 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2586.90227 - tps: 1782.91797 + dps: 2585.72345 + tps: 1778.04228 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1275.02332 - tps: 1399.89318 + dps: 1289.15496 + tps: 1408.56039 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 959.8702 - tps: 701.06932 + dps: 951.25014 + tps: 694.73198 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1097.97558 - tps: 769.21101 + dps: 1086.27137 + tps: 758.35852 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3339.85788 - tps: 2846.24752 + dps: 3334.85902 + tps: 2846.65 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2498.80309 - tps: 1773.30893 + dps: 2466.32321 + tps: 1750.56997 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2586.90227 - tps: 1782.91797 + dps: 2585.72345 + tps: 1778.04228 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1275.02332 - tps: 1399.89318 + dps: 1289.15496 + tps: 1408.56039 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 959.8702 - tps: 701.06932 + dps: 951.25014 + tps: 694.73198 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1097.97558 - tps: 769.21101 + dps: 1086.27137 + tps: 758.35852 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5045.81692 - tps: 4076.79564 + dps: 5006.16249 + tps: 4034.47715 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3344.68515 - tps: 2364.14548 + dps: 3317.28291 + tps: 2344.12839 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3473.45633 - tps: 2402.75661 + dps: 3483.88509 + tps: 2406.2464 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1855.90539 - tps: 1833.07527 + dps: 1826.21865 + tps: 1814.82824 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1178.10172 - tps: 854.20641 + dps: 1172.60549 + tps: 850.32776 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1348.84356 - tps: 944.56482 + dps: 1340.97561 + tps: 935.70141 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5045.81692 - tps: 4076.79564 + dps: 5006.16249 + tps: 4034.47715 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3344.68515 - tps: 2364.14548 + dps: 3317.28291 + tps: 2344.12839 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3473.45633 - tps: 2402.75661 + dps: 3483.88509 + tps: 2406.2464 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1855.90539 - tps: 1833.07527 + dps: 1826.21865 + tps: 1814.82824 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1178.10172 - tps: 854.20641 + dps: 1172.60549 + tps: 850.32776 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1348.84356 - tps: 944.56482 + dps: 1340.97561 + tps: 935.70141 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4987.56864 - tps: 3506.09108 + dps: 5005.26878 + tps: 3523.40886 } } diff --git a/sim/shaman/item_sets_pve_phase_6.go b/sim/shaman/item_sets_pve_phase_6.go index 2cd7a983a9..59c6be2bc2 100644 --- a/sim/shaman/item_sets_pve_phase_6.go +++ b/sim/shaman/item_sets_pve_phase_6.go @@ -103,7 +103,7 @@ func (shaman *Shaman) applyTAQTank2PBonus() { return } - affectedSpellCodess := []int32{SpellCode_ShamanStormstrike, SpellCode_ShamanLavaBurst, SpellCode_ShamanMoltenBlast} + affectedSpellCodess := []int32{SpellCode_ShamanStormstrikeHit, SpellCode_ShamanLavaBurst, SpellCode_ShamanMoltenBlast} buffAura := shaman.RegisterAura(core.Aura{ ActionID: core.ActionID{SpellID: 1213934}, @@ -265,10 +265,15 @@ func (shaman *Shaman) applyTAQEnhancement4PBonus() { }, }) - core.MakePermanent(shaman.RegisterAura(core.Aura{ - Label: label, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if !result.Outcome.Matches(core.OutcomeCrit) || !(spell == shaman.StormstrikeMH || spell == shaman.StormstrikeOH || spell == shaman.LavaLash || spell == shaman.LavaBurst) { + var affectedSpellCodes = []int32{SpellCode_ShamanStormstrikeHit, SpellCode_ShamanLavaLash, SpellCode_ShamanLavaBurst} + + core.MakeProcTriggerAura(&shaman.Unit, core.ProcTrigger{ + Name: label, + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeCrit, + CanProcFromProcs: true, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if !slices.Contains(affectedSpellCodes, spell.SpellCode) { return } @@ -282,7 +287,7 @@ func (shaman *Shaman) applyTAQEnhancement4PBonus() { burnSpell.Cast(sim, result.Target) }, - })) + }) } var ItemSetGiftOfTheGatheringStorm = core.NewItemSet(core.ItemSet{ diff --git a/sim/shaman/runes.go b/sim/shaman/runes.go index df9dfe20d1..3b207ea20a 100644 --- a/sim/shaman/runes.go +++ b/sim/shaman/runes.go @@ -441,16 +441,20 @@ func (shaman *Shaman) applyMaelstromWeapon() { ppmm := shaman.AutoAttacks.NewPPMManager(ppm, core.ProcMaskMelee) shaman.maelstromWeaponPPMM = &ppmm - // This aura is hidden, just applies stacks of the proc aura. - core.MakePermanent(shaman.RegisterAura(core.Aura{ - Label: "Maelstrom Weapon Trigger", - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee|core.ProcMaskMeleeDamageProc) && shaman.maelstromWeaponPPMM.Proc(sim, spell.ProcMask, "Maelstrom Weapon") { + core.MakeProcTriggerAura(&shaman.Unit, core.ProcTrigger{ + Name: "Maelstrom Weapon Trigger", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + CanProcFromProcs: true, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if shaman.maelstromWeaponPPMM.Proc(sim, spell.ProcMask, "Maelstrom Weapon") { shaman.MaelstromWeaponAura.Activate(sim) shaman.MaelstromWeaponAura.AddStack(sim) } }, - })) + }) } func (shaman *Shaman) applyPowerSurge() { diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go index b78bb3ad78..37b6bc8f35 100644 --- a/sim/shaman/shaman.go +++ b/sim/shaman/shaman.go @@ -41,6 +41,7 @@ const ( SpellCode_ShamanSearingTotem SpellCode_ShamanSearingTotemAttack SpellCode_ShamanStormstrike + SpellCode_ShamanStormstrikeHit ) // Indexes into NextTotemDrops for self buffs diff --git a/sim/shaman/stormstrike.go b/sim/shaman/stormstrike.go index 15654df164..9a75ec44be 100644 --- a/sim/shaman/stormstrike.go +++ b/sim/shaman/stormstrike.go @@ -15,12 +15,12 @@ func (shaman *Shaman) registerStormstrikeSpell() { hasDualWieldSpecRune := shaman.HasRune(proto.ShamanRune_RuneChestDualWieldSpec) shaman.StormstrikeMH = shaman.newStormstrikeHitSpell(true) - shaman.StormstrikeMH.SpellCode = SpellCode_ShamanStormstrike if hasDualWieldSpecRune { shaman.StormstrikeOH = shaman.newStormstrikeHitSpell(false) } shaman.RegisterSpell(core.SpellConfig{ + SpellCode: SpellCode_ShamanStormstrike, ActionID: core.ActionID{SpellID: 17364}, SpellSchool: core.SpellSchoolPhysical, DefenseType: core.DefenseTypeMelee, @@ -50,14 +50,14 @@ func (shaman *Shaman) registerStormstrikeSpell() { }) } -// Only the main-hand hit triggers procs / the debuff func (shaman *Shaman) newStormstrikeHitSpell(isMH bool) *core.Spell { procMask := core.ProcMaskMeleeMHSpecial flags := core.SpellFlagMeleeMetrics damageMultiplier := 1.0 damageFunc := shaman.MHWeaponDamage if !isMH { - procMask = core.ProcMaskMeleeOHSpecial + // Only the main-hand hit triggers procs / the debuff + procMask = core.ProcMaskMeleeOHSpecial | core.ProcMaskMeleeProc | core.ProcMaskMeleeDamageProc flags |= core.SpellFlagNoOnCastComplete damageMultiplier = shaman.AutoAttacks.OHConfig().DamageMultiplier damageFunc = shaman.OHWeaponDamage @@ -68,6 +68,7 @@ func (shaman *Shaman) newStormstrikeHitSpell(isMH bool) *core.Spell { }) return shaman.RegisterSpell(core.SpellConfig{ + SpellCode: SpellCode_ShamanStormstrikeHit, ActionID: core.ActionID{SpellID: 17364}.WithTag(int32(core.Ternary(isMH, 1, 2))), SpellSchool: core.SpellSchoolPhysical, DefenseType: core.DefenseTypeMelee, diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index 5d7407e916..27681476c7 100644 --- a/sim/shaman/warden/TestWardenShaman.results +++ b/sim/shaman/warden/TestWardenShaman.results @@ -50,12 +50,12 @@ character_stats_results: { stat_weights_results: { key: "TestWardenShaman-Phase4-Lvl60-StatWeights-Default" value: { - weights: 1.10827 + weights: 1.10583 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 0.48771 + weights: 0.48731 weights: 0 weights: 0 weights: 0 @@ -67,7 +67,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.50376 + weights: 0.50265 weights: 0 weights: 0 weights: 0 @@ -78,7 +78,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.89922 + weights: 1.892 weights: 0 weights: 0 weights: 0 @@ -99,154 +99,154 @@ stat_weights_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1153.83821 - tps: 1192.87636 + dps: 1161.40069 + tps: 1198.613 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1201.90518 - tps: 1239.38377 + dps: 1210.28393 + tps: 1246.07244 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 1191.48492 - tps: 1233.25083 + dps: 1205.04806 + tps: 1245.08751 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 1181.3229 - tps: 1220.24068 + dps: 1188.83441 + tps: 1226.29708 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1153.67096 - tps: 1192.31616 + dps: 1161.1639 + tps: 1198.40887 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 1186.55774 - tps: 1224.33803 + dps: 1194.56354 + tps: 1230.92617 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 1833.9416 - tps: 2029.74641 + dps: 1842.53237 + tps: 2039.6525 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1054.18792 - tps: 1085.80313 + dps: 1064.11047 + tps: 1095.19088 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Average-Default" value: { - dps: 2092.26668 - tps: 1671.44445 + dps: 2077.84269 + tps: 1661.39152 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2229.35637 - tps: 3147.38605 + dps: 2246.90323 + tps: 3152.0502 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 979.97773 - tps: 851.10631 + dps: 983.09599 + tps: 848.64816 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1320.37829 - tps: 1121.02602 + dps: 1316.30805 + tps: 1110.87798 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 702.88904 - tps: 1227.13683 + dps: 692.94449 + tps: 1214.33759 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 345.8839 - tps: 284.66366 + dps: 346.48782 + tps: 285.71648 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 554.82096 - tps: 445.67998 + dps: 549.65697 + tps: 440.76762 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2211.43236 - tps: 3120.47725 + dps: 2223.32853 + tps: 3120.4533 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 979.98406 - tps: 849.67679 + dps: 968.84117 + tps: 844.41736 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1308.08964 - tps: 1115.86559 + dps: 1305.00012 + tps: 1109.51954 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 690.6545 - tps: 1206.73415 + dps: 680.55352 + tps: 1196.15929 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 339.41964 - tps: 278.80711 + dps: 336.74916 + tps: 278.22794 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 536.08517 - tps: 428.50206 + dps: 532.51728 + tps: 423.37051 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1802.46825 - tps: 1462.27145 + dps: 1787.37772 + tps: 1449.14505 } } diff --git a/sim/shaman/windfury_weapon.go b/sim/shaman/windfury_weapon.go index 58f8cbadd1..4c09d8d34b 100644 --- a/sim/shaman/windfury_weapon.go +++ b/sim/shaman/windfury_weapon.go @@ -73,49 +73,34 @@ func (shaman *Shaman) RegisterWindfuryImbue(procMask core.ProcMask) { shaman.OffHand().TempEnchant = enchantId } - var proc = 0.2 + var procChance = 0.2 if procMask == core.ProcMaskMelee { - proc = 0.36 - } - - icd := core.Cooldown{ - Timer: shaman.NewTimer(), - Duration: icdDuration, + procChance = 0.36 } shaman.WindfuryWeaponMH = shaman.newWindfuryImbueSpell(true) shaman.WindfuryWeaponOH = shaman.newWindfuryImbueSpell(false) - aura := shaman.RegisterAura(core.Aura{ - Label: "Windfury Imbue", - Duration: core.NeverExpires, - OnReset: func(aura *core.Aura, sim *core.Simulation) { - aura.Activate(sim) - }, - OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { - if !result.Landed() || !spell.ProcMask.Matches(procMask) || spell.Flags.Matches(core.SpellFlagSuppressEquipProcs) { - return - } - - if !icd.IsReady(sim) { - return - } - - if sim.RandomFloat("Windfury Imbue") < proc { - icd.Use(sim) - - if spell.IsMH() { - shaman.WindfuryWeaponMH.Cast(sim, result.Target) - shaman.WindfuryWeaponMH.Cast(sim, result.Target) - } else { - shaman.WindfuryWeaponOH.Cast(sim, result.Target) - shaman.WindfuryWeaponOH.Cast(sim, result.Target) - } + triggerAura := core.MakeProcTriggerAura(&shaman.Unit, core.ProcTrigger{ + Name: "Windfury Trigger", + Callback: core.CallbackOnSpellHitDealt, + ProcMask: procMask, + Outcome: core.OutcomeLanded, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + ProcChance: procChance, + ICD: icdDuration, + Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if spell.IsMH() { + shaman.WindfuryWeaponMH.Cast(sim, result.Target) + shaman.WindfuryWeaponMH.Cast(sim, result.Target) + } else { + shaman.WindfuryWeaponOH.Cast(sim, result.Target) + shaman.WindfuryWeaponOH.Cast(sim, result.Target) } }, }) - shaman.RegisterOnItemSwapWithImbue(enchantId, &procMask, aura) + shaman.RegisterOnItemSwapWithImbue(enchantId, &procMask, triggerAura) } func (shaman *Shaman) ApplyWindfuryImbue(procMask core.ProcMask) { diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 90815ce015..297b8be722 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -691,9 +691,9 @@ dps_results: { dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1682.81663 - tps: 1460.1186 - hps: 384.87365 + dps: 1682.31712 + tps: 1459.98569 + hps: 384.83717 } } dps_results: { @@ -827,9 +827,9 @@ dps_results: { dps_results: { key: "TestAffliction-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1862.70268 - tps: 1380.75578 - hps: 357.31465 + dps: 1861.87282 + tps: 1380.35713 + hps: 357.20286 } } dps_results: { @@ -971,9 +971,9 @@ dps_results: { dps_results: { key: "TestAffliction-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1017.01966 - tps: 924.6105 - hps: 292.43015 + dps: 1016.62564 + tps: 924.32264 + hps: 292.25496 } } dps_results: { diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results index 973db75d6e..b970b37ff7 100644 --- a/sim/warlock/dps/TestDemonology.results +++ b/sim/warlock/dps/TestDemonology.results @@ -400,8 +400,8 @@ dps_results: { dps_results: { key: "TestDemonology-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 3228.42143 - tps: 1490.13015 + dps: 3228.44807 + tps: 1490.15147 } } dps_results: { @@ -520,8 +520,8 @@ dps_results: { dps_results: { key: "TestDemonology-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2933.00973 - tps: 1896.9497 + dps: 2932.9827 + tps: 1896.9232 } } dps_results: { diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 4b3acd7850..a4fcd96aa5 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -396,9 +396,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.90322 + weights: 0.90383 weights: 0 - weights: 0.83553 + weights: 0.83705 weights: 0 weights: 0 weights: 0 @@ -406,8 +406,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 15.65371 - weights: 10.5351 + weights: 15.65792 + weights: 10.53622 weights: 0 weights: 0 weights: 0 @@ -722,57 +722,57 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-Average-Default" value: { - dps: 1732.20086 - tps: 1557.79614 + dps: 1732.16597 + tps: 1557.79241 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2674.98149 - tps: 3157.35605 + dps: 2674.28514 + tps: 3157.14168 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1719.73724 - tps: 1547.90786 + dps: 1718.95388 + tps: 1547.37313 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1846.83709 - tps: 1671.22647 + dps: 1844.4981 + tps: 1670.21925 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1686.78032 - tps: 2278.81668 + dps: 1686.30884 + tps: 2278.5736 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 974.20502 - tps: 879.14741 + dps: 973.89861 + tps: 879.07059 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1035.50588 - tps: 947.97317 + dps: 1034.72553 + tps: 947.84708 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1726.15551 - tps: 1554.34605 + dps: 1725.75814 + tps: 1554.37686 } } dps_results: { @@ -827,8 +827,8 @@ dps_results: { dps_results: { key: "TestDestruction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2713.13975 - tps: 2465.87357 + dps: 2712.57194 + tps: 2465.78659 } } dps_results: { @@ -953,8 +953,8 @@ dps_results: { dps_results: { key: "TestDestruction-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2875.14263 - tps: 2555.87734 + dps: 2874.60407 + tps: 2555.92277 } } dps_results: { @@ -1079,8 +1079,8 @@ dps_results: { dps_results: { key: "TestDestruction-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 3144.2087 - tps: 2756.45148 + dps: 3143.5738 + tps: 2756.43992 } } dps_results: { diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results index 646bcd27c2..99464f06b6 100644 --- a/sim/warlock/tank/TestAffliction.results +++ b/sim/warlock/tank/TestAffliction.results @@ -320,8 +320,8 @@ dps_results: { dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1653.65934 - tps: 3285.8463 + dps: 1653.06869 + tps: 3285.53754 } } dps_results: { diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results index f3eea2c8fd..e2d8f784be 100644 --- a/sim/warlock/tank/TestDemonology.results +++ b/sim/warlock/tank/TestDemonology.results @@ -325,9 +325,9 @@ dps_results: { dps_results: { key: "TestDemonology-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1254.08944 - tps: 1350.16871 - hps: 217.80836 + dps: 1254.02616 + tps: 1350.03432 + hps: 217.79163 } } dps_results: { diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index 80d53cb598..31a0f629b9 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -642,8 +642,8 @@ dps_results: { dps_results: { key: "TestDestruction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1700.20643 - tps: 3540.30238 + dps: 1699.68611 + tps: 3540.14176 } } dps_results: { diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index 625dba8d9c..cd839fe99e 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -246,8 +246,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.36962 - weights: 1.64641 + weights: 2.3729 + weights: 1.13652 weights: 0 weights: 0 weights: 0 @@ -263,9 +263,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.0324 - weights: 4.40538 - weights: 27.33923 + weights: 1.01318 + weights: 6.36019 + weights: 24.33836 weights: 0 weights: 0 weights: 0 @@ -295,8 +295,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.71274 - weights: 1.60697 + weights: 2.99244 + weights: 1.56361 weights: 0 weights: 0 weights: 0 @@ -312,9 +312,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.89685 - weights: 33.54616 - weights: 28.91102 + weights: 0.85177 + weights: 34.07497 + weights: 27.67404 weights: 0 weights: 0 weights: 0 @@ -498,50 +498,50 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 2838.16363 - tps: 2446.84573 + dps: 2845.62459 + tps: 2452.52314 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2091.66454 - tps: 1843.81436 + dps: 2072.28436 + tps: 1824.3828 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2476.72938 - tps: 2140.4297 + dps: 2462.44628 + tps: 2128.70774 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2445.42348 - tps: 2114.82185 + dps: 2444.45369 + tps: 2114.95116 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2476.72938 - tps: 2140.4297 + dps: 2462.44628 + tps: 2128.70774 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 3023.62142 - tps: 2599.52764 + dps: 3030.07382 + tps: 2604.05986 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 3910.82729 - tps: 3062.71505 + dps: 3910.86152 + tps: 3063.10075 } } dps_results: { @@ -631,57 +631,57 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3029.20742 - tps: 2381.31633 + dps: 3041.76337 + tps: 2392.40441 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 3263.70938 - tps: 2798.09928 + dps: 3287.83657 + tps: 2815.86935 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2213.78724 - tps: 1935.15098 + dps: 2199.5549 + tps: 1922.33877 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2689.23659 - tps: 2309.40467 + dps: 2690.0234 + tps: 2309.38491 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2647.96124 - tps: 2275.98318 + dps: 2677.35971 + tps: 2299.81557 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2689.23659 - tps: 2309.40467 + dps: 2690.0234 + tps: 2309.38491 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 3491.70202 - tps: 2988.27928 + dps: 3508.56499 + tps: 2999.98601 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4562.04304 - tps: 3553.80587 + dps: 4564.01036 + tps: 3555.09736 } } dps_results: { @@ -855,8 +855,8 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3622.24049 - tps: 2805.05699 + dps: 3630.3795 + tps: 2816.16341 } } dps_results: { diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results index 72fab32a25..459457c234 100644 --- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results +++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results @@ -197,8 +197,8 @@ stat_weights_results: { stat_weights_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.26285 - weights: 1.71883 + weights: 3.20864 + weights: 2.6689 weights: 0 weights: 0 weights: 0 @@ -214,9 +214,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.92724 + weights: 1.00157 weights: 0 - weights: 22.49344 + weights: 27.15425 weights: 0 weights: 0 weights: 0 @@ -400,50 +400,50 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 2715.62994 - tps: 2252.88762 + dps: 2720.42797 + tps: 2258.84387 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 1662.50805 - tps: 1409.09944 + dps: 1656.93555 + tps: 1403.01423 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 1986.44062 - tps: 1671.25019 + dps: 1993.81836 + tps: 1677.33027 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 1969.98686 - tps: 1658.60081 + dps: 1956.09328 + tps: 1645.44747 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 1986.44062 - tps: 1671.25019 + dps: 1993.81836 + tps: 1677.33027 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 2926.67742 - tps: 2428.11444 + dps: 2927.42797 + tps: 2428.88546 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4491.06144 - tps: 3404.00852 + dps: 4486.69802 + tps: 3400.38726 } } dps_results: { @@ -617,8 +617,8 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3703.86244 - tps: 2787.99996 + dps: 3687.79396 + tps: 2775.66168 } } dps_results: { diff --git a/sim/warrior/item_sets_pve_phase_4.go b/sim/warrior/item_sets_pve_phase_4.go index e6803cf0e5..0a063a1677 100644 --- a/sim/warrior/item_sets_pve_phase_4.go +++ b/sim/warrior/item_sets_pve_phase_4.go @@ -27,12 +27,13 @@ var ItemSetBattlegearOfValor = core.NewItemSet(core.ItemSet{ rageMetrics := c.NewRageMetrics(core.ActionID{SpellID: 450589}) core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{ - ActionID: actionID, - Name: "S03 - Warrior Armor Heal Trigger - Battlegear of Valor", - Callback: core.CallbackOnSpellHitDealt, - Outcome: core.OutcomeLanded, - ProcMask: core.ProcMaskMelee, - PPM: 1, + ActionID: actionID, + Name: "S03 - Warrior Armor Heal Trigger - Battlegear of Valor", + Callback: core.CallbackOnSpellHitDealt, + Outcome: core.OutcomeLanded, + ProcMask: core.ProcMaskMelee, + SpellFlagsExclude: core.SpellFlagSuppressEquipProcs, + PPM: 1, Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) { c.GainHealth(sim, sim.Roll(88, 132), healthMetrics) if c.HasRageBar() { From b17faf90d435775036605e2df8427bcb073f9df5 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Tue, 31 Dec 2024 18:21:30 -0500 Subject: [PATCH 2/5] fix issue with aimed shot/multi shot not completing --- sim/hunter/TestBM.results | 48 +++++------ sim/hunter/TestMM.results | 48 +++++------ sim/hunter/TestSV.results | 176 +++++++++++++++++++------------------- sim/hunter/aimed_shot.go | 7 +- sim/hunter/multi_shot.go | 5 +- 5 files changed, 145 insertions(+), 139 deletions(-) diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index 3923a45d34..70d8a2e7c2 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -162,22 +162,22 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 553.86848 - tps: 651.24524 + dps: 539.98168 + tps: 639.29337 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 488.51541 - tps: 256.02006 + dps: 480.08828 + tps: 251.60899 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 530.84557 - tps: 273.04146 + dps: 479.14047 + tps: 248.20311 } } dps_results: { @@ -246,22 +246,22 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 755.38989 - tps: 867.14178 + dps: 741.60387 + tps: 853.79258 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 679.22745 - tps: 439.32537 + dps: 669.17718 + tps: 435.61495 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 734.26407 - tps: 477.50511 + dps: 669.86316 + tps: 449.73602 } } dps_results: { @@ -330,22 +330,22 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 553.44237 - tps: 647.15879 + dps: 540.61482 + tps: 636.92207 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 491.52499 - tps: 253.04987 + dps: 481.39587 + tps: 247.95175 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 533.35383 - tps: 269.96494 + dps: 481.54827 + tps: 245.43375 } } dps_results: { @@ -414,22 +414,22 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 755.87161 - tps: 876.52417 + dps: 743.63258 + tps: 868.66409 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 679.13926 - tps: 434.3789 + dps: 663.48981 + tps: 429.52804 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 735.1694 - tps: 472.21388 + dps: 670.01315 + tps: 446.06523 } } dps_results: { diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results index f8ac32e82f..94f0c16868 100644 --- a/sim/hunter/TestMM.results +++ b/sim/hunter/TestMM.results @@ -218,85 +218,85 @@ dps_results: { dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 640.20169 - tps: 630.49346 + dps: 758.20261 + tps: 931.51243 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 579.45898 - tps: 442.4404 + dps: 654.86883 + tps: 526.85756 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 588.54519 - tps: 455.33108 + dps: 650.19803 + tps: 520.75452 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 362.98056 - tps: 480.0866 + dps: 422.26075 + tps: 661.00298 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 312.27787 - tps: 248.44106 + dps: 360.96617 + tps: 303.92172 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 330.25524 - tps: 263.22233 + dps: 377.5628 + tps: 311.28293 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 644.99202 - tps: 635.88631 + dps: 762.87626 + tps: 935.56757 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 584.25377 - tps: 441.74818 + dps: 658.83242 + tps: 525.79631 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 593.13101 - tps: 454.95486 + dps: 654.08271 + tps: 518.65939 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 366.16267 - tps: 474.03882 + dps: 427.60071 + tps: 651.92758 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 314.88425 - tps: 247.80312 + dps: 366.58411 + tps: 304.7192 } } dps_results: { key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 332.39633 - tps: 261.52569 + dps: 381.17459 + tps: 310.85955 } } dps_results: { diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 7a128dbc62..1094e8e912 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -198,7 +198,7 @@ stat_weights_results: { key: "TestSV-Phase4-Lvl60-StatWeights-Default" value: { weights: 0 - weights: 2.96835 + weights: 2.82757 weights: 0 weights: 0 weights: 0 @@ -214,9 +214,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.39601 + weights: 0.39647 weights: 0 - weights: 20.54013 + weights: 21.21761 weights: 0 weights: 0 weights: 0 @@ -224,7 +224,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.4384 + weights: 0.44379 weights: 0 weights: 0 weights: 0 @@ -407,17 +407,17 @@ dps_results: { dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-BeastmasterArmor" value: { - dps: 1052.50217 - tps: 827.28501 - hps: 14.05876 + dps: 1108.62529 + tps: 882.10353 + hps: 14.17231 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-BloodGuard'sChain" value: { - dps: 1182.25899 - tps: 934.2052 - hps: 14.05876 + dps: 1244.72796 + tps: 992.53336 + hps: 14.17231 } } dps_results: { @@ -431,25 +431,25 @@ dps_results: { dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurEye-19991" value: { - dps: 3241.19065 - tps: 2856.5705 - hps: 20.21352 + dps: 3213.27592 + tps: 2825.17424 + hps: 20.4684 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurTooth-19992" value: { - dps: 3214.92863 - tps: 2833.3991 - hps: 20.21352 + dps: 3187.12404 + tps: 2802.28393 + hps: 20.4684 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-DreadHunter'sChain" value: { - dps: 1844.25977 - tps: 1580.53683 - hps: 15.28197 + dps: 1899.77808 + tps: 1636.85565 + hps: 15.34389 } } dps_results: { @@ -463,182 +463,182 @@ dps_results: { dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain" value: { - dps: 1182.25899 - tps: 934.2052 - hps: 14.05876 + dps: 1244.72796 + tps: 992.53336 + hps: 14.17231 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320" value: { - dps: 3262.11155 - tps: 2882.01225 - hps: 19.89415 + dps: 3237.01395 + tps: 2852.87833 + hps: 20.15517 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-SignetofBeasts-209823" value: { - dps: 3178.51567 - tps: 2802.96097 - hps: 20.28722 + dps: 3159.57977 + tps: 2784.51375 + hps: 20.7632 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322" value: { - dps: 2911.18127 - tps: 2573.16375 - hps: 19.62477 + dps: 2886.18418 + tps: 2544.39142 + hps: 19.87223 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323" value: { - dps: 3057.49786 - tps: 2691.23148 - hps: 19.62477 + dps: 3073.37628 + tps: 2703.58761 + hps: 19.87223 } } dps_results: { key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321" value: { - dps: 3141.57793 - tps: 2776.03883 - hps: 19.62477 + dps: 3116.93138 + tps: 2747.51823 + hps: 19.87223 } } dps_results: { key: "TestSV-Phase4-Lvl60-Average-Default" value: { - dps: 3245.85267 - tps: 2862.63447 - hps: 19.97449 + dps: 3240.82233 + tps: 2856.97014 + hps: 20.17278 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 4944.79446 - tps: 4960.56653 - hps: 20.1602 + dps: 4734.16901 + tps: 4772.50877 + hps: 20.73445 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2986.42493 - tps: 2611.68776 - hps: 20.22776 + dps: 2996.97928 + tps: 2628.77088 + hps: 20.62697 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2986.23838 - tps: 2618.26971 - hps: 19.45383 + dps: 3041.22596 + tps: 2686.22531 + hps: 20.03729 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3318.44207 - tps: 3567.46733 - hps: 10.55617 + dps: 3306.01954 + tps: 3565.88718 + hps: 10.42193 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1500.39661 - tps: 1336.22272 - hps: 10.37596 + dps: 1517.98161 + tps: 1353.69711 + hps: 10.30148 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1508.55008 - tps: 1326.72925 - hps: 10.66558 + dps: 1510.76821 + tps: 1328.81466 + hps: 10.61961 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 5229.66353 - tps: 5227.73017 - hps: 20.20319 + dps: 5047.14236 + tps: 5076.96859 + hps: 20.44579 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3162.41039 - tps: 2777.25348 - hps: 20.22469 + dps: 3228.49257 + tps: 2840.30554 + hps: 20.51335 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3225.74417 - tps: 2849.98451 - hps: 19.02391 + dps: 3292.64028 + tps: 2933.649 + hps: 19.28493 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3311.53884 - tps: 3556.98708 - hps: 10.37596 + dps: 3296.14027 + tps: 3549.76953 + hps: 10.54881 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1502.57872 - tps: 1337.49305 - hps: 10.37688 + dps: 1511.87796 + tps: 1345.95201 + hps: 10.37136 } } dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1543.23597 - tps: 1360.60771 + dps: 1545.37175 + tps: 1362.50325 hps: 10.57364 } } dps_results: { key: "TestSV-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3019.2061 - tps: 2719.86715 - hps: 19.59929 + dps: 3012.04121 + tps: 2700.04616 + hps: 19.89102 } } dps_results: { key: "TestSV-Phase5-Lvl60-AllItems-BeastmasterArmor" value: { - dps: 1174.82316 - tps: 953.33813 + dps: 1176.83581 + tps: 955.63333 } } dps_results: { key: "TestSV-Phase5-Lvl60-AllItems-BloodGuard'sChain" value: { - dps: 1348.32064 - tps: 1034.76059 + dps: 1350.98456 + tps: 1037.4956 } } dps_results: { key: "TestSV-Phase5-Lvl60-AllItems-BloodlashBow-216516" value: { - dps: 3730.09278 - tps: 3054.85594 + dps: 3803.3957 + tps: 3150.24938 } } dps_results: { @@ -665,15 +665,15 @@ dps_results: { dps_results: { key: "TestSV-Phase5-Lvl60-AllItems-GurubashiPitFighter'sBow-221450" value: { - dps: 3766.69794 - tps: 3088.4234 + dps: 3840.51351 + tps: 3184.38884 } } dps_results: { key: "TestSV-Phase5-Lvl60-AllItems-Knight-Lieutenant'sChain" value: { - dps: 1348.32064 - tps: 1034.76059 + dps: 1350.98456 + tps: 1037.4956 } } dps_results: { diff --git a/sim/hunter/aimed_shot.go b/sim/hunter/aimed_shot.go index fdfe5fede0..7343f1c22e 100644 --- a/sim/hunter/aimed_shot.go +++ b/sim/hunter/aimed_shot.go @@ -37,8 +37,9 @@ func (hunter *Hunter) getAimedShotConfig(rank int, timer *core.Timer) core.Spell Timer: timer, Duration: time.Second * 6, }, - ModifyCast: func(_ *core.Simulation, spell *core.Spell, cast *core.Cast) { + ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) { cast.CastTime = spell.CastTime() + hunter.AutoAttacks.CancelAutoSwing(sim) }, IgnoreHaste: true, // Hunter GCD is locked at 1.5s CastTime: func(spell *core.Spell) time.Duration { @@ -62,8 +63,10 @@ func (hunter *Hunter) getAimedShotConfig(rank int, timer *core.Timer) core.Spell baseDamage := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target, false)) + hunter.AmmoDamageBonus + baseDamage - result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeRangedHitAndCrit) + + hunter.AutoAttacks.EnableAutoSwing(sim) + spell.WaitTravelTime(sim, func(s *core.Simulation) { spell.DealDamage(sim, result) }) diff --git a/sim/hunter/multi_shot.go b/sim/hunter/multi_shot.go index 9a3baf1193..d758cf718f 100644 --- a/sim/hunter/multi_shot.go +++ b/sim/hunter/multi_shot.go @@ -38,8 +38,9 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell GCD: core.GCDDefault, CastTime: time.Millisecond * 500, }, - ModifyCast: func(_ *core.Simulation, spell *core.Spell, cast *core.Cast) { + ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) { cast.CastTime = spell.CastTime() + hunter.AutoAttacks.CancelAutoSwing(sim) }, IgnoreHaste: true, // Hunter GCD is locked at 1.5s CD: core.Cooldown{ @@ -71,6 +72,8 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell target = sim.Environment.NextTargetUnit(target) } + hunter.AutoAttacks.EnableAutoSwing(sim) + spell.WaitTravelTime(sim, func(s *core.Simulation) { for _, result := range results { spell.DealDamage(sim, result) From 53b9fdcb7b78ee7d73132a5630cf3c0c28fc721e Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Tue, 31 Dec 2024 18:26:52 -0500 Subject: [PATCH 3/5] enhancement t2.5 4pc burn ignores attacker mods --- sim/shaman/item_sets_pve_phase_6.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/shaman/item_sets_pve_phase_6.go b/sim/shaman/item_sets_pve_phase_6.go index 59c6be2bc2..8ee8b7db8a 100644 --- a/sim/shaman/item_sets_pve_phase_6.go +++ b/sim/shaman/item_sets_pve_phase_6.go @@ -242,7 +242,7 @@ func (shaman *Shaman) applyTAQEnhancement4PBonus() { SpellSchool: core.SpellSchoolFire, DefenseType: core.DefenseTypeMagic, ProcMask: core.ProcMaskEmpty, - Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell, + Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagIgnoreAttackerModifiers, DamageMultiplier: 1, ThreatMultiplier: 1, From f4470530cb1c63f6fe1fd5402de3a19e85ec1899 Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Thu, 2 Jan 2025 19:08:57 -0700 Subject: [PATCH 4/5] fixed typo --- sim/rogue/evasion.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/rogue/evasion.go b/sim/rogue/evasion.go index d46e38e035..bd540a533f 100644 --- a/sim/rogue/evasion.go +++ b/sim/rogue/evasion.go @@ -33,7 +33,7 @@ func (rogue *Rogue) RegisterEvasionSpell() { DefaultCast: core.Cast{}, CD: core.Cooldown{ Timer: rogue.NewTimer(), - Duration: []time.Duration{time.Minute * 5, time.Minute*5 - time.Second*45, time.Second*5 - time.Second*90}[rogue.Talents.Elusiveness], + Duration: []time.Duration{time.Minute * 5, time.Minute*5 - time.Second*45, time.Minute*5 - time.Second*90}[rogue.Talents.Elusiveness], }, IgnoreHaste: true, }, From 5ecaf4d7944cec1f94d9b90f59b350fdaf0c9f4d Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Thu, 2 Jan 2025 19:27:18 -0700 Subject: [PATCH 5/5] evasion talent change --- sim/rogue/evasion.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/rogue/evasion.go b/sim/rogue/evasion.go index bd540a533f..5e523c9a80 100644 --- a/sim/rogue/evasion.go +++ b/sim/rogue/evasion.go @@ -33,7 +33,7 @@ func (rogue *Rogue) RegisterEvasionSpell() { DefaultCast: core.Cast{}, CD: core.Cooldown{ Timer: rogue.NewTimer(), - Duration: []time.Duration{time.Minute * 5, time.Minute*5 - time.Second*45, time.Minute*5 - time.Second*90}[rogue.Talents.Elusiveness], + Duration: []time.Duration{time.Minute * 5, time.Minute*5 - time.Second*45, time.Minute*5 - time.Second*90}[rogue.Talents.Endurance], }, IgnoreHaste: true, },