From 318afe948dc0a3d5e4545669edfc409418dc4827 Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Tue, 8 Oct 2024 05:17:48 -0400 Subject: [PATCH 1/6] implement off GCD apl --- proto/apl.proto | 18 +- sim/core/apl_action.go | 16 + sim/core/apl_actions_casting.go | 78 ++++- sim/core/apl_actions_misc.go | 63 ++++ sim/core/apl_actions_sequences.go | 68 +++- sim/core/apl_actions_timing.go | 320 +++++++++++++++++- sim/druid/feral/apl_values.go | 8 + sim/mage/TestArcane.results | 102 +++--- sim/paladin/apl_values.go | 8 + sim/paladin/judgement.go | 2 + sim/paladin/retribution/TestExodin.results | 16 +- sim/paladin/retribution/TestShockadin.results | 40 +-- .../individual_sim_ui/apl_actions.ts | 42 +++ .../apls/p5ret-twist-4DR-CancelAura.apl.json | 20 ++ .../gear_sets/p5twistingHaste.gear.json | 21 ++ ui/retribution_paladin/presets.ts | 19 +- ui/retribution_paladin/sim.ts | 7 + 17 files changed, 754 insertions(+), 94 deletions(-) create mode 100644 ui/retribution_paladin/apls/p5ret-twist-4DR-CancelAura.apl.json create mode 100644 ui/retribution_paladin/gear_sets/p5twistingHaste.gear.json diff --git a/proto/apl.proto b/proto/apl.proto index 236a6f804e..ad98e49260 100644 --- a/proto/apl.proto +++ b/proto/apl.proto @@ -41,7 +41,7 @@ message APLListItem { APLAction action = 3; // The action to be performed. } -// NextIndex: 24 +// NextIndex: 26 message APLAction { APLValue condition = 1; // If set, action will only execute if value is true or != 0. @@ -56,7 +56,9 @@ message APLAction { // Timing APLActionWait wait = 4; APLActionWaitUntil wait_until = 14; + APLActionRelativeSchedule relative_schedule = 24; APLActionSchedule schedule = 15; + APLActionPeriodicSchedule periodic_schedule = 25; // Sequences APLActionSequence sequence = 2; @@ -219,6 +221,13 @@ message APLActionWaitUntil { APLValue condition = 1; } +message APLActionRelativeSchedule { + // relative time compared to current time, e.g. '1s' + string schedule = 1; + + APLAction inner_action = 2; +} + message APLActionSchedule { // Comma-separated list of times, e.g. '0s, 30s, 60s' string schedule = 1; @@ -226,6 +235,13 @@ message APLActionSchedule { APLAction inner_action = 2; } +message APLActionPeriodicSchedule { + // Comma-separated list of starttime and period e.g. '1s, 3s' for every 3 seconds starting at 1 seconds + string schedule = 1; + + APLAction inner_action = 2; +} + message APLActionSequence { string name = 1; diff --git a/sim/core/apl_action.go b/sim/core/apl_action.go index ad192e5619..b2ec408618 100644 --- a/sim/core/apl_action.go +++ b/sim/core/apl_action.go @@ -2,6 +2,7 @@ package core import ( "fmt" + "time" "github.com/wowsims/sod/sim/core/proto" ) @@ -26,6 +27,10 @@ func (action *APLAction) Execute(sim *Simulation) { action.impl.Execute(sim) } +func (action *APLAction) ExecuteOffGCD(sim *Simulation, offGCDTime time.Duration) { + action.impl.ExecuteOffGCD(sim, offGCDTime) +} + // Returns this Action, along with all inner Actions. func (action *APLAction) GetAllActions() []*APLAction { actions := action.impl.GetInnerActions() @@ -90,9 +95,15 @@ type APLActionImpl interface { // Whether this action is available to be used right now. IsReady(*Simulation) bool + // Whether this action is available Even during GCD + IsOffGCDAction() bool + // Performs the action. Execute(*Simulation) + // Performs the action off GCD at the given time + ExecuteOffGCD(*Simulation, time.Duration) + // Called only while this action is controlling the rotation. GetNextAction(sim *Simulation) *APLAction @@ -109,6 +120,7 @@ func (impl defaultAPLActionImpl) GetAPLValues() []APLValue { return func (impl defaultAPLActionImpl) Finalize(*APLRotation) {} func (impl defaultAPLActionImpl) Reset(*Simulation) {} func (impl defaultAPLActionImpl) GetNextAction(*Simulation) *APLAction { return nil } +func (impl defaultAPLActionImpl) IsOffGCDAction() bool { return false } func (rot *APLRotation) newAPLAction(config *proto.APLAction) *APLAction { if config == nil { @@ -155,8 +167,12 @@ func (rot *APLRotation) newAPLActionImpl(config *proto.APLAction) APLActionImpl return rot.newActionWait(config.GetWait()) case *proto.APLAction_WaitUntil: return rot.newActionWaitUntil(config.GetWaitUntil()) + case *proto.APLAction_RelativeSchedule: + return rot.newActionRelativeSchedule(config.GetRelativeSchedule()) case *proto.APLAction_Schedule: return rot.newActionSchedule(config.GetSchedule()) + case *proto.APLAction_PeriodicSchedule: + return rot.newActionPeriodicSchedule(config.GetPeriodicSchedule()) // Sequences case *proto.APLAction_Sequence: diff --git a/sim/core/apl_actions_casting.go b/sim/core/apl_actions_casting.go index 4646c05e24..d1b80e6f8e 100644 --- a/sim/core/apl_actions_casting.go +++ b/sim/core/apl_actions_casting.go @@ -2,14 +2,18 @@ package core import ( "fmt" + "time" "github.com/wowsims/sod/sim/core/proto" ) type APLActionCastSpell struct { defaultAPLActionImpl - spell *Spell - target UnitReference + spell *Spell + target UnitReference + offGCD bool + offGCDTime time.Duration + offGCDTimeExe time.Duration } func (rot *APLRotation) newActionCastSpell(config *proto.APLActionCastSpell) APLActionImpl { @@ -27,11 +31,53 @@ func (rot *APLRotation) newActionCastSpell(config *proto.APLActionCastSpell) APL } } func (action *APLActionCastSpell) IsReady(sim *Simulation) bool { - return action.spell.CanCast(sim, action.target.Get()) && (!action.spell.Flags.Matches(SpellFlagMCD) || action.spell.Unit.GCD.IsReady(sim) || action.spell.DefaultCast.GCD == 0) + action.offGCD = false + ready := action.spell.CanCast(sim, action.target.Get()) && (!action.spell.Flags.Matches(SpellFlagMCD) || action.spell.Unit.GCD.IsReady(sim) || action.spell.DefaultCast.GCD == 0) + + if !ready && (action.spell.DefaultCast.GCD == 0) && action.spell.CD.Timer != nil && (action.spell.CD.Timer.TimeToReady(sim) < 1500*time.Millisecond) && action.offGCDTimeExe != action.spell.CD.Timer.ReadyAt() { + //if sim.Log != nil { + // sim.Log("APLActionCastSpell IsReady offGCD") + //} + ready = true + action.offGCD = true + action.offGCDTime = action.spell.CD.Timer.ReadyAt() + } + return ready +} +func (action *APLActionCastSpell) IsOffGCDAction() bool { + return action.spell.DefaultCast.GCD == 0 } func (action *APLActionCastSpell) Execute(sim *Simulation) { - action.spell.Cast(sim, action.target.Get()) + if action.offGCD { + // Used when using APLActionCastSpell as an unnested action + action.offGCDTimeExe = action.offGCDTime + offGCDTimeExe := action.offGCDTimeExe + //if sim.Log != nil { + // sim.Log("APLActionCastSpell Execute Scheduling delayed off GCD action for %f", offGCDTimeExe) + //} + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: offGCDTimeExe, + OnAction: func(s *Simulation) { + if action.spell.CanCast(sim, action.target.Get()) { + action.spell.Cast(sim, action.target.Get()) + } + }, + }) + } else { + action.spell.Cast(sim, action.target.Get()) + } +} + +func (action *APLActionCastSpell) ExecuteOffGCD(sim *Simulation, time time.Duration) { + //if sim.Log != nil { + // sim.Log("APLActionCastSpell ExecuteOffGCD Scheduling delayed off GCD action for %f", time) + //} + // Used when using APLActionCastSpell as a nested action (e.g. within a sequence) + action.offGCD = true + action.offGCDTime = time + action.Execute(sim) // Default to Execute unless impletented for this APL Action } + func (action *APLActionCastSpell) String() string { return fmt.Sprintf("Cast Spell(%s)", action.spell.ActionID) } @@ -82,6 +128,9 @@ func (action *APLActionChannelSpell) GetAPLValues() []APLValue { func (action *APLActionChannelSpell) IsReady(sim *Simulation) bool { return action.spell.CanCast(sim, action.target.Get()) } +func (action *APLActionChannelSpell) IsOffGCDAction() bool { + return false +} func (action *APLActionChannelSpell) Execute(sim *Simulation) { action.spell.Cast(sim, action.target.Get()) @@ -95,6 +144,9 @@ func (action *APLActionChannelSpell) Execute(sim *Simulation) { action.spell.Unit.Rotation.allowChannelRecastOnInterrupt = action.allowRecast } } +func (action *APLActionChannelSpell) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionChannelSpell) String() string { return fmt.Sprintf("Channel Spell(%s, interruptIf=%s)", action.spell.ActionID, action.interruptIf) } @@ -167,9 +219,15 @@ func (action *APLActionMultidot) IsReady(sim *Simulation) bool { } return false } +func (action *APLActionMultidot) IsOffGCDAction() bool { + return false +} func (action *APLActionMultidot) Execute(sim *Simulation) { action.spell.Cast(sim, action.nextTarget) } +func (action *APLActionMultidot) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionMultidot) String() string { return fmt.Sprintf("Multidot(%s)", action.spell.ActionID) } @@ -228,9 +286,15 @@ func (action *APLActionMultishield) IsReady(sim *Simulation) bool { } return false } +func (action *APLActionMultishield) IsOffGCDAction() bool { + return false +} func (action *APLActionMultishield) Execute(sim *Simulation) { action.spell.Cast(sim, action.nextTarget) } +func (action *APLActionMultishield) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionMultishield) String() string { return fmt.Sprintf("Multishield(%s)", action.spell.ActionID) } @@ -259,10 +323,16 @@ func (action *APLActionAutocastOtherCooldowns) IsReady(sim *Simulation) bool { // true even for MCDs which do not require the GCD. return action.nextReadyMCD != nil && action.character.GCD.IsReady(sim) } +func (action *APLActionAutocastOtherCooldowns) IsOffGCDAction() bool { + return false +} func (action *APLActionAutocastOtherCooldowns) Execute(sim *Simulation) { action.nextReadyMCD.tryActivateHelper(sim, action.character) action.character.UpdateMajorCooldowns() } +func (action *APLActionAutocastOtherCooldowns) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionAutocastOtherCooldowns) String() string { return "Autocast Other Cooldowns" } diff --git a/sim/core/apl_actions_misc.go b/sim/core/apl_actions_misc.go index d8d10fe965..9422f72be6 100644 --- a/sim/core/apl_actions_misc.go +++ b/sim/core/apl_actions_misc.go @@ -30,12 +30,19 @@ func (rot *APLRotation) newActionChangeTarget(config *proto.APLActionChangeTarge func (action *APLActionChangeTarget) IsReady(sim *Simulation) bool { return action.unit.CurrentTarget != action.newTarget.Get() } + +func (action *APLActionChangeTarget) IsOffGCDAction() bool { + return false +} func (action *APLActionChangeTarget) Execute(sim *Simulation) { if sim.Log != nil { action.unit.Log(sim, "Changing target to %s", action.newTarget.Get().Label) } action.unit.CurrentTarget = action.newTarget.Get() } +func (action *APLActionChangeTarget) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionChangeTarget) String() string { return fmt.Sprintf("Change Target(%s)", action.newTarget.Get().Label) } @@ -58,12 +65,19 @@ func (rot *APLRotation) newActionCancelAura(config *proto.APLActionCancelAura) A func (action *APLActionCancelAura) IsReady(sim *Simulation) bool { return action.aura.IsActive() } + +func (action *APLActionCancelAura) IsOffGCDAction() bool { + return true +} func (action *APLActionCancelAura) Execute(sim *Simulation) { if sim.Log != nil { action.aura.Unit.Log(sim, "Cancelling aura %s", action.aura.ActionID) } action.aura.Deactivate(sim) } +func (action *APLActionCancelAura) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionCancelAura) String() string { return fmt.Sprintf("Cancel Aura(%s)", action.aura.ActionID) } @@ -87,6 +101,9 @@ func (action *APLActionActivateAura) IsReady(sim *Simulation) bool { return true } +func (action *APLActionActivateAura) IsOffGCDAction() bool { + return false +} func (action *APLActionActivateAura) Execute(sim *Simulation) { if sim.Log != nil { action.aura.Unit.Log(sim, "Activating aura %s", action.aura.ActionID) @@ -94,6 +111,10 @@ func (action *APLActionActivateAura) Execute(sim *Simulation) { action.aura.Activate(sim) } +func (action *APLActionActivateAura) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionActivateAura) String() string { return fmt.Sprintf("Activate Aura(%s)", action.aura.ActionID) } @@ -129,6 +150,10 @@ func (action *APLActionActivateAuraWithStacks) IsReady(sim *Simulation) bool { return true } +func (action *APLActionActivateAuraWithStacks) IsOffGCDAction() bool { + return false +} + func (action *APLActionActivateAuraWithStacks) Execute(sim *Simulation) { if sim.Log != nil { action.aura.Unit.Log(sim, "Activating aura %s (%d stacks)", action.aura.ActionID, action.numStacks) @@ -137,6 +162,10 @@ func (action *APLActionActivateAuraWithStacks) Execute(sim *Simulation) { action.aura.SetStacks(sim, action.numStacks) } +func (action *APLActionActivateAuraWithStacks) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionActivateAuraWithStacks) String() string { return fmt.Sprintf("Activate Aura(%s) Stacks(%d)", action.aura.ActionID, action.numStacks) } @@ -167,6 +196,10 @@ func (action *APLActionAddComboPoints) IsReady(sim *Simulation) bool { return true } +func (action *APLActionAddComboPoints) IsOffGCDAction() bool { + return false +} + func (action *APLActionAddComboPoints) Execute(sim *Simulation) { numPoints := strconv.Itoa(int(action.numPoints)) @@ -177,6 +210,10 @@ func (action *APLActionAddComboPoints) Execute(sim *Simulation) { action.character.AddComboPointsIgnoreTarget(sim, action.numPoints, action.metrics) } +func (action *APLActionAddComboPoints) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionAddComboPoints) String() string { numPoints := strconv.Itoa(int(action.numPoints)) return fmt.Sprintf("Add Combo Points(%s)", numPoints) @@ -199,12 +236,19 @@ func (rot *APLRotation) newActionTriggerICD(config *proto.APLActionTriggerICD) A func (action *APLActionTriggerICD) IsReady(sim *Simulation) bool { return action.aura.IsActive() } + +func (action *APLActionTriggerICD) IsOffGCDAction() bool { + return false +} func (action *APLActionTriggerICD) Execute(sim *Simulation) { if sim.Log != nil { action.aura.Unit.Log(sim, "Triggering ICD %s", action.aura.ActionID) } action.aura.Icd.Use(sim) } +func (action *APLActionTriggerICD) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionTriggerICD) String() string { return fmt.Sprintf("Trigger ICD(%s)", action.aura.ActionID) } @@ -237,6 +281,10 @@ func (rot *APLRotation) newActionItemSwap(config *proto.APLActionItemSwap) APLAc func (action *APLActionItemSwap) IsReady(sim *Simulation) bool { return (action.swapSet == proto.APLActionItemSwap_Main) == action.character.ItemSwap.IsSwapped() } + +func (action *APLActionItemSwap) IsOffGCDAction() bool { + return false +} func (action *APLActionItemSwap) Execute(sim *Simulation) { if sim.Log != nil { action.character.Log(sim, "Item Swap to set %s", action.swapSet) @@ -248,6 +296,9 @@ func (action *APLActionItemSwap) Execute(sim *Simulation) { action.character.ItemSwap.SwapItems(sim, action.character.ItemSwap.slots) } } +func (action *APLActionItemSwap) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionItemSwap) String() string { return fmt.Sprintf("Item Swap(%s)", action.swapSet) } @@ -268,6 +319,9 @@ func (action *APLActionMove) IsReady(sim *Simulation) bool { isPrepull := sim.CurrentTime < 0 return !action.unit.IsMoving() && (action.moveRange.GetFloat(sim) != action.unit.DistanceFromTarget || isPrepull) && !action.unit.IsCasting(sim) } +func (action *APLActionMove) IsOffGCDAction() bool { + return false +} func (action *APLActionMove) Execute(sim *Simulation) { moveRange := action.moveRange.GetFloat(sim) if sim.Log != nil { @@ -276,6 +330,9 @@ func (action *APLActionMove) Execute(sim *Simulation) { action.unit.MoveTo(moveRange, sim) } +func (action *APLActionMove) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionMove) String() string { return fmt.Sprintf("Move(%s)", action.moveRange) } @@ -306,10 +363,16 @@ func (action *APLActionCustomRotation) IsReady(sim *Simulation) bool { // Prevent infinite loops by only allowing this action to be performed once at each timestamp. return action.lastExecutedAt != sim.CurrentTime } +func (action *APLActionCustomRotation) IsOffGCDAction() bool { + return false +} func (action *APLActionCustomRotation) Execute(sim *Simulation) { action.lastExecutedAt = sim.CurrentTime action.agent.ExecuteCustomRotation(sim) } +func (action *APLActionCustomRotation) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionCustomRotation) String() string { return "Custom Rotation()" } diff --git a/sim/core/apl_actions_sequences.go b/sim/core/apl_actions_sequences.go index 9fc2a0dfe7..636f53e6ab 100644 --- a/sim/core/apl_actions_sequences.go +++ b/sim/core/apl_actions_sequences.go @@ -3,6 +3,7 @@ package core import ( "fmt" "strings" + "time" "github.com/wowsims/sod/sim/core/proto" ) @@ -44,10 +45,16 @@ func (action *APLActionSequence) Reset(*Simulation) { func (action *APLActionSequence) IsReady(sim *Simulation) bool { return action.curIdx < len(action.subactions) && action.subactions[action.curIdx].IsReady(sim) } +func (action *APLActionSequence) IsOffGCDAction() bool { + return false +} func (action *APLActionSequence) Execute(sim *Simulation) { action.subactions[action.curIdx].Execute(sim) action.curIdx++ } +func (action *APLActionSequence) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionSequence) String() string { return "Sequence(" + strings.Join(MapSlice(action.subactions, func(subaction *APLAction) string { return fmt.Sprintf("(%s)", subaction) }), "+") + ")" } @@ -79,9 +86,15 @@ func (action *APLActionResetSequence) Finalize(rot *APLRotation) { func (action *APLActionResetSequence) IsReady(sim *Simulation) bool { return action.sequence != nil && action.sequence.curIdx != 0 } +func (action *APLActionResetSequence) IsOffGCDAction() bool { + return false +} func (action *APLActionResetSequence) Execute(sim *Simulation) { action.sequence.curIdx = 0 } +func (action *APLActionResetSequence) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} func (action *APLActionResetSequence) String() string { return fmt.Sprintf("Reset Sequence(name = '%s')", action.name) } @@ -92,7 +105,8 @@ type APLActionStrictSequence struct { subactions []*APLAction curIdx int - subactionSpells []*Spell + subactionSpells []*Spell + subactionsOffGCD bool } func (rot *APLRotation) newActionStrictSequence(config *proto.APLActionStrictSequence) APLActionImpl { @@ -122,22 +136,61 @@ func (action *APLActionStrictSequence) Reset(*Simulation) { action.curIdx = 0 } func (action *APLActionStrictSequence) IsReady(sim *Simulation) bool { - if !action.unit.GCD.IsReady(sim) { + if !action.unit.GCD.IsReady(sim) && !action.IsOffGCDAction() { + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Is not ready due to GCD") + //} return false } if !action.subactions[0].IsReady(sim) { + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Is not ready due to first subaction not ready") + //} return false } for _, spell := range action.subactionSpells { if !spell.IsReady(sim) { + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Is not ready due to a subaction spell not ready") + //} return false } } return true } +func (action *APLActionStrictSequence) IsOffGCDAction() bool { + action.subactionsOffGCD = true + for _, subaction := range action.subactions { + if !subaction.impl.IsOffGCDAction() { + action.subactionsOffGCD = false + } + } + + return action.subactionsOffGCD +} func (action *APLActionStrictSequence) Execute(sim *Simulation) { action.unit.Rotation.pushControllingAction(action) } +func (action *APLActionStrictSequence) ExecuteOffGCD(sim *Simulation, time time.Duration) { + if action.IsOffGCDAction() { + for _, subaction := range action.subactions { + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Scheduling subaction %s for time %f ", subaction.String(), time) + //} + + subactionTemp := subaction // needed for delayed action to use correct subaction + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: time, + OnAction: func(s *Simulation) { + subactionTemp.ExecuteOffGCD(sim, time) + }, + }) + } + + } else { + action.Execute(sim) // Default to Execute unless all subactions are off the GCD + } +} func (action *APLActionStrictSequence) GetNextAction(sim *Simulation) *APLAction { if action.subactions[action.curIdx].IsReady(sim) { nextAction := action.subactions[action.curIdx] @@ -147,15 +200,24 @@ func (action *APLActionStrictSequence) GetNextAction(sim *Simulation) *APLAction action.curIdx = 0 action.unit.Rotation.popControllingAction(action) } - + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Next action is ready") + //} return nextAction } else if action.unit.GCD.IsReady(sim) { // If the GCD is ready when the next subaction isn't, it means the sequence is bad // so reset and exit the sequence. + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence - Next action not ready but GCD is ready") + //} + action.curIdx = 0 action.unit.Rotation.popControllingAction(action) return action.unit.Rotation.getNextAction(sim) } else { + //if sim.Log != nil { + // sim.Log("APLActionStrictSequence GetNextAction (offGCD) Return Nil") + //} // Return nil to wait for the GCD to become ready. return nil } diff --git a/sim/core/apl_actions_timing.go b/sim/core/apl_actions_timing.go index 4c0843afc3..7c541a485a 100644 --- a/sim/core/apl_actions_timing.go +++ b/sim/core/apl_actions_timing.go @@ -35,6 +35,10 @@ func (action *APLActionWait) IsReady(sim *Simulation) bool { return action.duration.GetDuration(sim) > 0 } +func (action *APLActionWait) IsOffGCDAction() bool { + return false +} + func (action *APLActionWait) Execute(sim *Simulation) { action.unit.Rotation.pushControllingAction(action) action.curWaitTime = sim.CurrentTime + action.duration.GetDuration(sim) @@ -47,6 +51,10 @@ func (action *APLActionWait) Execute(sim *Simulation) { sim.AddPendingAction(pa) } +func (action *APLActionWait) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionWait) GetNextAction(sim *Simulation) *APLAction { if sim.CurrentTime >= action.curWaitTime { action.unit.Rotation.popControllingAction(action) @@ -85,6 +93,10 @@ func (action *APLActionWaitUntil) IsReady(sim *Simulation) bool { return !action.condition.GetBool(sim) } +func (action *APLActionWaitUntil) IsOffGCDAction() bool { + return false +} + func (action *APLActionWaitUntil) Execute(sim *Simulation) { action.unit.Rotation.pushControllingAction(action) } @@ -98,10 +110,101 @@ func (action *APLActionWaitUntil) GetNextAction(sim *Simulation) *APLAction { } } +func (action *APLActionWaitUntil) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionWaitUntil) String() string { return fmt.Sprintf("WaitUntil(%s)", action.condition) } +type APLActionRelativeSchedule struct { + defaultAPLActionImpl + innerAction *APLAction + + timing time.Duration + prevTime time.Duration +} + +func (rot *APLRotation) newActionRelativeSchedule(config *proto.APLActionRelativeSchedule) APLActionImpl { + innerAction := rot.newAPLAction(config.InnerAction) + if innerAction == nil { + return nil + } + + timing := 1 * time.Second + valid := true + + if durVal, err := time.ParseDuration(strings.TrimSpace(config.Schedule)); err == nil { + timing = durVal + } else { + rot.ValidationWarning("Invalid duration value '%s'", strings.TrimSpace(config.Schedule)) + valid = false + } + + if !valid { + return nil + } + + return &APLActionRelativeSchedule{ + innerAction: innerAction, + timing: timing, + prevTime: -1 * time.Second, + } +} +func (action *APLActionRelativeSchedule) Reset(*Simulation) { +} +func (action *APLActionRelativeSchedule) GetInnerActions() []*APLAction { + return []*APLAction{action.innerAction} +} +func (action *APLActionRelativeSchedule) IsReady(sim *Simulation) bool { + isReady := action.innerAction.IsReady(sim) && (action.prevTime != (sim.CurrentTime + action.timing)) + + return isReady +} + +func (action *APLActionRelativeSchedule) IsOffGCDAction() bool { + return action.innerAction.impl.IsOffGCDAction() +} + +func (action *APLActionRelativeSchedule) Execute(sim *Simulation) { + action.prevTime = sim.CurrentTime + action.timing + scheduledTime := action.prevTime + + if action.IsOffGCDAction() { + + //if sim.Log != nil { + // sim.Log("APLActionRelativeSchedule Execute Scheduling delayed off GCD action for %f", scheduledTime) + //} + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: scheduledTime, + OnAction: func(s *Simulation) { + action.innerAction.ExecuteOffGCD(sim, scheduledTime) + }, + }) + } else { + //if sim.Log != nil { + // sim.Log("APLActionRelativeSchedule Execute Scheduling delayed on GCD action ") + //} + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: scheduledTime, + OnAction: func(s *Simulation) { + if action.innerAction.IsReady(sim) { // Need to check as there is no guarantee it will be ready + action.innerAction.Execute(sim) + } + }, + }) + } +} + +func (action *APLActionRelativeSchedule) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + +func (action *APLActionRelativeSchedule) String() string { + return fmt.Sprintf("RelativeSchedule(%s, %s)", action.timing, action.innerAction) +} + type APLActionSchedule struct { defaultAPLActionImpl innerAction *APLAction @@ -147,16 +250,223 @@ func (action *APLActionSchedule) GetInnerActions() []*APLAction { return []*APLAction{action.innerAction} } func (action *APLActionSchedule) IsReady(sim *Simulation) bool { - return action.nextTimingIdx < len(action.timings) && - sim.CurrentTime >= action.timings[action.nextTimingIdx] && - action.innerAction.IsReady(sim) + + //if sim.Log != nil { + // sim.Log("APLActionSchedule IsReady timing index is %d", action.nextTimingIdx) + //} + + checkA := action.nextTimingIdx < len(action.timings) + checkB := false + + if checkA { + if action.IsOffGCDAction() { + //if sim.Log != nil { + // sim.Log("Scheduled action is offGCD B check") + //} + checkB = sim.CurrentTime >= action.timings[action.nextTimingIdx]-(time.Millisecond*1500) + } else { + //if sim.Log != nil { + // sim.Log("Scheduled action is regular B check") + //} + checkB = sim.CurrentTime >= action.timings[action.nextTimingIdx] + } + } + + checkC := action.innerAction.IsReady(sim) + isReady := checkA && checkB && checkC + + //if sim.Log != nil && isReady { + // sim.Log("Scheduled action is ready") + //} + //if sim.Log != nil && !isReady { + // sim.Log("Scheduled action is not ready") + // if checkA { + // sim.Log("Scheduled action is not ready currentTime %f nextactionTime %f ", sim.CurrentTime, action.timings[action.nextTimingIdx]) + // } + // sim.Log("Scheduled action is not ready reason %t %t %t", checkA, checkB, checkC) + //} + return isReady +} + +func (action *APLActionSchedule) IsOffGCDAction() bool { + return action.innerAction.impl.IsOffGCDAction() } func (action *APLActionSchedule) Execute(sim *Simulation) { - action.nextTimingIdx++ - action.innerAction.Execute(sim) + + //if sim.Log != nil { + // sim.Log("APLActionSchedule Execute timing index is %d", action.nextTimingIdx) + //} + + if action.IsOffGCDAction() { + offGCDTime := action.timings[action.nextTimingIdx] + + //if sim.Log != nil { + // sim.Log("APLActionSchedule Execute Scheduling delayed off GCD action for %f", offGCDTime) + //} + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: offGCDTime, + OnAction: func(s *Simulation) { + action.innerAction.ExecuteOffGCD(sim, offGCDTime) + }, + }) + //action.innerAction.ExecuteOffGCD(sim, offGCDTime) + action.nextTimingIdx++ + } else { + //if sim.Log != nil { + // sim.Log("APLActionSchedule Execute Scheduling non-delayed action ") + //} + action.nextTimingIdx++ + action.innerAction.Execute(sim) + } +} + +func (action *APLActionSchedule) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action } func (action *APLActionSchedule) String() string { return fmt.Sprintf("Schedule(%s, %s)", action.timings, action.innerAction) } + +type APLActionPeriodicSchedule struct { + defaultAPLActionImpl + innerAction *APLAction + + timings []time.Duration + period time.Duration + nextTimingIdx int +} + +func (rot *APLRotation) newActionPeriodicSchedule(config *proto.APLActionPeriodicSchedule) APLActionImpl { + innerAction := rot.newAPLAction(config.InnerAction) + if innerAction == nil { + return nil + } + + timingStrs := strings.Split(config.Schedule, ",") + if len(timingStrs) != 2 { + return nil + } + + timings := make([]time.Duration, len(timingStrs)) + valid := true + period := 1 * time.Second + for i, timingStr := range timingStrs { + if durVal, err := time.ParseDuration(strings.TrimSpace(timingStr)); err == nil { + timings[i] = durVal + if i == 1 { + period = durVal + + if timings[1] == 0 { + rot.ValidationWarning("Invalid periodic duration value '%s'", strings.TrimSpace(timingStr)) + valid = false + } + timings[1] = timings[0] + durVal + } + } else { + rot.ValidationWarning("Invalid duration value '%s'", strings.TrimSpace(timingStr)) + valid = false + } + } + if !valid { + return nil + } + + return &APLActionPeriodicSchedule{ + innerAction: innerAction, + timings: timings, + period: period, + } +} +func (action *APLActionPeriodicSchedule) Reset(*Simulation) { + action.nextTimingIdx = 0 +} +func (action *APLActionPeriodicSchedule) GetInnerActions() []*APLAction { + return []*APLAction{action.innerAction} +} +func (action *APLActionPeriodicSchedule) IsReady(sim *Simulation) bool { + + //if sim.Log != nil { + // sim.Log("APLActionPeriodicSchedule IsReady timing index is %d", action.nextTimingIdx) + //} + + checkA := action.nextTimingIdx < len(action.timings) + checkB := false + + if checkA { + if action.IsOffGCDAction() { + //if sim.Log != nil { + // sim.Log("Scheduled action is offGCD B check") + //} + checkB = sim.CurrentTime >= action.timings[action.nextTimingIdx]-(time.Millisecond*1500) + } else { + //if sim.Log != nil { + // sim.Log("Scheduled action is regular B check") + //} + checkB = sim.CurrentTime >= action.timings[action.nextTimingIdx] + } + } + + checkC := action.innerAction.IsReady(sim) + isReady := checkA && checkB && checkC + + //if sim.Log != nil && isReady { + // sim.Log("Scheduled action is ready") + //} + //if sim.Log != nil && !isReady { + // sim.Log("Scheduled action is not ready") + // if checkA { + // sim.Log("Scheduled action is not ready currentTime %f nextactionTime %f ", sim.CurrentTime, action.timings[action.nextTimingIdx]) + // } + // sim.Log("Scheduled action is not ready reason %t %t %t", checkA, checkB, checkC) + //} + return isReady +} + +func (action *APLActionPeriodicSchedule) IsOffGCDAction() bool { + return action.innerAction.impl.IsOffGCDAction() +} + +func (action *APLActionPeriodicSchedule) Execute(sim *Simulation) { + + //if sim.Log != nil { + // sim.Log("APLActionPeriodicSchedule Execute timing index is %d", action.nextTimingIdx) + //} + + if action.IsOffGCDAction() { + offGCDTime := action.timings[action.nextTimingIdx] + + //if sim.Log != nil { + // sim.Log("APLActionPeriodicSchedule Execute Scheduling delayed off GCD action for %f", offGCDTime) + //} + StartDelayedAction(sim, DelayedActionOptions{ + DoAt: offGCDTime, + OnAction: func(s *Simulation) { + action.innerAction.ExecuteOffGCD(sim, offGCDTime) + }, + }) + + action.nextTimingIdx++ + if action.nextTimingIdx >= len(action.timings) { + action.timings = append(action.timings, action.timings[action.nextTimingIdx-1]+action.period) + } + } else { + //if sim.Log != nil { + // sim.Log("APLActionPeriodicSchedule Execute Scheduling non-delayed action ") + //} + action.nextTimingIdx++ + if action.nextTimingIdx >= len(action.timings) { + action.timings = append(action.timings, action.timings[action.nextTimingIdx-1]+action.period) + } + action.innerAction.Execute(sim) + } +} + +func (action *APLActionPeriodicSchedule) ExecuteOffGCD(sim *Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + +func (action *APLActionPeriodicSchedule) String() string { + return fmt.Sprintf("PeriodicSchedule(%s, %s)", action.timings, action.innerAction) +} diff --git a/sim/druid/feral/apl_values.go b/sim/druid/feral/apl_values.go index 509eaa0bbb..6b3c1c01b4 100644 --- a/sim/druid/feral/apl_values.go +++ b/sim/druid/feral/apl_values.go @@ -126,6 +126,10 @@ func (action *APLActionCatOptimalRotationAction) IsReady(sim *core.Simulation) b return sim.CurrentTime > action.lastAction } +func (action *APLActionCatOptimalRotationAction) IsOffGCDAction() bool { + return false +} + func (action *APLActionCatOptimalRotationAction) Execute(sim *core.Simulation) { cat := action.cat @@ -145,6 +149,10 @@ func (action *APLActionCatOptimalRotationAction) Execute(sim *core.Simulation) { action.lastAction = sim.CurrentTime } +func (action *APLActionCatOptimalRotationAction) ExecuteOffGCD(sim *core.Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (action *APLActionCatOptimalRotationAction) Reset(*core.Simulation) { action.lastAction = core.DurationFromSeconds(-100) } diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 8c031f1400..31a511ceb8 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -249,10 +249,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.29596 + weights: -0.25498 weights: 0 - weights: 0.50746 - weights: 0.50746 + weights: 0.50735 + weights: 0.50735 weights: 0 weights: 0 weights: 0 @@ -260,7 +260,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.53194 + weights: 2.53017 weights: 0 weights: 0 weights: 0 @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.73132 + weights: -1.25543 weights: 0 - weights: 1.21853 - weights: 1.0916 - weights: 0.12692 + weights: 1.2215 + weights: 1.09341 + weights: 0.12808 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 14.06111 + weights: 13.78883 weights: 0 weights: 0 weights: 0 @@ -491,8 +491,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase2-Lvl40-Average-Default" value: { - dps: 441.12825 - tps: 276.23124 + dps: 441.08396 + tps: 276.20448 } } dps_results: { @@ -540,15 +540,15 @@ dps_results: { dps_results: { key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 456.41338 - tps: 507.72569 + dps: 456.38845 + tps: 507.6576 } } dps_results: { key: "TestArcane-Phase2-Lvl40-Settings-Troll-p2_arcane-Arcane-p2_arcane-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 456.41338 - tps: 285.54191 + dps: 456.38845 + tps: 285.5243 } } dps_results: { @@ -582,8 +582,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 446.41717 - tps: 279.59983 + dps: 446.27514 + tps: 279.51461 } } dps_results: { @@ -617,8 +617,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-IronweaveBattlesuit" value: { - dps: 590.19959 - tps: 614.93977 + dps: 590.39506 + tps: 615.12049 } } dps_results: { @@ -638,8 +638,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1630.73808 - tps: 1652.48143 + dps: 1639.4439 + tps: 1661.15514 } } dps_results: { @@ -652,99 +652,99 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Average-Default" value: { - dps: 2054.77473 - tps: 2078.0935 + dps: 2056.64591 + tps: 2080.04322 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2081.4061 - tps: 2491.74947 + dps: 2080.78387 + tps: 2487.04156 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2081.4061 - tps: 2101.92327 + dps: 2080.78387 + tps: 2101.09676 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2341.45102 - tps: 2359.2573 + dps: 2303.92082 + tps: 2321.91028 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 980.28689 - tps: 1226.95652 + dps: 986.14631 + tps: 1227.41657 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 980.28689 - tps: 992.62037 + dps: 986.14631 + tps: 998.20983 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1250.73439 - tps: 1266.68376 + dps: 1232.33072 + tps: 1248.28009 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2090.03172 - tps: 2501.29642 + dps: 2082.46034 + tps: 2495.91558 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2090.03172 - tps: 2110.59496 + dps: 2082.46034 + tps: 2103.1331 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2371.02537 - tps: 2390.30879 + dps: 2343.42318 + tps: 2362.13004 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 968.53061 - tps: 1215.9156 + dps: 979.0447 + tps: 1226.16438 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 968.53061 - tps: 980.89986 + dps: 979.0447 + tps: 991.40069 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1264.62377 - tps: 1281.48918 + dps: 1259.10578 + tps: 1275.5002 } } dps_results: { key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2049.85046 - tps: 2073.17395 + dps: 2044.94207 + tps: 2068.25241 } } dps_results: { @@ -813,8 +813,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase5-Lvl60-Average-Default" value: { - dps: 3247.61451 - tps: 1956.91706 + dps: 3247.54511 + tps: 1956.87542 } } dps_results: { diff --git a/sim/paladin/apl_values.go b/sim/paladin/apl_values.go index 20d7ce015e..15998d2f1a 100644 --- a/sim/paladin/apl_values.go +++ b/sim/paladin/apl_values.go @@ -75,10 +75,18 @@ func (x *APLActionCastPaladinPrimarySeal) Execute(sim *core.Simulation) { x.paladin.primarySeal.Cast(sim, x.paladin.CurrentTarget) } +func (action *APLActionCastPaladinPrimarySeal) ExecuteOffGCD(sim *core.Simulation, time time.Duration) { + action.Execute(sim) // Default to Execute unless impletented for this APL Action +} + func (x *APLActionCastPaladinPrimarySeal) IsReady(sim *core.Simulation) bool { return sim.CurrentTime > x.lastAction && x.paladin.primarySeal.CanCast(sim, x.paladin.CurrentTarget) } +func (action *APLActionCastPaladinPrimarySeal) IsOffGCDAction() bool { + return false +} + func (x *APLActionCastPaladinPrimarySeal) Reset(*core.Simulation) { x.lastAction = core.DurationFromSeconds(-100) } diff --git a/sim/paladin/judgement.go b/sim/paladin/judgement.go index 2e48886deb..abfbf69c70 100644 --- a/sim/paladin/judgement.go +++ b/sim/paladin/judgement.go @@ -64,6 +64,8 @@ func (paladin *Paladin) registerJudgement() { }, }) + + paladin.judgement.DefaultCast.GCD = 0 } // Helper Function For casting Judgement diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results index d0ff1f7ca0..4481a86566 100644 --- a/sim/paladin/retribution/TestExodin.results +++ b/sim/paladin/retribution/TestExodin.results @@ -463,15 +463,15 @@ dps_results: { dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 805.55478 - tps: 1173.54922 + dps: 803.89439 + tps: 1171.69492 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 357.36301 - tps: 375.80405 + dps: 358.52712 + tps: 376.97786 } } dps_results: { @@ -505,15 +505,15 @@ dps_results: { dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 816.83445 - tps: 1185.63731 + dps: 820.03024 + tps: 1189.02827 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 366.13194 - tps: 384.54559 + dps: 366.45392 + tps: 384.86757 } } dps_results: { diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index 713ded36d5..6fec900f7d 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -197,8 +197,8 @@ stat_weights_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 384.17911 - tps: 403.88708 + dps: 384.35163 + tps: 404.06511 } } dps_results: { @@ -211,15 +211,15 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 545.35844 - tps: 824.06297 + dps: 534.26237 + tps: 814.42207 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 147.15029 - tps: 161.05377 + dps: 149.85211 + tps: 163.81861 } } dps_results: { @@ -232,15 +232,15 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 257.61526 - tps: 442.56154 + dps: 237.19124 + tps: 421.19573 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 77.75211 - tps: 86.99943 + dps: 79.82225 + tps: 89.02247 } } dps_results: { @@ -253,15 +253,15 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 557.35472 - tps: 836.37459 + dps: 539.43234 + tps: 820.38863 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 146.71806 - tps: 160.67813 + dps: 150.84753 + tps: 164.91624 } } dps_results: { @@ -274,22 +274,22 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 263.72985 - tps: 450.00713 + dps: 230.99513 + tps: 415.91324 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 77.95938 - tps: 87.27325 + dps: 81.48621 + tps: 90.73211 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 107.47706 - tps: 118.46779 + dps: 107.59894 + tps: 118.58967 } } dps_results: { diff --git a/ui/core/components/individual_sim_ui/apl_actions.ts b/ui/core/components/individual_sim_ui/apl_actions.ts index d808d3b285..636f8b2290 100644 --- a/ui/core/components/individual_sim_ui/apl_actions.ts +++ b/ui/core/components/individual_sim_ui/apl_actions.ts @@ -19,7 +19,9 @@ import { APLActionMultidot, APLActionMultishield, APLActionResetSequence, + APLActionRelativeSchedule, APLActionSchedule, + APLActionPeriodicSchedule, APLActionSequence, APLActionStrictSequence, APLActionTriggerICD, @@ -476,6 +478,26 @@ const actionKindFactories: { [f in NonNullable]: ActionKindConfig newValue: () => APLActionWaitUntil.create(), fields: [AplValues.valueFieldConfig('condition')], }), + ['relativeSchedule']: inputBuilder({ + label: 'Scheduled Relative Action', + submenu: ['Timing'], + shortDescription: 'Executes the inner action once at each specified relative timing (Compared to current sim time).', + includeIf: (player: Player, isPrepull: boolean) => !isPrepull, + newValue: () => + APLActionSchedule.create({ + schedule: '1s', + innerAction: { + action: { oneofKind: 'castSpell', castSpell: {} }, + }, + }), + fields: [ + AplHelpers.stringFieldConfig('schedule', { + label: 'Do At', + labelTooltip: 'Comma-separated list of timings. The inner action will be performed once at each timing.', + }), + actionFieldConfig('innerAction'), + ], + }), ['schedule']: inputBuilder({ label: 'Scheduled Action', submenu: ['Timing'], @@ -496,6 +518,26 @@ const actionKindFactories: { [f in NonNullable]: ActionKindConfig actionFieldConfig('innerAction'), ], }), + ['periodicSchedule']: inputBuilder({ + label: 'Scheduled Periodic Action', + submenu: ['Timing'], + shortDescription: 'Executes the inner action once at each periodic timing starting at the start time.', + includeIf: (player: Player, isPrepull: boolean) => !isPrepull, + newValue: () => + APLActionSchedule.create({ + schedule: '0s, 60s', + innerAction: { + action: { oneofKind: 'castSpell', castSpell: {} }, + }, + }), + fields: [ + AplHelpers.stringFieldConfig('schedule', { + label: 'Do At', + labelTooltip: 'Comma-separated list of Start time followed by period. The inner action will be performed once at each timing.', + }), + actionFieldConfig('innerAction'), + ], + }), ['sequence']: inputBuilder({ label: 'Sequence', submenu: ['Sequences'], diff --git a/ui/retribution_paladin/apls/p5ret-twist-4DR-CancelAura.apl.json b/ui/retribution_paladin/apls/p5ret-twist-4DR-CancelAura.apl.json new file mode 100644 index 0000000000..1df3f315b3 --- /dev/null +++ b/ui/retribution_paladin/apls/p5ret-twist-4DR-CancelAura.apl.json @@ -0,0 +1,20 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-1.5"}}}, + {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"0"}}}, + {"action":{"activateAuraWithStacks":{"auraId":{"spellId":21919},"numStacks":"4"}},"doAtValue":{"const":{"val":"0"}},"hide":true} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"MainHand"}},"rhs":{"autoSwingTime":{"autoType":"MainHand"}}}},"relativeSchedule":{"schedule":"0.2s","innerAction":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":20920,"rank":5}}},"rhs":{"const":{"val":"0.5s"}}}},"strictSequence":{"actions":[{"cancelAura":{"auraId":{"spellId":20920,"rank":5}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"MainHand"}},"rhs":{"autoSwingTime":{"autoType":"MainHand"}}}},"relativeSchedule":{"schedule":"0.2s","innerAction":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":20920,"rank":5}}},"rhs":{"const":{"val":"0.5s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}}}]}},"castSpell":{"spellId":{"spellId":20271}}}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"100ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":407798}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"200ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":429152}}}}},{"not":{"val":{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":407798}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":407676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":407778}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"autoSwingTime":{"autoType":"MainHand"}},"rhs":{"const":{"val":"3.18"}}}}]}}]}},"castSpell":{"spellId":{"spellId":415073}}}} + ] +} diff --git a/ui/retribution_paladin/gear_sets/p5twistingHaste.gear.json b/ui/retribution_paladin/gear_sets/p5twistingHaste.gear.json new file mode 100644 index 0000000000..b48422a48d --- /dev/null +++ b/ui/retribution_paladin/gear_sets/p5twistingHaste.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":231178,"enchant":7619,"rune":429139}, + {"id":231902}, + {"id":231176,"enchant":2606}, + {"id":230842,"enchant":849,"rune":440672}, + {"id":231181,"enchant":1891,"rune":407778}, + {"id":231174,"enchant":1885,"rune":429152}, + {"id":230861,"enchant":931,"rune":407676}, + {"id":231175,"rune":426158}, + {"id":231177,"enchant":7619,"rune":407624}, + {"id":230741,"enchant":1887,"rune":426157}, + {"id":228261,"rune":442898}, + {"id":230734,"rune":442876}, + {"id":231779}, + {"id":228722}, + {"id":230242,"enchant":1900}, + {}, + {"id":232389} + ] +} \ No newline at end of file diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts index f9dc5a8045..3ca901b071 100644 --- a/ui/retribution_paladin/presets.ts +++ b/ui/retribution_paladin/presets.ts @@ -34,6 +34,7 @@ import APLP4RetTwisting6PcT1Json from './apls/p4ret-twisting-6pcT1.apl.json'; import APLPP5ExodinJson from './apls/p5ret-exodin-6CF2DR.apl.json'; import APLPP5TwistingSlowJson from './apls/p5ret-twist-4DR-3.5-3.6.apl.json'; import APLPP5TwistingSlowerJson from './apls/p5ret-twist-4DR-3.7-4.0.apl.json'; +import APLPP5TwistingCancelAuraJson from './apls/p5ret-twist-4DR-CancelAura.apl.json'; import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json'; import Phase1RetGearJson from './gear_sets/p1ret.gear.json'; import Phase2RetSoCGearJson from './gear_sets/p2retsoc.gear.json'; @@ -46,6 +47,7 @@ import Phase4RetGearJson from './gear_sets/p4rettwist.gear.json'; import Phase5ExodinGearJson from './gear_sets/p5exodin.gear.json'; import Phase5ShockadinGearJson from './gear_sets/p5shockadin.gear.json'; import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json'; +import Phase5TwistingHasteGearJson from './gear_sets/p5twistingHaste.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -82,6 +84,9 @@ export const Phase4RetExodin6pT1Gear = PresetUtils.makePresetGear('P4 Ret Exodin export const Phase5TwistingGear = PresetUtils.makePresetGear('P5 Twisting', Phase5TwistingGearJson, { customCondition: player => player.getLevel() == 60, }); +export const Phase5TwistingHasteGear = PresetUtils.makePresetGear('P5 Twisting Haste', Phase5TwistingHasteGearJson, { + customCondition: player => player.getLevel() == 60, +}); export const Phase5ExodinGear = PresetUtils.makePresetGear('P5 Exodin', Phase5ExodinGearJson, { customCondition: player => player.getLevel() == 60, }); @@ -94,7 +99,7 @@ export const GearPresets = { [Phase.Phase2]: [Phase2RetSoCGear, Phase2RetSoMGear], [Phase.Phase3]: [Phase3RetSoMGear], [Phase.Phase4]: [Phase4RetTwistGear, Phase4RetTwist6pT1Gear, Phase4RetExodinGear, Phase4RetExodin6pT1Gear], - [Phase.Phase5]: [Phase5TwistingGear, Phase5ExodinGear, Phase5ShockadinGear], + [Phase.Phase5]: [Phase5TwistingGear, Phase5TwistingHasteGear, Phase5ExodinGear, Phase5ShockadinGear], }; export const DefaultGear = GearPresets[Phase.Phase5][0]; @@ -130,6 +135,9 @@ export const APLPP5Twisting4DRSlow = PresetUtils.makePresetAPLRotation('P5 Twist export const APLPP5Twisting4DRSlower = PresetUtils.makePresetAPLRotation('P5 Twist 4DR Slower 3.7+', APLPP5TwistingSlowerJson, { customCondition: player => player.getLevel() === 60, }); +export const APLPP5Twisting4DRCancelAura = PresetUtils.makePresetAPLRotation('P5 Twist 4DR CancelAura', APLPP5TwistingCancelAuraJson, { + customCondition: player => player.getLevel() === 60, +}); export const APLPP5Exodin = PresetUtils.makePresetAPLRotation('P5 Exodin', APLPP5ExodinJson, { customCondition: player => player.getLevel() === 60, }); @@ -142,7 +150,7 @@ export const APLPresets = { [Phase.Phase2]: [APLP2Ret], [Phase.Phase3]: [APLP3Ret], [Phase.Phase4]: [APLP4RetTwist, APLP4RetTwist6pT1, APLP4RetExodin, APLP4RetExodin6pT1], - [Phase.Phase5]: [APLPP5Twisting4DRSlow, APLPP5Twisting4DRSlower, APLPP5Exodin, APLPP5Shockadin], + [Phase.Phase5]: [APLPP5Twisting4DRCancelAura, APLPP5Twisting4DRSlow, APLPP5Twisting4DRSlower, APLPP5Exodin, APLPP5Shockadin], }; export const DefaultAPLs: Record = { @@ -191,6 +199,13 @@ export const TalentPresets = { [Phase.Phase5]: [P4RetTalents, P5ShockadinTalents], }; +export const PresetBuildTwistingCancelAura = PresetUtils.makePresetBuild('TwistingCancelAura', { gear: Phase5TwistingHasteGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRCancelAura }); +export const PresetBuildTwistingSlow = PresetUtils.makePresetBuild('TwistingSlow', { gear: Phase5TwistingGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRSlow }); +export const PresetBuildTwistingSlower = PresetUtils.makePresetBuild('TwistingSlower', { gear: Phase5TwistingHasteGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRSlower }); +export const PresetBuildExodin = PresetUtils.makePresetBuild('Exodin', { gear: Phase5ExodinGear, talents: P4RetTalents, rotation: APLPP5Exodin }); +export const PresetBuildShockadin = PresetUtils.makePresetBuild('Shockadin', { gear: Phase5ShockadinGear, talents: P5ShockadinTalents, rotation: APLPP5Shockadin }); + + export const DefaultTalents = TalentPresets[Phase.Phase5][0]; /////////////////////////////////////////////////////////////////////////// diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts index 6b42d7f763..24affd28b7 100644 --- a/ui/retribution_paladin/sim.ts +++ b/ui/retribution_paladin/sim.ts @@ -150,6 +150,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { ...Presets.GearPresets[Phase.Phase2], ...Presets.GearPresets[Phase.Phase1], ], + builds: [ + Presets.PresetBuildTwistingCancelAura, + Presets.PresetBuildTwistingSlow, + Presets.PresetBuildTwistingSlower, + Presets.PresetBuildExodin, + Presets.PresetBuildShockadin, + ], }, autoRotation: player => { From b8fa326c08b88db6c2e33d3227789a7eb5a91d6c Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Tue, 22 Oct 2024 03:53:55 -0400 Subject: [PATCH 2/6] add stacking preset --- .../apls/p5ret-stacking-6CF2DR.apl.json | 18 ++++++++++++++++ .../gear_sets/p5stacking.gear.json | 21 +++++++++++++++++++ .../gear_sets/p5twistingSlower.gear.json | 21 +++++++++++++++++++ ui/retribution_paladin/presets.ts | 21 ++++++++++++++++--- ui/retribution_paladin/sim.ts | 1 + 5 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 ui/retribution_paladin/apls/p5ret-stacking-6CF2DR.apl.json create mode 100644 ui/retribution_paladin/gear_sets/p5stacking.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p5twistingSlower.gear.json diff --git a/ui/retribution_paladin/apls/p5ret-stacking-6CF2DR.apl.json b/ui/retribution_paladin/apls/p5ret-stacking-6CF2DR.apl.json new file mode 100644 index 0000000000..326a4d3dc4 --- /dev/null +++ b/ui/retribution_paladin/apls/p5ret-stacking-6CF2DR.apl.json @@ -0,0 +1,18 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-3s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"-1.5s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":20920,"rank":5}}},"rhs":{"const":{"val":"0.5s"}}}},{"cmp":{"op":"OpLe","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407798}}},"rhs":{"const":{"val":"0.5s"}}}},{"cmp":{"op":"OpLe","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":407798}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":20271}}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":20271}}}}, + {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":429152}}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}}, + {"action":{"castSpell":{"spellId":{"spellId":407778}}}}, + {"action":{"castSpell":{"spellId":{"spellId":407676}}}}, + {"action":{"castSpell":{"spellId":{"spellId":415073}}}}, + {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}} + ] +} diff --git a/ui/retribution_paladin/gear_sets/p5stacking.gear.json b/ui/retribution_paladin/gear_sets/p5stacking.gear.json new file mode 100644 index 0000000000..80a65910c4 --- /dev/null +++ b/ui/retribution_paladin/gear_sets/p5stacking.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":232147,"enchant":2543,"rune":429139}, + {"id":231902}, + {"id":232145,"enchant":2606}, + {"id":230842,"enchant":849,"rune":440672}, + {"id":232150,"enchant":1891,"rune":407778}, + {"id":231174,"enchant":1885,"rune":429144}, + {"id":231179,"enchant":931,"rune":407676}, + {"id":232144,"rune":426158}, + {"id":232146,"enchant":2543,"rune":407624}, + {"id":232149,"enchant":1887,"rune":426157}, + {"id":228261,"rune":442898}, + {"id":230734,"rune":442876}, + {"id":230272}, + {"id":228722}, + {"id":230242,"enchant":1900}, + {}, + {"id":221457} + ] +} \ No newline at end of file diff --git a/ui/retribution_paladin/gear_sets/p5twistingSlower.gear.json b/ui/retribution_paladin/gear_sets/p5twistingSlower.gear.json new file mode 100644 index 0000000000..994137bcac --- /dev/null +++ b/ui/retribution_paladin/gear_sets/p5twistingSlower.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":231178,"enchant":7619,"rune":429139}, + {"id":231902}, + {"id":231176,"enchant":2606}, + {"id":230842,"enchant":849,"rune":440672}, + {"id":231181,"enchant":1891,"rune":407778}, + {"id":231174,"enchant":1885,"rune":429152}, + {"id":230861,"enchant":931,"rune":407676}, + {"id":231175,"rune":426158}, + {"id":231177,"enchant":7619,"rune":407624}, + {"id":230741,"enchant":1887,"rune":426157}, + {"id":228261,"rune":442898}, + {"id":230734,"rune":442876}, + {"id":231779}, + {"id":228722}, + {"id":230271,"enchant":1900}, + {}, + {"id":232389} + ] +} \ No newline at end of file diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts index 3ca901b071..3c72a3bdfa 100644 --- a/ui/retribution_paladin/presets.ts +++ b/ui/retribution_paladin/presets.ts @@ -35,6 +35,7 @@ import APLPP5ExodinJson from './apls/p5ret-exodin-6CF2DR.apl.json'; import APLPP5TwistingSlowJson from './apls/p5ret-twist-4DR-3.5-3.6.apl.json'; import APLPP5TwistingSlowerJson from './apls/p5ret-twist-4DR-3.7-4.0.apl.json'; import APLPP5TwistingCancelAuraJson from './apls/p5ret-twist-4DR-CancelAura.apl.json'; +import APLPP5StackingJson from './apls/p5ret-stacking-6CF2DR.apl.json'; import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json'; import Phase1RetGearJson from './gear_sets/p1ret.gear.json'; import Phase2RetSoCGearJson from './gear_sets/p2retsoc.gear.json'; @@ -47,6 +48,8 @@ import Phase4RetGearJson from './gear_sets/p4rettwist.gear.json'; import Phase5ExodinGearJson from './gear_sets/p5exodin.gear.json'; import Phase5ShockadinGearJson from './gear_sets/p5shockadin.gear.json'; import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json'; +import Phase5TwistingSlowerGearJson from './gear_sets/p5twistingSlower.gear.json'; +import Phase5StackingGearJson from './gear_sets/p5stacking.gear.json'; import Phase5TwistingHasteGearJson from './gear_sets/p5twistingHaste.gear.json'; // Preset options for this spec. @@ -84,6 +87,12 @@ export const Phase4RetExodin6pT1Gear = PresetUtils.makePresetGear('P4 Ret Exodin export const Phase5TwistingGear = PresetUtils.makePresetGear('P5 Twisting', Phase5TwistingGearJson, { customCondition: player => player.getLevel() == 60, }); +export const Phase5TwistingSlowerGear = PresetUtils.makePresetGear('P5 Twisting Slower', Phase5TwistingSlowerGearJson, { + customCondition: player => player.getLevel() == 60, +}); +export const Phase5StackingGear = PresetUtils.makePresetGear('P5 Stacking', Phase5StackingGearJson, { + customCondition: player => player.getLevel() == 60, +}); export const Phase5TwistingHasteGear = PresetUtils.makePresetGear('P5 Twisting Haste', Phase5TwistingHasteGearJson, { customCondition: player => player.getLevel() == 60, }); @@ -99,7 +108,7 @@ export const GearPresets = { [Phase.Phase2]: [Phase2RetSoCGear, Phase2RetSoMGear], [Phase.Phase3]: [Phase3RetSoMGear], [Phase.Phase4]: [Phase4RetTwistGear, Phase4RetTwist6pT1Gear, Phase4RetExodinGear, Phase4RetExodin6pT1Gear], - [Phase.Phase5]: [Phase5TwistingGear, Phase5TwistingHasteGear, Phase5ExodinGear, Phase5ShockadinGear], + [Phase.Phase5]: [Phase5TwistingGear, Phase5TwistingSlowerGear, Phase5StackingGear, Phase5TwistingHasteGear, Phase5ExodinGear, Phase5ShockadinGear], }; export const DefaultGear = GearPresets[Phase.Phase5][0]; @@ -138,6 +147,9 @@ export const APLPP5Twisting4DRSlower = PresetUtils.makePresetAPLRotation('P5 Twi export const APLPP5Twisting4DRCancelAura = PresetUtils.makePresetAPLRotation('P5 Twist 4DR CancelAura', APLPP5TwistingCancelAuraJson, { customCondition: player => player.getLevel() === 60, }); +export const APLPP5Stacking6CF2DR = PresetUtils.makePresetAPLRotation('P5 Twist 4DR CancelAura', APLPP5StackingJson, { + customCondition: player => player.getLevel() === 60, +}); export const APLPP5Exodin = PresetUtils.makePresetAPLRotation('P5 Exodin', APLPP5ExodinJson, { customCondition: player => player.getLevel() === 60, }); @@ -150,7 +162,7 @@ export const APLPresets = { [Phase.Phase2]: [APLP2Ret], [Phase.Phase3]: [APLP3Ret], [Phase.Phase4]: [APLP4RetTwist, APLP4RetTwist6pT1, APLP4RetExodin, APLP4RetExodin6pT1], - [Phase.Phase5]: [APLPP5Twisting4DRCancelAura, APLPP5Twisting4DRSlow, APLPP5Twisting4DRSlower, APLPP5Exodin, APLPP5Shockadin], + [Phase.Phase5]: [APLPP5Twisting4DRCancelAura, APLPP5Stacking6CF2DR, APLPP5Twisting4DRSlow, APLPP5Twisting4DRSlower, APLPP5Exodin, APLPP5Shockadin], }; export const DefaultAPLs: Record = { @@ -201,7 +213,8 @@ export const TalentPresets = { export const PresetBuildTwistingCancelAura = PresetUtils.makePresetBuild('TwistingCancelAura', { gear: Phase5TwistingHasteGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRCancelAura }); export const PresetBuildTwistingSlow = PresetUtils.makePresetBuild('TwistingSlow', { gear: Phase5TwistingGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRSlow }); -export const PresetBuildTwistingSlower = PresetUtils.makePresetBuild('TwistingSlower', { gear: Phase5TwistingHasteGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRSlower }); +export const PresetBuildTwistingSlower = PresetUtils.makePresetBuild('TwistingSlower', { gear: Phase5TwistingSlowerGear, talents: P4RetTalents, rotation: APLPP5Twisting4DRSlower }); +export const PresetBuildSealStacking = PresetUtils.makePresetBuild('SealStacking', { gear: Phase5StackingGear, talents: P4RetTalents, rotation: APLPP5Stacking6CF2DR }); export const PresetBuildExodin = PresetUtils.makePresetBuild('Exodin', { gear: Phase5ExodinGear, talents: P4RetTalents, rotation: APLPP5Exodin }); export const PresetBuildShockadin = PresetUtils.makePresetBuild('Shockadin', { gear: Phase5ShockadinGear, talents: P5ShockadinTalents, rotation: APLPP5Shockadin }); @@ -260,6 +273,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({ fireResistanceTotem: true, giftOfTheWild: TristateEffect.TristateEffectImproved, sanctityAura: true, + hornOfLordaeron: true, leaderOfThePack: true, demonicPact: 110, aspectOfTheLion: true, @@ -269,6 +283,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({ export const DefaultDebuffs = Debuffs.create({ curseOfRecklessness: true, + exposeArmor: TristateEffect.TristateEffectImproved, homunculi: 70, // 70% average uptime default faerieFire: true, giftOfArthas: true, diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts index 24affd28b7..981967f5fa 100644 --- a/ui/retribution_paladin/sim.ts +++ b/ui/retribution_paladin/sim.ts @@ -152,6 +152,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, { ], builds: [ Presets.PresetBuildTwistingCancelAura, + Presets.PresetBuildSealStacking, Presets.PresetBuildTwistingSlow, Presets.PresetBuildTwistingSlower, Presets.PresetBuildExodin, From afe76cf45d5abb7f36ed4dda457056b5eaa1c671 Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Thu, 14 Nov 2024 01:03:23 -0500 Subject: [PATCH 3/6] test results --- sim/druid/balance/TestBalance.results | 98 +-- sim/druid/feral/TestFeral.results | 778 +++++++++--------- sim/hunter/TestBM.results | 58 +- sim/hunter/TestSV.results | 4 +- sim/mage/TestFire.results | 200 ++--- sim/mage/TestFrost.results | 132 +-- sim/paladin/protection/TestProtection.results | 28 +- .../retribution/TestRetribution.results | 190 ++--- sim/shaman/elemental/TestElemental.results | 252 +++--- .../enhancement/TestEnhancement.results | 284 +++---- sim/shaman/warden/TestWardenShaman.results | 64 +- sim/warlock/dps/TestAffliction.results | 72 +- sim/warlock/dps/TestDestruction.results | 24 +- .../dps_warrior/TestDualWieldWarrior.results | 250 +++--- .../dps_warrior/TestTwoHandedWarrior.results | 182 ++-- .../tank_warrior/TestTankWarrior.results | 72 +- 16 files changed, 1344 insertions(+), 1344 deletions(-) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 43ffe1f1cd..36088b4694 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -445,9 +445,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.93275 + weights: -0.118 weights: 0 - weights: 2.80172 + weights: 2.80217 weights: 0 weights: 0 weights: 0 @@ -456,7 +456,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 32.90091 + weights: 31.49433 weights: 0 weights: 0 weights: 0 @@ -995,113 +995,113 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather" value: { - dps: 1462.4569 - tps: 1480.81624 + dps: 1462.52831 + tps: 1480.88765 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sLeather" value: { - dps: 1361.03029 - tps: 1379.36504 + dps: 1361.38951 + tps: 1379.72427 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather" value: { - dps: 1340.17337 - tps: 1358.34588 + dps: 1340.39692 + tps: 1358.56943 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers" value: { - dps: 1995.09892 - tps: 1916.32354 + dps: 1995.36552 + tps: 1917.74546 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb" value: { - dps: 1345.77043 - tps: 1363.96752 + dps: 1345.04964 + tps: 1363.25165 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldLeathers" value: { - dps: 1360.00809 - tps: 1378.34284 + dps: 1360.36731 + tps: 1378.70207 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldWatcherVestments" value: { - dps: 1409.80396 - tps: 1427.96172 + dps: 1409.6408 + tps: 1427.79856 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment" value: { - dps: 2028.70824 - tps: 1948.58341 + dps: 2028.8328 + tps: 1948.70797 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-FeralheartRaiment" value: { - dps: 1235.0035 - tps: 1253.28984 + dps: 1234.25519 + tps: 1252.5317 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" value: { - dps: 1462.4569 - tps: 1480.81624 + dps: 1462.52831 + tps: 1480.88765 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather" value: { - dps: 1361.03029 - tps: 1379.36504 + dps: 1361.38951 + tps: 1379.72427 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" value: { - dps: 1340.17337 - tps: 1358.34588 + dps: 1340.39692 + tps: 1358.56943 } } dps_results: { key: "TestBalance-Phase5-Lvl60-AllItems-LostWorshipper'sArmor" value: { - dps: 2116.84598 - tps: 2047.09084 + dps: 2116.99823 + tps: 2048.19811 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Average-Default" value: { - dps: 4454.38654 - tps: 4314.97229 + dps: 4454.73498 + tps: 4315.27639 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6301.96208 - tps: 6584.47242 + dps: 6305.1066 + tps: 6587.42027 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4392.87242 - tps: 4242.37957 + dps: 4391.54573 + tps: 4241.06272 } } dps_results: { @@ -1114,15 +1114,15 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 2889.14057 - tps: 3001.58154 + dps: 2889.29892 + tps: 3001.7044 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2006.72752 - tps: 1939.99736 + dps: 2007.28473 + tps: 1940.55457 } } dps_results: { @@ -1135,15 +1135,15 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6206.44351 - tps: 6487.45891 + dps: 6211.34901 + tps: 6492.46274 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4388.34251 - tps: 4238.80736 + dps: 4385.23087 + tps: 4235.18439 } } dps_results: { @@ -1156,15 +1156,15 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 2886.95281 - tps: 2998.70681 + dps: 2886.78666 + tps: 2998.44078 } } dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 2011.83414 - tps: 1943.60359 + dps: 2011.82576 + tps: 1943.5952 } } dps_results: { @@ -1177,7 +1177,7 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4420.20745 - tps: 4269.5904 + dps: 4420.00111 + tps: 4269.38407 } } diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index f0f764ef4e..5855130f38 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -295,8 +295,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.94445 - weights: 1.02691 + weights: 0.94594 + weights: 0.97485 weights: 0 weights: 0 weights: 0 @@ -312,9 +312,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.41281 - weights: 4.83242 - weights: 5.45266 + weights: 0.41346 + weights: 4.76229 + weights: 5.78957 weights: 0 weights: 0 weights: 0 @@ -344,8 +344,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.51638 - weights: 1.61816 + weights: 1.51371 + weights: 1.62225 weights: 0 weights: 0 weights: 0 @@ -361,9 +361,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.63821 - weights: 16.71662 - weights: 11.8052 + weights: 0.63708 + weights: 16.42342 + weights: 11.74783 weights: 0 weights: 0 weights: 0 @@ -393,8 +393,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.11148 - weights: 2.44949 + weights: 2.11079 + weights: 2.50216 weights: 0 weights: 0 weights: 0 @@ -410,9 +410,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.79981 + weights: 0.79954 weights: 0 - weights: 25.91707 + weights: 25.341 weights: 0 weights: 0 weights: 0 @@ -442,8 +442,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.79442 - weights: 2.4606 + weights: 2.7974 + weights: 2.42795 weights: 0 weights: 0 weights: 0 @@ -459,9 +459,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.92043 + weights: 0.92141 weights: 0 - weights: 22.11101 + weights: 21.26277 weights: 0 weights: 0 weights: 0 @@ -771,260 +771,260 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Average-Default" value: { - dps: 803.37838 - tps: 586.00606 + dps: 802.9137 + tps: 585.69904 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.06327 - tps: 392.06085 + dps: 494.93354 + tps: 392.06825 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.40739 - tps: 332.31019 + dps: 460.27766 + tps: 332.2434 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 573.95949 - tps: 426.89892 + dps: 571.53236 + tps: 425.22963 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 287.73721 - tps: 216.36583 + dps: 287.92683 + tps: 214.55599 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.49596 - tps: 194.74383 + dps: 270.67308 + tps: 194.7721 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.09267 - tps: 257.76428 + dps: 343.27479 + tps: 256.69616 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.06327 - tps: 392.06085 + dps: 494.93354 + tps: 392.06825 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.40739 - tps: 332.31019 + dps: 460.27766 + tps: 332.2434 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 573.95949 - tps: 426.89892 + dps: 571.53236 + tps: 425.22963 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 287.73721 - tps: 216.36583 + dps: 287.92683 + tps: 214.55599 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.49596 - tps: 194.74383 + dps: 270.67308 + tps: 194.7721 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.09267 - tps: 257.76428 + dps: 343.27479 + tps: 256.69616 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.06327 - tps: 392.06085 + dps: 494.93354 + tps: 392.06825 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.40739 - tps: 332.31019 + dps: 460.27766 + tps: 332.2434 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 573.95949 - tps: 426.89892 + dps: 571.53236 + tps: 425.22963 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 287.73721 - tps: 216.36583 + dps: 287.92683 + tps: 214.55599 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.49596 - tps: 194.74383 + dps: 270.67308 + tps: 194.7721 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.09267 - tps: 257.76428 + dps: 343.27479 + tps: 256.69616 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.77207 - tps: 391.731 + dps: 494.70875 + tps: 391.02602 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.41075 - tps: 332.315 + dps: 460.06238 + tps: 332.08055 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 574.27838 - tps: 427.30376 + dps: 571.49408 + tps: 425.32821 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 288.01464 - tps: 218.42999 + dps: 287.40519 + tps: 217.02425 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.93339 - tps: 195.14296 + dps: 270.32394 + tps: 194.67213 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.42307 - tps: 258.44165 + dps: 343.72094 + tps: 257.75255 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.77207 - tps: 391.731 + dps: 494.70875 + tps: 391.02602 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.41075 - tps: 332.315 + dps: 460.06238 + tps: 332.08055 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 574.27838 - tps: 427.30376 + dps: 571.49408 + tps: 425.32821 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 288.01464 - tps: 218.42999 + dps: 287.40519 + tps: 217.02425 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.93339 - tps: 195.14296 + dps: 270.32394 + tps: 194.67213 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.42307 - tps: 258.44165 + dps: 343.72094 + tps: 257.75255 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 495.77207 - tps: 391.731 + dps: 494.70875 + tps: 391.02602 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 460.41075 - tps: 332.315 + dps: 460.06238 + tps: 332.08055 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 574.27838 - tps: 427.30376 + dps: 571.49408 + tps: 425.32821 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 288.01464 - tps: 218.42999 + dps: 287.40519 + tps: 217.02425 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 270.93339 - tps: 195.14296 + dps: 270.32394 + tps: 194.67213 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 344.42307 - tps: 258.44165 + dps: 343.72094 + tps: 257.75255 } } dps_results: { @@ -1045,326 +1045,326 @@ dps_results: { dps_results: { key: "TestFeral-Phase3-Lvl50-Average-Default" value: { - dps: 1883.19205 - tps: 1347.46916 - hps: 10.23573 + dps: 1880.83445 + tps: 1345.8214 + hps: 10.22905 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1346.38828 - tps: 1073.39205 - hps: 6.99304 + dps: 1349.19137 + tps: 1075.38189 + hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1273.60988 - tps: 910.21349 - hps: 7.07519 + dps: 1276.37787 + tps: 912.1758 + hps: 7.04914 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1436.01366 - tps: 1022.92784 + dps: 1435.83257 + tps: 1022.79927 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 638.49717 - tps: 531.56795 - hps: 4.202 + dps: 639.38043 + tps: 532.40323 + hps: 4.19467 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 612.88253 - tps: 439.24266 - hps: 4.25333 + dps: 613.72421 + tps: 439.85065 + hps: 4.246 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 744.37964 - tps: 532.88105 + dps: 744.27586 + tps: 532.80736 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1346.38828 - tps: 1073.39205 - hps: 6.99304 + dps: 1349.19137 + tps: 1075.38189 + hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1273.60988 - tps: 910.21349 - hps: 7.07519 + dps: 1276.37787 + tps: 912.1758 + hps: 7.04914 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1436.01366 - tps: 1022.92784 + dps: 1435.83257 + tps: 1022.79927 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 638.49717 - tps: 531.56795 - hps: 4.202 + dps: 639.38043 + tps: 532.40323 + hps: 4.19467 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 612.88253 - tps: 439.24266 - hps: 4.25333 + dps: 613.72421 + tps: 439.85065 + hps: 4.246 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 744.37964 - tps: 532.88105 + dps: 744.27586 + tps: 532.80736 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1346.38828 - tps: 1073.39205 - hps: 6.99304 + dps: 1349.19137 + tps: 1075.38189 + hps: 6.97901 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1273.60988 - tps: 910.21349 - hps: 7.07519 + dps: 1276.37787 + tps: 912.1758 + hps: 7.04914 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1436.01366 - tps: 1022.92784 + dps: 1435.83257 + tps: 1022.79927 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 638.49717 - tps: 531.56795 - hps: 4.202 + dps: 639.38043 + tps: 532.40323 + hps: 4.19467 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 612.88253 - tps: 439.24266 - hps: 4.25333 + dps: 613.72421 + tps: 439.85065 + hps: 4.246 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 744.37964 - tps: 532.88105 + dps: 744.27586 + tps: 532.80736 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1378.13303 - tps: 1101.98561 - hps: 6.98702 + dps: 1380.20132 + tps: 1103.33682 + hps: 6.99304 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1305.35391 - tps: 933.09281 - hps: 7.06116 + dps: 1307.40884 + tps: 934.5231 + hps: 7.06517 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1471.681 - tps: 1048.25471 + dps: 1471.67727 + tps: 1048.25207 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 636.10185 - tps: 527.6207 - hps: 4.16533 + dps: 638.69219 + tps: 531.79051 + hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 610.41729 - tps: 437.39167 - hps: 4.224 + dps: 613.03261 + tps: 439.36508 + hps: 4.268 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 740.85134 - tps: 531.16316 + dps: 740.74732 + tps: 531.0893 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1378.13303 - tps: 1101.98561 - hps: 6.98702 + dps: 1380.20132 + tps: 1103.33682 + hps: 6.99304 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1305.35391 - tps: 933.09281 - hps: 7.06116 + dps: 1307.40884 + tps: 934.5231 + hps: 7.06517 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1471.681 - tps: 1048.25471 + dps: 1471.67727 + tps: 1048.25207 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 636.10185 - tps: 527.6207 - hps: 4.16533 + dps: 638.69219 + tps: 531.79051 + hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 610.41729 - tps: 437.39167 - hps: 4.224 + dps: 613.03261 + tps: 439.36508 + hps: 4.268 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 740.85134 - tps: 531.16316 + dps: 740.74732 + tps: 531.0893 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1378.13303 - tps: 1101.98561 - hps: 6.98702 + dps: 1380.20132 + tps: 1103.33682 + hps: 6.99304 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1305.35391 - tps: 933.09281 - hps: 7.06116 + dps: 1307.40884 + tps: 934.5231 + hps: 7.06517 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 1471.681 - tps: 1048.25471 + dps: 1471.67727 + tps: 1048.25207 hps: 7.2131 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 636.10185 - tps: 527.6207 - hps: 4.16533 + dps: 638.69219 + tps: 531.79051 + hps: 4.20933 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 610.41729 - tps: 437.39167 - hps: 4.224 + dps: 613.03261 + tps: 439.36508 + hps: 4.268 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 740.85134 - tps: 531.16316 + dps: 740.74732 + tps: 531.0893 hps: 4.87667 } } dps_results: { key: "TestFeral-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1241.5312 - tps: 885.22962 - hps: 9.35676 + dps: 1238.2116 + tps: 882.8798 + hps: 9.34874 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather" value: { - dps: 1358.74594 - tps: 991.53958 + dps: 1358.9512 + tps: 991.68182 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sLeather" value: { - dps: 1407.50461 - tps: 1026.14634 + dps: 1406.96413 + tps: 1025.84281 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather" value: { - dps: 1328.32483 - tps: 969.9741 + dps: 1328.08179 + tps: 969.80503 } } dps_results: { @@ -1377,351 +1377,351 @@ dps_results: { dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb" value: { - dps: 1332.84458 - tps: 972.98372 + dps: 1333.3773 + tps: 973.36894 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldLeathers" value: { - dps: 1400.11026 - tps: 1020.88641 + dps: 1399.57395 + tps: 1020.58584 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldWatcherVestments" value: { - dps: 1339.61842 - tps: 977.82853 + dps: 1340.68216 + tps: 978.66065 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment" value: { dps: 1963.04783 - tps: 1419.68263 + tps: 1419.82445 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-FeralheartRaiment" value: { - dps: 1438.73455 - tps: 1048.28756 + dps: 1439.20166 + tps: 1048.6192 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" value: { - dps: 1358.74594 - tps: 991.53958 + dps: 1358.9512 + tps: 991.68182 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather" value: { - dps: 1407.50461 - tps: 1026.14634 + dps: 1406.96413 + tps: 1025.84281 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" value: { - dps: 1328.32483 - tps: 969.9741 + dps: 1328.08179 + tps: 969.80503 } } dps_results: { key: "TestFeral-Phase4-Lvl60-AllItems-LostWorshipper'sArmor" value: { dps: 2019.99944 - tps: 1461.41764 + tps: 1461.49436 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Average-Default" value: { - dps: 3781.8757 - tps: 2708.69964 + dps: 3779.97586 + tps: 2707.40861 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 16673.53155 - tps: 12129.94823 + dps: 16495.31415 + tps: 12004.15973 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2489.14208 - tps: 1782.97991 + dps: 2496.57021 + tps: 1788.21226 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2769.27399 - tps: 1978.4312 + dps: 2770.21377 + tps: 1979.09503 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6823.84005 - tps: 4999.83933 + dps: 6741.04518 + tps: 4941.59758 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1194.61006 - tps: 856.63872 + dps: 1192.25349 + tps: 855.16179 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1487.64553 - tps: 1063.41531 + dps: 1485.10791 + tps: 1061.6136 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 16673.53155 - tps: 12129.94823 + dps: 16495.31415 + tps: 12004.15973 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2489.14208 - tps: 1782.97991 + dps: 2496.57021 + tps: 1788.21226 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2769.27399 - tps: 1978.4312 + dps: 2770.21377 + tps: 1979.09503 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6823.84005 - tps: 4999.83933 + dps: 6741.04518 + tps: 4941.59758 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1194.61006 - tps: 856.63872 + dps: 1192.25349 + tps: 855.16179 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1487.64553 - tps: 1063.41531 + dps: 1485.10791 + tps: 1061.6136 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 16673.53155 - tps: 12129.94823 + dps: 16495.31415 + tps: 12004.15973 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2489.14208 - tps: 1782.97991 + dps: 2496.57021 + tps: 1788.21226 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2769.27399 - tps: 1978.4312 + dps: 2770.21377 + tps: 1979.09503 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6823.84005 - tps: 4999.83933 + dps: 6741.04518 + tps: 4941.59758 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1194.61006 - tps: 856.63872 + dps: 1192.25349 + tps: 855.16179 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1487.64553 - tps: 1063.41531 + dps: 1485.10791 + tps: 1061.6136 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 17784.30518 - tps: 12918.36769 + dps: 17590.1843 + tps: 12781.42809 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2654.21562 - tps: 1900.07672 + dps: 2652.26642 + tps: 1898.59906 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2949.84774 - tps: 2106.5899 + dps: 2958.80907 + tps: 2112.95951 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6868.45667 - tps: 5034.46675 + dps: 6812.58161 + tps: 4995.69992 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1191.25725 - tps: 854.25148 + dps: 1195.57443 + tps: 857.13345 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1483.73989 - tps: 1060.6423 + dps: 1480.92741 + tps: 1058.64544 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 17784.30518 - tps: 12918.36769 + dps: 17590.1843 + tps: 12781.42809 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2654.21562 - tps: 1900.07672 + dps: 2652.26642 + tps: 1898.59906 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2949.84774 - tps: 2106.5899 + dps: 2958.80907 + tps: 2112.95951 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6868.45667 - tps: 5034.46675 + dps: 6812.58161 + tps: 4995.69992 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1191.25725 - tps: 854.25148 + dps: 1195.57443 + tps: 857.13345 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1483.73989 - tps: 1060.6423 + dps: 1480.92741 + tps: 1058.64544 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 17784.30518 - tps: 12918.36769 + dps: 17590.1843 + tps: 12781.42809 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2654.21562 - tps: 1900.07672 + dps: 2652.26642 + tps: 1898.59906 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2949.84774 - tps: 2106.5899 + dps: 2958.80907 + tps: 2112.95951 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 6868.45667 - tps: 5034.46675 + dps: 6812.58161 + tps: 4995.69992 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1191.25725 - tps: 854.25148 + dps: 1195.57443 + tps: 857.13345 } } dps_results: { key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1483.73989 - tps: 1060.6423 + dps: 1480.92741 + tps: 1058.64544 } } dps_results: { key: "TestFeral-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2807.73281 - tps: 2005.0906 + dps: 2805.38545 + tps: 2003.55757 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather" value: { - dps: 1418.62176 - tps: 1033.20204 + dps: 1419.30166 + tps: 1033.76791 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sLeather" value: { - dps: 1473.40236 - tps: 1072.54328 + dps: 1475.87878 + tps: 1074.36843 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather" value: { - dps: 1390.18196 - tps: 1012.91742 + dps: 1390.03056 + tps: 1012.80644 } } dps_results: { @@ -1734,329 +1734,329 @@ dps_results: { dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb" value: { - dps: 1395.09067 - tps: 1016.65514 + dps: 1395.98317 + tps: 1017.2923 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldLeathers" value: { - dps: 1466.0301 - tps: 1067.299 + dps: 1468.4953 + tps: 1069.11618 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldWatcherVestments" value: { - dps: 1401.40857 - tps: 1021.06537 + dps: 1401.86429 + tps: 1021.38893 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment" value: { dps: 2217.20998 - tps: 1599.25621 + tps: 1599.33378 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-FeralheartRaiment" value: { dps: 1497.44479 - tps: 1088.00985 + tps: 1088.09501 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" value: { - dps: 1418.62176 - tps: 1033.20204 + dps: 1419.30166 + tps: 1033.76791 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather" value: { - dps: 1473.40236 - tps: 1072.54328 + dps: 1475.87878 + tps: 1074.36843 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" value: { - dps: 1390.18196 - tps: 1012.91742 + dps: 1390.03056 + tps: 1012.80644 } } dps_results: { key: "TestFeral-Phase5-Lvl60-AllItems-LostWorshipper'sArmor" value: { dps: 2261.03806 - tps: 1631.09855 + tps: 1631.17624 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Average-Default" value: { - dps: 4676.33953 - tps: 3343.01272 + dps: 4673.26648 + tps: 3340.88447 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3488.13944 - tps: 2745.50324 + dps: 3496.64486 + tps: 2757.45489 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3446.9786 - tps: 2462.56422 + dps: 3455.18613 + tps: 2468.49659 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3782.12754 - tps: 2697.26872 + dps: 3777.83691 + tps: 2694.22237 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1480.13533 - tps: 1203.85845 + dps: 1477.80419 + tps: 1207.69479 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1457.88646 - tps: 1044.01818 + dps: 1455.56631 + tps: 1042.55471 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.87131 - tps: 1260.95561 + dps: 1764.86602 + tps: 1260.24185 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3488.13944 - tps: 2745.50324 + dps: 3496.64486 + tps: 2757.45489 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3446.9786 - tps: 2462.56422 + dps: 3455.18613 + tps: 2468.49659 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3782.12754 - tps: 2697.26872 + dps: 3777.83691 + tps: 2694.22237 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1480.13533 - tps: 1203.85845 + dps: 1477.80419 + tps: 1207.69479 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1457.88646 - tps: 1044.01818 + dps: 1455.56631 + tps: 1042.55471 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.87131 - tps: 1260.95561 + dps: 1764.86602 + tps: 1260.24185 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3488.13944 - tps: 2745.50324 + dps: 3496.64486 + tps: 2757.45489 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3446.9786 - tps: 2462.56422 + dps: 3455.18613 + tps: 2468.49659 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3782.12754 - tps: 2697.26872 + dps: 3777.83691 + tps: 2694.22237 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1480.13533 - tps: 1203.85845 + dps: 1477.80419 + tps: 1207.69479 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1457.88646 - tps: 1044.01818 + dps: 1455.56631 + tps: 1042.55471 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.87131 - tps: 1260.95561 + dps: 1764.86602 + tps: 1260.24185 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3428.83317 - tps: 2713.31062 + dps: 3436.00517 + tps: 2721.08599 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3387.69419 - tps: 2421.51487 + dps: 3394.57629 + tps: 2426.32899 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3723.46025 - tps: 2655.62225 + dps: 3718.52451 + tps: 2652.11787 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1484.03672 - tps: 1204.10527 + dps: 1482.29965 + tps: 1204.85669 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1461.4496 - tps: 1046.55281 + dps: 1459.71252 + tps: 1045.32774 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.84061 - tps: 1260.93381 + dps: 1764.8383 + tps: 1260.22217 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3428.83317 - tps: 2713.31062 + dps: 3436.00517 + tps: 2721.08599 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3387.69419 - tps: 2421.51487 + dps: 3394.57629 + tps: 2426.32899 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3723.46025 - tps: 2655.62225 + dps: 3718.52451 + tps: 2652.11787 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1484.03672 - tps: 1204.10527 + dps: 1482.29965 + tps: 1204.85669 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1461.4496 - tps: 1046.55281 + dps: 1459.71252 + tps: 1045.32774 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.84061 - tps: 1260.93381 + dps: 1764.8383 + tps: 1260.22217 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3428.83317 - tps: 2713.31062 + dps: 3436.00517 + tps: 2721.08599 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3387.69419 - tps: 2421.51487 + dps: 3394.57629 + tps: 2426.32899 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3723.46025 - tps: 2655.62225 + dps: 3718.52451 + tps: 2652.11787 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1484.03672 - tps: 1204.10527 + dps: 1482.29965 + tps: 1204.85669 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1461.4496 - tps: 1046.55281 + dps: 1459.71252 + tps: 1045.32774 } } dps_results: { key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1765.84061 - tps: 1260.93381 + dps: 1764.8383 + tps: 1260.22217 } } dps_results: { key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3384.61269 - tps: 2413.28166 + dps: 3382.2968 + tps: 2411.78943 } } diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index f89ed252a1..163c4e8244 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -162,14 +162,14 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 566.13278 - tps: 554.08885 + dps: 566.20003 + tps: 554.18132 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 507.56516 + dps: 507.39608 tps: 254.52732 } } @@ -183,15 +183,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 316.62459 - tps: 443.45974 + dps: 316.38372 + tps: 443.63226 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 273.97217 - tps: 150.68734 + dps: 273.67095 + tps: 150.66331 } } dps_results: { @@ -246,15 +246,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 768.36285 - tps: 875.08778 + dps: 768.40918 + tps: 874.89111 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 691.20791 - tps: 440.9837 + dps: 691.38848 + tps: 441.02363 } } dps_results: { @@ -267,15 +267,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 444.91874 - tps: 675.4987 + dps: 445.25168 + tps: 676.15057 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 395.09569 - tps: 272.28349 + dps: 395.05638 + tps: 272.34087 } } dps_results: { @@ -330,14 +330,14 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 570.15106 + dps: 570.08024 tps: 552.31469 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 514.9936 + dps: 514.82356 tps: 251.97392 } } @@ -351,15 +351,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 319.68528 - tps: 440.89267 + dps: 319.48151 + tps: 440.202 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 277.19063 - tps: 149.19322 + dps: 276.93899 + tps: 149.1178 } } dps_results: { @@ -414,15 +414,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 765.92665 - tps: 871.98709 + dps: 766.93218 + tps: 871.30062 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 691.01311 - tps: 434.28317 + dps: 691.55537 + tps: 434.81776 } } dps_results: { @@ -435,15 +435,15 @@ dps_results: { dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 447.49354 - tps: 671.35611 + dps: 447.50032 + tps: 671.70695 } } dps_results: { key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 395.9863 - tps: 268.63732 + dps: 395.93132 + tps: 268.70678 } } dps_results: { diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 537e21570a..16f9c307e5 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -501,8 +501,8 @@ dps_results: { dps_results: { key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1495.19005 - tps: 1328.12385 + dps: 1495.20225 + tps: 1328.13605 hps: 10.08173 } } diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 5f118b127d..60462ef8d5 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -396,18 +396,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.40147 + weights: 2.32281 weights: 0 - weights: 1.98432 + weights: 1.96034 weights: 0 - weights: 1.98432 + weights: 1.96034 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 21.26948 + weights: 26.35326 weights: 0 weights: 0 weights: 0 @@ -445,18 +445,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.64024 + weights: 1.89259 weights: 0 - weights: 2.39253 + weights: 2.37893 weights: 0 - weights: 2.39253 + weights: 2.37893 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 33.06184 + weights: 40.933 weights: 0 weights: 0 weights: 0 @@ -785,322 +785,322 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 1978.13588 - tps: 1295.26232 + dps: 1958.20768 + tps: 1283.68596 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 1840.53503 - tps: 1209.90291 + dps: 1849.41137 + tps: 1215.12504 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 1930.02845 - tps: 1266.50107 + dps: 1923.16901 + tps: 1259.33716 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 1768.03779 - tps: 1158.05177 + dps: 1750.59139 + tps: 1147.46063 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-IronweaveBattlesuit" value: { - dps: 676.42349 - tps: 648.61787 + dps: 677.68745 + tps: 648.84935 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 1978.13588 - tps: 1295.26232 + dps: 1958.20768 + tps: 1283.68596 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 1840.53503 - tps: 1209.90291 + dps: 1849.41137 + tps: 1215.12504 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2170.06198 - tps: 1425.62099 + dps: 2177.69757 + tps: 1428.46121 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 841.63931 - tps: 804.92407 + dps: 841.13333 + tps: 804.4021 } } dps_results: { key: "TestFire-Phase4-Lvl60-Average-Default" value: { - dps: 3001.35682 - tps: 1972.31589 + dps: 2954.90991 + tps: 1942.83586 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3047.60889 - tps: 2549.63272 + dps: 3078.75674 + tps: 2574.1803 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3047.60889 - tps: 1998.57808 + dps: 3078.75674 + tps: 2017.65862 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3476.20477 - tps: 2242.25903 + dps: 3531.64916 + tps: 2277.12449 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 834.74694 - tps: 884.25808 + dps: 839.79885 + tps: 890.34611 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 834.74694 - tps: 543.80302 + dps: 839.79885 + tps: 546.5651 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1645.24917 - tps: 1053.60661 + dps: 1652.86779 + tps: 1056.90467 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3011.23011 - tps: 2525.06781 + dps: 2975.11126 + tps: 2499.49214 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3011.23011 - tps: 1980.07046 + dps: 2975.11126 + tps: 1956.26968 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3594.48987 - tps: 2326.14064 + dps: 3653.57332 + tps: 2367.08022 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 763.26259 - tps: 830.3161 + dps: 776.5832 + tps: 840.30564 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 763.26259 - tps: 495.25131 + dps: 776.5832 + tps: 503.08908 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1674.73169 - tps: 1078.63593 + dps: 1680.28235 + tps: 1082.73049 } } dps_results: { key: "TestFire-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3022.39287 - tps: 1987.29295 + dps: 2976.60506 + tps: 1957.35133 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 2295.68875 - tps: 1509.21895 + dps: 2297.27248 + tps: 1510.95236 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 2085.42728 - tps: 1372.47773 + dps: 2066.85422 + tps: 1360.58359 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 2264.64873 - tps: 1489.62535 + dps: 2262.54685 + tps: 1488.15265 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 2060.57681 - tps: 1354.97988 + dps: 2061.25865 + tps: 1355.75549 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-IronweaveBattlesuit" value: { - dps: 986.6752 - tps: 720.19692 + dps: 984.81492 + tps: 718.87348 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 2295.68875 - tps: 1509.21895 + dps: 2297.27248 + tps: 1510.95236 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 2085.42728 - tps: 1372.47773 + dps: 2066.85422 + tps: 1360.58359 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2778.70289 - tps: 1647.40547 + dps: 2807.93947 + tps: 1661.21903 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-Sorcerer'sRegalia" value: { - dps: 1206.5568 - tps: 882.73657 + dps: 1206.3018 + tps: 882.55414 } } dps_results: { key: "TestFire-Phase5-Lvl60-Average-Default" value: { - dps: 3703.34736 - tps: 2134.47055 + dps: 3701.52473 + tps: 2133.0093 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 16389.24084 - tps: 9703.17079 + dps: 16388.99074 + tps: 9702.99622 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3702.12666 - tps: 2138.63682 + dps: 3717.2932 + tps: 2146.44376 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4448.55448 - tps: 2565.57358 + dps: 4545.24011 + tps: 2622.2677 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5163.17202 - tps: 3165.74673 + dps: 5161.5757 + tps: 3164.89947 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1007.04839 - tps: 594.24594 + dps: 1008.35439 + tps: 594.56374 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1966.15283 - tps: 1150 + dps: 1983.5947 + tps: 1160.75477 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 15853.19775 - tps: 9391.6087 + dps: 15851.72706 + tps: 9390.78511 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3672.47039 - tps: 2122.22097 + dps: 3674.73839 + tps: 2123.37415 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4444.63571 - tps: 2569.78667 + dps: 4521.15321 + tps: 2613.46203 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5220.12261 - tps: 3188.56792 + dps: 5218.42461 + tps: 3187.50025 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 981.78903 - tps: 578.48686 + dps: 942.8505 + tps: 554.92115 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1970.74534 - tps: 1152.89052 + dps: 1974.48262 + tps: 1157.11523 } } dps_results: { key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3750.62217 - tps: 2163.14984 + dps: 3709.18486 + tps: 2139.34127 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 92f6366c6f..3d759c1da9 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -200,18 +200,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.03186 + weights: -0.19077 weights: 0 - weights: 1.87009 + weights: 1.86976 weights: 0 - weights: 1.69686 - weights: 0.17323 + weights: 1.69657 + weights: 0.17318 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 24.61895 + weights: 24.13115 weights: 0 weights: 0 weights: 0 @@ -251,16 +251,16 @@ stat_weights_results: { weights: 0 weights: 0.30982 weights: 0 - weights: 2.01654 + weights: 2.01631 weights: 0 weights: 0 - weights: 1.91277 + weights: 1.91246 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 18.96179 + weights: 18.87768 weights: 0 weights: 0 weights: 0 @@ -393,50 +393,50 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 1735.03537 - tps: 1426.5872 + dps: 1720.33096 + tps: 1415.07179 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 1569.19276 - tps: 1289.56962 + dps: 1575.03273 + tps: 1296.01771 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 1724.7375 - tps: 1417.97999 + dps: 1729.44428 + tps: 1424.104 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 1563.2498 - tps: 1284.01585 + dps: 1550.78274 + tps: 1274.69348 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-IronweaveBattlesuit" value: { - dps: 747.63715 - tps: 597.91515 + dps: 747.40761 + tps: 597.76005 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 1735.03537 - tps: 1426.5872 + dps: 1720.33096 + tps: 1415.07179 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 1569.19276 - tps: 1289.56962 + dps: 1575.03273 + tps: 1296.01771 } } dps_results: { @@ -456,99 +456,99 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-Average-Default" value: { - dps: 2625.16089 - tps: 2153.56433 + dps: 2630.60145 + tps: 2160.15105 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2583.35331 - tps: 2594.23521 + dps: 2583.64906 + tps: 2606.96035 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2583.35331 - tps: 2117.32722 + dps: 2583.64906 + tps: 2121.20369 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2676.3681 - tps: 2190.28614 + dps: 2695.24021 + tps: 2215.32943 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 851.65889 - tps: 1014.5687 + dps: 858.2616 + tps: 1020.20849 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 851.65889 - tps: 697.20592 + dps: 858.2616 + tps: 701.72975 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1278.07339 - tps: 1043.85554 + dps: 1309.96482 + tps: 1070.36679 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2578.03716 - tps: 2596.13904 + dps: 2590.58874 + tps: 2614.16901 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2578.03716 - tps: 2112.71514 + dps: 2590.58874 + tps: 2125.86106 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2740.55736 - tps: 2239.1776 + dps: 2753.78618 + tps: 2258.74328 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 840.56452 - tps: 1004.54803 + dps: 840.48344 + tps: 1005.66548 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 840.56452 - tps: 687.74257 + dps: 840.48344 + tps: 688.22444 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1340.70261 - tps: 1089.30997 + dps: 1363.01202 + tps: 1108.74767 } } dps_results: { key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2586.06266 - tps: 2119.12656 + dps: 2600.74453 + tps: 2134.47704 } } dps_results: { @@ -617,22 +617,22 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-Average-Default" value: { - dps: 3193.73752 - tps: 1358.80609 + dps: 3193.52792 + tps: 1358.63291 } } dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6537.78901 - tps: 1493.76068 + dps: 6536.39018 + tps: 1493.17316 } } dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3174.15308 - tps: 1348.99778 + dps: 3173.86367 + tps: 1348.87623 } } dps_results: { @@ -645,15 +645,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3958.34555 - tps: 947.60776 + dps: 3958.15236 + tps: 947.52661 } } dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1860.10908 - tps: 789.48441 + dps: 1859.91217 + tps: 789.4017 } } dps_results: { @@ -673,8 +673,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3195.36991 - tps: 1359.00799 + dps: 3195.2317 + tps: 1358.94994 } } dps_results: { @@ -694,8 +694,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1868.20021 - tps: 792.66016 + dps: 1868.10023 + tps: 792.61817 } } dps_results: { @@ -708,7 +708,7 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3199.21121 - tps: 1361.01759 + dps: 3199.073 + tps: 1360.95953 } } diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 436252ee99..afb223c1d9 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -155,8 +155,8 @@ dps_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 1496.08664 - tps: 3040.52826 + dps: 1496.05806 + tps: 3040.328 } } dps_results: { @@ -176,22 +176,22 @@ dps_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 681.83431 - tps: 2070.54521 + dps: 668.64497 + tps: 2021.14939 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 269.39149 - tps: 826.88154 + dps: 261.22065 + tps: 794.90504 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 523.06955 - tps: 1502.34047 + dps: 523.0229 + tps: 1499.40172 } } dps_results: { @@ -218,22 +218,22 @@ dps_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 691.99183 - tps: 2102.47752 + dps: 677.13182 + tps: 2050.48118 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 276.60478 - tps: 842.72187 + dps: 267.8552 + tps: 817.40969 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 528.32577 - tps: 1515.64655 + dps: 527.4117 + tps: 1515.01855 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 22a50587fe..5f68eccaa3 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -344,12 +344,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.13609 - weights: 1.54767 + weights: 1.09779 + weights: 1.55649 weights: 0 weights: 0 weights: 0 - weights: 0.2796 + weights: 0.27958 weights: 0 weights: 0 weights: 0 @@ -357,13 +357,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.68167 + weights: 2.70688 weights: 0.46614 weights: 0 weights: 0 - weights: 0.4303 - weights: 13.06784 - weights: 9.7732 + weights: 0.40087 + weights: 13.12474 + weights: 9.80922 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase5-Lvl60-StatWeights-Default" value: { - weights: 3.24603 - weights: 2.6271 + weights: 3.04431 + weights: 2.68266 weights: 0 weights: 0 weights: 0 - weights: 0.51161 + weights: 0.51515 weights: 0 weights: 0 weights: 0 @@ -455,13 +455,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 11.11041 - weights: 0.72251 + weights: 14.27255 + weights: 0.7503 weights: 0 weights: 0 - weights: 1.30848 - weights: 1.94364 - weights: 40.65526 + weights: 1.12498 + weights: 1.06367 + weights: 37.60833 weights: 0 weights: 0 weights: 0 @@ -631,15 +631,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 234.29971 - tps: 393.64451 + dps: 233.51314 + tps: 393.69908 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 107.82373 - tps: 115.83897 + dps: 107.9339 + tps: 116.01287 } } dps_results: { @@ -673,15 +673,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 236.71967 - tps: 397.45738 + dps: 239.00218 + tps: 401.28114 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 108.2034 - tps: 116.26073 + dps: 108.12419 + tps: 116.18152 } } dps_results: { @@ -708,22 +708,22 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-Average-Default" value: { - dps: 1135.62899 - tps: 1174.35939 + dps: 1135.64179 + tps: 1174.37057 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1436.37297 - tps: 1983.23056 + dps: 1431.04062 + tps: 1977.69611 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 335.23267 - tps: 362.55732 + dps: 336.38675 + tps: 363.70594 } } dps_results: { @@ -736,15 +736,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 511.7067 - tps: 785.58458 + dps: 424.58361 + tps: 695.15049 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 138.35953 - tps: 152.05343 + dps: 147.99886 + tps: 161.5272 } } dps_results: { @@ -757,15 +757,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1437.10672 - tps: 1986.58416 + dps: 1438.42099 + tps: 1987.93962 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 341.16056 - tps: 368.59347 + dps: 341.81341 + tps: 369.24544 } } dps_results: { @@ -778,15 +778,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 500.45425 - tps: 775.49746 + dps: 437.7162 + tps: 709.89892 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 141.79319 - tps: 155.54535 + dps: 149.95832 + tps: 163.56745 } } dps_results: { @@ -799,8 +799,8 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1072.02188 - tps: 1110.27079 + dps: 1071.89001 + tps: 1110.13892 } } dps_results: { @@ -1029,15 +1029,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 240.11438 - tps: 575.40679 + dps: 240.41179 + tps: 575.7042 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 183.16826 - tps: 199.93288 + dps: 184.0067 + tps: 200.77132 } } dps_results: { @@ -1196,15 +1196,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 239.36515 - tps: 575.14597 + dps: 239.63246 + tps: 575.41329 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 185.94433 - tps: 202.72274 + dps: 185.90385 + tps: 202.68226 } } dps_results: { @@ -1224,92 +1224,92 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 2477.5849 - tps: 2534.78477 + dps: 2448.74395 + tps: 2505.4529 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Hero'sBrand-231328" value: { - dps: 4584.86494 - tps: 4641.06504 + dps: 4546.93207 + tps: 4602.20276 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 2472.72941 - tps: 2530.50841 + dps: 2438.20309 + tps: 2495.04521 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 2632.20111 - tps: 2691.56676 + dps: 2601.18527 + tps: 2659.73452 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457" value: { - dps: 4681.80958 - tps: 4738.10527 + dps: 4628.48412 + tps: 4683.65087 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 4012.13281 - tps: 4075.56765 + dps: 3830.04846 + tps: 3893.40207 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-SanctifiedOrb-20512" value: { - dps: 4535.9642 - tps: 4591.87438 + dps: 4526.86622 + tps: 4582.07172 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1981.1567 - tps: 2032.96943 + dps: 1760.23034 + tps: 1807.74987 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 3928.51977 - tps: 3984.9661 + dps: 3851.87321 + tps: 3907.16538 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329" value: { - dps: 4236.58931 - tps: 4294.41915 + dps: 4222.25531 + tps: 4280.52487 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Average-Default" value: { - dps: 4634.90945 - tps: 4691.35305 + dps: 4606.27483 + tps: 4662.42962 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 842.28202 - tps: 1092.84551 + dps: 854.32241 + tps: 1105.4759 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 750.21544 - tps: 762.76328 + dps: 758.81586 + tps: 771.38828 } } dps_results: { @@ -1322,15 +1322,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 185.65736 - tps: 366.40418 + dps: 186.87842 + tps: 367.62524 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 154.03461 - tps: 163.07195 + dps: 154.35186 + tps: 163.3892 } } dps_results: { @@ -1384,15 +1384,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 877.99353 - tps: 1129.54035 + dps: 881.80756 + tps: 1133.55105 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 781.51019 - tps: 794.11703 + dps: 783.86248 + tps: 796.47424 } } dps_results: { @@ -1405,15 +1405,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 188.35139 - tps: 369.09822 + dps: 188.45629 + tps: 369.20312 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 154.24095 - tps: 163.27829 + dps: 154.31857 + tps: 163.35591 } } dps_results: { @@ -1426,15 +1426,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 43.9541 - tps: 230.30593 + dps: 42.4324 + tps: 228.58756 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 40.60656 - tps: 49.92415 + dps: 39.08486 + tps: 48.39261 } } dps_results: { @@ -1467,7 +1467,7 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3759.1327 - tps: 3814.52735 + dps: 3764.10027 + tps: 3818.6177 } } diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index fa381fa895..bcb38d79f7 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.0995 + weights: 1.22619 weights: 0 - weights: 0.87591 + weights: 0.87541 weights: 0 - weights: 0.26526 + weights: 0.26531 weights: 0 weights: 0 - weights: 0.61065 + weights: 0.6101 weights: 0 weights: 0 - weights: 7.52003 - weights: 3.32702 + weights: 7.58787 + weights: 3.34134 weights: 0 weights: 0 weights: 0 @@ -351,13 +351,13 @@ stat_weights_results: { weights: 0 weights: 1.13933 weights: 0 - weights: 0.35578 + weights: 0.3558 weights: 0 weights: 0 - weights: 0.78355 + weights: 0.78353 weights: 0 weights: 0 - weights: 12.39762 + weights: 12.42431 weights: 7.47639 weights: 0 weights: 0 @@ -396,18 +396,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.19774 + weights: 2.24278 weights: 0 - weights: 1.731 + weights: 1.73092 weights: 0 - weights: 0.54471 + weights: 0.54489 weights: 0 weights: 0 - weights: 1.1863 + weights: 1.18603 weights: 0 weights: 0 - weights: 30.69526 - weights: 16.1309 + weights: 31.57386 + weights: 15.25015 weights: 0 weights: 0 weights: 0 @@ -445,18 +445,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.10644 + weights: 3.14296 weights: 0 - weights: 2.1359 + weights: 2.13554 weights: 0 - weights: 0.5345 + weights: 0.53407 weights: 0 weights: 0 - weights: 1.6014 + weights: 1.60147 weights: 0 weights: 0 weights: 0 - weights: 23.52306 + weights: 23.54242 weights: 0 weights: 0 weights: 0 @@ -492,7 +492,7 @@ dps_results: { key: "TestElemental-Phase1-Lvl25-Average-Default" value: { dps: 197.0368 - tps: 157.08202 + tps: 157.08224 } } dps_results: { @@ -520,14 +520,14 @@ dps_results: { key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongMultiTarget" value: { dps: 133.67122 - tps: 297.14769 + tps: 297.15069 } } dps_results: { key: "TestElemental-Phase1-Lvl25-Settings-Orc-phase_1-Adaptive-phase_1-NoBuffs-P1-Consumes-LongSingleTarget" value: { dps: 133.67122 - tps: 107.87665 + tps: 107.8768 } } dps_results: { @@ -589,22 +589,22 @@ dps_results: { dps_results: { key: "TestElemental-Phase2-Lvl40-Average-Default" value: { - dps: 625.31624 - tps: 525.02289 + dps: 625.436 + tps: 525.18487 } } dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 713.89151 - tps: 1174.1531 + dps: 714.05944 + tps: 1174.1338 } } dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 591.87712 - tps: 495.81417 + dps: 593.00804 + tps: 496.6142 } } dps_results: { @@ -617,15 +617,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 377.37717 - tps: 729.49641 + dps: 377.25593 + tps: 729.31948 } } dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 323.96512 - tps: 273.69308 + dps: 323.99312 + tps: 273.69899 } } dps_results: { @@ -638,15 +638,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 719.20797 - tps: 1187.72949 + dps: 719.8241 + tps: 1187.92758 } } dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 598.08632 - tps: 502.22388 + dps: 599.01504 + tps: 503.16178 } } dps_results: { @@ -659,15 +659,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 377.98189 - tps: 736.52082 + dps: 377.7085 + tps: 736.41558 } } dps_results: { key: "TestElemental-Phase2-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 318.36619 - tps: 268.82856 + dps: 318.84218 + tps: 269.33906 } } dps_results: { @@ -680,29 +680,29 @@ dps_results: { dps_results: { key: "TestElemental-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 624.30514 - tps: 527.08711 + dps: 624.62409 + tps: 527.34599 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Average-Default" value: { - dps: 1515.21228 - tps: 1312.20494 + dps: 1515.19687 + tps: 1312.17404 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 3327.057 - tps: 3435.59468 + dps: 3326.81779 + tps: 3432.22287 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { dps: 1457.59977 - tps: 1268.49328 + tps: 1268.46868 } } dps_results: { @@ -715,15 +715,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1679.35513 - tps: 1884.29353 + dps: 1682.98644 + tps: 1886.1771 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Orc-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { dps: 879.20185 - tps: 779.17511 + tps: 779.13305 } } dps_results: { @@ -737,14 +737,14 @@ dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongMultiTarget" value: { dps: 3350.96791 - tps: 3467.39762 + tps: 3467.22427 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1487.91321 - tps: 1294.92606 + dps: 1487.73579 + tps: 1294.76687 } } dps_results: { @@ -757,15 +757,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1657.02256 - tps: 1877.42881 + dps: 1654.84928 + tps: 1876.05878 } } dps_results: { key: "TestElemental-Phase3-Lvl50-Settings-Troll-phase_3-Adaptive-phase_3-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 891.91317 - tps: 789.85877 + dps: 892.09312 + tps: 789.90187 } } dps_results: { @@ -779,91 +779,91 @@ dps_results: { key: "TestElemental-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { dps: 1492.67681 - tps: 1296.72801 + tps: 1296.7254 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { dps: 1422.99736 - tps: 1489.3492 + tps: 1489.12526 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { dps: 1422.18323 - tps: 1488.65812 + tps: 1488.34966 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { dps: 1553.25315 - tps: 1620.47865 + tps: 1620.33883 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { dps: 1502.05403 - tps: 1567.4383 + tps: 1567.29565 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { dps: 1421.25133 - tps: 1487.76814 + tps: 1487.62549 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { dps: 1421.55894 - tps: 1488.07575 + tps: 1487.9331 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 2322.16363 - tps: 2363.71131 + dps: 2326.63856 + tps: 2369.05016 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { dps: 2452.74978 - tps: 2493.20775 + tps: 2493.35239 } } dps_results: { key: "TestElemental-Phase4-Lvl60-AllItems-TheFiveThunders" value: { dps: 1318.3191 - tps: 1309.81159 + tps: 1309.77286 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Average-Default" value: { - dps: 3226.77729 - tps: 1969.52408 + dps: 3226.7133 + tps: 1969.6127 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 5883.40244 - tps: 4039.62491 + dps: 5884.90239 + tps: 4042.0552 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3124.22548 - tps: 1905.61812 + dps: 3121.90205 + tps: 1904.40203 } } dps_results: { @@ -876,15 +876,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2407.47801 - tps: 1922.21442 + dps: 2408.07325 + tps: 1921.09566 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1534.58869 - tps: 953.72683 + dps: 1533.50902 + tps: 952.68569 } } dps_results: { @@ -897,15 +897,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 5911.26999 - tps: 4036.99925 + dps: 5912.86825 + tps: 4037.62721 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3182.48508 - tps: 1948.3319 + dps: 3177.0025 + tps: 1944.79576 } } dps_results: { @@ -918,15 +918,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2355.89208 - tps: 1894.19501 + dps: 2343.96022 + tps: 1889.18273 } } dps_results: { key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1553.14897 - tps: 970.37977 + dps: 1552.60222 + tps: 969.29499 } } dps_results: { @@ -939,92 +939,92 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3197.1754 - tps: 1948.40868 + dps: 3194.55521 + tps: 1946.83078 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1494.36855 - tps: 1520.89055 + dps: 1491.63851 + tps: 1517.89465 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1493.43782 - tps: 1519.77903 + dps: 1490.91819 + tps: 1517.23212 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 1626.27493 - tps: 1653.12261 + dps: 1629.19109 + tps: 1655.46391 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 1576.03032 - tps: 1601.32523 + dps: 1573.90384 + tps: 1599.16969 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1491.54647 - tps: 1517.91975 + dps: 1489.51974 + tps: 1515.86606 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 1491.86532 - tps: 1518.2386 + dps: 1489.83701 + tps: 1516.18333 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 2537.45739 - tps: 2539.98805 + dps: 2537.8859 + tps: 2540.41656 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 2663.06349 - tps: 2665.89332 + dps: 2663.50773 + tps: 2666.33756 } } dps_results: { key: "TestElemental-Phase5-Lvl60-AllItems-TheFiveThunders" value: { dps: 1334.8054 - tps: 1318.63864 + tps: 1319.07796 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Average-Default" value: { - dps: 4223.07918 - tps: 2550.07468 + dps: 4221.9643 + tps: 2549.51785 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8064.48365 - tps: 3985.03402 + dps: 8063.86825 + tps: 3984.40918 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4090.36115 - tps: 2468.81191 + dps: 4094.44946 + tps: 2472.34945 } } dps_results: { @@ -1037,15 +1037,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4257.98424 - tps: 2187.10517 + dps: 4257.68685 + tps: 2186.64731 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1876.31779 - tps: 1140.85213 + dps: 1876.14911 + tps: 1141.28851 } } dps_results: { @@ -1058,15 +1058,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 8095.25783 - tps: 4004.05207 + dps: 8094.05907 + tps: 4003.38858 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4097.09717 - tps: 2473.60998 + dps: 4095.26931 + tps: 2472.16396 } } dps_results: { @@ -1079,15 +1079,15 @@ dps_results: { dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4249.53231 - tps: 2187.95259 + dps: 4249.05788 + tps: 2188.29253 } } dps_results: { key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1895.91966 - tps: 1152.99406 + dps: 1895.60415 + tps: 1152.83601 } } dps_results: { @@ -1100,7 +1100,7 @@ dps_results: { dps_results: { key: "TestElemental-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4162.98836 - tps: 2520.85124 + dps: 4154.69372 + tps: 2513.41114 } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index a01f3e09a3..fdd4b5296f 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.07589 - weights: 0.31537 + weights: 2.07575 + weights: 0.29932 weights: 0 weights: 0 weights: 0 - weights: 0.76012 + weights: 0.76014 weights: 0 weights: 0 weights: 0 @@ -410,9 +410,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94359 - weights: 27.41553 - weights: 10.83314 + weights: 0.94352 + weights: 27.63614 + weights: 10.82772 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.52568 + weights: 2.52561 weights: 0.85121 weights: 0 weights: 0 weights: 0 - weights: 0.83947 + weights: 0.83941 weights: 0 weights: 0 weights: 0 @@ -459,9 +459,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.99829 - weights: 28.58411 - weights: 11.53107 + weights: 0.99826 + weights: 28.50156 + weights: 11.51941 weights: 0 weights: 0 weights: 0 @@ -701,8 +701,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 222.28753 - tps: 250.16185 + dps: 222.52132 + tps: 250.39334 } } dps_results: { @@ -743,8 +743,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 222.28753 - tps: 250.16185 + dps: 222.52132 + tps: 250.39334 } } dps_results: { @@ -785,8 +785,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 219.37072 - tps: 246.65469 + dps: 219.51271 + tps: 246.50714 } } dps_results: { @@ -827,8 +827,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget" value: { - dps: 219.37072 - tps: 246.65469 + dps: 219.51271 + tps: 246.50714 } } dps_results: { @@ -883,8 +883,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 428.02822 - tps: 324.78601 + dps: 428.02971 + tps: 324.79487 } } dps_results: { @@ -925,8 +925,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 428.02822 - tps: 324.78601 + dps: 428.02971 + tps: 324.79487 } } dps_results: { @@ -967,8 +967,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 419.10779 - tps: 319.08108 + dps: 418.33243 + tps: 318.66354 } } dps_results: { @@ -1009,8 +1009,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget" value: { - dps: 419.10779 - tps: 319.08108 + dps: 418.33243 + tps: 318.66354 } } dps_results: { @@ -1037,15 +1037,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1890.88816 - tps: 1916.1924 + dps: 1890.11572 + tps: 1915.59883 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1959.62865 - tps: 1983.66967 + dps: 1958.803 + tps: 1983.02382 } } dps_results: { @@ -1059,63 +1059,63 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { dps: 1936.03924 - tps: 1961.60289 + tps: 1961.59653 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { dps: 1889.8685 - tps: 1915.43715 + tps: 1915.43079 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { dps: 1936.7672 - tps: 1961.41882 + tps: 1961.41246 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 2879.75375 - tps: 2939.73913 + dps: 2875.98591 + tps: 2936.14396 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 2825.54195 - tps: 2888.0478 + dps: 2821.76249 + tps: 2884.44118 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1561.73857 - tps: 1595.20811 + dps: 1561.44665 + tps: 1594.91426 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Average-Default" value: { - dps: 3816.30413 - tps: 2722.93332 + dps: 3816.29904 + tps: 2722.92593 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 1708.89578 - tps: 1711.61906 + tps: 1711.50887 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1056.79344 - tps: 762.945 + tps: 762.93269 } } dps_results: { @@ -1128,15 +1128,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 696.97199 - tps: 930.12046 + dps: 695.61934 + tps: 929.42643 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 448.1382 - tps: 331.8189 + dps: 448.17301 + tps: 331.81454 } } dps_results: { @@ -1150,14 +1150,14 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 1708.89578 - tps: 1711.61906 + tps: 1711.50887 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1056.79344 - tps: 762.945 + tps: 762.93269 } } dps_results: { @@ -1170,15 +1170,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 696.97199 - tps: 930.12046 + dps: 695.61934 + tps: 929.42643 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 448.1382 - tps: 331.8189 + dps: 448.17301 + tps: 331.81454 } } dps_results: { @@ -1192,14 +1192,14 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2998.00544 - tps: 2621.54192 + tps: 2621.23641 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1501.23882 - tps: 1073.03692 + tps: 1072.83548 } } dps_results: { @@ -1212,15 +1212,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1208.52498 - tps: 1299.07315 + dps: 1194.99131 + tps: 1289.80587 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 610.96477 - tps: 445.90542 + dps: 607.50119 + tps: 445.0325 } } dps_results: { @@ -1234,14 +1234,14 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2998.00544 - tps: 2621.54192 + tps: 2621.23641 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1501.23882 - tps: 1073.03692 + tps: 1072.83548 } } dps_results: { @@ -1254,15 +1254,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1208.52498 - tps: 1299.07315 + dps: 1194.99131 + tps: 1289.80587 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 610.96477 - tps: 445.90542 + dps: 607.50119 + tps: 445.0325 } } dps_results: { @@ -1283,7 +1283,7 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1061.89006 - tps: 766.70848 + tps: 766.7104 } } dps_results: { @@ -1296,15 +1296,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 694.31044 - tps: 929.15607 + dps: 694.79547 + tps: 929.52902 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 443.32997 - tps: 328.05693 + dps: 443.36583 + tps: 328.25775 } } dps_results: { @@ -1325,7 +1325,7 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1061.89006 - tps: 766.70848 + tps: 766.7104 } } dps_results: { @@ -1338,15 +1338,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 694.31044 - tps: 929.15607 + dps: 694.79547 + tps: 929.52902 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 443.32997 - tps: 328.05693 + dps: 443.36583 + tps: 328.25775 } } dps_results: { @@ -1360,14 +1360,14 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2986.09659 - tps: 2618.43193 + tps: 2621.00745 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1489.63142 - tps: 1065.07048 + tps: 1065.1069 } } dps_results: { @@ -1380,15 +1380,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1191.84358 - tps: 1288.47686 + dps: 1196.95892 + tps: 1291.65783 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 603.28444 - tps: 440.66397 + dps: 603.33132 + tps: 440.9302 } } dps_results: { @@ -1402,14 +1402,14 @@ dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2986.09659 - tps: 2618.43193 + tps: 2621.00745 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1489.63142 - tps: 1065.07048 + tps: 1065.1069 } } dps_results: { @@ -1422,15 +1422,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1191.84358 - tps: 1288.47686 + dps: 1196.95892 + tps: 1291.65783 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 603.28444 - tps: 440.66397 + dps: 603.33132 + tps: 440.9302 } } dps_results: { @@ -1492,15 +1492,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 3263.83959 - tps: 3310.92034 + dps: 3264.28159 + tps: 3311.39095 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 3202.47981 - tps: 3252.13686 + dps: 3202.89885 + tps: 3252.58376 } } dps_results: { @@ -1513,22 +1513,22 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Average-Default" value: { - dps: 4440.79976 - tps: 3163.09795 + dps: 4440.79784 + tps: 3163.0989 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2226.96212 - tps: 2108.82705 + tps: 2110.6991 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1384.62077 - tps: 987.96661 + tps: 987.90412 } } dps_results: { @@ -1541,15 +1541,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 858.61724 - tps: 1064.02383 + dps: 871.51483 + tps: 1072.80889 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 571.51706 - tps: 418.38487 + dps: 571.06851 + tps: 418.61172 } } dps_results: { @@ -1563,14 +1563,14 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2226.96212 - tps: 2108.82705 + tps: 2110.6991 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1384.62077 - tps: 987.96661 + tps: 987.90412 } } dps_results: { @@ -1583,15 +1583,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 858.61724 - tps: 1064.02383 + dps: 871.51483 + tps: 1072.80889 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 571.51706 - tps: 418.38487 + dps: 571.06851 + tps: 418.61172 } } dps_results: { @@ -1612,7 +1612,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1647.03468 - tps: 1176.45161 + tps: 1176.36828 } } dps_results: { @@ -1625,15 +1625,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1489.40543 - tps: 1608.96658 + dps: 1487.42636 + tps: 1607.11992 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 666.01801 - tps: 486.99103 + dps: 667.54633 + tps: 488.33943 } } dps_results: { @@ -1654,7 +1654,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1647.03468 - tps: 1176.45161 + tps: 1176.36828 } } dps_results: { @@ -1667,15 +1667,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1489.40543 - tps: 1608.96658 + dps: 1487.42636 + tps: 1607.11992 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 666.01801 - tps: 486.99103 + dps: 667.54633 + tps: 488.33943 } } dps_results: { @@ -1689,14 +1689,14 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2198.48126 - tps: 2085.76158 + tps: 2083.42199 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1376.36018 - tps: 984.8172 + tps: 984.78846 } } dps_results: { @@ -1709,15 +1709,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 850.54369 - tps: 1059.81781 + dps: 855.83447 + tps: 1062.28546 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 562.55264 - tps: 411.37889 + dps: 562.5613 + tps: 411.98078 } } dps_results: { @@ -1731,14 +1731,14 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 2198.48126 - tps: 2085.76158 + tps: 2083.42199 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1376.36018 - tps: 984.8172 + tps: 984.78846 } } dps_results: { @@ -1751,15 +1751,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 850.54369 - tps: 1059.81781 + dps: 855.83447 + tps: 1062.28546 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 562.55264 - tps: 411.37889 + dps: 562.5613 + tps: 411.98078 } } dps_results: { @@ -1773,14 +1773,14 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 3522.45108 - tps: 3012.44402 + tps: 3012.48252 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1635.43921 - tps: 1168.45447 + tps: 1168.4559 } } dps_results: { @@ -1793,15 +1793,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1479.12362 - tps: 1604.59074 + dps: 1480.01236 + tps: 1604.54607 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 660.20767 - tps: 481.68972 + dps: 662.03036 + tps: 483.71244 } } dps_results: { @@ -1815,14 +1815,14 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 3522.45108 - tps: 3012.44402 + tps: 3012.48252 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1635.43921 - tps: 1168.45447 + tps: 1168.4559 } } dps_results: { @@ -1835,15 +1835,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1479.12362 - tps: 1604.59074 + dps: 1480.01236 + tps: 1604.54607 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 660.20767 - tps: 481.68972 + dps: 662.03036 + tps: 483.71244 } } dps_results: { @@ -1856,7 +1856,7 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3661.55033 - tps: 2607.09517 + dps: 3660.16352 + tps: 2606.25611 } } diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index 93d7918a98..2a0f3c3b9d 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.11021 + weights: 1.11135 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 0.48698 + weights: 0.48798 weights: 0 weights: 0 weights: 0 @@ -67,7 +67,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.50464 + weights: 0.50516 weights: 0 weights: 0 weights: 0 @@ -78,7 +78,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94886 + weights: 0.95169 weights: 0 weights: 0 weights: 0 @@ -100,77 +100,77 @@ dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { dps: 1161.69795 - tps: 1200.11289 + tps: 1199.89911 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { dps: 1209.95619 - tps: 1246.80684 + tps: 1246.55695 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { dps: 1197.9031 - tps: 1238.49145 + tps: 1238.54027 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { dps: 1189.15603 - tps: 1227.43273 + tps: 1227.51054 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { dps: 1161.53069 - tps: 1199.5533 + tps: 1199.63111 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { dps: 1194.54794 - tps: 1231.70218 + tps: 1231.77999 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { dps: 1781.04458 - tps: 1972.46112 + tps: 1972.36243 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-AllItems-TheFiveThunders" value: { dps: 1064.36328 - tps: 1096.09302 + tps: 1095.96382 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Average-Default" value: { - dps: 1998.81756 - tps: 1597.71166 + dps: 1999.64519 + tps: 1598.81874 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2114.22793 - tps: 3022.81142 + dps: 2119.10209 + tps: 3029.08722 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 937.15736 - tps: 814.10179 + dps: 937.83091 + tps: 816.95165 } } dps_results: { @@ -183,15 +183,15 @@ dps_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 657.85054 - tps: 1180.63199 + dps: 655.94734 + tps: 1178.86982 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 327.90015 - tps: 270.50923 + dps: 327.65331 + tps: 270.56561 } } dps_results: { @@ -204,15 +204,15 @@ dps_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2095.38128 - tps: 2995.61353 + dps: 2091.24565 + tps: 2989.89246 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 935.241 - tps: 811.39671 + dps: 933.96917 + tps: 810.12266 } } dps_results: { @@ -225,15 +225,15 @@ dps_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 646.1171 - tps: 1161.1969 + dps: 647.24529 + tps: 1161.94956 } } dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 321.43647 - tps: 264.7763 + dps: 321.7655 + tps: 264.98691 } } dps_results: { @@ -246,7 +246,7 @@ dps_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1726.45954 - tps: 1400.43829 + dps: 1731.91182 + tps: 1404.26904 } } diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 21588efb0e..b6d978ad53 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -200,9 +200,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.31836 + weights: 0.24219 weights: 0 - weights: 1.50206 + weights: 1.46857 weights: 0 weights: 0 weights: 0 @@ -210,8 +210,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.45524 - weights: 9.99922 + weights: 9.46717 + weights: 9.9404 weights: 0 weights: 0 weights: 0 @@ -249,9 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.91832 + weights: 2.94186 weights: 0 - weights: 2.00004 + weights: 2.16203 weights: 0 weights: 0 weights: 0 @@ -259,8 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 10.97814 - weights: 21.42464 + weights: 10.979 + weights: 21.38957 weights: 0 weights: 0 weights: 0 @@ -367,33 +367,33 @@ dps_results: { dps_results: { key: "TestAffliction-Phase3-Lvl50-AllItems-DeathmistRaiment" value: { - dps: 364.72877 - tps: 241.74446 - hps: 160.59939 + dps: 364.9575 + tps: 242.08193 + hps: 160.75374 } } dps_results: { key: "TestAffliction-Phase3-Lvl50-Average-Default" value: { - dps: 1545.52639 - tps: 1345.14145 - hps: 370.76627 + dps: 1545.49109 + tps: 1345.08993 + hps: 370.77621 } } dps_results: { key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2313.28294 - tps: 3123.47144 - hps: 368.3118 + dps: 2312.63696 + tps: 3122.17105 + hps: 368.14609 } } dps_results: { key: "TestAffliction-Phase3-Lvl50-Settings-Orc-nf.ruin-Affliction Warlock-nf.ruin-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1533.43515 - tps: 1333.38491 - hps: 368.70183 + dps: 1532.91601 + tps: 1332.92902 + hps: 368.49753 } } dps_results: { @@ -440,7 +440,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { dps: 844.45204 - tps: 649.16932 + tps: 649.20746 hps: 261.53768 } } @@ -448,7 +448,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-DeathmistRaiment" value: { dps: 646.7303 - tps: 454.10724 + tps: 454.11491 hps: 270.79764 } } @@ -456,7 +456,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { dps: 844.75629 - tps: 650.26559 + tps: 650.27269 hps: 261.61803 } } @@ -472,7 +472,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-IronweaveBattlesuit" value: { dps: 630.33445 - tps: 447.38723 + tps: 447.29209 hps: 271.7413 } } @@ -488,7 +488,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { dps: 844.45204 - tps: 649.16932 + tps: 649.20746 hps: 261.53768 } } @@ -496,7 +496,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { dps: 1347.92236 - tps: 1140.52584 + tps: 1140.54458 hps: 322.22865 } } @@ -504,16 +504,16 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb" value: { dps: 1325.88624 - tps: 1116.75884 + tps: 1116.76269 hps: 320.86936 } } dps_results: { key: "TestAffliction-Phase4-Lvl60-Average-Default" value: { - dps: 3155.67156 - tps: 2980.12974 - hps: 642.47865 + dps: 3155.6598 + tps: 2980.12292 + hps: 642.4584 } } dps_results: { @@ -543,17 +543,17 @@ dps_results: { dps_results: { key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1484.36206 - tps: 2910.83103 - hps: 356.33254 + dps: 1483.67911 + tps: 2910.03152 + hps: 356.00326 } } dps_results: { key: "TestAffliction-Phase4-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1484.36206 - tps: 1428.13863 - hps: 356.33254 + dps: 1483.67911 + tps: 1427.33912 + hps: 356.00326 } } dps_results: { diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 690296d0a8..6de6ea9668 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -298,9 +298,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.90322 + weights: 0.93689 weights: 0 - weights: 0.83553 + weights: 0.86919 weights: 0 weights: 0 weights: 0 @@ -308,7 +308,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 15.65371 + weights: 15.65564 weights: 10.5351 weights: 0 weights: 0 @@ -519,29 +519,29 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-AllItems-DeathmistRaiment" value: { - dps: 375.48174 + dps: 375.51589 tps: 251.02524 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Average-Default" value: { - dps: 1732.20086 - tps: 1557.79614 + dps: 1732.14941 + tps: 1557.73063 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2674.98149 + dps: 2676.28331 tps: 3157.35605 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1719.73724 - tps: 1547.90786 + dps: 1719.63158 + tps: 1547.75735 } } dps_results: { @@ -554,14 +554,14 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1686.78032 + dps: 1687.61673 tps: 2278.81668 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 974.20502 + dps: 974.26854 tps: 879.14741 } } @@ -575,7 +575,7 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1726.15551 + dps: 1726.21337 tps: 1554.34605 } } diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index add7000a38..90a1a18f1a 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -148,8 +148,8 @@ character_stats_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.1642 - weights: 0.07715 + weights: 0.35659 + weights: 0.14353 weights: 0 weights: 0 weights: 0 @@ -165,9 +165,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.71965 - weights: 8.44477 - weights: 8.35111 + weights: 0.92605 + weights: 8.64998 + weights: 8.26897 weights: 0 weights: 0 weights: 0 @@ -197,8 +197,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.51588 - weights: 1.05953 + weights: 2.28928 + weights: 0.48139 weights: 0 weights: 0 weights: 0 @@ -214,9 +214,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.20756 - weights: 6.96289 - weights: 24.30329 + weights: 0.99476 + weights: 10.42273 + weights: 21.05883 weights: 0 weights: 0 weights: 0 @@ -246,8 +246,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.48895 - weights: 1.53607 + weights: 2.7851 + weights: 1.5234 weights: 0 weights: 0 weights: 0 @@ -263,9 +263,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.60799 - weights: 33.74102 - weights: 26.89507 + weights: 1.02716 + weights: 35.11749 + weights: 24.42067 weights: 0 weights: 0 weights: 0 @@ -295,15 +295,15 @@ stat_weights_results: { dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-AllItems-BattlegearofHeroism" value: { - dps: 549.93761 - tps: 488.71629 + dps: 549.14216 + tps: 488.18372 } } dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-Average-Default" value: { - dps: 607.36853 - tps: 536.6699 + dps: 607.42419 + tps: 536.72713 } } dps_results: { @@ -393,371 +393,371 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 562.85785 - tps: 498.46466 + dps: 562.93004 + tps: 498.66892 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 2756.44774 - tps: 2379.72637 + dps: 2755.60923 + tps: 2378.77269 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2101.65513 - tps: 1850.9511 + dps: 2109.56865 + tps: 1858.36161 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2502.55416 - tps: 2160.19648 + dps: 2501.67008 + tps: 2160.27752 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2466.57794 - tps: 2131.52485 + dps: 2454.63418 + tps: 2121.60941 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2502.55416 - tps: 2160.19648 + dps: 2501.67008 + tps: 2160.27752 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 2919.32664 - tps: 2512.7479 + dps: 2918.26857 + tps: 2511.76917 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 3787.59423 - tps: 2968.364 + dps: 3692.96409 + tps: 2912.03359 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1703.92938 - tps: 1629.31977 + dps: 1965.32498 + tps: 1888.45413 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 536.57449 - tps: 484.94771 + dps: 553.34899 + tps: 497.2272 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 734.83379 - tps: 641.13374 + dps: 756.00705 + tps: 664.60785 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 771.47964 - tps: 814.26555 + dps: 882.65917 + tps: 924.13407 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 267.89319 - tps: 270.69185 + dps: 274.69261 + tps: 274.93684 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 370.22181 - tps: 349.65945 + dps: 382.93307 + tps: 362.69364 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1833.42377 - tps: 1780.55583 + dps: 2174.26113 + tps: 2074.96743 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 558.9659 - tps: 502.39517 + dps: 581.66891 + tps: 518.78664 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 772.50087 - tps: 669.12277 + dps: 774.6768 + tps: 677.8927 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 808.0255 - tps: 861.77431 + dps: 945.24535 + tps: 979.99355 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 268.87524 - tps: 270.42504 + dps: 276.79458 + tps: 275.88395 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 384.58615 - tps: 359.50764 + dps: 384.92667 + tps: 362.68756 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2952.74348 - tps: 2321.13691 + dps: 2896.38724 + tps: 2295.32973 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 3121.12012 - tps: 2677.06124 + dps: 3120.40909 + tps: 2676.52764 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2144.73831 - tps: 1876.19394 + dps: 2140.58344 + tps: 1872.71324 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2634.78481 - tps: 2266.08354 + dps: 2635.83109 + tps: 2266.5909 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2598.01912 - tps: 2234.15637 + dps: 2596.63211 + tps: 2232.0939 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2634.78481 - tps: 2266.08354 + dps: 2635.83109 + tps: 2266.5909 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 3334.23202 - tps: 2854.58281 + dps: 3337.88433 + tps: 2858.00214 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4382.87192 - tps: 3411.49229 + dps: 4258.65373 + tps: 3310.90425 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2047.59111 - tps: 1884.12087 + dps: 1855.06165 + tps: 1738.33216 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 551.33039 - tps: 473.92823 + dps: 517.24856 + tps: 451.13052 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 769.89905 - tps: 638.20126 + dps: 641.83441 + tps: 545.42132 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 859.51547 - tps: 875.43201 + dps: 757.10763 + tps: 797.77773 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 224.96729 - tps: 226.39952 + dps: 211.36564 + tps: 217.1604 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 334.39933 - tps: 307.68423 + dps: 278.22091 + tps: 268.23013 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1573.93097 - tps: 1521.75446 + dps: 1560.03721 + tps: 1492.93972 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 442.77878 - tps: 390.358 + dps: 445.88793 + tps: 392.4787 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 572.20005 - tps: 499.61256 + dps: 573.29663 + tps: 486.86079 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 631.33409 - tps: 701.06045 + dps: 614.03525 + tps: 678.90808 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 171.2215 - tps: 185.13149 + dps: 170.40302 + tps: 184.44883 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 227.19188 - tps: 230.97275 + dps: 229.4978 + tps: 227.95264 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2129.16108 - tps: 1964.57388 + dps: 1849.16097 + tps: 1747.68299 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 551.40627 - tps: 473.22097 + dps: 513.45658 + tps: 445.61373 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 809.19583 - tps: 660.02478 + dps: 645.86396 + tps: 539.2074 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 931.88481 - tps: 941.90068 + dps: 779.81301 + tps: 820.92584 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 232.93777 - tps: 230.95747 + dps: 216.31953 + tps: 219.80096 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 359.93651 - tps: 323.04532 + dps: 286.91064 + tps: 271.0869 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1331.78082 - tps: 1300.42144 + dps: 1591.6163 + tps: 1536.29184 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 441.63983 - tps: 384.93159 + dps: 440.65538 + tps: 387.54718 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 589.3819 - tps: 477.01264 + dps: 574.89031 + tps: 481.79286 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 536.97642 - tps: 615.03614 + dps: 640.62164 + tps: 707.04497 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 174.93958 - tps: 186.41504 + dps: 171.32602 + tps: 184.79604 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 241.4118 - tps: 230.39304 + dps: 233.37833 + tps: 229.59805 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3459.45806 - tps: 2682.82789 + dps: 3370.00692 + tps: 2624.02278 } } diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results index 2848a916de..3f31bf6997 100644 --- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results +++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results @@ -99,8 +99,8 @@ character_stats_results: { stat_weights_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.28624 - weights: 0.95655 + weights: 1.28691 + weights: 1.28641 weights: 0 weights: 0 weights: 0 @@ -116,9 +116,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.50989 - weights: 15.71723 - weights: 10.32656 + weights: 0.51015 + weights: 15.79775 + weights: 10.34512 weights: 0 weights: 0 weights: 0 @@ -148,8 +148,8 @@ stat_weights_results: { stat_weights_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.78779 - weights: 1.28104 + weights: 1.85563 + weights: 0.74219 weights: 0 weights: 0 weights: 0 @@ -165,9 +165,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.56188 + weights: 0.6345 weights: 0 - weights: 24.11071 + weights: 24.78987 weights: 0 weights: 0 weights: 0 @@ -197,15 +197,15 @@ stat_weights_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-AllItems-BattlegearofHeroism" value: { - dps: 800.37525 - tps: 689.41703 + dps: 808.73565 + tps: 682.50594 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Average-Default" value: { - dps: 1168.22826 - tps: 998.0197 + dps: 1168.22549 + tps: 997.99464 } } dps_results: { @@ -218,15 +218,15 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 86.6047 - tps: 79.76864 + dps: 78.65611 + tps: 73.27992 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 158.62624 - tps: 142.02593 + dps: 123.02895 + tps: 113.56845 } } dps_results: { @@ -239,15 +239,15 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 40.87872 - tps: 41.88825 + dps: 36.54158 + tps: 38.39805 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 80.15143 - tps: 77.10208 + dps: 61.39207 + tps: 62.2559 } } dps_results: { @@ -260,15 +260,15 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 93.89587 - tps: 85.90045 + dps: 86.23065 + tps: 79.42042 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 168.57229 - tps: 150.14534 + dps: 132.74908 + tps: 121.64683 } } dps_results: { @@ -281,245 +281,245 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 44.05879 - tps: 44.57861 + dps: 39.79389 + tps: 41.08626 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 85.2417 - tps: 81.17224 + dps: 66.31617 + tps: 66.34072 } } dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1088.73646 - tps: 934.41168 + dps: 1085.53521 + tps: 915.65592 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 2608.00553 - tps: 2166.13368 + dps: 2599.52365 + tps: 2160.35679 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 1622.31096 - tps: 1374.29779 + dps: 1620.75621 + tps: 1372.42654 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 1946.75079 - tps: 1637.6988 + dps: 1942.59371 + tps: 1634.96106 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 1918.68531 - tps: 1616.38195 + dps: 1921.17828 + tps: 1618.81271 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 1946.75079 - tps: 1637.6988 + dps: 1942.59371 + tps: 1634.96106 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 2810.59207 - tps: 2336.77705 + dps: 2795.63597 + tps: 2322.86673 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4365.65499 - tps: 3310.2171 + dps: 4356.69139 + tps: 3309.01441 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 954.8031 - tps: 721.00227 + dps: 955.63213 + tps: 723.02259 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 936.47969 - tps: 613.40555 + dps: 937.30872 + tps: 615.40058 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 1231.77757 - tps: 818.30239 + tps: 819.07022 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 441.60384 - tps: 388.30563 + dps: 441.68427 + tps: 388.53209 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 430.44384 - tps: 286.04615 + dps: 430.52427 + tps: 286.28798 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 568.7573 - tps: 382.63447 + tps: 382.92863 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 677.6159 - tps: 555.33579 + dps: 696.87438 + tps: 569.73591 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 665.89647 - tps: 452.94514 + dps: 685.10103 + tps: 467.17447 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1028.46031 - tps: 729.77905 + dps: 1026.93636 + tps: 729.4682 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 295.96286 - tps: 298.26706 + dps: 294.41586 + tps: 297.79681 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 288.23286 - tps: 198.76501 + dps: 286.68586 + tps: 198.11959 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 454.5056 - tps: 324.6227 + dps: 451.13908 + tps: 322.64098 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 973.37108 - tps: 735.90291 + dps: 972.12628 + tps: 735.03946 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 955.8128 - tps: 628.84118 + dps: 954.86073 + tps: 628.23721 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 1312.86215 - tps: 876.44774 + tps: 876.58731 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 455.87283 - tps: 398.46767 + dps: 455.39175 + tps: 397.98404 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 445.02783 - tps: 296.40794 + dps: 444.71925 + tps: 296.05868 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 610.73073 - tps: 412.04702 + tps: 411.9581 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 689.38878 - tps: 565.63363 + dps: 698.37311 + tps: 573.50356 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 678.17639 - tps: 463.53487 + dps: 686.58348 + tps: 470.84236 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1098.12986 - tps: 782.70864 + dps: 1092.92055 + tps: 779.73508 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 296.23262 - tps: 299.75068 + dps: 298.151 + tps: 302.34264 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 288.65762 - tps: 200.44011 + dps: 290.5685 + tps: 202.75094 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 479.76603 - tps: 345.84801 + dps: 475.17394 + tps: 342.8837 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3601.73315 - tps: 2713.05902 + dps: 3573.6664 + tps: 2696.40461 } } diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results index 5607edf0f5..37390af577 100644 --- a/sim/warrior/tank_warrior/TestTankWarrior.results +++ b/sim/warrior/tank_warrior/TestTankWarrior.results @@ -50,7 +50,7 @@ character_stats_results: { stat_weights_results: { key: "TestTankWarrior-Phase4-Lvl60-StatWeights-Default" value: { - weights: 1.04483 + weights: 0.16448 weights: 0 weights: 0 weights: 0 @@ -67,7 +67,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.53302 + weights: -0.07794 weights: 0 weights: 0 weights: 0 @@ -78,9 +78,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.23704 + weights: 0.43328 weights: 0 - weights: 0.5262 + weights: 0.53043 weights: 0 weights: 0 weights: 0 @@ -99,64 +99,64 @@ stat_weights_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 1644.5649 - tps: 3625.44124 + dps: 1644.09382 + tps: 3621.14747 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 930.54251 - tps: 1895.21945 + dps: 929.93401 + tps: 1893.72626 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 939.68211 - tps: 1954.84007 + dps: 939.2017 + tps: 1953.64587 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 934.17799 - tps: 1943.31903 + dps: 934.14667 + tps: 1943.52303 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 939.68211 - tps: 1954.84007 + dps: 939.2017 + tps: 1953.64587 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 1729.47856 - tps: 3738.74274 + dps: 1726.67885 + tps: 3731.33742 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 1552.78843 - tps: 3997.73251 + dps: 1553.10772 + tps: 3998.77971 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 445.08433 - tps: 1263.16714 + dps: 444.60502 + tps: 1260.66486 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 115.23529 - tps: 380.02153 + dps: 114.9823 + tps: 379.22063 } } dps_results: { @@ -169,15 +169,15 @@ dps_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 144.50986 - tps: 568.28568 + dps: 144.27914 + tps: 566.8831 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 49.70933 - tps: 200.50334 + dps: 49.55895 + tps: 200.01979 } } dps_results: { @@ -190,15 +190,15 @@ dps_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 465.05183 - tps: 1300.24401 + dps: 464.57252 + tps: 1297.74174 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 121.09846 - tps: 393.9724 + dps: 120.84547 + tps: 393.17149 } } dps_results: { @@ -211,15 +211,15 @@ dps_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 144.77341 - tps: 569.0788 + dps: 144.54269 + tps: 567.67622 } } dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 49.73817 - tps: 200.63862 + dps: 49.58779 + tps: 200.15507 } } dps_results: { @@ -232,7 +232,7 @@ dps_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1322.15656 - tps: 3452.0711 + dps: 1320.88157 + tps: 3445.44435 } } From 55393804026f62dc0ceadc9fa48b70e013742c0b Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Fri, 15 Nov 2024 22:03:06 -0500 Subject: [PATCH 4/6] fix state leak in apl --- sim/core/apl_actions_casting.go | 7 ++ sim/core/apl_actions_timing.go | 3 +- sim/druid/feral/TestFeral.results | 48 ++++++------ sim/mage/TestArcane.results | 74 +++++++++---------- sim/mage/TestFire.results | 58 +++++++-------- sim/mage/TestFrost.results | 44 +++++------ sim/paladin/protection/TestProtection.results | 8 +- .../retribution/TestRetribution.results | 8 +- sim/paladin/retribution/TestShockadin.results | 12 +-- sim/warlock/dps/TestAffliction.results | 20 ++--- sim/warlock/dps/TestDestruction.results | 24 +++--- .../tank_warrior/TestTankWarrior.results | 4 +- 12 files changed, 159 insertions(+), 151 deletions(-) diff --git a/sim/core/apl_actions_casting.go b/sim/core/apl_actions_casting.go index d1b80e6f8e..6858bd4ec7 100644 --- a/sim/core/apl_actions_casting.go +++ b/sim/core/apl_actions_casting.go @@ -30,6 +30,13 @@ func (rot *APLRotation) newActionCastSpell(config *proto.APLActionCastSpell) APL target: target, } } + +func (action *APLActionCastSpell) Reset(sim *Simulation) { + action.offGCD = false + action.offGCDTime = -1 * time.Minute + action.offGCDTimeExe = -1 * time.Minute +} + func (action *APLActionCastSpell) IsReady(sim *Simulation) bool { action.offGCD = false ready := action.spell.CanCast(sim, action.target.Get()) && (!action.spell.Flags.Matches(SpellFlagMCD) || action.spell.Unit.GCD.IsReady(sim) || action.spell.DefaultCast.GCD == 0) diff --git a/sim/core/apl_actions_timing.go b/sim/core/apl_actions_timing.go index 7c541a485a..905680a7c1 100644 --- a/sim/core/apl_actions_timing.go +++ b/sim/core/apl_actions_timing.go @@ -149,10 +149,11 @@ func (rot *APLRotation) newActionRelativeSchedule(config *proto.APLActionRelativ return &APLActionRelativeSchedule{ innerAction: innerAction, timing: timing, - prevTime: -1 * time.Second, + prevTime: -1 * time.Minute, } } func (action *APLActionRelativeSchedule) Reset(*Simulation) { + action.prevTime = -1 * time.Minute } func (action *APLActionRelativeSchedule) GetInnerActions() []*APLAction { return []*APLAction{action.innerAction} diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 5855130f38..11357146ae 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -792,8 +792,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.53236 - tps: 425.22963 + dps: 572.53279 + tps: 425.85698 } } dps_results: { @@ -813,8 +813,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.27479 - tps: 256.69616 + dps: 343.20641 + tps: 256.6476 } } dps_results: { @@ -834,8 +834,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.53236 - tps: 425.22963 + dps: 572.53279 + tps: 425.85698 } } dps_results: { @@ -855,8 +855,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.27479 - tps: 256.69616 + dps: 343.20641 + tps: 256.6476 } } dps_results: { @@ -876,8 +876,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.53236 - tps: 425.22963 + dps: 572.53279 + tps: 425.85698 } } dps_results: { @@ -897,8 +897,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.27479 - tps: 256.69616 + dps: 343.20641 + tps: 256.6476 } } dps_results: { @@ -918,8 +918,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.49408 - tps: 425.32821 + dps: 572.50009 + tps: 425.95912 } } dps_results: { @@ -939,8 +939,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.72094 - tps: 257.75255 + dps: 343.65228 + tps: 257.7038 } } dps_results: { @@ -960,8 +960,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.49408 - tps: 425.32821 + dps: 572.50009 + tps: 425.95912 } } dps_results: { @@ -981,8 +981,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.72094 - tps: 257.75255 + dps: 343.65228 + tps: 257.7038 } } dps_results: { @@ -1002,8 +1002,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 571.49408 - tps: 425.32821 + dps: 572.50009 + tps: 425.95912 } } dps_results: { @@ -1023,8 +1023,8 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 343.72094 - tps: 257.75255 + dps: 343.65228 + tps: 257.7038 } } dps_results: { diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 31a511ceb8..926240de4d 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -200,11 +200,11 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.50455 + weights: 0.47639 weights: 0 - weights: 0.41068 - weights: 0.32407 - weights: 0.08661 + weights: 0.41084 + weights: 0.32419 + weights: 0.08666 weights: 0 weights: 0 weights: 0 @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -1.25543 + weights: -1.24293 weights: 0 - weights: 1.2215 - weights: 1.09341 - weights: 0.12808 + weights: 1.22124 + weights: 1.0932 + weights: 0.12805 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 13.78883 + weights: 13.80313 weights: 0 weights: 0 weights: 0 @@ -393,8 +393,8 @@ stat_weights_results: { dps_results: { key: "TestArcane-Phase1-Lvl25-Average-Default" value: { - dps: 179.25803 - tps: 110.74567 + dps: 179.25625 + tps: 110.7446 } } dps_results: { @@ -442,15 +442,15 @@ dps_results: { dps_results: { key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 613.17902 - tps: 429.77131 + dps: 613.9529 + tps: 430.23564 } } dps_results: { key: "TestArcane-Phase1-Lvl25-Settings-Troll-p1_generic-Arcane-p1_arcane-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 170.03978 - tps: 105.11706 + dps: 170.07822 + tps: 105.14013 } } dps_results: { @@ -484,8 +484,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase1-Lvl25-SwitchInFrontOfTarget-Default" value: { - dps: 185.17807 - tps: 114.19921 + dps: 185.23832 + tps: 114.23536 } } dps_results: { @@ -652,8 +652,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Average-Default" value: { - dps: 2056.64591 - tps: 2080.04322 + dps: 2056.67561 + tps: 2080.07325 } } dps_results: { @@ -673,8 +673,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2303.92082 - tps: 2321.91028 + dps: 2326.6262 + tps: 2344.73452 } } dps_results: { @@ -694,29 +694,29 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1232.33072 - tps: 1248.28009 + dps: 1243.99239 + tps: 1258.54884 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2082.46034 - tps: 2495.91558 + dps: 2082.45077 + tps: 2495.90601 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2082.46034 - tps: 2103.1331 + dps: 2082.45077 + tps: 2103.12353 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2343.42318 - tps: 2362.13004 + dps: 2337.82907 + tps: 2356.56095 } } dps_results: { @@ -736,15 +736,15 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1259.10578 - tps: 1275.5002 + dps: 1259.37774 + tps: 1275.77216 } } dps_results: { key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2044.94207 - tps: 2068.25241 + dps: 2044.9325 + tps: 2068.24284 } } dps_results: { @@ -813,8 +813,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase5-Lvl60-Average-Default" value: { - dps: 3247.54511 - tps: 1956.87542 + dps: 3247.52702 + tps: 1956.86457 } } dps_results: { @@ -862,8 +862,8 @@ dps_results: { dps_results: { key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 6865.96018 - tps: 2085.09551 + dps: 6865.82033 + tps: 2085.01161 } } dps_results: { diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 60462ef8d5..cc4ff999c0 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -447,16 +447,16 @@ stat_weights_results: { weights: 0 weights: 1.89259 weights: 0 - weights: 2.37893 + weights: 2.37848 weights: 0 - weights: 2.37893 + weights: 2.37848 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 40.933 + weights: 40.56996 weights: 0 weights: 0 weights: 0 @@ -785,29 +785,29 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 1958.20768 - tps: 1283.68596 + dps: 1956.4381 + tps: 1283.1816 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 1849.41137 - tps: 1215.12504 + dps: 1859.46124 + tps: 1222.35848 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 1923.16901 - tps: 1259.33716 + dps: 1924.04855 + tps: 1259.761 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 1750.59139 - tps: 1147.46063 + dps: 1751.92241 + tps: 1149.17541 } } dps_results: { @@ -820,22 +820,22 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 1958.20768 - tps: 1283.68596 + dps: 1956.4381 + tps: 1283.1816 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 1849.41137 - tps: 1215.12504 + dps: 1859.46124 + tps: 1222.35848 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2177.69757 - tps: 1428.46121 + dps: 2175.18782 + tps: 1426.94599 } } dps_results: { @@ -932,8 +932,8 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1680.28235 - tps: 1082.73049 + dps: 1696.89654 + tps: 1090.3762 } } dps_results: { @@ -1009,8 +1009,8 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Average-Default" value: { - dps: 3701.52473 - tps: 2133.0093 + dps: 3701.39484 + tps: 2132.97592 } } dps_results: { @@ -1030,8 +1030,8 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4545.24011 - tps: 2622.2677 + dps: 4524.77355 + tps: 2611.33856 } } dps_results: { @@ -1044,8 +1044,8 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1008.35439 - tps: 594.56374 + dps: 1009.28764 + tps: 595.23262 } } dps_results: { @@ -1065,15 +1065,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3674.73839 - tps: 2123.37415 + dps: 3676.56158 + tps: 2124.25262 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 4521.15321 - tps: 2613.46203 + dps: 4523.81313 + tps: 2614.90117 } } dps_results: { diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 3d759c1da9..385a17b86d 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -251,10 +251,10 @@ stat_weights_results: { weights: 0 weights: 0.30982 weights: 0 - weights: 2.01631 + weights: 2.01646 weights: 0 weights: 0 - weights: 1.91246 + weights: 1.91256 weights: 0 weights: 0 weights: 0 @@ -393,29 +393,29 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 1720.33096 - tps: 1415.07179 + dps: 1731.81262 + tps: 1425.19388 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 1575.03273 - tps: 1296.01771 + dps: 1571.2564 + tps: 1292.74182 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 1729.44428 - tps: 1424.104 + dps: 1715.12617 + tps: 1412.51503 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 1550.78274 - tps: 1274.69348 + dps: 1560.18077 + tps: 1282.72466 } } dps_results: { @@ -428,15 +428,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 1720.33096 - tps: 1415.07179 + dps: 1731.81262 + tps: 1425.19388 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 1575.03273 - tps: 1296.01771 + dps: 1571.2564 + tps: 1292.74182 } } dps_results: { @@ -498,8 +498,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1309.96482 - tps: 1070.36679 + dps: 1304.24182 + tps: 1065.48288 } } dps_results: { @@ -540,8 +540,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1363.01202 - tps: 1108.74767 + dps: 1363.43575 + tps: 1109.35945 } } dps_results: { @@ -582,8 +582,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-AllItems-IronweaveBattlesuit" value: { - dps: 1037.78195 - tps: 647.97953 + dps: 1038.37248 + tps: 648.26412 } } dps_results: { @@ -617,8 +617,8 @@ dps_results: { dps_results: { key: "TestFrost-Phase5-Lvl60-Average-Default" value: { - dps: 3193.52792 - tps: 1358.63291 + dps: 3193.52688 + tps: 1358.59578 } } dps_results: { diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index afb223c1d9..bae16e32b8 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -155,8 +155,8 @@ dps_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330" value: { - dps: 1496.05806 - tps: 3040.328 + dps: 1496.0575 + tps: 3040.28595 } } dps_results: { @@ -232,8 +232,8 @@ dps_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 527.4117 - tps: 1515.01855 + dps: 527.37338 + tps: 1515.56797 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 5f68eccaa3..749a65c486 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1029,15 +1029,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 240.41179 - tps: 575.7042 + dps: 240.58877 + tps: 575.88118 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 184.0067 - tps: 200.77132 + dps: 184.15196 + tps: 200.91658 } } dps_results: { diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index 6fec900f7d..1ae54c5123 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -197,8 +197,8 @@ stat_weights_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 384.35163 - tps: 404.06511 + dps: 385.38135 + tps: 405.15734 } } dps_results: { @@ -260,8 +260,8 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 150.84753 - tps: 164.91624 + dps: 151.11363 + tps: 165.17602 } } dps_results: { @@ -288,8 +288,8 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 107.59894 - tps: 118.58967 + dps: 107.85767 + tps: 118.8484 } } dps_results: { diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index b6d978ad53..96ab1450a1 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -210,7 +210,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.46717 + weights: 9.47167 weights: 9.9404 weights: 0 weights: 0 @@ -375,9 +375,9 @@ dps_results: { dps_results: { key: "TestAffliction-Phase3-Lvl50-Average-Default" value: { - dps: 1545.49109 - tps: 1345.08993 - hps: 370.77621 + dps: 1545.49385 + tps: 1345.08415 + hps: 370.7762 } } dps_results: { @@ -440,7 +440,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { dps: 844.45204 - tps: 649.20746 + tps: 649.21021 hps: 261.53768 } } @@ -472,7 +472,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-IronweaveBattlesuit" value: { dps: 630.33445 - tps: 447.29209 + tps: 447.19009 hps: 271.7413 } } @@ -488,7 +488,7 @@ dps_results: { key: "TestAffliction-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { dps: 844.45204 - tps: 649.20746 + tps: 649.21021 hps: 261.53768 } } @@ -511,9 +511,9 @@ dps_results: { dps_results: { key: "TestAffliction-Phase4-Lvl60-Average-Default" value: { - dps: 3155.6598 - tps: 2980.12292 - hps: 642.4584 + dps: 3155.574 + tps: 2980.03239 + hps: 642.45794 } } dps_results: { diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 6de6ea9668..b3109c26b3 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -298,9 +298,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.93689 + weights: 0.94623 weights: 0 - weights: 0.86919 + weights: 0.8882 weights: 0 weights: 0 weights: 0 @@ -308,8 +308,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 15.65564 - weights: 10.5351 + weights: 15.67358 + weights: 10.53703 weights: 0 weights: 0 weights: 0 @@ -519,28 +519,28 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-AllItems-DeathmistRaiment" value: { - dps: 375.51589 + dps: 376.25364 tps: 251.02524 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Average-Default" value: { - dps: 1732.14941 - tps: 1557.73063 + dps: 1732.23507 + tps: 1557.74495 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2676.28331 + dps: 2700.25477 tps: 3157.35605 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 1719.63158 + dps: 1720.82373 tps: 1547.75735 } } @@ -554,14 +554,14 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1687.61673 + dps: 1699.44442 tps: 2278.81668 } } dps_results: { key: "TestDestruction-Phase3-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 974.26854 + dps: 974.97694 tps: 879.14741 } } @@ -575,7 +575,7 @@ dps_results: { dps_results: { key: "TestDestruction-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1726.21337 + dps: 1727.40552 tps: 1554.34605 } } diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results index 37390af577..93edb87c0e 100644 --- a/sim/warrior/tank_warrior/TestTankWarrior.results +++ b/sim/warrior/tank_warrior/TestTankWarrior.results @@ -141,8 +141,8 @@ dps_results: { dps_results: { key: "TestTankWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 1553.10772 - tps: 3998.77971 + dps: 1553.10976 + tps: 3998.79566 } } dps_results: { From 39375dc35842798bf469f64002c467df81f45e2d Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Sat, 16 Nov 2024 19:37:38 -0500 Subject: [PATCH 5/6] seal stacking rotation APL naming fix --- ui/retribution_paladin/presets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts index 3c72a3bdfa..8059d55756 100644 --- a/ui/retribution_paladin/presets.ts +++ b/ui/retribution_paladin/presets.ts @@ -147,7 +147,7 @@ export const APLPP5Twisting4DRSlower = PresetUtils.makePresetAPLRotation('P5 Twi export const APLPP5Twisting4DRCancelAura = PresetUtils.makePresetAPLRotation('P5 Twist 4DR CancelAura', APLPP5TwistingCancelAuraJson, { customCondition: player => player.getLevel() === 60, }); -export const APLPP5Stacking6CF2DR = PresetUtils.makePresetAPLRotation('P5 Twist 4DR CancelAura', APLPP5StackingJson, { +export const APLPP5Stacking6CF2DR = PresetUtils.makePresetAPLRotation('P5 Stacking 6C2D', APLPP5StackingJson, { customCondition: player => player.getLevel() === 60, }); export const APLPP5Exodin = PresetUtils.makePresetAPLRotation('P5 Exodin', APLPP5ExodinJson, { From 2bdfafac85ed83f3675f1984abbf95c82598d10c Mon Sep 17 00:00:00 2001 From: Adam Chodaba Date: Mon, 18 Nov 2024 00:56:37 -0500 Subject: [PATCH 6/6] update test results --- sim/druid/balance/TestBalance.results | 22 +-- sim/shaman/elemental/TestElemental.results | 10 +- .../enhancement/TestEnhancement.results | 176 +++++++++--------- sim/shaman/warden/TestWardenShaman.results | 4 +- .../dps_warrior/TestDualWieldWarrior.results | 24 +-- .../dps_warrior/TestTwoHandedWarrior.results | 48 ++--- 6 files changed, 142 insertions(+), 142 deletions(-) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 36088b4694..9c748d0ee2 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -445,9 +445,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.118 + weights: -0.69498 weights: 0 - weights: 2.80217 + weights: 2.80131 weights: 0 weights: 0 weights: 0 @@ -456,7 +456,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 31.49433 + weights: 30.96322 weights: 0 weights: 0 weights: 0 @@ -1086,8 +1086,8 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Average-Default" value: { - dps: 4454.73498 - tps: 4315.27639 + dps: 4454.98784 + tps: 4315.50939 } } dps_results: { @@ -1100,8 +1100,8 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 4391.54573 - tps: 4241.06272 + dps: 4396.67746 + tps: 4246.71754 } } dps_results: { @@ -1114,8 +1114,8 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 2889.29892 - tps: 3001.7044 + dps: 2889.31332 + tps: 3001.7188 } } dps_results: { @@ -1177,7 +1177,7 @@ dps_results: { dps_results: { key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4420.00111 - tps: 4269.38407 + dps: 4419.94272 + tps: 4269.32568 } } diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index bcb38d79f7..912d61da43 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -406,8 +406,8 @@ stat_weights_results: { weights: 1.18603 weights: 0 weights: 0 - weights: 31.57386 - weights: 15.25015 + weights: 31.55178 + weights: 15.27013 weights: 0 weights: 0 weights: 0 @@ -688,7 +688,7 @@ dps_results: { key: "TestElemental-Phase3-Lvl50-Average-Default" value: { dps: 1515.19687 - tps: 1312.17404 + tps: 1312.17368 } } dps_results: { @@ -848,8 +848,8 @@ dps_results: { dps_results: { key: "TestElemental-Phase4-Lvl60-Average-Default" value: { - dps: 3226.7133 - tps: 1969.6127 + dps: 3226.74128 + tps: 1969.63195 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index fdd4b5296f..6463228753 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.07575 - weights: 0.29932 + weights: 2.07669 + weights: 0.28096 weights: 0 weights: 0 weights: 0 - weights: 0.76014 + weights: 0.76041 weights: 0 weights: 0 weights: 0 @@ -410,9 +410,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.94352 - weights: 27.63614 - weights: 10.82772 + weights: 0.94395 + weights: 28.41717 + weights: 11.22554 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.52561 - weights: 0.85121 + weights: 2.52454 + weights: 0.87168 weights: 0 weights: 0 weights: 0 - weights: 0.83941 + weights: 0.83957 weights: 0 weights: 0 weights: 0 @@ -459,9 +459,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.99826 - weights: 28.50156 - weights: 11.51941 + weights: 0.99784 + weights: 28.73309 + weights: 11.0492 weights: 0 weights: 0 weights: 0 @@ -1037,71 +1037,71 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1890.11572 - tps: 1915.59883 + dps: 1890.55846 + tps: 1914.763 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 1958.803 - tps: 1983.02382 + dps: 1959.3284 + tps: 1982.25735 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 1997.61858 - tps: 2021.96251 + dps: 1997.88231 + tps: 2019.95057 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 1936.03924 - tps: 1961.59653 + dps: 1936.40007 + tps: 1960.50156 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1889.8685 - tps: 1915.43079 + dps: 1890.20098 + tps: 1914.36678 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 1936.7672 - tps: 1961.41246 + dps: 1937.16308 + tps: 1960.41735 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 2875.98591 - tps: 2936.14396 + dps: 2863.17716 + tps: 2923.57056 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 2821.76249 - tps: 2884.44118 + dps: 2808.52263 + tps: 2871.38923 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1561.44665 - tps: 1594.91426 + dps: 1560.698 + tps: 1593.80972 } } dps_results: { key: "TestEnhancement-Phase4-Lvl60-Average-Default" value: { - dps: 3816.29904 - tps: 2722.92593 + dps: 3816.61828 + tps: 2723.1042 } } dps_results: { @@ -1212,8 +1212,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1194.99131 - tps: 1289.80587 + dps: 1195.02842 + tps: 1289.81758 } } dps_results: { @@ -1254,8 +1254,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1194.99131 - tps: 1289.80587 + dps: 1195.02842 + tps: 1289.81758 } } dps_results: { @@ -1303,8 +1303,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 443.36583 - tps: 328.25775 + dps: 442.97552 + tps: 327.84734 } } dps_results: { @@ -1345,8 +1345,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 443.36583 - tps: 328.25775 + dps: 442.97552 + tps: 327.84734 } } dps_results: { @@ -1359,8 +1359,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2986.09659 - tps: 2621.00745 + dps: 2986.176 + tps: 2621.0668 } } dps_results: { @@ -1380,8 +1380,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1196.95892 - tps: 1291.65783 + dps: 1197.0336 + tps: 1291.71645 } } dps_results: { @@ -1401,8 +1401,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 2986.09659 - tps: 2621.00745 + dps: 2986.176 + tps: 2621.0668 } } dps_results: { @@ -1422,8 +1422,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { - dps: 1196.95892 - tps: 1291.65783 + dps: 1197.0336 + tps: 1291.71645 } } dps_results: { @@ -1443,78 +1443,78 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3088.85892 - tps: 2200.90233 + dps: 3093.40276 + tps: 2205.45974 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail" value: { - dps: 1984.02073 - tps: 1998.54728 + dps: 1985.04906 + tps: 2000.16167 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sMail" value: { - dps: 2060.36032 - tps: 2073.58035 + dps: 2061.42203 + tps: 2075.09477 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail" value: { - dps: 2112.80168 - tps: 2126.75955 + dps: 2112.51865 + tps: 2126.64062 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldChainmail" value: { - dps: 2033.01603 - tps: 2047.19716 + dps: 2034.12478 + tps: 2048.77283 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldLadenChain" value: { - dps: 1983.79875 - tps: 1998.50555 + dps: 1984.84047 + tps: 1999.99374 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldScalemail" value: { - dps: 2030.20697 - tps: 2043.98991 + dps: 2031.26083 + tps: 2045.48981 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 3264.28159 - tps: 3311.39095 + dps: 3267.57326 + tps: 3311.67731 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 3202.89885 - tps: 3252.58376 + dps: 3205.21623 + tps: 3251.56655 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-AllItems-TheFiveThunders" value: { - dps: 1636.3723 - tps: 1664.84825 + dps: 1637.34319 + tps: 1665.806 } } dps_results: { key: "TestEnhancement-Phase5-Lvl60-Average-Default" value: { - dps: 4440.79784 - tps: 3163.0989 + dps: 4441.44227 + tps: 3163.36994 } } dps_results: { @@ -1612,7 +1612,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1647.03468 - tps: 1176.36828 + tps: 1176.36924 } } dps_results: { @@ -1632,8 +1632,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 667.54633 - tps: 488.33943 + dps: 667.93815 + tps: 488.9405 } } dps_results: { @@ -1654,7 +1654,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { dps: 1647.03468 - tps: 1176.36828 + tps: 1176.36924 } } dps_results: { @@ -1674,8 +1674,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 667.54633 - tps: 488.33943 + dps: 667.93815 + tps: 488.9405 } } dps_results: { @@ -1716,8 +1716,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 562.5613 - tps: 411.98078 + dps: 562.60061 + tps: 411.98068 } } dps_results: { @@ -1758,8 +1758,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 562.5613 - tps: 411.98078 + dps: 562.60061 + tps: 411.98068 } } dps_results: { @@ -1773,7 +1773,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 3522.45108 - tps: 3012.48252 + tps: 3012.46327 } } dps_results: { @@ -1800,8 +1800,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 662.03036 - tps: 483.71244 + dps: 662.34191 + tps: 484.07134 } } dps_results: { @@ -1815,7 +1815,7 @@ dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" value: { dps: 3522.45108 - tps: 3012.48252 + tps: 3012.46327 } } dps_results: { @@ -1842,8 +1842,8 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" value: { - dps: 662.03036 - tps: 483.71244 + dps: 662.34191 + tps: 484.07134 } } dps_results: { @@ -1856,7 +1856,7 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3660.16352 - tps: 2606.25611 + dps: 3651.72634 + tps: 2600.16575 } } diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index 2a0f3c3b9d..3eb9bcb2c3 100644 --- a/sim/shaman/warden/TestWardenShaman.results +++ b/sim/shaman/warden/TestWardenShaman.results @@ -155,8 +155,8 @@ dps_results: { dps_results: { key: "TestWardenShaman-Phase4-Lvl60-Average-Default" value: { - dps: 1999.64519 - tps: 1598.81874 + dps: 1999.65356 + tps: 1598.82252 } } dps_results: { diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index 90a1a18f1a..9e71c10ed8 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -603,8 +603,8 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 641.83441 - tps: 545.42132 + dps: 640.68327 + tps: 544.49015 } } dps_results: { @@ -624,8 +624,8 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 278.22091 - tps: 268.23013 + dps: 278.197 + tps: 268.28683 } } dps_results: { @@ -645,8 +645,8 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 573.29663 - tps: 486.86079 + dps: 572.25639 + tps: 486.02656 } } dps_results: { @@ -666,8 +666,8 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 229.4978 - tps: 227.95264 + dps: 229.44282 + tps: 227.9823 } } dps_results: { @@ -688,7 +688,7 @@ dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 645.86396 - tps: 539.2074 + tps: 539.28656 } } dps_results: { @@ -709,7 +709,7 @@ dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 286.91064 - tps: 271.0869 + tps: 271.16606 } } dps_results: { @@ -730,7 +730,7 @@ dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 574.89031 - tps: 481.79286 + tps: 481.87202 } } dps_results: { @@ -751,7 +751,7 @@ dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 233.37833 - tps: 229.59805 + tps: 229.67722 } } dps_results: { diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results index 3f31bf6997..fc2c6ddf0f 100644 --- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results +++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results @@ -99,8 +99,8 @@ character_stats_results: { stat_weights_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.28691 - weights: 1.28641 + weights: 1.32465 + weights: 0.90376 weights: 0 weights: 0 weights: 0 @@ -116,9 +116,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.51015 - weights: 15.79775 - weights: 10.34512 + weights: 0.40562 + weights: 16.88988 + weights: 10.41244 weights: 0 weights: 0 weights: 0 @@ -204,8 +204,8 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-Average-Default" value: { - dps: 1168.22549 - tps: 997.99464 + dps: 1166.78565 + tps: 977.95888 } } dps_results: { @@ -295,8 +295,8 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1085.53521 - tps: 915.65592 + dps: 1089.07078 + tps: 912.70241 } } dps_results: { @@ -366,7 +366,7 @@ dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 1231.77757 - tps: 819.07022 + tps: 819.14817 } } dps_results: { @@ -387,7 +387,7 @@ dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 568.7573 - tps: 382.92863 + tps: 382.96839 } } dps_results: { @@ -408,7 +408,7 @@ dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 1026.93636 - tps: 729.4682 + tps: 729.47237 } } dps_results: { @@ -428,50 +428,50 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 451.13908 - tps: 322.64098 + dps: 450.23815 + tps: 321.93959 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget" value: { dps: 972.12628 - tps: 735.03946 + tps: 734.92706 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget" value: { dps: 954.86073 - tps: 628.23721 + tps: 628.12481 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 1312.86215 - tps: 876.58731 + tps: 875.88664 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget" value: { dps: 455.39175 - tps: 397.98404 + tps: 397.93741 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget" value: { dps: 444.71925 - tps: 296.05868 + tps: 296.01205 } } dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { dps: 610.73073 - tps: 411.9581 + tps: 411.71949 } } dps_results: { @@ -491,8 +491,8 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1092.92055 - tps: 779.73508 + dps: 1094.80391 + tps: 781.06177 } } dps_results: { @@ -512,8 +512,8 @@ dps_results: { dps_results: { key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 475.17394 - tps: 342.8837 + dps: 475.90301 + tps: 343.40655 } } dps_results: {