diff --git a/sim/druid/berserk.go b/sim/druid/berserk.go index 8e31714170..e89c1251ce 100644 --- a/sim/druid/berserk.go +++ b/sim/druid/berserk.go @@ -45,6 +45,8 @@ func (druid *Druid) registerBerserkCD() { druid.Berserk = druid.RegisterSpell(core.SpellConfig{ ActionID: actionId, + Flags: core.SpellFlagAPL, + Cast: core.CastConfig{ DefaultCast: core.Cast{ GCD: time.Second, @@ -59,4 +61,9 @@ func (druid *Druid) registerBerserkCD() { druid.BerserkAura.Activate(sim) }, }) + + druid.AddMajorCooldown(core.MajorCooldown{ + Spell: druid.Berserk, + Type: core.CooldownTypeDPS, + }) } diff --git a/sim/druid/druid.go b/sim/druid/druid.go index 04f7ce5675..42024ca0dc 100644 --- a/sim/druid/druid.go +++ b/sim/druid/druid.go @@ -48,6 +48,7 @@ type Druid struct { MangleBear *core.Spell MangleCat *core.Spell Maul *core.Spell + MaulQueueSpell *core.Spell Moonfire *core.Spell Rebirth *core.Spell Rake *core.Spell diff --git a/sim/druid/enrage.go b/sim/druid/enrage.go index 5c960b352e..21513fe0a5 100644 --- a/sim/druid/enrage.go +++ b/sim/druid/enrage.go @@ -39,9 +39,10 @@ func (druid *Druid) registerEnrageSpell() { }, }) - spell := druid.RegisterSpell(core.SpellConfig{ + druid.Enrage = druid.RegisterSpell(core.SpellConfig{ ActionID: actionID, Flags: core.SpellFlagAPL, + Cast: core.CastConfig{ CD: core.Cooldown{ Timer: druid.NewTimer(), @@ -49,6 +50,9 @@ func (druid *Druid) registerEnrageSpell() { }, IgnoreHaste: true, }, + ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool { + return druid.InForm(Bear) + }, ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) { druid.AddRage(sim, instantRage, rageMetrics) @@ -67,5 +71,8 @@ func (druid *Druid) registerEnrageSpell() { }, }) - druid.Enrage = spell + druid.AddMajorCooldown(core.MajorCooldown{ + Spell: druid.Enrage, + Type: core.CooldownTypeDPS, + }) } diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index b13695c630..8f2273a2d3 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -46,1145 +46,1145 @@ character_stats_results: { dps_results: { key: "TestFeral-AllItems-Althor'sAbacus-50359" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-Althor'sAbacus-50366" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-Bandit'sInsignia-40371" value: { - dps: 7593.60431 - tps: 5454.27986 + dps: 7565.84705 + tps: 5434.27306 } } dps_results: { key: "TestFeral-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7439.67589 - tps: 5344.61675 + dps: 7406.93992 + tps: 5321.449 hps: 89.11518 } } dps_results: { key: "TestFeral-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7439.67589 - tps: 5344.61675 + dps: 7406.93992 + tps: 5321.449 hps: 89.11518 } } dps_results: { key: "TestFeral-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7586.36733 - tps: 5451.38521 + dps: 7586.92315 + tps: 5451.40591 } } dps_results: { key: "TestFeral-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6149.77007 - tps: 4427.96097 + dps: 6135.27426 + tps: 4417.29501 } } dps_results: { key: "TestFeral-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5324.21372 + dps: 7570.60839 + tps: 5331.02597 } } dps_results: { key: "TestFeral-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7735.89978 - tps: 5557.55325 + dps: 7736.33704 + tps: 5557.48977 } } dps_results: { key: "TestFeral-AllItems-CorpseTongueCoin-50349" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-CorpseTongueCoin-50352" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 hps: 64 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7541.07721 - tps: 5416.5369 + dps: 7547.40798 + tps: 5420.95696 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7572.5553 - tps: 5439.03592 + dps: 7583.70991 + tps: 5446.8809 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-Death'sChoice-47464" value: { - dps: 7873.87819 - tps: 5652.90038 + dps: 7878.77492 + tps: 5656.45185 } } dps_results: { key: "TestFeral-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7523.08172 - tps: 5403.83489 + dps: 7516.32011 + tps: 5399.03414 } } dps_results: { key: "TestFeral-AllItems-Deathbringer'sWill-50362" value: { - dps: 7851.64245 - tps: 5637.41215 + dps: 7883.73944 + tps: 5660.05145 } } dps_results: { key: "TestFeral-AllItems-Deathbringer'sWill-50363" value: { - dps: 7931.83617 - tps: 5694.20012 + dps: 7932.03343 + tps: 5693.66709 } } dps_results: { key: "TestFeral-AllItems-Defender'sCode-40257" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7589.07641 - tps: 5453.30865 + dps: 7588.15255 + tps: 5452.12921 } } dps_results: { key: "TestFeral-AllItems-DislodgedForeignObject-50348" value: { - dps: 7574.13248 - tps: 5440.30529 + dps: 7545.77247 + tps: 5419.94532 } } dps_results: { key: "TestFeral-AllItems-DislodgedForeignObject-50353" value: { - dps: 7592.6349 - tps: 5453.44201 + dps: 7573.02596 + tps: 5438.99615 } } dps_results: { key: "TestFeral-AllItems-DreamwalkerBattlegear" value: { - dps: 6984.00442 - tps: 5020.86564 + dps: 6995.81325 + tps: 5028.35247 } } dps_results: { key: "TestFeral-AllItems-DreamwalkerGarb" value: { - dps: 5990.93222 - tps: 4316.8314 + dps: 5990.0304 + tps: 4316.41546 } } dps_results: { key: "TestFeral-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-EmberSkyflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7586.36733 - tps: 5451.38521 + dps: 7586.92315 + tps: 5451.40591 } } dps_results: { key: "TestFeral-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7580.79626 - tps: 5447.42974 + dps: 7585.18074 + tps: 5450.1688 } } dps_results: { key: "TestFeral-AllItems-EphemeralSnowflake-50260" value: { - dps: 7572.19706 - tps: 5438.85635 + dps: 7484.61416 + tps: 5376.0742 } } dps_results: { key: "TestFeral-AllItems-EssenceofGossamer-37220" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7569.80361 - tps: 5436.93265 + dps: 7581.91004 + tps: 5445.90214 } } dps_results: { key: "TestFeral-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7527.8599 - tps: 5407.07782 + dps: 7537.55195 + tps: 5414.03396 } } dps_results: { key: "TestFeral-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ForethoughtTalisman-40258" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ForgeEmber-37660" value: { - dps: 7508.01446 - tps: 5392.98756 + dps: 7518.88739 + tps: 5400.78213 } } dps_results: { key: "TestFeral-AllItems-ForlornSkyflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-ForlornStarflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7617.35647 - tps: 5470.76996 + dps: 7588.40525 + tps: 5450.28938 } } dps_results: { key: "TestFeral-AllItems-FuturesightRune-38763" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-Gladiator'sSanctuary" value: { - dps: 7517.40091 - tps: 5399.57715 + dps: 7538.66585 + tps: 5413.92739 } } dps_results: { key: "TestFeral-AllItems-Gladiator'sWildhide" value: { - dps: 6057.95459 - tps: 4363.37026 + dps: 6045.30453 + tps: 4353.71564 } } dps_results: { key: "TestFeral-AllItems-GlowingTwilightScale-54573" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-GlowingTwilightScale-54589" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7549.1448 - tps: 5422.48925 + dps: 7561.06319 + tps: 5430.72695 } } dps_results: { key: "TestFeral-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-Heartpierce-49982" value: { - dps: 7820.74684 - tps: 5617.49551 + dps: 7857.20349 + tps: 5643.37973 } } dps_results: { key: "TestFeral-AllItems-Heartpierce-50641" value: { - dps: 7931.98427 - tps: 5696.32451 + dps: 7914.39287 + tps: 5683.53547 } } dps_results: { key: "TestFeral-AllItems-IdolofLunarFury-47670" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-IdolofMutilation-47668" value: { - dps: 7880.6686 - tps: 5660.3391 + dps: 7900.70711 + tps: 5674.41688 } } dps_results: { key: "TestFeral-AllItems-IdoloftheCorruptor-45509" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 7889.50712 - tps: 5666.53967 + dps: 7918.75297 + tps: 5686.93029 } } dps_results: { key: "TestFeral-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 7644.19059 - tps: 5492.43972 + dps: 7634.43875 + tps: 5484.99241 } } dps_results: { key: "TestFeral-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7586.36733 - tps: 5451.38521 + dps: 7586.92315 + tps: 5451.40591 } } dps_results: { key: "TestFeral-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7580.79626 - tps: 5447.42974 + dps: 7585.18074 + tps: 5450.1688 } } dps_results: { key: "TestFeral-AllItems-IncisorFragment-37723" value: { - dps: 7608.6812 - tps: 5464.61052 + dps: 7576.07364 + tps: 5441.53394 } } dps_results: { key: "TestFeral-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7586.5748 - tps: 5451.53251 + dps: 7595.18298 + tps: 5457.27038 hps: 12.24352 } } dps_results: { key: "TestFeral-AllItems-LasherweaveBattlegear" value: { - dps: 8273.01361 - tps: 5935.16473 + dps: 8266.44026 + tps: 5930.49765 } } dps_results: { key: "TestFeral-AllItems-LasherweaveRegalia" value: { - dps: 6189.59339 - tps: 4504.17136 + dps: 6176.17275 + tps: 4494.13837 } } dps_results: { key: "TestFeral-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-Malfurion'sBattlegear" value: { - dps: 7442.62122 - tps: 5348.87675 + dps: 7419.48796 + tps: 5333.05042 } } dps_results: { key: "TestFeral-AllItems-Malfurion'sRegalia" value: { - dps: 5832.47798 - tps: 4242.04856 + dps: 5869.72912 + tps: 4273.7658 } } dps_results: { key: "TestFeral-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7591.21968 - tps: 5452.58677 + dps: 7598.12849 + tps: 5457.04331 } } dps_results: { key: "TestFeral-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7613.48633 - tps: 5468.02216 + dps: 7636.01776 + tps: 5483.94469 } } dps_results: { key: "TestFeral-AllItems-NightsongBattlegear" value: { - dps: 7385.33022 - tps: 5306.10611 + dps: 7311.21807 + tps: 5253.71084 } } dps_results: { key: "TestFeral-AllItems-NightsongGarb" value: { - dps: 5896.11258 - tps: 4252.65049 + dps: 5959.46621 + tps: 4297.55678 } } dps_results: { key: "TestFeral-AllItems-OfferingofSacrifice-37638" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7580.30624 - tps: 5447.08183 + dps: 7590.62687 + tps: 5454.03554 } } dps_results: { key: "TestFeral-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7585.01566 - tps: 5450.42552 + dps: 7595.3371 + tps: 5457.37981 } } dps_results: { key: "TestFeral-AllItems-PetrifiedScarab-21685" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-PurifiedShardoftheGods" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ReignoftheDead-47316" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ReignoftheDead-47477" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7742.73374 - tps: 5562.40536 + dps: 7746.87401 + tps: 5564.97101 } } dps_results: { key: "TestFeral-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-RuneofRepulsion-40372" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-SealofthePantheon-36993" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ShinyShardoftheGods" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-SliverofPureIce-50339" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-SliverofPureIce-50346" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-SoulPreserver-37111" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-SouloftheDead-40382" value: { - dps: 7529.74464 - tps: 5408.41599 + dps: 7541.99091 + tps: 5417.18563 } } dps_results: { key: "TestFeral-AllItems-SparkofLife-37657" value: { - dps: 7467.89454 - tps: 5364.87635 + dps: 7472.726 + tps: 5368.00754 } } dps_results: { key: "TestFeral-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7583.72433 - tps: 5448.53645 + dps: 7571.42931 + tps: 5440.10613 } } dps_results: { key: "TestFeral-AllItems-StormshroudArmor" value: { - dps: 6262.70055 - tps: 4507.6181 + dps: 6232.59846 + tps: 4486.24561 } } dps_results: { key: "TestFeral-AllItems-SwiftSkyflareDiamond" value: { - dps: 7585.01566 - tps: 5450.42552 + dps: 7595.3371 + tps: 5457.37981 } } dps_results: { key: "TestFeral-AllItems-SwiftStarflareDiamond" value: { - dps: 7580.30624 - tps: 5447.08183 + dps: 7590.62687 + tps: 5454.03554 } } dps_results: { key: "TestFeral-AllItems-SwiftWindfireDiamond" value: { - dps: 7572.06475 - tps: 5441.23037 + dps: 7582.38397 + tps: 5448.18308 } } dps_results: { key: "TestFeral-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-TearsoftheVanquished-47215" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-ThunderheartHarness" value: { - dps: 6072.83734 - tps: 4374.90925 + dps: 6078.62789 + tps: 4378.12309 } } dps_results: { key: "TestFeral-AllItems-ThunderheartRegalia" value: { - dps: 5256.68083 - tps: 3795.73727 + dps: 5198.774 + tps: 3754.773 } } dps_results: { key: "TestFeral-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7625.7738 - tps: 5479.51337 + dps: 7574.78837 + tps: 5442.93978 } } dps_results: { key: "TestFeral-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7591.20338 - tps: 5454.66923 + dps: 7606.06931 + tps: 5465.29882 } } dps_results: { key: "TestFeral-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7633.51231 - tps: 5484.70856 + dps: 7639.60044 + tps: 5489.03114 } } dps_results: { key: "TestFeral-AllItems-TirelessSkyflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-TirelessStarflareDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7464.78658 - tps: 5362.6697 + dps: 7471.05691 + tps: 5366.89727 } } dps_results: { key: "TestFeral-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7560.29119 - tps: 5432.87115 + dps: 7570.60839 + tps: 5439.82242 } } dps_results: { key: "TestFeral-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6427.34382 - tps: 4625.48704 + dps: 6433.93705 + tps: 4629.56994 } } dps_results: { key: "TestFeral-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6334.68127 - tps: 4562.91246 + dps: 6374.6777 + tps: 4590.93599 } } dps_results: { key: "TestFeral-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-AllItems-WingedTalisman-37844" value: { - dps: 7435.35977 - tps: 5341.5523 + dps: 7406.89649 + tps: 5321.41816 } } dps_results: { key: "TestFeral-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 7593.36531 - tps: 5456.35377 + dps: 7596.74148 + tps: 5458.37692 } } dps_results: { key: "TestFeral-Average-Default" value: { - dps: 7788.0939 - tps: 5594.44081 + dps: 7790.28345 + tps: 5595.73491 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-LongMultiTarget" value: { - dps: 7742.73374 - tps: 5562.40536 + dps: 7746.87401 + tps: 5564.97101 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-LongSingleTarget" value: { - dps: 7742.73374 - tps: 5562.40536 + dps: 7746.87401 + tps: 5564.97101 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-FullBuffs-ShortSingleTarget" value: { - dps: 8472.85959 - tps: 6073.31604 + dps: 8542.95421 + tps: 6120.83962 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-FullBuffs-LongMultiTarget" value: { - dps: 7775.9294 - tps: 5585.97427 + dps: 7777.77246 + tps: 5587.13327 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-FullBuffs-LongSingleTarget" value: { - dps: 7775.9294 - tps: 5585.97427 + dps: 7777.77246 + tps: 5587.13327 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-FullBuffs-ShortSingleTarget" value: { - dps: 8611.69099 - tps: 6171.13847 + dps: 8476.9692 + tps: 6073.99026 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-NoBuffs-LongMultiTarget" value: { - dps: 4874.10809 - tps: 3523.96105 + dps: 4856.96743 + tps: 3511.49203 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-NoBuffs-LongSingleTarget" value: { - dps: 4874.10809 - tps: 3523.96105 + dps: 4856.96743 + tps: 3511.49203 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBleed-NoBuffs-ShortSingleTarget" value: { - dps: 5069.91858 - tps: 3655.35826 + dps: 5080.49582 + tps: 3659.87663 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-LongMultiTarget" value: { - dps: 4849.90006 - tps: 3506.62378 + dps: 4851.74041 + tps: 3507.93042 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-LongSingleTarget" value: { - dps: 4849.90006 - tps: 3506.62378 + dps: 4851.74041 + tps: 3507.93042 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Default-NoBuffs-ShortSingleTarget" value: { - dps: 5098.10689 - tps: 3674.62409 + dps: 5117.48766 + tps: 3686.14084 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-FullBuffs-LongMultiTarget" value: { - dps: 22992.33137 - tps: 16645.5556 + dps: 22860.1726 + tps: 16534.17882 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-FullBuffs-LongSingleTarget" value: { - dps: 4749.28634 - tps: 3450.72612 + dps: 4756.54831 + tps: 3455.18339 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-FullBuffs-ShortSingleTarget" value: { - dps: 5674.76106 - tps: 4093.28701 + dps: 5627.02645 + tps: 4059.4234 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-NoBuffs-LongMultiTarget" value: { - dps: 14733.85351 - tps: 10879.67439 + dps: 14513.64196 + tps: 10690.98136 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-NoBuffs-LongSingleTarget" value: { - dps: 2572.50188 - tps: 1908.10689 + dps: 2560.5779 + tps: 1897.82888 } } dps_results: { key: "TestFeral-Settings-Tauren-P1-Flower-Aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2862.92701 - tps: 2097.3836 + dps: 2811.72934 + tps: 2060.87709 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-FullBuffs-LongMultiTarget" value: { - dps: 10105.41652 - tps: 7238.19004 + dps: 10079.62949 + tps: 7220.25518 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-FullBuffs-LongSingleTarget" value: { - dps: 10105.41652 - tps: 7238.19004 + dps: 10079.62949 + tps: 7220.25518 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-FullBuffs-ShortSingleTarget" value: { - dps: 11585.59846 - tps: 8279.99524 + dps: 11525.23547 + tps: 8234.89392 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-FullBuffs-LongMultiTarget" value: { - dps: 10060.83211 - tps: 7207.05861 + dps: 10067.64068 + tps: 7211.81791 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-FullBuffs-LongSingleTarget" value: { - dps: 10060.83211 - tps: 7207.05861 + dps: 10067.64068 + tps: 7211.81791 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-FullBuffs-ShortSingleTarget" value: { - dps: 11545.98902 - tps: 8251.49861 + dps: 11575.09147 + tps: 8271.03954 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-LongMultiTarget" value: { - dps: 6269.60608 - tps: 4514.09155 + dps: 6285.6676 + tps: 4525.12129 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-LongSingleTarget" value: { - dps: 6269.60608 - tps: 4514.09155 + dps: 6285.6676 + tps: 4525.12129 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-ShortSingleTarget" value: { - dps: 6889.90957 - tps: 4946.05613 + dps: 6885.95483 + tps: 4939.88287 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-LongMultiTarget" value: { - dps: 6263.03005 - tps: 4509.7965 + dps: 6312.36343 + tps: 4543.47704 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-LongSingleTarget" value: { - dps: 6263.03005 - tps: 4509.7965 + dps: 6312.36343 + tps: 4543.47704 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6860.04227 - tps: 4925.59821 + dps: 6873.9667 + tps: 4931.37129 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-FullBuffs-LongMultiTarget" value: { - dps: 31448.6377 - tps: 22628.51999 + dps: 31741.19376 + tps: 22847.55886 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-FullBuffs-LongSingleTarget" value: { - dps: 6340.54825 - tps: 4579.07443 + dps: 6329.79182 + tps: 4569.76952 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-FullBuffs-ShortSingleTarget" value: { - dps: 7566.49644 - tps: 5436.30673 + dps: 7639.2528 + tps: 5487.01218 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-NoBuffs-LongMultiTarget" value: { - dps: 20666.67348 - tps: 15082.61032 + dps: 20694.54267 + tps: 15099.29804 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-NoBuffs-LongSingleTarget" value: { - dps: 3509.95358 - tps: 2572.82049 + dps: 3496.10886 + tps: 2561.7007 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Flower-Aoe-NoBuffs-ShortSingleTarget" value: { - dps: 3961.51157 - tps: 2877.49187 + dps: 3879.92814 + tps: 2815.94847 } } dps_results: { key: "TestFeral-SwitchInFrontOfTarget-Default" value: { - dps: 6270.42779 - tps: 4515.34803 + dps: 6274.08483 + tps: 4517.27145 } } diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results index ffaa35cbfe..5cd1204a7d 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results @@ -46,935 +46,935 @@ character_stats_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Althor'sAbacus-50359" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Althor'sAbacus-50366" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-AustereEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Bandit'sInsignia-40371" value: { - dps: 9842.44041 - tps: 7051.70136 + dps: 9801.72784 + tps: 7022.57107 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BaubleofTrueBlood-50354" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 90.47701 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BaubleofTrueBlood-50726" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 90.47701 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 9703.71202 - tps: 6955.52259 + dps: 9641.38288 + tps: 6911.56804 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7571.46168 - tps: 5441.25091 + dps: 7578.56824 + tps: 5445.69828 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BracingEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6785.58723 + dps: 9614.07257 + tps: 6754.33417 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ChaoticSkyflareDiamond" value: { - dps: 9919.58257 - tps: 7108.79068 + dps: 9855.85907 + tps: 7063.84614 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-CorpseTongueCoin-50349" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-CorpseTongueCoin-50352" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 64 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 9802.53899 - tps: 7023.82007 + dps: 9815.77529 + tps: 7033.06827 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DarkmoonCard:Death-42990" value: { - dps: 9837.64883 - tps: 7048.29934 + dps: 9816.24536 + tps: 7032.87851 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 9845.1149 - tps: 7053.60024 + dps: 9817.44531 + tps: 7034.10441 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Death'sChoice-47464" value: { - dps: 10189.55873 - tps: 7298.23015 + dps: 10222.13884 + tps: 7321.43682 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 9794.67709 - tps: 7018.01376 + dps: 9740.16485 + tps: 6978.78656 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Deathbringer'sWill-50362" value: { - dps: 10184.47917 - tps: 7294.84802 + dps: 10227.43143 + tps: 7324.59626 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Deathbringer'sWill-50363" value: { - dps: 10297.68185 - tps: 7375.29671 + dps: 10302.63469 + tps: 7378.73845 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Defender'sCode-40257" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DestructiveSkyflareDiamond" value: { - dps: 9710.65824 - tps: 6960.4544 + dps: 9648.74213 + tps: 6916.79311 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DislodgedForeignObject-50348" value: { - dps: 9851.14205 - tps: 7057.95431 + dps: 9832.74881 + tps: 7044.14724 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DislodgedForeignObject-50353" value: { - dps: 9841.05209 - tps: 7050.64087 + dps: 9859.13014 + tps: 7063.02756 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DreamwalkerBattlegear" value: { - dps: 8479.28017 - tps: 6086.32555 + dps: 8411.00012 + tps: 6036.65012 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DreamwalkerGarb" value: { - dps: 7223.97117 - tps: 5196.32753 + dps: 7221.86031 + tps: 5194.3801 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EffulgentSkyflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EmberSkyflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 9703.71202 - tps: 6955.52259 + dps: 9641.38288 + tps: 6911.56804 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EnigmaticStarflareDiamond" value: { - dps: 9698.81875 - tps: 6952.04837 + dps: 9635.79121 + tps: 6907.59796 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EphemeralSnowflake-50260" value: { - dps: 9783.73176 - tps: 7010.31736 + dps: 9684.26008 + tps: 6939.31854 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EssenceofGossamer-37220" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EternalEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 9837.11882 - tps: 7047.5491 + dps: 9811.72424 + tps: 7029.81809 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-EyeoftheBroodmother-45308" value: { - dps: 9790.95429 - tps: 7015.07143 + dps: 9766.84527 + tps: 6998.02881 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ForethoughtTalisman-40258" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ForgeEmber-37660" value: { - dps: 9777.49629 - tps: 7005.51625 + dps: 9721.32986 + tps: 6965.78766 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ForlornSkyflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ForlornStarflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 9879.02588 - tps: 7077.82662 + dps: 9837.52375 + tps: 7048.21053 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-FuturesightRune-38763" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Gladiator'sSanctuary" value: { - dps: 9096.15861 - tps: 6523.56138 + dps: 9116.23461 + tps: 6537.36661 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Gladiator'sWildhide" value: { - dps: 7339.64617 - tps: 5276.36275 + dps: 7372.25391 + tps: 5299.06553 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-GlowingTwilightScale-54573" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-GlowingTwilightScale-54589" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-GnomishLightningGenerator-41121" value: { - dps: 9814.68898 - tps: 7031.6987 + dps: 9792.4215 + tps: 7016.11315 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Heartpierce-49982" value: { - dps: 10054.56117 - tps: 7204.70027 + dps: 10057.44557 + tps: 7206.29947 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Heartpierce-50641" value: { - dps: 10079.08846 - tps: 7222.11464 + dps: 10088.6735 + tps: 7228.39652 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdolofLunarFury-47670" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdolofMutilation-47668" value: { - dps: 10013.24542 - tps: 7175.8896 + dps: 9925.21748 + tps: 7113.09061 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheCorruptor-45509" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 9954.12278 - tps: 7133.98731 + dps: 9895.19813 + tps: 7091.77687 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 9691.76332 - tps: 6947.03901 + dps: 9637.71854 + tps: 6909.04115 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 9703.71202 - tps: 6955.52259 + dps: 9641.38288 + tps: 6911.56804 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ImpassiveStarflareDiamond" value: { - dps: 9698.81875 - tps: 6952.04837 + dps: 9635.79121 + tps: 6907.59796 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IncisorFragment-37723" value: { - dps: 9835.66883 - tps: 7046.96832 + dps: 9827.0824 + tps: 7040.49803 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 9689.01093 - tps: 6945.1596 + dps: 9643.67647 + tps: 6913.19649 hps: 13.49381 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-LasherweaveBattlegear" value: { - dps: 9827.26395 - tps: 7041.8983 + dps: 9839.71736 + tps: 7050.96458 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-LasherweaveRegalia" value: { - dps: 7507.03544 - tps: 5398.2006 + dps: 7533.33074 + tps: 5416.04761 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-MajesticDragonFigurine-40430" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Malfurion'sBattlegear" value: { - dps: 8807.83132 - tps: 6321.54132 + dps: 8798.28245 + tps: 6314.61205 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Malfurion'sRegalia" value: { - dps: 7173.94501 - tps: 5161.40725 + dps: 7166.97454 + tps: 5156.0095 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-MeteoriteWhetstone-37390" value: { - dps: 9903.74384 - tps: 7095.07722 + dps: 9900.04027 + tps: 7092.14854 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 9884.19489 - tps: 7080.89832 + dps: 9833.41238 + tps: 7045.74017 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NightsongBattlegear" value: { - dps: 8810.70284 - tps: 6322.38351 + dps: 8818.29735 + tps: 6326.65381 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NightsongGarb" value: { - dps: 7090.35739 - tps: 5102.58355 + dps: 7118.67332 + tps: 5121.71563 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-OfferingofSacrifice-37638" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PersistentEarthshatterDiamond" value: { - dps: 9683.35271 - tps: 6941.14227 + dps: 9638.03763 + tps: 6909.19292 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 9689.01093 - tps: 6945.1596 + dps: 9643.67647 + tps: 6913.19649 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PetrifiedScarab-21685" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-PurifiedShardoftheGods" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ReignoftheDead-47316" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ReignoftheDead-47477" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 9924.98693 - tps: 7112.62777 + dps: 9860.2215 + tps: 7066.94346 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-RuneofRepulsion-40372" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SealofthePantheon-36993" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ShinyShardoftheGods" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SliverofPureIce-50339" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SliverofPureIce-50346" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SoulPreserver-37111" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SouloftheDead-40382" value: { - dps: 9795.66346 - tps: 7018.41494 + dps: 9770.34931 + tps: 7000.51668 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SparkofLife-37657" value: { - dps: 9760.24534 - tps: 6993.49243 + dps: 9688.2825 + tps: 6941.80052 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 9821.23574 - tps: 7038.51571 + dps: 9791.40197 + tps: 7017.55809 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-StormshroudArmor" value: { - dps: 7718.35933 - tps: 5543.60379 + dps: 7719.9569 + tps: 5545.48593 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SwiftSkyflareDiamond" value: { - dps: 9689.01093 - tps: 6945.1596 + dps: 9643.67647 + tps: 6913.19649 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SwiftStarflareDiamond" value: { - dps: 9683.35271 - tps: 6941.14227 + dps: 9638.03763 + tps: 6909.19292 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SwiftWindfireDiamond" value: { - dps: 9673.45083 - tps: 6934.11193 + dps: 9628.16966 + tps: 6902.18666 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TearsoftheVanquished-47215" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TheGeneral'sHeart-45507" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ThunderheartHarness" value: { - dps: 6995.63198 - tps: 5030.24301 + dps: 6982.80231 + tps: 5020.8348 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ThunderheartRegalia" value: { - dps: 6146.99098 - tps: 4428.75491 + dps: 6156.02874 + tps: 4434.72301 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ThunderingSkyflareDiamond" value: { - dps: 9656.62189 - tps: 6922.53731 + dps: 9641.88057 + tps: 6911.84662 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TinyAbominationinaJar-50351" value: { - dps: 9798.31036 - tps: 7022.98656 + dps: 9839.51425 + tps: 7052.39089 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TinyAbominationinaJar-50706" value: { - dps: 9819.41374 - tps: 7038.04475 + dps: 9872.10021 + tps: 7074.62948 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TirelessSkyflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TirelessStarflareDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 9677.91151 - tps: 6934.88584 + dps: 9686.47155 + tps: 6940.51475 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 9659.30529 - tps: 6924.0686 + dps: 9614.07257 + tps: 6892.17773 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 7898.39575 - tps: 5673.22453 + dps: 7898.59926 + tps: 5673.14466 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7436.02725 - tps: 5345.84033 + dps: 7493.86612 + tps: 5386.45721 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-WingedTalisman-37844" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9572.54108 + tps: 6862.69037 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Average-Default" value: { - dps: 9935.96195 - tps: 7120.64338 + dps: 9924.52334 + tps: 7112.22712 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-LongMultiTarget" value: { - dps: 9924.98693 - tps: 7112.62777 + dps: 9860.2215 + tps: 7066.94346 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-LongSingleTarget" value: { - dps: 9924.98693 - tps: 7112.62777 + dps: 9860.2215 + tps: 7066.94346 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-ShortSingleTarget" value: { - dps: 11222.82517 - tps: 8025.04374 + dps: 11192.03862 + tps: 8001.31562 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongMultiTarget" value: { - dps: 6111.88693 - tps: 4403.83104 + dps: 6154.17682 + tps: 4433.70729 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongSingleTarget" value: { - dps: 6111.88693 - tps: 4403.83104 + dps: 6154.17682 + tps: 4433.70729 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6633.18983 - tps: 4767.15051 + dps: 6580.96349 + tps: 4725.20868 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-SwitchInFrontOfTarget-Default" value: { - dps: 7553.98656 - tps: 5428.02093 + dps: 7595.23162 + tps: 5456.33269 } } diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results index 80c9d5aa34..4632a01379 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results @@ -46,935 +46,935 @@ character_stats_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Althor'sAbacus-50359" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Althor'sAbacus-50366" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-AustereEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Bandit'sInsignia-40371" value: { - dps: 9838.74018 - tps: 7049.37334 + dps: 9798.51663 + tps: 7020.44069 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BaubleofTrueBlood-50354" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 90.47701 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BaubleofTrueBlood-50726" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 90.47701 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 9753.3043 - tps: 6990.88268 + dps: 9721.42987 + tps: 6967.95269 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7594.33406 - tps: 5457.56509 + dps: 7594.01516 + tps: 5456.88995 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BracingEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6823.61305 + dps: 9699.26953 + tps: 6813.24776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ChaoticSkyflareDiamond" value: { - dps: 9970.82705 - tps: 7145.32383 + dps: 9937.72604 + tps: 7121.52297 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-CorpseTongueCoin-50349" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-CorpseTongueCoin-50352" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 hps: 64 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 9802.52155 - tps: 7023.65811 + dps: 9793.40033 + tps: 7017.10726 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DarkmoonCard:Death-42990" value: { - dps: 9837.52225 - tps: 7047.91032 + dps: 9814.0667 + tps: 7031.33166 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 9845.26593 - tps: 7053.93184 + dps: 9802.98649 + tps: 7023.24035 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Death'sChoice-47464" value: { - dps: 10184.14362 - tps: 7294.46021 + dps: 10149.96491 + tps: 7269.52024 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 9794.67709 - tps: 7018.01376 + dps: 9740.16485 + tps: 6978.78656 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Deathbringer'sWill-50362" value: { - dps: 10212.55822 - tps: 7314.63457 + dps: 10223.65865 + tps: 7322.14195 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Deathbringer'sWill-50363" value: { - dps: 10212.77289 - tps: 7314.78699 + dps: 10253.15287 + tps: 7343.30721 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Defender'sCode-40257" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DestructiveSkyflareDiamond" value: { - dps: 9761.55953 - tps: 6996.74389 + dps: 9729.06699 + tps: 6973.37504 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DislodgedForeignObject-50348" value: { - dps: 9851.14205 - tps: 7057.95431 + dps: 9832.74881 + tps: 7044.14724 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DislodgedForeignObject-50353" value: { - dps: 9841.05209 - tps: 7050.64087 + dps: 9859.13014 + tps: 7063.02756 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DreamwalkerBattlegear" value: { - dps: 8486.39881 - tps: 6091.00584 + dps: 8434.42691 + tps: 6053.05879 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DreamwalkerGarb" value: { - dps: 7228.44466 - tps: 5199.42892 + dps: 7223.40095 + tps: 5195.69831 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EffulgentSkyflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EmberSkyflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 9753.3043 - tps: 6990.88268 + dps: 9721.42987 + tps: 6967.95269 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EnigmaticStarflareDiamond" value: { - dps: 9749.60291 - tps: 6988.25469 + dps: 9716.42879 + tps: 6964.40192 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EphemeralSnowflake-50260" value: { - dps: 9783.73176 - tps: 7010.31736 + dps: 9684.26008 + tps: 6939.31854 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EssenceofGossamer-37220" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EternalEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 9836.57951 - tps: 7047.16619 + dps: 9810.25026 + tps: 7028.99593 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-EyeoftheBroodmother-45308" value: { - dps: 9790.95429 - tps: 7015.07143 + dps: 9766.84527 + tps: 6998.02881 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ForethoughtTalisman-40258" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ForgeEmber-37660" value: { - dps: 9777.49629 - tps: 7005.51625 + dps: 9721.32986 + tps: 6965.78766 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ForlornSkyflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ForlornStarflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 9867.00729 - tps: 7069.29342 + dps: 9824.46183 + tps: 7038.93657 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-FuturesightRune-38763" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Gladiator'sSanctuary" value: { - dps: 9101.8802 - tps: 6527.6237 + dps: 9085.82224 + tps: 6515.84862 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Gladiator'sWildhide" value: { - dps: 7352.43662 - tps: 5285.36918 + dps: 7333.36972 + tps: 5271.45775 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-GlowingTwilightScale-54573" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-GlowingTwilightScale-54589" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-GnomishLightningGenerator-41121" value: { - dps: 9814.68898 - tps: 7031.6987 + dps: 9792.4215 + tps: 7016.11315 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Heartpierce-49982" value: { - dps: 10177.52973 - tps: 7291.93316 + dps: 10154.76897 + tps: 7275.09994 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Heartpierce-50641" value: { - dps: 10178.17658 - tps: 7292.24285 + dps: 10177.71189 + tps: 7291.4642 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdolofLunarFury-47670" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdolofMutilation-47668" value: { - dps: 10071.29436 - tps: 7216.65562 + dps: 10028.9884 + tps: 7186.39403 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheCorruptor-45509" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 10010.99072 - tps: 7173.91482 + dps: 9977.96897 + tps: 7150.17024 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 9739.54342 - tps: 6981.11246 + dps: 9719.0073 + tps: 6966.23266 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 9753.3043 - tps: 6990.88268 + dps: 9721.42987 + tps: 6967.95269 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ImpassiveStarflareDiamond" value: { - dps: 9749.60291 - tps: 6988.25469 + dps: 9716.42879 + tps: 6964.40192 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IncisorFragment-37723" value: { - dps: 9835.66883 - tps: 7046.96832 + dps: 9827.0824 + tps: 7040.49803 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 9743.7678 - tps: 6984.11177 + dps: 9729.15806 + tps: 6973.51449 hps: 13.49381 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-LasherweaveBattlegear" value: { - dps: 9915.58778 - tps: 7104.90736 + dps: 9926.30474 + tps: 7112.29204 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-LasherweaveRegalia" value: { - dps: 7496.24954 - tps: 5390.31825 + dps: 7496.92221 + tps: 5390.34713 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-MajesticDragonFigurine-40430" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Malfurion'sBattlegear" value: { - dps: 8831.1925 - tps: 6338.12776 + dps: 8802.43222 + tps: 6317.55838 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Malfurion'sRegalia" value: { - dps: 7192.43481 - tps: 5174.83416 + dps: 7162.60665 + tps: 5152.53436 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-MeteoriteWhetstone-37390" value: { - dps: 9882.6174 - tps: 7080.30181 + dps: 9903.75146 + tps: 7094.93305 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 9884.19489 - tps: 7080.89832 + dps: 9833.41238 + tps: 7045.74017 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NightsongBattlegear" value: { - dps: 8846.10211 - tps: 6346.46998 + dps: 8831.72278 + tps: 6336.03629 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NightsongGarb" value: { - dps: 7110.75147 - tps: 5116.61463 + dps: 7106.79023 + tps: 5113.503 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-OfferingofSacrifice-37638" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PersistentEarthshatterDiamond" value: { - dps: 9738.06926 - tps: 6980.0658 + dps: 9723.46501 + tps: 6969.47242 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 9743.7678 - tps: 6984.11177 + dps: 9729.15806 + tps: 6973.51449 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PetrifiedScarab-21685" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-PurifiedShardoftheGods" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ReignoftheDead-47316" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ReignoftheDead-47477" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 9968.5641 - tps: 7143.71714 + dps: 9950.19119 + tps: 7130.44801 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-RuneofRepulsion-40372" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SealofthePantheon-36993" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ShinyShardoftheGods" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SliverofPureIce-50339" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SliverofPureIce-50346" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SoulPreserver-37111" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SouloftheDead-40382" value: { - dps: 9795.66346 - tps: 7018.41494 + dps: 9770.34931 + tps: 7000.51668 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SparkofLife-37657" value: { - dps: 9760.24534 - tps: 6993.49243 + dps: 9688.2825 + tps: 6941.80052 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 9821.23574 - tps: 7038.51571 + dps: 9791.40197 + tps: 7017.55809 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-StormshroudArmor" value: { - dps: 7754.63019 - tps: 5569.80482 + dps: 7736.43482 + tps: 5557.26004 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SwiftSkyflareDiamond" value: { - dps: 9743.7678 - tps: 6984.11177 + dps: 9729.15806 + tps: 6973.51449 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SwiftStarflareDiamond" value: { - dps: 9738.06926 - tps: 6980.0658 + dps: 9723.46501 + tps: 6969.47242 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SwiftWindfireDiamond" value: { - dps: 9728.09682 - tps: 6972.98537 + dps: 9713.50217 + tps: 6962.3988 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TearsoftheVanquished-47215" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TheGeneral'sHeart-45507" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ThunderheartHarness" value: { - dps: 6977.09888 - tps: 5017.1593 + dps: 6991.79393 + tps: 5027.518 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ThunderheartRegalia" value: { - dps: 6097.74231 - tps: 4393.78836 + dps: 6114.00871 + tps: 4405.11314 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ThunderingSkyflareDiamond" value: { - dps: 9722.19954 - tps: 6968.94788 + dps: 9744.21714 + tps: 6984.4308 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TinyAbominationinaJar-50351" value: { - dps: 9808.61348 - tps: 7030.60092 + dps: 9808.64811 + tps: 7030.102 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TinyAbominationinaJar-50706" value: { - dps: 9829.98692 - tps: 7045.70127 + dps: 9749.55556 + tps: 6988.22107 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TirelessSkyflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TirelessStarflareDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 9677.91151 - tps: 6934.88584 + dps: 9686.47155 + tps: 6940.51475 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 9713.85047 - tps: 6962.87046 + dps: 9699.26953 + tps: 6952.29363 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 7943.752 - tps: 5705.57704 + dps: 7920.82372 + tps: 5688.92403 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7533.05943 - tps: 5414.13489 + dps: 7523.08564 + tps: 5406.75435 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-WingedTalisman-37844" value: { - dps: 9656.30557 - tps: 6919.69519 + dps: 9615.85142 + tps: 6890.82318 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9655.79647 + tps: 6921.42776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Average-Default" value: { - dps: 10015.55245 - tps: 7177.13577 + dps: 9991.32891 + tps: 7159.6304 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-LongMultiTarget" value: { - dps: 9968.5641 - tps: 7143.71714 + dps: 9950.19119 + tps: 7130.44801 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-LongSingleTarget" value: { - dps: 9968.5641 - tps: 7143.71714 + dps: 9950.19119 + tps: 7130.44801 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-FullBuffs-ShortSingleTarget" value: { - dps: 11394.223 - tps: 8146.36227 + dps: 11270.05825 + tps: 8055.58776 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongMultiTarget" value: { - dps: 6159.80284 - tps: 4438.15048 + dps: 6173.73894 + tps: 4447.89554 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongSingleTarget" value: { - dps: 6159.80284 - tps: 4438.15048 + dps: 6173.73894 + tps: 4447.89554 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6693.51492 - tps: 4809.60739 + dps: 6610.60711 + tps: 4746.62958 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-SwitchInFrontOfTarget-Default" value: { - dps: 7610.83932 - tps: 5467.78809 + dps: 7625.50102 + tps: 5477.82397 } } diff --git a/sim/druid/maul.go b/sim/druid/maul.go index 7272c6a2dd..ff0a9d4242 100644 --- a/sim/druid/maul.go +++ b/sim/druid/maul.go @@ -19,7 +19,7 @@ func (druid *Druid) registerMaulSpell(rageThreshold float64) { ActionID: core.ActionID{SpellID: 48480}, SpellSchool: core.SpellSchoolPhysical, ProcMask: core.ProcMaskMeleeMHSpecial, - Flags: core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete | core.SpellFlagAPL, + Flags: core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete, RageCost: core.RageCostOptions{ Cost: 15 - float64(druid.Talents.Ferocity), @@ -60,6 +60,8 @@ func (druid *Druid) registerMaulSpell(rageThreshold float64) { curTarget = sim.Environment.NextTargetUnit(curTarget) } + + druid.MaulQueueAura.Deactivate(sim) }, }) @@ -69,17 +71,33 @@ func (druid *Druid) registerMaulSpell(rageThreshold float64) { Duration: core.NeverExpires, }) + druid.MaulQueueSpell = druid.RegisterSpell(core.SpellConfig{ + ActionID: druid.Maul.WithTag(1), + SpellSchool: core.SpellSchoolPhysical, + ProcMask: core.ProcMaskMeleeMHSpecial, + Flags: core.SpellFlagMeleeMetrics | core.SpellFlagAPL, + + ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool { + return !druid.MaulQueueAura.IsActive() && + druid.CurrentRage() >= druid.Maul.DefaultCast.Cost && + sim.CurrentTime >= druid.Hardcast.Expires + }, + + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + druid.MaulQueueAura.Activate(sim) + }, + }) + druid.MaulRageThreshold = core.MaxFloat(druid.Maul.DefaultCast.Cost, rageThreshold) + if druid.IsUsingAPL { + druid.MaulRageThreshold = 0 + } } func (druid *Druid) QueueMaul(sim *core.Simulation) { - if druid.CurrentRage() < druid.Maul.DefaultCast.Cost { - panic("Not enough rage for HS") - } - if druid.MaulQueueAura.IsActive() { - return + if druid.MaulQueueSpell.CanCast(sim, druid.CurrentTarget) { + druid.MaulQueueSpell.Cast(sim, druid.CurrentTarget) } - druid.MaulQueueAura.Activate(sim) } // Returns true if the regular melee swing should be used, false otherwise. @@ -98,7 +116,6 @@ func (druid *Druid) MaulReplaceMH(sim *core.Simulation, mhSwingSpell *core.Spell } } - druid.MaulQueueAura.Deactivate(sim) return druid.Maul } diff --git a/sim/druid/tank/TestFeralTank.results b/sim/druid/tank/TestFeralTank.results index de98b348b0..d567c50392 100644 --- a/sim/druid/tank/TestFeralTank.results +++ b/sim/druid/tank/TestFeralTank.results @@ -46,1057 +46,1057 @@ character_stats_results: { dps_results: { key: "TestFeralTank-AllItems-Althor'sAbacus-50359" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Althor'sAbacus-50366" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 2531.96764 - tps: 5340.17724 - dtps: 5.90388 + dps: 2616.90218 + tps: 5535.31072 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-AustereEarthsiegeDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Bandit'sInsignia-40371" value: { - dps: 2592.15098 - tps: 5459.91885 - dtps: 5.9393 + dps: 2639.98168 + tps: 5575.47127 + dtps: 6.74905 } } dps_results: { key: "TestFeralTank-AllItems-BaubleofTrueBlood-50354" value: { - dps: 2484.95768 - tps: 5240.89958 - dtps: 5.67896 + dps: 2543.44945 + tps: 5383.59026 + dtps: 6.41606 hps: 85.38358 } } dps_results: { key: "TestFeralTank-AllItems-BaubleofTrueBlood-50726" value: { - dps: 2484.95768 - tps: 5240.89958 - dtps: 5.67896 + dps: 2543.44945 + tps: 5383.59026 + dtps: 6.41606 hps: 85.38358 } } dps_results: { key: "TestFeralTank-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 2461.3377 - tps: 5192.57753 - dtps: 5.90388 + dps: 2547.85868 + tps: 5392.35593 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 2009.89917 - tps: 4256.17426 - dtps: 5.60437 + dps: 2083.14965 + tps: 4434.00089 + dtps: 6.36395 } } dps_results: { key: "TestFeralTank-AllItems-BracingEarthsiegeDiamond" value: { - dps: 2447.02585 - tps: 5059.7153 - dtps: 5.90388 + dps: 2542.98989 + tps: 5276.54779 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 2439.61354 - tps: 5144.18294 - dtps: 5.90388 + dps: 2487.55817 + tps: 5267.81883 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ChaoticSkyflareDiamond" value: { - dps: 2511.17994 - tps: 5291.44845 - dtps: 5.90388 + dps: 2574.35118 + tps: 5442.74232 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-CorpseTongueCoin-50349" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-CorpseTongueCoin-50352" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 hps: 64 } } dps_results: { key: "TestFeralTank-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 2551.70623 - tps: 5387.95693 - dtps: 5.90388 + dps: 2616.09791 + tps: 5533.50868 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DarkmoonCard:Death-42990" value: { - dps: 2596.24467 - tps: 5483.69201 - dtps: 6.03384 + dps: 2640.08196 + tps: 5591.24693 + dtps: 6.74617 } } dps_results: { key: "TestFeralTank-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 2494.16991 - tps: 5258.10128 - dtps: 5.90388 + dps: 2546.19437 + tps: 5390.50298 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 2473.33651 - tps: 5217.25602 - dtps: 5.90388 + dps: 2532.82861 + tps: 5352.68558 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Death'sChoice-47464" value: { - dps: 2660.20394 - tps: 5615.1759 - dtps: 5.90388 + dps: 2703.91576 + tps: 5701.22504 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 2524.73999 - tps: 5326.67045 - dtps: 5.90388 + dps: 2581.91842 + tps: 5458.73187 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Deathbringer'sWill-50362" value: { - dps: 2684.24779 - tps: 5668.70602 - dtps: 5.90388 + dps: 2737.22228 + tps: 5790.12772 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Deathbringer'sWill-50363" value: { - dps: 2712.28556 - tps: 5709.29935 - dtps: 5.90388 + dps: 2779.90088 + tps: 5867.29127 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Defender'sCode-40257" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DestructiveSkyflareDiamond" value: { - dps: 2479.51287 - tps: 5232.87336 - dtps: 5.90388 + dps: 2544.90066 + tps: 5389.05084 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DislodgedForeignObject-50348" value: { - dps: 2587.8729 - tps: 5478.13288 - dtps: 5.90388 + dps: 2665.67429 + tps: 5655.41635 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DislodgedForeignObject-50353" value: { - dps: 2580.32101 - tps: 5449.90064 - dtps: 5.90388 + dps: 2640.85123 + tps: 5593.19015 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DreamwalkerBattlegear" value: { - dps: 2394.71208 - tps: 5033.03301 - dtps: 5.98221 + dps: 2469.40401 + tps: 5216.78951 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-DreamwalkerGarb" value: { - dps: 2038.15316 - tps: 4346.72452 - dtps: 6.52394 + dps: 2088.90003 + tps: 4466.81641 + dtps: 7.20775 } } dps_results: { key: "TestFeralTank-AllItems-EffulgentSkyflareDiamond" value: { - dps: 2455.59362 - tps: 5186.44024 - dtps: 5.7858 + dps: 2543.36705 + tps: 5385.18354 + dtps: 6.53093 } } dps_results: { key: "TestFeralTank-AllItems-EmberSkyflareDiamond" value: { - dps: 2449.49977 - tps: 5168.30133 - dtps: 5.90388 + dps: 2546.81241 + tps: 5392.58016 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 2461.3377 - tps: 5192.57753 - dtps: 5.90388 + dps: 2547.85868 + tps: 5392.35593 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-EnigmaticStarflareDiamond" value: { - dps: 2456.83298 - tps: 5183.58929 - dtps: 5.90388 + dps: 2546.47044 + tps: 5391.21801 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-EphemeralSnowflake-50260" value: { - dps: 2549.52772 - tps: 5388.49109 - dtps: 5.90388 + dps: 2596.16116 + tps: 5498.47162 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-EternalEarthsiegeDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 2559.46962 - tps: 5399.22861 - dtps: 5.98221 + dps: 2615.63966 + tps: 5538.92905 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-EyeoftheBroodmother-45308" value: { - dps: 2549.39795 - tps: 5381.02699 - dtps: 5.98221 + dps: 2593.91441 + tps: 5486.4798 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 2491.4123 - tps: 5251.72575 - dtps: 5.90388 + dps: 2541.84762 + tps: 5381.54906 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ForethoughtTalisman-40258" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ForgeEmber-37660" value: { - dps: 2534.70143 - tps: 5355.6252 - dtps: 5.98221 + dps: 2569.57051 + tps: 5431.16177 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ForlornSkyflareDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ForlornStarflareDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 2480.16826 - tps: 5230.04938 - dtps: 5.90388 + dps: 2542.80906 + tps: 5372.08892 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 2582.765 - tps: 5436.2161 - dtps: 5.90388 + dps: 2645.16217 + tps: 5595.88588 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-FuturesightRune-38763" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Gladiator'sSanctuary" value: { - dps: 2565.95613 - tps: 5375.66554 - dtps: 6.52394 + dps: 2636.16657 + tps: 5534.99526 + dtps: 7.20775 } } dps_results: { key: "TestFeralTank-AllItems-Gladiator'sWildhide" value: { - dps: 2029.42859 - tps: 4314.31969 - dtps: 6.63155 + dps: 2090.95376 + tps: 4451.3795 + dtps: 7.20775 } } dps_results: { key: "TestFeralTank-AllItems-GlowingTwilightScale-54573" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-GlowingTwilightScale-54589" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-GnomishLightningGenerator-41121" value: { - dps: 2579.07633 - tps: 5444.13752 - dtps: 5.98221 + dps: 2625.42931 + tps: 5559.60508 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 2450.89571 - tps: 5167.60961 - dtps: 5.90388 + dps: 2519.74769 + tps: 5330.28238 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Heartpierce-49982" value: { - dps: 2522.83071 - tps: 5330.69426 - dtps: 5.90388 + dps: 2599.9673 + tps: 5508.39437 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Heartpierce-50641" value: { - dps: 2525.74215 - tps: 5340.34203 - dtps: 5.90388 + dps: 2621.26359 + tps: 5555.90014 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdolofLunarFury-47670" value: { - dps: 2439.61354 - tps: 5144.18294 - dtps: 5.90388 + dps: 2487.55817 + tps: 5267.81883 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdolofMutilation-47668" value: { - dps: 2439.61354 - tps: 5144.18294 - dtps: 5.90388 + dps: 2487.55817 + tps: 5267.81883 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheCorruptor-45509" value: { - dps: 2494.25707 - tps: 5266.05272 - dtps: 5.90388 + dps: 2535.07709 + tps: 5365.2147 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 2485.37893 - tps: 5243.22342 - dtps: 5.90388 + dps: 2558.60783 + tps: 5409.8124 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 2440.57196 - tps: 5146.77808 - dtps: 5.90388 + dps: 2496.92692 + tps: 5291.47113 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 2459.76004 - tps: 5186.22902 - dtps: 5.90388 + dps: 2512.93787 + tps: 5321.85174 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 2439.61354 - tps: 5144.18294 - dtps: 5.90388 + dps: 2487.55817 + tps: 5267.81883 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 2456.01293 - tps: 5176.61966 - dtps: 5.90388 + dps: 2507.30502 + tps: 5299.77048 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 2461.3377 - tps: 5192.57753 - dtps: 5.90388 + dps: 2547.85868 + tps: 5392.35593 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ImpassiveStarflareDiamond" value: { - dps: 2456.83298 - tps: 5183.58929 - dtps: 5.90388 + dps: 2546.47044 + tps: 5391.21801 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-IncisorFragment-37723" value: { - dps: 2595.71186 - tps: 5466.22941 - dtps: 5.90388 + dps: 2624.80617 + tps: 5550.10658 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 2449.36802 - tps: 5168.02437 - dtps: 5.90388 + dps: 2546.85335 + tps: 5392.60622 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 2487.19164 - tps: 5244.80382 - dtps: 5.90388 - hps: 22.78762 + dps: 2542.7589 + tps: 5381.61158 + dtps: 6.66421 + hps: 23.30004 } } dps_results: { key: "TestFeralTank-AllItems-LasherweaveBattlegear" value: { - dps: 2762.91188 - tps: 5736.85306 - dtps: 5.80994 + dps: 2849.5617 + tps: 5934.31433 + dtps: 5.8645 } } dps_results: { key: "TestFeralTank-AllItems-LasherweaveRegalia" value: { - dps: 2227.5708 - tps: 4767.12526 - dtps: 6.67527 + dps: 2273.83399 + tps: 4903.35721 + dtps: 7.20775 } } dps_results: { key: "TestFeralTank-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-MajesticDragonFigurine-40430" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Malfurion'sBattlegear" value: { - dps: 2554.02897 - tps: 5366.24367 - dtps: 6.01913 + dps: 2617.13538 + tps: 5517.91636 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Malfurion'sRegalia" value: { - dps: 2067.86761 - tps: 4417.37661 - dtps: 6.52394 + dps: 2122.99078 + tps: 4557.57123 + dtps: 7.20775 } } dps_results: { key: "TestFeralTank-AllItems-MeteoriteWhetstone-37390" value: { - dps: 2579.60713 - tps: 5444.40266 - dtps: 5.98221 + dps: 2656.43272 + tps: 5639.87485 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 2563.85821 - tps: 5407.10244 - dtps: 7.4365 + dps: 2649.52021 + tps: 5572.72422 + dtps: 8.03899 } } dps_results: { key: "TestFeralTank-AllItems-NightsongBattlegear" value: { - dps: 2523.71935 - tps: 5310.22035 - dtps: 5.98221 + dps: 2583.84765 + tps: 5455.72259 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-NightsongGarb" value: { - dps: 2040.71423 - tps: 4364.82502 - dtps: 6.01913 + dps: 2089.80333 + tps: 4482.55519 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-OfferingofSacrifice-37638" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PersistentEarthshatterDiamond" value: { - dps: 2489.37925 - tps: 5254.95307 - dtps: 5.90388 + dps: 2530.6182 + tps: 5354.09229 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PetrifiedScarab-21685" value: { - dps: 2482.92524 - tps: 5229.59597 - dtps: 4.87833 + dps: 2541.87178 + tps: 5384.1804 + dtps: 5.50054 } } dps_results: { key: "TestFeralTank-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-PurifiedShardoftheGods" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ReignoftheDead-47316" value: { - dps: 2502.40535 - tps: 5276.04864 - dtps: 5.90388 + dps: 2555.77617 + tps: 5409.01134 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ReignoftheDead-47477" value: { - dps: 2504.27613 - tps: 5279.9812 - dtps: 5.90388 + dps: 2557.64201 + tps: 5412.93354 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 2516.47735 - tps: 5299.88562 - dtps: 5.90388 + dps: 2576.19815 + tps: 5446.42556 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 2481.90183 - tps: 5224.55215 - dtps: 5.90388 + dps: 2527.60223 + tps: 5339.57747 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-RuneofRepulsion-40372" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 2457.12454 - tps: 5178.90269 - dtps: 5.90388 + dps: 2507.66584 + tps: 5303.97688 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SealofthePantheon-36993" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ShinyShardoftheGods" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 2488.90476 - tps: 5252.53263 - dtps: 3.90291 + dps: 2542.72959 + tps: 5383.43509 + dtps: 4.4102 } } dps_results: { key: "TestFeralTank-AllItems-SliverofPureIce-50339" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SliverofPureIce-50346" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SoulPreserver-37111" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SouloftheDead-40382" value: { - dps: 2548.95237 - tps: 5379.96437 - dtps: 5.98221 + dps: 2603.70807 + tps: 5507.32104 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SparkofLife-37657" value: { - dps: 2512.07649 - tps: 5294.16917 - dtps: 5.90388 + dps: 2572.72465 + tps: 5457.23295 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 2575.23198 - tps: 5431.94529 - dtps: 5.90388 + dps: 2623.9945 + tps: 5555.74294 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-StormshroudArmor" value: { - dps: 1984.25532 - tps: 4199.63824 - dtps: 5.57221 + dps: 2023.27491 + tps: 4286.31573 + dtps: 6.36395 } } dps_results: { key: "TestFeralTank-AllItems-SwiftSkyflareDiamond" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SwiftStarflareDiamond" value: { - dps: 2489.37925 - tps: 5254.95307 - dtps: 5.90388 + dps: 2530.6182 + tps: 5354.09229 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-SwiftWindfireDiamond" value: { - dps: 2488.97594 - tps: 5252.68448 - dtps: 5.90388 + dps: 2531.09842 + tps: 5361.72427 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TearsoftheVanquished-47215" value: { - dps: 2494.16991 - tps: 5258.10128 - dtps: 5.90388 + dps: 2546.19437 + tps: 5390.50298 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TheGeneral'sHeart-45507" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ThunderheartHarness" value: { - dps: 2015.07661 - tps: 4407.51303 - dtps: 5.60437 + dps: 2066.03743 + tps: 4506.05122 + dtps: 6.36395 } } dps_results: { key: "TestFeralTank-AllItems-ThunderheartRegalia" value: { - dps: 1780.20539 - tps: 3805.8936 - dtps: 5.98221 + dps: 1839.36996 + tps: 3946.03654 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-ThunderingSkyflareDiamond" value: { - dps: 2485.55812 - tps: 5251.21029 - dtps: 5.90388 + dps: 2543.02166 + tps: 5393.37939 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TinyAbominationinaJar-50351" value: { - dps: 2608.11893 - tps: 5517.69085 - dtps: 5.90388 + dps: 2652.07768 + tps: 5623.52632 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TinyAbominationinaJar-50706" value: { - dps: 2619.17842 - tps: 5543.45294 - dtps: 5.90388 + dps: 2653.32531 + tps: 5621.12468 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TirelessSkyflareDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TirelessStarflareDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 2524.74899 - tps: 5328.47554 - dtps: 5.90388 + dps: 2582.10895 + tps: 5465.83662 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 2447.02585 - tps: 5162.77233 - dtps: 5.90388 + dps: 2542.98989 + tps: 5383.99834 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 2128.31862 - tps: 4506.32741 - dtps: 5.53387 + dps: 2171.68213 + tps: 4610.60813 + dtps: 6.36395 } } dps_results: { key: "TestFeralTank-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 1975.03482 - tps: 4223.66348 - dtps: 5.98221 + dps: 2007.10951 + tps: 4307.98709 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 2439.61354 - tps: 5144.18294 - dtps: 5.90388 + dps: 2487.55817 + tps: 5267.81883 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-WingedTalisman-37844" value: { - dps: 2490.35346 - tps: 5250.84332 - dtps: 5.90388 + dps: 2541.47993 + tps: 5381.16775 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 2507.6072 - tps: 5281.58276 - dtps: 5.90388 + dps: 2557.41143 + tps: 5410.66687 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-Average-Default" value: { - dps: 2597.02254 - tps: 5513.41274 - dtps: 55.42453 + dps: 2657.57976 + tps: 5652.97568 + dtps: 56.32679 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-FullBuffs-LongMultiTarget" value: { - dps: 4528.15016 - tps: 10288.69673 + dps: 4681.21197 + tps: 10670.13215 dtps: 6.22692 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-FullBuffs-LongSingleTarget" value: { - dps: 2603.27525 - tps: 5490.89613 - dtps: 5.90388 + dps: 2663.00534 + tps: 5633.75453 + dtps: 6.66421 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-FullBuffs-ShortSingleTarget" value: { - dps: 2842.90997 - tps: 6189.9024 - dtps: 29.51938 + dps: 2838.6314 + tps: 6200.51581 + dtps: 33.32105 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-NoBuffs-LongMultiTarget" value: { - dps: 1467.40078 - tps: 3528.18906 + dps: 1660.07682 + tps: 4023.95601 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-NoBuffs-LongSingleTarget" value: { - dps: 1194.99183 - tps: 2545.91112 + dps: 1262.93213 + tps: 2694.2397 } } dps_results: { key: "TestFeralTank-Settings-Tauren-P1-Default-NoBuffs-ShortSingleTarget" value: { - dps: 1069.79036 - tps: 2376.73552 + dps: 1092.571 + tps: 2434.07074 } } dps_results: { key: "TestFeralTank-SwitchInFrontOfTarget-Default" value: { - dps: 2698.43789 - tps: 5728.70352 - dtps: 48.36845 + dps: 2758.39093 + tps: 5871.52468 + dtps: 48.91906 } } diff --git a/sim/druid/tank/rotation.go b/sim/druid/tank/rotation.go index a3a17a14b4..10794976c8 100644 --- a/sim/druid/tank/rotation.go +++ b/sim/druid/tank/rotation.go @@ -30,8 +30,6 @@ func (bear *FeralTankDruid) doRotation(sim *core.Simulation) { if bear.Barkskin.IsReady(sim) { bear.Barkskin.Cast(sim, nil) } - - bear.UpdateMajorCooldowns() } else if bear.MangleBear.CanCast(sim, bear.CurrentTarget) { bear.MangleBear.Cast(sim, bear.CurrentTarget) } else if bear.shouldFaerieFire(sim) { diff --git a/ui/feral_tank_druid/presets.ts b/ui/feral_tank_druid/presets.ts index 19051d4989..0e3fceada4 100644 --- a/ui/feral_tank_druid/presets.ts +++ b/ui/feral_tank_druid/presets.ts @@ -8,7 +8,8 @@ import { Conjured } from '../core/proto/common.js'; import { Explosive } from '../core/proto/common.js'; import { UnitReference } from '../core/proto/common.js'; import { Glyphs } from '../core/proto/common.js'; -import { SavedTalents } from '../core/proto/ui.js'; +import { SavedRotation, SavedTalents } from '../core/proto/ui.js'; +import { APLRotation } from '../core/proto/apl.js'; import { FeralTankDruid_Rotation as DruidRotation, @@ -46,6 +47,31 @@ export const DefaultRotation = DruidRotation.create({ lacerateTime: 8.0, }); +export const ROTATION_DEFAULT = { + name: 'Default', + rotation: SavedRotation.create({ + specRotationOptionsJson: DruidRotation.toJsonString(DruidRotation.create({ + })), + rotation: APLRotation.fromJsonString(`{ + "enabled": true, + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48568}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48568}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":48568}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48564}}}}, + {"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":48564}}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":48564}}},"rhs":{"const":{"val":"1.2s"}}}}]}},"wait":{"duration":{"spellTimeToReady":{"spellId":{"spellId":48564}}}}}}, + {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":48560},"maxOverlap":{"const":{"val":"1.5s"}}}},"castSpell":{"spellId":{"spellId":48560}}}}, + {"action":{"castSpell":{"spellId":{"spellId":16857}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48568}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48568}}},"rhs":{"const":{"val":"8s"}}}}]}},"castSpell":{"spellId":{"spellId":48568}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},"castSpell":{"spellId":{"spellId":48562}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"25"}}}},"castSpell":{"spellId":{"spellId":48480,"tag":1}}}} + ] + }`), + }), +}; + export const DefaultOptions = DruidOptions.create({ innervateTarget: UnitReference.create(), startingRage: 20, diff --git a/ui/feral_tank_druid/sim.ts b/ui/feral_tank_druid/sim.ts index a7fa19216e..0acbef5fa4 100644 --- a/ui/feral_tank_druid/sim.ts +++ b/ui/feral_tank_druid/sim.ts @@ -2,18 +2,11 @@ import { RaidBuffs } from '../core/proto/common.js'; import { PartyBuffs } from '../core/proto/common.js'; import { IndividualBuffs } from '../core/proto/common.js'; import { Debuffs } from '../core/proto/common.js'; -import { Class } from '../core/proto/common.js'; -import { Consumes } from '../core/proto/common.js'; -import { Encounter } from '../core/proto/common.js'; -import { ItemSlot } from '../core/proto/common.js'; -import { MobType } from '../core/proto/common.js'; -import { UnitReference } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; import { Stat, PseudoStat } from '../core/proto/common.js'; import { TristateEffect } from '../core/proto/common.js' import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; -import { Sim } from '../core/sim.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; import { TypedEvent } from '../core/typed_event.js'; @@ -185,6 +178,10 @@ export class FeralTankDruidSimUI extends IndividualSimUI