From 9310bb988234b136d8fb90429ede917e81396a49 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Mon, 15 Jul 2024 13:35:00 -0700 Subject: [PATCH 1/7] Added API for querying the elapsed time since an Aura was last active. On branch rotation_timing Changes to be committed: modified: sim/core/aura.go --- sim/core/aura.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sim/core/aura.go b/sim/core/aura.go index 63e680f57a..eacd38a569 100644 --- a/sim/core/aura.go +++ b/sim/core/aura.go @@ -54,6 +54,7 @@ type Aura struct { startTime time.Duration // Time at which the aura was applied. expires time.Duration // Time at which aura will be removed. + fadeTime time.Duration // Time at which the aura was actually removed. // The unit this aura is attached to. Unit *Unit @@ -128,6 +129,7 @@ func (aura *Aura) reset(sim *Simulation) { panic("Aura nonzero stacks during reset: " + aura.Label) } aura.metrics.reset() + aura.fadeTime = -NeverExpires if aura.OnReset != nil { aura.OnReset(aura, sim) @@ -224,6 +226,17 @@ func (aura *Aura) TimeActive(sim *Simulation) time.Duration { } } +// The amount of elapsed time since this aura was last active. +func (aura *Aura) TimeInactive(sim *Simulation) time.Duration { + if aura.IsActive() { + return 0 + } else if aura == nil { + return NeverExpires + } else { + return sim.CurrentTime - aura.fadeTime + } +} + func (aura *Aura) RemainingDuration(sim *Simulation) time.Duration { if aura.expires == NeverExpires { return NeverExpires @@ -659,6 +672,7 @@ func (aura *Aura) Deactivate(sim *Simulation) { } aura.expires = 0 + aura.fadeTime = sim.CurrentTime if aura.activeIndex != Inactive { removeActiveIndex := aura.activeIndex aura.Unit.activeAuras = removeBySwappingToBack(aura.Unit.activeAuras, removeActiveIndex) From ff405182fa2456bfad88f90fb18847e7c84b2df8 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Mon, 15 Jul 2024 19:30:15 -0700 Subject: [PATCH 2/7] Implemented AuraInactiveWithReactionTime APL value, which can be used to introduce realism into certain sims by blocking the re-application of non-clippable DoTs on the exact timestep when they expire. On branch rotation_timing Changes to be committed: modified: proto/apl.proto modified: sim/core/apl_value.go modified: sim/core/apl_values_aura.go modified: sim/core/aura.go modified: ui/core/components/individual_sim_ui/apl_values.ts --- proto/apl.proto | 7 ++++- sim/core/apl_value.go | 2 ++ sim/core/apl_values_aura.go | 30 +++++++++++++++++++ sim/core/aura.go | 2 +- .../individual_sim_ui/apl_values.ts | 9 ++++++ 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/proto/apl.proto b/proto/apl.proto index e83fc21752..32a93d9bfe 100644 --- a/proto/apl.proto +++ b/proto/apl.proto @@ -81,7 +81,7 @@ message APLAction { } } -// NextIndex: 75 +// NextIndex: 77 message APLValue { oneof value { // Operators @@ -155,6 +155,7 @@ message APLValue { APLValueAuraIsKnown aura_is_known = 73; APLValueAuraIsActive aura_is_active = 22; APLValueAuraIsActiveWithReactionTime aura_is_active_with_reaction_time = 50; + APLValueAuraIsInactiveWithReactionTime aura_is_inactive_with_reaction_time = 76; APLValueAuraRemainingTime aura_remaining_time = 23; APLValueAuraNumStacks aura_num_stacks = 24; APLValueAuraInternalCooldown aura_internal_cooldown = 39; @@ -522,6 +523,10 @@ message APLValueAuraIsActiveWithReactionTime { UnitReference source_unit = 2; ActionID aura_id = 1; } +message APLValueAuraIsInactiveWithReactionTime { + UnitReference source_unit = 2; + ActionID aura_id = 1; +} message APLValueAuraRemainingTime { UnitReference source_unit = 2; ActionID aura_id = 1; diff --git a/sim/core/apl_value.go b/sim/core/apl_value.go index 50b1c579e4..d6af895f5e 100644 --- a/sim/core/apl_value.go +++ b/sim/core/apl_value.go @@ -179,6 +179,8 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue { return rot.newValueAuraIsActive(config.GetAuraIsActive()) case *proto.APLValue_AuraIsActiveWithReactionTime: return rot.newValueAuraIsActiveWithReactionTime(config.GetAuraIsActiveWithReactionTime()) + case *proto.APLValue_AuraIsInactiveWithReactionTime: + return rot.newValueAuraIsInactiveWithReactionTime(config.GetAuraIsInactiveWithReactionTime()) case *proto.APLValue_AuraRemainingTime: return rot.newValueAuraRemainingTime(config.GetAuraRemainingTime()) case *proto.APLValue_AuraNumStacks: diff --git a/sim/core/apl_values_aura.go b/sim/core/apl_values_aura.go index 544a2a709c..1e4d2a7d42 100644 --- a/sim/core/apl_values_aura.go +++ b/sim/core/apl_values_aura.go @@ -85,6 +85,36 @@ func (value *APLValueAuraIsActiveWithReactionTime) String() string { return fmt.Sprintf("Aura Active With Reaction Time(%s)", value.aura.String()) } +type APLValueAuraIsInactiveWithReactionTime struct { + DefaultAPLValueImpl + aura AuraReference + reactionTime time.Duration +} + +func (rot *APLRotation) newValueAuraIsInactiveWithReactionTime(config *proto.APLValueAuraIsInactiveWithReactionTime) APLValue { + if config.AuraId == nil { + return nil + } + aura := rot.GetAPLAura(rot.GetSourceUnit(config.SourceUnit), config.AuraId) + if aura.Get() == nil { + return nil + } + return &APLValueAuraIsInactiveWithReactionTime{ + aura: aura, + reactionTime: rot.unit.ReactionTime, + } +} +func (value *APLValueAuraIsInactiveWithReactionTime) Type() proto.APLValueType { + return proto.APLValueType_ValueTypeBool +} +func (value *APLValueAuraIsInactiveWithReactionTime) GetBool(sim *Simulation) bool { + aura := value.aura.Get() + return !aura.IsActive() && aura.TimeInactive(sim) >= value.reactionTime +} +func (value *APLValueAuraIsInactiveWithReactionTime) String() string { + return fmt.Sprintf("Aura Inactive With Reaction Time(%s)", value.aura.String()) +} + type APLValueAuraRemainingTime struct { DefaultAPLValueImpl aura AuraReference diff --git a/sim/core/aura.go b/sim/core/aura.go index eacd38a569..a570ddcaa8 100644 --- a/sim/core/aura.go +++ b/sim/core/aura.go @@ -230,7 +230,7 @@ func (aura *Aura) TimeActive(sim *Simulation) time.Duration { func (aura *Aura) TimeInactive(sim *Simulation) time.Duration { if aura.IsActive() { return 0 - } else if aura == nil { + } else if (aura == nil) || (aura.fadeTime < 0) { return NeverExpires } else { return sim.CurrentTime - aura.fadeTime diff --git a/ui/core/components/individual_sim_ui/apl_values.ts b/ui/core/components/individual_sim_ui/apl_values.ts index df080763ca..b13983eb04 100644 --- a/ui/core/components/individual_sim_ui/apl_values.ts +++ b/ui/core/components/individual_sim_ui/apl_values.ts @@ -6,6 +6,7 @@ import { APLValueAuraInternalCooldown, APLValueAuraIsActive, APLValueAuraIsActiveWithReactionTime, + APLValueAuraIsInactiveWithReactionTime, APLValueAuraIsKnown, APLValueAuraNumStacks, APLValueAuraRemainingTime, @@ -888,6 +889,14 @@ const valueKindFactories: { [f in NonNullable]: ValueKindConfigTrue if the aura is not currently active AND it has been inactive for at least as long as the player reaction time (configured in Settings), otherwise False.', + newValue: APLValueAuraIsInactiveWithReactionTime.create, + fields: [AplHelpers.unitFieldConfig('sourceUnit', 'aura_sources'), AplHelpers.actionIdFieldConfig('auraId', 'auras', 'sourceUnit')], + }), auraRemainingTime: inputBuilder({ label: 'Aura Remaining Time', submenu: ['Aura'], From 6485843c3418a9c02ac8025f610a6ac270adc1df Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Mon, 15 Jul 2024 20:29:51 -0700 Subject: [PATCH 3/7] Fixed AplActionWait to use the proper API for rescheduling the rotation action. On branch rotation_timing Changes to be committed: modified: sim/core/apl_actions_timing.go modified: sim/hunter/survival/TestSV.results --- sim/core/apl_actions_timing.go | 8 +- sim/hunter/survival/TestSV.results | 842 ++++++++++++++--------------- 2 files changed, 422 insertions(+), 428 deletions(-) diff --git a/sim/core/apl_actions_timing.go b/sim/core/apl_actions_timing.go index eda82845d1..36cddee164 100644 --- a/sim/core/apl_actions_timing.go +++ b/sim/core/apl_actions_timing.go @@ -38,13 +38,7 @@ func (action *APLActionWait) IsReady(sim *Simulation) bool { func (action *APLActionWait) Execute(sim *Simulation) { action.unit.Rotation.pushControllingAction(action) action.curWaitTime = sim.CurrentTime + action.duration.GetDuration(sim) - - pa := &PendingAction{ - Priority: ActionPriorityLow, - OnAction: action.unit.rotationAction.OnAction, - NextActionAt: action.curWaitTime, - } - sim.AddPendingAction(pa) + action.unit.WaitUntil(sim, action.curWaitTime) } func (action *APLActionWait) GetNextAction(sim *Simulation) *APLAction { diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results index 995a83c28f..5913f2e545 100644 --- a/sim/hunter/survival/TestSV.results +++ b/sim/hunter/survival/TestSV.results @@ -37,1297 +37,1297 @@ character_stats_results: { dps_results: { key: "TestSV-AllItems-AgileShadowspiritDiamond" value: { - dps: 26098.46465 - tps: 23577.08712 + dps: 26125.05009 + tps: 23598.27348 } } dps_results: { key: "TestSV-AllItems-AgonyandTorment" value: { - dps: 25102.15701 - tps: 22661.00877 + dps: 25228.0762 + tps: 22789.25009 } } dps_results: { key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 22020.36687 - tps: 19884.25324 + dps: 21918.67031 + tps: 19806.65347 } } dps_results: { key: "TestSV-AllItems-Althor'sAbacus-50366" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Anhuur'sHymnal-55889" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-Anhuur'sHymnal-56407" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-AustereShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-BaubleofTrueBlood-50726" value: { - dps: 24446.53896 - tps: 22091.90612 - hps: 96.44839 + dps: 24517.50815 + tps: 22153.47992 + hps: 96.26802 } } dps_results: { key: "TestSV-AllItems-BedrockTalisman-58182" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BellofEnragingResonance-59326" value: { - dps: 24767.13006 - tps: 22377.84787 + dps: 24861.41547 + tps: 22467.1567 } } dps_results: { key: "TestSV-AllItems-BellofEnragingResonance-65053" value: { - dps: 24818.72445 - tps: 22426.70657 + dps: 24909.24662 + tps: 22512.89668 } } dps_results: { key: "TestSV-AllItems-BindingPromise-67037" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BlackBruise-50692" value: { - dps: 24211.17431 - tps: 21864.31957 + dps: 24291.63858 + tps: 21930.87769 } } dps_results: { key: "TestSV-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 25257.04455 - tps: 22843.91065 + dps: 25344.77021 + tps: 22921.38753 } } dps_results: { key: "TestSV-AllItems-BloodofIsiset-55995" value: { - dps: 24669.30584 - tps: 22314.59641 + dps: 24740.65205 + tps: 22376.41169 } } dps_results: { key: "TestSV-AllItems-BloodofIsiset-56414" value: { - dps: 24698.42674 - tps: 22343.66913 + dps: 24769.85056 + tps: 22405.56201 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 25542.59778 - tps: 23085.92455 + dps: 25612.88847 + tps: 23146.34255 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 24744.41486 - tps: 22355.79747 + dps: 24836.58829 + tps: 22443.02626 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 25574.91027 - tps: 23099.64422 + dps: 25650.64224 + tps: 23167.92997 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-BottledLightning-66879" value: { - dps: 24561.25912 - tps: 22200.13226 + dps: 24624.90747 + tps: 22253.84294 } } dps_results: { key: "TestSV-AllItems-BracingShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 22553.93541 + dps: 25542.94277 + tps: 22576.22941 } } dps_results: { key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 26099.8667 - tps: 23578.69687 + dps: 26126.35291 + tps: 23599.61027 } } dps_results: { key: "TestSV-AllItems-BurningShadowspiritDiamond" value: { - dps: 25912.73212 - tps: 23409.3164 + dps: 25937.79849 + tps: 23430.73857 } } dps_results: { key: "TestSV-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 25964.08857 - tps: 23455.9796 + dps: 26003.58941 + tps: 23489.31924 } } dps_results: { key: "TestSV-AllItems-CoreofRipeness-58184" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-CorpseTongueCoin-50349" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-CrushingWeight-59506" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-CrushingWeight-65118" value: { - dps: 24407.03498 - tps: 22047.36296 + dps: 24508.83691 + tps: 22141.29591 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 24745.54288 - tps: 22395.86678 + dps: 24863.8663 + tps: 22492.98688 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 25800.66493 - tps: 23344.59447 + dps: 25902.15289 + tps: 23422.99566 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 24735.47608 - tps: 22380.454 + dps: 24807.361 + tps: 22442.92517 } } dps_results: { key: "TestSV-AllItems-Deathbringer'sWill-50363" value: { - dps: 25071.00837 - tps: 22643.70267 + dps: 25154.78441 + tps: 22722.71019 } } dps_results: { key: "TestSV-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 25565.00611 - tps: 23057.98307 + dps: 25605.29964 + tps: 23092.1154 } } dps_results: { key: "TestSV-AllItems-DislodgedForeignObject-50348" value: { - dps: 24532.58674 - tps: 22184.92995 + dps: 24594.49805 + tps: 22235.62191 } } dps_results: { key: "TestSV-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-EmberShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 25565.00611 - tps: 23057.98307 + dps: 25605.29964 + tps: 23092.1154 } } dps_results: { key: "TestSV-AllItems-EssenceoftheCyclone-59473" value: { - dps: 25951.23893 - tps: 23453.02583 + dps: 26011.48768 + tps: 23502.65402 } } dps_results: { key: "TestSV-AllItems-EssenceoftheCyclone-65140" value: { - dps: 26088.94535 - tps: 23573.0286 + dps: 26178.13821 + tps: 23652.95544 } } dps_results: { key: "TestSV-AllItems-EternalShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-FallofMortality-59500" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-FallofMortality-65124" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Figurine-DemonPanther-52199" value: { - dps: 25651.81078 - tps: 23191.61711 + dps: 25695.08243 + tps: 23230.30471 } } dps_results: { key: "TestSV-AllItems-Figurine-DreamOwl-52354" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Figurine-KingofBoars-52351" value: { - dps: 24698.42674 - tps: 22343.66913 + dps: 24769.85056 + tps: 22405.56201 } } dps_results: { key: "TestSV-AllItems-Flamewaker'sBattlegear" value: { - dps: 27649.02811 - tps: 24886.14551 + dps: 27723.69218 + tps: 24956.05209 } } dps_results: { key: "TestSV-AllItems-FleetShadowspiritDiamond" value: { - dps: 25566.14716 - tps: 23063.72893 + dps: 25592.73191 + tps: 23086.66948 } } dps_results: { key: "TestSV-AllItems-FluidDeath-58181" value: { - dps: 25945.67714 - tps: 23440.56323 + dps: 25998.92852 + tps: 23486.50901 } } dps_results: { key: "TestSV-AllItems-ForlornShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-FuryofAngerforge-59461" value: { - dps: 24767.13006 - tps: 22377.84787 + dps: 24861.41547 + tps: 22467.1567 } } dps_results: { key: "TestSV-AllItems-GaleofShadows-56138" value: { - dps: 24531.88988 - tps: 22146.53406 + dps: 24607.33187 + tps: 22235.77192 } } dps_results: { key: "TestSV-AllItems-GaleofShadows-56462" value: { - dps: 24571.33996 - tps: 22177.18703 + dps: 24608.75567 + tps: 22225.64721 } } dps_results: { key: "TestSV-AllItems-GearDetector-61462" value: { - dps: 25149.675 - tps: 22700.26316 + dps: 25188.6299 + tps: 22742.72831 } } dps_results: { key: "TestSV-AllItems-Gladiator'sPursuit" value: { - dps: 23021.06053 - tps: 20774.66662 + dps: 22990.29894 + tps: 20744.38826 } } dps_results: { key: "TestSV-AllItems-GlowingTwilightScale-54589" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-GraceoftheHerald-55266" value: { - dps: 25208.79519 - tps: 22769.91379 + dps: 25306.95062 + tps: 22862.42411 } } dps_results: { key: "TestSV-AllItems-GraceoftheHerald-56295" value: { - dps: 25601.71132 - tps: 23124.85969 + dps: 25686.76937 + tps: 23203.20759 } } dps_results: { key: "TestSV-AllItems-HarmlightToken-63839" value: { - dps: 24454.32425 - tps: 22100.02912 + dps: 24525.11707 + tps: 22161.3353 } } dps_results: { key: "TestSV-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 24460.28043 - tps: 22105.93898 + dps: 24531.04931 + tps: 22167.17692 } } dps_results: { key: "TestSV-AllItems-HeartofIgnacious-59514" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartofIgnacious-65110" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartofRage-59224" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartofRage-65072" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartofSolace-55868" value: { - dps: 24531.88988 - tps: 22146.53406 + dps: 24607.33187 + tps: 22235.77192 } } dps_results: { key: "TestSV-AllItems-HeartofSolace-56393" value: { - dps: 24571.33996 - tps: 22177.18703 + dps: 24608.75567 + tps: 22225.64721 } } dps_results: { key: "TestSV-AllItems-HeartofThunder-55845" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartofThunder-56370" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-HeartoftheVile-66969" value: { - dps: 25344.18333 - tps: 22891.17152 + dps: 25418.45783 + tps: 22960.8089 } } dps_results: { key: "TestSV-AllItems-Heartpierce-50641" value: { - dps: 26251.88073 - tps: 23713.32546 + dps: 26290.29932 + tps: 23746.59782 } } dps_results: { key: "TestSV-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 25565.00611 - tps: 23057.98307 + dps: 25605.29964 + tps: 23092.1154 } } dps_results: { key: "TestSV-AllItems-ImpatienceofYouth-62464" value: { - dps: 24730.19501 - tps: 22375.38483 + dps: 24801.70348 + tps: 22437.36236 } } dps_results: { key: "TestSV-AllItems-ImpatienceofYouth-62469" value: { - dps: 24730.19501 - tps: 22375.38483 + dps: 24801.70348 + tps: 22437.36236 } } dps_results: { key: "TestSV-AllItems-ImpetuousQuery-55881" value: { - dps: 24669.30584 - tps: 22314.59641 + dps: 24740.65205 + tps: 22376.41169 } } dps_results: { key: "TestSV-AllItems-ImpetuousQuery-56406" value: { - dps: 24698.42674 - tps: 22343.66913 + dps: 24769.85056 + tps: 22405.56201 } } dps_results: { key: "TestSV-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 24641.67997 - tps: 22288.95098 + dps: 24702.51451 + tps: 22339.46899 } } dps_results: { key: "TestSV-AllItems-JarofAncientRemedies-59354" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-JarofAncientRemedies-65029" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-JujuofNimbleness-63840" value: { - dps: 25257.04455 - tps: 22843.91065 + dps: 25344.77021 + tps: 22921.38753 } } dps_results: { key: "TestSV-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 25650.79446 - tps: 23172.47057 + dps: 25682.11649 + tps: 23200.53136 } } dps_results: { key: "TestSV-AllItems-KvaldirBattleStandard-59685" value: { - dps: 24542.42263 - tps: 22190.27115 + dps: 24556.62013 + tps: 22186.14078 } } dps_results: { key: "TestSV-AllItems-KvaldirBattleStandard-59689" value: { - dps: 24542.42263 - tps: 22190.27115 + dps: 24556.62013 + tps: 22186.14078 } } dps_results: { key: "TestSV-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 24530.31432 - tps: 22159.96173 + dps: 24491.12329 + tps: 22135.15424 } } dps_results: { key: "TestSV-AllItems-LastWord-50708" value: { - dps: 26098.46465 - tps: 23577.08712 + dps: 26125.05009 + tps: 23598.27348 } } dps_results: { key: "TestSV-AllItems-LeadenDespair-55816" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-LeadenDespair-56347" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-LeftEyeofRajh-56102" value: { - dps: 25434.59523 - tps: 22978.69115 + dps: 25520.61911 + tps: 23056.16962 } } dps_results: { key: "TestSV-AllItems-LeftEyeofRajh-56427" value: { - dps: 25612.08404 - tps: 23145.10633 + dps: 25713.21585 + tps: 23235.8803 } } dps_results: { key: "TestSV-AllItems-LicensetoSlay-58180" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-Lightning-ChargedBattlegear" value: { - dps: 24859.05153 - tps: 22500.15294 + dps: 24885.32035 + tps: 22545.73649 } } dps_results: { key: "TestSV-AllItems-MagnetiteMirror-55814" value: { - dps: 24470.67269 - tps: 22118.22698 + dps: 24531.13115 + tps: 22168.36891 } } dps_results: { key: "TestSV-AllItems-MagnetiteMirror-56345" value: { - dps: 24470.67269 - tps: 22118.22698 + dps: 24531.13115 + tps: 22168.36891 } } dps_results: { key: "TestSV-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-MarkofKhardros-56132" value: { - dps: 24638.54245 - tps: 22286.09674 + dps: 24699.41508 + tps: 22336.65283 } } dps_results: { key: "TestSV-AllItems-MarkofKhardros-56458" value: { - dps: 24660.5254 - tps: 22308.07969 + dps: 24721.45226 + tps: 22358.69002 } } dps_results: { key: "TestSV-AllItems-MightoftheOcean-55251" value: { - dps: 24711.3622 - tps: 22337.25863 + dps: 24771.0269 + tps: 22393.23619 } } dps_results: { key: "TestSV-AllItems-MightoftheOcean-56285" value: { - dps: 24711.3622 - tps: 22337.25863 + dps: 24771.0269 + tps: 22393.23619 } } dps_results: { key: "TestSV-AllItems-MirrorofBrokenImages-62466" value: { - dps: 24730.19501 - tps: 22375.38483 + dps: 24801.70348 + tps: 22437.36236 } } dps_results: { key: "TestSV-AllItems-MirrorofBrokenImages-62471" value: { - dps: 24730.19501 - tps: 22375.38483 + dps: 24801.70348 + tps: 22437.36236 } } dps_results: { key: "TestSV-AllItems-MoonwellChalice-70142" value: { - dps: 24724.59453 - tps: 22370.25308 + dps: 24791.91674 + tps: 22428.04436 } } dps_results: { key: "TestSV-AllItems-Oremantle'sFavor-61448" value: { - dps: 24648.55863 - tps: 22278.55733 + dps: 24721.07418 + tps: 22342.21102 } } dps_results: { key: "TestSV-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 24624.16603 - tps: 22246.12057 + dps: 24702.08517 + tps: 22318.94189 } } dps_results: { key: "TestSV-AllItems-PorcelainCrab-55237" value: { - dps: 24451.56243 - tps: 22097.22099 + dps: 24522.32272 + tps: 22158.45034 } } dps_results: { key: "TestSV-AllItems-PorcelainCrab-56280" value: { - dps: 24453.73458 - tps: 22099.39313 + dps: 24524.48818 + tps: 22160.6158 } } dps_results: { key: "TestSV-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 25516.5496 - tps: 23014.21981 + dps: 25542.94277 + tps: 23036.96878 } } dps_results: { key: "TestSV-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 25871.47468 - tps: 23354.10757 + dps: 25852.5044 + tps: 23310.96892 } } dps_results: { key: "TestSV-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 25997.19039 - tps: 23448.41073 + dps: 25971.82532 + tps: 23441.53405 } } dps_results: { key: "TestSV-AllItems-Rainsong-55854" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Rainsong-56377" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 25912.73212 - tps: 23409.3164 + dps: 25937.79849 + tps: 23430.73857 } } dps_results: { key: "TestSV-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 25912.73212 - tps: 23409.3164 + dps: 25937.79849 + tps: 23430.73857 } } dps_results: { key: "TestSV-AllItems-RightEyeofRajh-56100" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-RightEyeofRajh-56431" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 25236.06039 - tps: 22795.36425 + dps: 25312.83769 + tps: 22867.65891 } } dps_results: { key: "TestSV-AllItems-SeaStar-55256" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-SeaStar-56290" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Shadowmourne-49623" value: { - dps: 26274.99461 - tps: 23701.73022 + dps: 26401.55275 + tps: 23826.38533 } } dps_results: { key: "TestSV-AllItems-ShardofWoe-60233" value: { - dps: 24492.27918 - tps: 22102.64065 + dps: 24649.29599 + tps: 22247.41911 } } dps_results: { key: "TestSV-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 24490.46193 - tps: 22136.76331 + dps: 24561.53497 + tps: 22205.81013 } } dps_results: { key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Skardyn'sGrace-56115" value: { - dps: 25498.1155 - tps: 23051.11027 + dps: 25575.16273 + tps: 23123.08997 } } dps_results: { key: "TestSV-AllItems-Skardyn'sGrace-56440" value: { - dps: 25633.32462 - tps: 23176.61476 + dps: 25713.10194 + tps: 23250.14255 } } dps_results: { key: "TestSV-AllItems-Sorrowsong-55879" value: { - dps: 24669.30584 - tps: 22314.59641 + dps: 24740.65205 + tps: 22376.41169 } } dps_results: { key: "TestSV-AllItems-Sorrowsong-56400" value: { - dps: 24698.42674 - tps: 22343.66913 + dps: 24769.85056 + tps: 22405.56201 } } dps_results: { key: "TestSV-AllItems-Soul'sAnguish-66994" value: { - dps: 24711.3622 - tps: 22337.25863 + dps: 24771.0269 + tps: 22393.23619 } } dps_results: { key: "TestSV-AllItems-SoulCasket-58183" value: { - dps: 24730.19501 - tps: 22375.38483 + dps: 24801.70348 + tps: 22437.36236 } } dps_results: { key: "TestSV-AllItems-Stonemother'sKiss-61411" value: { - dps: 24458.00659 - tps: 22100.69394 + dps: 24528.69145 + tps: 22161.8585 } } dps_results: { key: "TestSV-AllItems-StumpofTime-62465" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-StumpofTime-62470" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-SymbioticWorm-59332" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-SymbioticWorm-65048" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 24512.15773 - tps: 22157.68448 + dps: 24582.72897 + tps: 22218.72478 } } dps_results: { key: "TestSV-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 24487.22736 - tps: 22130.50369 + dps: 24549.34568 + tps: 22186.3102 } } dps_results: { key: "TestSV-AllItems-TearofBlood-55819" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-TearofBlood-56351" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 24636.65512 - tps: 22281.99972 + dps: 24707.91432 + tps: 22343.72799 } } dps_results: { key: "TestSV-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 24698.42674 - tps: 22343.66913 + dps: 24769.85056 + tps: 22405.56201 } } dps_results: { key: "TestSV-AllItems-Theralion'sMirror-59519" value: { - dps: 24455.37028 - tps: 22101.02883 + dps: 24526.14659 + tps: 22162.27421 } } dps_results: { key: "TestSV-AllItems-Theralion'sMirror-65105" value: { - dps: 24488.38076 - tps: 22133.46493 + dps: 24558.20247 + tps: 22193.75571 } } dps_results: { key: "TestSV-AllItems-Throngus'sFinger-56121" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Throngus'sFinger-56449" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-Tia'sGrace-55874" value: { - dps: 25665.42526 - tps: 23205.63686 + dps: 25748.81205 + tps: 23283.45884 } } dps_results: { key: "TestSV-AllItems-Tia'sGrace-56394" value: { - dps: 25829.81003 - tps: 23356.62532 + dps: 25914.87314 + tps: 23436.16254 } } dps_results: { key: "TestSV-AllItems-TinyAbominationinaJar-50706" value: { - dps: 24488.31004 - tps: 22124.97096 + dps: 24568.48212 + tps: 22190.07223 } } dps_results: { key: "TestSV-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 23730.52037 - tps: 21454.016 + dps: 23774.65786 + tps: 21492.76541 } } dps_results: { key: "TestSV-AllItems-UnheededWarning-59520" value: { - dps: 25545.94369 - tps: 23074.08946 + dps: 25629.06036 + tps: 23152.00321 } } dps_results: { key: "TestSV-AllItems-UnquenchableFlame-67101" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-UnsolvableRiddle-62463" value: { - dps: 25856.5513 - tps: 23404.78091 + dps: 25908.0084 + tps: 23448.8401 } } dps_results: { key: "TestSV-AllItems-UnsolvableRiddle-62468" value: { - dps: 25856.5513 - tps: 23404.78091 + dps: 25908.0084 + tps: 23448.8401 } } dps_results: { key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 24269.52577 - tps: 21906.51044 + dps: 24306.95633 + tps: 21926.68069 } } dps_results: { key: "TestSV-AllItems-VialofStolenMemories-59515" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-VialofStolenMemories-65109" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 25560.50764 - tps: 23109.20598 + dps: 25611.46173 + tps: 23152.76216 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 24690.64504 - tps: 22314.26094 + dps: 24736.18189 + tps: 22358.10931 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 24701.52176 - tps: 22327.00656 + dps: 24646.14463 + tps: 22265.75996 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 24790.12934 - tps: 22399.47681 + dps: 24880.27732 + tps: 22484.84214 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 24746.96159 - tps: 22392.12367 + dps: 24818.51474 + tps: 22454.14588 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 25623.74396 - tps: 23142.09788 + dps: 25690.76108 + tps: 23203.26662 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 24446.92799 - tps: 22092.58654 + dps: 24517.68159 + tps: 22153.80921 } } dps_results: { key: "TestSV-AllItems-WitchingHourglass-55787" value: { - dps: 24430.73058 - tps: 22071.33243 + dps: 24469.53004 + tps: 22102.92397 } } dps_results: { key: "TestSV-AllItems-WitchingHourglass-56320" value: { - dps: 24413.55708 - tps: 22048.23583 + dps: 24497.31404 + tps: 22127.99609 } } dps_results: { key: "TestSV-AllItems-World-QuellerFocus-63842" value: { - dps: 24640.18493 - tps: 22285.52369 + dps: 24711.45353 + tps: 22347.26136 } } dps_results: { key: "TestSV-AllItems-WyrmstalkerBattlegear" value: { - dps: 27382.34699 - tps: 24919.3313 + dps: 27459.84028 + tps: 24984.4587 } } dps_results: { key: "TestSV-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 24616.55951 - tps: 22264.1138 + dps: 24677.37789 + tps: 22314.61565 } } dps_results: { key: "TestSV-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 24616.55951 - tps: 22264.1138 + dps: 24677.37789 + tps: 22314.61565 } } dps_results: { key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 24706.86214 - tps: 22225.90149 + dps: 24856.10312 + tps: 22380.84826 } } dps_results: { key: "TestSV-Average-Default" value: { - dps: 26201.82405 - tps: 23669.97044 + dps: 26238.47534 + tps: 23706.22217 } } dps_results: { @@ -1375,85 +1375,85 @@ dps_results: { dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 28567.83026 - tps: 26159.54122 + dps: 28681.61896 + tps: 26272.51196 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 25902.65128 - tps: 23524.28191 + dps: 25923.58333 + tps: 23540.15916 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 32383.9053 - tps: 29240.02902 + dps: 32404.38976 + tps: 29258.25659 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 19912.86127 - tps: 18256.69057 + dps: 19963.62764 + tps: 18300.10655 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 18098.4664 - tps: 16431.54721 + dps: 18060.34002 + tps: 16396.86211 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20468.86084 - tps: 18530.93591 + dps: 20576.28923 + tps: 18626.15544 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 31072.75559 - tps: 28081.9763 + dps: 31168.16489 + tps: 28191.35023 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 26004.35981 - tps: 23622.48378 + dps: 26002.00977 + tps: 23606.14187 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 32597.96304 - tps: 29454.09335 + dps: 32615.86768 + tps: 29459.89031 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 21760.85597 - tps: 19679.20895 + dps: 21746.53327 + tps: 19675.51516 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 18120.75062 - tps: 16461.2327 + dps: 18127.77275 + tps: 16478.04339 } } dps_results: { key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20552.43468 - tps: 18617.75395 + dps: 20569.98567 + tps: 18638.43918 } } dps_results: { @@ -1501,91 +1501,91 @@ dps_results: { dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 28859.14553 - tps: 26305.56461 + dps: 28977.52545 + tps: 26423.39443 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 26098.46465 - tps: 23577.08712 + dps: 26125.05009 + tps: 23598.27348 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 32810.73359 - tps: 29463.64703 + dps: 32834.63998 + tps: 29485.21731 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 20136.45951 - tps: 18379.24511 + dps: 20188.96067 + tps: 18423.7743 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 18239.88856 - tps: 16471.63031 + dps: 18188.24728 + tps: 16423.3027 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20770.42337 - tps: 18702.94237 + dps: 20868.75511 + tps: 18788.58042 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongMultiTarget" value: { - dps: 31416.20147 - tps: 28287.45079 + dps: 31524.82398 + tps: 28411.09454 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongSingleTarget" value: { - dps: 26198.76123 - tps: 23673.25424 + dps: 26218.55324 + tps: 23678.25712 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-ShortSingleTarget" value: { - dps: 33055.51891 - tps: 29704.17364 + dps: 33100.70257 + tps: 29736.89487 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongMultiTarget" value: { - dps: 22022.57983 - tps: 19845.49169 + dps: 22016.96853 + tps: 19850.2733 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongSingleTarget" value: { - dps: 18262.03297 - tps: 16500.84633 + dps: 18267.21819 + tps: 16516.57886 } } dps_results: { key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-ShortSingleTarget" value: { - dps: 20866.11358 - tps: 18799.93746 + dps: 20873.92959 + tps: 18811.1503 } } dps_results: { key: "TestSV-SwitchInFrontOfTarget-Default" value: { - dps: 25939.19077 - tps: 23444.29508 + dps: 25962.79558 + tps: 23454.30732 } } From df3e989f4eaf0b7e63d2ca2ccbc39c0be9f8f870 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Tue, 16 Jul 2024 13:11:18 -0700 Subject: [PATCH 4/7] Fixed DotRemainingTime and AuraRemainingTime APL values to correctly return 0 for inactive auras. On branch rotation_timing Changes to be committed: modified: sim/core/apl_values_aura.go modified: sim/core/apl_values_core.go --- sim/core/apl_values_aura.go | 3 ++- sim/core/apl_values_core.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sim/core/apl_values_aura.go b/sim/core/apl_values_aura.go index 1e4d2a7d42..f16a02004e 100644 --- a/sim/core/apl_values_aura.go +++ b/sim/core/apl_values_aura.go @@ -136,7 +136,8 @@ func (value *APLValueAuraRemainingTime) Type() proto.APLValueType { return proto.APLValueType_ValueTypeDuration } func (value *APLValueAuraRemainingTime) GetDuration(sim *Simulation) time.Duration { - return value.aura.Get().RemainingDuration(sim) + aura := value.aura.Get() + return TernaryDuration(aura.IsActive(), aura.RemainingDuration(sim), 0) } func (value *APLValueAuraRemainingTime) String() string { return fmt.Sprintf("Aura Remaining Time(%s)", value.aura.String()) diff --git a/sim/core/apl_values_core.go b/sim/core/apl_values_core.go index c384fab6ae..650ce23ec8 100644 --- a/sim/core/apl_values_core.go +++ b/sim/core/apl_values_core.go @@ -49,7 +49,7 @@ func (value *APLValueDotRemainingTime) Type() proto.APLValueType { return proto.APLValueType_ValueTypeDuration } func (value *APLValueDotRemainingTime) GetDuration(sim *Simulation) time.Duration { - return value.dot.RemainingDuration(sim) + return TernaryDuration(value.dot.IsActive(), value.dot.RemainingDuration(sim), 0) } func (value *APLValueDotRemainingTime) String() string { return fmt.Sprintf("Dot Remaining Time(%s)", value.dot.Spell.ActionID) From 445bcefddfe19dab8f4f27a0ae0d1a9d7f583e93 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Tue, 16 Jul 2024 14:08:18 -0700 Subject: [PATCH 5/7] Trigger reaction time wait after Living Bomb explosions for more consistent rotational behavior across small changes in Haste value. On branch rotation_timing Changes to be committed: modified: sim/mage/fire/TestFire.results modified: sim/mage/living_bomb.go --- sim/mage/fire/TestFire.results | 726 ++++++++++++++++----------------- sim/mage/living_bomb.go | 1 + 2 files changed, 364 insertions(+), 363 deletions(-) diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index c9b1dc9c63..ce6580dea9 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -37,1268 +37,1268 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-AgileShadowspiritDiamond" value: { - dps: 30847.9115 - tps: 30214.98857 + dps: 30859.62541 + tps: 30221.01749 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 29097.74374 - tps: 28493.03552 + dps: 28954.51997 + tps: 28339.83817 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-55889" value: { - dps: 29727.40781 - tps: 29109.05564 + dps: 29847.23283 + tps: 29214.91416 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-56407" value: { - dps: 29552.67047 - tps: 28943.5734 + dps: 29882.67505 + tps: 29249.68251 } } dps_results: { key: "TestFire-AllItems-AustereShadowspiritDiamond" value: { - dps: 30292.94273 - tps: 29662.94358 + dps: 30315.34517 + tps: 29686.00975 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 28353.28086 - tps: 27774.91258 - hps: 102.65425 + dps: 28254.03079 + tps: 27675.12906 + hps: 102.57717 } } dps_results: { key: "TestFire-AllItems-BedrockTalisman-58182" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-59326" value: { - dps: 30391.05015 - tps: 29803.64959 + dps: 30293.61344 + tps: 29695.48273 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-65053" value: { - dps: 30522.47384 - tps: 29937.28331 + dps: 30430.91111 + tps: 29824.42851 } } dps_results: { key: "TestFire-AllItems-BindingPromise-67037" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 28602.1892 - tps: 28031.20218 + dps: 28493.44498 + tps: 27930.08665 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-55995" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-56414" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 29485.81086 - tps: 28889.75284 + dps: 29350.51286 + tps: 28764.28918 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 29079.26604 - tps: 28524.07687 + dps: 28918.18249 + tps: 28346.92176 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 29286.70577 - tps: 28679.7284 + dps: 29264.26274 + tps: 28670.16669 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-BottledLightning-66879" value: { - dps: 29422.16777 - tps: 28813.20181 + dps: 29260.26076 + tps: 28646.61067 } } dps_results: { key: "TestFire-AllItems-BracingShadowspiritDiamond" value: { - dps: 30527.93235 - tps: 29298.29881 + dps: 30566.62099 + tps: 29337.10627 } } dps_results: { key: "TestFire-AllItems-BurningShadowspiritDiamond" value: { - dps: 31228.14363 - tps: 30586.27653 + dps: 31194.85526 + tps: 30553.62078 } } dps_results: { key: "TestFire-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 31119.13536 - tps: 30486.58664 + dps: 31048.31444 + tps: 30414.14469 } } dps_results: { key: "TestFire-AllItems-CoreofRipeness-58184" value: { - dps: 29752.07985 - tps: 29118.34475 + dps: 29710.11049 + tps: 29077.02495 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-59506" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-65118" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 29752.07985 - tps: 29118.34475 + dps: 29710.11049 + tps: 29077.02495 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 28736.07101 - tps: 28154.90449 + dps: 28609.39899 + tps: 28041.10289 } } dps_results: { key: "TestFire-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 30530.39345 - tps: 29901.00395 + dps: 30462.6864 + tps: 29831.62468 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50348" value: { - dps: 29198.9936 - tps: 28619.95049 + dps: 29189.29816 + tps: 28609.93009 } } dps_results: { key: "TestFire-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 30292.94273 - tps: 29662.94358 + dps: 30315.34517 + tps: 29686.00975 } } dps_results: { key: "TestFire-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 28914.06993 - tps: 28319.05452 + dps: 28849.50952 + tps: 28253.93113 } } dps_results: { key: "TestFire-AllItems-EmberShadowspiritDiamond" value: { - dps: 30519.4432 - tps: 29884.7678 + dps: 30550.0422 + tps: 29915.63784 } } dps_results: { key: "TestFire-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 30530.39345 - tps: 29901.00395 + dps: 30462.6864 + tps: 29831.62468 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-59473" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-65140" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-EternalShadowspiritDiamond" value: { - dps: 30292.94273 - tps: 29662.94358 + dps: 30315.34517 + tps: 29686.00975 } } dps_results: { key: "TestFire-AllItems-FallofMortality-59500" value: { - dps: 29752.07985 - tps: 29118.34475 + dps: 29710.11049 + tps: 29077.02495 } } dps_results: { key: "TestFire-AllItems-FallofMortality-65124" value: { - dps: 29921.59556 - tps: 29283.24358 + dps: 29934.11519 + tps: 29299.44142 } } dps_results: { key: "TestFire-AllItems-Figurine-DemonPanther-52199" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-Figurine-DreamOwl-52354" value: { - dps: 29575.86029 - tps: 28955.29322 + dps: 29481.55286 + tps: 28853.37246 } } dps_results: { key: "TestFire-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 30617.63456 - tps: 29982.48661 + dps: 30566.89147 + tps: 29923.8765 } } dps_results: { key: "TestFire-AllItems-Figurine-KingofBoars-52351" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-Firelord'sVestments" value: { - dps: 27127.0872 - tps: 26684.47439 + dps: 27170.52233 + tps: 26716.48623 } } dps_results: { key: "TestFire-AllItems-FleetShadowspiritDiamond" value: { - dps: 30398.50039 - tps: 29768.50124 + dps: 30423.30241 + tps: 29793.96699 } } dps_results: { key: "TestFire-AllItems-FluidDeath-58181" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-ForlornShadowspiritDiamond" value: { - dps: 30527.93235 - tps: 29894.09751 + dps: 30566.62099 + tps: 29933.69509 } } dps_results: { key: "TestFire-AllItems-FuryofAngerforge-59461" value: { - dps: 29085.30825 - tps: 28527.52629 + dps: 28962.54237 + tps: 28391.98217 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56138" value: { - dps: 29636.04285 - tps: 29049.29198 + dps: 29650.06882 + tps: 29063.00244 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56462" value: { - dps: 29740.04599 - tps: 29145.42215 + dps: 29909.54543 + tps: 29314.47004 } } dps_results: { key: "TestFire-AllItems-GearDetector-61462" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 29140.65093 - tps: 28534.74283 + dps: 28998.90955 + tps: 28382.72642 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-55266" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-56295" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HarmlightToken-63839" value: { - dps: 29459.95013 - tps: 28846.30065 + dps: 29294.89992 + tps: 28673.23481 } } dps_results: { key: "TestFire-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-59514" value: { - dps: 29963.40294 - tps: 29393.63387 + dps: 29765.35805 + tps: 29184.94067 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-65110" value: { - dps: 29834.3275 - tps: 29252.95269 + dps: 29965.39392 + tps: 29392.422 } } dps_results: { key: "TestFire-AllItems-HeartofRage-59224" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HeartofRage-65072" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-55868" value: { - dps: 28779.68873 - tps: 28214.40617 + dps: 28796.03121 + tps: 28230.43314 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-56393" value: { - dps: 28920.4861 - tps: 28351.61949 + dps: 28931.92445 + tps: 28356.31323 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-55845" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-56370" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-HeartoftheVile-66969" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 31119.13536 - tps: 30486.58664 + dps: 31048.31444 + tps: 30414.14469 } } dps_results: { key: "TestFire-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 30530.39345 - tps: 29901.00395 + dps: 30462.6864 + tps: 29831.62468 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62464" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62469" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-55881" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-56406" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 29199.70819 - tps: 28610.23833 + dps: 29194.84748 + tps: 28614.08097 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-59354" value: { - dps: 28450.73883 - tps: 27881.04872 + dps: 28356.35951 + tps: 27778.91325 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-65029" value: { - dps: 28450.73883 - tps: 27883.84872 + dps: 28356.35951 + tps: 27781.71325 } } dps_results: { key: "TestFire-AllItems-JujuofNimbleness-63840" value: { - dps: 28602.1892 - tps: 28031.20218 + dps: 28493.44498 + tps: 27930.08665 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59685" value: { - dps: 28559.41119 - tps: 28000.88415 + dps: 28675.04196 + tps: 28121.18468 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59689" value: { - dps: 28559.41119 - tps: 28000.88415 + dps: 28675.04196 + tps: 28121.18468 } } dps_results: { key: "TestFire-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 28123.31925 - tps: 27584.49295 + dps: 28012.1114 + tps: 27472.20345 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-55816" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-56347" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56102" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56427" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-LicensetoSlay-58180" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-55814" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-56345" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56132" value: { - dps: 28717.22787 - tps: 28135.78352 + dps: 28711.898 + tps: 28141.11403 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56458" value: { - dps: 28762.05397 - tps: 28180.60963 + dps: 28758.15077 + tps: 28187.36679 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-55251" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-56285" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62466" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62471" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-MoonwellChalice-70142" value: { - dps: 30373.87299 - tps: 29737.45043 + dps: 30364.27324 + tps: 29729.20096 } } dps_results: { key: "TestFire-AllItems-Oremantle'sFavor-61448" value: { - dps: 29049.36575 - tps: 28467.10158 + dps: 28976.21421 + tps: 28388.19557 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 29539.33945 - tps: 28938.71959 + dps: 29463.93539 + tps: 28878.72049 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-55237" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-56280" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 30292.94273 - tps: 29662.94358 + dps: 30315.34517 + tps: 29686.00975 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Rainsong-55854" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Rainsong-56377" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 30847.9115 - tps: 30214.98857 + dps: 30859.62541 + tps: 30221.01749 } } dps_results: { key: "TestFire-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 30847.9115 - tps: 30214.98857 + dps: 30859.62541 + tps: 30221.01749 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56100" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56431" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-SeaStar-55256" value: { - dps: 28913.22345 - tps: 28324.88978 + dps: 28782.47926 + tps: 28204.85557 } } dps_results: { key: "TestFire-AllItems-SeaStar-56290" value: { - dps: 29413.76344 - tps: 28818.67735 + dps: 29279.03844 + tps: 28693.89687 } } dps_results: { key: "TestFire-AllItems-ShardofWoe-60233" value: { - dps: 29222.52004 - tps: 28623.86424 + dps: 29088.77348 + tps: 28489.21236 } } dps_results: { key: "TestFire-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56115" value: { - dps: 28808.38318 - tps: 28227.87618 + dps: 28678.19939 + tps: 28109.28962 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56440" value: { - dps: 28855.91629 - tps: 28275.40929 + dps: 28725.32713 + tps: 28156.41735 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-55879" value: { - dps: 29528.51553 - tps: 28936.53615 + dps: 29440.33871 + tps: 28859.60481 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-56400" value: { - dps: 29639.79932 - tps: 29045.98242 + dps: 29549.6869 + tps: 28967.25147 } } dps_results: { key: "TestFire-AllItems-Soul'sAnguish-66994" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-SoulCasket-58183" value: { - dps: 30297.58965 - tps: 29682.8522 + dps: 30196.96691 + tps: 29596.0186 } } dps_results: { key: "TestFire-AllItems-Stonemother'sKiss-61411" value: { - dps: 29917.72065 - tps: 29294.44028 + dps: 29868.62946 + tps: 29243.86411 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62465" value: { - dps: 29972.78527 - tps: 29353.73407 + dps: 30256.54413 + tps: 29621.14864 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62470" value: { - dps: 29990.91164 - tps: 29373.20427 + dps: 30306.25682 + tps: 29668.30212 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-59332" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-65048" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 29606.48888 - tps: 28990.73963 + dps: 29512.48329 + tps: 28890.29569 } } dps_results: { key: "TestFire-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-TearofBlood-55819" value: { - dps: 29268.48257 - tps: 28655.47603 + dps: 29110.20024 + tps: 28488.95966 } } dps_results: { key: "TestFire-AllItems-TearofBlood-56351" value: { - dps: 29575.86029 - tps: 28955.29322 + dps: 29481.55286 + tps: 28853.37246 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 29477.62389 - tps: 28875.53674 + dps: 29414.47479 + tps: 28823.24632 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 29852.76014 - tps: 29249.37728 + dps: 29762.85402 + tps: 29170.58494 } } dps_results: { key: "TestFire-AllItems-Theralion'sMirror-59519" value: { - dps: 30300.17667 - tps: 29666.63989 + dps: 30293.66226 + tps: 29661.28971 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56121" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56449" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-55874" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-56394" value: { - dps: 28722.00371 - tps: 28144.05643 + dps: 28615.8818 + tps: 28048.14136 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 28644.90456 - tps: 28059.95667 + dps: 28538.83718 + tps: 27948.76901 } } dps_results: { key: "TestFire-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 29648.2259 - tps: 29042.25714 + dps: 29885.94837 + tps: 29268.01016 } } dps_results: { key: "TestFire-AllItems-UnheededWarning-59520" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-UnquenchableFlame-67101" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62463" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62468" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-68709" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-59515" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-65109" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 29550.27434 - tps: 28953.34669 + dps: 29414.46367 + tps: 28827.27177 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28717.85104 - tps: 28148.42576 + dps: 28914.63781 + tps: 28320.07949 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 28519.04215 - tps: 27976.26591 + dps: 28569.55738 + tps: 28021.26742 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 29109.25123 - tps: 28560.75864 + dps: 28923.66459 + tps: 28353.82498 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 28837.86793 - tps: 28256.77099 + dps: 28771.29374 + tps: 28201.62314 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 29363.47019 - tps: 28757.17975 + dps: 29323.06501 + tps: 28728.7479 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 28318.98149 - tps: 27746.20455 + dps: 28260.6811 + tps: 27692.17663 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-55787" value: { - dps: 29421.9806 - tps: 28816.66814 + dps: 29437.0997 + tps: 28842.20106 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-56320" value: { - dps: 30339.91782 - tps: 29707.74577 + dps: 30483.75259 + tps: 29847.38287 } } dps_results: { key: "TestFire-AllItems-World-QuellerFocus-63842" value: { - dps: 28602.1892 - tps: 28031.20218 + dps: 28493.44498 + tps: 27930.08665 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 28649.98872 - tps: 28068.54437 + dps: 28642.51884 + tps: 28071.73487 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 28649.98872 - tps: 28068.54437 + dps: 28642.51884 + tps: 28071.73487 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 31687.95642 - tps: 31053.90056 + dps: 31612.74284 + tps: 30977.93633 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 49937.51004 - tps: 51192.69843 + dps: 49880.63509 + tps: 51118.25902 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31119.13536 - tps: 30486.58664 + dps: 31048.31444 + tps: 30414.14469 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 41028.40524 - tps: 40124.36647 + dps: 41019.64389 + tps: 40116.02724 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 34797.28526 - tps: 38356.59236 + dps: 35418.90151 + tps: 38983.61838 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 20894.35498 - tps: 20626.45868 + dps: 20738.28346 + tps: 20454.15144 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 23913.33446 - tps: 23306.79426 + dps: 23917.90796 + tps: 23308.31973 } } dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 31119.13536 - tps: 30486.58664 + dps: 31048.31444 + tps: 30414.14469 } } diff --git a/sim/mage/living_bomb.go b/sim/mage/living_bomb.go index 1fd418ccf2..ccbc9d9d35 100644 --- a/sim/mage/living_bomb.go +++ b/sim/mage/living_bomb.go @@ -73,6 +73,7 @@ func (mage *Mage) registerLivingBombSpell() { OnExpire: func(aura *core.Aura, sim *core.Simulation) { if bombExplode { livingBombExplosionSpell.Cast(sim, aura.Unit) + mage.WaitUntil(sim, sim.CurrentTime + mage.ReactionTime) if len(activeLivingBombs) != 0 { activeLivingBombs = activeLivingBombs[1:] } From 7798c57b99d0fbdf4b7a0917774b37245e75a096 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Tue, 16 Jul 2024 14:21:36 -0700 Subject: [PATCH 6/7] Added reaction time check to Living Bomb usage in Fire Mage APL, which blocks unrealistic casts on the exact nanosecond when a prior Living Bomb exploded. Also added a wait condition to block hardcasts when Living Bomb is nearly about to explode. Both of these changes suppress the fake DPS discontinuity when dropping total Haste from 3262 to 3261 by ~3x relative to the prior APL. On branch rotation_timing Changes to be committed: modified: sim/mage/fire/TestFire.results modified: ui/mage/fire/apls/fire.apl.json --- sim/mage/fire/TestFire.results | 712 ++++++++++++++++---------------- ui/mage/fire/apls/fire.apl.json | 3 +- 2 files changed, 358 insertions(+), 357 deletions(-) diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index ce6580dea9..3b4b88ef96 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -37,1241 +37,1241 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-AgileShadowspiritDiamond" value: { - dps: 30859.62541 - tps: 30221.01749 + dps: 30925.0946 + tps: 30287.49557 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 28954.51997 - tps: 28339.83817 + dps: 28918.33672 + tps: 28302.42038 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-55889" value: { - dps: 29847.23283 - tps: 29214.91416 + dps: 29760.17125 + tps: 29126.5067 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-56407" value: { - dps: 29882.67505 - tps: 29249.68251 + dps: 29815.20785 + tps: 29180.82711 } } dps_results: { key: "TestFire-AllItems-AustereShadowspiritDiamond" value: { - dps: 30315.34517 - tps: 29686.00975 + dps: 30431.24567 + tps: 29802.92312 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 28254.03079 - tps: 27675.12906 + dps: 28217.75 + tps: 27637.6666 hps: 102.57717 } } dps_results: { key: "TestFire-AllItems-BedrockTalisman-58182" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-59326" value: { - dps: 30293.61344 - tps: 29695.48273 + dps: 30297.1151 + tps: 29708.30182 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-65053" value: { - dps: 30430.91111 - tps: 29824.42851 + dps: 30419.41984 + tps: 29822.08581 } } dps_results: { key: "TestFire-AllItems-BindingPromise-67037" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 28493.44498 - tps: 27930.08665 + dps: 28456.69724 + tps: 27892.10593 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-55995" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-56414" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 29350.51286 - tps: 28764.28918 + dps: 29305.34896 + tps: 28717.76689 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 28918.18249 - tps: 28346.92176 + dps: 28924.7237 + tps: 28362.02644 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 29264.26274 - tps: 28670.16669 + dps: 29225.03548 + tps: 28629.63122 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-BottledLightning-66879" value: { - dps: 29260.26076 - tps: 28646.61067 + dps: 29233.73933 + tps: 28619.49657 } } dps_results: { key: "TestFire-AllItems-BracingShadowspiritDiamond" value: { - dps: 30566.62099 - tps: 29337.10627 + dps: 30693.5875 + tps: 29462.54011 } } dps_results: { key: "TestFire-AllItems-BurningShadowspiritDiamond" value: { - dps: 31194.85526 - tps: 30553.62078 + dps: 31271.6188 + tps: 30631.40596 } } dps_results: { key: "TestFire-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 31048.31444 - tps: 30414.14469 + dps: 31057.15112 + tps: 30423.91192 } } dps_results: { key: "TestFire-AllItems-CoreofRipeness-58184" value: { - dps: 29710.11049 - tps: 29077.02495 + dps: 29674.36374 + tps: 29040.04228 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-59506" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-65118" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 29710.11049 - tps: 29077.02495 + dps: 29674.36374 + tps: 29040.04228 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 28609.39899 - tps: 28041.10289 + dps: 28576.79604 + tps: 28008.28244 } } dps_results: { key: "TestFire-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 30462.6864 - tps: 29831.62468 + dps: 30524.23247 + tps: 29894.10528 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50348" value: { - dps: 29189.29816 - tps: 28609.93009 + dps: 29276.89964 + tps: 28705.50446 } } dps_results: { key: "TestFire-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 30315.34517 - tps: 29686.00975 + dps: 30431.24567 + tps: 29802.92312 } } dps_results: { key: "TestFire-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 28849.50952 - tps: 28253.93113 + dps: 28810.18018 + tps: 28212.74376 } } dps_results: { key: "TestFire-AllItems-EmberShadowspiritDiamond" value: { - dps: 30550.0422 - tps: 29915.63784 + dps: 30677.00871 + tps: 30043.62753 } } dps_results: { key: "TestFire-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 30462.6864 - tps: 29831.62468 + dps: 30524.23247 + tps: 29894.10528 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-59473" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-65140" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-EternalShadowspiritDiamond" value: { - dps: 30315.34517 - tps: 29686.00975 + dps: 30431.24567 + tps: 29802.92312 } } dps_results: { key: "TestFire-AllItems-FallofMortality-59500" value: { - dps: 29710.11049 - tps: 29077.02495 + dps: 29674.36374 + tps: 29040.04228 } } dps_results: { key: "TestFire-AllItems-FallofMortality-65124" value: { - dps: 29934.11519 - tps: 29299.44142 + dps: 29898.15951 + tps: 29262.24943 } } dps_results: { key: "TestFire-AllItems-Figurine-DemonPanther-52199" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-Figurine-DreamOwl-52354" value: { - dps: 29481.55286 - tps: 28853.37246 + dps: 29445.98521 + tps: 28816.56922 } } dps_results: { key: "TestFire-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 30566.89147 - tps: 29923.8765 + dps: 30522.99591 + tps: 29878.62778 } } dps_results: { key: "TestFire-AllItems-Figurine-KingofBoars-52351" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-Firelord'sVestments" value: { - dps: 27170.52233 - tps: 26716.48623 + dps: 27147.58561 + tps: 26701.3249 } } dps_results: { key: "TestFire-AllItems-FleetShadowspiritDiamond" value: { - dps: 30423.30241 - tps: 29793.96699 + dps: 30539.62726 + tps: 29911.30471 } } dps_results: { key: "TestFire-AllItems-FluidDeath-58181" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-ForlornShadowspiritDiamond" value: { - dps: 30566.62099 - tps: 29933.69509 + dps: 30693.5875 + tps: 30061.68478 } } dps_results: { key: "TestFire-AllItems-FuryofAngerforge-59461" value: { - dps: 28962.54237 - tps: 28391.98217 + dps: 28962.99362 + tps: 28400.71201 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56138" value: { - dps: 29650.06882 - tps: 29063.00244 + dps: 29711.77033 + tps: 29133.52372 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56462" value: { - dps: 29909.54543 - tps: 29314.47004 + dps: 29953.0987 + tps: 29366.98822 } } dps_results: { key: "TestFire-AllItems-GearDetector-61462" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 28998.90955 - tps: 28382.72642 + dps: 28962.66387 + tps: 28345.24608 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-55266" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-56295" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HarmlightToken-63839" value: { - dps: 29294.89992 - tps: 28673.23481 + dps: 29268.49501 + tps: 28645.59492 } } dps_results: { key: "TestFire-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-59514" value: { - dps: 29765.35805 - tps: 29184.94067 + dps: 29546.2546 + tps: 28979.89635 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-65110" value: { - dps: 29965.39392 - tps: 29392.422 + dps: 29921.01693 + tps: 29347.22125 } } dps_results: { key: "TestFire-AllItems-HeartofRage-59224" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HeartofRage-65072" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-55868" value: { - dps: 28796.03121 - tps: 28230.43314 + dps: 28747.71433 + tps: 28193.91927 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-56393" value: { - dps: 28931.92445 - tps: 28356.31323 + dps: 28961.5788 + tps: 28394.76411 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-55845" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-56370" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-HeartoftheVile-66969" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 31048.31444 - tps: 30414.14469 + dps: 31057.15112 + tps: 30423.91192 } } dps_results: { key: "TestFire-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 30462.6864 - tps: 29831.62468 + dps: 30524.23247 + tps: 29894.10528 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62464" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62469" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-55881" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-56406" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 29194.84748 - tps: 28614.08097 + dps: 29152.07437 + tps: 28570.07489 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-59354" value: { - dps: 28356.35951 - tps: 27778.91325 + dps: 28320.07871 + tps: 27741.37275 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-65029" value: { - dps: 28356.35951 - tps: 27781.71325 + dps: 28320.07871 + tps: 27744.17275 } } dps_results: { key: "TestFire-AllItems-JujuofNimbleness-63840" value: { - dps: 28493.44498 - tps: 27930.08665 + dps: 28456.69724 + tps: 27892.10593 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59685" value: { - dps: 28675.04196 - tps: 28121.18468 + dps: 28701.21257 + tps: 28147.41003 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59689" value: { - dps: 28675.04196 - tps: 28121.18468 + dps: 28701.21257 + tps: 28147.41003 } } dps_results: { key: "TestFire-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 28012.1114 - tps: 27472.20345 + dps: 28048.02759 + tps: 27509.01998 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-55816" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-56347" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56102" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56427" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-LicensetoSlay-58180" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-55814" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-56345" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56132" value: { - dps: 28711.898 - tps: 28141.11403 + dps: 28671.20536 + tps: 28099.18841 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56458" value: { - dps: 28758.15077 - tps: 28187.36679 + dps: 28717.01694 + tps: 28145 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-55251" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-56285" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62466" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62471" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-MoonwellChalice-70142" value: { - dps: 30364.27324 - tps: 29729.20096 + dps: 30321.95043 + tps: 29685.64205 } } dps_results: { key: "TestFire-AllItems-Oremantle'sFavor-61448" value: { - dps: 28976.21421 - tps: 28388.19557 + dps: 28905.16113 + tps: 28314.04352 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 29463.93539 - tps: 28878.72049 + dps: 29428.5356 + tps: 28842.25302 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-55237" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-56280" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 30315.34517 - tps: 29686.00975 + dps: 30431.24567 + tps: 29802.92312 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Rainsong-55854" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Rainsong-56377" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 30859.62541 - tps: 30221.01749 + dps: 30925.0946 + tps: 30287.49557 } } dps_results: { key: "TestFire-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 30859.62541 - tps: 30221.01749 + dps: 30925.0946 + tps: 30287.49557 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56100" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56431" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-SeaStar-55256" value: { - dps: 28782.47926 - tps: 28204.85557 + dps: 28741.72769 + tps: 28162.80791 } } dps_results: { key: "TestFire-AllItems-SeaStar-56290" value: { - dps: 29279.03844 - tps: 28693.89687 + dps: 29234.42973 + tps: 28647.93761 } } dps_results: { key: "TestFire-AllItems-ShardofWoe-60233" value: { - dps: 29088.77348 - tps: 28489.21236 + dps: 28982.26577 + tps: 28381.87885 } } dps_results: { key: "TestFire-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56115" value: { - dps: 28678.19939 - tps: 28109.28962 + dps: 28637.13209 + tps: 28066.98934 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56440" value: { - dps: 28725.32713 - tps: 28156.41735 + dps: 28683.78118 + tps: 28113.63843 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-55879" value: { - dps: 29440.33871 - tps: 28859.60481 + dps: 29408.39541 + tps: 28826.51316 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-56400" value: { - dps: 29549.6869 - tps: 28967.25147 + dps: 29518.39313 + tps: 28934.82044 } } dps_results: { key: "TestFire-AllItems-Soul'sAnguish-66994" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-SoulCasket-58183" value: { - dps: 30196.96691 - tps: 29596.0186 + dps: 30148.40145 + tps: 29546.06126 } } dps_results: { key: "TestFire-AllItems-Stonemother'sKiss-61411" value: { - dps: 29868.62946 - tps: 29243.86411 + dps: 29812.12697 + tps: 29184.73889 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62465" value: { - dps: 30256.54413 - tps: 29621.14864 + dps: 30175.35114 + tps: 29537.06709 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62470" value: { - dps: 30306.25682 - tps: 29668.30212 + dps: 30238.06309 + tps: 29598.04024 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-59332" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-65048" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 29512.48329 - tps: 28890.29569 + dps: 29475.4012 + tps: 28851.97849 } } dps_results: { key: "TestFire-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-TearofBlood-55819" value: { - dps: 29110.20024 - tps: 28488.95966 + dps: 29073.79329 + tps: 28451.31777 } } dps_results: { key: "TestFire-AllItems-TearofBlood-56351" value: { - dps: 29481.55286 - tps: 28853.37246 + dps: 29445.98521 + tps: 28816.56922 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 29414.47479 - tps: 28823.24632 + dps: 29375.0654 + tps: 28782.46592 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 29762.85402 - tps: 29170.58494 + dps: 29726.34227 + tps: 29132.69913 } } dps_results: { key: "TestFire-AllItems-Theralion'sMirror-59519" value: { - dps: 30293.66226 - tps: 29661.28971 + dps: 30250.93834 + tps: 29617.32987 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56121" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56449" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-55874" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-56394" value: { - dps: 28615.8818 - tps: 28048.14136 + dps: 28578.9784 + tps: 28010.005 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 28538.83718 - tps: 27948.76901 + dps: 28545.46061 + tps: 27955.03688 } } dps_results: { key: "TestFire-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 29885.94837 - tps: 29268.01016 + dps: 29930.42977 + tps: 29311.62644 } } dps_results: { key: "TestFire-AllItems-UnheededWarning-59520" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-UnquenchableFlame-67101" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62463" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62468" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-68709" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-59515" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-65109" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 29414.46367 - tps: 28827.27177 + dps: 29368.80301 + tps: 28780.24572 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28914.63781 - tps: 28320.07949 + dps: 28842.64209 + tps: 28246.69558 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 28569.55738 - tps: 28021.26742 + dps: 28737.91164 + tps: 28166.59798 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 28923.66459 - tps: 28353.82498 + dps: 28922.61225 + tps: 28361.05124 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 28771.29374 - tps: 28201.62314 + dps: 28734.2347 + tps: 28163.33112 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 29323.06501 - tps: 28728.7479 + dps: 29273.93371 + tps: 28678.71578 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 28260.6811 - tps: 27692.17663 + dps: 28224.4003 + tps: 27654.66286 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-55787" value: { - dps: 29437.0997 - tps: 28842.20106 + dps: 29349.64959 + tps: 28750.03615 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-56320" value: { - dps: 30483.75259 - tps: 29847.38287 + dps: 30557.0948 + tps: 29927.09905 } } dps_results: { key: "TestFire-AllItems-World-QuellerFocus-63842" value: { - dps: 28493.44498 - tps: 27930.08665 + dps: 28456.69724 + tps: 27892.10593 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 28642.51884 - tps: 28071.73487 + dps: 28602.48798 + tps: 28030.47103 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 28642.51884 - tps: 28071.73487 + dps: 28602.48798 + tps: 28030.47103 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 31612.74284 - tps: 30977.93633 + dps: 31604.44588 + tps: 30969.65499 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 49880.63509 - tps: 51118.25902 + dps: 49884.31696 + tps: 51116.83375 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31048.31444 - tps: 30414.14469 + dps: 31057.15112 + tps: 30423.91192 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 41019.64389 - tps: 40116.02724 + dps: 41239.61821 + tps: 40338.6192 } } dps_results: { @@ -1298,7 +1298,7 @@ dps_results: { dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 31048.31444 - tps: 30414.14469 + dps: 31057.15112 + tps: 30423.91192 } } diff --git a/ui/mage/fire/apls/fire.apl.json b/ui/mage/fire/apls/fire.apl.json index bab03b6859..473637feb6 100644 --- a/ui/mage/fire/apls/fire.apl.json +++ b/ui/mage/fire/apls/fire.apl.json @@ -17,12 +17,13 @@ {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"17s"}}}},{"cmp":{"op":"OpGt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12846}}},"rhs":{"const":{"val":"15000"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12846}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":44457}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11366,"tag":1}}}]}}]}},"castSpell":{"spellId":{"spellId":11129}}}}, {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpGt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12846}}},"rhs":{"const":{"val":"10000"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12846}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":44457}}}]}}]}},"castSpell":{"spellId":{"spellId":11129}}}}, {"action":{"condition":{"and":{"vals":[{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48108}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"spellTravelTime":{"spellId":{"spellId":11366}}}}}]}},"castSpell":{"spellId":{"spellId":11366}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":44457}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":44457}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsInactiveWithReactionTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":44457}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":44457}}}}, {"action":{"condition":{"not":{"val":{"spellIsReady":{"spellId":{"spellId":11129}}}}},"castSpell":{"spellId":{"spellId":82731}}}}, {"hide":true,"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"30s"}}}},"castSpell":{"spellId":{"spellId":55342}}}}, {"hide":true,"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"channelSpell":{"spellId":{"spellId":12051},"interruptIf":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"20%"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}}]}}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"25s"}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"90%"}}}}]}},"castSpell":{"spellId":{"itemId":36799}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":6117}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5.15s"}}}},{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":44457}}},"rhs":{"inputDelay":{}}}},"rhs":{"const":{"val":"0.15s"}}}},{"dotIsActive":{"spellId":{"spellId":44457}}}]}},"wait":{"duration":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":44457}}},"rhs":{"inputDelay":{}}}}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":133}}},"rhs":{"spellTravelTime":{"spellId":{"spellId":133}}}}}}}]}},"castSpell":{"spellId":{"spellId":133}}}}, {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":2948}}}}},"castSpell":{"spellId":{"spellId":2948}}}}, {"action":{"castSpell":{"spellId":{"spellId":2136}}}} From 18a83408631969ddc7a51cc53fc937b516cd98de Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Thu, 18 Jul 2024 13:12:59 -0700 Subject: [PATCH 7/7] Removed MCD designation on Combustion so that it can be cast immediately after other spells in APLs. On branch rotation_timing Changes to be committed: modified: sim/mage/combustion.go modified: sim/mage/fire/TestFire.results --- sim/mage/combustion.go | 5 - sim/mage/fire/TestFire.results | 724 ++++++++++++++++----------------- 2 files changed, 362 insertions(+), 367 deletions(-) diff --git a/sim/mage/combustion.go b/sim/mage/combustion.go index 92008453dd..85eeb36f26 100644 --- a/sim/mage/combustion.go +++ b/sim/mage/combustion.go @@ -89,9 +89,4 @@ func (mage *Mage) registerCombustionSpell() { spell.Dot(target).Apply(sim) }, }) - - mage.AddMajorCooldown(core.MajorCooldown{ - Spell: mage.Combustion, - Type: core.CooldownTypeDPS, - }) } diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index 3b4b88ef96..aa5a2f77cd 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -37,1268 +37,1268 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-AgileShadowspiritDiamond" value: { - dps: 30925.0946 - tps: 30287.49557 + dps: 30897.36203 + tps: 30259.76301 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 28918.33672 - tps: 28302.42038 + dps: 28932.30937 + tps: 28316.39303 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-55889" value: { - dps: 29760.17125 - tps: 29126.5067 + dps: 29770.34416 + tps: 29136.51937 } } dps_results: { key: "TestFire-AllItems-Anhuur'sHymnal-56407" value: { - dps: 29815.20785 - tps: 29180.82711 + dps: 29819.98177 + tps: 29185.60103 } } dps_results: { key: "TestFire-AllItems-AustereShadowspiritDiamond" value: { - dps: 30431.24567 - tps: 29802.92312 + dps: 30432.77811 + tps: 29804.45556 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 28217.75 - tps: 27637.6666 + dps: 28225.27517 + tps: 27645.19177 hps: 102.57717 } } dps_results: { key: "TestFire-AllItems-BedrockTalisman-58182" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-59326" value: { - dps: 30297.1151 - tps: 29708.30182 + dps: 30372.48605 + tps: 29781.97579 } } dps_results: { key: "TestFire-AllItems-BellofEnragingResonance-65053" value: { - dps: 30419.41984 - tps: 29822.08581 + dps: 30472.34876 + tps: 29874.84732 } } dps_results: { key: "TestFire-AllItems-BindingPromise-67037" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 28456.69724 - tps: 27892.10593 + dps: 28465.19776 + tps: 27900.60645 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-55995" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-BloodofIsiset-56414" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 29305.34896 - tps: 28717.76689 + dps: 29325.22974 + tps: 28737.64767 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 28924.7237 - tps: 28362.02644 + dps: 28974.37449 + tps: 28415.29355 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 29225.03548 - tps: 28629.63122 + dps: 29233.08758 + tps: 28637.17829 } } dps_results: { key: "TestFire-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-BottledLightning-66879" value: { - dps: 29233.73933 - tps: 28619.49657 + dps: 29240.38422 + tps: 28626.14147 } } dps_results: { key: "TestFire-AllItems-BracingShadowspiritDiamond" value: { - dps: 30693.5875 - tps: 29462.54011 + dps: 30697.74387 + tps: 29466.61337 } } dps_results: { key: "TestFire-AllItems-BurningShadowspiritDiamond" value: { - dps: 31271.6188 - tps: 30631.40596 + dps: 31243.71155 + tps: 30603.49871 } } dps_results: { key: "TestFire-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 31057.15112 - tps: 30423.91192 + dps: 31032.40562 + tps: 30399.16642 } } dps_results: { key: "TestFire-AllItems-CoreofRipeness-58184" value: { - dps: 29674.36374 - tps: 29040.04228 + dps: 29690.50309 + tps: 29053.89711 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-59506" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-CrushingWeight-65118" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 29674.36374 - tps: 29040.04228 + dps: 29690.50309 + tps: 29053.89711 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 28576.79604 - tps: 28008.28244 + dps: 28564.69137 + tps: 28001.49108 } } dps_results: { key: "TestFire-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 30524.23247 - tps: 29894.10528 + dps: 30528.54199 + tps: 29898.41479 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50348" value: { - dps: 29276.89964 - tps: 28705.50446 + dps: 29286.69384 + tps: 28715.84674 } } dps_results: { key: "TestFire-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 30431.24567 - tps: 29802.92312 + dps: 30432.77811 + tps: 29804.45556 } } dps_results: { key: "TestFire-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 28810.18018 - tps: 28212.74376 + dps: 28815.35601 + tps: 28217.91959 } } dps_results: { key: "TestFire-AllItems-EmberShadowspiritDiamond" value: { - dps: 30677.00871 - tps: 30043.62753 + dps: 30681.16509 + tps: 30047.7839 } } dps_results: { key: "TestFire-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 30524.23247 - tps: 29894.10528 + dps: 30528.54199 + tps: 29898.41479 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-59473" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-EssenceoftheCyclone-65140" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-EternalShadowspiritDiamond" value: { - dps: 30431.24567 - tps: 29802.92312 + dps: 30432.77811 + tps: 29804.45556 } } dps_results: { key: "TestFire-AllItems-FallofMortality-59500" value: { - dps: 29674.36374 - tps: 29040.04228 + dps: 29690.50309 + tps: 29053.89711 } } dps_results: { key: "TestFire-AllItems-FallofMortality-65124" value: { - dps: 29898.15951 - tps: 29262.24943 + dps: 29914.1333 + tps: 29275.92997 } } dps_results: { key: "TestFire-AllItems-Figurine-DemonPanther-52199" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-Figurine-DreamOwl-52354" value: { - dps: 29445.98521 - tps: 28816.56922 + dps: 29464.08005 + tps: 28832.38703 } } dps_results: { key: "TestFire-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 30522.99591 - tps: 29878.62778 + dps: 30543.42886 + tps: 29896.78371 } } dps_results: { key: "TestFire-AllItems-Figurine-KingofBoars-52351" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-Firelord'sVestments" value: { - dps: 27147.58561 - tps: 26701.3249 + dps: 27071.36672 + tps: 26624.34664 } } dps_results: { key: "TestFire-AllItems-FleetShadowspiritDiamond" value: { - dps: 30539.62726 - tps: 29911.30471 + dps: 30543.80359 + tps: 29915.48105 } } dps_results: { key: "TestFire-AllItems-FluidDeath-58181" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-ForlornShadowspiritDiamond" value: { - dps: 30693.5875 - tps: 30061.68478 + dps: 30697.74387 + tps: 30065.84116 } } dps_results: { key: "TestFire-AllItems-FuryofAngerforge-59461" value: { - dps: 28962.99362 - tps: 28400.71201 + dps: 29012.61986 + tps: 28453.95458 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56138" value: { - dps: 29711.77033 - tps: 29133.52372 + dps: 29750.28636 + tps: 29163.27925 } } dps_results: { key: "TestFire-AllItems-GaleofShadows-56462" value: { - dps: 29953.0987 - tps: 29366.98822 + dps: 29940.68242 + tps: 29355.11312 } } dps_results: { key: "TestFire-AllItems-GearDetector-61462" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 28962.66387 - tps: 28345.24608 + dps: 28976.65439 + tps: 28359.2366 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-55266" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-GraceoftheHerald-56295" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HarmlightToken-63839" value: { - dps: 29268.49501 - tps: 28645.59492 + dps: 29288.83615 + tps: 28664.31009 } } dps_results: { key: "TestFire-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-59514" value: { - dps: 29546.2546 - tps: 28979.89635 + dps: 29571.37149 + tps: 29005.01324 } } dps_results: { key: "TestFire-AllItems-HeartofIgnacious-65110" value: { - dps: 29921.01693 - tps: 29347.22125 + dps: 29953.51754 + tps: 29373.17135 } } dps_results: { key: "TestFire-AllItems-HeartofRage-59224" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HeartofRage-65072" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-55868" value: { - dps: 28747.71433 - tps: 28193.91927 + dps: 28789.41591 + tps: 28227.65867 } } dps_results: { key: "TestFire-AllItems-HeartofSolace-56393" value: { - dps: 28961.5788 - tps: 28394.76411 + dps: 28955.42817 + tps: 28389.15466 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-55845" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HeartofThunder-56370" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-HeartoftheVile-66969" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 31057.15112 - tps: 30423.91192 + dps: 31032.40562 + tps: 30399.16642 } } dps_results: { key: "TestFire-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 30524.23247 - tps: 29894.10528 + dps: 30528.54199 + tps: 29898.41479 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62464" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-ImpatienceofYouth-62469" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-55881" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-ImpetuousQuery-56406" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 29152.07437 - tps: 28570.07489 + dps: 29184.33043 + tps: 28602.40887 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-59354" value: { - dps: 28320.07871 - tps: 27741.37275 + dps: 28321.44905 + tps: 27742.74309 } } dps_results: { key: "TestFire-AllItems-JarofAncientRemedies-65029" value: { - dps: 28320.07871 - tps: 27744.17275 + dps: 28321.44905 + tps: 27745.54309 } } dps_results: { key: "TestFire-AllItems-JujuofNimbleness-63840" value: { - dps: 28456.69724 - tps: 27892.10593 + dps: 28465.19776 + tps: 27900.60645 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59685" value: { - dps: 28701.21257 - tps: 28147.41003 + dps: 28682.39104 + tps: 28127.69781 } } dps_results: { key: "TestFire-AllItems-KvaldirBattleStandard-59689" value: { - dps: 28701.21257 - tps: 28147.41003 + dps: 28682.39104 + tps: 28127.69781 } } dps_results: { key: "TestFire-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 28048.02759 - tps: 27509.01998 + dps: 28009.90156 + tps: 27470.24004 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-55816" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-LeadenDespair-56347" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56102" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-LeftEyeofRajh-56427" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-LicensetoSlay-58180" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-55814" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-MagnetiteMirror-56345" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56132" value: { - dps: 28671.20536 - tps: 28099.18841 + dps: 28702.76766 + tps: 28130.80007 } } dps_results: { key: "TestFire-AllItems-MarkofKhardros-56458" value: { - dps: 28717.01694 - tps: 28145 + dps: 28749.12634 + tps: 28177.15875 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-55251" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-MightoftheOcean-56285" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62466" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-MirrorofBrokenImages-62471" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-MoonwellChalice-70142" value: { - dps: 30321.95043 - tps: 29685.64205 + dps: 30343.74873 + tps: 29705.15189 } } dps_results: { key: "TestFire-AllItems-Oremantle'sFavor-61448" value: { - dps: 28905.16113 - tps: 28314.04352 + dps: 28901.19408 + tps: 28307.643 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 29428.5356 - tps: 28842.25302 + dps: 29452.6881 + tps: 28864.18777 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-55237" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-PorcelainCrab-56280" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 30431.24567 - tps: 29802.92312 + dps: 30432.77811 + tps: 29804.45556 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Rainsong-55854" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Rainsong-56377" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 30925.0946 - tps: 30287.49557 + dps: 30897.36203 + tps: 30259.76301 } } dps_results: { key: "TestFire-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 30925.0946 - tps: 30287.49557 + dps: 30897.36203 + tps: 30259.76301 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56100" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-RightEyeofRajh-56431" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-SeaStar-55256" value: { - dps: 28741.72769 - tps: 28162.80791 + dps: 28761.4264 + tps: 28182.50662 } } dps_results: { key: "TestFire-AllItems-SeaStar-56290" value: { - dps: 29234.42973 - tps: 28647.93761 + dps: 29254.2876 + tps: 28667.79549 } } dps_results: { key: "TestFire-AllItems-ShardofWoe-60233" value: { - dps: 28982.26577 - tps: 28381.87885 + dps: 29009.41743 + tps: 28408.72948 } } dps_results: { key: "TestFire-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56115" value: { - dps: 28637.13209 - tps: 28066.98934 + dps: 28657.03587 + tps: 28086.89312 } } dps_results: { key: "TestFire-AllItems-Skardyn'sGrace-56440" value: { - dps: 28683.78118 - tps: 28113.63843 + dps: 28703.72391 + tps: 28133.58116 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-55879" value: { - dps: 29408.39541 - tps: 28826.51316 + dps: 29427.10064 + tps: 28845.21839 } } dps_results: { key: "TestFire-AllItems-Sorrowsong-56400" value: { - dps: 29518.39313 - tps: 28934.82044 + dps: 29537.14136 + tps: 28953.56867 } } dps_results: { key: "TestFire-AllItems-Soul'sAnguish-66994" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-SoulCasket-58183" value: { - dps: 30148.40145 - tps: 29546.06126 + dps: 30193.83502 + tps: 29591.49484 } } dps_results: { key: "TestFire-AllItems-Stonemother'sKiss-61411" value: { - dps: 29812.12697 - tps: 29184.73889 + dps: 29842.48583 + tps: 29215.09774 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62465" value: { - dps: 30175.35114 - tps: 29537.06709 + dps: 30183.83391 + tps: 29545.54986 } } dps_results: { key: "TestFire-AllItems-StumpofTime-62470" value: { - dps: 30238.06309 - tps: 29598.04024 + dps: 30261.04865 + tps: 29620.85947 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-59332" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-SymbioticWorm-65048" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 29475.4012 - tps: 28851.97849 + dps: 29499.22283 + tps: 28874.17192 } } dps_results: { key: "TestFire-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-TearofBlood-55819" value: { - dps: 29073.79329 - tps: 28451.31777 + dps: 29100.3718 + tps: 28476.2709 } } dps_results: { key: "TestFire-AllItems-TearofBlood-56351" value: { - dps: 29445.98521 - tps: 28816.56922 + dps: 29464.08005 + tps: 28832.38703 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 29375.0654 - tps: 28782.46592 + dps: 29383.73067 + tps: 28791.13118 } } dps_results: { key: "TestFire-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 29726.34227 - tps: 29132.69913 + dps: 29746.3925 + tps: 29152.74936 } } dps_results: { key: "TestFire-AllItems-Theralion'sMirror-59519" value: { - dps: 30250.93834 - tps: 29617.32987 + dps: 30265.0042 + tps: 29629.11122 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56121" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Throngus'sFinger-56449" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-55874" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-Tia'sGrace-56394" value: { - dps: 28578.9784 - tps: 28010.005 + dps: 28597.35532 + tps: 28028.38191 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 28545.46061 - tps: 27955.03688 + dps: 28556.17886 + tps: 27965.75513 } } dps_results: { key: "TestFire-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 29930.42977 - tps: 29311.62644 + dps: 29951.01439 + tps: 29332.21106 } } dps_results: { key: "TestFire-AllItems-UnheededWarning-59520" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-UnquenchableFlame-67101" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62463" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-62468" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-UnsolvableRiddle-68709" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-59515" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-VialofStolenMemories-65109" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 29368.80301 - tps: 28780.24572 + dps: 29388.70429 + tps: 28800.14699 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 28842.64209 - tps: 28246.69558 + dps: 28855.73215 + tps: 28259.78564 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 28737.91164 - tps: 28166.59798 + dps: 28828.83627 + tps: 28255.30731 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 28922.61225 - tps: 28361.05124 + dps: 28975.57401 + tps: 28412.31602 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 28734.2347 - tps: 28163.33112 + dps: 28753.59164 + tps: 28182.68807 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 29273.93371 - tps: 28678.71578 + dps: 29293.97007 + tps: 28698.75214 } } dps_results: { key: "TestFire-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 28224.4003 - tps: 27654.66286 + dps: 28227.25385 + tps: 27657.5164 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-55787" value: { - dps: 29349.64959 - tps: 28750.03615 + dps: 29346.65752 + tps: 28747.63165 } } dps_results: { key: "TestFire-AllItems-WitchingHourglass-56320" value: { - dps: 30557.0948 - tps: 29927.09905 + dps: 30585.75304 + tps: 29952.84024 } } dps_results: { key: "TestFire-AllItems-World-QuellerFocus-63842" value: { - dps: 28456.69724 - tps: 27892.10593 + dps: 28465.19776 + tps: 27900.60645 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 28602.48798 - tps: 28030.47103 + dps: 28633.22964 + tps: 28061.26206 } } dps_results: { key: "TestFire-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 28602.48798 - tps: 28030.47103 + dps: 28633.22964 + tps: 28061.26206 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 31604.44588 - tps: 30969.65499 + dps: 31640.30895 + tps: 31004.32384 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 49884.31696 - tps: 51116.83375 + dps: 49845.17531 + tps: 51078.50643 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 31057.15112 - tps: 30423.91192 + dps: 31032.40562 + tps: 30399.16642 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 41239.61821 - tps: 40338.6192 + dps: 41169.69171 + tps: 40268.69269 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 35418.90151 - tps: 38983.61838 + dps: 35428.60948 + tps: 38985.77259 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 20738.28346 - tps: 20454.15144 + dps: 20726.8346 + tps: 20442.70259 } } dps_results: { key: "TestFire-Settings-Troll-p1_fire-Fire-fire-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 23917.90796 - tps: 23308.31973 + dps: 23923.85546 + tps: 23314.26723 } } dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 31057.15112 - tps: 30423.91192 + dps: 31032.40562 + tps: 30399.16642 } }