From ac4df00ad3991b3dd214bf4b1d883182cb74a73a Mon Sep 17 00:00:00 2001 From: James Tanner Date: Fri, 22 Sep 2023 22:30:37 -0700 Subject: [PATCH] Move smite priest and all healing sims to Beta APL --- sim/core/dot.go | 2 +- sim/druid/restoration/restoration_test.go | 112 +--- sim/paladin/holy/holy_test.go | 122 +--- sim/priest/healing/TestDisc.results | 557 +++++++----------- sim/priest/healing/TestHoly.results | 446 +++++++------- sim/priest/healing/healing_priest_test.go | 130 ++-- sim/priest/smite/TestSmite.results | 472 +++++++-------- sim/priest/smite/smite_priest_test.go | 137 ++--- sim/rogue/TestAssassination.results | 2 +- sim/rogue/TestCombat.results | 2 +- sim/shaman/fire_elemental_totem.go | 6 +- .../restoration/TestRestoration.results | 454 ++++++-------- sim/shaman/restoration/restoration_test.go | 119 +--- ui/core/launched_sims.ts | 10 +- ui/healing_priest/sim.ts | 16 +- ui/holy_paladin/presets.ts | 7 +- ui/holy_paladin/sim.ts | 9 +- ui/hunter/sim.ts | 1 - ui/restoration_druid/sim.ts | 9 +- ui/restoration_shaman/sim.ts | 8 +- ui/smite_priest/sim.ts | 7 + 21 files changed, 1058 insertions(+), 1570 deletions(-) diff --git a/sim/core/dot.go b/sim/core/dot.go index f523a5d288..b3972392fc 100644 --- a/sim/core/dot.go +++ b/sim/core/dot.go @@ -192,8 +192,8 @@ func (dot *Dot) TickOnce(sim *Simulation) { dot.OnTick(sim, dot.Unit, dot) if dot.isChanneled && dot.Spell.Unit.IsUsingAPL { + // Note: even if the clip delay is 0ms, need a WaitUntil so that APL is called after the channel aura fully fades. if dot.MaxTicksRemaining() == 0 { - // If this was the last tick, wait 0ms to call the APL after the channel aura fully fades. dot.Spell.Unit.WaitUntil(sim, sim.CurrentTime+dot.Spell.Unit.ChannelClipDelay) } else if dot.Spell.Unit.Rotation.shouldInterruptChannel(sim) { dot.Cancel(sim) diff --git a/sim/druid/restoration/restoration_test.go b/sim/druid/restoration/restoration_test.go index cb5639eaa1..b046f165fc 100644 --- a/sim/druid/restoration/restoration_test.go +++ b/sim/druid/restoration/restoration_test.go @@ -22,6 +22,7 @@ func TestRestoration(t *testing.T) { Glyphs: StandardGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Standard", SpecOptions: PlayerOptionsStandard}, + Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -63,92 +64,29 @@ var PlayerOptionsStandard = &proto.Player_RestorationDruid{ }, } +var DefaultRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 44007, - "enchant": 3819, - "gems": [ - 41401, - 40017 - ] - }, - { - "id": 40071 - }, - { - "id": 39719, - "enchant": 3809, - "gems": [ - 39998 - ] - }, - { - "id": 40723, - "enchant": 3859 - }, - { - "id": 44002, - "enchant": 3832, - "gems": [ - 39998, - 40026 - ] - }, - { - "id": 44008, - "enchant": 2332, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40460, - "enchant": 3246, - "gems": [ - 40017, - 0 - ] - }, - { - "id": 40561, - "enchant": 3601, - "gems": [ - 39998 - ] - }, - { - "id": 40379, - "enchant": 3719, - "gems": [ - 39998, - 40017 - ] - }, - { - "id": 40558, - "enchant": 3606 - }, - { - "id": 40719 - }, - { - "id": 40375 - }, - { - "id": 37111 - }, - { - "id": 40432 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 39766 - }, - { - "id": 40342 - } + {"id":44007,"enchant":3819,"gems":[41401,40017]}, + {"id":40071}, + {"id":39719,"enchant":3809,"gems":[39998]}, + {"id":40723,"enchant":3859}, + {"id":44002,"enchant":3832,"gems":[39998,40026]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40460,"enchant":3246,"gems":[40017,0]}, + {"id":40561,"enchant":3601,"gems":[39998]}, + {"id":40379,"enchant":3719,"gems":[39998,40017]}, + {"id":40558,"enchant":3606}, + {"id":40719}, + {"id":40375}, + {"id":37111}, + {"id":40432}, + {"id":40395,"enchant":3834}, + {"id":39766}, + {"id":40342} ]}`) diff --git a/sim/paladin/holy/holy_test.go b/sim/paladin/holy/holy_test.go index bb0885d878..8cf2e9cb88 100644 --- a/sim/paladin/holy/holy_test.go +++ b/sim/paladin/holy/holy_test.go @@ -23,6 +23,7 @@ func TestHoly(t *testing.T) { Glyphs: StandardGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: BasicOptions}, + Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, IsHealer: true, InFrontOfTarget: true, @@ -79,8 +80,6 @@ var StandardGlyphs = &proto.Glyphs{ Minor2: int32(proto.PaladinMinorGlyph_GlyphOfSenseUndead), } -var defaultProtRotation = &proto.HolyPaladin_Rotation{} - var defaultProtOptions = &proto.HolyPaladin_Options{ Judgement: proto.PaladinJudgement_JudgementOfWisdom, Aura: proto.PaladinAura_DevotionAura, @@ -89,7 +88,7 @@ var defaultProtOptions = &proto.HolyPaladin_Options{ var BasicOptions = &proto.Player_HolyPaladin{ HolyPaladin: &proto.HolyPaladin{ Options: defaultProtOptions, - Rotation: defaultProtRotation, + Rotation: &proto.HolyPaladin_Rotation{}, }, } @@ -101,98 +100,29 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredDarkRune, } +var DefaultRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40298, - "enchant": 3819, - "gems": [ - 41401, - 40012 - ] - }, - { - "id": 44662, - "gems": [ - 40012 - ] - }, - { - "id": 40573, - "enchant": 3809, - "gems": [ - 40012 - ] - }, - { - "id": 44005, - "enchant": 3831, - "gems": [ - 40012 - ] - }, - { - "id": 40569, - "enchant": 3832, - "gems": [ - 40012, - 40012 - ] - }, - { - "id": 40332, - "enchant": 1119, - "gems": [ - 40012, - 0 - ] - }, - { - "id": 40570, - "enchant": 3604, - "gems": [ - 40012, - 0 - ] - }, - { - "id": 40259, - "gems": [ - 40012 - ] - }, - { - "id": 40572, - "enchant": 3721, - "gems": [ - 40027, - 40012 - ] - }, - { - "id": 40592, - "enchant": 3606 - }, - { - "id": 40399 - }, - { - "id": 40375 - }, - { - "id": 44255 - }, - { - "id": 37111 - }, - { - "id": 40395, - "enchant": 2666 - }, - { - "id": 40401, - "enchant": 1128 - }, - { - "id": 40705 - } + {"id":40298,"enchant":3819,"gems":[41401,40012]}, + {"id":44662,"gems":[40012]}, + {"id":40573,"enchant":3809,"gems":[40012]}, + {"id":44005,"enchant":3831,"gems":[40012]}, + {"id":40569,"enchant":3832,"gems":[40012,40012]}, + {"id":40332,"enchant":1119,"gems":[40012,0]}, + {"id":40570,"enchant":3604,"gems":[40012,0]}, + {"id":40259,"gems":[40012]}, + {"id":40572,"enchant":3721,"gems":[40027,40012]}, + {"id":40592,"enchant":3606}, + {"id":40399}, + {"id":40375}, + {"id":44255}, + {"id":37111}, + {"id":40395,"enchant":2666}, + {"id":40401,"enchant":1128}, + {"id":40705} ]}`) diff --git a/sim/priest/healing/TestDisc.results b/sim/priest/healing/TestDisc.results index c5d2c76be2..41dee9ee7c 100644 --- a/sim/priest/healing/TestDisc.results +++ b/sim/priest/healing/TestDisc.results @@ -51,7 +51,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.02811 + weights: 0 weights: 0 weights: 0 weights: 0 @@ -91,881 +91,771 @@ stat_weights_results: { dps_results: { key: "TestDisc-AllItems-AbsolutionRegalia" value: { - dps: 88.21263 - tps: 62.32907 - hps: 5121.80202 + tps: 13.58337 + hps: 3055.90374 } } dps_results: { key: "TestDisc-AllItems-Althor'sAbacus-50359" value: { - dps: 107.57683 - tps: 81.98424 - hps: 7579.85288 + tps: 17.12119 + hps: 3921.08611 } } dps_results: { key: "TestDisc-AllItems-Althor'sAbacus-50366" value: { - dps: 108.21004 - tps: 81.98424 - hps: 7632.67054 + tps: 17.12119 + hps: 3956.81586 } } dps_results: { key: "TestDisc-AllItems-AustereEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-Bandit'sInsignia-40371" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-BaubleofTrueBlood-50354" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7246.17961 + tps: 17.12119 + hps: 3738.01026 } } dps_results: { key: "TestDisc-AllItems-BaubleofTrueBlood-50726" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7246.17961 + tps: 17.12119 + hps: 3738.01026 } } dps_results: { key: "TestDisc-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 76.50831 - hps: 7285.91384 + tps: 14.44959 + hps: 3774.58427 } } dps_results: { key: "TestDisc-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 91.31478 - tps: 72.56504 - hps: 5990.49175 + tps: 16.32773 + hps: 3210.59379 } } dps_results: { key: "TestDisc-AllItems-BracingEarthsiegeDiamond" value: { - dps: 106.33918 - tps: 75.18321 - hps: 7227.48397 + tps: 14.24579 + hps: 3781.29915 } } dps_results: { key: "TestDisc-AllItems-ChaoticSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7214.37107 + tps: 14.24579 + hps: 3774.58427 } } dps_results: { key: "TestDisc-AllItems-CorpseTongueCoin-50349" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-CorpseTongueCoin-50352" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7213.81139 + tps: 17.12119 + hps: 3706.67331 } } dps_results: { key: "TestDisc-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 101.67644 - tps: 82.47596 - hps: 7535.00001 + tps: 15.23724 + hps: 3617.95922 } } dps_results: { key: "TestDisc-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 107.8732 - tps: 82.47596 - hps: 7093.96837 + tps: 16.02513 + hps: 3708.05555 } } dps_results: { key: "TestDisc-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-DarkmoonCard:Death-42990" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7234.58172 + tps: 17.12119 + hps: 3685.89463 } } dps_results: { key: "TestDisc-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 102.42478 - tps: 90.07499 - hps: 7641.47761 + tps: 31.80529 + hps: 3680.21076 } } dps_results: { key: "TestDisc-AllItems-Death'sChoice-47464" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7181.67746 + tps: 17.12119 + hps: 3661.27063 } } dps_results: { key: "TestDisc-AllItems-Deathbringer'sWill-50362" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-Deathbringer'sWill-50363" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-Defender'sCode-40257" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-DestructiveSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7220.1734 + tps: 14.24579 + hps: 3778.93518 } } dps_results: { key: "TestDisc-AllItems-DislodgedForeignObject-50348" value: { - dps: 102.42478 - tps: 81.83424 - hps: 7182.7985 + tps: 17.0725 + hps: 3621.43778 } } dps_results: { key: "TestDisc-AllItems-DislodgedForeignObject-50353" value: { - dps: 102.42478 - tps: 81.88424 - hps: 7165.8593 + tps: 17.17594 + hps: 3638.27588 } } dps_results: { key: "TestDisc-AllItems-EffulgentSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-EmberSkyflareDiamond" value: { - dps: 106.33918 - tps: 76.31017 - hps: 7297.95836 + tps: 14.40759 + hps: 3784.29139 } } dps_results: { key: "TestDisc-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7214.37107 + tps: 14.24579 + hps: 3774.58427 } } dps_results: { key: "TestDisc-AllItems-EnigmaticStarflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7206.97407 + tps: 14.24579 + hps: 3773.91001 } } dps_results: { key: "TestDisc-AllItems-EphemeralSnowflake-50260" value: { - dps: 102.42478 - tps: 86.91916 - hps: 7358.15286 + tps: 18.41134 + hps: 3603.63774 } } dps_results: { key: "TestDisc-AllItems-EssenceofGossamer-37220" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-EternalEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7246.63037 + tps: 17.12119 + hps: 3690.78954 } } dps_results: { key: "TestDisc-AllItems-EyeoftheBroodmother-45308" value: { - dps: 106.16649 - tps: 81.98424 - hps: 7415.25546 + tps: 17.12119 + hps: 3780.63227 } } dps_results: { key: "TestDisc-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 102.42478 - tps: 87.43967 - hps: 7366.31303 + tps: 19.00072 + hps: 3650.23426 } } dps_results: { key: "TestDisc-AllItems-ForgeEmber-37660" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7222.98582 + tps: 17.12119 + hps: 3681.08971 } } dps_results: { key: "TestDisc-AllItems-ForlornSkyflareDiamond" value: { - dps: 106.33918 - tps: 75.18321 - hps: 7227.48397 + tps: 14.24579 + hps: 3781.29915 } } dps_results: { key: "TestDisc-AllItems-ForlornStarflareDiamond" value: { - dps: 106.19527 - tps: 75.18321 - hps: 7220.89838 + tps: 14.24579 + hps: 3777.81014 } } dps_results: { key: "TestDisc-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-FuturesightRune-38763" value: { - dps: 104.20929 - tps: 82.03424 - hps: 7271.86134 + tps: 17.05307 + hps: 3685.97049 } } dps_results: { key: "TestDisc-AllItems-GarbofFaith" value: { - dps: 99.52293 - tps: 74.44868 - hps: 6537.28177 + tps: 14.52615 + hps: 3418.32699 } } dps_results: { key: "TestDisc-AllItems-Gladiator'sInvestiture" value: { - dps: 109.53403 - tps: 77.22937 - hps: 7350.79663 + tps: 14.41866 + hps: 3658.72784 } } dps_results: { key: "TestDisc-AllItems-Gladiator'sRaiment" value: { - dps: 109.53403 - tps: 77.22937 - hps: 7269.51695 + tps: 15.2431 + hps: 3896.39001 } } dps_results: { key: "TestDisc-AllItems-GlowingTwilightScale-54573" value: { - dps: 107.89343 - tps: 81.98424 - hps: 7720.44089 + tps: 17.12119 + hps: 3871.00355 } } dps_results: { key: "TestDisc-AllItems-GlowingTwilightScale-54589" value: { - dps: 108.61299 - tps: 81.98424 - hps: 7794.7793 + tps: 17.12119 + hps: 3900.82076 } } dps_results: { key: "TestDisc-AllItems-GnomishLightningGenerator-41121" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7234.43537 + tps: 17.12119 + hps: 3683.32909 } } dps_results: { key: "TestDisc-AllItems-Heartpierce-49982" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-Heartpierce-50641" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 108.18126 - tps: 81.98424 - hps: 7412.42157 + tps: 17.12119 + hps: 3696.16447 } } dps_results: { key: "TestDisc-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7214.37107 + tps: 14.24579 + hps: 3774.58427 } } dps_results: { key: "TestDisc-AllItems-ImpassiveStarflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7206.97407 + tps: 14.24579 + hps: 3773.91001 } } dps_results: { key: "TestDisc-AllItems-IncisorFragment-37723" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-LastWord-50179" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-LastWord-50708" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-MajesticDragonFigurine-40430" value: { - dps: 102.42478 - tps: 82.03424 - hps: 7360.67304 + tps: 16.92044 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-MeteoriteWhetstone-37390" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7222.98582 + tps: 17.12119 + hps: 3681.08971 } } dps_results: { key: "TestDisc-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7442.66543 + tps: 17.12119 + hps: 3811.70735 } } dps_results: { key: "TestDisc-AllItems-Nibelung-49992" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-Nibelung-50648" value: { - dps: 105.61962 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } dps_results: { key: "TestDisc-AllItems-OfferingofSacrifice-37638" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.59572 + tps: 17.12119 + hps: 3640.17065 } } dps_results: { key: "TestDisc-AllItems-PersistentEarthshatterDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-PetrifiedScarab-21685" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7169.69406 + tps: 17.12865 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-PurifiedShardoftheGods" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-RegaliaofFaith" value: { - dps: 95.43066 - tps: 73.87156 - hps: 6599.89142 + tps: 14.12331 + hps: 3425.02236 } } dps_results: { key: "TestDisc-AllItems-ReignoftheDead-47316" value: { - dps: 106.74214 - tps: 81.98424 - hps: 7351.8569 + tps: 17.12119 + hps: 3747.42456 } } dps_results: { key: "TestDisc-AllItems-ReignoftheDead-47477" value: { - dps: 107.26022 - tps: 81.98424 - hps: 7376.10236 + tps: 17.12119 + hps: 3759.99471 } } dps_results: { key: "TestDisc-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7294.2565 + tps: 14.19336 + hps: 3799.51801 } } dps_results: { key: "TestDisc-AllItems-RuneofRepulsion-40372" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-SanctificationGarb" value: { - dps: 101.90568 - tps: 75.97019 - hps: 6701.5599 + tps: 14.78178 + hps: 3535.22675 } } dps_results: { key: "TestDisc-AllItems-SanctificationRegalia" value: { - dps: 101.41576 - tps: 77.07198 - hps: 7113.83734 + tps: 14.64321 + hps: 3507.59616 } } dps_results: { key: "TestDisc-AllItems-SealofthePantheon-36993" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-ShinyShardoftheGods" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-SliverofPureIce-50339" value: { - dps: 106.9724 - tps: 87.50091 - hps: 7510.40317 + tps: 17.33445 + hps: 3753.01129 } } dps_results: { key: "TestDisc-AllItems-SliverofPureIce-50346" value: { - dps: 107.54804 - tps: 88.08424 - hps: 7554.15688 + tps: 17.33445 + hps: 3766.97812 } } dps_results: { key: "TestDisc-AllItems-SoulPreserver-37111" value: { - dps: 104.58346 - tps: 89.12329 - hps: 7440.54207 + tps: 19.17221 + hps: 3695.04893 } } dps_results: { key: "TestDisc-AllItems-SouloftheDead-40382" value: { - dps: 102.42478 - tps: 89.83424 - hps: 7473.49561 + tps: 19.45109 + hps: 3690.78954 } } dps_results: { key: "TestDisc-AllItems-SparkofLife-37657" value: { - dps: 102.42478 - tps: 82.03424 - hps: 7359.76637 + tps: 16.82269 + hps: 3601.97815 } } dps_results: { key: "TestDisc-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 104.19782 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-SwiftSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-SwiftStarflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-SwiftWindfireDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 102.42478 - tps: 82.03424 - hps: 7246.59945 + tps: 16.95524 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-TearsoftheVanquished-47215" value: { - dps: 102.42478 - tps: 91.49731 - hps: 7586.35832 + tps: 20.6525 + hps: 3661.27063 } } dps_results: { key: "TestDisc-AllItems-TheGeneral'sHeart-45507" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-ThunderingSkyflareDiamond" value: { - dps: 105.61962 - tps: 75.18321 - hps: 7194.55601 + tps: 14.24579 + hps: 3763.85408 } } dps_results: { key: "TestDisc-AllItems-TinyAbominationinaJar-50351" value: { - dps: 105.84352 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-TinyAbominationinaJar-50706" value: { - dps: 105.84352 - tps: 81.98424 - hps: 7149.81139 + tps: 17.12119 + hps: 3642.67331 } } dps_results: { key: "TestDisc-AllItems-TirelessSkyflareDiamond" value: { - dps: 106.33918 - tps: 75.18321 - hps: 7227.48397 + tps: 14.24579 + hps: 3781.29915 } } dps_results: { key: "TestDisc-AllItems-TirelessStarflareDiamond" value: { - dps: 106.19527 - tps: 75.18321 - hps: 7220.89838 + tps: 14.24579 + hps: 3777.81014 } } dps_results: { key: "TestDisc-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 104.38198 - tps: 81.80325 - hps: 7294.25006 + tps: 17.09221 + hps: 3648.8447 } } dps_results: { key: "TestDisc-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 106.19527 - tps: 75.18321 - hps: 7220.89838 + tps: 14.24579 + hps: 3777.81014 } } dps_results: { key: "TestDisc-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 106.33918 - tps: 75.18321 - hps: 7227.48397 + tps: 14.24579 + hps: 3781.29915 } } dps_results: { key: "TestDisc-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 109.01595 - tps: 82.82123 - hps: 7913.05996 + tps: 17.23573 + hps: 3967.8279 } } dps_results: { key: "TestDisc-AllItems-VestmentsofAbsolution" value: { - dps: 85.90369 - tps: 61.06989 - hps: 5156.05509 + tps: 12.65056 + hps: 3035.54693 } } dps_results: { key: "TestDisc-AllItems-WingedTalisman-37844" value: { - dps: 102.42478 - tps: 81.98424 - hps: 7249.84757 + tps: 17.12119 + hps: 3702.75532 } } dps_results: { key: "TestDisc-AllItems-Zabra'sRaiment" value: { - dps: 98.19377 - tps: 78.43609 - hps: 7401.18691 + tps: 14.84923 + hps: 3708.98145 } } dps_results: { key: "TestDisc-AllItems-Zabra'sRegalia" value: { - dps: 105.84806 - tps: 78.43609 - hps: 6857.79213 + tps: 15.08364 + hps: 3426.15129 } } dps_results: { key: "TestDisc-Average-Default" value: { - dps: 102.96421 - tps: 81.87851 - hps: 7436.81475 + tps: 16.99342 + hps: 3821.30717 } } dps_results: { @@ -1019,8 +909,7 @@ dps_results: { dps_results: { key: "TestDisc-SwitchInFrontOfTarget-Default" value: { - dps: 87.19696 - tps: 81.98424 - hps: 7376.86015 + tps: 17.12119 + hps: 3766.83285 } } diff --git a/sim/priest/healing/TestHoly.results b/sim/priest/healing/TestHoly.results index 0c7362123c..73ec3e43ea 100644 --- a/sim/priest/healing/TestHoly.results +++ b/sim/priest/healing/TestHoly.results @@ -48,839 +48,839 @@ dps_results: { value: { dps: 91.89253 tps: 38.67518 - hps: 3789.90768 + hps: 3753.56005 } } dps_results: { key: "TestHoly-AllItems-Althor'sAbacus-50359" value: { dps: 113.195 - tps: 50.88814 - hps: 5761.29944 + tps: 44.74666 + hps: 5500.90377 } } dps_results: { key: "TestHoly-AllItems-Althor'sAbacus-50366" value: { dps: 113.82822 - tps: 50.88814 - hps: 5804.55083 + tps: 44.74666 + hps: 5544.57512 } } dps_results: { key: "TestHoly-AllItems-AustereEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-Bandit'sInsignia-40371" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-BaubleofTrueBlood-50354" value: { dps: 108.04296 - tps: 50.83814 - hps: 5484.43319 + tps: 44.72899 + hps: 5223.21199 } } dps_results: { key: "TestHoly-AllItems-BaubleofTrueBlood-50726" value: { dps: 108.04296 - tps: 50.83814 - hps: 5484.43319 + tps: 44.72899 + hps: 5223.21199 } } dps_results: { key: "TestHoly-AllItems-BeamingEarthsiegeDiamond" value: { dps: 111.2378 - tps: 46.37603 - hps: 5498.18243 + tps: 41.79766 + hps: 5289.00758 } } dps_results: { key: "TestHoly-AllItems-BlessedRegaliaofUndeadCleansing" value: { dps: 95.56166 - tps: 45.40419 - hps: 4390.53348 + tps: 44.98616 + hps: 4274.31984 } } dps_results: { key: "TestHoly-AllItems-BracingEarthsiegeDiamond" value: { dps: 111.95736 - tps: 45.64175 - hps: 5467.2545 + tps: 41.63862 + hps: 5274.90321 } } dps_results: { key: "TestHoly-AllItems-ChaoticSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5451.98024 + tps: 41.58837 + hps: 5257.70757 } } dps_results: { key: "TestHoly-AllItems-CorpseTongueCoin-50349" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-CorpseTongueCoin-50352" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-CorrodedSkeletonKey-50356" value: { dps: 108.04296 - tps: 50.88814 - hps: 5428.7779 + tps: 44.46944 + hps: 5209.19129 } } dps_results: { key: "TestHoly-AllItems-CrimsonAcolyte'sRaiment" value: { dps: 107.99273 - tps: 49.59422 - hps: 5883.14926 + tps: 40.99214 + hps: 5323.10137 } } dps_results: { key: "TestHoly-AllItems-CrimsonAcolyte'sRegalia" value: { dps: 110.99536 - tps: 49.59422 - hps: 5197.18579 + tps: 45.22971 + hps: 4906.69858 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Berserker!-42989" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Death-42990" value: { dps: 108.04296 - tps: 50.98814 - hps: 5445.06373 + tps: 44.4186 + hps: 5186.94854 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Greatness-44255" value: { dps: 108.04296 - tps: 54.34213 - hps: 5704.19139 + tps: 48.42908 + hps: 5322.24412 } } dps_results: { key: "TestHoly-AllItems-Death'sChoice-47464" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-DeathKnight'sAnguish-38212" value: { dps: 108.04296 - tps: 50.88814 - hps: 5409.40211 + tps: 44.40182 + hps: 5162.96591 } } dps_results: { key: "TestHoly-AllItems-Deathbringer'sWill-50362" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-Deathbringer'sWill-50363" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-Defender'sCode-40257" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-DestructiveSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5469.92947 + tps: 41.67699 + hps: 5265.35877 } } dps_results: { key: "TestHoly-AllItems-DislodgedForeignObject-50348" value: { dps: 108.04296 - tps: 51.03814 - hps: 5422.53029 + tps: 44.83838 + hps: 5155.44525 } } dps_results: { key: "TestHoly-AllItems-DislodgedForeignObject-50353" value: { dps: 108.04296 - tps: 50.98814 - hps: 5398.72944 + tps: 44.78928 + hps: 5156.33283 } } dps_results: { key: "TestHoly-AllItems-EffulgentSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-EmberSkyflareDiamond" value: { dps: 111.95736 - tps: 46.25254 - hps: 5529.02627 + tps: 41.76961 + hps: 5314.90254 } } dps_results: { key: "TestHoly-AllItems-EnigmaticSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5451.98024 + tps: 41.58837 + hps: 5257.70757 } } dps_results: { key: "TestHoly-AllItems-EnigmaticStarflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5455.53719 + tps: 41.58837 + hps: 5256.44957 } } dps_results: { key: "TestHoly-AllItems-EphemeralSnowflake-50260" value: { dps: 108.04296 - tps: 56.20781 - hps: 5566.26322 + tps: 50.44445 + hps: 5294.61582 } } dps_results: { key: "TestHoly-AllItems-EssenceofGossamer-37220" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-EternalEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-ExtractofNecromanticPower-40373" value: { dps: 108.04296 - tps: 50.98814 - hps: 5446.93872 + tps: 44.4186 + hps: 5193.94092 } } dps_results: { key: "TestHoly-AllItems-EyeoftheBroodmother-45308" value: { dps: 111.78467 - tps: 50.98814 - hps: 5580.89935 + tps: 44.4186 + hps: 5334.89498 } } dps_results: { key: "TestHoly-AllItems-Figurine-SapphireOwl-42413" value: { dps: 108.04296 - tps: 56.19991 - hps: 5595.13104 + tps: 52.88332 + hps: 5370.76334 } } dps_results: { key: "TestHoly-AllItems-ForgeEmber-37660" value: { dps: 108.04296 - tps: 50.93814 - hps: 5441.69942 + tps: 44.4186 + hps: 5182.65662 } } dps_results: { key: "TestHoly-AllItems-ForlornSkyflareDiamond" value: { dps: 111.95736 - tps: 45.64175 - hps: 5467.2545 + tps: 41.63862 + hps: 5274.90321 } } dps_results: { key: "TestHoly-AllItems-ForlornStarflareDiamond" value: { dps: 111.81345 - tps: 45.64175 - hps: 5462.19917 + tps: 41.63862 + hps: 5269.55225 } } dps_results: { key: "TestHoly-AllItems-FuryoftheFiveFlights-40431" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-FuturesightRune-38763" value: { - dps: 109.83197 - tps: 51.03814 - hps: 5513.50245 + dps: 109.88348 + tps: 44.64084 + hps: 5271.72273 } } dps_results: { key: "TestHoly-AllItems-GarbofFaith" value: { dps: 104.22246 - tps: 45.24366 - hps: 4750.52815 + tps: 43.16014 + hps: 4601.90416 } } dps_results: { key: "TestHoly-AllItems-Gladiator'sInvestiture" value: { dps: 116.19938 - tps: 46.75072 - hps: 5661.95886 + tps: 41.79063 + hps: 5362.62552 } } dps_results: { key: "TestHoly-AllItems-Gladiator'sRaiment" value: { dps: 112.47609 - tps: 46.75072 - hps: 5280.30952 + tps: 44.55035 + hps: 5062.88703 } } dps_results: { key: "TestHoly-AllItems-GlowingTwilightScale-54573" value: { dps: 113.51161 - tps: 50.88814 - hps: 5885.40618 + tps: 44.46944 + hps: 5723.56797 } } dps_results: { key: "TestHoly-AllItems-GlowingTwilightScale-54589" value: { dps: 114.23117 - tps: 50.88814 - hps: 5953.14345 + tps: 44.46944 + hps: 5798.79171 } } dps_results: { key: "TestHoly-AllItems-GnomishLightningGenerator-41121" value: { dps: 108.04296 - tps: 50.98814 - hps: 5453.34317 + tps: 44.4186 + hps: 5186.96425 } } dps_results: { key: "TestHoly-AllItems-Heartpierce-49982" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-Heartpierce-50641" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-IllustrationoftheDragonSoul-40432" value: { dps: 113.79943 - tps: 50.88814 - hps: 5564.49559 + tps: 44.46944 + hps: 5354.984 } } dps_results: { key: "TestHoly-AllItems-ImpassiveSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5451.98024 + tps: 41.58837 + hps: 5257.70757 } } dps_results: { key: "TestHoly-AllItems-ImpassiveStarflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5455.53719 + tps: 41.58837 + hps: 5256.44957 } } dps_results: { key: "TestHoly-AllItems-IncisorFragment-37723" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-InsightfulEarthsiegeDiamond" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-InvigoratingEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-LastWord-50179" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-LastWord-50708" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-Lavanthor'sTalisman-37872" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-MajesticDragonFigurine-40430" value: { dps: 109.53892 - tps: 51.13814 - hps: 5610.472 + tps: 41.02901 + hps: 5310.79849 } } dps_results: { key: "TestHoly-AllItems-MeteoriteWhetstone-37390" value: { dps: 108.04296 - tps: 50.93814 - hps: 5438.48661 + tps: 44.4186 + hps: 5182.65662 } } dps_results: { key: "TestHoly-AllItems-NevermeltingIceCrystal-50259" value: { dps: 111.2378 - tps: 51.03814 - hps: 5588.48685 + tps: 44.4219 + hps: 5331.20521 } } dps_results: { key: "TestHoly-AllItems-Nibelung-49992" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-Nibelung-50648" value: { dps: 111.2378 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } dps_results: { key: "TestHoly-AllItems-OfferingofSacrifice-37638" value: { dps: 108.04296 - tps: 50.93814 - hps: 5366.29531 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-PersistentEarthshatterDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-PersistentEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-PetrifiedScarab-21685" value: { dps: 108.04296 - tps: 50.98814 - hps: 5393.28092 + tps: 44.27427 + hps: 5138.32895 } } dps_results: { key: "TestHoly-AllItems-PetrifiedTwilightScale-54571" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-PetrifiedTwilightScale-54591" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-PowerfulEarthshatterDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-PowerfulEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-PurifiedShardoftheGods" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-RegaliaofFaith" value: { dps: 100.88262 - tps: 44.93088 - hps: 4997.22816 + tps: 41.15469 + hps: 4836.91463 } } dps_results: { key: "TestHoly-AllItems-ReignoftheDead-47316" value: { dps: 112.36031 - tps: 50.88814 - hps: 5519.99549 + tps: 44.46944 + hps: 5308.61972 } } dps_results: { key: "TestHoly-AllItems-ReignoftheDead-47477" value: { dps: 112.8784 - tps: 50.88814 - hps: 5538.6216 + tps: 44.46944 + hps: 5328.23113 } } dps_results: { key: "TestHoly-AllItems-RelentlessEarthsiegeDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-RevitalizingSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5495.69659 + tps: 41.64398 + hps: 5300.72015 } } dps_results: { key: "TestHoly-AllItems-RuneofRepulsion-40372" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-SanctificationGarb" value: { dps: 106.33368 - tps: 46.06828 - hps: 4942.49098 + tps: 43.4996 + hps: 4741.23076 } } dps_results: { key: "TestHoly-AllItems-SanctificationRegalia" value: { - dps: 107.36302 - tps: 46.66541 - hps: 5326.0567 + dps: 104.98109 + tps: 42.70337 + hps: 4940.33396 } } dps_results: { key: "TestHoly-AllItems-SealofthePantheon-36993" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-ShinyShardoftheGods" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-Sindragosa'sFlawlessFang-50361" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-SliverofPureIce-50339" value: { dps: 112.59057 - tps: 56.40481 - hps: 5675.4688 + tps: 49.88611 + hps: 5444.11322 } } dps_results: { key: "TestHoly-AllItems-SliverofPureIce-50346" value: { dps: 113.16622 - tps: 57.13814 - hps: 5737.77931 + tps: 50.61944 + hps: 5467.32425 } } dps_results: { key: "TestHoly-AllItems-SoulPreserver-37111" value: { dps: 110.20164 - tps: 57.19023 - hps: 5608.10489 + tps: 48.72567 + hps: 5324.63447 } } dps_results: { key: "TestHoly-AllItems-SouloftheDead-40382" value: { dps: 108.04296 - tps: 58.3874 - hps: 5622.13717 + tps: 50.41186 + hps: 5310.0244 } } dps_results: { key: "TestHoly-AllItems-SparkofLife-37657" value: { dps: 108.04296 - tps: 51.03814 - hps: 5490.9833 + tps: 43.56277 + hps: 5215.1859 } } dps_results: { key: "TestHoly-AllItems-SphereofRedDragon'sBlood-37166" value: { dps: 109.91375 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-SwiftSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-SwiftStarflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-SwiftWindfireDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-TalismanofTrollDivinity-37734" value: { dps: 108.64965 - tps: 50.98814 - hps: 5490.44345 + tps: 46.07559 + hps: 5268.95142 } } dps_results: { key: "TestHoly-AllItems-TearsoftheVanquished-47215" value: { dps: 108.04296 - tps: 58.62456 - hps: 5727.13686 + tps: 48.29379 + hps: 5329.51806 } } dps_results: { key: "TestHoly-AllItems-TheGeneral'sHeart-45507" value: { dps: 108.04296 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-ThunderingSkyflareDiamond" value: { dps: 111.2378 - tps: 45.64175 - hps: 5441.97785 + tps: 41.63862 + hps: 5248.14842 } } dps_results: { key: "TestHoly-AllItems-TinyAbominationinaJar-50351" value: { dps: 111.64973 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-TinyAbominationinaJar-50706" value: { dps: 111.64973 - tps: 50.88814 - hps: 5364.7779 + tps: 44.46944 + hps: 5145.19129 } } dps_results: { key: "TestHoly-AllItems-TirelessSkyflareDiamond" value: { dps: 111.95736 - tps: 45.64175 - hps: 5467.2545 + tps: 41.63862 + hps: 5274.90321 } } dps_results: { key: "TestHoly-AllItems-TirelessStarflareDiamond" value: { dps: 111.81345 - tps: 45.64175 - hps: 5462.19917 + tps: 41.63862 + hps: 5269.55225 } } dps_results: { key: "TestHoly-AllItems-TomeofArcanePhenomena-36972" value: { dps: 110.00016 - tps: 50.98814 - hps: 5479.36461 + tps: 44.5773 + hps: 5240.6025 } } dps_results: { key: "TestHoly-AllItems-TrenchantEarthshatterDiamond" value: { dps: 111.81345 - tps: 45.64175 - hps: 5462.19917 + tps: 41.63862 + hps: 5269.55225 } } dps_results: { key: "TestHoly-AllItems-TrenchantEarthsiegeDiamond" value: { dps: 111.95736 - tps: 45.64175 - hps: 5467.2545 + tps: 41.63862 + hps: 5274.90321 } } dps_results: { key: "TestHoly-AllItems-Val'anyr,HammerofAncientKings-46017" value: { dps: 114.63412 - tps: 51.31467 - hps: 5953.78623 + tps: 44.89427 + hps: 5750.16127 } } dps_results: { @@ -888,39 +888,39 @@ dps_results: { value: { dps: 90.45807 tps: 37.99274 - hps: 3879.12841 + hps: 3807.57054 } } dps_results: { key: "TestHoly-AllItems-WingedTalisman-37844" value: { - dps: 108.15461 - tps: 50.88814 - hps: 5444.48487 + dps: 108.04296 + tps: 44.46944 + hps: 5221.87194 } } dps_results: { key: "TestHoly-AllItems-Zabra'sRaiment" value: { dps: 103.86181 - tps: 47.40472 - hps: 5459.69799 + tps: 43.06779 + hps: 5125.8773 } } dps_results: { key: "TestHoly-AllItems-Zabra'sRegalia" value: { dps: 110.77538 - tps: 47.40472 - hps: 4987.20071 + tps: 43.59632 + hps: 4776.14976 } } dps_results: { key: "TestHoly-Average-Default" value: { dps: 108.4408 - tps: 51.32178 - hps: 5642.35006 + tps: 45.08022 + hps: 5402.48184 } } dps_results: { @@ -975,7 +975,7 @@ dps_results: { key: "TestHoly-SwitchInFrontOfTarget-Default" value: { dps: 91.84158 - tps: 50.88814 - hps: 5572.96992 + tps: 44.46944 + hps: 5365.55633 } } diff --git a/sim/priest/healing/healing_priest_test.go b/sim/priest/healing/healing_priest_test.go index 9da6e61c0f..0f3e4ec64f 100644 --- a/sim/priest/healing/healing_priest_test.go +++ b/sim/priest/healing/healing_priest_test.go @@ -23,6 +23,7 @@ func TestDisc(t *testing.T) { Glyphs: DiscGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Disc", SpecOptions: PlayerOptionsDisc}, + Rotation: core.RotationCombo{Label: "Disc", Rotation: DiscRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -58,6 +59,7 @@ func TestHoly(t *testing.T) { Glyphs: HolyGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Holy", SpecOptions: PlayerOptionsHoly}, + Rotation: core.RotationCombo{Label: "Holy", Rotation: HolyRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -118,94 +120,44 @@ var PlayerOptionsHoly = &proto.Player_HealingPriest{ }, } +var DiscRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48066}}},"rhs":{"const":{"val":"18"}}}},"multishield":{"spellId":{"spellId":48066},"maxShields":10,"maxOverlap":{"const":{"val":"0ms"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":53007}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":53007}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48113}}},"rhs":{"const":{"val":"2"}}}},"castSpell":{"spellId":{"spellId":48113}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48063}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":48063}}}} + ] +}`) + +var HolyRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48063}}},"rhs":{"const":{"val":"10"}}}},"castSpell":{"spellId":{"spellId":48063}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48089}}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":48089}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48068}}},"rhs":{"const":{"val":"10"}}}},"multidot":{"spellId":{"spellId":48068},"maxDots":10,"maxOverlap":{"const":{"val":"0ms"}}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellCpm":{"spellId":{"spellId":48113}}},"rhs":{"const":{"val":"2"}}}},"castSpell":{"spellId":{"spellId":48113}}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40456, - "enchant": 3819, - "gems": [ - 41401, - 39998 - ] - }, - { - "id": 44657, - "gems": [ - 40047 - ] - }, - { - "id": 40450, - "enchant": 3809, - "gems": [ - 42144 - ] - }, - { - "id": 40724, - "enchant": 3859 - }, - { - "id": 40194, - "enchant": 3832, - "gems": [ - 42144 - ] - }, - { - "id": 40741, - "enchant": 2332, - "gems": [ - 0 - ] - }, - { - "id": 40445, - "enchant": 3246, - "gems": [ - 42144, - 0 - ] - }, - { - "id": 40271, - "enchant": 3601, - "gems": [ - 40027, - 39998 - ] - }, - { - "id": 40398, - "enchant": 3719, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 40236, - "enchant": 3606 - }, - { - "id": 40108 - }, - { - "id": 40433 - }, - { - "id": 37835 - }, - { - "id": 40258 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 40350 - }, - { - "id": 40245 - } + {"id":40456,"enchant":3819,"gems":[41401,39998]}, + {"id":44657,"gems":[40047]}, + {"id":40450,"enchant":3809,"gems":[42144]}, + {"id":40724,"enchant":3859}, + {"id":40194,"enchant":3832,"gems":[42144]}, + {"id":40741,"enchant":2332,"gems":[0]}, + {"id":40445,"enchant":3246,"gems":[42144,0]}, + {"id":40271,"enchant":3601,"gems":[40027,39998]}, + {"id":40398,"enchant":3719,"gems":[39998,39998]}, + {"id":40236,"enchant":3606}, + {"id":40108}, + {"id":40433}, + {"id":37835}, + {"id":40258}, + {"id":40395,"enchant":3834}, + {"id":40350}, + {"id":40245} ]}`) diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results index 38a05205db..a54f97b87e 100644 --- a/sim/priest/smite/TestSmite.results +++ b/sim/priest/smite/TestSmite.results @@ -46,822 +46,822 @@ character_stats_results: { dps_results: { key: "TestSmite-AllItems-AbsolutionRegalia" value: { - dps: 2409.01271 - tps: 2066.40495 + dps: 2439.72155 + tps: 1999.93002 } } dps_results: { key: "TestSmite-AllItems-Althor'sAbacus-50359" value: { - dps: 3514.43896 - tps: 2983.99036 + dps: 3556.55337 + tps: 2915.44059 } } dps_results: { key: "TestSmite-AllItems-Althor'sAbacus-50366" value: { - dps: 3530.87468 - tps: 2997.54815 + dps: 3573.51644 + tps: 2928.99069 } } dps_results: { key: "TestSmite-AllItems-AustereEarthsiegeDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-Bandit'sInsignia-40371" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-BaubleofTrueBlood-50354" value: { - dps: 3385.92139 - tps: 2878.32231 - hps: 89.55698 + dps: 3424.79122 + tps: 2811.10192 + hps: 89.19554 } } dps_results: { key: "TestSmite-AllItems-BaubleofTrueBlood-50726" value: { - dps: 3385.92139 - tps: 2878.32231 - hps: 89.55698 + dps: 3424.79122 + tps: 2811.10192 + hps: 89.19554 } } dps_results: { key: "TestSmite-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 3500.32531 - tps: 2972.29725 + dps: 3557.12446 + tps: 2916.06363 } } dps_results: { key: "TestSmite-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 2661.67934 - tps: 2273.4344 + dps: 2719.66531 + tps: 2227.23205 } } dps_results: { key: "TestSmite-AllItems-BracingEarthsiegeDiamond" value: { - dps: 3484.26041 - tps: 2900.58559 + dps: 3534.13248 + tps: 2838.30646 } } dps_results: { key: "TestSmite-AllItems-ChaoticSkyflareDiamond" value: { - dps: 3495.41331 - tps: 2967.90154 + dps: 3550.74408 + tps: 2907.79899 } } dps_results: { key: "TestSmite-AllItems-CorpseTongueCoin-50349" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-CorpseTongueCoin-50352" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 hps: 64 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 3547.21022 - tps: 3019.79579 + dps: 3647.28111 + tps: 3004.00941 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 3525.17103 - tps: 2996.57865 + dps: 3588.21096 + tps: 2948.83218 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 3407.02026 - tps: 2896.15296 + dps: 3465.75677 + tps: 2843.63745 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Death-42990" value: { - dps: 3448.76373 - tps: 2941.80847 + dps: 3494.1806 + tps: 2878.12428 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 3433.1929 - tps: 2917.89699 + dps: 3494.02523 + tps: 2865.07831 } } dps_results: { key: "TestSmite-AllItems-Death'sChoice-47464" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 3385.99576 - tps: 2879.04861 + dps: 3430.97844 + tps: 2814.68799 } } dps_results: { key: "TestSmite-AllItems-Deathbringer'sWill-50362" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-Deathbringer'sWill-50363" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-Defender'sCode-40257" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-DestructiveSkyflareDiamond" value: { - dps: 3468.50277 - tps: 2945.72966 + dps: 3519.42164 + tps: 2882.9391 } } dps_results: { key: "TestSmite-AllItems-DislodgedForeignObject-50348" value: { - dps: 3514.05017 - tps: 2982.11452 + dps: 3582.7931 + tps: 2935.92738 } } dps_results: { key: "TestSmite-AllItems-DislodgedForeignObject-50353" value: { - dps: 3500.2134 - tps: 2974.97642 + dps: 3565.20029 + tps: 2923.44929 } } dps_results: { key: "TestSmite-AllItems-EffulgentSkyflareDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-EmberSkyflareDiamond" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 3466.12423 - tps: 2943.6781 + dps: 3517.91455 + tps: 2881.53537 } } dps_results: { key: "TestSmite-AllItems-EnigmaticStarflareDiamond" value: { - dps: 3467.68057 - tps: 2945.28011 + dps: 3516.23677 + tps: 2880.78429 } } dps_results: { key: "TestSmite-AllItems-EphemeralSnowflake-50260" value: { - dps: 3367.58661 - tps: 2864.4468 + dps: 3439.83625 + tps: 2820.40862 } } dps_results: { key: "TestSmite-AllItems-EssenceofGossamer-37220" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-EternalEarthsiegeDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 3452.65465 - tps: 2944.14086 + dps: 3517.15524 + tps: 2893.77741 } } dps_results: { key: "TestSmite-AllItems-EyeoftheBroodmother-45308" value: { - dps: 3499.22152 - tps: 2972.32358 + dps: 3560.48484 + tps: 2917.233 } } dps_results: { key: "TestSmite-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 3462.58074 - tps: 2939.70477 + dps: 3512.48539 + tps: 2884.34163 } } dps_results: { key: "TestSmite-AllItems-ForethoughtTalisman-40258" value: { - dps: 3463.63766 - tps: 2942.08448 + dps: 3504.12206 + tps: 2873.55847 } } dps_results: { key: "TestSmite-AllItems-ForgeEmber-37660" value: { - dps: 3466.29471 - tps: 2946.93933 + dps: 3503.46119 + tps: 2873.46369 } } dps_results: { key: "TestSmite-AllItems-ForlornSkyflareDiamond" value: { - dps: 3484.26041 - tps: 2958.622 + dps: 3534.13248 + tps: 2895.06231 } } dps_results: { key: "TestSmite-AllItems-ForlornStarflareDiamond" value: { - dps: 3480.5712 - tps: 2955.57811 + dps: 3530.31533 + tps: 2892.01467 } } dps_results: { key: "TestSmite-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-FuturesightRune-38763" value: { - dps: 3456.33735 - tps: 2937.8278 + dps: 3513.79187 + tps: 2883.95344 } } dps_results: { key: "TestSmite-AllItems-GarbofFaith" value: { - dps: 3163.27028 - tps: 2704.31758 + dps: 3195.27336 + tps: 2629.64243 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sInvestiture" value: { - dps: 3569.28467 - tps: 3040.62595 + dps: 3674.16429 + tps: 3020.28957 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sRaiment" value: { - dps: 3326.44265 - tps: 2838.1292 + dps: 3424.33159 + tps: 2812.71505 } } dps_results: { key: "TestSmite-AllItems-GlowingTwilightScale-54573" value: { - dps: 3522.65682 - tps: 2990.76926 + dps: 3565.03491 + tps: 2922.21564 } } dps_results: { key: "TestSmite-AllItems-GlowingTwilightScale-54589" value: { - dps: 3541.33377 - tps: 3006.17583 + dps: 3584.31112 + tps: 2937.61348 } } dps_results: { key: "TestSmite-AllItems-GnomishLightningGenerator-41121" value: { - dps: 3431.31935 - tps: 2924.76295 + dps: 3486.02121 + tps: 2866.63403 } } dps_results: { key: "TestSmite-AllItems-Heartpierce-49982" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-Heartpierce-50641" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 3466.12423 - tps: 2943.6781 + dps: 3517.91455 + tps: 2881.53537 } } dps_results: { key: "TestSmite-AllItems-ImpassiveStarflareDiamond" value: { - dps: 3467.68057 - tps: 2945.28011 + dps: 3516.23677 + tps: 2880.78429 } } dps_results: { key: "TestSmite-AllItems-IncisorFragment-37723" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 3587.10453 - tps: 3050.35029 + dps: 3655.53806 + tps: 3005.99579 } } dps_results: { key: "TestSmite-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-LastWord-50179" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-LastWord-50708" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-MajesticDragonFigurine-40430" value: { - dps: 3532.25553 - tps: 3000.79219 + dps: 3589.38904 + tps: 2949.50656 } } dps_results: { key: "TestSmite-AllItems-MeteoriteWhetstone-37390" value: { - dps: 3405.1067 - tps: 2895.01029 + dps: 3440.3824 + tps: 2821.44998 } } dps_results: { key: "TestSmite-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 3484.00534 - tps: 2960.95878 + dps: 3519.20886 + tps: 2885.74614 } } dps_results: { key: "TestSmite-AllItems-Nibelung-49992" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-Nibelung-50648" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3567.28222 + tps: 2923.4926 } } dps_results: { key: "TestSmite-AllItems-OfferingofSacrifice-37638" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthshatterDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-PetrifiedScarab-21685" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-PurifiedShardoftheGods" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-RegaliaofFaith" value: { - dps: 3109.73743 - tps: 2657.49702 + dps: 3171.70798 + tps: 2614.34326 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47316" value: { - dps: 3595.75766 - tps: 3071.59209 + dps: 3636.78793 + tps: 3002.77267 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47477" value: { - dps: 3622.29595 - tps: 3095.78435 + dps: 3664.12974 + tps: 3027.33494 } } dps_results: { key: "TestSmite-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 3494.67941 - tps: 2967.2988 + dps: 3547.63247 + tps: 2905.89266 } } dps_results: { key: "TestSmite-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 3485.54384 - tps: 2960.82581 + dps: 3533.41433 + tps: 2896.81646 } } dps_results: { key: "TestSmite-AllItems-RuneofRepulsion-40372" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-SanctificationGarb" value: { - dps: 3318.39624 - tps: 2830.52724 + dps: 3381.69858 + tps: 2785.47441 } } dps_results: { key: "TestSmite-AllItems-SanctificationRegalia" value: { - dps: 3305.74982 - tps: 2818.23541 + dps: 3379.04248 + tps: 2779.34229 } } dps_results: { key: "TestSmite-AllItems-SealofthePantheon-36993" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-ShinyShardoftheGods" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-SliverofPureIce-50339" value: { - dps: 3605.49766 - tps: 3065.41272 + dps: 3655.32002 + tps: 3010.35987 } } dps_results: { key: "TestSmite-AllItems-SliverofPureIce-50346" value: { - dps: 3647.51634 - tps: 3100.56975 + dps: 3696.66999 + tps: 3045.47916 } } dps_results: { key: "TestSmite-AllItems-SoulPreserver-37111" value: { - dps: 3436.74285 - tps: 2919.89901 + dps: 3476.3643 + tps: 2851.38558 } } dps_results: { key: "TestSmite-AllItems-SouloftheDead-40382" value: { - dps: 3506.3743 - tps: 2983.42997 + dps: 3568.38796 + tps: 2941.41224 } } dps_results: { key: "TestSmite-AllItems-SparkofLife-37657" value: { - dps: 3475.54485 - tps: 2951.64586 + dps: 3509.33269 + tps: 2879.94573 } } dps_results: { key: "TestSmite-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 3403.51714 - tps: 2892.83498 + dps: 3449.56279 + tps: 2830.83871 } } dps_results: { key: "TestSmite-AllItems-SwiftSkyflareDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-SwiftStarflareDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-SwiftWindfireDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 3451.58755 - tps: 2934.19273 + dps: 3492.64077 + tps: 2867.46623 } } dps_results: { key: "TestSmite-AllItems-TearsoftheVanquished-47215" value: { - dps: 3505.26471 - tps: 2981.4815 + dps: 3565.45289 + tps: 2929.69927 } } dps_results: { key: "TestSmite-AllItems-TheGeneral'sHeart-45507" value: { - dps: 3380.712 - tps: 2873.67929 + dps: 3418.53565 + tps: 2805.19206 } } dps_results: { key: "TestSmite-AllItems-ThunderingSkyflareDiamond" value: { - dps: 3465.81437 - tps: 2943.40256 + dps: 3515.04676 + tps: 2879.82409 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50351" value: { - dps: 3403.51714 - tps: 2892.83498 + dps: 3449.56279 + tps: 2830.83871 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50706" value: { - dps: 3403.51714 - tps: 2892.83498 + dps: 3449.56279 + tps: 2830.83871 } } dps_results: { key: "TestSmite-AllItems-TirelessSkyflareDiamond" value: { - dps: 3484.26041 - tps: 2958.622 + dps: 3534.13248 + tps: 2895.06231 } } dps_results: { key: "TestSmite-AllItems-TirelessStarflareDiamond" value: { - dps: 3480.5712 - tps: 2955.57811 + dps: 3530.31533 + tps: 2892.01467 } } dps_results: { key: "TestSmite-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 3427.14399 - tps: 2913.02515 + dps: 3499.57866 + tps: 2869.39443 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 3480.5712 - tps: 2955.57811 + dps: 3530.31533 + tps: 2892.01467 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 3484.26041 - tps: 2958.622 + dps: 3534.13248 + tps: 2895.06231 } } dps_results: { key: "TestSmite-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 3618.09049 - tps: 3068.28749 + dps: 3670.3816 + tps: 3003.42647 } } dps_results: { key: "TestSmite-AllItems-VestmentsofAbsolution" value: { - dps: 2327.12464 - tps: 1993.93817 + dps: 2359.60453 + tps: 1934.03968 } } dps_results: { key: "TestSmite-AllItems-WingedTalisman-37844" value: { - dps: 3435.47218 - tps: 2920.3906 + dps: 3474.00422 + tps: 2851.44258 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRaiment" value: { - dps: 3285.42589 - tps: 2804.87351 + dps: 3372.11 + tps: 2777.18447 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRegalia" value: { - dps: 3434.00921 - tps: 2925.73013 + dps: 3538.85721 + tps: 2908.07518 } } dps_results: { key: "TestSmite-Average-Default" value: { - dps: 3513.54707 - tps: 2984.87813 + dps: 3572.59181 + tps: 2929.61876 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 3524.69096 - tps: 4084.80899 + dps: 3482.29767 + tps: 3893.97577 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 3524.69096 - tps: 2992.06268 + dps: 3482.29767 + tps: 2806.69392 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 4802.98377 - tps: 4160.03991 + dps: 4703.98383 + tps: 3930.12228 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1191.57542 - tps: 1476.29994 + dps: 1214.87149 + tps: 1443.29886 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1191.57542 - tps: 1024.41187 + dps: 1214.87149 + tps: 991.41079 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 2837.73254 - tps: 2276.92561 + dps: 2706.64205 + tps: 2058.70992 } } dps_results: { key: "TestSmite-SwitchInFrontOfTarget-Default" value: { - dps: 3508.56243 - tps: 2992.06268 + dps: 3551.04865 + tps: 2923.4926 } } diff --git a/sim/priest/smite/smite_priest_test.go b/sim/priest/smite/smite_priest_test.go index 6dc9c6fdf0..3da33dbab7 100644 --- a/sim/priest/smite/smite_priest_test.go +++ b/sim/priest/smite/smite_priest_test.go @@ -22,6 +22,7 @@ func TestSmite(t *testing.T) { Glyphs: DefaultGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, + Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -59,104 +60,48 @@ var PlayerOptionsBasic = &proto.Player_SmitePriest{ UseInnerFire: true, UseShadowfiend: true, }, - Rotation: &proto.SmitePriest_Rotation{ - UseDevouringPlague: true, - UseShadowWordDeath: true, - UseMindBlast: true, - - AllowedHolyFireDelayMs: 50, - }, + Rotation: &proto.SmitePriest_Rotation{}, }, } +var DefaultRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":48135}}},{"cmp":{"op":"OpLe","lhs":{"spellCastTime":{"spellId":{"spellId":48123}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":48135}}}}}]}},"castSpell":{"spellId":{"spellId":14751}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":48135}}},{"cmp":{"op":"OpLe","lhs":{"spellCastTime":{"spellId":{"spellId":48123}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":48135}}}}}]}},"castSpell":{"spellId":{"spellId":48123}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48300}}}}},"castSpell":{"spellId":{"spellId":48300}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48125}}}}},"castSpell":{"spellId":{"spellId":48125}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48135}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":48135}}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":48135}}},"rhs":{"const":{"val":"50ms"}}}}]}},"wait":{"duration":{"spellTimeToReady":{"spellId":{"spellId":48135}}}}}}, + {"hide":true,"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59000}}},"castSpell":{"spellId":{"spellId":48123}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":53007}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":48158}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"spellId":48127}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"tag":3,"spellId":48156}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48123}}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40562, - "enchant": 3820, - "gems": [ - 41333, - 42144 - ] - }, - { - "id": 44661, - "gems": [ - 39998 - ] - }, - { - "id": 40459, - "enchant": 3810, - "gems": [ - 42144 - ] - }, - { - "id": 44005, - "enchant": 3859, - "gems": [ - 42144 - ] - }, - { - "id": 40234, - "enchant": 1144, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 44008, - "enchant": 2332, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40454, - "enchant": 3604, - "gems": [ - 40049, - 0 - ] - }, - { - "id": 40561, - "enchant": 3601, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 3719 - }, - { - "id": 40558, - "enchant": 3826 - }, - { - "id": 40719 - }, - { - "id": 40399 - }, - { - "id": 40255 - }, - { - "id": 40432 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 40273 - }, - { - "id": 39712 - } + {"id":40562,"enchant":3820,"gems":[41333,42144]}, + {"id":44661,"gems":[39998]}, + {"id":40459,"enchant":3810,"gems":[42144]}, + {"id":44005,"enchant":3859,"gems":[42144]}, + {"id":40234,"enchant":1144,"gems":[39998,39998]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40454,"enchant":3604,"gems":[40049,0]}, + {"id":40561,"enchant":3601,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40558,"enchant":3826}, + {"id":40719}, + {"id":40399}, + {"id":40255}, + {"id":40432}, + {"id":40395,"enchant":3834}, + {"id":40273}, + {"id":39712} ]}`) diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 72fadc6633..2a01864f7a 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5636.84 - final_stats: 469.94995 + final_stats: 469.94994 final_stats: 2072.9756 final_stats: 221 final_stats: 94 diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 6cc54bb53e..c0c8430e85 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5862.3136 - final_stats: 469.94995 + final_stats: 469.94994 final_stats: 2164.78757 final_stats: 221 final_stats: 94 diff --git a/sim/shaman/fire_elemental_totem.go b/sim/shaman/fire_elemental_totem.go index e119b2a5bb..144ac674f7 100644 --- a/sim/shaman/fire_elemental_totem.go +++ b/sim/shaman/fire_elemental_totem.go @@ -46,8 +46,12 @@ func (shaman *Shaman) registerFireElementalTotem() { } else if shaman.Totems.Fire != proto.FireTotem_NoFireTotem && !shaman.Totems.UseFireMcd { shaman.NextTotemDrops[FireTotem] = sim.CurrentTime + fireTotemDuration } + shaman.MagmaTotem.AOEDot().Cancel(sim) - shaman.SearingTotem.Dot(shaman.CurrentTarget).Cancel(sim) + searingTotemDot := shaman.SearingTotem.Dot(shaman.CurrentTarget) + if searingTotemDot != nil { + searingTotemDot.Cancel(sim) + } shaman.FireElemental.EnableWithTimeout(sim, shaman.FireElemental, fireTotemDuration) diff --git a/sim/shaman/restoration/TestRestoration.results b/sim/shaman/restoration/TestRestoration.results index 9fda6a2438..951de60d37 100644 --- a/sim/shaman/restoration/TestRestoration.results +++ b/sim/shaman/restoration/TestRestoration.results @@ -3,19 +3,19 @@ character_stats_results: { value: { final_stats: 385 final_stats: 335.5 - final_stats: 1404.15 + final_stats: 1384.35 final_stats: 1229.8 final_stats: 324.5 - final_stats: 2989.94 - final_stats: 385 + final_stats: 3158.94 + final_stats: 416 final_stats: 0 - final_stats: 1451.45399 - final_stats: 645 + final_stats: 1385.45399 + final_stats: 573 final_stats: 0 final_stats: 1702.25 final_stats: 0 - final_stats: 1147.01467 - final_stats: 645 + final_stats: 1081.01467 + final_stats: 573 final_stats: 0 final_stats: 0 final_stats: 22563 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 20821.5 + final_stats: 20623.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,981 +46,857 @@ character_stats_results: { dps_results: { key: "TestRestoration-AllItems-Althor'sAbacus-50359" value: { - tps: 56.02985 - hps: 3756.24519 + dps: 448.56677 } } dps_results: { key: "TestRestoration-AllItems-Althor'sAbacus-50366" value: { - tps: 56.02985 - hps: 3790.50709 + dps: 450.70095 } } dps_results: { key: "TestRestoration-AllItems-AustereEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-Bandit'sInsignia-40371" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-BaubleofTrueBlood-50354" value: { - tps: 55.73375 - hps: 3562.82736 + dps: 431.39321 + hps: 93.56546 } } dps_results: { key: "TestRestoration-AllItems-BaubleofTrueBlood-50726" value: { - tps: 55.73375 - hps: 3562.82736 + dps: 431.39321 + hps: 93.56546 } } dps_results: { key: "TestRestoration-AllItems-BeamingEarthsiegeDiamond" value: { - tps: 53.89479 - hps: 3492.57195 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-Beast-tamer'sShoulders-30892" value: { - tps: 57.45403 - hps: 3320.91806 + dps: 426.68973 } } dps_results: { key: "TestRestoration-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-BlackBruise-50035" value: { - tps: 58.65319 - hps: 3086.18247 + dps: 382.52198 } } dps_results: { key: "TestRestoration-AllItems-BlackBruise-50692" value: { - tps: 58.65319 - hps: 3086.18247 + dps: 382.52198 } } dps_results: { key: "TestRestoration-AllItems-BlessedGarboftheUndeadSlayer" value: { - tps: 51.82867 - hps: 2685.64199 + dps: 380.39261 } } dps_results: { key: "TestRestoration-AllItems-BlessedRegaliaofUndeadCleansing" value: { - tps: 52.23976 - hps: 2804.81336 + dps: 396.67991 } } dps_results: { key: "TestRestoration-AllItems-BracingEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3451.01752 + dps: 442.43515 } } dps_results: { key: "TestRestoration-AllItems-Bryntroll,theBoneArbiter-50415" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Bryntroll,theBoneArbiter-50709" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-ChaoticSkyflareDiamond" value: { - tps: 53.15684 - hps: 3448.97728 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-CorpseTongueCoin-50349" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-CorpseTongueCoin-50352" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-CorrodedSkeletonKey-50356" value: { - tps: 55.94781 - hps: 3545.33782 + dps: 431.20231 + hps: 64 } } dps_results: { key: "TestRestoration-AllItems-DarkmoonCard:Berserker!-42989" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-DarkmoonCard:Death-42990" value: { - tps: 56.7451 - hps: 3535.96241 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-DarkmoonCard:Greatness-44255" value: { - tps: 60.17036 - hps: 3769.22175 + dps: 434.45826 } } dps_results: { key: "TestRestoration-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Death'sChoice-47464" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-DeathKnight'sAnguish-38212" value: { - tps: 56.19391 - hps: 3501.90179 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Deathbringer'sWill-50362" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Deathbringer'sWill-50363" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Defender'sCode-40257" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-DestructiveSkyflareDiamond" value: { - tps: 53.19786 - hps: 3449.84441 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-DislodgedForeignObject-50348" value: { - tps: 55.8568 - hps: 3480.87146 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-DislodgedForeignObject-50353" value: { - tps: 55.8568 - hps: 3480.59601 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-EarthshatterBattlegear" value: { - tps: 48.8553 - hps: 2621.83576 + dps: 391.21659 } } dps_results: { key: "TestRestoration-AllItems-EarthshatterGarb" value: { - tps: 52.28018 - hps: 3123.14785 + dps: 441.46862 } } dps_results: { key: "TestRestoration-AllItems-EffulgentSkyflareDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-EmberSkyflareDiamond" value: { - tps: 53.63194 - hps: 3496.38066 + dps: 443.13698 } } dps_results: { key: "TestRestoration-AllItems-EnigmaticSkyflareDiamond" value: { - tps: 53.15684 - hps: 3448.97728 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-EnigmaticStarflareDiamond" value: { - tps: 53.15684 - hps: 3448.97728 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-EphemeralSnowflake-50260" value: { - tps: 60.0112 - hps: 3575.02567 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-EssenceofGossamer-37220" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-EternalEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-ExtractofNecromanticPower-40373" value: { - tps: 56.95018 - hps: 3544.72566 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-EyeoftheBroodmother-45308" value: { - tps: 56.90916 - hps: 3632.73969 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Figurine-SapphireOwl-42413" value: { - tps: 61.97911 - hps: 3670.3972 + dps: 432.84709 + tps: 0.975 } } dps_results: { key: "TestRestoration-AllItems-ForethoughtTalisman-40258" value: { - tps: 55.94781 - hps: 3606.00473 + dps: 441.97021 } } dps_results: { key: "TestRestoration-AllItems-ForgeEmber-37660" value: { - tps: 56.66306 - hps: 3528.8162 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-ForlornSkyflareDiamond" value: { - tps: 52.95176 - hps: 3451.01752 + dps: 442.43515 } } dps_results: { key: "TestRestoration-AllItems-ForlornStarflareDiamond" value: { - tps: 52.95176 - hps: 3447.69617 + dps: 441.95011 } } dps_results: { key: "TestRestoration-AllItems-FrostWitch'sBattlegear" value: { - tps: 54.18965 - hps: 2939.65451 + dps: 394.75407 } } dps_results: { key: "TestRestoration-AllItems-FrostWitch'sRegalia" value: { - tps: 60.07309 - hps: 3726.0287 + dps: 474.58823 } } dps_results: { key: "TestRestoration-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-FuryoftheFiveFlights-40431" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-FuturesightRune-38763" value: { - tps: 55.94781 - hps: 3523.64002 + dps: 437.21681 } } dps_results: { key: "TestRestoration-AllItems-Gladiator'sEarthshaker" value: { - tps: 56.62679 - hps: 3064.60714 + dps: 372.96985 } } dps_results: { key: "TestRestoration-AllItems-Gladiator'sWartide" value: { - tps: 51.4736 - hps: 3343.64087 + dps: 464.44856 } } dps_results: { key: "TestRestoration-AllItems-GlowingTwilightScale-54573" value: { - tps: 55.94781 - hps: 3667.93358 + dps: 449.63386 } } dps_results: { key: "TestRestoration-AllItems-GlowingTwilightScale-54589" value: { - tps: 55.94781 - hps: 3692.35092 + dps: 452.05906 } } dps_results: { key: "TestRestoration-AllItems-GnomishLightningGenerator-41121" value: { - tps: 56.7451 - dtps: 27.04198 - hps: 3535.19385 + dps: 428.49008 + dtps: 31.91045 } } dps_results: { key: "TestRestoration-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Heartpierce-49982" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Heartpierce-50641" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 + } +} +dps_results: { + key: "TestRestoration-AllItems-IllustrationoftheDragonSoul-40432" + value: { + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-ImpassiveSkyflareDiamond" value: { - tps: 53.15684 - hps: 3448.97728 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-ImpassiveStarflareDiamond" value: { - tps: 53.15684 - hps: 3448.97728 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-IncisorFragment-37723" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-InsightfulEarthsiegeDiamond" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-InvigoratingEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-LastWord-50179" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-LastWord-50708" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Lavanthor'sTalisman-37872" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-MajesticDragonFigurine-40430" value: { - tps: 55.8568 - hps: 3479.41725 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-MeteoriteWhetstone-37390" value: { - tps: 56.66306 - hps: 3528.8162 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-NevermeltingIceCrystal-50259" value: { - tps: 58.13966 - hps: 3696.45463 + dps: 441.97021 } } dps_results: { key: "TestRestoration-AllItems-Nibelung-49992" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-Nibelung-50648" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-OfferingofSacrifice-37638" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-PersistentEarthshatterDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-PersistentEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-PetrifiedScarab-21685" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-PetrifiedTwilightScale-54571" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-PetrifiedTwilightScale-54591" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-PowerfulEarthshatterDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-PowerfulEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-PurifiedShardoftheGods" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-ReignoftheDead-47316" value: { - tps: 55.94781 - hps: 3583.68184 + dps: 445.75353 } } dps_results: { key: "TestRestoration-AllItems-ReignoftheDead-47477" value: { - tps: 55.94781 - hps: 3595.96312 + dps: 447.49968 } } dps_results: { key: "TestRestoration-AllItems-RelentlessEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-RevitalizingSkyflareDiamond" value: { - tps: 53.11582 - hps: 3516.99632 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-RuneofRepulsion-40372" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-SealofthePantheon-36993" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Shadowmourne-49623" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-ShinyShardoftheGods" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Sindragosa'sFlawlessFang-50361" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-SkycallTotem-33506" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-SkyshatterHarness" value: { - tps: 40.1362 - hps: 2068.99886 + dps: 345.77185 } } dps_results: { key: "TestRestoration-AllItems-SkyshatterRegalia" value: { - tps: 44.41819 - hps: 2568.43927 + dps: 391.08118 } } dps_results: { key: "TestRestoration-AllItems-SliverofPureIce-50339" value: { - tps: 64.05571 - hps: 3768.40976 + dps: 446.5296 } } dps_results: { key: "TestRestoration-AllItems-SliverofPureIce-50346" value: { - tps: 64.82108 - hps: 3805.52962 + dps: 448.46976 } } dps_results: { key: "TestRestoration-AllItems-SouloftheDead-40382" value: { - tps: 64.43782 - hps: 3705.57981 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-SparkofLife-37657" value: { - tps: 56.7451 - hps: 3614.79593 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-SphereofRedDragon'sBlood-37166" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 442.12727 } } dps_results: { key: "TestRestoration-AllItems-Stonebreaker'sTotem-33507" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-StormshroudArmor" value: { - tps: 48.45516 - hps: 2510.94875 + dps: 376.93415 } } dps_results: { key: "TestRestoration-AllItems-SwiftSkyflareDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-SwiftStarflareDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-SwiftWindfireDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-TalismanofTrollDivinity-37734" value: { - tps: 55.8568 - hps: 3478.41006 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-TearsoftheVanquished-47215" value: { - tps: 64.73227 - hps: 3796.02382 + dps: 434.25842 } } dps_results: { key: "TestRestoration-AllItems-TheFistsofFury" value: { - tps: 56.13897 - hps: 2983.28628 + dps: 387.20001 } } dps_results: { key: "TestRestoration-AllItems-TheGeneral'sHeart-45507" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 431.20231 } } dps_results: { key: "TestRestoration-AllItems-Thrall'sBattlegear" value: { - tps: 52.38097 - hps: 2829.80761 + dps: 401.52996 } } dps_results: { key: "TestRestoration-AllItems-Thrall'sRegalia" value: { - tps: 54.2367 - hps: 3277.9511 + dps: 471.34404 } } dps_results: { key: "TestRestoration-AllItems-ThunderingSkyflareDiamond" value: { - tps: 52.95176 - hps: 3434.41076 + dps: 440.00995 } } dps_results: { key: "TestRestoration-AllItems-TidefuryRaiment" value: { - tps: 42.98929 - hps: 2454.36029 + dps: 378.30949 } } dps_results: { key: "TestRestoration-AllItems-TinyAbominationinaJar-50351" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 449.6694 } } dps_results: { key: "TestRestoration-AllItems-TinyAbominationinaJar-50706" value: { - tps: 55.94781 - hps: 3481.33782 + dps: 449.6694 } } dps_results: { key: "TestRestoration-AllItems-TirelessSkyflareDiamond" value: { - tps: 52.95176 - hps: 3451.01752 + dps: 442.43515 } } dps_results: { key: "TestRestoration-AllItems-TirelessStarflareDiamond" value: { - tps: 52.95176 - hps: 3447.69617 + dps: 441.95011 } } dps_results: { key: "TestRestoration-AllItems-TomeofArcanePhenomena-36972" value: { - tps: 55.94781 - hps: 3529.24578 + dps: 437.79886 } } dps_results: { key: "TestRestoration-AllItems-TotemofElectrifyingWind-47666" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-TotemofQuakingEarth-47667" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-TotemoftheAvalanche-50463" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-TotemoftheElementalPlane-40708" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-AllItems-TrenchantEarthshatterDiamond" value: { - tps: 52.95176 - hps: 3447.69617 + dps: 441.95011 } } dps_results: { key: "TestRestoration-AllItems-TrenchantEarthsiegeDiamond" value: { - tps: 52.95176 - hps: 3451.01752 + dps: 442.43515 } } dps_results: { key: "TestRestoration-AllItems-UndeadSlayer'sBlessedArmor" value: { - tps: 48.07483 - hps: 2492.16914 + dps: 376.93415 } } dps_results: { key: "TestRestoration-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - tps: 61.65251 - hps: 3909.97254 + dps: 452.7871 } } dps_results: { key: "TestRestoration-AllItems-WingedTalisman-37844" value: { - tps: 55.94781 - hps: 3527.19971 + dps: 464.76713 } } dps_results: { key: "TestRestoration-AllItems-WorldbreakerBattlegear" value: { - tps: 50.25305 - hps: 2702.03207 + dps: 396.63682 } } dps_results: { key: "TestRestoration-AllItems-WorldbreakerGarb" value: { - tps: 54.74915 - hps: 3318.83225 + dps: 466.20095 } } dps_results: { key: "TestRestoration-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 440.70911 } } dps_results: { key: "TestRestoration-Average-Default" value: { - tps: 62.19455 - hps: 3707.01695 + dps: 442.96219 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-FullBuffs-LongMultiTarget" value: { - tps: 1215.72804 - hps: 3636.76773 + tps: 1214.78809 + hps: 3656.35628 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-FullBuffs-LongSingleTarget" value: { - tps: 60.7864 - hps: 3636.76773 + tps: 60.7394 + hps: 3656.35628 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-FullBuffs-ShortSingleTarget" value: { - tps: 181.16525 - hps: 6507.22714 + tps: 166.90088 + hps: 6377.42874 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-NoBuffs-LongMultiTarget" value: { - tps: 606.99042 - hps: 1959.06873 + tps: 603.51585 + hps: 1983.64197 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-NoBuffs-LongSingleTarget" value: { - tps: 30.34952 - hps: 1959.06873 + tps: 30.17579 + hps: 1983.64197 } } dps_results: { key: "TestRestoration-Settings-Troll-P1-Standard-NoBuffs-ShortSingleTarget" value: { - tps: 117.87665 - hps: 5429.84121 + tps: 116.0309 + hps: 5369.31022 } } dps_results: { key: "TestRestoration-SwitchInFrontOfTarget-Default" value: { - tps: 60.7864 - hps: 3636.76773 + dps: 401.83478 } } diff --git a/sim/shaman/restoration/restoration_test.go b/sim/shaman/restoration/restoration_test.go index 0b1d1df472..4588f171e8 100644 --- a/sim/shaman/restoration/restoration_test.go +++ b/sim/shaman/restoration/restoration_test.go @@ -22,6 +22,7 @@ func TestRestoration(t *testing.T) { Glyphs: StandardGlyphs, Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Standard", SpecOptions: PlayerOptionsStandard}, + Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation}, ItemFilter: core.ItemFilter{ WeaponTypes: []proto.WeaponType{ @@ -103,99 +104,29 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredDarkRune, } +var DefaultRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40510, - "enchant": 3820, - "gems": [ - 41401, - 40051 - ] - }, - { - "id": 44662, - "gems": [ - 42150 - ] - }, - { - "id": 40513, - "enchant": 3810, - "gems": [ - 40051 - ] - }, - { - "id": 44005, - "enchant": 3859, - "gems": [ - 40105 - ] - }, - { - "id": 40508, - "enchant": 2381, - "gems": [ - 42144, - 42150 - ] - }, - { - "id": 40209, - "enchant": 2332, - "gems": [ - 0 - ] - }, - { - "id": 40564, - "enchant": 3604, - "gems": [ - 0 - ] - }, - { - "id": 40327, - "gems": [ - 0 - ] - }, - { - "id": 40512, - "enchant": 3721, - "gems": [ - 40051, - 40105 - ] - }, - { - "id": 40237, - "enchant": 3606, - "gems": [ - 40105 - ] - }, - { - "id": 40399 - }, - { - "id": 40375 - }, - { - "id": 40432 - }, - { - "id": 37111 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 40401, - "enchant": 1128 - }, - { - "id": 40709 - } + {"id":40510,"enchant":3820,"gems":[41401,39998]}, + {"id":44662,"gems":[40051]}, + {"id":40513,"enchant":3810,"gems":[39998]}, + {"id":44005,"enchant":3831,"gems":[40027]}, + {"id":40508,"enchant":2381,"gems":[39998,40051]}, + {"id":40209,"enchant":2332,"gems":[0]}, + {"id":40564,"enchant":3246,"gems":[0]}, + {"id":40327,"gems":[39998]}, + {"id":40512,"enchant":3721,"gems":[39998,40027]}, + {"id":39734,"enchant":3244}, + {"id":40399}, + {"id":40375}, + {"id":37111}, + {"id":40685}, + {"id":40395,"enchant":3834}, + {"id":40401,"enchant":1128}, + {"id":40709} ]}`) diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index ef823ea519..35958b72e0 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -43,19 +43,19 @@ export const aplLaunchStatuses: Record = { [Spec.SpecBalanceDruid]: LaunchStatus.Alpha, [Spec.SpecFeralDruid]: LaunchStatus.Alpha, [Spec.SpecFeralTankDruid]: LaunchStatus.Alpha, - [Spec.SpecRestorationDruid]: LaunchStatus.Alpha, + [Spec.SpecRestorationDruid]: LaunchStatus.Beta, [Spec.SpecElementalShaman]: LaunchStatus.Alpha, [Spec.SpecEnhancementShaman]: LaunchStatus.Alpha, - [Spec.SpecRestorationShaman]: LaunchStatus.Alpha, + [Spec.SpecRestorationShaman]: LaunchStatus.Beta, [Spec.SpecHunter]: LaunchStatus.Launched, [Spec.SpecMage]: LaunchStatus.Alpha, [Spec.SpecRogue]: LaunchStatus.Alpha, - [Spec.SpecHolyPaladin]: LaunchStatus.Alpha, + [Spec.SpecHolyPaladin]: LaunchStatus.Beta, [Spec.SpecProtectionPaladin]: LaunchStatus.Alpha, [Spec.SpecRetributionPaladin]: LaunchStatus.Alpha, - [Spec.SpecHealingPriest]: LaunchStatus.Alpha, + [Spec.SpecHealingPriest]: LaunchStatus.Beta, [Spec.SpecShadowPriest]: LaunchStatus.Alpha, - [Spec.SpecSmitePriest]: LaunchStatus.Alpha, + [Spec.SpecSmitePriest]: LaunchStatus.Beta, [Spec.SpecWarlock]: LaunchStatus.Alpha, [Spec.SpecWarrior]: LaunchStatus.Alpha, [Spec.SpecProtectionWarrior]: LaunchStatus.Alpha, diff --git a/ui/healing_priest/sim.ts b/ui/healing_priest/sim.ts index 0ee4175493..089dec9e3b 100644 --- a/ui/healing_priest/sim.ts +++ b/ui/healing_priest/sim.ts @@ -4,12 +4,9 @@ import { Stat } from '../core/proto/common.js'; import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; - import { - HealingPriest, - HealingPriest_Rotation as Rotation, - HealingPriest_Options as Options, -} from '../core/proto/priest.js'; + APLRotation, +} from '../core/proto/apl.js'; import * as IconInputs from '../core/components/icon_inputs.js'; import * as OtherInputs from '../core/components/other_inputs.js'; @@ -126,6 +123,15 @@ export class HealingPriestSimUI extends IndividualSimUI Presets.HOLY_P2_PRESET, ], }, + + autoRotation: (player: Player): APLRotation => { + const talentTree = player.getTalentTree(); + if (talentTree == 0) { + return Presets.ROTATION_PRESET_DISC.rotation.rotation!; + } else { + return Presets.ROTATION_PRESET_HOLY.rotation.rotation!; + } + }, }); } } diff --git a/ui/holy_paladin/presets.ts b/ui/holy_paladin/presets.ts index 53b244f92f..5e34d78dfd 100644 --- a/ui/holy_paladin/presets.ts +++ b/ui/holy_paladin/presets.ts @@ -1,13 +1,9 @@ -import { Conjured, Consumes } from '../core/proto/common.js'; -import { CustomRotation, CustomSpell } from '../core/proto/common.js'; +import { Consumes } from '../core/proto/common.js'; import { EquipmentSpec } from '../core/proto/common.js'; import { Flask } from '../core/proto/common.js'; import { Food } from '../core/proto/common.js'; -import { Glyphs } from '../core/proto/common.js'; -import { ItemSpec } from '../core/proto/common.js'; import { Potions } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; -import { Faction } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; import { Player } from '../core/player.js'; @@ -20,7 +16,6 @@ import { HolyPaladin_Options as HolyPaladinOptions, } from '../core/proto/paladin.js'; -import * as Gems from '../core/proto_utils/gems.js'; import * as Tooltips from '../core/constants/tooltips.js'; // Preset options for this spec. diff --git a/ui/holy_paladin/sim.ts b/ui/holy_paladin/sim.ts index 4299bac320..1f709639c7 100644 --- a/ui/holy_paladin/sim.ts +++ b/ui/holy_paladin/sim.ts @@ -5,6 +5,9 @@ import { Debuffs } 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 { + APLRotation, +} from '../core/proto/apl.js'; import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -14,8 +17,6 @@ import * as IconInputs from '../core/components/icon_inputs.js'; import * as OtherInputs from '../core/components/other_inputs.js'; import * as Mechanics from '../core/constants/mechanics.js'; -import { PaladinMajorGlyph } from '../core/proto/paladin.js'; - import * as HolyPaladinInputs from './inputs.js'; import * as Presets from './presets.js'; @@ -153,6 +154,10 @@ export class HolyPaladinSimUI extends IndividualSimUI { Presets.P2_PRESET, ], }, + + autoRotation: (_player: Player): APLRotation => { + return APLRotation.create(); + }, }); } } diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts index 6ebbf1d50e..52a69023b1 100644 --- a/ui/hunter/sim.ts +++ b/ui/hunter/sim.ts @@ -14,7 +14,6 @@ import { import { APLAction, APLListItem, - APLPrepullAction, APLRotation, } from '../core/proto/apl.js'; import { Player } from '../core/player.js'; diff --git a/ui/restoration_druid/sim.ts b/ui/restoration_druid/sim.ts index fff9368ee7..8c547d901a 100644 --- a/ui/restoration_druid/sim.ts +++ b/ui/restoration_druid/sim.ts @@ -1,10 +1,11 @@ import { Spec } from '../core/proto/common.js'; import { Stat } from '../core/proto/common.js'; +import { + APLRotation, +} from '../core/proto/apl.js'; import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; - -import * as IconInputs from '../core/components/icon_inputs.js'; import * as OtherInputs from '../core/components/other_inputs.js'; import * as DruidInputs from './inputs.js'; @@ -110,6 +111,10 @@ export class RestorationDruidSimUI extends IndividualSimUI): APLRotation => { + return APLRotation.create(); + }, }); } } diff --git a/ui/restoration_shaman/sim.ts b/ui/restoration_shaman/sim.ts index 6ad63708ed..90fe198a75 100644 --- a/ui/restoration_shaman/sim.ts +++ b/ui/restoration_shaman/sim.ts @@ -5,6 +5,9 @@ import { Debuffs } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; import { Stat } from '../core/proto/common.js'; import { TristateEffect } from '../core/proto/common.js' +import { + APLRotation, +} from '../core/proto/apl.js'; import { Player } from '../core/player.js'; import { Stats } from '../core/proto_utils/stats.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -17,7 +20,6 @@ import * as Mechanics from '../core/constants/mechanics.js'; import * as ShamanInputs from './inputs.js'; import * as Presets from './presets.js'; -import { shamanGlyphsConfig } from '../core/talents/shaman.js'; export class RestorationShamanSimUI extends IndividualSimUI { constructor(parentElem: HTMLElement, player: Player) { @@ -143,6 +145,10 @@ export class RestorationShamanSimUI extends IndividualSimUI): APLRotation => { + return APLRotation.create(); + }, }); } } diff --git a/ui/smite_priest/sim.ts b/ui/smite_priest/sim.ts index 0e4fa26fa6..1a30f4e262 100644 --- a/ui/smite_priest/sim.ts +++ b/ui/smite_priest/sim.ts @@ -1,6 +1,9 @@ import { PartyBuffs } from '../core/proto/common.js'; import { Spec } from '../core/proto/common.js'; import { Stat } from '../core/proto/common.js'; +import { + APLRotation, +} from '../core/proto/apl.js'; import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -121,6 +124,10 @@ export class SmitePriestSimUI extends IndividualSimUI { Presets.P1_PRESET, ], }, + + autoRotation: (_player: Player): APLRotation => { + return Presets.ROTATION_PRESET_APL.rotation.rotation!; + }, }); } }