From 7e5ceab4e17a9750cdd39963ad196b8b8544e0c2 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Mon, 16 Oct 2023 21:57:32 -0700 Subject: [PATCH 1/2] Move gear sets into json files --- sim/core/test_utils.go | 10 + sim/deathknight/dps/TestBlood.results | 72 +- sim/deathknight/dps/TestFrost.results | 144 +- sim/deathknight/dps/TestFrostUH.results | 48 +- sim/deathknight/dps/TestUnholy.results | 96 +- sim/deathknight/dps/dps_deathknight_test.go | 68 +- sim/deathknight/tank/TestBloodTank.results | 48 +- sim/deathknight/tank/tank_deathknight_test.go | 22 +- sim/druid/balance/TestBalance.results | 78 +- sim/druid/balance/TestBalancePhase3.results | 12 +- sim/druid/balance/balance_test.go | 89 +- sim/druid/feral/TestFeral.results | 162 +- sim/druid/feral/feral_test.go | 53 +- sim/druid/restoration/TestRestoration.results | 12 +- sim/druid/restoration/restoration_test.go | 22 +- sim/druid/tank/TestFeralTank.results | 12 +- sim/druid/tank/tank_test.go | 24 +- sim/hunter/TestBM.results | 24 +- sim/hunter/TestMM.results | 660 +++---- sim/hunter/TestSV.results | 72 +- sim/hunter/hunter_test.go | 28 +- sim/mage/TestArcane.results | 521 +++--- sim/mage/TestFire.results | 521 +++--- sim/mage/TestFrost.results | 509 ++--- sim/mage/TestFrostFire.results | 485 ++--- sim/mage/mage_test.go | 30 +- sim/paladin/holy/TestHoly.results | 24 +- sim/paladin/holy/holy_test.go | 24 +- sim/paladin/protection/TestProtection.results | 72 +- sim/paladin/protection/protection_test.go | 24 +- .../retribution/TestRetribution.results | 192 +- sim/paladin/retribution/retribution_test.go | 24 +- sim/priest/healing/TestDisc.results | 12 +- sim/priest/healing/TestHoly.results | 744 ++++---- sim/priest/healing/healing_priest_test.go | 24 +- sim/priest/shadow/TestShadow.results | 108 +- sim/priest/shadow/shadow_priest_test.go | 208 +-- sim/priest/smite/TestSmite.results | 12 +- sim/priest/smite/smite_priest_test.go | 22 +- sim/rogue/TestAssassination.results | 384 ++-- sim/rogue/TestCombat.results | 1648 ++++++++--------- sim/rogue/TestSubtlety.results | 24 +- sim/rogue/rogue_test.go | 46 +- sim/shaman/elemental/TestElemental.results | 96 +- sim/shaman/elemental/elemental_test.go | 24 +- .../enhancement/TestEnhancement.results | 144 +- sim/shaman/enhancement/enhancement_test.go | 24 +- .../restoration/TestRestoration.results | 12 +- sim/shaman/restoration/restoration_test.go | 24 +- sim/warlock/TestAffliction.results | 456 ++--- sim/warlock/TestDemonology.results | 498 ++--- sim/warlock/TestDestruction.results | 503 ++--- sim/warlock/warlock_test.go | 65 +- sim/warrior/dps/TestArms.results | 600 +++--- sim/warrior/dps/TestFury.results | 48 +- sim/warrior/dps/dps_warrior_test.go | 26 +- .../protection/TestProtectionWarrior.results | 24 +- .../protection/protection_warrior_test.go | 24 +- ui/balance_druid/gear_sets/p1.gear.json | 19 + ui/balance_druid/gear_sets/p2.gear.json | 19 + .../gear_sets/p3_alliance.gear.json | 19 + ui/balance_druid/gear_sets/p3_horde.gear.json | 19 + ui/balance_druid/gear_sets/preraid.gear.json | 19 + ui/balance_druid/presets.ts | 152 +- ui/balance_druid/sim.ts | 2 +- ui/core/preset_utils.ts | 53 +- ui/deathknight/gear_sets/p1_blood.gear.json | 19 + ui/deathknight/gear_sets/p1_frost.gear.json | 19 + .../gear_sets/p1_frost_subUh.gear.json | 19 + ui/deathknight/gear_sets/p1_uh_2h.gear.json | 19 + ui/deathknight/gear_sets/p1_uh_dw.gear.json | 19 + ui/deathknight/gear_sets/p2_blood.gear.json | 19 + ui/deathknight/gear_sets/p2_frost.gear.json | 19 + ui/deathknight/gear_sets/p2_uh_dw.gear.json | 19 + ui/deathknight/gear_sets/p3_blood.gear.json | 19 + ui/deathknight/gear_sets/p3_frost.gear.json | 19 + ui/deathknight/gear_sets/p3_uh_dw.gear.json | 19 + ui/deathknight/gear_sets/p4_blood.gear.json | 19 + ui/deathknight/gear_sets/p4_frost.gear.json | 19 + ui/deathknight/gear_sets/p4_uh_2h.gear.json | 19 + ui/deathknight/gear_sets/p4_uh_dw.gear.json | 19 + .../gear_sets/preraid_frost.gear.json | 19 + .../gear_sets/preraid_uh_2h.gear.json | 19 + .../gear_sets/preraid_uh_dw.gear.json | 19 + ui/deathknight/presets.ts | 649 ++----- ui/deathknight/sim.ts | 37 +- ui/elemental_shaman/gear_sets/p1.gear.json | 19 + ui/elemental_shaman/gear_sets/p2.gear.json | 19 + .../gear_sets/p3_alliance.gear.json | 19 + .../gear_sets/p3_horde.gear.json | 19 + ui/elemental_shaman/gear_sets/p4.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/elemental_shaman/presets.ts | 231 +-- ui/elemental_shaman/sim.ts | 3 +- ui/enhancement_shaman/gear_sets/p1.gear.json | 19 + .../gear_sets/p2_ft.gear.json | 19 + .../gear_sets/p2_wf.gear.json | 19 + .../gear_sets/p3_alliance.gear.json | 19 + .../gear_sets/p3_horde.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/enhancement_shaman/presets.ts | 221 +-- ui/enhancement_shaman/sim.ts | 2 +- ui/feral_druid/gear_sets/p1.gear.json | 19 + ui/feral_druid/gear_sets/p2.gear.json | 19 + ui/feral_druid/gear_sets/p3.gear.json | 19 + ui/feral_druid/gear_sets/p4.gear.json | 19 + ui/feral_druid/gear_sets/preraid.gear.json | 19 + ui/feral_druid/presets.ts | 171 +- ui/feral_druid/sim.ts | 2 +- ui/feral_tank_druid/gear_sets/p1.gear.json | 19 + ui/feral_tank_druid/gear_sets/p2.gear.json | 19 + ui/feral_tank_druid/presets.ts | 72 +- ui/healing_priest/gear_sets/p1_disc.gear.json | 19 + ui/healing_priest/gear_sets/p1_holy.gear.json | 19 + ui/healing_priest/gear_sets/p2_disc.gear.json | 19 + ui/healing_priest/gear_sets/p2_holy.gear.json | 19 + .../gear_sets/preraid_disc.gear.json | 19 + .../gear_sets/preraid_holy.gear.json | 19 + ui/healing_priest/presets.ts | 221 +-- ui/holy_paladin/gear_sets/p1.gear.json | 19 + ui/holy_paladin/gear_sets/p2.gear.json | 19 + ui/holy_paladin/gear_sets/preraid.gear.json | 19 + ui/holy_paladin/presets.ts | 88 +- ui/hunter/gear_sets/p1_mm.gear.json | 19 + ui/hunter/gear_sets/p1_sv.gear.json | 19 + ui/hunter/gear_sets/p2_mm.gear.json | 19 + ui/hunter/gear_sets/p2_sv.gear.json | 19 + ui/hunter/gear_sets/p3_mm.gear.json | 19 + ui/hunter/gear_sets/p3_sv.gear.json | 19 + ui/hunter/gear_sets/p4_mm.gear.json | 19 + ui/hunter/gear_sets/p4_sv.gear.json | 19 + ui/hunter/gear_sets/p5_mm.gear.json | 19 + ui/hunter/gear_sets/p5_sv.gear.json | 19 + ui/hunter/gear_sets/preraid_mm.gear.json | 19 + ui/hunter/gear_sets/preraid_sv.gear.json | 19 + ui/hunter/presets.ts | 365 +--- ui/mage/gear_sets/p1_arcane.gear.json | 19 + ui/mage/gear_sets/p1_fire.gear.json | 19 + ui/mage/gear_sets/p1_frost.gear.json | 19 + ui/mage/gear_sets/p2_arcane.gear.json | 19 + ui/mage/gear_sets/p2_ffb.gear.json | 19 + ui/mage/gear_sets/p2_fire.gear.json | 19 + ui/mage/gear_sets/p2_frost.gear.json | 19 + .../gear_sets/p3_arcane_alliance.gear.json | 19 + ui/mage/gear_sets/p3_arcane_horde.gear.json | 19 + ui/mage/gear_sets/p3_ffb_alliance.gear.json | 19 + ui/mage/gear_sets/p3_ffb_horde.gear.json | 19 + ui/mage/gear_sets/p3_fire_alliance.gear.json | 19 + ui/mage/gear_sets/p3_fire_horde.gear.json | 19 + ui/mage/gear_sets/p3_frost_alliance.gear.json | 19 + ui/mage/gear_sets/p3_frost_horde.gear.json | 19 + .../gear_sets/p4_arcane_alliance.gear.json | 19 + ui/mage/gear_sets/p4_arcane_horde.gear.json | 19 + ui/mage/gear_sets/p4_ffb_alliance.gear.json | 19 + ui/mage/gear_sets/p4_ffb_horde.gear.json | 19 + ui/mage/gear_sets/p4_fire_alliance.gear.json | 19 + ui/mage/gear_sets/p4_fire_horde.gear.json | 19 + ui/mage/gear_sets/preraid_arcane.gear.json | 19 + ui/mage/gear_sets/preraid_fire.gear.json | 19 + ui/mage/presets.ts | 668 +------ ui/protection_paladin/gear_sets/p1.gear.json | 19 + ui/protection_paladin/gear_sets/p2.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/protection_paladin/presets.ts | 121 +- .../gear_sets/p1_balanced.gear.json | 19 + .../gear_sets/p2_survival.gear.json | 19 + .../gear_sets/preraid_balanced.gear.json | 19 + ui/protection_warrior/presets.ts | 128 +- ui/protection_warrior/sim.ts | 4 +- ui/raid/presets.ts | 72 +- ui/restoration_druid/gear_sets/p1.gear.json | 19 + ui/restoration_druid/gear_sets/p2.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/restoration_druid/presets.ts | 89 +- ui/restoration_druid/sim.ts | 2 +- ui/restoration_shaman/gear_sets/p1.gear.json | 19 + ui/restoration_shaman/gear_sets/p2.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/restoration_shaman/presets.ts | 104 +- ui/restoration_shaman/sim.ts | 4 +- ui/retribution_paladin/gear_sets/p1.gear.json | 19 + ui/retribution_paladin/gear_sets/p2.gear.json | 19 + .../gear_sets/p3_mace.gear.json | 19 + ui/retribution_paladin/gear_sets/p4.gear.json | 19 + ui/retribution_paladin/gear_sets/p5.gear.json | 19 + .../gear_sets/preraid.gear.json | 19 + ui/retribution_paladin/presets.ts | 232 +-- ui/retribution_paladin/sim.ts | 2 +- ui/rogue/gear_sets/p1_assassination.gear.json | 19 + ui/rogue/gear_sets/p1_combat.gear.json | 19 + ui/rogue/gear_sets/p1_hemosub.gear.json | 19 + ui/rogue/gear_sets/p2_assassination.gear.json | 19 + ui/rogue/gear_sets/p2_combat.gear.json | 19 + ui/rogue/gear_sets/p2_hemosub.gear.json | 19 + ui/rogue/gear_sets/p3_assassination.gear.json | 19 + ui/rogue/gear_sets/p3_combat.gear.json | 19 + ui/rogue/gear_sets/p3_dancesub.gear.json | 25 + ui/rogue/gear_sets/p3_hemosub.gear.json | 20 + .../gear_sets/preraid_assassination.gear.json | 19 + ui/rogue/gear_sets/preraid_combat.gear.json | 19 + ui/rogue/presets.ts | 386 +--- ui/shadow_priest/gear_sets/p1.gear.json | 19 + ui/shadow_priest/gear_sets/p2.gear.json | 19 + ui/shadow_priest/gear_sets/p3.gear.json | 19 + ui/shadow_priest/gear_sets/preraid.gear.json | 19 + ui/shadow_priest/presets.ts | 120 +- ui/shadow_priest/sim.ts | 2 +- ui/smite_priest/gear_sets/p1.gear.json | 19 + ui/smite_priest/gear_sets/preraid.gear.json | 19 + ui/smite_priest/presets.ts | 72 +- .../gear_sets/p1_blood.gear.json | 19 + .../gear_sets/p1_frost.gear.json | 19 + .../gear_sets/p2_blood.gear.json | 19 + .../gear_sets/p2_frost.gear.json | 19 + ui/tank_deathknight/presets.ts | 130 +- ui/warlock/gear_sets/p1_affliction.gear.json | 19 + ui/warlock/gear_sets/p1_demodestro.gear.json | 19 + ui/warlock/gear_sets/p2_affliction.gear.json | 19 + ui/warlock/gear_sets/p2_demodestro.gear.json | 19 + .../p3_affliction_alliance.gear.json | 19 + .../gear_sets/p3_affliction_horde.gear.json | 19 + .../gear_sets/p3_demo_alliance.gear.json | 19 + ui/warlock/gear_sets/p3_demo_horde.gear.json | 19 + .../gear_sets/p3_destro_alliance.gear.json | 19 + .../gear_sets/p3_destro_horde.gear.json | 19 + .../gear_sets/preraid_affliction.gear.json | 19 + .../gear_sets/preraid_demodestro.gear.json | 19 + ui/warlock/gear_sets/swp.gear.json | 19 + ui/warlock/presets.ts | 430 +---- ui/warlock/sim.ts | 26 +- ui/warrior/gear_sets/p1_arms.gear.json | 19 + ui/warrior/gear_sets/p1_fury.gear.json | 19 + ui/warrior/gear_sets/p2_arms.gear.json | 19 + ui/warrior/gear_sets/p2_fury.gear.json | 19 + .../gear_sets/p3_arms_2p_alliance.gear.json | 19 + .../gear_sets/p3_arms_2p_horde.gear.json | 19 + .../gear_sets/p3_arms_4p_alliance.gear.json | 19 + .../gear_sets/p3_arms_4p_horde.gear.json | 19 + .../gear_sets/p3_fury_alliance.gear.json | 19 + ui/warrior/gear_sets/p3_fury_horde.gear.json | 19 + ui/warrior/gear_sets/preraid_arms.gear.json | 19 + ui/warrior/gear_sets/preraid_fury.gear.json | 19 + ui/warrior/presets.ts | 394 +--- ui/warrior/sim.ts | 4 +- 244 files changed, 8327 insertions(+), 9790 deletions(-) create mode 100644 ui/balance_druid/gear_sets/p1.gear.json create mode 100644 ui/balance_druid/gear_sets/p2.gear.json create mode 100644 ui/balance_druid/gear_sets/p3_alliance.gear.json create mode 100644 ui/balance_druid/gear_sets/p3_horde.gear.json create mode 100644 ui/balance_druid/gear_sets/preraid.gear.json create mode 100644 ui/deathknight/gear_sets/p1_blood.gear.json create mode 100644 ui/deathknight/gear_sets/p1_frost.gear.json create mode 100644 ui/deathknight/gear_sets/p1_frost_subUh.gear.json create mode 100644 ui/deathknight/gear_sets/p1_uh_2h.gear.json create mode 100644 ui/deathknight/gear_sets/p1_uh_dw.gear.json create mode 100644 ui/deathknight/gear_sets/p2_blood.gear.json create mode 100644 ui/deathknight/gear_sets/p2_frost.gear.json create mode 100644 ui/deathknight/gear_sets/p2_uh_dw.gear.json create mode 100644 ui/deathknight/gear_sets/p3_blood.gear.json create mode 100644 ui/deathknight/gear_sets/p3_frost.gear.json create mode 100644 ui/deathknight/gear_sets/p3_uh_dw.gear.json create mode 100644 ui/deathknight/gear_sets/p4_blood.gear.json create mode 100644 ui/deathknight/gear_sets/p4_frost.gear.json create mode 100644 ui/deathknight/gear_sets/p4_uh_2h.gear.json create mode 100644 ui/deathknight/gear_sets/p4_uh_dw.gear.json create mode 100644 ui/deathknight/gear_sets/preraid_frost.gear.json create mode 100644 ui/deathknight/gear_sets/preraid_uh_2h.gear.json create mode 100644 ui/deathknight/gear_sets/preraid_uh_dw.gear.json create mode 100644 ui/elemental_shaman/gear_sets/p1.gear.json create mode 100644 ui/elemental_shaman/gear_sets/p2.gear.json create mode 100644 ui/elemental_shaman/gear_sets/p3_alliance.gear.json create mode 100644 ui/elemental_shaman/gear_sets/p3_horde.gear.json create mode 100644 ui/elemental_shaman/gear_sets/p4.gear.json create mode 100644 ui/elemental_shaman/gear_sets/preraid.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/p1.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/p2_ft.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/p2_wf.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/p3_alliance.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/p3_horde.gear.json create mode 100644 ui/enhancement_shaman/gear_sets/preraid.gear.json create mode 100644 ui/feral_druid/gear_sets/p1.gear.json create mode 100644 ui/feral_druid/gear_sets/p2.gear.json create mode 100644 ui/feral_druid/gear_sets/p3.gear.json create mode 100644 ui/feral_druid/gear_sets/p4.gear.json create mode 100644 ui/feral_druid/gear_sets/preraid.gear.json create mode 100644 ui/feral_tank_druid/gear_sets/p1.gear.json create mode 100644 ui/feral_tank_druid/gear_sets/p2.gear.json create mode 100644 ui/healing_priest/gear_sets/p1_disc.gear.json create mode 100644 ui/healing_priest/gear_sets/p1_holy.gear.json create mode 100644 ui/healing_priest/gear_sets/p2_disc.gear.json create mode 100644 ui/healing_priest/gear_sets/p2_holy.gear.json create mode 100644 ui/healing_priest/gear_sets/preraid_disc.gear.json create mode 100644 ui/healing_priest/gear_sets/preraid_holy.gear.json create mode 100644 ui/holy_paladin/gear_sets/p1.gear.json create mode 100644 ui/holy_paladin/gear_sets/p2.gear.json create mode 100644 ui/holy_paladin/gear_sets/preraid.gear.json create mode 100644 ui/hunter/gear_sets/p1_mm.gear.json create mode 100644 ui/hunter/gear_sets/p1_sv.gear.json create mode 100644 ui/hunter/gear_sets/p2_mm.gear.json create mode 100644 ui/hunter/gear_sets/p2_sv.gear.json create mode 100644 ui/hunter/gear_sets/p3_mm.gear.json create mode 100644 ui/hunter/gear_sets/p3_sv.gear.json create mode 100644 ui/hunter/gear_sets/p4_mm.gear.json create mode 100644 ui/hunter/gear_sets/p4_sv.gear.json create mode 100644 ui/hunter/gear_sets/p5_mm.gear.json create mode 100644 ui/hunter/gear_sets/p5_sv.gear.json create mode 100644 ui/hunter/gear_sets/preraid_mm.gear.json create mode 100644 ui/hunter/gear_sets/preraid_sv.gear.json create mode 100644 ui/mage/gear_sets/p1_arcane.gear.json create mode 100644 ui/mage/gear_sets/p1_fire.gear.json create mode 100644 ui/mage/gear_sets/p1_frost.gear.json create mode 100644 ui/mage/gear_sets/p2_arcane.gear.json create mode 100644 ui/mage/gear_sets/p2_ffb.gear.json create mode 100644 ui/mage/gear_sets/p2_fire.gear.json create mode 100644 ui/mage/gear_sets/p2_frost.gear.json create mode 100644 ui/mage/gear_sets/p3_arcane_alliance.gear.json create mode 100644 ui/mage/gear_sets/p3_arcane_horde.gear.json create mode 100644 ui/mage/gear_sets/p3_ffb_alliance.gear.json create mode 100644 ui/mage/gear_sets/p3_ffb_horde.gear.json create mode 100644 ui/mage/gear_sets/p3_fire_alliance.gear.json create mode 100644 ui/mage/gear_sets/p3_fire_horde.gear.json create mode 100644 ui/mage/gear_sets/p3_frost_alliance.gear.json create mode 100644 ui/mage/gear_sets/p3_frost_horde.gear.json create mode 100644 ui/mage/gear_sets/p4_arcane_alliance.gear.json create mode 100644 ui/mage/gear_sets/p4_arcane_horde.gear.json create mode 100644 ui/mage/gear_sets/p4_ffb_alliance.gear.json create mode 100644 ui/mage/gear_sets/p4_ffb_horde.gear.json create mode 100644 ui/mage/gear_sets/p4_fire_alliance.gear.json create mode 100644 ui/mage/gear_sets/p4_fire_horde.gear.json create mode 100644 ui/mage/gear_sets/preraid_arcane.gear.json create mode 100644 ui/mage/gear_sets/preraid_fire.gear.json create mode 100644 ui/protection_paladin/gear_sets/p1.gear.json create mode 100644 ui/protection_paladin/gear_sets/p2.gear.json create mode 100644 ui/protection_paladin/gear_sets/preraid.gear.json create mode 100644 ui/protection_warrior/gear_sets/p1_balanced.gear.json create mode 100644 ui/protection_warrior/gear_sets/p2_survival.gear.json create mode 100644 ui/protection_warrior/gear_sets/preraid_balanced.gear.json create mode 100644 ui/restoration_druid/gear_sets/p1.gear.json create mode 100644 ui/restoration_druid/gear_sets/p2.gear.json create mode 100644 ui/restoration_druid/gear_sets/preraid.gear.json create mode 100644 ui/restoration_shaman/gear_sets/p1.gear.json create mode 100644 ui/restoration_shaman/gear_sets/p2.gear.json create mode 100644 ui/restoration_shaman/gear_sets/preraid.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p1.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p2.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p3_mace.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p4.gear.json create mode 100644 ui/retribution_paladin/gear_sets/p5.gear.json create mode 100644 ui/retribution_paladin/gear_sets/preraid.gear.json create mode 100644 ui/rogue/gear_sets/p1_assassination.gear.json create mode 100644 ui/rogue/gear_sets/p1_combat.gear.json create mode 100644 ui/rogue/gear_sets/p1_hemosub.gear.json create mode 100644 ui/rogue/gear_sets/p2_assassination.gear.json create mode 100644 ui/rogue/gear_sets/p2_combat.gear.json create mode 100644 ui/rogue/gear_sets/p2_hemosub.gear.json create mode 100644 ui/rogue/gear_sets/p3_assassination.gear.json create mode 100644 ui/rogue/gear_sets/p3_combat.gear.json create mode 100644 ui/rogue/gear_sets/p3_dancesub.gear.json create mode 100644 ui/rogue/gear_sets/p3_hemosub.gear.json create mode 100644 ui/rogue/gear_sets/preraid_assassination.gear.json create mode 100644 ui/rogue/gear_sets/preraid_combat.gear.json create mode 100644 ui/shadow_priest/gear_sets/p1.gear.json create mode 100644 ui/shadow_priest/gear_sets/p2.gear.json create mode 100644 ui/shadow_priest/gear_sets/p3.gear.json create mode 100644 ui/shadow_priest/gear_sets/preraid.gear.json create mode 100644 ui/smite_priest/gear_sets/p1.gear.json create mode 100644 ui/smite_priest/gear_sets/preraid.gear.json create mode 100644 ui/tank_deathknight/gear_sets/p1_blood.gear.json create mode 100644 ui/tank_deathknight/gear_sets/p1_frost.gear.json create mode 100644 ui/tank_deathknight/gear_sets/p2_blood.gear.json create mode 100644 ui/tank_deathknight/gear_sets/p2_frost.gear.json create mode 100644 ui/warlock/gear_sets/p1_affliction.gear.json create mode 100644 ui/warlock/gear_sets/p1_demodestro.gear.json create mode 100644 ui/warlock/gear_sets/p2_affliction.gear.json create mode 100644 ui/warlock/gear_sets/p2_demodestro.gear.json create mode 100644 ui/warlock/gear_sets/p3_affliction_alliance.gear.json create mode 100644 ui/warlock/gear_sets/p3_affliction_horde.gear.json create mode 100644 ui/warlock/gear_sets/p3_demo_alliance.gear.json create mode 100644 ui/warlock/gear_sets/p3_demo_horde.gear.json create mode 100644 ui/warlock/gear_sets/p3_destro_alliance.gear.json create mode 100644 ui/warlock/gear_sets/p3_destro_horde.gear.json create mode 100644 ui/warlock/gear_sets/preraid_affliction.gear.json create mode 100644 ui/warlock/gear_sets/preraid_demodestro.gear.json create mode 100644 ui/warlock/gear_sets/swp.gear.json create mode 100644 ui/warrior/gear_sets/p1_arms.gear.json create mode 100644 ui/warrior/gear_sets/p1_fury.gear.json create mode 100644 ui/warrior/gear_sets/p2_arms.gear.json create mode 100644 ui/warrior/gear_sets/p2_fury.gear.json create mode 100644 ui/warrior/gear_sets/p3_arms_2p_alliance.gear.json create mode 100644 ui/warrior/gear_sets/p3_arms_2p_horde.gear.json create mode 100644 ui/warrior/gear_sets/p3_arms_4p_alliance.gear.json create mode 100644 ui/warrior/gear_sets/p3_arms_4p_horde.gear.json create mode 100644 ui/warrior/gear_sets/p3_fury_alliance.gear.json create mode 100644 ui/warrior/gear_sets/p3_fury_horde.gear.json create mode 100644 ui/warrior/gear_sets/preraid_arms.gear.json create mode 100644 ui/warrior/gear_sets/preraid_fury.gear.json diff --git a/sim/core/test_utils.go b/sim/core/test_utils.go index 44246d9470..1c0c2cbced 100644 --- a/sim/core/test_utils.go +++ b/sim/core/test_utils.go @@ -245,3 +245,13 @@ func GetAplRotation(dir string, file string) RotationCombo { return RotationCombo{Label: file, Rotation: APLRotationFromJsonString(string(data))} } + +func GetGearSet(dir string, file string) GearSetCombo { + filePath := dir + "/" + file + ".gear.json" + data, err := os.ReadFile(filePath) + if err != nil { + log.Fatalf("failed to load gear json file: %s, %s", filePath, err) + } + + return GearSetCombo{Label: file, GearSet: EquipmentSpecFromJsonString(string(data))} +} diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results index 8783169bf0..e6aac1eb30 100644 --- a/sim/deathknight/dps/TestBlood.results +++ b/sim/deathknight/dps/TestBlood.results @@ -825,252 +825,252 @@ dps_results: { } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-LongMultiTarget" value: { dps: 32421.74446 tps: 16656.08321 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-LongSingleTarget" value: { dps: 10851.11699 tps: 5503.21034 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--FullBuffs-ShortSingleTarget" value: { dps: 13936.91984 tps: 6335.51473 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-LongMultiTarget" value: { dps: 17420.6997 tps: 8937.25269 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-LongSingleTarget" value: { dps: 6225.90184 tps: 3164.4222 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7306.89178 tps: 3278.89099 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget" value: { dps: 29213.10075 tps: 15870.80875 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget" value: { dps: 10258.63951 tps: 5420.39076 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13963.19168 tps: 6368.52587 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget" value: { dps: 15762.16943 tps: 8577.90162 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget" value: { dps: 5904.42278 tps: 3142.36376 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti-NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7401.11559 tps: 3356.10984 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" value: { dps: 27122.28681 tps: 15423.78827 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" value: { dps: 10276.86836 tps: 5428.06193 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" value: { dps: 13869.01326 tps: 6274.48344 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" value: { dps: 14628.23707 tps: 8286.52265 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" value: { dps: 5854.07494 tps: 3101.45469 } } dps_results: { - key: "TestBlood-Settings-Human-Blood P3 -Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" value: { dps: 7265.05412 tps: 3257.14244 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-LongMultiTarget" value: { dps: 32841.02145 tps: 16734.2366 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-LongSingleTarget" value: { dps: 10973.31612 tps: 5521.35213 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--FullBuffs-ShortSingleTarget" value: { dps: 14196.69031 tps: 6387.82816 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-LongMultiTarget" value: { dps: 17656.94508 tps: 8981.68316 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-LongSingleTarget" value: { dps: 6296.83513 tps: 3175.99209 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7445.4697 tps: 3307.33313 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget" value: { dps: 29479.23537 tps: 15916.50948 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget" value: { dps: 10369.59414 tps: 5446.51733 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget" value: { dps: 14206.30775 tps: 6414.57022 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget" value: { dps: 15905.6751 tps: 8601.20484 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget" value: { dps: 5940.58783 tps: 3141.89232 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti-NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7529.68148 tps: 3381.61311 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget" value: { dps: 27229.0312 tps: 15439.73625 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget" value: { dps: 10367.95684 tps: 5441.77244 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget" value: { dps: 14114.35284 tps: 6319.18525 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget" value: { dps: 14679.44716 tps: 8288.41496 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget" value: { dps: 5908.75804 tps: 3111.58029 } } dps_results: { - key: "TestBlood-Settings-Orc-Blood P3 -Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" + key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget" value: { dps: 7398.90689 tps: 3284.478 diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results index 2c8f74feef..6f58a49b25 100644 --- a/sim/deathknight/dps/TestFrost.results +++ b/sim/deathknight/dps/TestFrost.results @@ -916,504 +916,504 @@ dps_results: { } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--FullBuffs-LongMultiTarget" value: { dps: 37835.77503 tps: 22557.09099 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--FullBuffs-LongSingleTarget" value: { dps: 11314.12124 tps: 6635.91991 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--FullBuffs-ShortSingleTarget" value: { dps: 13089.24808 tps: 7494.54173 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--NoBuffs-LongMultiTarget" value: { dps: 19239.14495 tps: 11449.91388 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--NoBuffs-LongSingleTarget" value: { dps: 6770.86014 tps: 3967.39634 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7301.28553 tps: 4183.49163 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-FullBuffs-LongMultiTarget" value: { dps: 26247.92126 tps: 15491.77838 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-FullBuffs-LongSingleTarget" value: { dps: 11297.58272 tps: 6522.32328 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13436.79681 tps: 7196.48982 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-NoBuffs-LongMultiTarget" value: { dps: 13762.89221 tps: 8084.71381 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-NoBuffs-LongSingleTarget" value: { dps: 6858.47832 tps: 3941.78626 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_bl_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_bl_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7838.73035 tps: 4133.25519 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 29874.22042 tps: 17666.35967 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11235.23555 tps: 6483.37883 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13289.2203 tps: 7107.20748 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15651.53729 tps: 9215.92857 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6823.57997 tps: 3919.36125 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7745.34323 tps: 4073.80114 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--FullBuffs-LongMultiTarget" value: { dps: 36334.15904 tps: 21657.38558 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--FullBuffs-LongSingleTarget" value: { dps: 11317.71576 tps: 6646.34756 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--FullBuffs-ShortSingleTarget" value: { dps: 12893.37168 tps: 7372.09373 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--NoBuffs-LongMultiTarget" value: { dps: 19347.75677 tps: 11518.36187 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--NoBuffs-LongSingleTarget" value: { dps: 6823.04363 tps: 4002.74809 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync--NoBuffs-ShortSingleTarget" value: { dps: 7195.54124 tps: 4117.41822 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-FullBuffs-LongMultiTarget" value: { dps: 26247.92126 tps: 15491.77838 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-FullBuffs-LongSingleTarget" value: { dps: 11297.58272 tps: 6522.32328 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13436.79681 tps: 7196.48982 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-NoBuffs-LongMultiTarget" value: { dps: 13762.89221 tps: 8084.71381 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-NoBuffs-LongSingleTarget" value: { dps: 6858.47832 tps: 3941.78626 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_bl_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_bl_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7838.73035 tps: 4133.25519 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 29874.22042 tps: 17666.35967 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11235.23555 tps: 6483.37883 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13289.2203 tps: 7107.20748 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15651.53729 tps: 9215.92857 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6823.57997 tps: 3919.36125 } } dps_results: { - key: "TestFrost-Settings-Human-Frost P3-Desync-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Human-p3_frost-Desync-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7745.34323 tps: 4073.80114 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--FullBuffs-LongMultiTarget" value: { dps: 37662.42597 tps: 22441.27621 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--FullBuffs-LongSingleTarget" value: { dps: 11320.97171 tps: 6632.98517 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--FullBuffs-ShortSingleTarget" value: { dps: 13123.57673 tps: 7497.53796 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--NoBuffs-LongMultiTarget" value: { dps: 19353.89799 tps: 11512.90978 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--NoBuffs-LongSingleTarget" value: { dps: 6809.56639 tps: 3986.15931 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7337.49665 tps: 4195.72657 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-FullBuffs-LongMultiTarget" value: { dps: 26558.18843 tps: 15669.65009 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-FullBuffs-LongSingleTarget" value: { dps: 11329.72016 tps: 6534.12475 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13546.51677 tps: 7243.71622 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-NoBuffs-LongMultiTarget" value: { dps: 13850.19658 tps: 8132.18668 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-NoBuffs-LongSingleTarget" value: { dps: 6899.86182 tps: 3961.52521 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_bl_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_bl_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7873.87678 tps: 4144.46021 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 30004.11703 tps: 17735.96273 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11315.70214 tps: 6523.02195 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13332.49345 tps: 7114.43817 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15750.11064 tps: 9270.80658 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6834.27784 tps: 3920.7197 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7785.29023 tps: 4088.701 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--FullBuffs-LongMultiTarget" value: { dps: 36984.45133 tps: 22039.40955 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--FullBuffs-LongSingleTarget" value: { dps: 11357.72862 tps: 6663.4342 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--FullBuffs-ShortSingleTarget" value: { dps: 12968.01864 tps: 7400.9381 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--NoBuffs-LongMultiTarget" value: { dps: 19388.34358 tps: 11539.15891 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--NoBuffs-LongSingleTarget" value: { dps: 6856.16474 tps: 4017.51554 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync--NoBuffs-ShortSingleTarget" value: { dps: 7239.13086 tps: 4134.45363 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-FullBuffs-LongMultiTarget" value: { dps: 26558.18843 tps: 15669.65009 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-FullBuffs-LongSingleTarget" value: { dps: 11329.72016 tps: 6534.12475 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13546.51677 tps: 7243.71622 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-NoBuffs-LongMultiTarget" value: { dps: 13850.19658 tps: 8132.18668 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-NoBuffs-LongSingleTarget" value: { dps: 6899.86182 tps: 3961.52521 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_bl_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_bl_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7873.87678 tps: 4144.46021 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 30004.11703 tps: 17735.96273 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11315.70214 tps: 6523.02195 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 13332.49345 tps: 7114.43817 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15750.11064 tps: 9270.80658 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6834.27784 tps: 3920.7197 } } dps_results: { - key: "TestFrost-Settings-Orc-Frost P3-Desync-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Orc-p3_frost-Desync-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 7785.29023 tps: 4088.701 diff --git a/sim/deathknight/dps/TestFrostUH.results b/sim/deathknight/dps/TestFrostUH.results index ba5ec15c20..8ebcab385a 100644 --- a/sim/deathknight/dps/TestFrostUH.results +++ b/sim/deathknight/dps/TestFrostUH.results @@ -916,168 +916,168 @@ dps_results: { } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--FullBuffs-LongMultiTarget" value: { dps: 29416.22802 tps: 21405.87415 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--FullBuffs-LongSingleTarget" value: { dps: 11447.42906 tps: 8177.30187 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--FullBuffs-ShortSingleTarget" value: { dps: 13450.0091 tps: 9289.18189 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--NoBuffs-LongMultiTarget" value: { dps: 15440.1963 tps: 11212.66809 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--NoBuffs-LongSingleTarget" value: { dps: 6720.72451 tps: 4786.35579 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7519.48078 tps: 5201.17082 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 28966.01784 tps: 20928.42523 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11404.19923 tps: 8001.70202 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 14126.2476 tps: 9164.89999 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15318.06982 tps: 11014.08438 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6873.39093 tps: 4796.24732 } } dps_results: { - key: "TestFrostUH-Settings-Human-Frost P1-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Human-p3_frost-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 8176.07264 tps: 5224.57131 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--FullBuffs-LongMultiTarget" value: { dps: 29326.49842 tps: 21328.605 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--FullBuffs-LongSingleTarget" value: { dps: 11494.97142 tps: 8201.03926 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--FullBuffs-ShortSingleTarget" value: { dps: 13525.99688 tps: 9315.88611 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--NoBuffs-LongMultiTarget" value: { dps: 15023.76504 tps: 10898.43746 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--NoBuffs-LongSingleTarget" value: { dps: 6690.22347 tps: 4756.32034 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7545.19127 tps: 5201.91874 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongMultiTarget" value: { dps: 29007.45315 tps: 20944.64382 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-LongSingleTarget" value: { dps: 11491.39758 tps: 8054.26255 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-FullBuffs-ShortSingleTarget" value: { dps: 14215.8894 tps: 9198.33964 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongMultiTarget" value: { dps: 15450.48494 tps: 11103.28189 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-LongSingleTarget" value: { dps: 6907.24362 tps: 4814.18266 } } dps_results: { - key: "TestFrostUH-Settings-Orc-Frost P1-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" + key: "TestFrostUH-Settings-Orc-p3_frost-Basic-frost_uh_pesti-NoBuffs-ShortSingleTarget" value: { dps: 8183.14767 tps: 5212.57631 diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results index 8b4defc1c7..2095fecfc6 100644 --- a/sim/deathknight/dps/TestUnholy.results +++ b/sim/deathknight/dps/TestUnholy.results @@ -1028,7 +1028,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--FullBuffs-LongMultiTarget" value: { dps: 58289.40143 tps: 61052.68007 @@ -1036,7 +1036,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--FullBuffs-LongSingleTarget" value: { dps: 11917.8928 tps: 7935.64076 @@ -1044,7 +1044,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--FullBuffs-ShortSingleTarget" value: { dps: 16867.44038 tps: 8820.07393 @@ -1052,7 +1052,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--NoBuffs-LongMultiTarget" value: { dps: 35192.7445 tps: 37747.41149 @@ -1060,7 +1060,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--NoBuffs-LongSingleTarget" value: { dps: 6073.28917 tps: 4426.31004 @@ -1068,7 +1068,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7578.67773 tps: 4493.17081 @@ -1076,7 +1076,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-LongMultiTarget" value: { dps: 14165.35662 tps: 9310.25956 @@ -1084,7 +1084,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-LongSingleTarget" value: { dps: 10195.14094 tps: 5983.39426 @@ -1092,7 +1092,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-ShortSingleTarget" value: { dps: 15149.8816 tps: 7146.71782 @@ -1100,7 +1100,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-LongMultiTarget" value: { dps: 6743.02312 tps: 4596.18416 @@ -1108,7 +1108,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-LongSingleTarget" value: { dps: 5050.90646 tps: 3182.17362 @@ -1116,7 +1116,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_2h_ss-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-ShortSingleTarget" value: { dps: 6556.50427 tps: 3455.66307 @@ -1124,7 +1124,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-LongMultiTarget" value: { dps: 58908.71496 tps: 60996.09128 @@ -1132,7 +1132,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-LongSingleTarget" value: { dps: 11166.24446 tps: 7453.31537 @@ -1140,7 +1140,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-ShortSingleTarget" value: { dps: 16132.6799 tps: 8664.46552 @@ -1148,7 +1148,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-LongMultiTarget" value: { dps: 35068.57742 tps: 37450.11087 @@ -1156,7 +1156,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-LongSingleTarget" value: { dps: 5696.76392 tps: 4178.63055 @@ -1164,7 +1164,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-ShortSingleTarget" value: { dps: 7145.99955 tps: 4446.35054 @@ -1172,7 +1172,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-LongMultiTarget" value: { dps: 36085.77545 tps: 43097.77682 @@ -1180,7 +1180,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-LongSingleTarget" value: { dps: 11359.86279 tps: 7620.00658 @@ -1188,7 +1188,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-ShortSingleTarget" value: { dps: 16214.52165 tps: 8813.67894 @@ -1196,7 +1196,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-LongMultiTarget" value: { dps: 18604.32001 tps: 22813.86753 @@ -1204,7 +1204,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-LongSingleTarget" value: { dps: 5829.27205 tps: 4283.75246 @@ -1212,7 +1212,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Human-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Human-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-ShortSingleTarget" value: { dps: 7203.1042 tps: 4483.49763 @@ -1220,7 +1220,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--FullBuffs-LongMultiTarget" value: { dps: 58795.89675 tps: 61400.18708 @@ -1228,7 +1228,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--FullBuffs-LongSingleTarget" value: { dps: 12135.19759 tps: 7950.18776 @@ -1236,7 +1236,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--FullBuffs-ShortSingleTarget" value: { dps: 17291.49508 tps: 8873.44022 @@ -1244,7 +1244,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--NoBuffs-LongMultiTarget" value: { dps: 35563.85 tps: 38144.57064 @@ -1252,7 +1252,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--NoBuffs-LongSingleTarget" value: { dps: 6176.27952 tps: 4439.18077 @@ -1260,7 +1260,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic--NoBuffs-ShortSingleTarget" value: { dps: 7795.80165 tps: 4532.50068 @@ -1268,7 +1268,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-LongMultiTarget" value: { dps: 14361.12682 tps: 9346.40063 @@ -1276,7 +1276,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-LongSingleTarget" value: { dps: 10313.37416 tps: 5964.57287 @@ -1284,7 +1284,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-FullBuffs-ShortSingleTarget" value: { dps: 15425.59404 tps: 7139.14152 @@ -1292,7 +1292,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-LongMultiTarget" value: { dps: 6761.94219 tps: 4569.5131 @@ -1300,7 +1300,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-LongSingleTarget" value: { dps: 5081.39742 tps: 3166.06186 @@ -1308,7 +1308,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_2h_ss-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_2h_ss-NoBuffs-ShortSingleTarget" value: { dps: 6680.90713 tps: 3470.07521 @@ -1316,7 +1316,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-LongMultiTarget" value: { dps: 59350.47187 tps: 61313.3856 @@ -1324,7 +1324,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-LongSingleTarget" value: { dps: 11313.5294 tps: 7454.40638 @@ -1332,7 +1332,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-FullBuffs-ShortSingleTarget" value: { dps: 16475.45277 tps: 8713.61689 @@ -1340,7 +1340,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-LongMultiTarget" value: { dps: 35109.43466 tps: 37444.05902 @@ -1348,7 +1348,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-LongSingleTarget" value: { dps: 5748.09908 tps: 4179.27955 @@ -1356,7 +1356,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-uh_dnd_aoe-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-uh_dnd_aoe-NoBuffs-ShortSingleTarget" value: { dps: 7264.64219 tps: 4458.29405 @@ -1364,7 +1364,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-LongMultiTarget" value: { dps: 36291.06866 tps: 43249.80547 @@ -1372,7 +1372,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-LongSingleTarget" value: { dps: 11457.30561 tps: 7593.73156 @@ -1380,7 +1380,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-FullBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-FullBuffs-ShortSingleTarget" value: { dps: 16563.8433 tps: 8862.06053 @@ -1388,7 +1388,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-LongMultiTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-LongMultiTarget" value: { dps: 18703.05825 tps: 22903.87171 @@ -1396,7 +1396,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-LongSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-LongSingleTarget" value: { dps: 5878.77619 tps: 4284.65854 @@ -1404,7 +1404,7 @@ dps_results: { } } dps_results: { - key: "TestUnholy-Settings-Orc-Unholy P3 -Basic-unholy_dw_ss-NoBuffs-ShortSingleTarget" + key: "TestUnholy-Settings-Orc-p3_uh_dw-Basic-unholy_dw_ss-NoBuffs-ShortSingleTarget" value: { dps: 7338.4941 tps: 4512.22992 diff --git a/sim/deathknight/dps/dps_deathknight_test.go b/sim/deathknight/dps/dps_deathknight_test.go index 7e6561bede..3090e8b677 100644 --- a/sim/deathknight/dps/dps_deathknight_test.go +++ b/sim/deathknight/dps/dps_deathknight_test.go @@ -18,7 +18,7 @@ func TestBlood(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Blood P3 ", GearSet: BloodP3Gear}, + GearSet: core.GetGearSet("../../../ui/deathknight/gear_sets", "p3_blood"), Talents: BloodTalents, Glyphs: BloodDefaultGlyphs, Consumes: FullConsumes, @@ -38,7 +38,7 @@ func TestUnholy(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Unholy P3 ", GearSet: UnholyDwP3Gear}, + GearSet: core.GetGearSet("../../../ui/deathknight/gear_sets", "p3_uh_dw"), Talents: UnholyTalents, Glyphs: UnholyDefaultGlyphs, Consumes: FullConsumes, @@ -60,7 +60,7 @@ func TestFrost(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Frost P3", GearSet: FrostP3Gear}, + GearSet: core.GetGearSet("../../../ui/deathknight/gear_sets", "p3_frost"), Talents: FrostTalents, Glyphs: FrostDefaultGlyphs, Consumes: FullConsumes, @@ -84,7 +84,7 @@ func TestFrostUH(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Frost P1", GearSet: FrostP3Gear}, + GearSet: core.GetGearSet("../../../ui/deathknight/gear_sets", "p3_frost"), Talents: FrostUHTalents, Glyphs: FrostUHDefaultGlyphs, Consumes: FullConsumes, @@ -216,63 +216,3 @@ var ItemFilter = core.ItemFilter{ proto.WeaponType_WeaponTypeMace, }, } - -var BloodP3Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":48493,"enchant":3817,"gems":[41285,40142]}, - {"id":47458,"gems":[40142]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47546,"enchant":3831,"gems":[42142]}, - {"id":47449,"enchant":3832,"gems":[49110,42142,40142]}, - {"id":48008,"enchant":3845,"gems":[40111,0]}, - {"id":48492,"enchant":3604,"gems":[40142,0]}, - {"id":47429,"gems":[40142,40142,40111]}, - {"id":48494,"enchant":3823,"gems":[40142,40111]}, - {"id":45599,"enchant":3606,"gems":[40111,40111]}, - {"id":47993,"gems":[40111,45862]}, - {"id":47413,"gems":[40142]}, - {"id":45931}, - {"id":47464}, - {"id":47446,"enchant":3368,"gems":[42142,40141]}, - {}, - {"id":47673} -]}`) - -var UnholyDwP3Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":48493,"enchant":3817,"gems":[41398,40146]}, - {"id":47458,"gems":[40146]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47548,"enchant":3831,"gems":[40111]}, - {"id":48491,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[40111,0]}, - {"id":48492,"enchant":3604,"gems":[40146,0]}, - {"id":47429,"gems":[40111,45862,40111]}, - {"id":47465,"enchant":3823,"gems":[49110,40111,40146]}, - {"id":45599,"enchant":3606,"gems":[40111,40111]}, - {"id":47413,"gems":[40146]}, - {"id":45534,"gems":[42142]}, - {"id":47464}, - {"id":45609}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":47673} -]}`) - -var FrostP3Gear = core.EquipmentSpecFromJsonString(`{ "items": [ - {"id":48493,"enchant":3817,"gems":[41398,40142]}, - {"id":45459,"gems":[40111]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47548,"enchant":3831,"gems":[40111]}, - {"id":48491,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[40111,0]}, - {"id":47492,"enchant":3604,"gems":[49110,40111,0]}, - {"id":45241,"gems":[40111,42142,40111]}, - {"id":48494,"enchant":3823,"gems":[40142,40111]}, - {"id":47473,"enchant":3606,"gems":[40142,40111]}, - {"id":46966,"gems":[40111]}, - {"id":45534,"gems":[40111]}, - {"id":47464}, - {"id":45931}, - {"id":47528,"enchant":3370,"gems":[40111]}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":40207} -]}`) diff --git a/sim/deathknight/tank/TestBloodTank.results b/sim/deathknight/tank/TestBloodTank.results index 5d5d656a10..75f4a35540 100644 --- a/sim/deathknight/tank/TestBloodTank.results +++ b/sim/deathknight/tank/TestBloodTank.results @@ -833,168 +833,168 @@ dps_results: { } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-FullBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-FullBuffs-LongMultiTarget" value: { dps: 2026.58808 tps: 4459.72501 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-FullBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-FullBuffs-LongSingleTarget" value: { dps: 2026.58808 tps: 4459.72501 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-FullBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-FullBuffs-ShortSingleTarget" value: { dps: 2982.04152 tps: 4890.76359 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-NoBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-NoBuffs-LongMultiTarget" value: { dps: 1223.75004 tps: 2657.11163 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-NoBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-NoBuffs-LongSingleTarget" value: { dps: 1223.75004 tps: 2657.11163 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_aggro-NoBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_aggro-NoBuffs-ShortSingleTarget" value: { dps: 1797.0372 tps: 2720.03527 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-FullBuffs-LongMultiTarget" value: { dps: 7786.10604 tps: 18205.88346 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-FullBuffs-LongSingleTarget" value: { dps: 2168.40233 tps: 6587.74453 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-FullBuffs-ShortSingleTarget" value: { dps: 3096.22661 tps: 7054.15439 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-NoBuffs-LongMultiTarget" value: { dps: 4159.81193 tps: 9786.38821 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-NoBuffs-LongSingleTarget" value: { dps: 1304.28358 tps: 3917.98149 } } dps_results: { - key: "TestBloodTank-Settings-Human-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Human-p1_blood-Basic-blood_icy_touch-NoBuffs-ShortSingleTarget" value: { dps: 1876.24585 tps: 4036.24839 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-FullBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-FullBuffs-LongMultiTarget" value: { dps: 2044.94485 tps: 4492.60888 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-FullBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-FullBuffs-LongSingleTarget" value: { dps: 2044.94485 tps: 4492.60888 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-FullBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-FullBuffs-ShortSingleTarget" value: { dps: 3014.92325 tps: 4938.19347 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-NoBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-NoBuffs-LongMultiTarget" value: { dps: 1237.61281 tps: 2682.79934 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-NoBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-NoBuffs-LongSingleTarget" value: { dps: 1237.61281 tps: 2682.79934 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_aggro-NoBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_aggro-NoBuffs-ShortSingleTarget" value: { dps: 1824.78521 tps: 2767.06191 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-FullBuffs-LongMultiTarget" value: { dps: 7871.52585 tps: 18386.6769 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-FullBuffs-LongSingleTarget" value: { dps: 2188.29896 tps: 6632.90335 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-FullBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-FullBuffs-ShortSingleTarget" value: { dps: 3134.87742 tps: 7117.86947 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-LongMultiTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-NoBuffs-LongMultiTarget" value: { dps: 4215.32035 tps: 9904.96538 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-LongSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-NoBuffs-LongSingleTarget" value: { dps: 1318.56824 tps: 3951.73057 } } dps_results: { - key: "TestBloodTank-Settings-Orc-Blood Tank P1-Basic-blood_icy_touch-NoBuffs-ShortSingleTarget" + key: "TestBloodTank-Settings-Orc-p1_blood-Basic-blood_icy_touch-NoBuffs-ShortSingleTarget" value: { dps: 1902.94412 tps: 4083.30208 diff --git a/sim/deathknight/tank/tank_deathknight_test.go b/sim/deathknight/tank/tank_deathknight_test.go index bedd5448b5..3f308a73e8 100644 --- a/sim/deathknight/tank/tank_deathknight_test.go +++ b/sim/deathknight/tank/tank_deathknight_test.go @@ -18,7 +18,7 @@ func TestBloodTank(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "Blood Tank P1", GearSet: BloodP1Gear}, + GearSet: core.GetGearSet("../../../ui/tank_deathknight/gear_sets", "p1_blood"), Talents: BloodTankTalents, Glyphs: Glyphs, Consumes: FullConsumes, @@ -100,23 +100,3 @@ var FullDebuffs = &proto.Debuffs{ EbonPlaguebringer: true, HeartOfTheCrusader: true, } - -var BloodP1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40565,"enchant":3878,"gems":[41380,36767]}, - {"id":40387}, - {"id":39704,"enchant":3852,"gems":[40008]}, - {"id":40252,"enchant":3605}, - {"id":40559,"gems":[40008,40022]}, - {"id":40306,"enchant":3850,"gems":[40008,0]}, - {"id":40563,"enchant":3860,"gems":[40008,0]}, - {"id":39759,"gems":[40008,40008]}, - {"id":40567,"enchant":3822,"gems":[40008,40008]}, - {"id":40297,"enchant":3232}, - {"id":40718}, - {"id":40107}, - {"id":44063,"gems":[36767,36767]}, - {"id":42341,"gems":[40008,40008]}, - {"id":40406,"enchant":3847}, - {}, - {"id":40207} -]}`) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 716af61863..3c7e61edc2 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -950,168 +950,126 @@ dps_results: { } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-FullBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-FullBuffs-LongMultiTarget" value: { dps: 11434.28206 tps: 13586.07534 } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-FullBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-FullBuffs-LongSingleTarget" value: { dps: 8027.33723 tps: 7815.49981 } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-FullBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-FullBuffs-ShortSingleTarget" value: { dps: 9064.14467 tps: 8283.0532 } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-NoBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-NoBuffs-LongMultiTarget" value: { dps: 2951.00531 tps: 3223.31974 } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-NoBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-NoBuffs-LongSingleTarget" value: { dps: 2024.51805 tps: 1918.22458 } } dps_results: { - key: "TestBalance-Settings-Tauren-P1-Default-basic_p3-NoBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p1-Default-basic_p3-NoBuffs-ShortSingleTarget" value: { dps: 5181.35264 tps: 4918.10249 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-FullBuffs-LongMultiTarget" - value: { - dps: 13801.86842 - tps: 16125.55329 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-FullBuffs-LongSingleTarget" - value: { - dps: 9591.8185 - tps: 9352.90452 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-FullBuffs-ShortSingleTarget" - value: { - dps: 11131.05793 - tps: 10257.12414 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-NoBuffs-LongMultiTarget" - value: { - dps: 4420.46565 - tps: 4941.29964 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-NoBuffs-LongSingleTarget" - value: { - dps: 3162.82362 - tps: 3050.02311 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-4P-Default-basic_p3-NoBuffs-ShortSingleTarget" - value: { - dps: 6483.97842 - tps: 6188.67442 - } -} -dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-FullBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-FullBuffs-LongMultiTarget" value: { dps: 14057.32487 tps: 16383.58824 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-FullBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-FullBuffs-LongSingleTarget" value: { dps: 9849.30409 tps: 9609.60117 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-FullBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-FullBuffs-ShortSingleTarget" value: { dps: 11266.28584 tps: 10382.54465 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-NoBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-NoBuffs-LongMultiTarget" value: { dps: 4925.31269 tps: 5522.44083 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-NoBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-NoBuffs-LongSingleTarget" value: { dps: 3445.69109 tps: 3335.738 } } dps_results: { - key: "TestBalance-Settings-Tauren-P2-Default-basic_p3-NoBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p2-Default-basic_p3-NoBuffs-ShortSingleTarget" value: { dps: 6515.83364 tps: 6217.52304 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-FullBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-LongMultiTarget" value: { dps: 16434.76186 tps: 18954.37322 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-FullBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-LongSingleTarget" value: { dps: 11470.83985 tps: 11231.8985 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-FullBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-ShortSingleTarget" value: { dps: 12684.79585 tps: 11781.67278 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-NoBuffs-LongMultiTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-LongMultiTarget" value: { dps: 7121.51647 tps: 8109.27578 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-NoBuffs-LongSingleTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-LongSingleTarget" value: { dps: 4990.84591 tps: 4895.16686 } } dps_results: { - key: "TestBalance-Settings-Tauren-P3-Default-basic_p3-NoBuffs-ShortSingleTarget" + key: "TestBalance-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-ShortSingleTarget" value: { dps: 7749.81973 tps: 7459.38337 diff --git a/sim/druid/balance/TestBalancePhase3.results b/sim/druid/balance/TestBalancePhase3.results index 25a7d122e5..aba2000e6f 100644 --- a/sim/druid/balance/TestBalancePhase3.results +++ b/sim/druid/balance/TestBalancePhase3.results @@ -950,42 +950,42 @@ dps_results: { } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-FullBuffs-LongMultiTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-LongMultiTarget" value: { dps: 16400.83037 tps: 19099.03764 } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-FullBuffs-LongSingleTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-LongSingleTarget" value: { dps: 11528.06738 tps: 11243.29698 } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-FullBuffs-ShortSingleTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-FullBuffs-ShortSingleTarget" value: { dps: 12866.67627 tps: 11819.65155 } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-NoBuffs-LongMultiTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-LongMultiTarget" value: { dps: 6129.9201 tps: 6946.25391 } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-NoBuffs-LongSingleTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-LongSingleTarget" value: { dps: 4222.30747 tps: 4095.23874 } } dps_results: { - key: "TestBalancePhase3-Settings-Tauren-P3-Default-basic_p3-NoBuffs-ShortSingleTarget" + key: "TestBalancePhase3-Settings-Tauren-p3_alliance-Default-basic_p3-NoBuffs-ShortSingleTarget" value: { dps: 7833.74831 tps: 7486.50449 diff --git a/sim/druid/balance/balance_test.go b/sim/druid/balance/balance_test.go index 38047396ba..5e5d2d2b2e 100644 --- a/sim/druid/balance/balance_test.go +++ b/sim/druid/balance/balance_test.go @@ -17,11 +17,10 @@ func TestBalance(t *testing.T) { Class: proto.Class_ClassDruid, Race: proto.Race_RaceTauren, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "p1"), OtherGearSets: []core.GearSetCombo{ - {Label: "P2", GearSet: P2Gear}, - {Label: "P2-4P", GearSet: P2Gear4P}, - {Label: "P3", GearSet: P3Gear}, + core.GetGearSet("../../../ui/balance_druid/gear_sets", "p2"), + core.GetGearSet("../../../ui/balance_druid/gear_sets", "p3_alliance"), }, Talents: StandardTalents, Glyphs: StandardGlyphs, @@ -38,7 +37,7 @@ func TestBalancePhase3(t *testing.T) { Class: proto.Class_ClassDruid, Race: proto.Race_RaceTauren, - GearSet: core.GearSetCombo{Label: "P3", GearSet: P3Gear}, + GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "p3_alliance"), Talents: "5102233115331303213305311031--205003002", Glyphs: &proto.Glyphs{ Major1: int32(proto.DruidMajorGlyph_GlyphOfStarfire), @@ -103,83 +102,3 @@ var ItemFilter = core.ItemFilter{ proto.RangedWeaponType_RangedWeaponTypeIdol, }, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40467,"enchant":3820,"gems":[41285,42144]}, - {"id":44661,"gems":[40026]}, - {"id":40470,"enchant":3810,"gems":[42144]}, - {"id":44005,"enchant":3859,"gems":[40026]}, - {"id":40469,"enchant":3832,"gems":[42144,39998]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40466,"enchant":3604,"gems":[39998,0]}, - {"id":40561,"enchant":3601,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40519,"enchant":3606}, - {"id":40399}, - {"id":40080}, - {"id":40255}, - {"id":40432}, - {"id":40395,"enchant":3834}, - {"id":40192}, - {"id":40321} -]}`) - -var P2Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,42144]}, - {"id":45133,"gems":[40048]}, - {"id":46196,"enchant":3810,"gems":[39998]}, - {"id":45242,"enchant":3859,"gems":[40048]}, - {"id":45519,"enchant":3832,"gems":[40051,42144,40026]}, - {"id":45446,"enchant":2332,"gems":[42144,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"gems":[39998,39998,39998]}, - {"id":46192,"enchant":3719,"gems":[39998,39998]}, - {"id":45537,"enchant":3606,"gems":[39998,40026]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":40321} -]}`) - -var P2Gear4P = core.EquipmentSpecFromJsonString(`{"items":[ - {"id":46191,"enchant":3820,"gems":[41285,42144]}, - {"id":45933,"gems":[39998]}, - {"id":46196,"enchant":3810,"gems":[40026]}, - {"id":45242,"enchant":3859,"gems":[39998]}, - {"id":46194,"enchant":3832,"gems":[39998,42144]}, - {"id":45446,"enchant":2332,"gems":[42144,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45616,"gems":[39998,39998,39998]}, - {"id":46192,"enchant":3719,"gems":[39998,39998]}, - {"id":45537,"enchant":3606,"gems":[39998,40026]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":40321}] -}`) - -var P3Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":48171,"enchant":3820,"gems":[41285,40153]}, - {"id":47144,"gems":[40153]}, - {"id":48168,"enchant":3810,"gems":[40153]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":48169,"enchant":3832,"gems":[40113,40113]}, - {"id":47066,"enchant":2332,"gems":[40113,0]}, - {"id":48172,"enchant":3604,"gems":[40113,0]}, - {"id":47084,"gems":[40133,40113,40113]}, - {"id":47190,"enchant":3719,"gems":[40113,40113,40113]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":47237,"gems":[40113]}, - {"id":46046,"gems":[40113]}, - {"id":45518}, - {"id":47188}, - {"id":47206,"enchant":3834}, - {"id":47064}, - {"id":47670} -]}`) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index f106940866..b96301781e 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -958,257 +958,131 @@ dps_results: { } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-LongMultiTarget" value: { dps: 7729.37576 tps: 5552.77162 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-LongSingleTarget" value: { dps: 7729.37576 tps: 5552.77162 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-ShortSingleTarget" value: { dps: 8471.98548 tps: 6072.69543 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-LongMultiTarget" value: { dps: 4853.83095 tps: 3509.33992 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-LongSingleTarget" value: { dps: 4853.83095 tps: 3509.33992 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-ShortSingleTarget" value: { dps: 5098.10689 tps: 3674.62409 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-LongMultiTarget" value: { dps: 7760.7578 tps: 5575.12765 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-LongSingleTarget" value: { dps: 7760.7578 tps: 5575.12765 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-ShortSingleTarget" value: { dps: 8611.25717 tps: 6170.83046 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-LongMultiTarget" value: { dps: 4873.94512 tps: 3523.84534 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-LongSingleTarget" value: { dps: 4873.94512 tps: 3523.84534 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Default-NoBleed--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-ShortSingleTarget" value: { dps: 5077.18897 tps: 3660.52024 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongMultiTarget" value: { dps: 22991.33879 tps: 16642.6613 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongSingleTarget" value: { dps: 4747.33047 tps: 3448.80558 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-ShortSingleTarget" value: { dps: 5662.93939 tps: 4084.57893 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongMultiTarget" value: { dps: 14733.47866 tps: 10879.36617 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongSingleTarget" value: { dps: 2572.3973 tps: 1908.02844 } } dps_results: { - key: "TestFeral-Settings-Tauren-P1-Flower-Aoe--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-ShortSingleTarget" value: { dps: 2863.73277 tps: 2097.93465 } } -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--FullBuffs-LongMultiTarget" - value: { - dps: 10114.4882 - tps: 7244.7805 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--FullBuffs-LongSingleTarget" - value: { - dps: 10114.4882 - tps: 7244.7805 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--FullBuffs-ShortSingleTarget" - value: { - dps: 11586.52253 - tps: 8280.65133 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--NoBuffs-LongMultiTarget" - value: { - dps: 6291.9379 - tps: 4529.72278 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--NoBuffs-LongSingleTarget" - value: { - dps: 6291.9379 - tps: 4529.72278 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default--NoBuffs-ShortSingleTarget" - value: { - dps: 6835.21915 - tps: 4907.59986 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--FullBuffs-LongMultiTarget" - value: { - dps: 10051.53028 - tps: 7200.37952 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--FullBuffs-LongSingleTarget" - value: { - dps: 10051.53028 - tps: 7200.37952 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--FullBuffs-ShortSingleTarget" - value: { - dps: 11546.93935 - tps: 8252.17334 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--NoBuffs-LongMultiTarget" - value: { - dps: 6309.44618 - tps: 4542.37801 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--NoBuffs-LongSingleTarget" - value: { - dps: 6309.44618 - tps: 4542.37801 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Default-NoBleed--NoBuffs-ShortSingleTarget" - value: { - dps: 6862.20267 - tps: 4926.38423 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--FullBuffs-LongMultiTarget" - value: { - dps: 31473.67009 - tps: 22651.25303 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--FullBuffs-LongSingleTarget" - value: { - dps: 6346.27298 - tps: 4582.50293 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--FullBuffs-ShortSingleTarget" - value: { - dps: 7569.11677 - tps: 5437.8202 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--NoBuffs-LongMultiTarget" - value: { - dps: 20666.30314 - tps: 15082.34738 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--NoBuffs-LongSingleTarget" - value: { - dps: 3509.95819 - tps: 2572.83656 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-P2-Flower-Aoe--NoBuffs-ShortSingleTarget" - value: { - dps: 3961.53462 - tps: 2877.51848 - } -} dps_results: { key: "TestFeral-SwitchInFrontOfTarget-Default" value: { diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index cb82f23a53..40de6e30bd 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -31,10 +31,7 @@ func TestFeral(t *testing.T) { Class: proto.Class_ClassDruid, Race: proto.Race_RaceTauren, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, - OtherGearSets: []core.GearSetCombo{ - {Label: "P2", GearSet: P2Gear}, - }, + GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -90,7 +87,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceTauren, Class: proto.Class_ClassDruid, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/feral_druid/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsMonoCat, Buffs: core.FullIndividualBuffs, @@ -216,52 +213,6 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredDarkRune, } -var P1Gear = core.EquipmentSpecFromJsonString(` -{ - "items": [ - {"id":40473,"enchant":3817,"gems":[41398,39996]}, - {"id":44664,"gems":[39996]}, - {"id":40494,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[39996]}, - {"id":39765,"enchant":3845,"gems":[39996,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[39996]}, - {"id":44011,"enchant":3823,"gems":[39996,49110]}, - {"id":40243,"enchant":3606,"gems":[40014]}, - {"id":40474}, - {"id":40717}, - {"id":42987}, - {"id":40256}, - {"id":40388,"enchant":3789}, - {}, - {"id":39757} - ] -}`) - -var P2Gear = core.EquipmentSpecFromJsonString(` -{ - "items": [ - {"id":46161,"enchant":3817,"gems":[41398,40002]}, - {"id":45517,"gems":[40002]}, - {"id":45245,"enchant":3808,"gems":[40002,40002]}, - {"id":46032,"enchant":3605,"gems":[40002,40058]}, - {"id":45473,"enchant":3832,"gems":[40002,40002,40002]}, - {"id":45869,"enchant":3845,"gems":[40037,0]}, - {"id":46158,"enchant":3604,"gems":[40002,0]}, - {"id":46095,"gems":[40002,40002,40002]}, - {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":45564,"enchant":3606,"gems":[39996,39996]}, - {"id":46048,"gems":[45862]}, - {"id":45608,"gems":[39996]}, - {"id":45931}, - {"id":46038}, - {"id":45613,"enchant":3789,"gems":[40037,42702]}, - {}, - {"id":40713} - ] -}`) - var P2GearDoubleArmorPenTrinkets = core.EquipmentSpecFromJsonString(` { "items": [ diff --git a/sim/druid/restoration/TestRestoration.results b/sim/druid/restoration/TestRestoration.results index 44872b0626..0479d3776f 100644 --- a/sim/druid/restoration/TestRestoration.results +++ b/sim/druid/restoration/TestRestoration.results @@ -565,27 +565,27 @@ dps_results: { value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-FullBuffs-LongMultiTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-FullBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-FullBuffs-LongSingleTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-FullBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-FullBuffs-ShortSingleTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-FullBuffs-ShortSingleTarget" value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-NoBuffs-LongMultiTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-NoBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-NoBuffs-LongSingleTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-NoBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestRestoration-Settings-Tauren-P1-Standard-Default-NoBuffs-ShortSingleTarget" + key: "TestRestoration-Settings-Tauren-p1-Standard-Default-NoBuffs-ShortSingleTarget" value: {} } dps_results: { diff --git a/sim/druid/restoration/restoration_test.go b/sim/druid/restoration/restoration_test.go index b046f165fc..cd6edfb296 100644 --- a/sim/druid/restoration/restoration_test.go +++ b/sim/druid/restoration/restoration_test.go @@ -17,7 +17,7 @@ func TestRestoration(t *testing.T) { Class: proto.Class_ClassDruid, Race: proto.Race_RaceTauren, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/restoration_druid/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -70,23 +70,3 @@ var DefaultRotation = core.APLRotationFromJsonString(`{ {"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} -]}`) diff --git a/sim/druid/tank/TestFeralTank.results b/sim/druid/tank/TestFeralTank.results index fd901f5880..2872feb305 100644 --- a/sim/druid/tank/TestFeralTank.results +++ b/sim/druid/tank/TestFeralTank.results @@ -1080,7 +1080,7 @@ dps_results: { } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-FullBuffs-LongMultiTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-FullBuffs-LongMultiTarget" value: { dps: 4596.97168 tps: 10417.84607 @@ -1088,7 +1088,7 @@ dps_results: { } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-FullBuffs-LongSingleTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-FullBuffs-LongSingleTarget" value: { dps: 2674.35053 tps: 5637.34408 @@ -1096,7 +1096,7 @@ dps_results: { } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-FullBuffs-ShortSingleTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-FullBuffs-ShortSingleTarget" value: { dps: 2854.21381 tps: 6208.75396 @@ -1104,21 +1104,21 @@ dps_results: { } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-NoBuffs-LongMultiTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-NoBuffs-LongMultiTarget" value: { dps: 1634.48911 tps: 3955.54738 } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-NoBuffs-LongSingleTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-NoBuffs-LongSingleTarget" value: { dps: 1243.82896 tps: 2681.45428 } } dps_results: { - key: "TestFeralTank-Settings-Tauren-P1-Default-default-NoBuffs-ShortSingleTarget" + key: "TestFeralTank-Settings-Tauren-p1-Default-default-NoBuffs-ShortSingleTarget" value: { dps: 1098.16826 tps: 2482.20882 diff --git a/sim/druid/tank/tank_test.go b/sim/druid/tank/tank_test.go index 585441a4e7..1424efb46f 100644 --- a/sim/druid/tank/tank_test.go +++ b/sim/druid/tank/tank_test.go @@ -17,7 +17,7 @@ func TestFeralTank(t *testing.T) { Class: proto.Class_ClassDruid, Race: proto.Race_RaceTauren, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/feral_tank_druid/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -48,7 +48,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceTauren, Class: proto.Class_ClassDruid, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/feral_tank_druid/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsDefault, Buffs: core.FullIndividualBuffs, @@ -96,23 +96,3 @@ var FullConsumes = &proto.Consumes{ ThermalSapper: true, FillerExplosive: proto.Explosive_ExplosiveSaroniteBomb, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40329,"enchant":67839,"gems":[41339,40008]}, - {"id":40387}, - {"id":40494,"enchant":44957,"gems":[40008]}, - {"id":40252,"enchant":3294}, - {"id":40471,"enchant":3832,"gems":[42702,40088]}, - {"id":40186,"enchant":3850,"gems":[40008,0]}, - {"id":40472,"enchant":63770,"gems":[40008,0]}, - {"id":43591,"gems":[40008,40008,40008]}, - {"id":44011,"enchant":38373,"gems":[40008,40008]}, - {"id":40243,"enchant":55016,"gems":[40008]}, - {"id":40370}, - {"id":37784}, - {"id":44253}, - {"id":37220}, - {"id":40280,"enchant":2673}, - {}, - {"id":38365} -]}`) diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results index 2d77f3ff6a..1d593e7cbc 100644 --- a/sim/hunter/TestBM.results +++ b/sim/hunter/TestBM.results @@ -888,84 +888,84 @@ dps_results: { } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-LongMultiTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-FullBuffs-LongMultiTarget" value: { dps: 14089.69804 tps: 13400.54792 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-LongSingleTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-FullBuffs-LongSingleTarget" value: { dps: 6360.92184 tps: 4367.27242 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-FullBuffs-ShortSingleTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-FullBuffs-ShortSingleTarget" value: { dps: 7622.26077 tps: 5201.03751 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-LongMultiTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-NoBuffs-LongMultiTarget" value: { dps: 7562.64991 tps: 8710.0143 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-LongSingleTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-NoBuffs-LongSingleTarget" value: { dps: 3048.58679 tps: 2407.41844 } } dps_results: { - key: "TestBM-Settings-Dwarf-P1-Basic-bm-NoBuffs-ShortSingleTarget" + key: "TestBM-Settings-Dwarf-p1_sv-Basic-bm-NoBuffs-ShortSingleTarget" value: { dps: 3493.97125 tps: 2753.08417 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-LongMultiTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-FullBuffs-LongMultiTarget" value: { dps: 14281.82423 tps: 13473.82205 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-LongSingleTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-FullBuffs-LongSingleTarget" value: { dps: 6463.05956 tps: 4362.82632 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-FullBuffs-ShortSingleTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-FullBuffs-ShortSingleTarget" value: { dps: 7772.83752 tps: 5212.04328 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-LongMultiTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-NoBuffs-LongMultiTarget" value: { dps: 7634.869 tps: 8751.05919 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-LongSingleTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-NoBuffs-LongSingleTarget" value: { dps: 3078.71573 tps: 2403.14887 } } dps_results: { - key: "TestBM-Settings-Orc-P1-Basic-bm-NoBuffs-ShortSingleTarget" + key: "TestBM-Settings-Orc-p1_sv-Basic-bm-NoBuffs-ShortSingleTarget" value: { dps: 3553.79138 tps: 2766.14097 diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results index db6d22fd47..4ff2644077 100644 --- a/sim/hunter/TestMM.results +++ b/sim/hunter/TestMM.results @@ -2,34 +2,34 @@ character_stats_results: { key: "TestMM-CharacterStats-Default" value: { final_stats: 358.6 - final_stats: 1816.672 - final_stats: 1452.55 - final_stats: 613.184 + final_stats: 1794.936 + final_stats: 1423.95 + final_stats: 632.632 final_stats: 275 final_stats: 500 final_stats: 109 - final_stats: 232 - final_stats: 1353.7762 - final_stats: 225 + final_stats: 175 + final_stats: 1290.13287 + final_stats: 341 final_stats: 0 - final_stats: 5760.9992 - final_stats: 330.36997 - final_stats: 2179.48535 - final_stats: 225 - final_stats: 68 + final_stats: 5820.6896 + final_stats: 273.36997 + final_stats: 2098.5116 + final_stats: 341 + final_stats: 105 final_stats: 0 - final_stats: 13963.76 + final_stats: 14255.48 final_stats: 0 final_stats: 0 - final_stats: 13625.844 - final_stats: 6052.0416 + final_stats: 13604.372 + final_stats: 6133.1248 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 21669.5 + final_stats: 21383.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,382 +46,382 @@ character_stats_results: { dps_results: { key: "TestMM-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 8479.78131 - tps: 7556.37143 + dps: 8466.66767 + tps: 7546.367 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50359" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-Althor'sAbacus-50366" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 7040.24865 - tps: 6122.12672 + dps: 7159.01669 + tps: 6243.38723 } } dps_results: { key: "TestMM-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-Bandit'sInsignia-40371" value: { - dps: 7145.3023 - tps: 6222.77186 + dps: 7255.07928 + tps: 6334.76723 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6972.12323 - tps: 6060.67361 - hps: 92.97876 + dps: 7089.64922 + tps: 6180.27326 + hps: 91.71984 } } dps_results: { key: "TestMM-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6972.12323 - tps: 6060.67361 - hps: 92.97876 + dps: 7089.64922 + tps: 6180.27326 + hps: 91.71984 } } dps_results: { key: "TestMM-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7129.87178 - tps: 6204.48328 + dps: 7198.56264 + tps: 6273.85268 } } dps_results: { key: "TestMM-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7058.9673 - tps: 6152.38547 + dps: 7152.70991 + tps: 6241.08314 } } dps_results: { key: "TestMM-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6630.11794 - tps: 5708.26266 + dps: 6686.52738 + tps: 5771.94376 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50035" value: { - dps: 6896.6057 - tps: 5996.20953 + dps: 6977.90995 + tps: 6075.26474 } } dps_results: { key: "TestMM-AllItems-BlackBruise-50692" value: { - dps: 6883.86046 - tps: 5984.66102 + dps: 6965.06881 + tps: 6063.61868 } } dps_results: { key: "TestMM-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6087.38907 - tps: 5303.64985 + dps: 6119.44919 + tps: 5335.53738 } } dps_results: { key: "TestMM-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5855.24229 - tps: 5086.71023 + dps: 5876.08601 + tps: 5116.88398 } } dps_results: { key: "TestMM-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7112.09419 - tps: 6063.76889 + dps: 7175.18266 + tps: 6125.83679 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { key: "TestMM-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { key: "TestMM-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7272.96015 - tps: 6347.5051 + dps: 7333.43388 + tps: 6408.6069 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50349" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-CorpseTongueCoin-50352" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 hps: 64 } } dps_results: { key: "TestMM-AllItems-CryptstalkerBattlegear" value: { - dps: 6700.12906 - tps: 5808.91044 + dps: 6612.58402 + tps: 5734.56184 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7119.77842 - tps: 6204.93928 + dps: 7211.64242 + tps: 6301.09302 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7161.95756 - tps: 6246.71437 + dps: 7244.96495 + tps: 6332.76733 } } dps_results: { key: "TestMM-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7257.53562 - tps: 6327.03003 + dps: 7347.94901 + tps: 6416.64989 } } dps_results: { key: "TestMM-AllItems-Death'sChoice-47464" value: { - dps: 7444.10018 - tps: 6501.99795 + dps: 7531.7904 + tps: 6591.75285 } } dps_results: { key: "TestMM-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7070.67983 - tps: 6159.99087 + dps: 7157.09435 + tps: 6243.55105 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50362" value: { - dps: 7376.04476 - tps: 6451.45803 + dps: 7479.69903 + tps: 6553.34745 } } dps_results: { key: "TestMM-AllItems-Deathbringer'sWill-50363" value: { - dps: 7409.37918 - tps: 6481.83654 + dps: 7517.70046 + tps: 6589.84779 } } dps_results: { key: "TestMM-AllItems-Defender'sCode-40257" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7134.80173 - tps: 6209.34667 + dps: 7195.52445 + tps: 6270.71245 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50348" value: { - dps: 7173.17426 - tps: 6264.42595 + dps: 7223.39472 + tps: 6312.0282 } } dps_results: { key: "TestMM-AllItems-DislodgedForeignObject-50353" value: { - dps: 7091.36478 - tps: 6184.92407 + dps: 7207.05894 + tps: 6297.49019 } } dps_results: { key: "TestMM-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-EmberSkyflareDiamond" value: { - dps: 7117.57044 - tps: 6191.0589 + dps: 7187.71965 + tps: 6261.19665 } } dps_results: { key: "TestMM-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7132.19319 - tps: 6206.73813 + dps: 7194.24689 + tps: 6269.41991 } } dps_results: { key: "TestMM-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7129.15688 - tps: 6203.70182 + dps: 7191.78665 + tps: 6266.95967 } } dps_results: { key: "TestMM-AllItems-EphemeralSnowflake-50260" value: { - dps: 7117.58086 - tps: 6212.57463 + dps: 7175.17663 + tps: 6270.89288 } } dps_results: { key: "TestMM-AllItems-EssenceofGossamer-37220" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7181.01283 - tps: 6265.84595 + dps: 7261.89103 + tps: 6350.35867 } } dps_results: { key: "TestMM-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7102.23263 - tps: 6186.81794 + dps: 7194.45607 + tps: 6282.49958 } } dps_results: { key: "TestMM-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7000.8607 - tps: 6086.63275 + dps: 7127.82834 + tps: 6214.96196 } } dps_results: { key: "TestMM-AllItems-ForethoughtTalisman-40258" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-ForgeEmber-37660" value: { - dps: 7077.20701 - tps: 6161.8566 + dps: 7171.80569 + tps: 6260.04823 } } dps_results: { key: "TestMM-AllItems-ForlornSkyflareDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-ForlornStarflareDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7161.39178 - tps: 6231.66257 + dps: 7281.00317 + tps: 6353.80326 } } dps_results: { key: "TestMM-AllItems-FuturesightRune-38763" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-Gladiator'sPursuit" value: { - dps: 7233.99135 - tps: 6351.76668 + dps: 7233.51338 + tps: 6375.01298 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54573" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-GlowingTwilightScale-54589" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7131.6641 - tps: 6216.56318 + dps: 7223.03283 + tps: 6310.91082 } } dps_results: { @@ -434,631 +434,631 @@ dps_results: { dps_results: { key: "TestMM-AllItems-Heartpierce-49982" value: { - dps: 7338.66963 - tps: 6406.49354 + dps: 7395.77293 + tps: 6464.22309 } } dps_results: { key: "TestMM-AllItems-Heartpierce-50641" value: { - dps: 7339.91436 - tps: 6407.6234 + dps: 7397.01905 + tps: 6465.35492 } } dps_results: { key: "TestMM-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6972.3294 - tps: 6060.38004 + dps: 7089.76824 + tps: 6180.25501 } } dps_results: { key: "TestMM-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7132.19319 - tps: 6206.73813 + dps: 7194.24689 + tps: 6269.41991 } } dps_results: { key: "TestMM-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7129.15688 - tps: 6203.70182 + dps: 7191.78665 + tps: 6266.95967 } } dps_results: { key: "TestMM-AllItems-IncisorFragment-37723" value: { - dps: 7127.68857 - tps: 6207.26994 + dps: 7247.7188 + tps: 6329.78741 } } dps_results: { key: "TestMM-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7184.43424 - tps: 6258.40498 + dps: 7248.04898 + tps: 6321.77967 } } dps_results: { key: "TestMM-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7143.44768 - tps: 6216.57413 - hps: 11.23202 + dps: 7200.21957 + tps: 6272.31359 + hps: 11.11942 } } dps_results: { key: "TestMM-AllItems-LastWord-50179" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { key: "TestMM-AllItems-LastWord-50708" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { key: "TestMM-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6972.3294 - tps: 6060.38004 + dps: 7089.78536 + tps: 6180.27213 } } dps_results: { key: "TestMM-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7168.13937 - tps: 6262.31112 + dps: 7271.33757 + tps: 6360.81514 } } dps_results: { key: "TestMM-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7148.25387 - tps: 6234.93203 + dps: 7236.11754 + tps: 6327.24994 } } dps_results: { key: "TestMM-AllItems-Nibelung-49992" value: { - dps: 7395.78314 - tps: 6458.25826 + dps: 7468.10832 + tps: 6528.92669 } } dps_results: { key: "TestMM-AllItems-Nibelung-50648" value: { - dps: 7406.09187 - tps: 6467.19241 + dps: 7477.26065 + tps: 6537.0346 } } dps_results: { key: "TestMM-AllItems-OfferingofSacrifice-37638" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7132.80068 - tps: 6204.95072 + dps: 7195.93657 + tps: 6268.32534 } } dps_results: { key: "TestMM-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7137.6728 - tps: 6209.36314 + dps: 7200.81984 + tps: 6272.75106 } } dps_results: { key: "TestMM-AllItems-PetrifiedScarab-21685" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78536 + tps: 6180.27213 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-PurifiedShardoftheGods" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47316" value: { - dps: 6981.48737 - tps: 6069.69869 + dps: 7098.88136 + tps: 6189.34161 } } dps_results: { key: "TestMM-AllItems-ReignoftheDead-47477" value: { - dps: 6982.88888 - tps: 6071.1002 + dps: 7100.02447 + tps: 6190.48472 } } dps_results: { key: "TestMM-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { key: "TestMM-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7113.97051 - tps: 6187.86778 + dps: 7178.80539 + tps: 6252.62975 } } dps_results: { key: "TestMM-AllItems-RuneofRepulsion-40372" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-ScourgestalkerBattlegear" value: { - dps: 7015.87383 - tps: 6136.17129 + dps: 7067.92036 + tps: 6188.81051 } } dps_results: { key: "TestMM-AllItems-SealofthePantheon-36993" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-Shadowmourne-49623" value: { - dps: 7497.64909 - tps: 6571.7757 + dps: 7610.72192 + tps: 6683.14555 } } dps_results: { key: "TestMM-AllItems-ShinyShardoftheGods" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.76417 + tps: 6180.25094 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50339" value: { - dps: 7026.44868 - tps: 6114.40046 + dps: 7142.42616 + tps: 6231.9653 } } dps_results: { key: "TestMM-AllItems-SliverofPureIce-50346" value: { - dps: 7028.38841 - tps: 6116.62672 + dps: 7143.41456 + tps: 6233.45273 } } dps_results: { key: "TestMM-AllItems-SoulPreserver-37111" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-SouloftheDead-40382" value: { - dps: 7105.76672 - tps: 6191.59543 + dps: 7213.50877 + tps: 6302.46821 } } dps_results: { key: "TestMM-AllItems-SparkofLife-37657" value: { - dps: 7121.94478 - tps: 6207.17699 + dps: 7213.09095 + tps: 6299.108 } } dps_results: { key: "TestMM-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7065.88133 - tps: 6144.07779 + dps: 7185.68482 + tps: 6266.47215 } } dps_results: { key: "TestMM-AllItems-StormshroudArmor" value: { - dps: 5682.49994 - tps: 4921.02458 + dps: 5727.15237 + tps: 4976.21324 } } dps_results: { key: "TestMM-AllItems-SwiftSkyflareDiamond" value: { - dps: 7137.6728 - tps: 6209.36314 + dps: 7200.81984 + tps: 6272.75106 } } dps_results: { key: "TestMM-AllItems-SwiftStarflareDiamond" value: { - dps: 7132.80068 - tps: 6204.95072 + dps: 7195.93657 + tps: 6268.32534 } } dps_results: { key: "TestMM-AllItems-SwiftWindfireDiamond" value: { - dps: 7124.27448 - tps: 6197.22897 + dps: 7187.39084 + tps: 6260.58034 } } dps_results: { key: "TestMM-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-TearsoftheVanquished-47215" value: { - dps: 7058.00932 - tps: 6138.06022 + dps: 7184.06464 + tps: 6264.84586 } } dps_results: { key: "TestMM-AllItems-TheFistsofFury" value: { - dps: 6931.89209 - tps: 6029.78467 + dps: 7010.19921 + tps: 6107.47641 } } dps_results: { key: "TestMM-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 7065.56545 - tps: 6161.8372 + dps: 7161.28693 + tps: 6257.594 } } dps_results: { key: "TestMM-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7111.73639 - tps: 6192.17267 + dps: 7201.96374 + tps: 6276.76109 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6972.53347 - tps: 6060.58411 + dps: 7090.03676 + tps: 6180.52353 } } dps_results: { key: "TestMM-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6972.53347 - tps: 6060.58411 + dps: 7090.03676 + tps: 6180.52353 } } dps_results: { key: "TestMM-AllItems-TirelessSkyflareDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-TirelessStarflareDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7065.80215 - tps: 6157.41469 + dps: 7151.22932 + tps: 6238.0454 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7112.09419 - tps: 6186.19791 + dps: 7175.18266 + tps: 6249.51605 } } dps_results: { key: "TestMM-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6023.50933 - tps: 5239.87171 + dps: 6022.46197 + tps: 5252.73606 } } dps_results: { key: "TestMM-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6999.85741 - tps: 6098.39483 + dps: 7066.29458 + tps: 6159.76523 } } dps_results: { key: "TestMM-AllItems-Windrunner'sPursuit" value: { - dps: 7263.99141 - tps: 6357.35551 + dps: 7274.62567 + tps: 6372.31057 } } dps_results: { key: "TestMM-AllItems-WingedTalisman-37844" value: { - dps: 6972.32864 - tps: 6060.37928 + dps: 7089.78943 + tps: 6180.2762 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7776.61762 - tps: 6860.76608 + dps: 7891.98915 + tps: 6967.5668 } } dps_results: { key: "TestMM-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 8015.95498 - tps: 7101.14235 + dps: 8091.67717 + tps: 7174.86466 } } dps_results: { key: "TestMM-Average-Default" value: { - dps: 7261.46246 - tps: 6346.09998 + dps: 7344.09626 + tps: 6425.47971 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-FullBuffs-LongMultiTarget" value: { - dps: 14193.97777 - tps: 14557.51261 + dps: 14274.33158 + tps: 14652.76432 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-FullBuffs-LongSingleTarget" value: { - dps: 7242.89841 - tps: 6364.5906 + dps: 7329.96989 + tps: 6454.80211 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-FullBuffs-ShortSingleTarget" value: { - dps: 8152.33138 - tps: 7137.74959 + dps: 8335.48272 + tps: 7312.58988 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-NoBuffs-LongMultiTarget" value: { - dps: 7291.29371 - tps: 8778.76381 + dps: 7421.76085 + tps: 8909.65471 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-NoBuffs-LongSingleTarget" value: { - dps: 3553.33521 - tps: 3298.49469 + dps: 3599.26399 + tps: 3345.16253 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm-NoBuffs-ShortSingleTarget" value: { - dps: 4156.32319 - tps: 3831.6856 + dps: 4184.34561 + tps: 3850.53327 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-FullBuffs-LongMultiTarget" value: { - dps: 14053.93382 - tps: 14360.66888 + dps: 14010.95681 + tps: 14300.798 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-FullBuffs-LongSingleTarget" value: { - dps: 7248.94863 - tps: 6375.76279 + dps: 7297.959 + tps: 6420.58585 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-FullBuffs-ShortSingleTarget" value: { - dps: 8408.62634 - tps: 7398.36308 + dps: 8424.73711 + tps: 7411.22505 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-NoBuffs-LongMultiTarget" value: { - dps: 7200.54516 - tps: 8630.29486 + dps: 7270.62414 + tps: 8731.36834 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-NoBuffs-LongSingleTarget" value: { - dps: 3542.1299 - tps: 3287.6059 + dps: 3619.87157 + tps: 3365.50453 } } dps_results: { - key: "TestMM-Settings-Dwarf-P1-Basic-mm_advanced-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Dwarf-p1_mm-Basic-mm_advanced-NoBuffs-ShortSingleTarget" value: { - dps: 4403.98227 - tps: 4067.07331 + dps: 4418.24722 + tps: 4077.83861 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-FullBuffs-LongMultiTarget" value: { - dps: 14274.17819 - tps: 14585.40593 + dps: 14360.5723 + tps: 14687.66625 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-FullBuffs-LongSingleTarget" value: { - dps: 7280.78997 - tps: 6353.95514 + dps: 7337.82851 + tps: 6411.59336 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-FullBuffs-ShortSingleTarget" value: { - dps: 8226.28444 - tps: 7149.53136 + dps: 8386.17169 + tps: 7300.89917 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-NoBuffs-LongMultiTarget" value: { - dps: 7296.11181 - tps: 8763.17951 + dps: 7452.13724 + tps: 8914.11683 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-NoBuffs-LongSingleTarget" value: { - dps: 3549.91766 - tps: 3278.9174 + dps: 3614.18547 + tps: 3340.41291 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm-NoBuffs-ShortSingleTarget" value: { - dps: 4230.07755 - tps: 3880.4478 + dps: 4308.46835 + tps: 3947.14471 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-FullBuffs-LongMultiTarget" value: { - dps: 14120.50347 - tps: 14379.2739 + dps: 14086.71608 + tps: 14325.27418 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-FullBuffs-LongSingleTarget" value: { - dps: 7280.0761 - tps: 6356.85712 + dps: 7332.70063 + tps: 6407.32552 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-FullBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-FullBuffs-ShortSingleTarget" value: { - dps: 8493.91293 - tps: 7422.26831 + dps: 8501.40254 + tps: 7426.93741 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-LongMultiTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-NoBuffs-LongMultiTarget" value: { - dps: 7218.03768 - tps: 8634.29052 + dps: 7324.11129 + tps: 8769.08886 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-LongSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-NoBuffs-LongSingleTarget" value: { - dps: 3560.42249 - tps: 3286.8438 + dps: 3636.03963 + tps: 3364.4352 } } dps_results: { - key: "TestMM-Settings-Orc-P1-Basic-mm_advanced-NoBuffs-ShortSingleTarget" + key: "TestMM-Settings-Orc-p1_mm-Basic-mm_advanced-NoBuffs-ShortSingleTarget" value: { - dps: 4400.14485 - tps: 4040.03483 + dps: 4461.16768 + tps: 4099.72963 } } dps_results: { key: "TestMM-SwitchInFrontOfTarget-Default" value: { - dps: 7220.66336 - tps: 6355.71844 + dps: 7291.99841 + tps: 6437.57063 } } diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results index 6c8dc8f448..eab1d9e499 100644 --- a/sim/hunter/TestSV.results +++ b/sim/hunter/TestSV.results @@ -888,252 +888,252 @@ dps_results: { } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-FullBuffs-LongMultiTarget" value: { dps: 31060.39892 tps: 31017.21368 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-FullBuffs-LongSingleTarget" value: { dps: 3625.22567 tps: 2637.0629 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-FullBuffs-ShortSingleTarget" value: { dps: 4886.37703 tps: 3723.35344 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-NoBuffs-LongMultiTarget" value: { dps: 13107.72872 tps: 13990.7011 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-NoBuffs-LongSingleTarget" value: { dps: 1458.77564 tps: 1151.94758 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-aoe-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-aoe-NoBuffs-ShortSingleTarget" value: { dps: 2178.89371 tps: 1793.72999 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-FullBuffs-LongMultiTarget" value: { dps: 19928.37492 tps: 20119.7887 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-FullBuffs-LongSingleTarget" value: { dps: 7594.27275 tps: 6594.90692 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-FullBuffs-ShortSingleTarget" value: { dps: 8457.90169 tps: 7323.8827 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-NoBuffs-LongMultiTarget" value: { dps: 10484.49844 tps: 11603.80206 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-NoBuffs-LongSingleTarget" value: { dps: 3827.28691 tps: 3506.67975 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv-NoBuffs-ShortSingleTarget" value: { dps: 4559.8542 tps: 4156.97684 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-LongMultiTarget" value: { dps: 20805.93715 tps: 21147.06699 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-LongSingleTarget" value: { dps: 7674.20379 tps: 6678.50957 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-ShortSingleTarget" value: { dps: 9035.73531 tps: 7873.32996 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-LongMultiTarget" value: { dps: 11127.56021 tps: 12244.96943 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-LongSingleTarget" value: { dps: 3852.4054 tps: 3533.31513 } } dps_results: { - key: "TestSV-Settings-Dwarf-P1-Basic-sv_advanced-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-ShortSingleTarget" value: { dps: 4784.2999 tps: 4385.60063 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-FullBuffs-LongMultiTarget" value: { dps: 31043.87526 tps: 30943.98744 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-FullBuffs-LongSingleTarget" value: { dps: 3673.65532 tps: 2631.13163 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-FullBuffs-ShortSingleTarget" value: { dps: 4969.11967 tps: 3738.27222 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-NoBuffs-LongMultiTarget" value: { dps: 13147.00183 tps: 14003.87871 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-NoBuffs-LongSingleTarget" value: { dps: 1479.79057 tps: 1153.06491 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-aoe-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-aoe-NoBuffs-ShortSingleTarget" value: { dps: 2205.12365 tps: 1798.74725 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-FullBuffs-LongMultiTarget" value: { dps: 20050.12155 tps: 20179.5756 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-FullBuffs-LongSingleTarget" value: { dps: 7643.04025 tps: 6588.10837 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-FullBuffs-ShortSingleTarget" value: { dps: 8522.54204 tps: 7321.26785 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-NoBuffs-LongMultiTarget" value: { dps: 10506.04268 tps: 11620.03248 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-NoBuffs-LongSingleTarget" value: { dps: 3842.06655 tps: 3499.66519 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv-NoBuffs-ShortSingleTarget" value: { dps: 4598.46221 tps: 4171.50736 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-FullBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-LongMultiTarget" value: { dps: 20920.22975 tps: 21198.34186 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-FullBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-LongSingleTarget" value: { dps: 7718.0752 tps: 6665.5027 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-FullBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-ShortSingleTarget" value: { dps: 9101.7618 tps: 7870.83539 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-NoBuffs-LongMultiTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-LongMultiTarget" value: { dps: 11197.83185 tps: 12302.31472 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-NoBuffs-LongSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-LongSingleTarget" value: { dps: 3878.18028 tps: 3537.26158 } } dps_results: { - key: "TestSV-Settings-Orc-P1-Basic-sv_advanced-NoBuffs-ShortSingleTarget" + key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-ShortSingleTarget" value: { dps: 4822.03228 tps: 4399.80919 diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index 4d95d8655c..ba302ef366 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -18,7 +18,7 @@ func TestBM(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p1_sv"), Talents: BMTalents, Glyphs: BMGlyphs, Consumes: FullConsumes, @@ -35,7 +35,7 @@ func TestMM(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p1_mm"), Talents: MMTalents, Glyphs: MMGlyphs, Consumes: FullConsumes, @@ -55,7 +55,7 @@ func TestSV(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p1_sv"), Talents: SVTalents, Glyphs: SVGlyphs, Consumes: FullConsumes, @@ -95,7 +95,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassHunter, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../ui/hunter/gear_sets", "p1_sv").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsBasic, Glyphs: MMGlyphs, @@ -169,23 +169,3 @@ var PlayerOptionsBasic = &proto.Player_Hunter{ }, }, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40505,"enchant":3817,"gems":[41398,42143]}, - {"id":44664,"gems":[42143]}, - {"id":40507,"enchant":3808,"gems":[39997]}, - {"id":40403,"enchant":3605}, - {"id":43998,"enchant":3832,"gems":[42143,39997]}, - {"id":40282,"enchant":3845,"gems":[39997,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":39762,"enchant":3601,"gems":[39997]}, - {"id":40331,"enchant":3823,"gems":[39997,49110]}, - {"id":40549,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":40388,"enchant":3827}, - {}, - {"id":40385,"enchant":3608} -]}`) diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 697328e81a..4a70f5b230 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 303.6 final_stats: 312.4 - final_stats: 1976.15 - final_stats: 2175.8 - final_stats: 592.9 - final_stats: 4506.37 + final_stats: 1694.55 + final_stats: 1849.43 + final_stats: 1087.79 + final_stats: 3931.4145 final_stats: 109 - final_stats: 295.69598 - final_stats: 2429.29605 - final_stats: 1238 + final_stats: 258.69598 + final_stats: 2350.76003 + final_stats: 855 final_stats: 0 final_stats: 755.7 - final_stats: 217 - final_stats: 1483.08921 - final_stats: 1238 + final_stats: 180 + final_stats: 1059.08921 + final_stats: 855 final_stats: 0 final_stats: 0 - final_stats: 35625 + final_stats: 30729.45 final_stats: 0 final_stats: 0 - final_stats: 5794.3 + final_stats: 5658.3 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26544.5 + final_stats: 23728.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,808 +46,815 @@ character_stats_results: { dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50359" value: { - dps: 13954.08561 - tps: 8529.97086 + dps: 10805.26913 + tps: 6614.3316 } } dps_results: { key: "TestArcane-AllItems-Althor'sAbacus-50366" value: { - dps: 14002.79056 - tps: 8558.91533 + dps: 10847.10387 + tps: 6639.16463 } } dps_results: { key: "TestArcane-AllItems-AustereEarthsiegeDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-Bandit'sInsignia-40371" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50354" value: { - dps: 13570.70047 - tps: 8301.34371 - hps: 102.59478 + dps: 10462.93274 + tps: 6411.06675 + hps: 102.38829 } } dps_results: { key: "TestArcane-AllItems-BaubleofTrueBlood-50726" value: { - dps: 13570.70047 - tps: 8301.34371 - hps: 102.59478 + dps: 10462.93274 + tps: 6411.06675 + hps: 102.38829 } } dps_results: { key: "TestArcane-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 14169.39961 - tps: 8663.70091 + dps: 10719.23674 + tps: 6560.15206 } } dps_results: { key: "TestArcane-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 9401.29017 - tps: 5761.7709 + dps: 8075.14838 + tps: 4957.07093 } } dps_results: { key: "TestArcane-AllItems-Bloodmage'sRegalia" value: { - dps: 13020.68851 - tps: 7971.39727 + dps: 11230.30362 + tps: 6886.70742 } } dps_results: { key: "TestArcane-AllItems-BracingEarthsiegeDiamond" value: { - dps: 14157.9037 - tps: 8481.52087 + dps: 10707.49136 + tps: 6426.96154 } } dps_results: { key: "TestArcane-AllItems-ChaoticSkyflareDiamond" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50349" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-CorpseTongueCoin-50352" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 hps: 64 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 13739.71587 - tps: 8409.87186 + dps: 10608.98628 + tps: 6501.65786 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Death-42990" value: { - dps: 13742.50303 - tps: 8433.4251 + dps: 10662.39066 + tps: 6550.09875 } } dps_results: { key: "TestArcane-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 13923.05438 - tps: 8519.0025 + dps: 10692.20053 + tps: 6546.62476 } } dps_results: { key: "TestArcane-AllItems-Death'sChoice-47464" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 13604.634 - tps: 8325.5383 + dps: 10513.41788 + tps: 6440.72582 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50362" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-Deathbringer'sWill-50363" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-Defender'sCode-40257" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-DestructiveSkyflareDiamond" value: { - dps: 14123.70706 - tps: 8632.41491 + dps: 10700.91581 + tps: 6553.65349 + } +} +dps_results: { + key: "TestArcane-AllItems-DislodgedForeignObject-50348" + value: { + dps: 11274.66047 + tps: 6902.02611 } } dps_results: { key: "TestArcane-AllItems-DislodgedForeignObject-50353" value: { - dps: 14436.52856 - tps: 8824.72335 + dps: 11168.67794 + tps: 6839.98355 } } dps_results: { key: "TestArcane-AllItems-EffulgentSkyflareDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-EmberSkyflareDiamond" value: { - dps: 14204.92982 - tps: 8684.00416 + dps: 10767.80992 + tps: 6588.92671 } } dps_results: { key: "TestArcane-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 14117.659 - tps: 8628.75533 + dps: 10699.52372 + tps: 6552.73912 } } dps_results: { key: "TestArcane-AllItems-EnigmaticStarflareDiamond" value: { - dps: 14086.36527 - tps: 8609.91354 + dps: 10695.1138 + tps: 6550.0171 } } dps_results: { key: "TestArcane-AllItems-EphemeralSnowflake-50260" value: { - dps: 13769.07437 - tps: 8424.83418 + dps: 10738.79708 + tps: 6577.6561 } } dps_results: { key: "TestArcane-AllItems-EssenceofGossamer-37220" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-EternalEarthsiegeDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 13717.39071 - tps: 8396.31603 + dps: 10603.00235 + tps: 6497.18264 } } dps_results: { key: "TestArcane-AllItems-EyeoftheBroodmother-45308" value: { - dps: 13997.6284 - tps: 8563.80417 + dps: 10846.47184 + tps: 6642.45905 } } dps_results: { key: "TestArcane-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 13698.98308 - tps: 8383.4184 + dps: 10554.71644 + tps: 6460.35227 } } dps_results: { key: "TestArcane-AllItems-ForethoughtTalisman-40258" value: { - dps: 13803.54303 - tps: 8440.50614 + dps: 10675.96176 + tps: 6537.57497 } } dps_results: { key: "TestArcane-AllItems-ForgeEmber-37660" value: { - dps: 13887.71562 - tps: 8496.2704 + dps: 10756.25623 + tps: 6587.40718 } } dps_results: { key: "TestArcane-AllItems-ForlornSkyflareDiamond" value: { - dps: 14157.9037 - tps: 8652.33187 + dps: 10707.49136 + tps: 6556.3024 } } dps_results: { key: "TestArcane-AllItems-ForlornStarflareDiamond" value: { - dps: 14146.84893 - tps: 8645.76126 + dps: 10698.12568 + tps: 6550.7438 } } dps_results: { key: "TestArcane-AllItems-FrostfireGarb" value: { - dps: 9965.398 - tps: 6112.35165 + dps: 8386.38959 + tps: 5145.87592 } } dps_results: { key: "TestArcane-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-FuturesightRune-38763" value: { - dps: 13850.8144 - tps: 8471.36347 + dps: 10654.84815 + tps: 6521.13144 } } dps_results: { key: "TestArcane-AllItems-Gladiator'sRegalia" value: { - dps: 10160.32265 - tps: 6218.55503 + dps: 8669.04946 + tps: 5304.01713 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54573" value: { - dps: 13978.43809 - tps: 8544.4431 + dps: 10826.1865 + tps: 6626.74812 } } dps_results: { key: "TestArcane-AllItems-GlowingTwilightScale-54589" value: { - dps: 14033.78463 - tps: 8577.33454 + dps: 10873.72598 + tps: 6654.96747 } } dps_results: { key: "TestArcane-AllItems-GnomishLightningGenerator-41121" value: { - dps: 13720.8825 - tps: 8415.02017 + dps: 10642.64409 + tps: 6534.37007 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-49982" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { key: "TestArcane-AllItems-Heartpierce-50641" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { key: "TestArcane-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 13989.57636 - tps: 8552.25465 + dps: 10836.18166 + tps: 6633.81506 } } dps_results: { key: "TestArcane-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 14117.659 - tps: 8628.75533 + dps: 10699.52372 + tps: 6552.73912 } } dps_results: { key: "TestArcane-AllItems-ImpassiveStarflareDiamond" value: { - dps: 14086.36527 - tps: 8609.91354 + dps: 10695.1138 + tps: 6550.0171 } } dps_results: { key: "TestArcane-AllItems-IncisorFragment-37723" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 14203.69054 - tps: 8690.81357 + dps: 10739.54046 + tps: 6577.09599 } } dps_results: { key: "TestArcane-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-Khadgar'sRegalia" value: { - dps: 10790.39246 - tps: 6611.97858 + dps: 9165.03044 + tps: 5619.84759 } } dps_results: { key: "TestArcane-AllItems-KirinTorGarb" value: { - dps: 10460.56782 - tps: 6403.89095 + dps: 8919.45709 + tps: 5454.51128 } } dps_results: { key: "TestArcane-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-MajesticDragonFigurine-40430" value: { - dps: 13926.9496 - tps: 8519.39322 + dps: 10715.77808 + tps: 6562.77063 } } dps_results: { key: "TestArcane-AllItems-MeteoriteWhetstone-37390" value: { - dps: 13659.43124 - tps: 8360.25773 + dps: 10569.61473 + tps: 6476.24145 } } dps_results: { key: "TestArcane-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 13866.82366 - tps: 8481.00279 + dps: 10731.96133 + tps: 6567.3256 } } dps_results: { key: "TestArcane-AllItems-Nibelung-49992" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { key: "TestArcane-AllItems-Nibelung-50648" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { key: "TestArcane-AllItems-OfferingofSacrifice-37638" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthshatterDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-PetrifiedScarab-21685" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-PurifiedShardoftheGods" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47316" value: { - dps: 14226.49107 - tps: 8807.61816 + dps: 11011.33936 + tps: 6832.88953 } } dps_results: { key: "TestArcane-AllItems-ReignoftheDead-47477" value: { - dps: 14301.5559 - tps: 8866.45738 + dps: 11076.40081 + tps: 6884.01412 } } dps_results: { key: "TestArcane-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 14520.11011 - tps: 8872.55315 + dps: 10986.57907 + tps: 6726.45335 } } dps_results: { key: "TestArcane-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 14052.54106 - tps: 8590.05498 + dps: 10666.94196 + tps: 6529.35284 } } dps_results: { key: "TestArcane-AllItems-RuneofRepulsion-40372" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-SealofthePantheon-36993" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-ShinyShardoftheGods" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50339" value: { - dps: 14047.47989 - tps: 8590.71549 + dps: 10817.59175 + tps: 6621.1156 } } dps_results: { key: "TestArcane-AllItems-SliverofPureIce-50346" value: { - dps: 14099.37712 - tps: 8621.59396 + dps: 10856.45057 + tps: 6645.67074 } } dps_results: { key: "TestArcane-AllItems-SoulPreserver-37111" value: { - dps: 13723.84401 - tps: 8393.14246 + dps: 10607.50492 + tps: 6496.93911 } } dps_results: { key: "TestArcane-AllItems-SouloftheDead-40382" value: { - dps: 13869.83216 - tps: 8491.42236 + dps: 10638.34657 + tps: 6519.66732 } } dps_results: { key: "TestArcane-AllItems-SparkofLife-37657" value: { - dps: 13807.82023 - tps: 8446.52379 + dps: 10651.49518 + tps: 6521.7953 } } dps_results: { key: "TestArcane-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 13598.52459 - tps: 8321.27125 + dps: 10606.69464 + tps: 6495.17113 } } dps_results: { key: "TestArcane-AllItems-SwiftSkyflareDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-SwiftStarflareDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-SwiftWindfireDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 13697.05602 - tps: 8380.36931 + dps: 10597.86357 + tps: 6487.4307 } } dps_results: { key: "TestArcane-AllItems-TearsoftheVanquished-47215" value: { - dps: 13786.97892 - tps: 8436.99341 + dps: 10601.35975 + tps: 6490.01976 } } dps_results: { key: "TestArcane-AllItems-TempestRegalia" value: { - dps: 7626.35061 - tps: 4689.57217 + dps: 6590.00198 + tps: 4065.35104 } } dps_results: { key: "TestArcane-AllItems-TheGeneral'sHeart-45507" value: { - dps: 13557.8044 - tps: 8294.46814 + dps: 10464.8865 + tps: 6412.28106 } } dps_results: { key: "TestArcane-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 11281.2493 - tps: 6928.79814 + dps: 8689.00257 + tps: 5349.22558 } } dps_results: { key: "TestArcane-AllItems-ThunderingSkyflareDiamond" value: { - dps: 14102.62985 - tps: 8619.47886 + dps: 10660.66296 + tps: 6528.50938 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50351" value: { - dps: 13621.62004 - tps: 8336.11949 + dps: 10607.7643 + tps: 6496.96529 } } dps_results: { key: "TestArcane-AllItems-TinyAbominationinaJar-50706" value: { - dps: 13621.62004 - tps: 8336.11949 + dps: 10607.7643 + tps: 6496.96529 } } dps_results: { key: "TestArcane-AllItems-TirelessSkyflareDiamond" value: { - dps: 14157.9037 - tps: 8652.33187 + dps: 10707.49136 + tps: 6556.3024 } } dps_results: { key: "TestArcane-AllItems-TirelessStarflareDiamond" value: { - dps: 14146.84893 - tps: 8645.76126 + dps: 10698.12568 + tps: 6550.7438 } } dps_results: { key: "TestArcane-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 13854.10173 - tps: 8471.71772 + dps: 10748.83704 + tps: 6578.71666 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 14146.84893 - tps: 8645.76126 + dps: 10698.12568 + tps: 6550.7438 } } dps_results: { key: "TestArcane-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 14157.9037 - tps: 8652.33187 + dps: 10707.49136 + tps: 6556.3024 } } dps_results: { key: "TestArcane-AllItems-WingedTalisman-37844" value: { - dps: 13725.95428 - tps: 8395.35806 + dps: 10602.47405 + tps: 6494.83359 } } dps_results: { key: "TestArcane-Average-Default" value: { - dps: 14617.25532 - tps: 8935.54079 + dps: 11068.93745 + tps: 6775.63834 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-FullBuffs-LongMultiTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-FullBuffs-LongMultiTarget" value: { - dps: 14539.40704 - tps: 11006.62893 + dps: 11028.81164 + tps: 8448.79052 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-FullBuffs-LongSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-FullBuffs-LongSingleTarget" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-FullBuffs-ShortSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-FullBuffs-ShortSingleTarget" value: { - dps: 19303.35945 - tps: 11651.94607 + dps: 14190.20133 + tps: 8575.96382 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-NoBuffs-LongMultiTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-NoBuffs-LongMultiTarget" value: { - dps: 7172.11756 - tps: 5961.54028 + dps: 5774.30191 + tps: 4910.78782 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-NoBuffs-LongSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-NoBuffs-LongSingleTarget" value: { - dps: 7172.11756 - tps: 4398.33779 + dps: 5774.30191 + tps: 3547.11991 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane-NoBuffs-ShortSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane-NoBuffs-ShortSingleTarget" value: { - dps: 10298.11319 - tps: 6168.96704 + dps: 7209.27996 + tps: 4302.28293 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-FullBuffs-LongMultiTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-FullBuffs-LongMultiTarget" value: { - dps: 34387.67262 - tps: 20893.0503 + dps: 29241.06399 + tps: 17775.1023 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-FullBuffs-LongSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-FullBuffs-LongSingleTarget" value: { - dps: 2809.92001 - tps: 1844.249 + dps: 2378.08502 + tps: 1567.15295 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-FullBuffs-ShortSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 4194.19165 - tps: 2595.43534 + dps: 3450.86864 + tps: 2130.60218 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-NoBuffs-LongMultiTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-NoBuffs-LongMultiTarget" value: { - dps: 25539.98624 - tps: 15750.77257 + dps: 20253.26494 + tps: 12407.79379 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-NoBuffs-LongSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-NoBuffs-LongSingleTarget" value: { - dps: 1420.53635 - tps: 936.23932 + dps: 1175.47837 + tps: 778.88322 } } dps_results: { - key: "TestArcane-Settings-Troll-P3Arcane-Arcane-arcane_aoe-NoBuffs-ShortSingleTarget" + key: "TestArcane-Settings-Troll-p3_arcane_alliance-Arcane-arcane_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2903.80217 - tps: 1750.19819 + dps: 2142.14171 + tps: 1280.7994 } } dps_results: { key: "TestArcane-SwitchInFrontOfTarget-Default" value: { - dps: 14539.40704 - tps: 8884.36314 + dps: 11028.81164 + tps: 6752.69776 } } diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 57eee8dc87..d26760097b 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 303.6 final_stats: 312.4 - final_stats: 1976.15 - final_stats: 1892 - final_stats: 560.56 - final_stats: 4180 + final_stats: 1701.15 + final_stats: 1612.6 + final_stats: 855.712 + final_stats: 3679 final_stats: 109 - final_stats: 217 - final_stats: 2333.34033 - final_stats: 1238 + final_stats: 340 + final_stats: 2280.07394 + final_stats: 700 final_stats: 0 final_stats: 755.7 - final_stats: 217 - final_stats: 1483.08921 - final_stats: 1238 + final_stats: 340 + final_stats: 1216.08921 + final_stats: 700 final_stats: 0 final_stats: 0 - final_stats: 31368 + final_stats: 27177 final_stats: 0 final_stats: 0 - final_stats: 5794.3 + final_stats: 5658.3 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26544.5 + final_stats: 23794.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,808 +46,815 @@ character_stats_results: { dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50359" value: { - dps: 13075.21495 - tps: 10515.69443 + dps: 10620.17899 + tps: 8557.89494 } } dps_results: { key: "TestFire-AllItems-Althor'sAbacus-50366" value: { - dps: 13126.66013 - tps: 10556.48947 + dps: 10666.1052 + tps: 8594.25967 } } dps_results: { key: "TestFire-AllItems-AustereEarthsiegeDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-Bandit'sInsignia-40371" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50354" value: { - dps: 12598.20104 - tps: 10137.27547 - hps: 102.21554 + dps: 10244.33663 + tps: 8260.20663 + hps: 100.32759 } } dps_results: { key: "TestFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 12598.20104 - tps: 10137.27547 - hps: 102.21554 + dps: 10244.33663 + tps: 8260.20663 + hps: 100.32759 } } dps_results: { key: "TestFire-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 13311.97613 - tps: 10706.57304 + dps: 10468.94702 + tps: 8440.10579 } } dps_results: { key: "TestFire-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8452.06795 - tps: 6801.71481 + dps: 7471.18942 + tps: 6023.33195 } } dps_results: { key: "TestFire-AllItems-Bloodmage'sRegalia" value: { - dps: 12596.82644 - tps: 10136.48319 + dps: 10825.24329 + tps: 8724.94849 } } dps_results: { key: "TestFire-AllItems-BracingEarthsiegeDiamond" value: { - dps: 13235.08703 - tps: 10432.48939 + dps: 10485.76361 + tps: 8285.94322 } } dps_results: { key: "TestFire-AllItems-ChaoticSkyflareDiamond" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-CorpseTongueCoin-50352" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 hps: 64 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 12899.60667 - tps: 10380.35734 + dps: 10398.69548 + tps: 8385.88589 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Death-42990" value: { - dps: 13078.2516 - tps: 10539.25763 + dps: 10490.31106 + tps: 8471.82707 } } dps_results: { key: "TestFire-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 12836.96403 - tps: 10333.42855 + dps: 10526.31111 + tps: 8470.33904 } } dps_results: { key: "TestFire-AllItems-Death'sChoice-47464" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 12690.93219 - tps: 10211.85815 + dps: 10325.89867 + tps: 8325.96902 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50362" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-Defender'sCode-40257" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-DestructiveSkyflareDiamond" value: { - dps: 13254.07095 - tps: 10658.91 + dps: 10486.43739 + tps: 8454.09507 + } +} +dps_results: { + key: "TestFire-AllItems-DislodgedForeignObject-50348" + value: { + dps: 11131.15734 + tps: 8965.69844 } } dps_results: { key: "TestFire-AllItems-DislodgedForeignObject-50353" value: { - dps: 13571.86882 - tps: 10918.18907 + dps: 10961.06551 + tps: 8829.46293 } } dps_results: { key: "TestFire-AllItems-EffulgentSkyflareDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-EmberSkyflareDiamond" value: { - dps: 13332.71265 - tps: 10722.54304 + dps: 10499.6998 + tps: 8464.2889 } } dps_results: { key: "TestFire-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 13242.97138 - tps: 10650.20932 + dps: 10484.51167 + tps: 8452.54157 } } dps_results: { key: "TestFire-AllItems-EnigmaticStarflareDiamond" value: { - dps: 13215.78086 - tps: 10628.4016 + dps: 10485.15902 + tps: 8452.61862 } } dps_results: { key: "TestFire-AllItems-EphemeralSnowflake-50260" value: { - dps: 12816.79395 - tps: 10310.4515 + dps: 10431.87349 + tps: 8408.44605 } } dps_results: { key: "TestFire-AllItems-EssenceofGossamer-37220" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-EternalEarthsiegeDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 12899.80085 - tps: 10392.98534 + dps: 10444.81132 + tps: 8431.70269 } } dps_results: { key: "TestFire-AllItems-EyeoftheBroodmother-45308" value: { - dps: 13168.08834 - tps: 10594.10315 + dps: 10634.11704 + tps: 8572.65673 } } dps_results: { key: "TestFire-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 12650.18412 - tps: 10183.58255 + dps: 10360.88195 + tps: 8344.00197 } } dps_results: { key: "TestFire-AllItems-ForethoughtTalisman-40258" value: { - dps: 12916.20259 - tps: 10389.60066 + dps: 10478.22524 + tps: 8445.49484 } } dps_results: { key: "TestFire-AllItems-ForgeEmber-37660" value: { - dps: 13035.71369 - tps: 10488.2573 + dps: 10565.05239 + tps: 8517.83919 } } dps_results: { key: "TestFire-AllItems-ForlornSkyflareDiamond" value: { - dps: 13235.08703 - tps: 10643.24329 + dps: 10485.76361 + tps: 8453.01827 } } dps_results: { key: "TestFire-AllItems-ForlornStarflareDiamond" value: { - dps: 13223.47707 - tps: 10634.03798 + dps: 10475.49178 + tps: 8444.8871 } } dps_results: { key: "TestFire-AllItems-FrostfireGarb" value: { - dps: 9225.77844 - tps: 7438.59474 + dps: 7754.75384 + tps: 6259.79886 } } dps_results: { key: "TestFire-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-FuturesightRune-38763" value: { - dps: 12801.37332 - tps: 10298.2734 + dps: 10441.37946 + tps: 8416.86889 } } dps_results: { key: "TestFire-AllItems-Gladiator'sRegalia" value: { - dps: 9619.33412 - tps: 7742.77355 + dps: 8285.03346 + tps: 6673.52802 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54573" value: { - dps: 13100.93754 - tps: 10536.09195 + dps: 10643.1421 + tps: 8576.0773 } } dps_results: { key: "TestFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 13159.39797 - tps: 10582.44996 + dps: 10695.33098 + tps: 8617.40087 } } dps_results: { key: "TestFire-AllItems-GnomishLightningGenerator-41121" value: { - dps: 12877.4845 - tps: 10370.5626 + dps: 10515.1662 + tps: 8485.62935 } } dps_results: { key: "TestFire-AllItems-Heartpierce-49982" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { key: "TestFire-AllItems-Heartpierce-50641" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { key: "TestFire-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 13106.02232 - tps: 10541.62088 + dps: 10647.86657 + tps: 8581.37152 } } dps_results: { key: "TestFire-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 13242.97138 - tps: 10650.20932 + dps: 10484.51167 + tps: 8452.54157 } } dps_results: { key: "TestFire-AllItems-ImpassiveStarflareDiamond" value: { - dps: 13215.78086 - tps: 10628.4016 + dps: 10485.15902 + tps: 8452.61862 } } dps_results: { key: "TestFire-AllItems-IncisorFragment-37723" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 13255.47169 - tps: 10668.0702 + dps: 10594.45134 + tps: 8530.82808 } } dps_results: { key: "TestFire-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-Khadgar'sRegalia" value: { - dps: 10151.51582 - tps: 8185.02066 + dps: 8680.41674 + tps: 7005.8318 } } dps_results: { key: "TestFire-AllItems-KirinTorGarb" value: { - dps: 10176.89962 - tps: 8191.69005 + dps: 8665.44853 + tps: 6980.87111 } } dps_results: { key: "TestFire-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-MajesticDragonFigurine-40430" value: { - dps: 12977.33621 - tps: 10441.70774 + dps: 10609.38629 + tps: 8538.31395 } } dps_results: { key: "TestFire-AllItems-MeteoriteWhetstone-37390" value: { - dps: 12820.48502 - tps: 10316.49134 + dps: 10380.41362 + tps: 8370.77485 } } dps_results: { key: "TestFire-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 12940.44217 - tps: 10411.96942 + dps: 10539.1306 + tps: 8494.07517 } } dps_results: { key: "TestFire-AllItems-Nibelung-49992" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { key: "TestFire-AllItems-Nibelung-50648" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { key: "TestFire-AllItems-OfferingofSacrifice-37638" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-PersistentEarthshatterDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-PetrifiedScarab-21685" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-PurifiedShardoftheGods" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47316" value: { - dps: 13289.11136 - tps: 10733.68129 + dps: 10831.90151 + tps: 8779.49118 } } dps_results: { key: "TestFire-AllItems-ReignoftheDead-47477" value: { - dps: 13359.40851 - tps: 10795.23373 + dps: 10902.04687 + tps: 8841.80582 } } dps_results: { key: "TestFire-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 13589.01892 - tps: 10927.81642 + dps: 10761.47943 + tps: 8675.21982 } } dps_results: { key: "TestFire-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 13231.30837 - tps: 10642.14179 + dps: 10447.46728 + tps: 8421.4351 } } dps_results: { key: "TestFire-AllItems-RuneofRepulsion-40372" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-SealofthePantheon-36993" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-ShinyShardoftheGods" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50339" value: { - dps: 12993.05718 - tps: 10456.1979 + dps: 10680.19966 + tps: 8596.43807 } } dps_results: { key: "TestFire-AllItems-SliverofPureIce-50346" value: { - dps: 13029.56576 - tps: 10486.28359 + dps: 10726.05571 + tps: 8632.57435 } } dps_results: { key: "TestFire-AllItems-SoulPreserver-37111" value: { - dps: 12832.01957 - tps: 10322.84513 + dps: 10403.07325 + tps: 8385.98891 } } dps_results: { key: "TestFire-AllItems-SouloftheDead-40382" value: { - dps: 12910.69299 - tps: 10396.39065 + dps: 10579.57313 + tps: 8516.39372 } } dps_results: { key: "TestFire-AllItems-SparkofLife-37657" value: { - dps: 12864.65671 - tps: 10351.04324 + dps: 10382.50279 + tps: 8363.50623 } } dps_results: { key: "TestFire-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 12977.49151 - tps: 10440.99055 + dps: 10378.63959 + tps: 8368.13427 } } dps_results: { key: "TestFire-AllItems-SwiftSkyflareDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-SwiftStarflareDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-SwiftWindfireDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 12770.20533 - tps: 10275.1802 + dps: 10396.00231 + tps: 8381.61966 } } dps_results: { key: "TestFire-AllItems-TearsoftheVanquished-47215" value: { - dps: 12674.95465 - tps: 10200.79016 + dps: 10375.3303 + tps: 8354.30612 } } dps_results: { key: "TestFire-AllItems-TempestRegalia" value: { - dps: 6811.28385 - tps: 5490.8923 + dps: 6103.0969 + tps: 4930.73682 } } dps_results: { key: "TestFire-AllItems-TheGeneral'sHeart-45507" value: { - dps: 12656.63828 - tps: 10183.77112 + dps: 10246.50661 + tps: 8262.01821 } } dps_results: { key: "TestFire-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 10390.80493 - tps: 8377.08332 + dps: 8481.97902 + tps: 6858.63396 } } dps_results: { key: "TestFire-AllItems-ThunderingSkyflareDiamond" value: { - dps: 13177.03725 - tps: 10597.21675 + dps: 10434.40445 + tps: 8412.36245 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50351" value: { - dps: 13065.42708 - tps: 10510.72697 + dps: 10378.63959 + tps: 8368.13427 } } dps_results: { key: "TestFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 13065.42708 - tps: 10510.72697 + dps: 10378.63959 + tps: 8368.13427 } } dps_results: { key: "TestFire-AllItems-TirelessSkyflareDiamond" value: { - dps: 13235.08703 - tps: 10643.24329 + dps: 10485.76361 + tps: 8453.01827 } } dps_results: { key: "TestFire-AllItems-TirelessStarflareDiamond" value: { - dps: 13223.47707 - tps: 10634.03798 + dps: 10475.49178 + tps: 8444.8871 } } dps_results: { key: "TestFire-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 12976.31466 - tps: 10439.6821 + dps: 10538.59392 + tps: 8493.49565 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 13223.47707 - tps: 10634.03798 + dps: 10475.49178 + tps: 8444.8871 } } dps_results: { key: "TestFire-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 13235.08703 - tps: 10643.24329 + dps: 10485.76361 + tps: 8453.01827 } } dps_results: { key: "TestFire-AllItems-WingedTalisman-37844" value: { - dps: 12854.99272 - tps: 10342.45468 + dps: 10416.67628 + tps: 8398.15395 } } dps_results: { key: "TestFire-Average-Default" value: { - dps: 13648.39173 - tps: 10977.00239 + dps: 10876.75244 + tps: 8768.02702 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-FullBuffs-LongMultiTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-FullBuffs-LongMultiTarget" value: { - dps: 47357.96542 - tps: 40374.67309 + dps: 38085.36222 + tps: 32980.78258 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-FullBuffs-LongSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-FullBuffs-LongSingleTarget" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-FullBuffs-ShortSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-FullBuffs-ShortSingleTarget" value: { - dps: 16639.64556 - tps: 13278.74795 + dps: 12869.77048 + tps: 10259.24894 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-NoBuffs-LongMultiTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-NoBuffs-LongMultiTarget" value: { - dps: 31805.50425 - tps: 28708.54798 + dps: 22222.81509 + tps: 20575.92958 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-NoBuffs-LongSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-NoBuffs-LongSingleTarget" value: { - dps: 5481.38165 - tps: 4404.34584 + dps: 4932.35278 + tps: 3972.49689 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire-NoBuffs-ShortSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire-NoBuffs-ShortSingleTarget" value: { - dps: 8595.78676 - tps: 6799.46245 + dps: 6567.5219 + tps: 5189.7887 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-FullBuffs-LongMultiTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-FullBuffs-LongMultiTarget" value: { - dps: 73962.74686 - tps: 62594.93046 + dps: 61597.95507 + tps: 51618.17587 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-FullBuffs-LongSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-FullBuffs-LongSingleTarget" value: { - dps: 4910.61336 - tps: 3883.37155 + dps: 4386.54418 + tps: 3491.92635 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-FullBuffs-ShortSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 6475.15129 - tps: 4970.72261 + dps: 5435.93276 + tps: 4190.41953 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-NoBuffs-LongMultiTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-NoBuffs-LongMultiTarget" value: { - dps: 45856.78096 - tps: 39620.54109 + dps: 35747.61436 + tps: 30168.25267 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-NoBuffs-LongSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-NoBuffs-LongSingleTarget" value: { - dps: 2106.12625 - tps: 1669.78182 + dps: 1957.36144 + tps: 1561.936 } } dps_results: { - key: "TestFire-Settings-Troll-P3Fire-Fire-fire_aoe-NoBuffs-ShortSingleTarget" + key: "TestFire-Settings-Troll-p3_fire_alliance-Fire-fire_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 3965.47876 - tps: 2988.2328 + dps: 3184.72337 + tps: 2410.09603 } } dps_results: { key: "TestFire-SwitchInFrontOfTarget-Default" value: { - dps: 13658.42121 - tps: 10983.58612 + dps: 10814.62136 + tps: 8717.81267 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 9bd1fffe59..dc582270eb 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 303.6 final_stats: 312.4 - final_stats: 1976.15 - final_stats: 1892 - final_stats: 560.56 - final_stats: 4180 + final_stats: 1682.45 + final_stats: 1575.2 + final_stats: 869.44 + final_stats: 3658 final_stats: 109 - final_stats: 295.69598 - final_stats: 1887.31437 - final_stats: 1238 + final_stats: 336.69598 + final_stats: 1406.05627 + final_stats: 882 final_stats: 0 final_stats: 755.7 - final_stats: 217 - final_stats: 1483.08921 - final_stats: 1238 + final_stats: 258 + final_stats: 1089.08921 + final_stats: 882 final_stats: 0 final_stats: 0 - final_stats: 31368 + final_stats: 26616 final_stats: 0 final_stats: 0 - final_stats: 5794.3 + final_stats: 5658.3 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26544.5 + final_stats: 23607.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,802 +46,809 @@ character_stats_results: { dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50359" value: { - dps: 10286.8196 - tps: 8511.74962 + dps: 7928.24208 + tps: 6453.45112 } } dps_results: { key: "TestFrost-AllItems-Althor'sAbacus-50366" value: { - dps: 10327.11849 - tps: 8545.32477 + dps: 7962.77382 + tps: 6481.89515 } } dps_results: { key: "TestFrost-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-Bandit'sInsignia-40371" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50354" value: { - dps: 9958.39942 - tps: 8238.40256 - hps: 100.35531 + dps: 7646.41564 + tps: 6221.07535 + hps: 92.57675 } } dps_results: { key: "TestFrost-AllItems-BaubleofTrueBlood-50726" value: { - dps: 9958.39942 - tps: 8238.40256 - hps: 100.35531 + dps: 7646.41564 + tps: 6221.07535 + hps: 92.57675 } } dps_results: { key: "TestFrost-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10386.62035 - tps: 8628.94688 + dps: 7782.85819 + tps: 6339.33425 } } dps_results: { key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7521.48836 - tps: 6144.88394 + dps: 6005.44274 + tps: 4826.77708 } } dps_results: { key: "TestFrost-AllItems-Bloodmage'sRegalia" value: { - dps: 9796.4471 - tps: 8125.81506 + dps: 8143.08775 + tps: 6688.26693 } } dps_results: { key: "TestFrost-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10416.21362 - tps: 8478.51614 + dps: 7798.72055 + tps: 6223.09271 } } dps_results: { key: "TestFrost-AllItems-ChaoticSkyflareDiamond" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50349" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-CorpseTongueCoin-50352" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 hps: 64 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10129.66675 - tps: 8393.16292 + dps: 7721.01592 + tps: 6287.16324 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10123.79034 - tps: 8392.03147 + dps: 7731.37855 + tps: 6303.73706 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10043.11576 - tps: 8318.4689 + dps: 7684.58603 + tps: 6266.86577 } } dps_results: { key: "TestFrost-AllItems-Death'sChoice-47464" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10031.56806 - tps: 8304.07582 + dps: 7678.84495 + tps: 6246.81867 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50362" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-Deathbringer'sWill-50363" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-Defender'sCode-40257" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10390.54792 - tps: 8632.84978 + dps: 7783.55414 + tps: 6340.66928 + } +} +dps_results: { + key: "TestFrost-AllItems-DislodgedForeignObject-50348" + value: { + dps: 8381.41843 + tps: 6873.3235 } } dps_results: { key: "TestFrost-AllItems-DislodgedForeignObject-50353" value: { - dps: 10614.37557 - tps: 8830.28107 + dps: 8297.80523 + tps: 6789.83899 } } dps_results: { key: "TestFrost-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-EmberSkyflareDiamond" value: { - dps: 10421.43326 - tps: 8654.60025 + dps: 7812.27004 + tps: 6362.69935 } } dps_results: { key: "TestFrost-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10386.73747 - tps: 8630.12089 + dps: 7782.89356 + tps: 6340.06823 } } dps_results: { key: "TestFrost-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10382.7855 - tps: 8627.11438 + dps: 7777.85554 + tps: 6335.57176 } } dps_results: { key: "TestFrost-AllItems-EphemeralSnowflake-50260" value: { - dps: 10053.55536 - tps: 8324.36475 + dps: 7759.64948 + tps: 6319.89085 } } dps_results: { key: "TestFrost-AllItems-EssenceofGossamer-37220" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10087.84815 - tps: 8352.65094 + dps: 7723.41199 + tps: 6291.61522 } } dps_results: { key: "TestFrost-AllItems-EyeoftheBroodmother-45308" value: { - dps: 10330.72307 - tps: 8570.93758 + dps: 7906.80366 + tps: 6452.50593 } } dps_results: { key: "TestFrost-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 9993.12076 - tps: 8270.25379 + dps: 7668.23295 + tps: 6239.78194 } } dps_results: { key: "TestFrost-AllItems-ForethoughtTalisman-40258" value: { - dps: 10162.25941 - tps: 8407.9719 + dps: 7821.50761 + tps: 6365.5332 } } dps_results: { key: "TestFrost-AllItems-ForgeEmber-37660" value: { - dps: 10213.879 - tps: 8463.01688 + dps: 7824.55194 + tps: 6374.99683 } } dps_results: { key: "TestFrost-AllItems-ForlornSkyflareDiamond" value: { - dps: 10416.21362 - tps: 8651.03533 + dps: 7798.72055 + tps: 6349.7974 } } dps_results: { key: "TestFrost-AllItems-ForlornStarflareDiamond" value: { - dps: 10407.0553 - tps: 8643.40068 + dps: 7791.0072 + tps: 6343.45611 } } dps_results: { key: "TestFrost-AllItems-FrostfireGarb" value: { - dps: 7422.99357 - tps: 6050.76248 + dps: 6101.65344 + tps: 4903.61721 } } dps_results: { key: "TestFrost-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-FuturesightRune-38763" value: { - dps: 10072.55175 - tps: 8332.22749 + dps: 7744.89597 + tps: 6301.18733 } } dps_results: { key: "TestFrost-AllItems-Gladiator'sRegalia" value: { - dps: 7922.12662 - tps: 6447.09471 + dps: 6595.83373 + tps: 5290.27837 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54573" value: { - dps: 10306.96905 - tps: 8528.5372 + dps: 7945.50795 + tps: 6467.67314 } } dps_results: { key: "TestFrost-AllItems-GlowingTwilightScale-54589" value: { - dps: 10352.76324 - tps: 8566.69077 + dps: 7984.74857 + tps: 6499.9959 } } dps_results: { key: "TestFrost-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10137.09751 - tps: 8403.14822 + dps: 7726.20314 + tps: 6306.13936 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-49982" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { key: "TestFrost-AllItems-Heartpierce-50641" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 10292.58086 - tps: 8535.61974 + dps: 7930.51116 + tps: 6474.17485 } } dps_results: { key: "TestFrost-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10386.73747 - tps: 8630.12089 + dps: 7782.89356 + tps: 6340.06823 } } dps_results: { key: "TestFrost-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10382.7855 - tps: 8627.11438 + dps: 7777.85554 + tps: 6335.57176 } } dps_results: { key: "TestFrost-AllItems-IncisorFragment-37723" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10370.84741 - tps: 8615.32578 + dps: 7772.45693 + tps: 6333.79039 } } dps_results: { key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-Khadgar'sRegalia" value: { - dps: 8197.43334 - tps: 6719.56251 + dps: 6580.00377 + tps: 5309.1505 } } dps_results: { key: "TestFrost-AllItems-KirinTorGarb" value: { - dps: 8073.25878 - tps: 6608.63605 + dps: 6639.84098 + tps: 5357.24077 } } dps_results: { key: "TestFrost-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-MajesticDragonFigurine-40430" value: { - dps: 9958.65892 - tps: 8232.9568 + dps: 7647.59946 + tps: 6219.47581 } } dps_results: { key: "TestFrost-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10045.81724 - tps: 8313.54109 + dps: 7691.79354 + tps: 6256.75774 } } dps_results: { key: "TestFrost-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10226.57504 - tps: 8466.81093 + dps: 7847.31458 + tps: 6384.09669 } } dps_results: { key: "TestFrost-AllItems-Nibelung-49992" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { key: "TestFrost-AllItems-Nibelung-50648" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { key: "TestFrost-AllItems-OfferingofSacrifice-37638" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-PetrifiedScarab-21685" value: { - dps: 9957.45546 - tps: 8237.24005 + dps: 7646.26897 + tps: 6221.11085 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-PurifiedShardoftheGods" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47316" value: { - dps: 10463.94938 - tps: 8708.68257 + dps: 7998.96913 + tps: 6538.92968 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47477" value: { - dps: 10525.36375 - tps: 8764.62147 + dps: 8048.33749 + tps: 6583.34161 } } dps_results: { key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 10693.29439 - tps: 8902.77689 + dps: 7978.38291 + tps: 6514.28941 } } dps_results: { key: "TestFrost-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10369.98167 - tps: 8610.78223 + dps: 7760.12417 + tps: 6316.94905 } } dps_results: { key: "TestFrost-AllItems-RuneofRepulsion-40372" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-SealofthePantheon-36993" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-ShinyShardoftheGods" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50339" value: { - dps: 10248.04176 - tps: 8482.01963 + dps: 7895.33302 + tps: 6429.12257 } } dps_results: { key: "TestFrost-AllItems-SliverofPureIce-50346" value: { - dps: 10284.63551 - tps: 8512.74877 + dps: 7926.72551 + tps: 6455.23432 } } dps_results: { key: "TestFrost-AllItems-SoulPreserver-37111" value: { - dps: 10096.31577 - tps: 8353.03075 + dps: 7765.00113 + tps: 6318.98842 } } dps_results: { key: "TestFrost-AllItems-SouloftheDead-40382" value: { - dps: 10116.43645 - tps: 8383.20076 + dps: 7719.6486 + tps: 6289.29418 } } dps_results: { key: "TestFrost-AllItems-SparkofLife-37657" value: { - dps: 10021.3981 - tps: 8294.32497 + dps: 7755.89541 + tps: 6324.01321 } } dps_results: { key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10142.25681 - tps: 8405.00674 + dps: 7706.01629 + tps: 6281.8047 } } dps_results: { key: "TestFrost-AllItems-SwiftSkyflareDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-SwiftStarflareDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-SwiftWindfireDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 9958.89334 - tps: 8236.98232 + dps: 7647.57925 + tps: 6220.68724 } } dps_results: { key: "TestFrost-AllItems-TearsoftheVanquished-47215" value: { - dps: 10026.15538 - tps: 8297.31416 + dps: 7686.34035 + tps: 6255.4996 } } dps_results: { key: "TestFrost-AllItems-TempestRegalia" value: { - dps: 5983.3929 - tps: 4823.26929 + dps: 5182.16607 + tps: 4139.21118 } } dps_results: { key: "TestFrost-AllItems-TheGeneral'sHeart-45507" value: { - dps: 9958.9332 - tps: 8238.57002 + dps: 7647.27929 + tps: 6222.02013 } } dps_results: { key: "TestFrost-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 8330.09998 - tps: 6909.37358 + dps: 6369.89154 + tps: 5180.72909 } } dps_results: { key: "TestFrost-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10370.42202 - tps: 8612.86208 + dps: 7760.1538 + tps: 6318.09095 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10193.80501 - tps: 8456.0714 + dps: 7706.01629 + tps: 6281.8047 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10193.80501 - tps: 8456.0714 + dps: 7706.01629 + tps: 6281.8047 } } dps_results: { key: "TestFrost-AllItems-TirelessSkyflareDiamond" value: { - dps: 10416.21362 - tps: 8651.03533 + dps: 7798.72055 + tps: 6349.7974 } } dps_results: { key: "TestFrost-AllItems-TirelessStarflareDiamond" value: { - dps: 10407.0553 - tps: 8643.40068 + dps: 7791.0072 + tps: 6343.45611 } } dps_results: { key: "TestFrost-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10182.59441 - tps: 8428.4018 + dps: 7784.88807 + tps: 6332.07288 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10407.0553 - tps: 8643.40068 + dps: 7791.0072 + tps: 6343.45611 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10416.21362 - tps: 8651.03533 + dps: 7798.72055 + tps: 6349.7974 } } dps_results: { key: "TestFrost-AllItems-WingedTalisman-37844" value: { - dps: 10087.92557 - tps: 8354.11362 + dps: 7749.91677 + tps: 6314.13796 } } dps_results: { key: "TestFrost-Average-Default" value: { - dps: 10764.58483 - tps: 8964.95364 + dps: 8088.27706 + tps: 6619.63625 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-FullBuffs-LongMultiTarget" value: { - dps: 10711.01299 - tps: 9396.68721 + dps: 8003.40047 + tps: 6815.93838 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-FullBuffs-LongSingleTarget" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-FullBuffs-ShortSingleTarget" value: { - dps: 13262.35274 - tps: 11087.85859 + dps: 10069.72226 + tps: 8272.31852 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-NoBuffs-LongMultiTarget" value: { - dps: 6619.58455 - tps: 5829.72752 + dps: 4934.56009 + tps: 4284.70346 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-NoBuffs-LongSingleTarget" value: { - dps: 6619.58455 - tps: 5425.96978 + dps: 4934.56009 + tps: 3959.71224 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost-NoBuffs-ShortSingleTarget" value: { - dps: 7672.861 - tps: 6262.85467 + dps: 5551.75709 + tps: 4398.90899 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-FullBuffs-LongMultiTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-FullBuffs-LongMultiTarget" value: { - dps: 815.93075 + dps: 748.90312 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-FullBuffs-LongSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-FullBuffs-LongSingleTarget" value: { - dps: 815.93075 + dps: 748.90312 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-FullBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 1003.60686 + dps: 925.2614 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-NoBuffs-LongMultiTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-NoBuffs-LongMultiTarget" value: { - dps: 600.1266 + dps: 545.77064 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-NoBuffs-LongSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-NoBuffs-LongSingleTarget" value: { - dps: 600.1266 + dps: 545.77064 } } dps_results: { - key: "TestFrost-Settings-Troll-P3Frost-Frost-frost_aoe-NoBuffs-ShortSingleTarget" + key: "TestFrost-Settings-Troll-p3_frost_alliance-Frost-frost_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 747.51322 + dps: 679.92782 } } dps_results: { key: "TestFrost-SwitchInFrontOfTarget-Default" value: { - dps: 10711.01299 - tps: 8921.28474 + dps: 8003.40047 + tps: 6538.31272 } } diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results index e7631fa8bf..9190f9bb89 100644 --- a/sim/mage/TestFrostFire.results +++ b/sim/mage/TestFrostFire.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 303.6 final_stats: 312.4 - final_stats: 1976.15 - final_stats: 1892 - final_stats: 560.56 - final_stats: 4180 + final_stats: 1701.15 + final_stats: 1612.6 + final_stats: 963.248 + final_stats: 3679 final_stats: 109 - final_stats: 217 - final_stats: 2333.34033 - final_stats: 1238 + final_stats: 244 + final_stats: 2355.34914 + final_stats: 702 final_stats: 0 final_stats: 755.7 - final_stats: 217 - final_stats: 1483.08921 - final_stats: 1238 + final_stats: 244 + final_stats: 1216.08921 + final_stats: 702 final_stats: 0 final_stats: 0 - final_stats: 31368 + final_stats: 27177 final_stats: 0 final_stats: 0 - final_stats: 5794.3 + final_stats: 5658.3 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26544.5 + final_stats: 23794.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,766 +46,773 @@ character_stats_results: { dps_results: { key: "TestFrostFire-AllItems-Althor'sAbacus-50359" value: { - dps: 12250.87587 - tps: 9832.70442 + dps: 9562.34372 + tps: 7684.09987 } } dps_results: { key: "TestFrostFire-AllItems-Althor'sAbacus-50366" value: { - dps: 12299.29095 - tps: 9871.07954 + dps: 9604.02054 + tps: 7717.08579 } } dps_results: { key: "TestFrostFire-AllItems-AustereEarthsiegeDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-Bandit'sInsignia-40371" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-BaubleofTrueBlood-50354" value: { - dps: 11858.05634 - tps: 9521.51019 - hps: 102.0626 + dps: 9223.03847 + tps: 7415.39323 + hps: 102.56137 } } dps_results: { key: "TestFrostFire-AllItems-BaubleofTrueBlood-50726" value: { - dps: 11858.05634 - tps: 9521.51019 - hps: 102.0626 + dps: 9223.03847 + tps: 7415.39323 + hps: 102.56137 } } dps_results: { key: "TestFrostFire-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 12257.24517 - tps: 9835.31736 + dps: 9496.57352 + tps: 7633.22995 } } dps_results: { key: "TestFrostFire-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8234.23452 - tps: 6634.44032 + dps: 7027.60059 + tps: 5652.0459 } } dps_results: { key: "TestFrostFire-AllItems-Bloodmage'sRegalia" value: { - dps: 11591.49399 - tps: 9323.9964 + dps: 10215.58495 + tps: 8215.00489 } } dps_results: { key: "TestFrostFire-AllItems-BracingEarthsiegeDiamond" value: { - dps: 12247.78334 - tps: 9631.99488 + dps: 9532.83288 + tps: 7510.4163 } } dps_results: { key: "TestFrostFire-AllItems-ChaoticSkyflareDiamond" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { key: "TestFrostFire-AllItems-CorpseTongueCoin-50349" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-CorpseTongueCoin-50352" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 hps: 64 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 12081.52577 - tps: 9702.14193 + dps: 9487.22175 + tps: 7628.56589 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Death-42990" value: { - dps: 12094.29474 - tps: 9726.41669 + dps: 9430.9809 + tps: 7595.1954 } } dps_results: { key: "TestFrostFire-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 12029.26164 - tps: 9659.92812 + dps: 9397.16729 + tps: 7558.01373 } } dps_results: { key: "TestFrostFire-AllItems-Death'sChoice-47464" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 11906.79395 - tps: 9560.80516 + dps: 9316.16644 + tps: 7492.82962 } } dps_results: { key: "TestFrostFire-AllItems-Deathbringer'sWill-50362" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-Deathbringer'sWill-50363" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-Defender'sCode-40257" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-DestructiveSkyflareDiamond" value: { - dps: 12283.13285 - tps: 9856.03654 + dps: 9504.69524 + tps: 7639.87102 + } +} +dps_results: { + key: "TestFrostFire-AllItems-DislodgedForeignObject-50348" + value: { + dps: 10146.92944 + tps: 8156.52638 } } dps_results: { key: "TestFrostFire-AllItems-DislodgedForeignObject-50353" value: { - dps: 12547.19411 - tps: 10071.4165 + dps: 10115.91285 + tps: 8134.55374 } } dps_results: { key: "TestFrostFire-AllItems-EffulgentSkyflareDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-EmberSkyflareDiamond" value: { - dps: 12285.92046 - tps: 9856.60644 + dps: 9561.78582 + tps: 7684.89568 } } dps_results: { key: "TestFrostFire-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 12250.55659 - tps: 9831.28865 + dps: 9496.57061 + tps: 7633.27904 } } dps_results: { key: "TestFrostFire-AllItems-EnigmaticStarflareDiamond" value: { - dps: 12232.52683 - tps: 9816.24829 + dps: 9485.07211 + tps: 7623.77146 } } dps_results: { key: "TestFrostFire-AllItems-EphemeralSnowflake-50260" value: { - dps: 12119.81938 - tps: 9733.80836 + dps: 9438.52344 + tps: 7587.18408 } } dps_results: { key: "TestFrostFire-AllItems-EssenceofGossamer-37220" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-EternalEarthsiegeDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 12086.22026 - tps: 9716.53556 + dps: 9498.48399 + tps: 7648.5069 } } dps_results: { key: "TestFrostFire-AllItems-EyeoftheBroodmother-45308" value: { - dps: 12380.15207 - tps: 9940.78415 + dps: 9677.3216 + tps: 7780.44828 } } dps_results: { key: "TestFrostFire-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 11810.24503 - tps: 9485.79476 + dps: 9257.66051 + tps: 7444.19784 } } dps_results: { key: "TestFrostFire-AllItems-ForethoughtTalisman-40258" value: { - dps: 12101.22928 - tps: 9714.09041 + dps: 9433.52445 + tps: 7582.14339 } } dps_results: { key: "TestFrostFire-AllItems-ForgeEmber-37660" value: { - dps: 12216.11668 - tps: 9808.18444 + dps: 9535.72601 + tps: 7669.52428 } } dps_results: { key: "TestFrostFire-AllItems-ForlornSkyflareDiamond" value: { - dps: 12247.78334 - tps: 9827.07873 + dps: 9532.83288 + tps: 7662.33215 } } dps_results: { key: "TestFrostFire-AllItems-ForlornStarflareDiamond" value: { - dps: 12236.96593 - tps: 9818.50676 + dps: 9523.41889 + tps: 7654.88233 } } dps_results: { key: "TestFrostFire-AllItems-FrostfireGarb" value: { - dps: 8612.32654 - tps: 6922.27577 + dps: 7337.87319 + tps: 5899.70568 } } dps_results: { key: "TestFrostFire-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-FuturesightRune-38763" value: { - dps: 12040.53678 - tps: 9665.99644 + dps: 9411.31069 + tps: 7565.06931 } } dps_results: { key: "TestFrostFire-AllItems-Gladiator'sRegalia" value: { - dps: 9036.77652 - tps: 7250.32554 + dps: 7772.83294 + tps: 6237.34336 } } dps_results: { key: "TestFrostFire-AllItems-GlowingTwilightScale-54573" value: { - dps: 12275.08341 - tps: 9851.89198 + dps: 9583.18213 + tps: 7700.59283 } } dps_results: { key: "TestFrostFire-AllItems-GlowingTwilightScale-54589" value: { - dps: 12330.10054 - tps: 9895.50007 + dps: 9630.54215 + tps: 7738.07683 } } dps_results: { key: "TestFrostFire-AllItems-GnomishLightningGenerator-41121" value: { - dps: 11992.78935 - tps: 9639.51971 + dps: 9425.64352 + tps: 7585.32026 } } dps_results: { key: "TestFrostFire-AllItems-Heartpierce-49982" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { key: "TestFrostFire-AllItems-Heartpierce-50641" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { key: "TestFrostFire-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 12281.08251 - tps: 9858.15784 + dps: 9588.13938 + tps: 7705.9914 } } dps_results: { key: "TestFrostFire-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 12250.55659 - tps: 9831.28865 + dps: 9496.57061 + tps: 7633.27904 } } dps_results: { key: "TestFrostFire-AllItems-ImpassiveStarflareDiamond" value: { - dps: 12232.52683 - tps: 9816.24829 + dps: 9485.07211 + tps: 7623.77146 } } dps_results: { key: "TestFrostFire-AllItems-IncisorFragment-37723" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 12225.90731 - tps: 9815.62239 + dps: 9499.44783 + tps: 7640.80781 } } dps_results: { key: "TestFrostFire-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-Khadgar'sRegalia" value: { - dps: 9470.09131 - tps: 7612.32407 + dps: 8066.26558 + tps: 6487.90939 } } dps_results: { key: "TestFrostFire-AllItems-KirinTorGarb" value: { - dps: 9533.91609 - tps: 7654.60565 + dps: 8311.02477 + tps: 6675.41679 } } dps_results: { key: "TestFrostFire-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-MajesticDragonFigurine-40430" value: { - dps: 12138.58829 - tps: 9748.41149 + dps: 9495.83781 + tps: 7633.7993 } } dps_results: { key: "TestFrostFire-AllItems-MeteoriteWhetstone-37390" value: { - dps: 12006.11016 - tps: 9640.35564 + dps: 9383.60362 + tps: 7547.94765 } } dps_results: { key: "TestFrostFire-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 12126.61667 - tps: 9735.28989 + dps: 9508.57264 + tps: 7642.07353 } } dps_results: { key: "TestFrostFire-AllItems-Nibelung-49992" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { key: "TestFrostFire-AllItems-Nibelung-50648" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { key: "TestFrostFire-AllItems-OfferingofSacrifice-37638" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-PersistentEarthshatterDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedScarab-21685" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-PurifiedShardoftheGods" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-ReignoftheDead-47316" value: { - dps: 12441.36877 - tps: 10042.37278 + dps: 9908.10155 + tps: 8012.20511 } } dps_results: { key: "TestFrostFire-AllItems-ReignoftheDead-47477" value: { - dps: 12514.67202 - tps: 10107.46925 + dps: 9974.61188 + tps: 8071.49456 } } dps_results: { key: "TestFrostFire-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 12584.39452 - tps: 10097.89287 + dps: 9794.50881 + tps: 7873.26358 } } dps_results: { key: "TestFrostFire-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 12198.44833 - tps: 9786.50286 + dps: 9485.64245 + tps: 7624.80454 } } dps_results: { key: "TestFrostFire-AllItems-RuneofRepulsion-40372" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-SealofthePantheon-36993" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-ShinyShardoftheGods" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-SliverofPureIce-50339" value: { - dps: 12204.56094 - tps: 9801.55501 + dps: 9522.52299 + tps: 7657.99674 } } dps_results: { key: "TestFrostFire-AllItems-SliverofPureIce-50346" value: { - dps: 12248.57464 - tps: 9837.12482 + dps: 9560.38696 + tps: 7688.36536 } } dps_results: { key: "TestFrostFire-AllItems-SoulPreserver-37111" value: { - dps: 12022.00461 - tps: 9651.29475 + dps: 9365.32601 + tps: 7528.16642 } } dps_results: { key: "TestFrostFire-AllItems-SouloftheDead-40382" value: { - dps: 12096.54039 - tps: 9723.91573 + dps: 9428.57002 + tps: 7588.63501 } } dps_results: { key: "TestFrostFire-AllItems-SparkofLife-37657" value: { - dps: 12131.1227 - tps: 9741.64161 + dps: 9377.7679 + tps: 7537.12114 } } dps_results: { key: "TestFrostFire-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 12185.14495 - tps: 9782.52615 + dps: 9508.73814 + tps: 7644.77631 } } dps_results: { key: "TestFrostFire-AllItems-SwiftSkyflareDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-SwiftStarflareDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-SwiftWindfireDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 11948.56415 - tps: 9594.76431 + dps: 9339.66998 + tps: 7512.57727 } } dps_results: { key: "TestFrostFire-AllItems-TearsoftheVanquished-47215" value: { - dps: 11918.00761 - tps: 9569.85938 + dps: 9318.25477 + tps: 7494.13458 } } dps_results: { key: "TestFrostFire-AllItems-TempestRegalia" value: { - dps: 6330.94076 - tps: 5109.18479 + dps: 5590.77347 + tps: 4499.43665 } } dps_results: { key: "TestFrostFire-AllItems-TheGeneral'sHeart-45507" value: { - dps: 11856.95322 - tps: 9520.47048 + dps: 9223.24593 + tps: 7415.71442 } } dps_results: { key: "TestFrostFire-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 9661.85908 - tps: 7791.63706 + dps: 7718.40193 + tps: 6224.33875 } } dps_results: { key: "TestFrostFire-AllItems-ThunderingSkyflareDiamond" value: { - dps: 12193.69631 - tps: 9784.21889 + dps: 9485.76293 + tps: 7625.08304 } } dps_results: { key: "TestFrostFire-AllItems-TinyAbominationinaJar-50351" value: { - dps: 12364.30693 - tps: 9926.91739 + dps: 9618.7568 + tps: 7732.01119 } } dps_results: { key: "TestFrostFire-AllItems-TinyAbominationinaJar-50706" value: { - dps: 12364.30693 - tps: 9926.91739 + dps: 9618.7568 + tps: 7732.01119 } } dps_results: { key: "TestFrostFire-AllItems-TirelessSkyflareDiamond" value: { - dps: 12247.78334 - tps: 9827.07873 + dps: 9532.83288 + tps: 7662.33215 } } dps_results: { key: "TestFrostFire-AllItems-TirelessStarflareDiamond" value: { - dps: 12236.96593 - tps: 9818.50676 + dps: 9523.41889 + tps: 7654.88233 } } dps_results: { key: "TestFrostFire-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 12160.61328 - tps: 9760.66557 + dps: 9487.77099 + tps: 7626.95792 } } dps_results: { key: "TestFrostFire-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 12236.96593 - tps: 9818.50676 + dps: 9523.41889 + tps: 7654.88233 } } dps_results: { key: "TestFrostFire-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 12247.78334 - tps: 9827.07873 + dps: 9532.83288 + tps: 7662.33215 } } dps_results: { key: "TestFrostFire-AllItems-WingedTalisman-37844" value: { - dps: 12031.15015 - tps: 9659.82802 + dps: 9376.55999 + tps: 7538.36566 } } dps_results: { key: "TestFrostFire-Average-Default" value: { - dps: 12733.71708 - tps: 10222.28234 + dps: 9826.5867 + tps: 7898.95933 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-FullBuffs-LongMultiTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-FullBuffs-LongMultiTarget" value: { - dps: 16887.37419 - tps: 15778.72323 + dps: 13394.92444 + tps: 12495.80791 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-FullBuffs-LongSingleTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-FullBuffs-LongSingleTarget" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-FullBuffs-ShortSingleTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-FullBuffs-ShortSingleTarget" value: { - dps: 14776.82451 - tps: 11771.18552 + dps: 11145.59295 + tps: 8857.80645 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-NoBuffs-LongMultiTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-NoBuffs-LongMultiTarget" value: { - dps: 10065.05137 - tps: 10250.95543 + dps: 7866.71971 + tps: 7896.46858 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-NoBuffs-LongSingleTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-NoBuffs-LongSingleTarget" value: { - dps: 6265.245 - tps: 5042.8232 + dps: 5394.83308 + tps: 4353.82971 } } dps_results: { - key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-frostfire-NoBuffs-ShortSingleTarget" + key: "TestFrostFire-Settings-Troll-p3_ffb_alliance-Fire-frostfire-NoBuffs-ShortSingleTarget" value: { - dps: 7917.8638 - tps: 6267.47312 + dps: 5850.55156 + tps: 4617.93916 } } dps_results: { key: "TestFrostFire-SwitchInFrontOfTarget-Default" value: { - dps: 12644.44887 - tps: 10147.51786 + dps: 9806.18211 + tps: 7882.15261 } } diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index 0fd7234076..3f9e9b4145 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -17,7 +17,7 @@ func TestArcane(t *testing.T) { Class: proto.Class_ClassMage, Race: proto.Race_RaceTroll, - GearSet: core.GearSetCombo{Label: "P3Arcane", GearSet: P3ArcaneGear}, + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_arcane_alliance"), Talents: ArcaneTalents, Glyphs: ArcaneGlyphs, Consumes: FullArcaneConsumes, @@ -36,7 +36,7 @@ func TestFire(t *testing.T) { Class: proto.Class_ClassMage, Race: proto.Race_RaceTroll, - GearSet: core.GearSetCombo{Label: "P3Fire", GearSet: P3FireGear}, + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_fire_alliance"), Talents: FireTalents, Glyphs: FireGlyphs, Consumes: FullFireConsumes, @@ -55,7 +55,7 @@ func TestFrostFire(t *testing.T) { Class: proto.Class_ClassMage, Race: proto.Race_RaceTroll, - GearSet: core.GearSetCombo{Label: "P3FrostFire", GearSet: P3FireGear}, + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_ffb_alliance"), Talents: FrostFireTalents, Glyphs: FrostFireGlyphs, Consumes: FullFireConsumes, @@ -71,7 +71,7 @@ func TestFrost(t *testing.T) { Class: proto.Class_ClassMage, Race: proto.Race_RaceTroll, - GearSet: core.GearSetCombo{Label: "P3Frost", GearSet: P3FrostGear}, + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p3_frost_alliance"), Talents: FrostTalents, Glyphs: FrostGlyphs, Consumes: FullFrostConsumes, @@ -158,25 +158,3 @@ var FullFireConsumes = &proto.Consumes{ var FullFrostConsumes = FullFireConsumes var FullArcaneConsumes = FullFireConsumes - -var P3FireGear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40153]}, - {"id":50628,"enchant":3722,"gems":[40153]}, - {"id":51283,"enchant":3832,"gems":[40113,40133]}, - {"id":54582,"enchant":2332,"gems":[40155,0]}, - {"id":50722,"enchant":3604,"gems":[40153,40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40153]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40153]}, - {"id":47188}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40153]} -]}`) -var P3FrostGear = P3FireGear -var P3ArcaneGear = P3FireGear diff --git a/sim/paladin/holy/TestHoly.results b/sim/paladin/holy/TestHoly.results index aebedd54b9..50e6c577ba 100644 --- a/sim/paladin/holy/TestHoly.results +++ b/sim/paladin/holy/TestHoly.results @@ -547,51 +547,51 @@ dps_results: { value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-FullBuffs-LongMultiTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-FullBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-FullBuffs-LongSingleTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-FullBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-FullBuffs-ShortSingleTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-FullBuffs-ShortSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-NoBuffs-LongMultiTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-NoBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-NoBuffs-LongSingleTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-NoBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-BloodElf-P1-Basic-Default-NoBuffs-ShortSingleTarget" + key: "TestHoly-Settings-BloodElf-p1-Basic-Default-NoBuffs-ShortSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-FullBuffs-LongMultiTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-FullBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-FullBuffs-LongSingleTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-FullBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-FullBuffs-ShortSingleTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-FullBuffs-ShortSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-NoBuffs-LongMultiTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-NoBuffs-LongMultiTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-NoBuffs-LongSingleTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-NoBuffs-LongSingleTarget" value: {} } dps_results: { - key: "TestHoly-Settings-Human-P1-Basic-Default-NoBuffs-ShortSingleTarget" + key: "TestHoly-Settings-Human-p1-Basic-Default-NoBuffs-ShortSingleTarget" value: {} } dps_results: { diff --git a/sim/paladin/holy/holy_test.go b/sim/paladin/holy/holy_test.go index 8cf2e9cb88..81bbcf1835 100644 --- a/sim/paladin/holy/holy_test.go +++ b/sim/paladin/holy/holy_test.go @@ -18,7 +18,7 @@ func TestHoly(t *testing.T) { Race: proto.Race_RaceBloodElf, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/holy_paladin/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -49,7 +49,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceBloodElf, Class: proto.Class_ClassPaladin, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/holy_paladin/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: BasicOptions, TalentsString: StandardTalents, @@ -106,23 +106,3 @@ var DefaultRotation = core.APLRotationFromJsonString(`{ {"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} -]}`) diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 8c21e8e41c..c26088d21b 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -910,252 +910,252 @@ dps_results: { } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 10375.07714 tps: 27835.71812 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 2946.48266 tps: 7005.01894 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 3181.85593 tps: 7528.0141 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 3005.78006 tps: 8743.75503 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 1412.45675 tps: 3421.27435 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 1595.15114 tps: 3882.79459 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 9291.2557 tps: 25044.54325 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 2974.38828 tps: 7081.47024 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 3181.02628 tps: 7530.50826 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 2496.96317 tps: 7431.6853 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 1373.04785 tps: 3318.6302 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 1560.42529 tps: 3788.26189 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 10233.63769 tps: 27462.61742 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 3276.6828 tps: 7856.39816 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 3412.25885 tps: 8136.77248 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 2953.89002 tps: 8609.31036 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 1553.86753 tps: 3785.55397 } } dps_results: { - key: "TestProtection-Settings-BloodElf-P1-Protection Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-BloodElf-p1-Protection Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 1718.87059 tps: 4201.87948 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 10095.13958 tps: 27075.19978 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 2923.26782 tps: 6942.83459 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 3185.20366 tps: 7535.54302 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 2949.55916 tps: 8550.73924 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 1408.01728 tps: 3406.22256 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 1553.95261 tps: 3770.02763 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 9098.94879 tps: 24507.58607 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 2941.4957 tps: 6995.17776 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 3184.67078 tps: 7538.71366 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 2436.38027 tps: 7237.77757 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 1360.69881 tps: 3286.92397 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 1537.46619 tps: 3728.30209 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 9942.66221 tps: 26670.75909 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 3262.95316 tps: 7817.60742 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 3416.12151 tps: 8145.54042 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 2904.01714 tps: 8432.84218 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 1539.91246 tps: 3745.85622 } } dps_results: { - key: "TestProtection-Settings-Human-P1-Protection Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestProtection-Settings-Human-p1-Protection Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 1671.15076 tps: 4074.9337 diff --git a/sim/paladin/protection/protection_test.go b/sim/paladin/protection/protection_test.go index fb6bc1d99f..dcfb1f388e 100644 --- a/sim/paladin/protection/protection_test.go +++ b/sim/paladin/protection/protection_test.go @@ -18,7 +18,7 @@ func TestProtection(t *testing.T) { Race: proto.Race_RaceBloodElf, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/protection_paladin/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -77,7 +77,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceBloodElf, Class: proto.Class_ClassPaladin, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/protection_paladin/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: DefaultOptions, Buffs: core.FullIndividualBuffs, @@ -128,23 +128,3 @@ var FullConsumes = &proto.Consumes{ PrepopPotion: proto.Potions_IndestructiblePotion, DefaultConjured: proto.Conjured_ConjuredDarkRune, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40581,"enchant":3818,"gems":[41380,36767]}, - {"id":40387}, - {"id":40584,"enchant":3852,"gems":[40008]}, - {"id":40410,"enchant":3605}, - {"id":40579,"enchant":3832,"gems":[36767,40022]}, - {"id":39764,"enchant":3850,"gems":[0]}, - {"id":40580,"enchant":3860,"gems":[40008,0]}, - {"id":39759,"enchant":3601,"gems":[40008,40008]}, - {"id":40589,"enchant":3822}, - {"id":39717,"enchant":3606,"gems":[40089]}, - {"id":40718}, - {"id":40107}, - {"id":44063,"gems":[36767,40089]}, - {"id":37220}, - {"id":40345,"enchant":3788}, - {"id":40400,"enchant":3849}, - {"id":40707} -]}`) diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index fe5f218d29..606ac5d4a9 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1056,7 +1056,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 18971.11574 tps: 20683.21538 @@ -1064,7 +1064,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 5489.1527 tps: 5574.62494 @@ -1072,7 +1072,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 6210.29551 tps: 6301.47989 @@ -1080,28 +1080,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 9637.17268 tps: 11227.77451 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 2840.7199 tps: 2920.93472 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 3117.48943 tps: 3201.81555 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 16959.3136 tps: 18671.09917 @@ -1109,7 +1109,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 5850.91138 tps: 5936.46432 @@ -1117,7 +1117,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 6639.8539 tps: 6730.42194 @@ -1125,28 +1125,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 8452.39789 tps: 10054.05795 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 2909.45187 tps: 2989.09547 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 3200.22801 tps: 3284.0232 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" value: { dps: 18990.20013 tps: 20698.36129 @@ -1154,7 +1154,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" value: { dps: 6660.95491 tps: 6746.43932 @@ -1162,7 +1162,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" value: { dps: 7368.71073 tps: 7459.48078 @@ -1170,28 +1170,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" value: { dps: 9473.00918 tps: 11060.68167 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" value: { dps: 3419.68819 tps: 3498.9876 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" value: { dps: 3662.89865 tps: 3744.33205 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 18990.20013 tps: 20698.36129 @@ -1199,7 +1199,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 6660.95491 tps: 6746.43932 @@ -1207,7 +1207,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 7368.71073 tps: 7459.48078 @@ -1215,28 +1215,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 9473.00918 tps: 11060.68167 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 3419.68819 tps: 3498.9876 } } dps_results: { - key: "TestRetribution-Settings-BloodElf-P1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-BloodElf-p1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 3662.89865 tps: 3744.33205 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 19094.51277 tps: 20786.21603 @@ -1244,7 +1244,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 5499.58746 tps: 5584.09355 @@ -1252,7 +1252,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 6214.23027 tps: 6305.4116 @@ -1260,28 +1260,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 9424.10193 tps: 10971.88085 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 2790.79043 tps: 2868.8458 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 3125.9593 tps: 3210.43205 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 17082.97172 tps: 18775.69464 @@ -1289,7 +1289,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 5865.04094 tps: 5949.58524 @@ -1297,7 +1297,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 6652.43061 tps: 6743.01944 @@ -1305,28 +1305,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 8337.63798 tps: 9899.84386 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 2890.17689 tps: 2968.59111 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 3214.61551 tps: 3298.85025 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" value: { dps: 19116.6762 tps: 20802.06273 @@ -1334,7 +1334,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" value: { dps: 6674.2038 tps: 6758.63756 @@ -1342,7 +1342,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" value: { dps: 7378.0797 tps: 7468.87098 @@ -1350,28 +1350,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" value: { dps: 9342.19849 tps: 10893.93201 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" value: { dps: 3391.68596 tps: 3469.06026 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" value: { dps: 3673.13865 tps: 3754.49899 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 19116.6762 tps: 20802.06273 @@ -1379,7 +1379,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 6674.2038 tps: 6758.63756 @@ -1387,7 +1387,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 7378.0797 tps: 7468.87098 @@ -1395,28 +1395,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 9342.19849 tps: 10893.93201 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 3391.68596 tps: 3469.06026 } } dps_results: { - key: "TestRetribution-Settings-Draenei-P1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Draenei-p1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 3673.13865 tps: 3754.49899 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 19007.05325 tps: 20699.64856 @@ -1424,7 +1424,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 5494.87026 tps: 5579.40444 @@ -1432,7 +1432,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 6210.46818 tps: 6301.68511 @@ -1440,28 +1440,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 9411.67633 tps: 10974.90771 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 2802.29988 tps: 2881.0583 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 3120.24146 tps: 3204.5678 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 16991.85853 tps: 18683.85693 @@ -1469,7 +1469,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 5861.92664 tps: 5946.50542 @@ -1477,7 +1477,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 6648.52672 tps: 6739.12247 @@ -1485,28 +1485,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 8245.79635 tps: 9813.64143 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 2864.82239 tps: 2942.63976 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 3209.75742 tps: 3293.55282 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" value: { dps: 19032.13072 tps: 20717.20345 @@ -1514,7 +1514,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" value: { dps: 6672.46181 tps: 6756.8892 @@ -1522,7 +1522,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" value: { dps: 7376.56743 tps: 7467.36579 @@ -1530,28 +1530,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" value: { dps: 9275.42904 tps: 10834.63258 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" value: { dps: 3391.62729 tps: 3469.40805 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" value: { dps: 3669.21489 tps: 3750.64852 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 19032.13072 tps: 20717.20345 @@ -1559,7 +1559,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 6672.46181 tps: 6756.8892 @@ -1567,7 +1567,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 7376.56743 tps: 7467.36579 @@ -1575,28 +1575,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 9275.42904 tps: 10834.63258 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 3391.62729 tps: 3469.40805 } } dps_results: { - key: "TestRetribution-Settings-Dwarf-P1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Dwarf-p1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 3669.21489 tps: 3750.64852 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-FullBuffs-LongMultiTarget" value: { dps: 18985.06088 tps: 20677.49648 @@ -1604,7 +1604,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-FullBuffs-LongSingleTarget" value: { dps: 5491.40167 tps: 5575.92765 @@ -1612,7 +1612,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-FullBuffs-ShortSingleTarget" value: { dps: 6209.29437 tps: 6300.50316 @@ -1620,28 +1620,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-NoBuffs-LongMultiTarget" value: { dps: 9412.80036 tps: 10973.17542 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-NoBuffs-LongSingleTarget" value: { dps: 2792.76182 tps: 2870.95267 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOC-default-NoBuffs-ShortSingleTarget" value: { dps: 3116.88825 tps: 3201.21454 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-FullBuffs-LongMultiTarget" value: { dps: 16972.62629 tps: 18664.47041 @@ -1649,7 +1649,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-FullBuffs-LongSingleTarget" value: { dps: 5855.17061 tps: 5939.7422 @@ -1657,7 +1657,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-FullBuffs-ShortSingleTarget" value: { dps: 6642.34837 tps: 6732.93719 @@ -1665,28 +1665,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-NoBuffs-LongMultiTarget" value: { dps: 8240.84027 tps: 9802.46029 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-NoBuffs-LongSingleTarget" value: { dps: 2869.0432 tps: 2947.12054 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOR-default-NoBuffs-ShortSingleTarget" value: { dps: 3203.80154 tps: 3287.59689 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongMultiTarget" value: { dps: 19005.65797 tps: 20690.6051 @@ -1694,7 +1694,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-LongSingleTarget" value: { dps: 6664.20207 tps: 6748.62327 @@ -1702,7 +1702,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-FullBuffs-ShortSingleTarget" value: { dps: 7370.40693 tps: 7461.19821 @@ -1710,28 +1710,28 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongMultiTarget" value: { dps: 9283.36282 tps: 10831.5079 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-LongSingleTarget" value: { dps: 3382.3599 tps: 3459.75617 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV 2 Target Swapping-default-NoBuffs-ShortSingleTarget" value: { dps: 3662.94515 tps: 3744.37872 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-FullBuffs-LongMultiTarget" value: { dps: 19005.65797 tps: 20690.6051 @@ -1739,7 +1739,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-FullBuffs-LongSingleTarget" value: { dps: 6664.20207 tps: 6748.62327 @@ -1747,7 +1747,7 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-FullBuffs-ShortSingleTarget" value: { dps: 7370.40693 tps: 7461.19821 @@ -1755,21 +1755,21 @@ dps_results: { } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-NoBuffs-LongMultiTarget" value: { dps: 9283.36282 tps: 10831.5079 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-NoBuffs-LongSingleTarget" value: { dps: 3382.3599 tps: 3459.75617 } } dps_results: { - key: "TestRetribution-Settings-Human-P1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" + key: "TestRetribution-Settings-Human-p1-Retribution Paladin SOV-default-NoBuffs-ShortSingleTarget" value: { dps: 3662.94515 tps: 3744.37872 diff --git a/sim/paladin/retribution/retribution_test.go b/sim/paladin/retribution/retribution_test.go index e858551a95..b4eb5a47ce 100644 --- a/sim/paladin/retribution/retribution_test.go +++ b/sim/paladin/retribution/retribution_test.go @@ -18,7 +18,7 @@ func TestRetribution(t *testing.T) { Race: proto.Race_RaceBloodElf, OtherRaces: []proto.Race{proto.Race_RaceHuman, proto.Race_RaceDraenei, proto.Race_RaceDwarf}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: Phase1Gear}, + GearSet: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -96,7 +96,7 @@ func BenchmarkSimulate(b *testing.B) { Class: proto.Class_ClassPaladin, TalentsString: StandardTalents, Glyphs: StandardGlyphs, - Equipment: Phase1Gear, + Equipment: core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: DefaultOptions, Buffs: core.FullIndividualBuffs, @@ -144,23 +144,3 @@ var FullConsumes = &proto.Consumes{ Food: proto.Food_FoodRoastedClefthoof, ThermalSapper: true, } - -var Phase1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":44006,"enchant":3817,"gems":[41398,49110]}, - {"id":44664,"gems":[42142]}, - {"id":40578,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3605}, - {"id":40574,"enchant":3832,"gems":[42142,39996]}, - {"id":40330,"enchant":3845,"gems":[39996,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40278,"gems":[39996,39996]}, - {"id":44011,"enchant":3823,"gems":[42142,39996]}, - {"id":40591,"enchant":3606}, - {"id":40075}, - {"id":40474}, - {"id":42987}, - {"id":40431}, - {"id":40384,"enchant":3789}, - {}, - {"id":42852} -]}`) diff --git a/sim/priest/healing/TestDisc.results b/sim/priest/healing/TestDisc.results index 511e7569b1..a57d5dc3b3 100644 --- a/sim/priest/healing/TestDisc.results +++ b/sim/priest/healing/TestDisc.results @@ -859,42 +859,42 @@ dps_results: { } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-FullBuffs-LongMultiTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-FullBuffs-LongMultiTarget" value: { tps: 342.42388 hps: 3766.83285 } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-FullBuffs-LongSingleTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-FullBuffs-LongSingleTarget" value: { tps: 17.12119 hps: 3766.83285 } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-FullBuffs-ShortSingleTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-FullBuffs-ShortSingleTarget" value: { tps: 18.9551 hps: 3705.11041 } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-NoBuffs-LongMultiTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-NoBuffs-LongMultiTarget" value: { tps: 371.54798 hps: 3123.50578 } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-NoBuffs-LongSingleTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-NoBuffs-LongSingleTarget" value: { tps: 18.5774 hps: 3123.50578 } } dps_results: { - key: "TestDisc-Settings-Undead-P1-Disc-disc-NoBuffs-ShortSingleTarget" + key: "TestDisc-Settings-Undead-p1_disc-Disc-disc-NoBuffs-ShortSingleTarget" value: { tps: 18.18625 hps: 3055.92036 diff --git a/sim/priest/healing/TestHoly.results b/sim/priest/healing/TestHoly.results index 65ff43b36a..b4925f13ba 100644 --- a/sim/priest/healing/TestHoly.results +++ b/sim/priest/healing/TestHoly.results @@ -1,27 +1,27 @@ character_stats_results: { key: "TestHoly-CharacterStats-Default" value: { - final_stats: 309.1 - final_stats: 316.8 - final_stats: 1316.172 - final_stats: 1204.5 - final_stats: 780.78 - final_stats: 3341.195 - final_stats: 325 + final_stats: 320.1 + final_stats: 327.8 + final_stats: 1320.748 + final_stats: 1491.6 + final_stats: 908.985 + final_stats: 2910.24625 + final_stats: 268 final_stats: 0 - final_stats: 991.10116 - final_stats: 168 + final_stats: 953.17881 + final_stats: 386 final_stats: 0 final_stats: 843.7 final_stats: 0 - final_stats: 748.3503 - final_stats: 168 + final_stats: 631.3503 + final_stats: 386 final_stats: 0 final_stats: 0 - final_stats: 21650.5 + final_stats: 25957 final_stats: 0 final_stats: 0 - final_stats: 8965.1 + final_stats: 8981.1 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 19941.72 + final_stats: 19987.48 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,935 +46,927 @@ character_stats_results: { dps_results: { key: "TestHoly-AllItems-AbsolutionRegalia" value: { - dps: 91.89253 - tps: 38.67518 - hps: 3753.56005 + dps: 87.12967 + tps: 48.5365 + hps: 3633.41402 } } dps_results: { key: "TestHoly-AllItems-Althor'sAbacus-50359" value: { - dps: 113.195 - tps: 44.74666 - hps: 5500.90377 + dps: 103.98612 + tps: 56.14018 + hps: 5391.0722 } } dps_results: { key: "TestHoly-AllItems-Althor'sAbacus-50366" value: { - dps: 113.82822 - tps: 44.74666 - hps: 5544.57512 + dps: 104.61933 + tps: 56.14018 + hps: 5436.21953 } } dps_results: { key: "TestHoly-AllItems-AustereEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-Bandit'sInsignia-40371" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-BaubleofTrueBlood-50354" value: { - dps: 108.04296 - tps: 44.72899 - hps: 5223.21199 + dps: 98.83407 + tps: 55.95466 + hps: 5105.78996 } } dps_results: { key: "TestHoly-AllItems-BaubleofTrueBlood-50726" value: { - dps: 108.04296 - tps: 44.72899 - hps: 5223.21199 + dps: 98.83407 + tps: 55.95466 + hps: 5105.78996 } } dps_results: { key: "TestHoly-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.79766 - hps: 5289.00758 + dps: 98.83407 + tps: 61.80257 + hps: 5243.10114 } } dps_results: { key: "TestHoly-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 95.56166 - tps: 44.98616 - hps: 4274.31984 + dps: 89.23853 + tps: 49.06008 + hps: 4009.75185 } } dps_results: { key: "TestHoly-AllItems-BracingEarthsiegeDiamond" value: { - dps: 111.95736 - tps: 41.63862 - hps: 5274.90321 + dps: 99.55363 + tps: 61.30402 + hps: 5228.98951 } } dps_results: { key: "TestHoly-AllItems-ChaoticSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.58837 - hps: 5257.70757 + dps: 98.83407 + tps: 61.30402 + hps: 5202.98543 } } dps_results: { key: "TestHoly-AllItems-CorpseTongueCoin-50349" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-CorpseTongueCoin-50352" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5209.19129 + dps: 98.83407 + tps: 54.76384 + hps: 5055.2512 } } dps_results: { key: "TestHoly-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 114.88597 - tps: 52.49781 - hps: 6182.29604 + dps: 108.73046 + tps: 63.73045 + hps: 5846.40602 } } dps_results: { key: "TestHoly-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 120.04569 - tps: 45.23595 - hps: 5340.0344 + dps: 113.35971 + tps: 66.28564 + hps: 5486.62923 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Death-42990" value: { - dps: 108.04296 - tps: 44.4186 - hps: 5186.94854 + dps: 98.83407 + tps: 54.76384 + hps: 5016.44368 } } dps_results: { key: "TestHoly-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 108.04296 - tps: 48.42908 - hps: 5322.24412 + dps: 98.83407 + tps: 52.20173 + hps: 5171.48014 } } dps_results: { key: "TestHoly-AllItems-Death'sChoice-47464" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 108.04296 - tps: 44.40182 - hps: 5162.96591 + dps: 98.83407 + tps: 54.76384 + hps: 5000.79593 } } dps_results: { key: "TestHoly-AllItems-Deathbringer'sWill-50362" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-Deathbringer'sWill-50363" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-Defender'sCode-40257" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-DestructiveSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.67699 - hps: 5265.35877 + dps: 98.83407 + tps: 61.30402 + hps: 5204.49678 } } dps_results: { key: "TestHoly-AllItems-DislodgedForeignObject-50348" value: { - dps: 108.04296 - tps: 44.83838 - hps: 5155.44525 + dps: 98.83407 + tps: 55.02095 + hps: 4994.432 } } dps_results: { key: "TestHoly-AllItems-DislodgedForeignObject-50353" value: { - dps: 108.04296 - tps: 44.78928 - hps: 5156.33283 + dps: 98.83407 + tps: 54.73392 + hps: 4989.41132 } } dps_results: { key: "TestHoly-AllItems-EffulgentSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-EmberSkyflareDiamond" value: { - dps: 111.95736 - tps: 41.76961 - hps: 5314.90254 + dps: 99.55363 + tps: 61.68547 + hps: 5271.311 } } dps_results: { key: "TestHoly-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.58837 - hps: 5257.70757 + dps: 98.83407 + tps: 61.30402 + hps: 5202.98543 } } dps_results: { key: "TestHoly-AllItems-EnigmaticStarflareDiamond" value: { - dps: 111.2378 - tps: 41.58837 - hps: 5256.44957 + dps: 98.83407 + tps: 61.30402 + hps: 5202.18171 } } dps_results: { key: "TestHoly-AllItems-EphemeralSnowflake-50260" value: { - dps: 108.04296 - tps: 50.44445 - hps: 5294.61582 + dps: 98.83407 + tps: 58.13109 + hps: 5060.58655 } } dps_results: { key: "TestHoly-AllItems-EssenceofGossamer-37220" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-EternalEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 108.04296 - tps: 44.4186 - hps: 5193.94092 + dps: 98.83407 + tps: 54.76384 + hps: 5023.54843 } } dps_results: { key: "TestHoly-AllItems-EyeoftheBroodmother-45308" value: { - dps: 111.78467 - tps: 44.4186 - hps: 5334.89498 + dps: 102.57578 + tps: 54.76384 + hps: 5167.35725 } } dps_results: { - key: "TestHoly-AllItems-Figurine-SapphireOwl-42413" + key: "TestHoly-AllItems-ForethoughtTalisman-40258" value: { - dps: 108.04296 - tps: 52.88332 - hps: 5370.76334 + dps: 102.02892 + tps: 54.76384 + hps: 5197.18054 } } dps_results: { key: "TestHoly-AllItems-ForgeEmber-37660" value: { - dps: 108.04296 - tps: 44.4186 - hps: 5182.65662 + dps: 98.83407 + tps: 54.76384 + hps: 5011.74617 } } dps_results: { key: "TestHoly-AllItems-ForlornSkyflareDiamond" value: { - dps: 111.95736 - tps: 41.63862 - hps: 5274.90321 + dps: 99.55363 + tps: 61.30402 + hps: 5228.98951 } } dps_results: { key: "TestHoly-AllItems-ForlornStarflareDiamond" value: { - dps: 111.81345 - tps: 41.63862 - hps: 5269.55225 + dps: 99.40972 + tps: 61.30402 + hps: 5223.13469 } } dps_results: { key: "TestHoly-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-FuturesightRune-38763" value: { - dps: 109.88348 - tps: 44.64084 - hps: 5271.72273 + dps: 101.35749 + tps: 58.35541 + hps: 5339.08305 } } dps_results: { key: "TestHoly-AllItems-GarbofFaith" value: { - dps: 104.22246 - tps: 43.16014 - hps: 4601.90416 + dps: 97.80047 + tps: 43.09071 + hps: 4261.66942 } } dps_results: { key: "TestHoly-AllItems-Gladiator'sInvestiture" value: { - dps: 116.19938 - tps: 41.79063 - hps: 5362.62552 + dps: 110.04387 + tps: 59.5397 + hps: 5405.77815 } } dps_results: { key: "TestHoly-AllItems-Gladiator'sRaiment" value: { - dps: 112.47609 - tps: 44.55035 - hps: 5062.88703 + dps: 106.32058 + tps: 44.29892 + hps: 4736.73909 } } dps_results: { key: "TestHoly-AllItems-GlowingTwilightScale-54573" value: { - dps: 113.51161 - tps: 44.46944 - hps: 5723.56797 + dps: 104.30272 + tps: 54.76384 + hps: 5619.27517 } } dps_results: { key: "TestHoly-AllItems-GlowingTwilightScale-54589" value: { - dps: 114.23117 - tps: 44.46944 - hps: 5798.79171 + dps: 105.02228 + tps: 54.76384 + hps: 5700.93152 } } dps_results: { key: "TestHoly-AllItems-GnomishLightningGenerator-41121" value: { - dps: 108.04296 - tps: 44.4186 - hps: 5186.96425 + dps: 98.83407 + tps: 54.76384 + hps: 5015.34235 } } dps_results: { key: "TestHoly-AllItems-Heartpierce-49982" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-Heartpierce-50641" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 113.79943 - tps: 44.46944 - hps: 5354.984 + dps: 104.59055 + tps: 54.76384 + hps: 5208.85202 } } dps_results: { key: "TestHoly-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.58837 - hps: 5257.70757 + dps: 98.83407 + tps: 61.30402 + hps: 5202.98543 } } dps_results: { key: "TestHoly-AllItems-ImpassiveStarflareDiamond" value: { - dps: 111.2378 - tps: 41.58837 - hps: 5256.44957 + dps: 98.83407 + tps: 61.30402 + hps: 5202.18171 } } dps_results: { key: "TestHoly-AllItems-IncisorFragment-37723" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-LastWord-50179" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-LastWord-50708" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-MajesticDragonFigurine-40430" value: { - dps: 109.53892 - tps: 41.02901 - hps: 5310.79849 + dps: 100.33004 + tps: 57.01663 + hps: 5365.94294 } } dps_results: { key: "TestHoly-AllItems-MeteoriteWhetstone-37390" value: { - dps: 108.04296 - tps: 44.4186 - hps: 5182.65662 + dps: 98.83407 + tps: 54.76384 + hps: 5011.74617 } } dps_results: { key: "TestHoly-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 111.2378 - tps: 44.4219 - hps: 5331.20521 + dps: 102.02892 + tps: 54.76384 + hps: 5162.77603 } } dps_results: { key: "TestHoly-AllItems-Nibelung-49992" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-Nibelung-50648" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { key: "TestHoly-AllItems-OfferingofSacrifice-37638" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-PersistentEarthshatterDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-PetrifiedScarab-21685" value: { - dps: 108.04296 - tps: 44.27427 - hps: 5138.32895 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-PurifiedShardoftheGods" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-RegaliaofFaith" value: { - dps: 100.88262 - tps: 41.15469 - hps: 4836.91463 + dps: 94.72711 + tps: 58.19439 + hps: 4851.16581 } } dps_results: { key: "TestHoly-AllItems-ReignoftheDead-47316" value: { - dps: 112.36031 - tps: 44.46944 - hps: 5308.61972 + dps: 103.15143 + tps: 54.76384 + hps: 5160.52328 } } dps_results: { key: "TestHoly-AllItems-ReignoftheDead-47477" value: { - dps: 112.8784 - tps: 44.46944 - hps: 5328.23113 + dps: 103.66951 + tps: 54.76384 + hps: 5180.83593 } } dps_results: { key: "TestHoly-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.64398 - hps: 5300.72015 + dps: 98.83407 + tps: 61.21451 + hps: 5260.18978 } } dps_results: { key: "TestHoly-AllItems-RuneofRepulsion-40372" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-SanctificationGarb" value: { - dps: 106.33368 - tps: 43.4996 - hps: 4741.23076 + dps: 100.00238 + tps: 50.48018 + hps: 4572.05945 } } dps_results: { key: "TestHoly-AllItems-SanctificationRegalia" value: { - dps: 104.98109 - tps: 42.70337 - hps: 4940.33396 + dps: 98.82558 + tps: 60.23322 + hps: 4953.67119 } } dps_results: { key: "TestHoly-AllItems-SealofthePantheon-36993" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-ShinyShardoftheGods" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-SliverofPureIce-50339" value: { - dps: 112.59057 - tps: 49.88611 - hps: 5444.11322 + dps: 103.38169 + tps: 59.51685 + hps: 5266.86034 } } dps_results: { key: "TestHoly-AllItems-SliverofPureIce-50346" value: { - dps: 113.16622 - tps: 50.61944 - hps: 5467.32425 - } -} -dps_results: { - key: "TestHoly-AllItems-SoulPreserver-37111" - value: { - dps: 110.20164 - tps: 48.72567 - hps: 5324.63447 + dps: 103.95733 + tps: 60.1604 + hps: 5294.27326 } } dps_results: { key: "TestHoly-AllItems-SouloftheDead-40382" value: { - dps: 108.04296 - tps: 50.41186 - hps: 5310.0244 + dps: 98.83407 + tps: 65.99294 + hps: 5248.27938 } } dps_results: { key: "TestHoly-AllItems-SparkofLife-37657" value: { - dps: 108.04296 - tps: 43.56277 - hps: 5215.1859 + dps: 98.83407 + tps: 58.52129 + hps: 5255.05794 } } dps_results: { key: "TestHoly-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 109.91375 - tps: 44.46944 - hps: 5145.19129 + dps: 100.54464 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-SwiftSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-SwiftStarflareDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-SwiftWindfireDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 108.64965 - tps: 46.07559 - hps: 5268.95142 + dps: 99.44077 + tps: 55.09365 + hps: 5070.0468 } } dps_results: { key: "TestHoly-AllItems-TearsoftheVanquished-47215" value: { - dps: 108.04296 - tps: 48.29379 - hps: 5329.51806 + dps: 98.83407 + tps: 68.20113 + hps: 5334.92312 } } dps_results: { key: "TestHoly-AllItems-TheGeneral'sHeart-45507" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5145.19129 + dps: 98.83407 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-ThunderingSkyflareDiamond" value: { - dps: 111.2378 - tps: 41.63862 - hps: 5248.14842 + dps: 98.83407 + tps: 61.30402 + hps: 5199.71539 } } dps_results: { key: "TestHoly-AllItems-TinyAbominationinaJar-50351" value: { - dps: 111.64973 - tps: 44.46944 - hps: 5145.19129 + dps: 102.13263 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-TinyAbominationinaJar-50706" value: { - dps: 111.64973 - tps: 44.46944 - hps: 5145.19129 + dps: 102.13263 + tps: 54.76384 + hps: 4991.2512 } } dps_results: { key: "TestHoly-AllItems-TirelessSkyflareDiamond" value: { - dps: 111.95736 - tps: 41.63862 - hps: 5274.90321 + dps: 99.55363 + tps: 61.30402 + hps: 5228.98951 } } dps_results: { key: "TestHoly-AllItems-TirelessStarflareDiamond" value: { - dps: 111.81345 - tps: 41.63862 - hps: 5269.55225 + dps: 99.40972 + tps: 61.30402 + hps: 5223.13469 } } dps_results: { key: "TestHoly-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 110.00016 - tps: 44.5773 - hps: 5240.6025 + dps: 100.79127 + tps: 55.42497 + hps: 5088.49071 } } dps_results: { key: "TestHoly-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 111.81345 - tps: 41.63862 - hps: 5269.55225 + dps: 99.40972 + tps: 61.30402 + hps: 5223.13469 } } dps_results: { key: "TestHoly-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 111.95736 - tps: 41.63862 - hps: 5274.90321 + dps: 99.55363 + tps: 61.30402 + hps: 5228.98951 } } dps_results: { key: "TestHoly-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 114.63412 - tps: 44.89427 - hps: 5750.16127 + dps: 102.23039 + tps: 66.87192 + hps: 5703.99304 } } dps_results: { key: "TestHoly-AllItems-VestmentsofAbsolution" value: { - dps: 90.45807 - tps: 37.99274 - hps: 3807.57054 + dps: 85.82192 + tps: 47.79809 + hps: 3715.88876 } } dps_results: { key: "TestHoly-AllItems-WingedTalisman-37844" value: { - dps: 108.04296 - tps: 44.46944 - hps: 5221.87194 + dps: 102.5408 + tps: 54.76384 + hps: 5072.76575 } } dps_results: { key: "TestHoly-AllItems-Zabra'sRaiment" value: { - dps: 103.86181 - tps: 43.06779 - hps: 5125.8773 + dps: 97.70631 + tps: 60.61888 + hps: 5150.02286 } } dps_results: { key: "TestHoly-AllItems-Zabra'sRegalia" value: { - dps: 110.77538 - tps: 43.59632 - hps: 4776.14976 + dps: 104.14004 + tps: 60.82634 + hps: 4815.65072 } } dps_results: { key: "TestHoly-Average-Default" value: { - dps: 108.4408 - tps: 45.08022 - hps: 5402.48184 + dps: 96.34965 + tps: 67.14115 + hps: 5330.50791 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-FullBuffs-LongMultiTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-FullBuffs-LongMultiTarget" value: { - dps: 111.2378 - tps: 889.38885 - hps: 5365.55633 + dps: 98.83407 + tps: 1327.98649 + hps: 5319.57826 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-FullBuffs-LongSingleTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-FullBuffs-LongSingleTarget" value: { - dps: 111.2378 - tps: 44.46944 - hps: 5365.55633 + dps: 98.83407 + tps: 66.39932 + hps: 5319.57826 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-FullBuffs-ShortSingleTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-FullBuffs-ShortSingleTarget" value: { - tps: 88.25877 - hps: 5729.8235 + tps: 78.24996 + hps: 5179.49209 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-NoBuffs-LongMultiTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-NoBuffs-LongMultiTarget" value: { - dps: 54.55975 - tps: 491.33473 - hps: 3186.39176 + dps: 46.75554 + tps: 728.99189 + hps: 3001.49045 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-NoBuffs-LongSingleTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-NoBuffs-LongSingleTarget" value: { - dps: 54.55975 - tps: 24.56674 - hps: 3186.39176 + dps: 46.75554 + tps: 36.44959 + hps: 3001.49045 } } dps_results: { - key: "TestHoly-Settings-Undead-P1-Holy-holy-NoBuffs-ShortSingleTarget" + key: "TestHoly-Settings-Undead-p1_holy-Holy-holy-NoBuffs-ShortSingleTarget" value: { - dps: 272.79876 - tps: 88.82208 - hps: 4691.41275 + dps: 176.37332 + tps: 121.46866 + hps: 4127.55625 } } dps_results: { key: "TestHoly-SwitchInFrontOfTarget-Default" value: { - dps: 91.84158 - tps: 44.46944 - hps: 5365.55633 + dps: 81.58725 + tps: 66.39932 + hps: 5319.57826 } } diff --git a/sim/priest/healing/healing_priest_test.go b/sim/priest/healing/healing_priest_test.go index 95648f89e7..c283397c98 100644 --- a/sim/priest/healing/healing_priest_test.go +++ b/sim/priest/healing/healing_priest_test.go @@ -18,7 +18,7 @@ func TestDisc(t *testing.T) { Race: proto.Race_RaceUndead, IsHealer: true, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/healing_priest/gear_sets", "p1_disc"), Talents: DiscTalents, Glyphs: DiscGlyphs, Consumes: FullConsumes, @@ -54,7 +54,7 @@ func TestHoly(t *testing.T) { Race: proto.Race_RaceUndead, IsHealer: true, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/healing_priest/gear_sets", "p1_holy"), Talents: HolyTalents, Glyphs: HolyGlyphs, Consumes: FullConsumes, @@ -119,23 +119,3 @@ var PlayerOptionsHoly = &proto.Player_HealingPriest{ Rotation: &proto.HealingPriest_Rotation{}, }, } - -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} -]}`) diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index ed1ea02db2..a3b26861ce 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -817,378 +817,378 @@ dps_results: { } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 7278.33213 tps: 7709.45276 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 7278.33213 tps: 7014.56678 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 8647.16609 tps: 7834.17551 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 3798.86536 tps: 4556.08738 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 3798.86536 tps: 3710.26527 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 3971.64182 tps: 3656.06736 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-FullBuffs-LongMultiTarget" value: { dps: 7278.33213 tps: 7709.45276 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-FullBuffs-LongSingleTarget" value: { dps: 7278.33213 tps: 7014.56678 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-FullBuffs-ShortSingleTarget" value: { dps: 8647.16609 tps: 7834.17551 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-NoBuffs-LongMultiTarget" value: { dps: 3798.86536 tps: 4556.08738 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-NoBuffs-LongSingleTarget" value: { dps: 3798.86536 tps: 3710.26527 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Clipping-default-NoBuffs-ShortSingleTarget" value: { dps: 3971.64182 tps: 3656.06736 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-FullBuffs-LongMultiTarget" value: { dps: 7278.33213 tps: 7709.45276 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-FullBuffs-LongSingleTarget" value: { dps: 7278.33213 tps: 7014.56678 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-FullBuffs-ShortSingleTarget" value: { dps: 8647.16609 tps: 7834.17551 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-NoBuffs-LongMultiTarget" value: { dps: 3798.86536 tps: 4556.08738 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-NoBuffs-LongSingleTarget" value: { dps: 3798.86536 tps: 3710.26527 } } dps_results: { - key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Draenei-p1-Ideal-default-NoBuffs-ShortSingleTarget" value: { dps: 3971.64182 tps: 3656.06736 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 7265.38882 tps: 7703.19008 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 7265.38882 tps: 7001.25511 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 8641.80372 tps: 7829.0883 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 3785.301 tps: 4542.50185 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 3785.301 tps: 3696.35081 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 3965.9512 tps: 3650.45945 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-FullBuffs-LongMultiTarget" value: { dps: 7265.38882 tps: 7703.19008 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-FullBuffs-LongSingleTarget" value: { dps: 7265.38882 tps: 7001.25511 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-FullBuffs-ShortSingleTarget" value: { dps: 8641.80372 tps: 7829.0883 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-NoBuffs-LongMultiTarget" value: { dps: 3785.301 tps: 4542.50185 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-NoBuffs-LongSingleTarget" value: { dps: 3785.301 tps: 3696.35081 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Clipping-default-NoBuffs-ShortSingleTarget" value: { dps: 3965.9512 tps: 3650.45945 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-FullBuffs-LongMultiTarget" value: { dps: 7265.38882 tps: 7703.19008 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-FullBuffs-LongSingleTarget" value: { dps: 7265.38882 tps: 7001.25511 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-FullBuffs-ShortSingleTarget" value: { dps: 8641.80372 tps: 7829.0883 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-NoBuffs-LongMultiTarget" value: { dps: 3785.301 tps: 4542.50185 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-NoBuffs-LongSingleTarget" value: { dps: 3785.301 tps: 3696.35081 } } dps_results: { - key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-NightElf-p1-Ideal-default-NoBuffs-ShortSingleTarget" value: { dps: 3965.9512 tps: 3650.45945 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 7269.54495 tps: 7705.74594 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 7269.54495 tps: 7005.16705 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 8646.83433 tps: 7833.61075 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 3794.58518 tps: 4550.17994 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 3794.58518 tps: 3705.28086 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 3968.19958 tps: 3652.52035 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-FullBuffs-LongMultiTarget" value: { dps: 7269.54495 tps: 7705.74594 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-FullBuffs-LongSingleTarget" value: { dps: 7269.54495 tps: 7005.16705 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-FullBuffs-ShortSingleTarget" value: { dps: 8646.83433 tps: 7833.61075 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-NoBuffs-LongMultiTarget" value: { dps: 3794.58518 tps: 4550.17994 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-NoBuffs-LongSingleTarget" value: { dps: 3794.58518 tps: 3705.28086 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Clipping-default-NoBuffs-ShortSingleTarget" value: { dps: 3968.19958 tps: 3652.52035 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-FullBuffs-LongMultiTarget" value: { dps: 7269.54495 tps: 7705.74594 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-FullBuffs-LongSingleTarget" value: { dps: 7269.54495 tps: 7005.16705 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-FullBuffs-ShortSingleTarget" value: { dps: 8646.83433 tps: 7833.61075 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-LongMultiTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-NoBuffs-LongMultiTarget" value: { dps: 3794.58518 tps: 4550.17994 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-LongSingleTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-NoBuffs-LongSingleTarget" value: { dps: 3794.58518 tps: 3705.28086 } } dps_results: { - key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-ShortSingleTarget" + key: "TestShadow-Settings-Undead-p1-Ideal-default-NoBuffs-ShortSingleTarget" value: { dps: 3968.19958 tps: 3652.52035 diff --git a/sim/priest/shadow/shadow_priest_test.go b/sim/priest/shadow/shadow_priest_test.go index 32819e9a8c..3fb8fae729 100644 --- a/sim/priest/shadow/shadow_priest_test.go +++ b/sim/priest/shadow/shadow_priest_test.go @@ -18,7 +18,7 @@ func TestShadow(t *testing.T) { Race: proto.Race_RaceUndead, OtherRaces: []proto.Race{proto.Race_RaceNightElf, proto.Race_RaceDraenei}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "p1"), Talents: DefaultTalents, Glyphs: DefaultGlyphs, Consumes: FullConsumes, @@ -103,209 +103,3 @@ var PlayerOptionsIdeal = &proto.Player_ShadowPriest{ }, }, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40562, - "enchant": 3820, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40459, - "enchant": 3810, - "gems": [ - 39998 - ] - }, - { - "id": 44005, - "enchant": 3722, - "gems": [ - 40026 - ] - }, - { - "id": 44002, - "enchant": 1144, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 44008, - "enchant": 2332, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40454, - "enchant": 3604, - "gems": [ - 40049, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 3719 - }, - { - "id": 40558, - "enchant": 3606 - }, - { - "id": 40719 - }, - { - "id": 40399 - }, - { - "id": 40255 - }, - { - "id": 40432 - }, - { - "id": 40395, - "enchant": 3834 - }, - { - "id": 40273 - }, - { - "id": 39712 - } -]}`) -var P2Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 46172, - "enchant": 3820, - "gems": [ - 41285, - 45883 - ] - }, - { - "id": 45243, - "gems": [ - 39998 - ] - }, - { - "id": 46165, - "enchant": 3810, - "gems": [ - 39998 - ] - }, - { - "id": 45242, - "enchant": 3722, - "gems": [ - 40049 - ] - }, - { - "id": 46168, - "enchant": 1144, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45446, - "enchant": 2332, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 45665, - "enchant": 3604, - "gems": [ - 39998, - 39998, - 0 - ] - }, - { - "id": 45619, - "enchant": 3601, - "gems": [ - 39998, - 39998, - 39998 - ] - }, - { - "id": 46170, - "enchant": 3719, - "gems": [ - 39998, - 40049 - ] - }, - { - "id": 45135, - "enchant": 3606, - "gems": [ - 39998, - 40049 - ] - }, - { - "id": 45495, - "gems": [ - 40026 - ] - }, - { - "id": 46046, - "gems": [ - 39998 - ] - }, - { - "id": 45518 - }, - { - "id": 45466 - }, - { - "id": 45620, - "enchant": 3834, - "gems": [ - 40026 - ] - }, - { - "id": 45617 - }, - { - "id": 45294, - "gems": [ - 39998 - ] - } - ] -}`) diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results index 68b03cc90c..528bb770cf 100644 --- a/sim/priest/smite/TestSmite.results +++ b/sim/priest/smite/TestSmite.results @@ -817,42 +817,42 @@ dps_results: { } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 3567.28222 tps: 4024.17641 } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 3567.28222 tps: 2923.4926 } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 4892.96346 tps: 4109.83599 } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 1195.49321 tps: 1418.57429 } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 1195.49321 tps: 966.68622 } } dps_results: { - key: "TestSmite-Settings-Undead-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestSmite-Settings-Undead-p1-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 2827.933 tps: 2204.06829 diff --git a/sim/priest/smite/smite_priest_test.go b/sim/priest/smite/smite_priest_test.go index 771c73db8e..a4a067f70d 100644 --- a/sim/priest/smite/smite_priest_test.go +++ b/sim/priest/smite/smite_priest_test.go @@ -17,7 +17,7 @@ func TestSmite(t *testing.T) { Class: proto.Class_ClassPriest, Race: proto.Race_RaceUndead, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/smite_priest/gear_sets", "p1"), Talents: DefaultTalents, Glyphs: DefaultGlyphs, Consumes: FullConsumes, @@ -63,23 +63,3 @@ var PlayerOptionsBasic = &proto.Player_SmitePriest{ Rotation: &proto.SmitePriest_Rotation{}, }, } - -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} -]}`) diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index d9ee887fb0..93fd2e94a5 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -790,1344 +790,1344 @@ dps_results: { } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-LongMultiTarget" value: { dps: 7559.07138 tps: 5366.94068 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-LongSingleTarget" value: { dps: 7559.07138 tps: 5366.94068 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8815.93704 tps: 6259.3153 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-LongMultiTarget" value: { dps: 3881.66689 tps: 2755.98349 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-LongSingleTarget" value: { dps: 3881.66689 tps: 2755.98349 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 4076.77595 tps: 2894.51093 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 7165.49406 tps: 5087.50078 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 7165.49406 tps: 5087.50078 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 8361.26454 tps: 5936.49782 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3756.23937 tps: 2666.92995 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3756.23937 tps: 2666.92995 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3864.61298 tps: 2743.87521 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 7430.90513 tps: 5275.94264 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 7430.90513 tps: 5275.94264 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8772.34475 tps: 6228.36477 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 3790.40939 tps: 2691.19067 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 3790.40939 tps: 2691.19067 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3935.0143 tps: 2793.86016 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6804.87464 tps: 4831.46099 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6804.87464 tps: 4831.46099 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 8158.62868 tps: 5792.62636 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3527.47075 tps: 2504.50423 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3527.47075 tps: 2504.50423 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3680.29345 tps: 2613.00835 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongMultiTarget" value: { dps: 4947.85548 tps: 3512.97739 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongSingleTarget" value: { dps: 4947.85548 tps: 3512.97739 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5795.22147 tps: 4114.60725 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongMultiTarget" value: { dps: 2563.52006 tps: 1820.09924 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongSingleTarget" value: { dps: 2563.52006 tps: 1820.09924 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2766.33679 tps: 1964.09912 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4669.89467 tps: 3315.62522 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4669.89467 tps: 3315.62522 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5447.12977 tps: 3867.46214 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2508.43402 tps: 1780.98815 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2508.43402 tps: 1780.98815 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2655.09097 tps: 1885.11459 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 5014.37987 tps: 3560.20971 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 5014.37987 tps: 3560.20971 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5896.39204 tps: 4186.43835 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 2573.22728 tps: 1826.99137 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 2573.22728 tps: 1826.99137 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2727.82758 tps: 1936.75758 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4587.38514 tps: 3257.04345 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4587.38514 tps: 3257.04345 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5487.57143 tps: 3896.17571 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2426.07966 tps: 1722.51656 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2426.07966 tps: 1722.51656 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2585.42708 tps: 1835.65322 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongMultiTarget" value: { dps: 7147.11828 tps: 5074.45398 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongSingleTarget" value: { dps: 7147.11828 tps: 5074.45398 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8292.4361 tps: 5887.62963 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongMultiTarget" value: { dps: 3682.0906 tps: 2614.28433 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongSingleTarget" value: { dps: 3682.0906 tps: 2614.28433 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3828.16856 tps: 2717.99968 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6756.71653 tps: 4797.26874 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6756.71653 tps: 4797.26874 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 7838.11231 tps: 5565.05974 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3543.71161 tps: 2516.03524 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3543.71161 tps: 2516.03524 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3615.78652 tps: 2567.20843 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 7022.62513 tps: 4986.06384 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 7022.62513 tps: 4986.06384 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8238.95505 tps: 5849.65809 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 3594.03524 tps: 2551.76502 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 3594.03524 tps: 2551.76502 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3715.05648 tps: 2637.6901 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6443.38882 tps: 4574.80606 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6443.38882 tps: 4574.80606 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 7699.53362 tps: 5466.66887 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3348.51318 tps: 2377.44436 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3348.51318 tps: 2377.44436 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3477.24194 tps: 2468.84178 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-LongMultiTarget" value: { dps: 3565.381 tps: 2531.42051 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-LongSingleTarget" value: { dps: 3565.381 tps: 2531.42051 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 3609.73062 tps: 2562.90874 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-LongMultiTarget" value: { dps: 1704.26815 tps: 1210.03039 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-LongSingleTarget" value: { dps: 1704.26815 tps: 1210.03039 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 1580.6145 tps: 1122.23629 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4015.30782 tps: 2850.86855 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4015.30782 tps: 2850.86855 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 4694.23813 tps: 3332.90907 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2081.85232 tps: 1478.11515 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2081.85232 tps: 1478.11515 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2123.04348 tps: 1507.36087 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 4842.07689 tps: 3437.87459 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 4842.07689 tps: 3437.87459 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5594.63051 tps: 3972.18766 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 2414.06333 tps: 1713.98496 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 2414.06333 tps: 1713.98496 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2461.12575 tps: 1747.39928 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 5050.81125 tps: 3586.07599 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 5050.81125 tps: 3586.07599 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5800.30414 tps: 4118.21594 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2535.62591 tps: 1800.2944 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2535.62591 tps: 1800.2944 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2671.03824 tps: 1896.43715 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-LongMultiTarget" value: { dps: 7611.49935 tps: 5404.16454 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-LongSingleTarget" value: { dps: 7611.49935 tps: 5404.16454 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8904.13701 tps: 6321.93728 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-LongMultiTarget" value: { dps: 3904.53796 tps: 2772.22195 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-LongSingleTarget" value: { dps: 3904.53796 tps: 2772.22195 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 4118.67793 tps: 2924.26133 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 7196.77543 tps: 5109.71056 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 7196.77543 tps: 5109.71056 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 8437.08055 tps: 5990.32719 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3782.25333 tps: 2685.39986 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3782.25333 tps: 2685.39986 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3906.68431 tps: 2773.74586 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 7490.59357 tps: 5318.32143 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 7490.59357 tps: 5318.32143 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8850.86555 tps: 6284.11454 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 3812.49911 tps: 2706.87437 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 3812.49911 tps: 2706.87437 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3978.19709 tps: 2824.51994 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6846.90504 tps: 4861.30258 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6846.90504 tps: 4861.30258 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 8246.38661 tps: 5854.93449 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3546.856 tps: 2518.26776 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3546.856 tps: 2518.26776 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-Assassination-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3725.13565 tps: 2644.84631 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongMultiTarget" value: { dps: 4983.17405 tps: 3538.05357 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-LongSingleTarget" value: { dps: 4983.17405 tps: 3538.05357 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5857.4047 tps: 4158.75734 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongMultiTarget" value: { dps: 2581.88668 tps: 1833.13954 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-LongSingleTarget" value: { dps: 2581.88668 tps: 1833.13954 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2803.89704 tps: 1990.7669 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4689.18059 tps: 3329.31822 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4689.18059 tps: 3329.31822 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5501.51015 tps: 3906.07221 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2528.58729 tps: 1795.29697 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2528.58729 tps: 1795.29697 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2685.90829 tps: 1906.99488 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 5055.89019 tps: 3589.68204 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 5055.89019 tps: 3589.68204 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5954.2573 tps: 4227.52269 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 2588.3363 tps: 1837.71877 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 2588.3363 tps: 1837.71877 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2762.11097 tps: 1961.09879 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4615.69045 tps: 3277.14022 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4615.69045 tps: 3277.14022 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5549.43064 tps: 3940.09575 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2439.16415 tps: 1731.80655 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2439.16415 tps: 1731.80655 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Deadly OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2618.33763 tps: 1859.01972 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongMultiTarget" value: { dps: 7194.87634 tps: 5108.3622 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-LongSingleTarget" value: { dps: 7194.87634 tps: 5108.3622 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8378.65994 tps: 5948.84856 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongMultiTarget" value: { dps: 3707.23165 tps: 2632.13447 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-LongSingleTarget" value: { dps: 3707.23165 tps: 2632.13447 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3872.29644 tps: 2749.33048 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6785.43029 tps: 4817.6555 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6785.43029 tps: 4817.6555 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 7908.82751 tps: 5615.26753 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3571.25268 tps: 2535.58941 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3571.25268 tps: 2535.58941 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3655.27309 tps: 2595.24389 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 7080.99729 tps: 5027.50807 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 7080.99729 tps: 5027.50807 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 8318.79322 tps: 5906.34319 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 3615.42017 tps: 2566.94832 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 3615.42017 tps: 2566.94832 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 3757.43464 tps: 2667.7786 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 6485.97383 tps: 4605.04142 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 6485.97383 tps: 4605.04142 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 7782.42447 tps: 5525.52137 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 3364.65418 tps: 2388.90447 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 3364.65418 tps: 2388.90447 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Deadly-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 3514.16995 tps: 2495.06066 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-LongMultiTarget" value: { dps: 3590.75619 tps: 2549.4369 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-LongSingleTarget" value: { dps: 3590.75619 tps: 2549.4369 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-FullBuffs-ShortSingleTarget" value: { dps: 3662.91779 tps: 2600.67163 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-LongMultiTarget" value: { dps: 1718.25549 tps: 1219.96139 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-LongSingleTarget" value: { dps: 1718.25549 tps: 1219.96139 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate-NoBuffs-ShortSingleTarget" value: { dps: 1606.25471 tps: 1140.44085 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 4041.72885 tps: 2869.62748 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 4041.72885 tps: 2869.62748 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 4745.75082 tps: 3369.48308 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2097.21968 tps: 1489.02598 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2097.21968 tps: 1489.02598 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2151.00063 tps: 1527.21044 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongMultiTarget" value: { dps: 4872.03949 tps: 3459.14804 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-LongSingleTarget" value: { dps: 4872.03949 tps: 3459.14804 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-FullBuffs-ShortSingleTarget" value: { dps: 5655.22536 tps: 4015.21 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongMultiTarget" value: { dps: 2430.68305 tps: 1725.78496 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-LongSingleTarget" value: { dps: 2430.68305 tps: 1725.78496 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate-NoBuffs-ShortSingleTarget" value: { dps: 2492.34944 tps: 1769.5681 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongMultiTarget" value: { dps: 5085.05511 tps: 3610.38912 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-LongSingleTarget" value: { dps: 5085.05511 tps: 3610.38912 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-FullBuffs-ShortSingleTarget" value: { dps: 5860.51025 tps: 4160.96228 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongMultiTarget" value: { dps: 2557.7696 tps: 1816.01642 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-LongSingleTarget" value: { dps: 2557.7696 tps: 1816.01642 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-p1_assassination-MH Instant OH Instant-rupture_mutilate_expose-NoBuffs-ShortSingleTarget" value: { dps: 2702.45891 tps: 1918.74583 diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index e0646b65b6..582389d490 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -2,34 +2,34 @@ character_stats_results: { key: "TestCombat-CharacterStats-Default" value: { final_stats: 393.8 - final_stats: 1502.6 - final_stats: 1443.75 + final_stats: 1493.8 + final_stats: 1463.55 final_stats: 187 final_stats: 242.462 final_stats: 500 final_stats: 109 - final_stats: 437.15997 - final_stats: 891.52994 - final_stats: 221 + final_stats: 386.15997 + final_stats: 950.52994 + final_stats: 264 final_stats: 0 - final_stats: 5725.0336 - final_stats: 469.94994 - final_stats: 2164.78757 - final_stats: 221 + final_stats: 5996.3904 + final_stats: 418.94994 + final_stats: 2218.9399 + final_stats: 264 final_stats: 94 - final_stats: 302.97496 + final_stats: 206.97496 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 9358.7 - final_stats: 3264.8 + final_stats: 9359.1 + final_stats: 3535.4 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 271.50112 final_stats: 0 final_stats: 0 - final_stats: 21861.5 + final_stats: 22059.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,2160 +46,2160 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50359" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50366" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 5980.04856 - tps: 4245.83448 + dps: 6266.22913 + tps: 4449.02269 } } dps_results: { key: "TestCombat-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-Bandit'sInsignia-40371" value: { - dps: 6154.4256 - tps: 4369.64218 + dps: 6439.62349 + tps: 4572.13268 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50354" value: { - dps: 5964.49491 - tps: 4234.79139 - hps: 88.5158 + dps: 6246.64449 + tps: 4435.11759 + hps: 89.08506 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50726" value: { - dps: 5964.49491 - tps: 4234.79139 - hps: 88.5158 + dps: 6246.64449 + tps: 4435.11759 + hps: 89.08506 } } dps_results: { key: "TestCombat-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6116.44661 - tps: 4342.6771 + dps: 6393.80786 + tps: 4539.60358 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50035" value: { - dps: 6440.75543 - tps: 4572.93636 + dps: 6641.57844 + tps: 4715.52069 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50692" value: { - dps: 6549.95423 - tps: 4650.4675 + dps: 6755.1068 + tps: 4796.12583 } } dps_results: { key: "TestCombat-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 4794.49835 - tps: 3404.09383 + dps: 4823.49853 + tps: 3424.68395 } } dps_results: { key: "TestCombat-AllItems-BonescytheBattlegear" value: { - dps: 5711.16732 - tps: 4054.9288 + dps: 5841.63537 + tps: 4147.56111 } } dps_results: { key: "TestCombat-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4238.40153 + dps: 6373.78715 + tps: 4434.8811 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6223.76325 - tps: 4418.87191 + dps: 6514.26682 + tps: 4625.12944 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50349" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50352" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 hps: 64 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6084.69178 - tps: 4320.13116 + dps: 6367.41521 + tps: 4520.8648 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6117.2246 - tps: 4343.22947 + dps: 6399.34934 + tps: 4543.53803 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6104.51486 - tps: 4334.20555 + dps: 6395.22823 + tps: 4540.61204 } } dps_results: { key: "TestCombat-AllItems-Death'sChoice-47464" value: { - dps: 6417.69162 - tps: 4556.56105 + dps: 6720.36271 + tps: 4771.45752 } } dps_results: { key: "TestCombat-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6064.99629 - tps: 4306.14737 + dps: 6348.06969 + tps: 4507.12948 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50362" value: { - dps: 6394.11953 - tps: 4539.82486 + dps: 6682.23574 + tps: 4744.38738 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50363" value: { - dps: 6437.02963 - tps: 4570.29104 + dps: 6751.91854 + tps: 4793.86216 } } dps_results: { key: "TestCombat-AllItems-Defender'sCode-40257" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6119.27158 - tps: 4344.68282 + dps: 6398.0584 + tps: 4542.62147 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50348" value: { - dps: 6194.50841 - tps: 4398.10097 + dps: 6424.09265 + tps: 4561.10578 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50353" value: { - dps: 6180.09722 - tps: 4387.86903 + dps: 6434.1675 + tps: 4568.25892 } } dps_results: { key: "TestCombat-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-EmberSkyflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6116.44661 - tps: 4342.6771 + dps: 6393.80786 + tps: 4539.60358 } } dps_results: { key: "TestCombat-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6112.3249 - tps: 4339.75068 + dps: 6389.84583 + tps: 4536.79054 } } dps_results: { key: "TestCombat-AllItems-EphemeralSnowflake-50260" value: { - dps: 6106.5534 - tps: 4335.65291 + dps: 6348.26925 + tps: 4507.27117 } } dps_results: { key: "TestCombat-AllItems-EssenceofGossamer-37220" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6110.91917 - tps: 4338.75261 + dps: 6393.79726 + tps: 4539.59605 } } dps_results: { key: "TestCombat-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6069.43732 - tps: 4309.3005 + dps: 6351.72926 + tps: 4509.72777 } } dps_results: { key: "TestCombat-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-ForethoughtTalisman-40258" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-ForgeEmber-37660" value: { - dps: 6046.9351 - tps: 4293.32392 + dps: 6330.54546 + tps: 4494.68728 } } dps_results: { key: "TestCombat-AllItems-ForlornSkyflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-ForlornStarflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6196.43371 - tps: 4399.46793 + dps: 6480.44987 + tps: 4601.11941 } } dps_results: { key: "TestCombat-AllItems-FuturesightRune-38763" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 6110.07225 - tps: 4338.1513 + dps: 6140.64163 + tps: 4359.85555 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54573" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54589" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6093.23012 - tps: 4326.19339 + dps: 6377.51693 + tps: 4528.03702 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-49982" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-50641" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6116.44661 - tps: 4342.6771 + dps: 6393.80786 + tps: 4539.60358 } } dps_results: { key: "TestCombat-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6112.3249 - tps: 4339.75068 + dps: 6389.84583 + tps: 4536.79054 } } dps_results: { key: "TestCombat-AllItems-IncisorFragment-37723" value: { - dps: 6137.71051 - tps: 4357.77446 + dps: 6429.95656 + tps: 4565.26916 } } dps_results: { key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6122.24393 - tps: 4346.79319 - hps: 11.11293 + dps: 6404.15163 + tps: 4546.94766 + hps: 11.25035 } } dps_results: { key: "TestCombat-AllItems-LastWord-50179" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-LastWord-50708" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-MajesticDragonFigurine-40430" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6200.02666 - tps: 4402.01893 + dps: 6421.01589 + tps: 4558.92128 } } dps_results: { key: "TestCombat-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6013.47625 - tps: 4269.56813 + dps: 6314.855 + tps: 4483.54705 } } dps_results: { key: "TestCombat-AllItems-Nibelung-49992" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-Nibelung-50648" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-OfferingofSacrifice-37638" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6116.24628 - tps: 4342.53486 + dps: 6398.87419 + tps: 4543.20067 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6122.09064 - tps: 4346.68436 + dps: 6404.77702 + tps: 4547.39168 } } dps_results: { key: "TestCombat-AllItems-PetrifiedScarab-21685" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-PurifiedShardoftheGods" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47316" value: { - dps: 6104.19175 - tps: 4333.97615 + dps: 6366.03224 + tps: 4519.88289 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47477" value: { - dps: 6122.10954 - tps: 4346.69778 + dps: 6381.24335 + tps: 4530.68278 } } dps_results: { key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-RuneofRepulsion-40372" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-SealofthePantheon-36993" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-Shadowblade'sBattlegear" value: { - dps: 7090.93664 - tps: 5034.56501 + dps: 7240.9915 + tps: 5141.10396 } } dps_results: { key: "TestCombat-AllItems-Shadowmourne-49623" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { key: "TestCombat-AllItems-ShinyShardoftheGods" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-Slayer'sArmor" value: { - dps: 4710.36223 - tps: 3344.35718 + dps: 4808.48556 + tps: 3414.02475 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50339" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50346" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-SoulPreserver-37111" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-SouloftheDead-40382" value: { - dps: 6074.17267 - tps: 4312.66259 + dps: 6354.63416 + tps: 4511.79025 } } dps_results: { key: "TestCombat-AllItems-SparkofLife-37657" value: { - dps: 6057.79922 - tps: 4301.03744 + dps: 6326.98432 + tps: 4492.15887 } } dps_results: { key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6138.33411 - tps: 4358.21722 + dps: 6413.04103 + tps: 4553.25913 } } dps_results: { key: "TestCombat-AllItems-StormshroudArmor" value: { - dps: 4867.27457 - tps: 3455.76495 + dps: 4967.13538 + tps: 3526.66612 } } dps_results: { key: "TestCombat-AllItems-SwiftSkyflareDiamond" value: { - dps: 6122.09064 - tps: 4346.68436 + dps: 6404.77702 + tps: 4547.39168 } } dps_results: { key: "TestCombat-AllItems-SwiftStarflareDiamond" value: { - dps: 6116.24628 - tps: 4342.53486 + dps: 6398.87419 + tps: 4543.20067 } } dps_results: { key: "TestCombat-AllItems-SwiftWindfireDiamond" value: { - dps: 6106.01866 - tps: 4335.27325 + dps: 6388.54423 + tps: 4535.8664 } } dps_results: { key: "TestCombat-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-TearsoftheVanquished-47215" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-TerrorbladeBattlegear" value: { - dps: 6095.90125 - tps: 4328.08989 + dps: 6216.71916 + tps: 4413.8706 } } dps_results: { key: "TestCombat-AllItems-TheFistsofFury" value: { - dps: 5487.45993 - tps: 3896.09655 + dps: 5565.72522 + tps: 3951.66491 } } dps_results: { key: "TestCombat-AllItems-TheGeneral'sHeart-45507" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5588.53003 - tps: 3967.85632 + dps: 5717.91574 + tps: 4059.72018 } } dps_results: { key: "TestCombat-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6201.53836 - tps: 4403.09223 + dps: 6447.77895 + tps: 4577.92305 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6281.47972 - tps: 4459.8506 + dps: 6553.50902 + tps: 4652.99141 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6325.03978 - tps: 4490.77824 + dps: 6578.64838 + tps: 4670.84035 } } dps_results: { key: "TestCombat-AllItems-TirelessSkyflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-TirelessStarflareDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6058.62848 - tps: 4301.62622 + dps: 6299.57418 + tps: 4472.69767 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6091.40777 - tps: 4324.89952 + dps: 6373.78715 + tps: 4525.38887 } } dps_results: { key: "TestCombat-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5087.62149 - tps: 3612.21126 + dps: 5130.87465 + tps: 3642.921 } } dps_results: { key: "TestCombat-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 5866.81869 - tps: 4165.44127 + dps: 6054.79234 + tps: 4298.90256 } } dps_results: { key: "TestCombat-AllItems-VanCleef'sBattlegear" value: { - dps: 5865.16238 - tps: 4164.26529 + dps: 6068.885 + tps: 4308.90835 } } dps_results: { key: "TestCombat-AllItems-WingedTalisman-37844" value: { - dps: 5964.05736 - tps: 4234.48073 + dps: 6246.04329 + tps: 4434.69074 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 6248.52854 - tps: 4436.45526 + dps: 6517.39889 + tps: 4627.35321 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 18653.81221 - tps: 13244.20667 + dps: 20232.92766 + tps: 14365.37864 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 4042.32795 - tps: 2870.05284 + dps: 4352.08495 + tps: 3089.98031 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 4903.05138 - tps: 3481.16648 + dps: 5301.80823 + tps: 3764.28384 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 11008.13308 - tps: 7815.77448 + dps: 11963.20071 + tps: 8493.8725 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 1966.16922 - tps: 1395.98015 + dps: 2140.60753 + tps: 1519.83135 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2063.866 - tps: 1465.34486 + dps: 2262.4695 + tps: 1606.35334 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 10918.07377 - tps: 7751.83238 + dps: 12494.10567 + tps: 8870.81503 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 3811.79648 - tps: 2706.3755 + dps: 4185.65266 + tps: 2971.81339 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 4659.99321 - tps: 3308.59518 + dps: 5093.04861 + tps: 3616.06451 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5894.30736 - tps: 4184.95822 + dps: 6619.43455 + tps: 4699.79853 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 1976.38927 - tps: 1403.23638 + dps: 2201.63042 + tps: 1563.1576 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2093.36862 - tps: 1486.29172 + dps: 2353.11771 + tps: 1670.71358 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 5296.0679 - tps: 3760.20821 + dps: 6036.43959 + tps: 4285.87211 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 4549.76627 - tps: 3230.33405 + dps: 5200.09137 + tps: 3692.06487 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 5381.8298 - tps: 3821.09916 + dps: 6167.05458 + tps: 4378.60875 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 2645.95372 - tps: 1878.62714 + dps: 3054.65868 + tps: 2168.80766 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2308.0424 - tps: 1638.7101 + dps: 2667.14491 + tps: 1893.67289 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2416.10562 - tps: 1715.43499 + dps: 2806.60334 + tps: 1992.68837 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 20000.09021 - tps: 14200.06405 + dps: 21434.41322 + tps: 15218.43339 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 3315.35283 - tps: 2353.90051 + dps: 3539.28394 + tps: 2512.89159 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 3992.55227 - tps: 2834.71211 + dps: 4297.31287 + tps: 3051.09214 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 12264.27889 - tps: 8707.63801 + dps: 13206.57635 + tps: 9376.66921 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 1650.83705 - tps: 1172.09431 + dps: 1785.58076 + tps: 1267.76234 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 1769.32634 - tps: 1256.2217 + dps: 1896.73775 + tps: 1346.6838 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 19796.54458 - tps: 14055.54665 + dps: 20786.98349 + tps: 14758.75828 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 5780.8216 - tps: 4104.38334 + dps: 5706.89497 + tps: 4051.89543 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 6964.09698 - tps: 4944.50885 + dps: 6879.10769 + tps: 4884.16646 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 11161.65058 - tps: 7924.77191 + dps: 11634.37463 + tps: 8260.40599 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2819.5967 - tps: 2001.91366 + dps: 2792.01431 + tps: 1982.33016 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2905.77072 - tps: 2063.09721 + dps: 2905.03658 + tps: 2062.57597 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 11711.59594 - tps: 8315.23312 + dps: 12585.83401 + tps: 8935.94215 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 5506.55713 - tps: 3909.65556 + dps: 5518.61358 + tps: 3918.21564 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6678.10578 - tps: 4741.45511 + dps: 6622.46751 + tps: 4701.95193 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 6167.67915 - tps: 4379.0522 + dps: 6511.29081 + tps: 4623.01648 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2809.02744 - tps: 1994.40948 + dps: 2854.23691 + tps: 2026.50821 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2923.10688 - tps: 2075.40589 + dps: 2978.98606 + tps: 2115.0801 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 6891.62361 - tps: 4893.05276 + dps: 7255.70173 + tps: 5151.54823 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 6227.96766 - tps: 4421.85704 + dps: 6519.94382 + tps: 4629.16011 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 7376.9425 - tps: 5237.62917 + dps: 7693.38673 + tps: 5462.30458 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 3414.37041 - tps: 2424.20299 + dps: 3636.81509 + tps: 2582.13872 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 3129.30768 - tps: 2221.80845 + dps: 3302.85173 + tps: 2345.02473 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 3227.18466 - tps: 2291.30111 + dps: 3402.53132 + tps: 2415.79724 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 22113.30181 - tps: 15700.44428 + dps: 23041.6227 + tps: 16359.55212 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 4698.76526 - tps: 3336.12334 + dps: 4633.93779 + tps: 3290.09583 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 5613.68598 - tps: 3985.71704 + dps: 5539.47133 + tps: 3933.02464 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 13061.42303 - tps: 9273.61035 + dps: 13452.61517 + tps: 9551.35677 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 2344.02115 - tps: 1664.25501 + dps: 2311.67667 + tps: 1641.29044 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2454.73594 - tps: 1742.86251 + dps: 2391.83647 + tps: 1698.20389 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 19039.56129 - tps: 13518.08852 + dps: 23056.08564 + tps: 16369.8208 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 5529.73724 - tps: 3926.11344 + dps: 6219.94654 + tps: 4416.16204 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 6654.15627 - tps: 4724.45095 + dps: 7507.15739 + tps: 5330.08175 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 10697.79583 - tps: 7595.43504 + dps: 12895.10364 + tps: 9155.52358 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2705.95959 - tps: 1921.23131 + dps: 3041.60457 + tps: 2159.53924 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2783.07219 - tps: 1975.98125 + dps: 3151.22866 + tps: 2237.37235 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 11158.97419 - tps: 7922.87168 + dps: 13908.69278 + tps: 9875.17187 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 5237.94409 - tps: 3718.94031 + dps: 6008.26905 + tps: 4265.87102 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6300.6523 - tps: 4473.46314 + dps: 7246.96601 + tps: 5145.34587 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5857.92234 - tps: 4159.12486 + dps: 7198.14652 + tps: 5110.68403 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2665.595 - tps: 1892.57245 + dps: 3087.42598 + tps: 2192.07245 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2773.09037 - tps: 1968.89416 + dps: 3222.80504 + tps: 2288.19157 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 6587.26736 - tps: 4676.95982 + dps: 7720.57737 + tps: 5481.60994 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 5925.92281 - tps: 4207.40519 + dps: 6972.25054 + tps: 4950.29788 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6966.43499 - tps: 4946.16885 + dps: 8266.50821 + tps: 5869.22083 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 3258.96445 - tps: 2313.86476 + dps: 3856.7679 + tps: 2738.30521 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2977.63206 - tps: 2114.11877 + dps: 3520.1542 + tps: 2499.30948 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 3052.64574 - tps: 2167.37848 + dps: 3630.17073 + tps: 2577.42122 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 21268.80436 - tps: 15100.85109 + dps: 25577.22336 + tps: 18159.82858 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 4516.55192 - tps: 3206.75186 + dps: 5051.65474 + tps: 3586.67487 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 5378.97181 - tps: 3819.06998 + dps: 6090.54672 + tps: 4324.28817 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 12538.76464 - tps: 8902.5229 + dps: 15006.10337 + tps: 10654.33339 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 2249.27403 - tps: 1596.98456 + dps: 2529.54294 + tps: 1795.97549 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2353.16729 - tps: 1670.74877 + dps: 2642.89647 + tps: 1876.45649 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 15229.76771 - tps: 10813.13508 + dps: 18027.9185 + tps: 12799.82214 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 4863.39577 - tps: 3453.011 + dps: 5305.27331 + tps: 3766.74405 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 6061.98204 - tps: 4304.00725 + dps: 6599.7649 + tps: 4685.83308 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 8332.39082 - tps: 5915.99748 + dps: 9922.65757 + tps: 7045.08688 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2233.17267 - tps: 1585.5526 + dps: 2452.0055 + tps: 1740.9239 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2394.31531 - tps: 1699.96387 + dps: 2628.60609 + tps: 1866.31033 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 9813.07382 - tps: 6967.28241 + dps: 11936.95884 + tps: 8475.24078 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 4592.18607 - tps: 3260.45211 + dps: 5096.65886 + tps: 3618.62779 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 5775.77696 - tps: 4100.80164 + dps: 6310.59055 + tps: 4480.51929 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5044.97728 - tps: 3581.93387 + dps: 6032.40594 + tps: 4283.00822 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2209.23487 - tps: 1568.55676 + dps: 2515.36184 + tps: 1785.90691 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2378.18651 - tps: 1688.51242 + dps: 2732.20617 + tps: 1939.86638 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 5965.86102 - tps: 4235.76132 + dps: 6857.35031 + tps: 4868.71872 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 5303.08218 - tps: 3765.18835 + dps: 6102.35911 + tps: 4332.67497 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6426.47778 - tps: 4562.79922 + dps: 7404.44678 + tps: 5257.15721 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 2789.97701 - tps: 1980.88368 + dps: 3286.00737 + tps: 2333.06523 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2510.95335 - tps: 1782.77688 + dps: 2956.12596 + tps: 2098.84943 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2665.61088 - tps: 1892.58373 + dps: 3133.94942 + tps: 2225.10409 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 16166.79398 - tps: 11478.42372 + dps: 19106.2191 + tps: 13565.41556 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 3880.10548 - tps: 2754.87489 + dps: 4221.11866 + tps: 2996.99425 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 4825.7742 - tps: 3426.29968 + dps: 5275.85455 + tps: 3745.85673 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 9289.01742 - tps: 6595.20237 + dps: 11024.41766 + tps: 7827.33654 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 1816.84627 - tps: 1289.96085 + dps: 1993.37475 + tps: 1415.29608 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 1976.96021 - tps: 1403.64175 + dps: 2154.67542 + tps: 1529.81955 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 18785.44697 - tps: 13337.66735 + dps: 20415.68239 + tps: 14495.1345 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 4071.90171 - tps: 2891.05021 + dps: 4390.73584 + tps: 3117.42244 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 4972.46876 - tps: 3530.45282 + dps: 5382.83792 + tps: 3821.81492 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 11093.00227 - tps: 7876.03161 + dps: 12060.94926 + tps: 8563.27398 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 1982.38699 - tps: 1407.49476 + dps: 2163.27177 + tps: 1535.92296 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2098.48842 - tps: 1489.92678 + dps: 2307.66027 + tps: 1638.43879 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 11001.079 - tps: 7810.76609 + dps: 12603.15505 + tps: 8948.24008 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 3838.40213 - tps: 2725.26551 + dps: 4213.50574 + tps: 2991.58908 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 4724.40643 - tps: 3354.32857 + dps: 5181.41443 + tps: 3678.80425 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5941.57068 - tps: 4218.51518 + dps: 6701.72018 + tps: 4758.22132 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 1992.01883 - tps: 1414.33337 + dps: 2219.59274 + tps: 1575.91084 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2127.48402 - tps: 1510.51365 + dps: 2391.54882 + tps: 1697.99966 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 5346.66142 - tps: 3796.12961 + dps: 6095.96905 + tps: 4328.13803 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 4579.6421 - tps: 3251.54589 + dps: 5242.81629 + tps: 3722.39956 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 5449.69381 - tps: 3869.28261 + dps: 6244.73798 + tps: 4433.76396 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 2673.14441 - tps: 1897.93253 + dps: 3084.42471 + tps: 2189.94154 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2324.80101 - tps: 1650.60872 + dps: 2687.30839 + tps: 1907.98895 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2450.94583 - tps: 1740.17154 + dps: 2847.51658 + tps: 2021.73677 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 20155.75687 - tps: 14310.58738 + dps: 21602.25983 + tps: 15337.60448 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 3340.23866 - tps: 2371.56945 + dps: 3565.31765 + tps: 2531.37553 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 4052.23705 - tps: 2877.0883 + dps: 4362.56442 + tps: 3097.42074 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 12374.9067 - tps: 8786.18376 + dps: 13327.71462 + tps: 9462.67738 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 1665.57417 - tps: 1182.55766 + dps: 1801.12195 + tps: 1278.79658 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 1802.18088 - tps: 1279.54842 + dps: 1931.94247 + tps: 1371.67916 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 19933.30844 - tps: 14152.64899 + dps: 20917.34424 + tps: 14851.31441 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 5821.42478 - tps: 4133.21159 + dps: 5755.01589 + tps: 4086.06129 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 7057.38538 - tps: 5010.74362 + dps: 6977.56677 + tps: 4954.0724 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 11245.88248 - tps: 7984.57656 + dps: 11745.8977 + tps: 8339.58737 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2841.32422 - tps: 2017.34019 + dps: 2819.27876 + tps: 2001.68792 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2950.39788 - tps: 2094.7825 + dps: 2958.20917 + tps: 2100.32851 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 11801.91203 - tps: 8379.35754 + dps: 12702.97565 + tps: 9019.11271 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 5543.88579 - tps: 3936.15891 + dps: 5554.79296 + tps: 3943.903 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6765.2165 - tps: 4803.30371 + dps: 6731.48105 + tps: 4779.35155 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 6218.09838 - tps: 4414.84985 + dps: 6570.42716 + tps: 4665.00328 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2829.88608 - tps: 2009.21911 + dps: 2877.07864 + tps: 2042.72584 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2967.04573 - tps: 2106.60247 + dps: 3025.27929 + tps: 2147.94829 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 6952.04558 - tps: 4935.95236 + dps: 7331.48056 + tps: 5205.3512 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 6268.13941 - tps: 4450.37898 + dps: 6572.74902 + tps: 4666.65181 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 7467.12964 - tps: 5301.66205 + dps: 7789.73212 + tps: 5530.7098 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 3446.27251 - tps: 2446.85349 + dps: 3670.87356 + tps: 2606.32023 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 3151.36119 - tps: 2237.46644 + dps: 3327.6089 + tps: 2362.60232 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 3271.31422 - tps: 2322.6331 + dps: 3450.03208 + tps: 2449.52278 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 22282.56638 - tps: 15820.62213 + dps: 23219.85961 + tps: 16486.10032 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 4732.59433 - tps: 3360.14198 + dps: 4667.63477 + tps: 3314.02069 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 5693.49379 - tps: 4042.38059 + dps: 5622.1731 + tps: 3991.7429 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 13176.90168 - tps: 9355.60019 + dps: 13581.74601 + tps: 9643.03967 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 2363.40856 - tps: 1678.02008 + dps: 2331.63373 + tps: 1655.45995 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Deadly OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2496.28549 - tps: 1772.3627 + dps: 2433.5633 + tps: 1727.82994 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 19173.13668 - tps: 13612.92704 + dps: 23247.44311 + tps: 16505.68461 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 5568.43972 - tps: 3953.5922 + dps: 6272.71559 + tps: 4453.62807 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 6743.34758 - tps: 4787.77679 + dps: 7614.01841 + tps: 5405.95307 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 10779.85863 - tps: 7653.69963 + dps: 12997.94128 + tps: 9228.53831 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2726.84854 - tps: 1936.06246 + dps: 3069.97186 + tps: 2179.68002 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2825.4876 - tps: 2006.09619 + dps: 3209.17247 + tps: 2278.51245 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 11247.33795 - tps: 7985.60995 + dps: 14011.73182 + tps: 9948.32959 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 5273.16937 - tps: 3743.95025 + dps: 6051.5132 + tps: 4296.57437 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6382.81105 - tps: 4531.79585 + dps: 7364.51067 + tps: 5228.80258 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5906.57677 - tps: 4193.66951 + dps: 7278.19602 + tps: 5167.51917 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2685.55464 - tps: 1906.74379 + dps: 3110.04339 + tps: 2208.13081 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2814.13476 - tps: 1998.03568 + dps: 3272.31965 + tps: 2323.34695 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 6646.17456 - tps: 4718.78394 + dps: 7796.98672 + tps: 5535.86057 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 5964.65142 - tps: 4234.90251 + dps: 7024.9646 + tps: 4987.72486 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 7051.63039 - tps: 5006.65758 + dps: 8373.39727 + tps: 5945.11206 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 3289.5761 - tps: 2335.59903 + dps: 3894.11067 + tps: 2764.81858 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2998.51438 - tps: 2128.94521 + dps: 3547.02518 + tps: 2518.38788 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 3093.90739 - tps: 2196.67425 + dps: 3680.68935 + tps: 2613.28944 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 21433.20562 - tps: 15217.57599 + dps: 25773.52526 + tps: 18299.20293 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 4549.57409 - tps: 3230.1976 + dps: 5087.58463 + tps: 3612.18509 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 5455.13612 - tps: 3873.14664 + dps: 6177.58913 + tps: 4386.08828 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 12650.36922 - tps: 8981.76215 + dps: 15145.72974 + tps: 10753.46811 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 2268.41897 - tps: 1610.57747 + dps: 2550.58596 + tps: 1810.91603 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Deadly-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2393.60129 - tps: 1699.45691 + dps: 2687.73193 + tps: 1908.28967 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongMultiTarget" value: { - dps: 15349.34025 - tps: 10898.03158 + dps: 18199.41529 + tps: 12921.58485 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-LongSingleTarget" value: { - dps: 4898.82391 - tps: 3478.16498 + dps: 5357.42259 + tps: 3803.77004 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-FullBuffs-ShortSingleTarget" value: { - dps: 6147.87321 - tps: 4364.98998 + dps: 6693.77196 + tps: 4752.57809 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongMultiTarget" value: { - dps: 8403.32068 - tps: 5966.35768 + dps: 10000.7439 + tps: 7100.52817 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-LongSingleTarget" value: { - dps: 2251.48885 - tps: 1598.55709 + dps: 2475.2972 + tps: 1757.46101 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd-NoBuffs-ShortSingleTarget" value: { - dps: 2434.15573 - tps: 1728.25057 + dps: 2679.74802 + tps: 1902.62109 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongMultiTarget" value: { - dps: 9894.53117 - tps: 7025.11713 + dps: 12042.75914 + tps: 8550.35899 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-LongSingleTarget" value: { - dps: 4624.02506 - tps: 3283.05779 + dps: 5129.98414 + tps: 3642.28874 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-FullBuffs-ShortSingleTarget" value: { - dps: 5855.32517 - tps: 4157.28087 + dps: 6419.13785 + tps: 4557.58787 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongMultiTarget" value: { - dps: 5089.38352 - tps: 3613.4623 + dps: 6097.51125 + tps: 4329.23299 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-LongSingleTarget" value: { - dps: 2226.63788 - tps: 1580.9129 + dps: 2535.69986 + tps: 1800.3469 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_cleave_snd_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2416.85583 - tps: 1715.96764 + dps: 2778.3456 + tps: 1972.62538 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-LongMultiTarget" value: { - dps: 6021.31929 - tps: 4275.1367 + dps: 6935.02148 + tps: 4923.86525 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-LongSingleTarget" value: { - dps: 5338.21889 - tps: 3790.13541 + dps: 6154.22392 + tps: 4369.49898 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-FullBuffs-ShortSingleTarget" value: { - dps: 6508.43234 - tps: 4620.98696 + dps: 7498.95217 + tps: 5324.25604 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-LongMultiTarget" value: { - dps: 2817.69847 - tps: 2000.56591 + dps: 3322.79569 + tps: 2359.18494 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-LongSingleTarget" value: { - dps: 2529.16082 - tps: 1795.70418 + dps: 2983.36458 + tps: 2118.18885 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-combat_expose-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-combat_expose-NoBuffs-ShortSingleTarget" value: { - dps: 2704.37852 - tps: 1920.10875 + dps: 3185.33772 + tps: 2261.58978 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-LongMultiTarget" value: { - dps: 16308.63411 - tps: 11579.13022 + dps: 19276.14588 + tps: 13686.06357 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-LongSingleTarget" value: { - dps: 3909.70953 - tps: 2775.89376 + dps: 4256.58341 + tps: 3022.17422 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-FullBuffs-ShortSingleTarget" value: { - dps: 4898.23674 - tps: 3477.74809 + dps: 5354.20562 + tps: 3801.48599 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-LongMultiTarget" value: { - dps: 9382.1937 - tps: 6661.35753 + dps: 11147.33881 + tps: 7914.61056 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-LongSingleTarget" value: { - dps: 1833.07174 - tps: 1301.48093 + dps: 2007.61638 + tps: 1425.40763 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Orc-p1_combat-MH Instant OH Instant-fan_aoe-NoBuffs-ShortSingleTarget" value: { - dps: 2014.00189 - tps: 1429.94134 + dps: 2195.23546 + tps: 1558.61717 } } dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 6017.74792 - tps: 4272.60102 + dps: 6158.64303 + tps: 4372.63655 } } diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results index 3dc0a45451..bafb4506ac 100644 --- a/sim/rogue/TestSubtlety.results +++ b/sim/rogue/TestSubtlety.results @@ -790,84 +790,84 @@ dps_results: { } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-LongMultiTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget" value: { dps: 31063.54723 tps: 22055.11853 } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-LongSingleTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget" value: { dps: 8302.87853 tps: 5893.03954 } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-ShortSingleTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget" value: { dps: 9202.82134 tps: 6497.37367 } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-LongMultiTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget" value: { dps: 19249.68587 tps: 13667.27697 } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-LongSingleTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget" value: { dps: 4091.27574 tps: 2903.22932 } } dps_results: { - key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-ShortSingleTarget" + key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget" value: { dps: 3990.28275 tps: 2821.77203 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget" value: { dps: 30736.39303 tps: 21822.83905 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget" value: { dps: 8260.81378 tps: 5863.79055 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget" value: { dps: 9119.98395 tps: 6461.14512 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-LongMultiTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget" value: { dps: 19003.33314 tps: 13492.36653 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-LongSingleTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget" value: { dps: 4064.43692 tps: 2883.14709 } } dps_results: { - key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-ShortSingleTarget" + key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget" value: { dps: 3954.08906 tps: 2798.18684 diff --git a/sim/rogue/rogue_test.go b/sim/rogue/rogue_test.go index dd95eb24d2..74c4095886 100644 --- a/sim/rogue/rogue_test.go +++ b/sim/rogue/rogue_test.go @@ -17,7 +17,7 @@ func TestCombat(t *testing.T) { Class: proto.Class_ClassRogue, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../ui/rogue/gear_sets", "p1_combat"), Talents: CombatTalents, Glyphs: CombatGlyphs, Consumes: FullConsumes, @@ -49,7 +49,7 @@ func TestAssassination(t *testing.T) { Class: proto.Class_ClassRogue, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P1 Assassination", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../ui/rogue/gear_sets", "p1_assassination"), Talents: AssassinationTalents, Glyphs: AssassinationGlyphs, Consumes: FullConsumes, @@ -86,7 +86,7 @@ func TestSubtlety(t *testing.T) { Class: proto.Class_ClassRogue, Race: proto.Race_RaceBloodElf, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P2 Subtlety", GearSet: SubtletyP2Gear}, + GearSet: core.GetGearSet("../../ui/rogue/gear_sets", "p2_hemosub"), Talents: SubtletyTalents, Glyphs: SubtletyGlyphs, Consumes: FullConsumes, @@ -191,7 +191,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceTroll, Class: proto.Class_ClassRogue, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../ui/rogue/gear_sets", "p1_combat").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsCombatDI, Buffs: core.FullIndividualBuffs, @@ -335,25 +335,6 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredRogueThistleTea, } -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40499,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[40003]}, - {"id":40502,"enchant":3808,"gems":[40003]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[40003]}, - {"id":39765,"enchant":3845,"gems":[40003,0]}, - {"id":40496,"enchant":3604,"gems":[40053,0]}, - {"id":40260,"gems":[39999]}, - {"id":40500,"enchant":3823,"gems":[40003,40003]}, - {"id":39701,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":39714,"enchant":3789}, - {"id":40386,"enchant":3789}, - {"id":40385} - ]}`) var GearWithoutRED = core.EquipmentSpecFromJsonString(`{"items":[ {"id":37293,"enchant":3817,"gems":[41339,40088]}, {"id":37861}, @@ -392,22 +373,3 @@ var GearWithRED = core.EquipmentSpecFromJsonString(`{"items":[ {"id":37856,"enchant":3789}, {"id":37191} ]}`) -var SubtletyP2Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":46125,"enchant":3817,"gems":[41398,42143]}, - {"id":45517,"gems":[49110]}, - {"id":45245,"enchant":3808,"gems":[40023,40003]}, - {"id":45461,"enchant":3605,"gems":[40044]}, - {"id":45473,"enchant":3832,"gems":[40044,40023,40003]}, - {"id":45611,"enchant":3845,"gems":[40044,0]}, - {"id":46124,"enchant":3604,"gems":[39997,0]}, - {"id":46095,"enchant":3599,"gems":[42143,42143,39997]}, - {"id":45536,"enchant":3823,"gems":[40044,39997,40023]}, - {"id":45564,"enchant":3606,"gems":[40023,40003]}, - {"id":45608,"gems":[39997]}, - {"id":46048,"gems":[39997]}, - {"id":45609}, - {"id":45931}, - {"id":45132,"enchant":3789,"gems":[40044]}, - {"id":45484,"enchant":3789,"gems":[39997]}, - {"id":45296,"gems":[39997]} -]}`) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 9a48c96e7e..033a62af90 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1027,336 +1027,336 @@ dps_results: { } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-LongMultiTarget" value: { dps: 9035.86528 tps: 4047.67419 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-LongSingleTarget" value: { dps: 6291.44675 tps: 3479.44236 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-ShortSingleTarget" value: { dps: 9414.51494 tps: 5096.00168 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-LongMultiTarget" value: { dps: 4968.7198 tps: 1730.38831 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-LongSingleTarget" value: { dps: 3000.03597 tps: 1528.55443 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-advanced-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-ShortSingleTarget" value: { dps: 6016.15431 tps: 3208.86986 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-FullBuffs-LongMultiTarget" value: { dps: 8349.26198 tps: 3757.87025 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-FullBuffs-LongSingleTarget" value: { dps: 7176.08989 tps: 3986.58618 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-FullBuffs-ShortSingleTarget" value: { dps: 9191.48582 tps: 4819.67249 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-NoBuffs-LongMultiTarget" value: { dps: 4646.54934 tps: 1634.61929 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-NoBuffs-LongSingleTarget" value: { dps: 3242.70738 tps: 1666.24672 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-Adaptive-default-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-Adaptive-default-NoBuffs-ShortSingleTarget" value: { dps: 6473.75245 tps: 3322.57042 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-LongMultiTarget" value: { dps: 9035.86528 tps: 4047.67419 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-LongSingleTarget" value: { dps: 6291.44675 tps: 3479.44236 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget" value: { dps: 9414.51494 tps: 5096.00168 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-LongMultiTarget" value: { dps: 4968.7198 tps: 1730.38831 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-LongSingleTarget" value: { dps: 3000.03597 tps: 1528.55443 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget" value: { dps: 6016.15431 tps: 3208.86986 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-FullBuffs-LongMultiTarget" value: { dps: 8349.26198 tps: 3757.87025 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-FullBuffs-LongSingleTarget" value: { dps: 7176.08989 tps: 3986.58618 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-FullBuffs-ShortSingleTarget" value: { dps: 9191.48582 tps: 4819.67249 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-NoBuffs-LongMultiTarget" value: { dps: 4646.54934 tps: 1634.61929 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-NoBuffs-LongSingleTarget" value: { dps: 3242.70738 tps: 1666.24672 } } dps_results: { - key: "TestElemental-Settings-Orc-P1-EleFireElemental-default-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Orc-p1-EleFireElemental-default-NoBuffs-ShortSingleTarget" value: { dps: 6473.75245 tps: 3322.57042 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-LongMultiTarget" value: { dps: 8809.11153 tps: 4027.51914 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-LongSingleTarget" value: { dps: 6196.56475 tps: 3449.14419 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-ShortSingleTarget" value: { dps: 9234.94027 tps: 5048.61727 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-LongMultiTarget" value: { dps: 4771.54302 tps: 1702.63881 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-LongSingleTarget" value: { dps: 2934.77196 tps: 1513.76853 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-advanced-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-ShortSingleTarget" value: { dps: 5891.95198 tps: 3181.50163 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-FullBuffs-LongMultiTarget" value: { dps: 8146.99019 tps: 3741.09511 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-FullBuffs-LongSingleTarget" value: { dps: 7051.4988 tps: 3939.43553 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-FullBuffs-ShortSingleTarget" value: { dps: 8941.3347 tps: 4751.95495 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-NoBuffs-LongMultiTarget" value: { dps: 4477.00979 tps: 1622.08939 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-NoBuffs-LongSingleTarget" value: { dps: 3199.12549 tps: 1662.89306 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-Adaptive-default-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-Adaptive-default-NoBuffs-ShortSingleTarget" value: { dps: 6398.00238 tps: 3318.30979 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-LongMultiTarget" value: { dps: 8809.11153 tps: 4027.51914 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-LongSingleTarget" value: { dps: 6196.56475 tps: 3449.14419 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget" value: { dps: 9234.94027 tps: 5048.61727 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-LongMultiTarget" value: { dps: 4771.54302 tps: 1702.63881 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-LongSingleTarget" value: { dps: 2934.77196 tps: 1513.76853 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget" value: { dps: 5891.95198 tps: 3181.50163 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-FullBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-FullBuffs-LongMultiTarget" value: { dps: 8146.99019 tps: 3741.09511 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-FullBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-FullBuffs-LongSingleTarget" value: { dps: 7051.4988 tps: 3939.43553 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-FullBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-FullBuffs-ShortSingleTarget" value: { dps: 8941.3347 tps: 4751.95495 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-NoBuffs-LongMultiTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-NoBuffs-LongMultiTarget" value: { dps: 4477.00979 tps: 1622.08939 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-NoBuffs-LongSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-NoBuffs-LongSingleTarget" value: { dps: 3199.12549 tps: 1662.89306 } } dps_results: { - key: "TestElemental-Settings-Troll-P1-EleFireElemental-default-NoBuffs-ShortSingleTarget" + key: "TestElemental-Settings-Troll-p1-EleFireElemental-default-NoBuffs-ShortSingleTarget" value: { dps: 6398.00238 tps: 3318.30979 diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go index a93865ce8d..fe06b3efc2 100644 --- a/sim/shaman/elemental/elemental_test.go +++ b/sim/shaman/elemental/elemental_test.go @@ -18,7 +18,7 @@ func TestElemental(t *testing.T) { Race: proto.Race_RaceTroll, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -63,7 +63,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassShaman, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "p1").GearSet, TalentsString: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -137,23 +137,3 @@ var FullConsumes = &proto.Consumes{ PrepopPotion: proto.Potions_DestructionPotion, DefaultConjured: proto.Conjured_ConjuredDarkRune, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40516,"enchant":3820,"gems":[41285,40027]}, - {"id":44661,"gems":[39998]}, - {"id":40286,"enchant":3810}, - {"id":44005,"enchant":3722,"gems":[40027]}, - {"id":40514,"enchant":3832,"gems":[42144,42144]}, - {"id":40324,"enchant":2332,"gems":[42144,0]}, - {"id":40302,"enchant":3246,"gems":[0]}, - {"id":40301,"gems":[40014]}, - {"id":40560,"enchant":3721}, - {"id":40519,"enchant":3826}, - {"id":37694}, - {"id":40399}, - {"id":40432}, - {"id":40255}, - {"id":40395,"enchant":3834}, - {"id":40401,"enchant":1128}, - {"id":40267} -]}`) diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 3ae38d5c30..55b3d67607 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -986,504 +986,504 @@ dps_results: { } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-FullBuffs-LongMultiTarget" value: { dps: 25964.65641 tps: 15728.8729 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-FullBuffs-LongSingleTarget" value: { dps: 7600.66921 tps: 4170.90214 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-FullBuffs-ShortSingleTarget" value: { dps: 9540.35349 tps: 4535.4143 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-NoBuffs-LongMultiTarget" value: { dps: 13406.38583 tps: 8725.14793 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-NoBuffs-LongSingleTarget" value: { dps: 3966.98428 tps: 2133.40483 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_ft-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_ft-NoBuffs-ShortSingleTarget" value: { dps: 5176.40049 tps: 2432.22206 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-FullBuffs-LongMultiTarget" value: { dps: 25091.93781 tps: 15124.24448 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-FullBuffs-LongSingleTarget" value: { dps: 7699.98902 tps: 4247.9019 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-FullBuffs-ShortSingleTarget" value: { dps: 9646.20604 tps: 4628.51239 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-NoBuffs-LongMultiTarget" value: { dps: 12760.38465 tps: 8341.14282 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-NoBuffs-LongSingleTarget" value: { dps: 3954.59364 tps: 2136.52761 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-default_wf-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-default_wf-NoBuffs-ShortSingleTarget" value: { dps: 5182.68428 tps: 2436.57438 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-FullBuffs-LongMultiTarget" value: { dps: 25747.8393 tps: 15638.15768 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-FullBuffs-LongSingleTarget" value: { dps: 7598.54141 tps: 4174.54185 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-FullBuffs-ShortSingleTarget" value: { dps: 9632.1215 tps: 4630.93378 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-NoBuffs-LongMultiTarget" value: { dps: 13249.99136 tps: 8590.36568 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-NoBuffs-LongSingleTarget" value: { dps: 3959.39254 tps: 2140.06817 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-FT-phase_3-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-FT-phase_3-NoBuffs-ShortSingleTarget" value: { dps: 5239.13629 tps: 2485.37213 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-FullBuffs-LongMultiTarget" value: { dps: 21795.44709 tps: 13271.32898 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-FullBuffs-LongSingleTarget" value: { dps: 6556.30191 tps: 3510.95709 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-FullBuffs-ShortSingleTarget" value: { dps: 8494.81669 tps: 3914.41667 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-NoBuffs-LongMultiTarget" value: { dps: 10692.09644 tps: 7426.25233 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-NoBuffs-LongSingleTarget" value: { dps: 2993.48268 tps: 1630.55304 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_ft-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_ft-NoBuffs-ShortSingleTarget" value: { dps: 4015.50326 tps: 1886.07417 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-FullBuffs-LongMultiTarget" value: { dps: 20979.4015 tps: 12736.70809 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-FullBuffs-LongSingleTarget" value: { dps: 6636.41267 tps: 3567.04956 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-FullBuffs-ShortSingleTarget" value: { dps: 8621.09489 tps: 4005.03127 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-NoBuffs-LongMultiTarget" value: { dps: 9958.99597 tps: 6917.89332 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-NoBuffs-LongSingleTarget" value: { dps: 3049.77412 tps: 1667.28149 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-default_wf-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-default_wf-NoBuffs-ShortSingleTarget" value: { dps: 4085.11766 tps: 1936.40106 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-FullBuffs-LongMultiTarget" value: { dps: 21333.69354 tps: 12920.62246 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-FullBuffs-LongSingleTarget" value: { dps: 6521.18018 tps: 3489.70213 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-FullBuffs-ShortSingleTarget" value: { dps: 8435.62198 tps: 3890.32689 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-NoBuffs-LongMultiTarget" value: { dps: 10405.28766 tps: 7217.42592 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-NoBuffs-LongSingleTarget" value: { dps: 2980.10175 tps: 1616.57632 } } dps_results: { - key: "TestEnhancement-Settings-Orc-P1-WF-phase_3-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Orc-p1-WF-phase_3-NoBuffs-ShortSingleTarget" value: { dps: 4068.58061 tps: 1931.99696 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-FullBuffs-LongMultiTarget" value: { dps: 25778.93342 tps: 15756.01864 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-FullBuffs-LongSingleTarget" value: { dps: 7557.5647 tps: 4179.34415 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-FullBuffs-ShortSingleTarget" value: { dps: 9601.78813 tps: 4666.59215 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-NoBuffs-LongMultiTarget" value: { dps: 13393.55355 tps: 8806.40499 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-NoBuffs-LongSingleTarget" value: { dps: 3920.24202 tps: 2134.51804 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_ft-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_ft-NoBuffs-ShortSingleTarget" value: { dps: 5165.59729 tps: 2478.30686 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-FullBuffs-LongMultiTarget" value: { dps: 25338.71919 tps: 15490.74156 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-FullBuffs-LongSingleTarget" value: { dps: 7687.62093 tps: 4262.64697 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-FullBuffs-ShortSingleTarget" value: { dps: 9717.09802 tps: 4740.04546 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-NoBuffs-LongMultiTarget" value: { dps: 12762.24467 tps: 8377.10932 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-NoBuffs-LongSingleTarget" value: { dps: 3979.94984 tps: 2165.31179 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-default_wf-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-default_wf-NoBuffs-ShortSingleTarget" value: { dps: 5244.00439 tps: 2521.68893 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-FullBuffs-LongMultiTarget" value: { dps: 25664.52211 tps: 15641.99256 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-FullBuffs-LongSingleTarget" value: { dps: 7583.40997 tps: 4194.39541 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-FullBuffs-ShortSingleTarget" value: { dps: 9594.50242 tps: 4677.38196 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-NoBuffs-LongMultiTarget" value: { dps: 12784.15175 tps: 8320.97337 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-NoBuffs-LongSingleTarget" value: { dps: 3910.42966 tps: 2122.61061 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-FT-phase_3-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-FT-phase_3-NoBuffs-ShortSingleTarget" value: { dps: 5194.64488 tps: 2489.56687 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-FullBuffs-LongMultiTarget" value: { dps: 21508.80933 tps: 13149.16065 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-FullBuffs-LongSingleTarget" value: { dps: 6494.6328 tps: 3493.04504 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-FullBuffs-ShortSingleTarget" value: { dps: 8397.42616 tps: 3916.3862 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-NoBuffs-LongMultiTarget" value: { dps: 10520.26167 tps: 7341.26268 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-NoBuffs-LongSingleTarget" value: { dps: 2969.44345 tps: 1628.12274 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_ft-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_ft-NoBuffs-ShortSingleTarget" value: { dps: 3969.23916 tps: 1897.49183 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-FullBuffs-LongMultiTarget" value: { dps: 21036.32904 tps: 12869.59758 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-FullBuffs-LongSingleTarget" value: { dps: 6563.83628 tps: 3548.71796 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-FullBuffs-ShortSingleTarget" value: { dps: 8477.46107 tps: 3979.84841 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-NoBuffs-LongMultiTarget" value: { dps: 9874.13786 tps: 6962.9888 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-NoBuffs-LongSingleTarget" value: { dps: 3024.02085 tps: 1666.89355 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-default_wf-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-default_wf-NoBuffs-ShortSingleTarget" value: { dps: 4042.5674 tps: 1947.16305 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-FullBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-FullBuffs-LongMultiTarget" value: { dps: 21378.83741 tps: 13090.23159 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-FullBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-FullBuffs-LongSingleTarget" value: { dps: 6495.39721 tps: 3495.84742 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-FullBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-FullBuffs-ShortSingleTarget" value: { dps: 8430.01037 tps: 3953.85926 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-NoBuffs-LongMultiTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-NoBuffs-LongMultiTarget" value: { dps: 10330.30617 tps: 7176.61741 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-NoBuffs-LongSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-NoBuffs-LongSingleTarget" value: { dps: 2930.60404 tps: 1599.9115 } } dps_results: { - key: "TestEnhancement-Settings-Troll-P1-WF-phase_3-NoBuffs-ShortSingleTarget" + key: "TestEnhancement-Settings-Troll-p1-WF-phase_3-NoBuffs-ShortSingleTarget" value: { dps: 4030.72513 tps: 1945.96685 diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go index b551c4b117..33d9f3dd8b 100644 --- a/sim/shaman/enhancement/enhancement_test.go +++ b/sim/shaman/enhancement/enhancement_test.go @@ -18,7 +18,7 @@ func TestEnhancement(t *testing.T) { Race: proto.Race_RaceTroll, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: Phase1Gear}, + GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -56,7 +56,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassShaman, - Equipment: Phase1Gear, + Equipment: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "p1").GearSet, TalentsString: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -133,23 +133,3 @@ var enhShamWFFT = &proto.EnhancementShaman_Options{ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredFlameCap, } - -var Phase1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40543,"enchant":3817,"gems":[41398,40014]}, - {"id":44661,"gems":[40014]}, - {"id":40524,"enchant":3808,"gems":[40014]}, - {"id":40403,"enchant":3605}, - {"id":40523,"enchant":3832,"gems":[40003,40014]}, - {"id":40282,"enchant":3845,"gems":[42702,0]}, - {"id":40520,"enchant":3604,"gems":[42154,0]}, - {"id":40275,"gems":[42156]}, - {"id":40522,"enchant":3823,"gems":[39999,42156]}, - {"id":40367,"enchant":3606,"gems":[40058]}, - {"id":40474}, - {"id":40074}, - {"id":40684}, - {"id":37390}, - {"id":39763,"enchant":3789}, - {"id":39468,"enchant":3789}, - {"id":40322} -]}`) diff --git a/sim/shaman/restoration/TestRestoration.results b/sim/shaman/restoration/TestRestoration.results index 35ea45f059..0e57c90514 100644 --- a/sim/shaman/restoration/TestRestoration.results +++ b/sim/shaman/restoration/TestRestoration.results @@ -853,37 +853,37 @@ dps_results: { } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-FullBuffs-LongMultiTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-FullBuffs-LongMultiTarget" value: { dps: 1998.26195 } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-FullBuffs-LongSingleTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-FullBuffs-LongSingleTarget" value: { dps: 441.31659 } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-FullBuffs-ShortSingleTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-FullBuffs-ShortSingleTarget" value: { dps: 1149.59074 } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-NoBuffs-LongMultiTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-NoBuffs-LongMultiTarget" value: { dps: 1517.94942 } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-NoBuffs-LongSingleTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-NoBuffs-LongSingleTarget" value: { dps: 324.78607 } } dps_results: { - key: "TestRestoration-Settings-Troll-P1-Standard-Default-NoBuffs-ShortSingleTarget" + key: "TestRestoration-Settings-Troll-p1-Standard-Default-NoBuffs-ShortSingleTarget" value: { dps: 851.05887 } diff --git a/sim/shaman/restoration/restoration_test.go b/sim/shaman/restoration/restoration_test.go index 4588f171e8..3944f25510 100644 --- a/sim/shaman/restoration/restoration_test.go +++ b/sim/shaman/restoration/restoration_test.go @@ -17,7 +17,7 @@ func TestRestoration(t *testing.T) { Class: proto.Class_ClassShaman, Race: proto.Race_RaceTroll, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/restoration_shaman/gear_sets", "p1"), Talents: StandardTalents, Glyphs: StandardGlyphs, Consumes: FullConsumes, @@ -48,7 +48,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassShaman, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/restoration_shaman/gear_sets", "p1").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsStandard, Buffs: core.FullIndividualBuffs, @@ -110,23 +110,3 @@ var DefaultRotation = core.APLRotationFromJsonString(`{ {"action":{"autocastOtherCooldowns":{}}} ] }`) - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"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/sim/warlock/TestAffliction.results b/sim/warlock/TestAffliction.results index 38cac6c84b..992863ce85 100644 --- a/sim/warlock/TestAffliction.results +++ b/sim/warlock/TestAffliction.results @@ -8,14 +8,14 @@ character_stats_results: { final_stats: 946 final_stats: 4123.8 final_stats: 109 - final_stats: 369.69598 + final_stats: 359.69598 final_stats: 1481.01293 - final_stats: 747 + final_stats: 757 final_stats: 0 final_stats: 1184.81 - final_stats: 291 + final_stats: 281 final_stats: 1091.89543 - final_stats: 687 + final_stats: 697 final_stats: 0 final_stats: 0 final_stats: 27072 @@ -46,59 +46,59 @@ character_stats_results: { dps_results: { key: "TestAffliction-AllItems-Althor'sAbacus-50359" value: { - dps: 11527.2934 - tps: 10386.24146 + dps: 11589.70341 + tps: 10452.41374 } } dps_results: { key: "TestAffliction-AllItems-Althor'sAbacus-50366" value: { - dps: 11581.14648 - tps: 10436.1645 + dps: 11638.96447 + tps: 10499.40259 } } dps_results: { key: "TestAffliction-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 11377.1952 - tps: 10246.04964 + dps: 11413.90321 + tps: 10287.8283 } } dps_results: { key: "TestAffliction-AllItems-AustereEarthsiegeDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-Bandit'sInsignia-40371" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-BaubleofTrueBlood-50354" value: { - dps: 11189.68731 - tps: 10067.42298 - hps: 95.83649 + dps: 11219.3566 + tps: 10104.34087 + hps: 95.37766 } } dps_results: { key: "TestAffliction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 11189.68731 - tps: 10067.42298 - hps: 95.83649 + dps: 11219.3566 + tps: 10104.34087 + hps: 95.37766 } } dps_results: { key: "TestAffliction-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 11466.12927 - tps: 10322.61902 + dps: 11491.63633 + tps: 10354.42035 } } dps_results: { @@ -111,36 +111,36 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-BracingEarthsiegeDiamond" value: { - dps: 11493.94516 - tps: 10150.93679 + dps: 11496.24105 + tps: 10154.62872 } } dps_results: { key: "TestAffliction-AllItems-ChaoticSkyflareDiamond" value: { - dps: 11677.71225 - tps: 10543.32889 + dps: 11676.35017 + tps: 10542.71746 } } dps_results: { key: "TestAffliction-AllItems-CorpseTongueCoin-50349" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-CorpseTongueCoin-50352" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 hps: 64 } } @@ -154,50 +154,50 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 11306.28794 - tps: 10187.00871 + dps: 11299.19985 + tps: 10176.26635 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Death-42990" value: { - dps: 11362.87074 - tps: 10245.11458 + dps: 11350.027 + tps: 10230.42741 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 11338.27839 - tps: 10218.47478 + dps: 11336.61438 + tps: 10220.84977 } } dps_results: { key: "TestAffliction-AllItems-Death'sChoice-47464" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 11222.28974 - tps: 10101.83385 + dps: 11258.51335 + tps: 10143.37591 } } dps_results: { key: "TestAffliction-AllItems-Deathbringer'sWill-50362" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-Deathbringer'sWill-50363" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { @@ -210,141 +210,141 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-Defender'sCode-40257" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-DestructiveSkyflareDiamond" value: { - dps: 11468.33854 - tps: 10333.95518 + dps: 11468.64221 + tps: 10335.0095 } } dps_results: { key: "TestAffliction-AllItems-DislodgedForeignObject-50348" value: { - dps: 12017.64987 - tps: 10876.35803 + dps: 11993.51457 + tps: 10846.68163 } } dps_results: { key: "TestAffliction-AllItems-DislodgedForeignObject-50353" value: { - dps: 11941.21916 - tps: 10807.809 + dps: 11904.82651 + tps: 10766.46936 } } dps_results: { key: "TestAffliction-AllItems-EffulgentSkyflareDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-EmberSkyflareDiamond" value: { - dps: 11500.63009 - tps: 10353.69349 + dps: 11550.43891 + tps: 10409.37533 } } dps_results: { key: "TestAffliction-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 11467.14936 - tps: 10332.766 + dps: 11466.29094 + tps: 10332.65823 } } dps_results: { key: "TestAffliction-AllItems-EnigmaticStarflareDiamond" value: { - dps: 11461.95664 - tps: 10327.57328 + dps: 11462.67734 + tps: 10329.04463 } } dps_results: { key: "TestAffliction-AllItems-EphemeralSnowflake-50260" value: { - dps: 11408.53138 - tps: 10290.70935 + dps: 11415.61284 + tps: 10301.0259 } } dps_results: { key: "TestAffliction-AllItems-EssenceofGossamer-37220" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-EternalEarthsiegeDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 11362.14556 - tps: 10240.731 + dps: 11392.41888 + tps: 10279.20572 } } dps_results: { key: "TestAffliction-AllItems-EyeoftheBroodmother-45308" value: { - dps: 11539.89658 - tps: 10403.94453 + dps: 11613.66401 + tps: 10483.35914 } } dps_results: { key: "TestAffliction-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 11210.45398 - tps: 10090.41445 + dps: 11249.84836 + tps: 10132.57025 } } dps_results: { key: "TestAffliction-AllItems-ForethoughtTalisman-40258" value: { - dps: 11390.52145 - tps: 10257.28535 + dps: 11454.84677 + tps: 10326.95014 } } dps_results: { key: "TestAffliction-AllItems-ForgeEmber-37660" value: { - dps: 11399.13193 - tps: 10270.40466 + dps: 11451.53994 + tps: 10328.09448 } } dps_results: { key: "TestAffliction-AllItems-ForlornSkyflareDiamond" value: { - dps: 11493.94516 - tps: 10356.22371 + dps: 11496.24105 + tps: 10359.9915 } } dps_results: { key: "TestAffliction-AllItems-ForlornStarflareDiamond" value: { - dps: 11484.55994 - tps: 10347.39472 + dps: 11483.13215 + tps: 10346.93252 } } dps_results: { key: "TestAffliction-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-FuturesightRune-38763" value: { - dps: 11329.33396 - tps: 10199.30733 + dps: 11396.70013 + tps: 10272.15143 } } dps_results: { @@ -357,22 +357,22 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-GlowingTwilightScale-54573" value: { - dps: 11555.21045 - tps: 10412.37149 + dps: 11606.44686 + tps: 10468.57327 } } dps_results: { key: "TestAffliction-AllItems-GlowingTwilightScale-54589" value: { - dps: 11611.48591 - tps: 10465.06524 + dps: 11672.86848 + tps: 10531.51463 } } dps_results: { key: "TestAffliction-AllItems-GnomishLightningGenerator-41121" value: { - dps: 11328.44968 - tps: 10206.38634 + dps: 11328.93517 + tps: 10205.04178 } } dps_results: { @@ -385,57 +385,57 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 11570.62739 - tps: 10426.98836 + dps: 11619.71969 + tps: 10481.11354 } } dps_results: { key: "TestAffliction-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 11467.14936 - tps: 10332.766 + dps: 11466.29094 + tps: 10332.65823 } } dps_results: { key: "TestAffliction-AllItems-ImpassiveStarflareDiamond" value: { - dps: 11461.95664 - tps: 10327.57328 + dps: 11462.67734 + tps: 10329.04463 } } dps_results: { key: "TestAffliction-AllItems-IncisorFragment-37723" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 11453.96416 - tps: 10315.68315 + dps: 11459.57037 + tps: 10323.93 } } dps_results: { key: "TestAffliction-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-MajesticDragonFigurine-40430" value: { - dps: 11366.78898 - tps: 10234.43882 + dps: 11421.26296 + tps: 10295.25432 } } dps_results: { @@ -448,57 +448,57 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-MeteoriteWhetstone-37390" value: { - dps: 11281.99573 - tps: 10161.53984 + dps: 11315.56453 + tps: 10200.4271 } } dps_results: { key: "TestAffliction-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 11887.96841 - tps: 10756.88562 + dps: 11949.70402 + tps: 10816.94364 } } dps_results: { key: "TestAffliction-AllItems-OfferingofSacrifice-37638" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-PersistentEarthshatterDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedScarab-21685" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { @@ -511,322 +511,322 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-PurifiedShardoftheGods" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-ReignoftheDead-47316" value: { - dps: 11611.0254 - tps: 10484.74137 + dps: 11613.09502 + tps: 10482.68486 } } dps_results: { key: "TestAffliction-AllItems-ReignoftheDead-47477" value: { - dps: 11659.44719 - tps: 10531.81184 + dps: 11679.35305 + tps: 10546.02539 } } dps_results: { key: "TestAffliction-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 11647.24577 - tps: 10512.86242 + dps: 11650.10483 + tps: 10516.47212 } } dps_results: { key: "TestAffliction-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 11430.61675 - tps: 10291.6323 + dps: 11448.68581 + tps: 10313.21361 } } dps_results: { key: "TestAffliction-AllItems-RuneofRepulsion-40372" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-SealofthePantheon-36993" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-ShinyShardoftheGods" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-SliverofPureIce-50339" value: { - dps: 11523.21537 - tps: 10387.60996 + dps: 11570.03638 + tps: 10439.46262 } } dps_results: { key: "TestAffliction-AllItems-SliverofPureIce-50346" value: { - dps: 11573.56702 - tps: 10434.33158 + dps: 11589.75558 + tps: 10453.99405 } } dps_results: { key: "TestAffliction-AllItems-SoulPreserver-37111" value: { - dps: 11315.50643 - tps: 10185.91081 + dps: 11373.8891 + tps: 10249.78418 } } dps_results: { key: "TestAffliction-AllItems-SouloftheDead-40382" value: { - dps: 11312.81693 - tps: 10197.03683 + dps: 11360.2256 + tps: 10246.13078 } } dps_results: { key: "TestAffliction-AllItems-SparkofLife-37657" value: { - dps: 11388.68258 - tps: 10272.16518 + dps: 11381.60186 + tps: 10259.64889 } } dps_results: { key: "TestAffliction-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 11185.97351 - tps: 10062.63587 + dps: 11198.52319 + tps: 10072.41303 } } dps_results: { key: "TestAffliction-AllItems-SwiftSkyflareDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-SwiftStarflareDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-SwiftWindfireDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 11255.41853 - tps: 10129.24961 + dps: 11304.64392 + tps: 10184.06172 } } dps_results: { key: "TestAffliction-AllItems-TearsoftheVanquished-47215" value: { - dps: 11240.08436 - tps: 10116.48051 + dps: 11227.72664 + tps: 10109.72371 } } dps_results: { key: "TestAffliction-AllItems-TheGeneral'sHeart-45507" value: { - dps: 11183.09176 - tps: 10062.63587 + dps: 11219.88278 + tps: 10104.74534 } } dps_results: { key: "TestAffliction-AllItems-ThunderingSkyflareDiamond" value: { - dps: 11439.19846 - tps: 10304.81511 + dps: 11442.21264 + tps: 10308.57993 } } dps_results: { key: "TestAffliction-AllItems-TinyAbominationinaJar-50351" value: { - dps: 11187.72588 - tps: 10062.63587 + dps: 11200.20378 + tps: 10072.41303 } } dps_results: { key: "TestAffliction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 11187.72588 - tps: 10062.63587 + dps: 11200.20378 + tps: 10072.41303 } } dps_results: { key: "TestAffliction-AllItems-TirelessSkyflareDiamond" value: { - dps: 11493.94516 - tps: 10356.22371 + dps: 11496.24105 + tps: 10359.9915 } } dps_results: { key: "TestAffliction-AllItems-TirelessStarflareDiamond" value: { - dps: 11484.55994 - tps: 10347.39472 + dps: 11483.13215 + tps: 10346.93252 } } dps_results: { key: "TestAffliction-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 11506.69572 - tps: 10385.77888 + dps: 11486.31437 + tps: 10362.89506 } } dps_results: { key: "TestAffliction-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 11484.55994 - tps: 10347.39472 + dps: 11483.13215 + tps: 10346.93252 } } dps_results: { key: "TestAffliction-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 11493.94516 - tps: 10356.22371 + dps: 11496.24105 + tps: 10359.9915 } } dps_results: { key: "TestAffliction-AllItems-WingedTalisman-37844" value: { - dps: 11334.44668 - tps: 10205.28967 + dps: 11364.28627 + tps: 10240.43639 } } dps_results: { key: "TestAffliction-Average-Default" value: { - dps: 11803.04473 - tps: 10666.49912 + dps: 11806.07212 + tps: 10670.62344 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--FullBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-LongMultiTarget" value: { - dps: 30702.64081 - tps: 35745.75223 + dps: 30582.98136 + tps: 35643.74638 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--FullBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-LongSingleTarget" value: { - dps: 11748.80892 - tps: 10617.02564 + dps: 11724.38345 + tps: 10597.71332 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--FullBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-ShortSingleTarget" value: { - dps: 12744.95769 - tps: 11577.47449 + dps: 12726.4766 + tps: 11558.42963 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--NoBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-LongMultiTarget" value: { - dps: 18516.05245 - tps: 23877.60621 + dps: 18393.00186 + tps: 23757.31598 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--NoBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-LongSingleTarget" value: { - dps: 6828.69145 - tps: 6423.31339 + dps: 6847.34472 + tps: 6440.97942 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-AffItemSwap--NoBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-ShortSingleTarget" value: { - dps: 6811.71339 - tps: 6318.22566 + dps: 6783.22791 + tps: 6287.07162 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--FullBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-LongMultiTarget" value: { - dps: 33373.41685 - tps: 38482.96384 + dps: 33161.3041 + tps: 38262.64229 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--FullBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-LongSingleTarget" value: { - dps: 11677.71225 - tps: 10543.32889 + dps: 11676.35017 + tps: 10542.71746 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--FullBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12848.96236 - tps: 11691.55739 + dps: 12803.3077 + tps: 11637.50671 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--NoBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-LongMultiTarget" value: { - dps: 20278.98603 - tps: 25715.17369 + dps: 20117.55745 + tps: 25576.82835 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--NoBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6819.41182 - tps: 6412.14959 + dps: 6839.51257 + tps: 6433.68312 } } dps_results: { - key: "TestAffliction-Settings-Orc-P3-Affliction Warlock--NoBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6791.88919 - tps: 6297.5077 + dps: 6779.2589 + tps: 6282.50028 } } dps_results: { key: "TestAffliction-SwitchInFrontOfTarget-Default" value: { - dps: 11636.45496 - tps: 10543.32889 + dps: 11634.98248 + tps: 10542.71746 } } diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results index 6136e33568..b67e93cdfa 100644 --- a/sim/warlock/TestDemonology.results +++ b/sim/warlock/TestDemonology.results @@ -3,22 +3,22 @@ character_stats_results: { value: { final_stats: 320.1 final_stats: 322.3 - final_stats: 1889.415 - final_stats: 1569.7 - final_stats: 1337.6 - final_stats: 4701.97114 + final_stats: 1901.515 + final_stats: 1565.3 + final_stats: 1400.3 + final_stats: 4710.60134 final_stats: 109 - final_stats: 379 - final_stats: 1773.98174 - final_stats: 725 + final_stats: 347 + final_stats: 1772.76982 + final_stats: 719 final_stats: 0 final_stats: 1184.81 - final_stats: 379 + final_stats: 347 final_stats: 1383.9553 - final_stats: 485 + final_stats: 479 final_stats: 0 final_stats: 0 - final_stats: 27935.145 + final_stats: 27867.165 final_stats: 0 final_stats: 0 final_stats: 5678.1 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26654.4945 + final_stats: 26779.1245 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,787 +46,787 @@ character_stats_results: { dps_results: { key: "TestDemonology-AllItems-Althor'sAbacus-50359" value: { - dps: 10697.49828 - tps: 8977.21828 + dps: 10604.36898 + tps: 8885.1363 } } dps_results: { key: "TestDemonology-AllItems-Althor'sAbacus-50366" value: { - dps: 10727.13496 - tps: 9003.06737 + dps: 10640.20902 + tps: 8916.36317 } } dps_results: { key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 10562.60209 - tps: 8859.56924 + dps: 10471.77686 + tps: 8770.33561 } } dps_results: { key: "TestDemonology-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10697.36926 - tps: 8948.6123 + dps: 10662.35912 + tps: 8920.39325 } } dps_results: { key: "TestDemonology-AllItems-Bandit'sInsignia-40371" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10374.57037 - tps: 8694.85596 - hps: 97.91731 + dps: 10295.98408 + tps: 8616.2298 + hps: 98.20466 } } dps_results: { key: "TestDemonology-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10374.57037 - tps: 8694.85596 - hps: 97.91731 + dps: 10295.98408 + tps: 8616.2298 + hps: 98.20466 } } dps_results: { key: "TestDemonology-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10733.64696 - tps: 8982.72699 + dps: 10668.02323 + tps: 8924.92243 } } dps_results: { key: "TestDemonology-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8460.37621 - tps: 7067.64786 + dps: 8341.78209 + tps: 6969.29925 } } dps_results: { key: "TestDemonology-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10742.35345 - tps: 8811.33818 + dps: 10688.20693 + tps: 8765.37118 } } dps_results: { key: "TestDemonology-AllItems-ChaoticSkyflareDiamond" value: { - dps: 10918.23897 - tps: 9170.3022 + dps: 10879.42382 + tps: 9138.29292 } } dps_results: { key: "TestDemonology-AllItems-CorpseTongueCoin-50349" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-CorpseTongueCoin-50352" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10443.23762 - tps: 8755.9389 + dps: 10352.67332 + tps: 8665.46136 hps: 64 } } dps_results: { key: "TestDemonology-AllItems-DarkCoven'sRegalia" value: { - dps: 10916.67667 - tps: 9327.48212 + dps: 10968.31656 + tps: 9379.56995 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10500.99774 - tps: 8821.18988 + dps: 10428.25453 + tps: 8748.06518 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10549.9376 - tps: 8868.52391 + dps: 10464.82704 + tps: 8785.35934 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10506.86093 - tps: 8817.57959 + dps: 10421.72496 + tps: 8734.68072 } } dps_results: { key: "TestDemonology-AllItems-Death'sChoice-47464" value: { - dps: 10377.09209 - tps: 8697.28423 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10412.30705 - tps: 8732.49919 + dps: 10334.89623 + tps: 8654.70689 } } dps_results: { key: "TestDemonology-AllItems-Deathbringer'sWill-50362" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-Deathbringer'sWill-50363" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-DeathbringerGarb" value: { - dps: 9384.98273 - tps: 7910.80297 + dps: 9323.60353 + tps: 7853.2179 } } dps_results: { key: "TestDemonology-AllItems-Defender'sCode-40257" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10716.29878 - tps: 8968.36201 + dps: 10677.46841 + tps: 8936.33751 } } dps_results: { key: "TestDemonology-AllItems-DislodgedForeignObject-50348" value: { - dps: 11181.21623 - tps: 9445.54667 + dps: 11091.71394 + tps: 9354.00944 } } dps_results: { key: "TestDemonology-AllItems-DislodgedForeignObject-50353" value: { - dps: 11093.0426 - tps: 9361.14898 + dps: 11016.25861 + tps: 9287.5221 } } dps_results: { key: "TestDemonology-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10697.36926 - tps: 8948.6123 + dps: 10662.35912 + tps: 8920.39325 } } dps_results: { key: "TestDemonology-AllItems-EmberSkyflareDiamond" value: { - dps: 10761.03815 - tps: 9004.87321 + dps: 10693.91646 + tps: 8945.53008 } } dps_results: { key: "TestDemonology-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10713.86603 - tps: 8965.92926 + dps: 10675.15882 + tps: 8934.02792 } } dps_results: { key: "TestDemonology-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10709.55921 - tps: 8961.62244 + dps: 10671.16977 + tps: 8930.03887 } } dps_results: { key: "TestDemonology-AllItems-EphemeralSnowflake-50260" value: { - dps: 10582.34274 - tps: 8899.81513 + dps: 10508.48794 + tps: 8829.57244 } } dps_results: { key: "TestDemonology-AllItems-EssenceofGossamer-37220" value: { - dps: 10413.40143 - tps: 8729.6622 + dps: 10332.49936 + tps: 8648.95559 } } dps_results: { key: "TestDemonology-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10502.83216 - tps: 8821.95001 + dps: 10447.11188 + tps: 8769.17559 } } dps_results: { key: "TestDemonology-AllItems-EyeoftheBroodmother-45308" value: { - dps: 10737.43968 - tps: 9028.18694 + dps: 10642.52833 + tps: 8935.15369 } } dps_results: { key: "TestDemonology-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10420.4707 - tps: 8732.62835 + dps: 10346.88763 + tps: 8661.34453 } } dps_results: { key: "TestDemonology-AllItems-ForethoughtTalisman-40258" value: { - dps: 10579.479 - tps: 8873.41035 + dps: 10493.09432 + tps: 8789.11652 } } dps_results: { key: "TestDemonology-AllItems-ForgeEmber-37660" value: { - dps: 10716.14625 - tps: 9009.76745 + dps: 10614.95234 + tps: 8909.05579 } } dps_results: { key: "TestDemonology-AllItems-ForlornSkyflareDiamond" value: { - dps: 10742.35345 - tps: 8989.02227 + dps: 10688.20693 + tps: 8942.10206 } } dps_results: { key: "TestDemonology-AllItems-ForlornStarflareDiamond" value: { - dps: 10729.13963 - tps: 8977.81811 + dps: 10685.42688 + tps: 8940.21624 } } dps_results: { key: "TestDemonology-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-FuturesightRune-38763" value: { - dps: 10557.25498 - tps: 8856.16714 + dps: 10462.57071 + tps: 8762.40805 } } dps_results: { key: "TestDemonology-AllItems-Gladiator'sFelshroud" value: { - dps: 9308.23121 - tps: 7796.06537 + dps: 9175.07087 + tps: 7691.21526 } } dps_results: { key: "TestDemonology-AllItems-GlowingTwilightScale-54573" value: { - dps: 10715.49104 - tps: 8993.12643 + dps: 10622.45931 + tps: 8900.97561 } } dps_results: { key: "TestDemonology-AllItems-GlowingTwilightScale-54589" value: { - dps: 10747.72012 - tps: 9020.58021 + dps: 10668.03458 + tps: 8940.56507 } } dps_results: { key: "TestDemonology-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10537.56059 - tps: 8856.04579 + dps: 10453.86273 + tps: 8775.51739 } } dps_results: { key: "TestDemonology-AllItems-Gul'dan'sRegalia" value: { - dps: 9693.47626 - tps: 8056.11992 + dps: 9615.25472 + tps: 7984.96246 } } dps_results: { key: "TestDemonology-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 10715.56041 - tps: 8992.49374 + dps: 10627.07595 + tps: 8903.85379 } } dps_results: { key: "TestDemonology-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10713.86603 - tps: 8965.92926 + dps: 10675.15882 + tps: 8934.02792 } } dps_results: { key: "TestDemonology-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10709.55921 - tps: 8961.62244 + dps: 10671.16977 + tps: 8930.03887 } } dps_results: { key: "TestDemonology-AllItems-IncisorFragment-37723" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10730.69555 - tps: 8983.94879 + dps: 10668.89129 + tps: 8927.3497 } } dps_results: { key: "TestDemonology-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10588.08006 - tps: 8881.46387 + dps: 10499.17866 + tps: 8794.14199 } } dps_results: { key: "TestDemonology-AllItems-MaleficRaiment" value: { - dps: 7327.054 - tps: 6049.25718 + dps: 7250.6781 + tps: 5975.51356 } } dps_results: { key: "TestDemonology-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10465.89185 - tps: 8786.08399 + dps: 10394.69359 + tps: 8714.50425 } } dps_results: { key: "TestDemonology-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10670.93806 - tps: 8964.86941 + dps: 10576.01732 + tps: 8872.03951 } } dps_results: { key: "TestDemonology-AllItems-OfferingofSacrifice-37638" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedScarab-21685" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-PlagueheartGarb" value: { - dps: 8999.83333 - tps: 7558.70387 + dps: 8883.47395 + tps: 7445.29568 } } dps_results: { key: "TestDemonology-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10696.1288 - tps: 8947.52516 + dps: 10661.12639 + tps: 8919.31291 } } dps_results: { key: "TestDemonology-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10697.36926 - tps: 8948.6123 + dps: 10662.35912 + tps: 8920.39325 } } dps_results: { key: "TestDemonology-AllItems-PurifiedShardoftheGods" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-ReignoftheDead-47316" value: { - dps: 10794.2853 - tps: 9078.67959 + dps: 10753.53251 + tps: 9040.65571 } } dps_results: { key: "TestDemonology-AllItems-ReignoftheDead-47477" value: { - dps: 10855.55381 - tps: 9134.37581 + dps: 10793.95595 + tps: 9076.93663 } } dps_results: { key: "TestDemonology-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 10892.12819 - tps: 9144.19142 + dps: 10857.05704 + tps: 9115.92614 } } dps_results: { key: "TestDemonology-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10697.31952 - tps: 8946.77617 + dps: 10661.78434 + tps: 8918.29649 } } dps_results: { key: "TestDemonology-AllItems-RuneofRepulsion-40372" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-SealofthePantheon-36993" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-ShinyShardoftheGods" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10443.23762 - tps: 8755.9389 + dps: 10352.67332 + tps: 8665.46136 } } dps_results: { key: "TestDemonology-AllItems-SliverofPureIce-50339" value: { - dps: 10685.90494 - tps: 8970.13452 + dps: 10590.27084 + tps: 8876.56401 } } dps_results: { key: "TestDemonology-AllItems-SliverofPureIce-50346" value: { - dps: 10715.44381 - tps: 8996.55204 + dps: 10619.35779 + tps: 8901.39628 } } dps_results: { key: "TestDemonology-AllItems-SoulPreserver-37111" value: { - dps: 10516.72757 - tps: 8819.90596 + dps: 10419.53583 + tps: 8723.56962 } } dps_results: { key: "TestDemonology-AllItems-SouloftheDead-40382" value: { - dps: 10542.87251 - tps: 8860.09483 + dps: 10434.67425 + tps: 8754.95535 } } dps_results: { key: "TestDemonology-AllItems-SparkofLife-37657" value: { - dps: 10567.73513 - tps: 8879.47025 + dps: 10500.23482 + tps: 8812.6417 } } dps_results: { key: "TestDemonology-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10553.14774 - tps: 8855.63325 + dps: 10487.61162 + tps: 8795.65399 } } dps_results: { key: "TestDemonology-AllItems-SwiftSkyflareDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-SwiftStarflareDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-SwiftWindfireDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10475.0263 - tps: 8784.6612 + dps: 10374.27507 + tps: 8683.67864 } } dps_results: { key: "TestDemonology-AllItems-TearsoftheVanquished-47215" value: { - dps: 10452.0377 - tps: 8762.24199 + dps: 10359.11739 + tps: 8670.92251 } } dps_results: { key: "TestDemonology-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10377.10343 - tps: 8697.29557 + dps: 10293.92291 + tps: 8613.73356 } } dps_results: { key: "TestDemonology-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10689.91118 - tps: 8941.97441 + dps: 10654.63883 + tps: 8913.50793 } } dps_results: { key: "TestDemonology-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10570.01228 - tps: 8866.07603 + dps: 10591.22432 + tps: 8889.47961 } } dps_results: { key: "TestDemonology-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10570.01228 - tps: 8866.07603 + dps: 10591.22432 + tps: 8889.47961 } } dps_results: { key: "TestDemonology-AllItems-TirelessSkyflareDiamond" value: { - dps: 10742.35345 - tps: 8989.02227 + dps: 10688.20693 + tps: 8942.10206 } } dps_results: { key: "TestDemonology-AllItems-TirelessStarflareDiamond" value: { - dps: 10729.13963 - tps: 8977.81811 + dps: 10685.42688 + tps: 8940.21624 } } dps_results: { key: "TestDemonology-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10630.86785 - tps: 8934.97895 + dps: 10558.39672 + tps: 8867.6235 } } dps_results: { key: "TestDemonology-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10729.13963 - tps: 8977.81811 + dps: 10685.42688 + tps: 8940.21624 } } dps_results: { key: "TestDemonology-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10742.35345 - tps: 8989.02227 + dps: 10688.20693 + tps: 8942.10206 } } dps_results: { key: "TestDemonology-AllItems-WingedTalisman-37844" value: { - dps: 10571.61632 - tps: 8869.761 + dps: 10481.35226 + tps: 8780.40047 } } dps_results: { key: "TestDemonology-Average-Default" value: { - dps: 11037.44241 - tps: 9283.68037 + dps: 10984.9289 + tps: 9234.4239 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--FullBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-LongMultiTarget" value: { - dps: 36186.13659 - tps: 40459.53073 + dps: 35688.50982 + tps: 39967.79205 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--FullBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-LongSingleTarget" value: { - dps: 10918.23897 - tps: 9170.3022 + dps: 10879.42382 + tps: 9138.29292 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--FullBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12436.47516 - tps: 10461.28742 + dps: 12309.70211 + tps: 10349.46003 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--NoBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-LongMultiTarget" value: { - dps: 22251.44599 - tps: 27533.19963 + dps: 21731.79307 + tps: 26990.03298 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--NoBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6330.50453 - tps: 5723.97757 + dps: 6279.91083 + tps: 5676.74983 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock--NoBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6607.38243 - tps: 5877.83924 + dps: 6579.56895 + tps: 5853.46081 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-FullBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-LongMultiTarget" value: { - dps: 14053.21156 - tps: 13879.42042 + dps: 13982.39609 + tps: 13817.09351 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-FullBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-LongSingleTarget" value: { - dps: 10929.05225 - tps: 9178.90694 + dps: 10847.41562 + tps: 9104.96012 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-FullBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-ShortSingleTarget" value: { - dps: 12443.58454 - tps: 10469.4423 + dps: 12337.7829 + tps: 10378.28722 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-NoBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-LongMultiTarget" value: { - dps: 8659.53405 - tps: 10222.51675 + dps: 8601.61974 + tps: 10170.95234 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-NoBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-LongSingleTarget" value: { - dps: 6317.52711 - tps: 5713.07182 + dps: 6265.49186 + tps: 5662.95196 } } dps_results: { - key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-demo-NoBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-ShortSingleTarget" value: { - dps: 6647.74354 - tps: 5918.09956 + dps: 6618.25619 + tps: 5892.63729 } } dps_results: { key: "TestDemonology-SwitchInFrontOfTarget-Default" value: { - dps: 10782.81262 - tps: 9172.20429 + dps: 10730.83996 + tps: 9136.29049 } } diff --git a/sim/warlock/TestDestruction.results b/sim/warlock/TestDestruction.results index 158033359d..b4ca7b6134 100644 --- a/sim/warlock/TestDestruction.results +++ b/sim/warlock/TestDestruction.results @@ -3,22 +3,22 @@ character_stats_results: { value: { final_stats: 320.1 final_stats: 322.3 - final_stats: 1884.575 - final_stats: 1577.4 - final_stats: 1129.7 - final_stats: 4366.583 + final_stats: 1876.105 + final_stats: 1566.4 + final_stats: 895.4 + final_stats: 4251.206 final_stats: 109 - final_stats: 366 - final_stats: 1682.76069 - final_stats: 453 + final_stats: 341 + final_stats: 1667.73089 + final_stats: 705 final_stats: 0 final_stats: 1184.81 - final_stats: 366 - final_stats: 1103.89543 - final_stats: 453 + final_stats: 341 + final_stats: 1091.89543 + final_stats: 705 final_stats: 0 final_stats: 0 - final_stats: 28054.11 + final_stats: 27884.16 final_stats: 0 final_stats: 0 final_stats: 5678.1 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 27974.5425 + final_stats: 27887.3015 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,780 +46,787 @@ character_stats_results: { dps_results: { key: "TestDestruction-AllItems-Althor'sAbacus-50359" value: { - dps: 11030.07603 - tps: 8985.82459 + dps: 11031.36328 + tps: 9009.50807 } } dps_results: { key: "TestDestruction-AllItems-Althor'sAbacus-50366" value: { - dps: 11069.01906 - tps: 9018.7932 + dps: 11071.38029 + tps: 9043.45951 } } dps_results: { key: "TestDestruction-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-Bandit'sInsignia-40371" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10712.76449 - tps: 8717.51714 - hps: 97.7892 + dps: 10706.95094 + tps: 8734.81675 + hps: 97.07514 } } dps_results: { key: "TestDestruction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10712.76449 - tps: 8717.51714 - hps: 97.7892 + dps: 10706.95094 + tps: 8734.81675 + hps: 97.07514 } } dps_results: { key: "TestDestruction-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10964.3034 - tps: 8960.68094 + dps: 10870.69015 + tps: 8892.23568 } } dps_results: { key: "TestDestruction-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8508.66524 - tps: 6916.08595 + dps: 8518.95108 + tps: 6930.93864 } } dps_results: { key: "TestDestruction-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10991.87002 - tps: 8805.33923 + dps: 10888.36123 + tps: 8730.41929 } } dps_results: { key: "TestDestruction-AllItems-ChaoticSkyflareDiamond" value: { - dps: 11281.43323 - tps: 9246.00851 + dps: 11183.42437 + tps: 9173.49298 } } dps_results: { key: "TestDestruction-AllItems-CorpseTongueCoin-50349" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-CorpseTongueCoin-50352" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 hps: 64 } } dps_results: { key: "TestDestruction-AllItems-DarkCoven'sRegalia" value: { - dps: 10872.6253 - tps: 8955.01924 + dps: 10922.92174 + tps: 9007.64818 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10823.07168 - tps: 8816.51494 + dps: 10804.54278 + tps: 8822.17361 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10936.33705 - tps: 8923.53966 + dps: 10795.83132 + tps: 8820.50533 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10801.4903 - tps: 8799.88286 + dps: 10791.74971 + tps: 8813.18109 } } dps_results: { key: "TestDestruction-AllItems-Death'sChoice-47464" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10750.02366 - tps: 8750.75669 + dps: 10738.47043 + tps: 8762.67982 } } dps_results: { key: "TestDestruction-AllItems-Deathbringer'sWill-50362" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-Deathbringer'sWill-50363" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-DeathbringerGarb" value: { - dps: 9579.03406 - tps: 7839.35796 + dps: 9421.48035 + tps: 7695.95518 } } dps_results: { key: "TestDestruction-AllItems-Defender'sCode-40257" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10983.79357 - tps: 8974.04598 + dps: 10878.08478 + tps: 8898.39231 } } dps_results: { key: "TestDestruction-AllItems-DislodgedForeignObject-50348" value: { - dps: 11409.2022 - tps: 9321.33191 + dps: 11457.71573 + tps: 9380.72633 } } dps_results: { key: "TestDestruction-AllItems-DislodgedForeignObject-50353" value: { - dps: 11351.28849 - tps: 9271.13206 + dps: 11339.77024 + tps: 9285.60449 } } dps_results: { key: "TestDestruction-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-EmberSkyflareDiamond" value: { - dps: 11016.41353 - tps: 9000.40668 + dps: 10902.96327 + tps: 8919.54233 } } dps_results: { key: "TestDestruction-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10964.3034 - tps: 8960.21799 + dps: 10870.69015 + tps: 8891.67589 } } dps_results: { key: "TestDestruction-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10961.72077 - tps: 8957.89362 + dps: 10868.95517 + tps: 8890.11441 } } dps_results: { key: "TestDestruction-AllItems-EphemeralSnowflake-50260" value: { - dps: 10861.56439 - tps: 8857.04489 + dps: 10852.78735 + tps: 8867.48761 } } dps_results: { key: "TestDestruction-AllItems-EssenceofGossamer-37220" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10903.27004 - tps: 8894.48254 + dps: 10846.15816 + tps: 8864.02947 } } dps_results: { key: "TestDestruction-AllItems-EyeoftheBroodmother-45308" value: { - dps: 11044.65337 - tps: 9003.61162 + dps: 11027.53755 + tps: 9010.65708 } } dps_results: { key: "TestDestruction-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10733.9226 - tps: 8736.00246 + dps: 10726.62585 + tps: 8751.73196 } } dps_results: { key: "TestDestruction-AllItems-ForethoughtTalisman-40258" value: { - dps: 10909.70668 - tps: 8883.93253 + dps: 10907.67433 + tps: 8904.56664 } } dps_results: { key: "TestDestruction-AllItems-ForgeEmber-37660" value: { - dps: 10955.5869 - tps: 8926.67379 + dps: 10943.99776 + tps: 8938.75161 } } dps_results: { key: "TestDestruction-AllItems-ForlornSkyflareDiamond" value: { - dps: 10991.87002 - tps: 8982.58247 + dps: 10888.36123 + tps: 8906.08864 } } dps_results: { key: "TestDestruction-AllItems-ForlornStarflareDiamond" value: { - dps: 10983.27061 - tps: 8975.31182 + dps: 10879.61108 + tps: 8898.68114 } } dps_results: { key: "TestDestruction-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-FuturesightRune-38763" value: { - dps: 10868.31757 - tps: 8849.0406 + dps: 10865.18097 + tps: 8868.64023 } } dps_results: { key: "TestDestruction-AllItems-Gladiator'sFelshroud" value: { - dps: 9256.7659 - tps: 7549.83148 + dps: 9163.73615 + tps: 7479.35454 } } dps_results: { key: "TestDestruction-AllItems-GlowingTwilightScale-54573" value: { - dps: 11049.54755 - tps: 9002.30889 + dps: 11051.37179 + tps: 9026.48379 } } dps_results: { key: "TestDestruction-AllItems-GlowingTwilightScale-54589" value: { - dps: 11093.80099 - tps: 9039.77372 + dps: 11096.84567 + tps: 9065.06461 } } dps_results: { key: "TestDestruction-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10851.1186 - tps: 8852.79577 + dps: 10813.64237 + tps: 8843.62805 } } dps_results: { key: "TestDestruction-AllItems-Gul'dan'sRegalia" value: { - dps: 9832.44677 - tps: 7969.82771 + dps: 9841.26909 + tps: 7990.64934 } } dps_results: { key: "TestDestruction-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 11059.5131 - tps: 9010.43075 + dps: 11061.91708 + tps: 9035.13662 } } dps_results: { key: "TestDestruction-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10964.3034 - tps: 8960.21799 + dps: 10870.69015 + tps: 8891.67589 } } dps_results: { key: "TestDestruction-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10961.72077 - tps: 8957.89362 + dps: 10868.95517 + tps: 8890.11441 } } dps_results: { key: "TestDestruction-AllItems-IncisorFragment-37723" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10971.50229 - tps: 8965.93206 + dps: 10858.01801 + tps: 8885.65653 } } dps_results: { key: "TestDestruction-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10915.49038 - tps: 8888.61388 + dps: 10913.79564 + tps: 8909.58365 } } dps_results: { key: "TestDestruction-AllItems-MaleficRaiment" value: { - dps: 7376.61255 - tps: 5919.49319 + dps: 7391.3015 + tps: 5933.44145 } } dps_results: { key: "TestDestruction-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10795.38305 - tps: 8791.58014 + dps: 10772.58843 + tps: 8793.38602 } } dps_results: { key: "TestDestruction-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10949.72677 - tps: 8920.02536 + dps: 10946.44288 + tps: 8939.45833 } } dps_results: { key: "TestDestruction-AllItems-OfferingofSacrifice-37638" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedScarab-21685" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-PlagueheartGarb" value: { - dps: 8852.53254 - tps: 7192.55138 + dps: 8861.16566 + tps: 7199.62916 } } dps_results: { key: "TestDestruction-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-PurifiedShardoftheGods" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-ReignoftheDead-47316" value: { - dps: 11222.1622 - tps: 9191.62408 + dps: 11124.24918 + tps: 9119.25966 + } +} +dps_results: { + key: "TestDestruction-AllItems-ReignoftheDead-47477" + value: { + dps: 11183.42437 + tps: 9173.49298 } } dps_results: { key: "TestDestruction-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 11264.71023 - tps: 9230.85088 + dps: 11155.17832 + tps: 9148.92475 } } dps_results: { key: "TestDestruction-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10948.87298 - tps: 8945.88497 + dps: 10844.61047 + tps: 8868.7328 } } dps_results: { key: "TestDestruction-AllItems-RuneofRepulsion-40372" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-SealofthePantheon-36993" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-ShinyShardoftheGods" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-SliverofPureIce-50339" value: { - dps: 10992.90314 - tps: 8958.33923 + dps: 10993.16522 + tps: 8981.62459 } } dps_results: { key: "TestDestruction-AllItems-SliverofPureIce-50346" value: { - dps: 11028.3059 - tps: 8988.62582 + dps: 11029.54433 + tps: 9012.94435 } } dps_results: { key: "TestDestruction-AllItems-SoulPreserver-37111" value: { - dps: 10845.98172 - tps: 8829.99037 + dps: 10842.19195 + tps: 8849.00517 } } dps_results: { key: "TestDestruction-AllItems-SouloftheDead-40382" value: { - dps: 10819.7547 - tps: 8818.18624 + dps: 10797.86447 + tps: 8821.45725 } } dps_results: { key: "TestDestruction-AllItems-SparkofLife-37657" value: { - dps: 10781.30821 - tps: 8785.60923 + dps: 10788.10693 + tps: 8806.9055 } } dps_results: { key: "TestDestruction-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10703.32083 - tps: 8709.63427 + dps: 10766.62394 + tps: 8788.20752 } } dps_results: { key: "TestDestruction-AllItems-SwiftSkyflareDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-SwiftStarflareDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-SwiftWindfireDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10797.08521 - tps: 8788.58784 + dps: 10791.94695 + tps: 8806.36945 } } dps_results: { key: "TestDestruction-AllItems-TearsoftheVanquished-47215" value: { - dps: 10750.52148 - tps: 8751.09912 + dps: 10743.72366 + tps: 8767.25903 } } dps_results: { key: "TestDestruction-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10713.2214 - tps: 8717.60839 + dps: 10705.77031 + tps: 8733.24971 } } dps_results: { key: "TestDestruction-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10948.87298 - tps: 8946.22922 + dps: 10844.61047 + tps: 8869.05112 } } dps_results: { key: "TestDestruction-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10703.32083 - tps: 8709.63427 + dps: 10766.62394 + tps: 8788.20752 } } dps_results: { key: "TestDestruction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10703.32083 - tps: 8709.63427 + dps: 10766.62394 + tps: 8788.20752 } } dps_results: { key: "TestDestruction-AllItems-TirelessSkyflareDiamond" value: { - dps: 10991.87002 - tps: 8982.58247 + dps: 10888.36123 + tps: 8906.08864 } } dps_results: { key: "TestDestruction-AllItems-TirelessStarflareDiamond" value: { - dps: 10983.27061 - tps: 8975.31182 + dps: 10879.61108 + tps: 8898.68114 } } dps_results: { key: "TestDestruction-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10942.04748 - tps: 8925.36299 + dps: 10880.17246 + tps: 8889.37588 } } dps_results: { key: "TestDestruction-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10983.27061 - tps: 8975.31182 + dps: 10879.61108 + tps: 8898.68114 } } dps_results: { key: "TestDestruction-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10991.87002 - tps: 8982.58247 + dps: 10888.36123 + tps: 8906.08864 } } dps_results: { key: "TestDestruction-AllItems-WingedTalisman-37844" value: { - dps: 10844.61319 - tps: 8829.24513 + dps: 10840.89345 + tps: 8848.27621 } } dps_results: { key: "TestDestruction-Average-Default" value: { - dps: 11428.72268 - tps: 9360.87835 + dps: 11384.65848 + tps: 9340.57407 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--FullBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-LongMultiTarget" value: { - dps: 25148.41254 - tps: 29741.12806 + dps: 25634.70124 + tps: 30674.03554 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--FullBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-LongSingleTarget" value: { - dps: 11281.43323 - tps: 9246.00851 + dps: 11183.42437 + tps: 9173.49298 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--FullBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12760.86525 - tps: 10462.45223 + dps: 12482.17162 + tps: 10202.16749 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--NoBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-LongMultiTarget" value: { - dps: 14813.02056 - tps: 19960.30367 + dps: 15212.06682 + tps: 20693.36868 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--NoBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6304.42609 - tps: 5337.10721 + dps: 6327.26454 + tps: 5373.81634 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock--NoBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6366.00707 - tps: 5361.75203 + dps: 6423.33592 + tps: 5425.4083 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-FullBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-LongMultiTarget" value: { - dps: 12356.30025 - tps: 11751.77749 + dps: 12234.87188 + tps: 11785.57639 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-FullBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-LongSingleTarget" value: { - dps: 11320.05232 - tps: 9124.63069 + dps: 11234.85399 + tps: 9069.27969 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-FullBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-ShortSingleTarget" value: { - dps: 12281.11135 - tps: 9412.06182 + dps: 12203.21746 + tps: 9382.85665 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-NoBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-LongMultiTarget" value: { - dps: 7045.69684 - tps: 7382.61137 + dps: 7033.30474 + tps: 7519.35034 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-NoBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-LongSingleTarget" value: { - dps: 6333.64271 - tps: 5282.55665 + dps: 6369.96101 + tps: 5330.23953 } } dps_results: { - key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-destro-NoBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-ShortSingleTarget" value: { - dps: 6617.52934 - tps: 5134.52671 + dps: 6453.53747 + tps: 5002.57509 } } dps_results: { key: "TestDestruction-SwitchInFrontOfTarget-Default" value: { - dps: 11281.43323 - tps: 9246.00851 + dps: 11183.42437 + tps: 9173.49298 } } diff --git a/sim/warlock/warlock_test.go b/sim/warlock/warlock_test.go index 9c3dde5e23..666c398491 100644 --- a/sim/warlock/warlock_test.go +++ b/sim/warlock/warlock_test.go @@ -17,7 +17,7 @@ func TestAffliction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GearSetCombo{Label: "P3", GearSet: P3Gear_affliction}, + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_affliction_alliance"), Talents: AfflictionTalents, Glyphs: AfflictionGlyphs, Consumes: FullConsumes, @@ -35,7 +35,7 @@ func TestDemonology(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GearSetCombo{Label: "P2", GearSet: P3Gear_demo}, + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_demo_alliance"), Talents: DemonologyTalents, Glyphs: DemonologyGlyphs, Consumes: FullConsumes, @@ -53,7 +53,7 @@ func TestDestruction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GearSetCombo{Label: "P2", GearSet: P3Gear_destro}, + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_destro_alliance"), Talents: DestructionTalents, Glyphs: DestructionGlyphs, Consumes: FullConsumes, @@ -201,62 +201,3 @@ var FullConsumes = &proto.Consumes{ PrepopPotion: proto.Potions_PotionOfWildMagic, Food: proto.Food_FoodFishFeast, } - -var P3Gear_affliction = core.EquipmentSpecFromJsonString(`{"items":[ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47793,"enchant":3810,"gems":[40155]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47462,"enchant":1144,"gems":[40133,40155,40113]}, - {"id":47485,"enchant":2332,"gems":[40113,0]}, - {"id":47797,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47795,"enchant":3872,"gems":[40113,40153]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40113]}, - {"id":47489,"gems":[40155]}, - {"id":45518},{"id":45466}, - {"id":47422,"enchant":3834,"gems":[40113]}, - {"id":48032,"gems":[40155]}, - {"id":45294,"gems":[40155]} -]}`) - -var P3Gear_demo = core.EquipmentSpecFromJsonString(`{"items":[ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":45133,"gems":[40153]}, - {"id":47793,"enchant":3810,"gems":[40113]}, - {"id":47554,"enchant":3722,"gems":[40113]}, - {"id":47794,"enchant":1144,"gems":[40113,40133]}, - {"id":47485,"enchant":2332,"gems":[40133,0]}, - {"id":47788,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40113]}, - {"id":45518}, - {"id":40255}, - {"id":47422,"enchant":3834,"gems":[40133]}, - {"id":47470}, - {"id":45294,"gems":[40113]} -]}`) - -var P3Gear_destro = core.EquipmentSpecFromJsonString(`{"items":[ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40153]}, - {"id":47793,"enchant":3810,"gems":[40155]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47794,"enchant":1144,"gems":[40113,40133]}, - {"id":47467,"enchant":2332,"gems":[40153,0]}, - {"id":47788,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":45518}, - {"id":47477}, - {"id":47422,"enchant":3834,"gems":[40133]}, - {"id":47437}, - {"id":45294,"gems":[40113]} -]}`) diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results index 9f8609bdef..21bde4c852 100644 --- a/sim/warrior/dps/TestArms.results +++ b/sim/warrior/dps/TestArms.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestArms-CharacterStats-Default" value: { - final_stats: 1187.472 - final_stats: 1001 - final_stats: 1953.38 - final_stats: 176 - final_stats: 228.8 + final_stats: 1070.784 + final_stats: 928.4 + final_stats: 1763.476 + final_stats: 180.4 + final_stats: 233.2 final_stats: 546 final_stats: 109 - final_stats: 141 - final_stats: 1145.52994 - final_stats: 243 + final_stats: 235 + final_stats: 1025.52994 + final_stats: 124 final_stats: 0 - final_stats: 6310.2259 - final_stats: 141 - final_stats: 2486.21888 - final_stats: 243 - final_stats: 392.9 - final_stats: 281.77746 + final_stats: 5716.60063 + final_stats: 235 + final_stats: 2312.89448 + final_stats: 124 + final_stats: 647.9 + final_stats: 156.77746 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 13810.5 - final_stats: 3033.8 + final_stats: 14376.3 + final_stats: 2679.6 final_stats: 0 final_stats: 0 - final_stats: 593.736 - final_stats: 534.48466 + final_stats: 535.392 + final_stats: 495.71984 final_stats: 0 final_stats: 0 - final_stats: 29729.8 + final_stats: 27830.76 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,935 +46,935 @@ character_stats_results: { dps_results: { key: "TestArms-AllItems-Althor'sAbacus-50359" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-Althor'sAbacus-50366" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-AustereEarthsiegeDiamond" value: { - dps: 8050.40231 - tps: 6617.62845 + dps: 6554.01044 + tps: 5327.96685 } } dps_results: { key: "TestArms-AllItems-Bandit'sInsignia-40371" value: { - dps: 7977.53649 - tps: 6548.24856 + dps: 6532.91222 + tps: 5302.89603 } } dps_results: { key: "TestArms-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7852.40784 - tps: 6451.84658 - hps: 90.47701 + dps: 6319.93525 + tps: 5128.65033 + hps: 89.11518 } } dps_results: { key: "TestArms-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7852.40784 - tps: 6451.84658 - hps: 90.47701 + dps: 6319.93525 + tps: 5128.65033 + hps: 89.11518 } } dps_results: { key: "TestArms-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 8089.88788 - tps: 6652.86335 + dps: 6593.26666 + tps: 5362.02081 } } dps_results: { key: "TestArms-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7895.90933 - tps: 6491.57184 + dps: 6322.58753 + tps: 5139.4522 } } dps_results: { key: "TestArms-AllItems-BlackBruise-50035" value: { - dps: 6236.55586 - tps: 5186.85528 + dps: 4785.38058 + tps: 3943.40268 } } dps_results: { key: "TestArms-AllItems-BlackBruise-50692" value: { - dps: 6422.50934 - tps: 5331.43059 + dps: 4968.74326 + tps: 4083.59476 } } dps_results: { key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6716.39452 - tps: 5529.09795 + dps: 5310.19846 + tps: 4307.96195 } } dps_results: { key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6661.20542 - tps: 5477.55974 + dps: 5197.19888 + tps: 4220.7348 } } dps_results: { key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6389.35926 - tps: 5263.59417 + dps: 4981.10601 + tps: 4046.1315 } } dps_results: { key: "TestArms-AllItems-BracingEarthsiegeDiamond" value: { - dps: 8063.21939 - tps: 6498.29326 + dps: 6553.31336 + tps: 5222.66225 } } dps_results: { key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 8582.8993 + tps: 7057.14544 } } dps_results: { key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 8690.57752 + tps: 7136.47654 } } dps_results: { key: "TestArms-AllItems-ChaoticSkyflareDiamond" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 6719.5785 + tps: 5466.3935 } } dps_results: { key: "TestArms-AllItems-CorpseTongueCoin-50349" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-CorpseTongueCoin-50352" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 hps: 64 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7924.63615 - tps: 6511.16194 + dps: 6422.72988 + tps: 5219.10186 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7953.41187 - tps: 6533.4538 + dps: 6468.77284 + tps: 5255.48151 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-Death'sChoice-47464" value: { - dps: 8351.22625 - tps: 6862.93009 + dps: 6818.23992 + tps: 5536.07608 } } dps_results: { key: "TestArms-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7918.28643 - tps: 6508.59287 + dps: 6401.28296 + tps: 5202.02863 } } dps_results: { key: "TestArms-AllItems-Deathbringer'sWill-50362" value: { - dps: 8312.78355 - tps: 6826.72767 + dps: 6820.94495 + tps: 5538.37067 } } dps_results: { key: "TestArms-AllItems-Deathbringer'sWill-50363" value: { - dps: 8359.84417 - tps: 6866.70315 + dps: 6857.77532 + tps: 5570.03148 } } dps_results: { key: "TestArms-AllItems-Defender'sCode-40257" value: { - dps: 7842.83184 - tps: 6440.53523 + dps: 6335.35622 + tps: 5138.82155 } } dps_results: { key: "TestArms-AllItems-DestructiveSkyflareDiamond" value: { - dps: 8111.60994 - tps: 6671.76324 + dps: 6599.38877 + tps: 5367.11188 } } dps_results: { key: "TestArms-AllItems-DislodgedForeignObject-50348" value: { - dps: 7976.44709 - tps: 6553.04827 + dps: 6473.3587 + tps: 5259.14963 } } dps_results: { key: "TestArms-AllItems-DislodgedForeignObject-50353" value: { - dps: 7896.15936 - tps: 6493.85385 + dps: 6446.60316 + tps: 5236.13759 } } dps_results: { key: "TestArms-AllItems-DreadnaughtBattlegear" value: { - dps: 7476.23598 - tps: 6150.83157 + dps: 5931.7964 + tps: 4835.58873 } } dps_results: { key: "TestArms-AllItems-DreadnaughtPlate" value: { - dps: 6582.81872 - tps: 5398.24917 + dps: 5178.6228 + tps: 4210.33209 } } dps_results: { key: "TestArms-AllItems-EffulgentSkyflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-EmberSkyflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 8089.88788 - tps: 6652.86335 + dps: 6593.26666 + tps: 5362.02081 } } dps_results: { key: "TestArms-AllItems-EnigmaticStarflareDiamond" value: { - dps: 8072.87161 - tps: 6637.16587 + dps: 6584.29944 + tps: 5355.67783 } } dps_results: { key: "TestArms-AllItems-EphemeralSnowflake-50260" value: { - dps: 7870.92775 - tps: 6470.34907 + dps: 6422.83932 + tps: 5218.90171 } } dps_results: { key: "TestArms-AllItems-EssenceofGossamer-37220" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-EternalEarthsiegeDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7959.02669 - tps: 6538.51905 + dps: 6467.56561 + tps: 5255.92616 } } dps_results: { key: "TestArms-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7911.34072 - tps: 6500.31581 + dps: 6416.08534 + tps: 5214.74195 } } dps_results: { key: "TestArms-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-ForethoughtTalisman-40258" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-ForgeEmber-37660" value: { - dps: 7884.23926 - tps: 6476.1122 + dps: 6391.33673 + tps: 5190.54764 } } dps_results: { key: "TestArms-AllItems-ForlornSkyflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-ForlornStarflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 8029.50057 - tps: 6593.49428 + dps: 6568.62475 + tps: 5333.09369 } } dps_results: { key: "TestArms-AllItems-FuturesightRune-38763" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-Gladiator'sBattlegear" value: { - dps: 7835.94664 - tps: 6415.80751 + dps: 6248.10809 + tps: 5059.68036 } } dps_results: { key: "TestArms-AllItems-GlowingTwilightScale-54573" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-GlowingTwilightScale-54589" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7930.69911 - tps: 6515.28359 + dps: 6447.68085 + tps: 5238.49475 } } dps_results: { key: "TestArms-AllItems-Heartpierce-49982" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 7881.36826 + tps: 6480.38239 } } dps_results: { key: "TestArms-AllItems-Heartpierce-50641" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 7929.51889 + tps: 6521.25681 } } dps_results: { key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 8089.88788 - tps: 6652.86335 + dps: 6593.26666 + tps: 5362.02081 } } dps_results: { key: "TestArms-AllItems-ImpassiveStarflareDiamond" value: { - dps: 8072.87161 - tps: 6637.16587 + dps: 6584.29944 + tps: 5355.67783 } } dps_results: { key: "TestArms-AllItems-IncisorFragment-37723" value: { - dps: 8039.13965 - tps: 6601.57908 + dps: 6540.88012 + tps: 5309.21789 } } dps_results: { key: "TestArms-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 8065.937 - tps: 6631.42277 - hps: 14.14952 + dps: 6606.12248 + tps: 5373.4336 + hps: 13.00101 } } dps_results: { key: "TestArms-AllItems-LastWord-50179" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 8025.05822 + tps: 6598.23618 } } dps_results: { key: "TestArms-AllItems-LastWord-50708" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 8092.35516 + tps: 6657.0612 } } dps_results: { key: "TestArms-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7910.28275 - tps: 6500.29003 + dps: 6483.81767 + tps: 5266.8289 } } dps_results: { key: "TestArms-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7985.33862 - tps: 6568.6209 + dps: 6478.40447 + tps: 5266.50251 } } dps_results: { key: "TestArms-AllItems-OfferingofSacrifice-37638" value: { - dps: 7843.55214 - tps: 6441.07522 + dps: 6330.64595 + tps: 5136.25934 } } dps_results: { key: "TestArms-AllItems-OnslaughtArmor" value: { - dps: 5396.53104 - tps: 4440.94172 + dps: 4209.56212 + tps: 3425.5375 } } dps_results: { key: "TestArms-AllItems-OnslaughtBattlegear" value: { - dps: 6264.67604 - tps: 5151.16299 + dps: 4854.09689 + tps: 3950.45046 } } dps_results: { key: "TestArms-AllItems-PersistentEarthshatterDiamond" value: { - dps: 8061.6668 - tps: 6628.45738 + dps: 6611.64015 + tps: 5377.28095 } } dps_results: { key: "TestArms-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 8084.89521 - tps: 6647.32401 + dps: 6615.41947 + tps: 5380.55541 } } dps_results: { key: "TestArms-AllItems-PetrifiedScarab-21685" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7854.14638 - tps: 6449.70559 + dps: 6344.32821 + tps: 5149.10754 } } dps_results: { key: "TestArms-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7865.31316 - tps: 6459.42762 + dps: 6379.5471 + tps: 5180.74751 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-PurifiedShardoftheGods" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47316" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47477" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 8287.82494 - tps: 6810.8394 + dps: 6702.38969 + tps: 5450.34489 } } dps_results: { key: "TestArms-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-RuneofRepulsion-40372" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SealofthePantheon-36993" value: { - dps: 7853.08878 - tps: 6447.63867 + dps: 6324.72833 + tps: 5132.59382 } } dps_results: { key: "TestArms-AllItems-Shadowmourne-49623" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 9638.96768 + tps: 7919.09819 } } dps_results: { key: "TestArms-AllItems-ShinyShardoftheGods" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SiegebreakerBattlegear" value: { - dps: 7911.05448 - tps: 6504.21622 + dps: 6089.44091 + tps: 4958.22969 } } dps_results: { key: "TestArms-AllItems-SiegebreakerPlate" value: { - dps: 6776.89885 - tps: 5558.44614 + dps: 5366.49677 + tps: 4360.69533 } } dps_results: { key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SliverofPureIce-50339" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SliverofPureIce-50346" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SoulPreserver-37111" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-SouloftheDead-40382" value: { - dps: 7914.57663 - tps: 6502.959 + dps: 6419.91099 + tps: 5217.80246 } } dps_results: { key: "TestArms-AllItems-SparkofLife-37657" value: { - dps: 7848.59726 - tps: 6450.10218 + dps: 6370.99434 + tps: 5172.41909 } } dps_results: { key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 8089.94601 - tps: 6646.18573 + dps: 6519.22478 + tps: 5293.70239 } } dps_results: { key: "TestArms-AllItems-StormshroudArmor" value: { - dps: 6331.87716 - tps: 5202.71844 + dps: 4970.04024 + tps: 4036.53848 } } dps_results: { key: "TestArms-AllItems-SwiftSkyflareDiamond" value: { - dps: 8084.89521 - tps: 6647.32401 + dps: 6615.41947 + tps: 5380.55541 } } dps_results: { key: "TestArms-AllItems-SwiftStarflareDiamond" value: { - dps: 8061.6668 - tps: 6628.45738 + dps: 6611.64015 + tps: 5377.28095 } } dps_results: { key: "TestArms-AllItems-SwiftWindfireDiamond" value: { - dps: 8050.35634 - tps: 6619.98325 + dps: 6590.03256 + tps: 5358.08113 } } dps_results: { key: "TestArms-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-TearsoftheVanquished-47215" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-TheFistsofFury" value: { - dps: 4691.3216 - tps: 3944.94674 + dps: 4825.93687 + tps: 4059.10222 } } dps_results: { key: "TestArms-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5032.36752 - tps: 4226.35497 + dps: 5148.84633 + tps: 4316.27234 } } dps_results: { key: "TestArms-AllItems-ThunderingSkyflareDiamond" value: { - dps: 8114.98205 - tps: 6676.11127 + dps: 6589.95036 + tps: 5359.30894 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50351" value: { - dps: 8195.60328 - tps: 6730.66767 + dps: 6650.43757 + tps: 5410.6944 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50706" value: { - dps: 8270.38741 - tps: 6792.33381 + dps: 6720.00718 + tps: 5463.07082 } } dps_results: { key: "TestArms-AllItems-TirelessSkyflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-TirelessStarflareDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7818.06081 - tps: 6430.11591 + dps: 6427.72253 + tps: 5221.02934 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 8063.21939 - tps: 6630.83038 + dps: 6553.31336 + tps: 5329.16344 } } dps_results: { key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6638.13063 - tps: 5464.86947 + dps: 5206.71603 + tps: 4223.57879 } } dps_results: { key: "TestArms-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 5230.25898 - tps: 4424.99907 + dps: 3795.48012 + tps: 3172.7421 } } dps_results: { key: "TestArms-AllItems-WingedTalisman-37844" value: { - dps: 7852.40784 - tps: 6451.84658 + dps: 6319.93525 + tps: 5128.65033 } } dps_results: { key: "TestArms-AllItems-Wrynn'sBattlegear" value: { - dps: 8739.84464 - tps: 7172.30898 + dps: 6790.93368 + tps: 5523.19213 } } dps_results: { key: "TestArms-AllItems-Wrynn'sPlate" value: { - dps: 7092.96307 - tps: 5822.70403 + dps: 5603.78756 + tps: 4550.36006 } } dps_results: { key: "TestArms-AllItems-YmirjarLord'sBattlegear" value: { - dps: 9334.80501 - tps: 7692.10534 + dps: 7365.39588 + tps: 6002.69385 } } dps_results: { key: "TestArms-AllItems-YmirjarLord'sPlate" value: { - dps: 7434.46942 - tps: 6098.55656 + dps: 5843.0184 + tps: 4746.85842 } } dps_results: { key: "TestArms-Average-Default" value: { - dps: 8268.01631 - tps: 6799.55814 + dps: 6716.71894 + tps: 5461.99499 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-LongMultiTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--FullBuffs-LongMultiTarget" value: { - dps: 10918.22761 - tps: 9316.0926 + dps: 8474.07602 + tps: 7157.81365 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-LongSingleTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--FullBuffs-LongSingleTarget" value: { - dps: 8194.09749 - tps: 6738.84105 + dps: 6600.37942 + tps: 5352.84031 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 8715.4711 - tps: 7231.83232 + dps: 7012.48508 + tps: 5763.01888 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-LongMultiTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--NoBuffs-LongMultiTarget" value: { - dps: 6421.48367 - tps: 5547.41344 + dps: 4910.08041 + tps: 4204.05779 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-LongSingleTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--NoBuffs-LongSingleTarget" value: { - dps: 4610.02099 - tps: 3794.48371 + dps: 3674.97148 + tps: 2978.48296 } } dps_results: { - key: "TestArms-Settings-Human-Arms P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestArms-Settings-Human-p1_arms-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 4488.93069 - tps: 3725.7865 + dps: 3563.07523 + tps: 2916.28216 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-LongMultiTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--FullBuffs-LongMultiTarget" value: { - dps: 10997.41247 - tps: 9388.26534 + dps: 8650.48828 + tps: 7305.00095 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-LongSingleTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--FullBuffs-LongSingleTarget" value: { - dps: 8277.41036 - tps: 6801.25246 + dps: 6702.38969 + tps: 5450.34489 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--FullBuffs-ShortSingleTarget" value: { - dps: 8813.98703 - tps: 7317.40723 + dps: 7229.80125 + tps: 5953.10426 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-LongMultiTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--NoBuffs-LongMultiTarget" value: { - dps: 6485.43756 - tps: 5605.29853 + dps: 5010.15338 + tps: 4299.51905 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-LongSingleTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--NoBuffs-LongSingleTarget" value: { - dps: 4588.72206 - tps: 3775.98074 + dps: 3695.94399 + tps: 2998.76397 } } dps_results: { - key: "TestArms-Settings-Orc-Arms P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestArms-Settings-Orc-p1_arms-Basic--NoBuffs-ShortSingleTarget" value: { - dps: 4522.90384 - tps: 3759.80824 + dps: 3637.95937 + tps: 2997.17387 } } dps_results: { key: "TestArms-SwitchInFrontOfTarget-Default" value: { - dps: 7638.48085 - tps: 6274.20145 + dps: 6209.03844 + tps: 5029.74756 } } diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results index 3f8d54b1aa..0c88b8a0bf 100644 --- a/sim/warrior/dps/TestFury.results +++ b/sim/warrior/dps/TestFury.results @@ -888,168 +888,168 @@ dps_results: { } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--FullBuffs-LongMultiTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--FullBuffs-LongMultiTarget" value: { dps: 9194.69651 tps: 7340.72966 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--FullBuffs-LongSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--FullBuffs-LongSingleTarget" value: { dps: 6873.32982 tps: 5081.14527 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--FullBuffs-ShortSingleTarget" value: { dps: 7897.40963 tps: 5832.12271 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--NoBuffs-LongMultiTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--NoBuffs-LongMultiTarget" value: { dps: 4445.2841 tps: 3606.96156 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--NoBuffs-LongSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--NoBuffs-LongSingleTarget" value: { dps: 3130.15371 tps: 2329.05542 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic--NoBuffs-ShortSingleTarget" value: { dps: 3290.38873 tps: 2452.72883 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-FullBuffs-LongMultiTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-LongMultiTarget" value: { dps: 10335.53844 tps: 8055.47326 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-FullBuffs-LongSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-LongSingleTarget" value: { dps: 6956.89606 tps: 5172.37235 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-FullBuffs-ShortSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-ShortSingleTarget" value: { dps: 8334.00253 tps: 6194.42682 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-NoBuffs-LongMultiTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-LongMultiTarget" value: { dps: 4398.47104 tps: 3574.68804 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-NoBuffs-LongSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-LongSingleTarget" value: { dps: 2781.44964 tps: 2099.54141 } } dps_results: { - key: "TestFury-Settings-Human-Fury P1-Basic-fury-NoBuffs-ShortSingleTarget" + key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-ShortSingleTarget" value: { dps: 2993.62836 tps: 2267.44841 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--FullBuffs-LongMultiTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--FullBuffs-LongMultiTarget" value: { dps: 9277.3113 tps: 7397.17369 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--FullBuffs-LongSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--FullBuffs-LongSingleTarget" value: { dps: 6946.09586 tps: 5135.85557 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--FullBuffs-ShortSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--FullBuffs-ShortSingleTarget" value: { dps: 7962.43878 tps: 5883.1142 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--NoBuffs-LongMultiTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--NoBuffs-LongMultiTarget" value: { dps: 4502.43278 tps: 3654.6595 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--NoBuffs-LongSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--NoBuffs-LongSingleTarget" value: { dps: 3103.92467 tps: 2309.64492 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic--NoBuffs-ShortSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic--NoBuffs-ShortSingleTarget" value: { dps: 3297.19798 tps: 2459.17541 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-FullBuffs-LongMultiTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-LongMultiTarget" value: { dps: 10420.27644 tps: 8119.1797 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-FullBuffs-LongSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-LongSingleTarget" value: { dps: 6948.04992 tps: 5165.92716 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-FullBuffs-ShortSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-ShortSingleTarget" value: { dps: 8418.04587 tps: 6247.66223 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-NoBuffs-LongMultiTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-LongMultiTarget" value: { dps: 4441.18536 tps: 3610.77623 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-NoBuffs-LongSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-LongSingleTarget" value: { dps: 2829.25095 tps: 2134.76157 } } dps_results: { - key: "TestFury-Settings-Orc-Fury P1-Basic-fury-NoBuffs-ShortSingleTarget" + key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-ShortSingleTarget" value: { dps: 3106.30985 tps: 2350.90578 diff --git a/sim/warrior/dps/dps_warrior_test.go b/sim/warrior/dps/dps_warrior_test.go index b14d515960..3fe66bf497 100644 --- a/sim/warrior/dps/dps_warrior_test.go +++ b/sim/warrior/dps/dps_warrior_test.go @@ -20,7 +20,7 @@ func TestFury(t *testing.T) { Talents: FuryTalents, Glyphs: FuryGlyphs, - GearSet: core.GearSetCombo{Label: "Fury P1", GearSet: FuryP1Gear}, + GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "p1_fury"), Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsFury}, @@ -50,7 +50,7 @@ func TestArms(t *testing.T) { Talents: ArmsTalents, Glyphs: ArmsGlyphs, - GearSet: core.GearSetCombo{Label: "Arms P1", GearSet: FuryP1Gear}, + GearSet: core.GetGearSet("../../../ui/warrior/gear_sets", "p1_arms"), Consumes: FullConsumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsArms}, @@ -74,7 +74,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassWarrior, - Equipment: FuryP1Gear, + Equipment: core.GetGearSet("../../../ui/warrior/gear_sets", "p1_fury").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsFury, TalentsString: FuryTalents, @@ -181,23 +181,3 @@ var FullConsumes = &proto.Consumes{ PrepopPotion: proto.Potions_PotionOfSpeed, Food: proto.Food_FoodFishFeast, } - -var FuryP1Gear = core.EquipmentSpecFromJsonString(`{"items":[ - {"id":44006,"enchant":3817,"gems":[41285,42702]}, - {"id":44664,"gems":[39996]}, - {"id":40530,"enchant":3808,"gems":[40037]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[42142]}, - {"id":39765,"enchant":3845,"gems":[39996,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[42142]}, - {"id":40529,"enchant":3823,"gems":[39996,40022]}, - {"id":40591,"enchant":3606}, - {"id":43993,"gems":[42142]}, - {"id":40717}, - {"id":42987}, - {"id":40256}, - {"id":40384,"enchant":3789}, - {"id":40384,"enchant":3789}, - {"id":40385} -]}`) diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index d1a9e0e5c6..c279f26b00 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -927,84 +927,84 @@ dps_results: { } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 1479.581 tps: 3902.21774 } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 1479.581 tps: 3851.86774 } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 1643.01563 tps: 4246.04821 } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 1050.46307 tps: 3335.71088 } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 865.20912 tps: 2483.44764 } } dps_results: { - key: "TestProtectionWarrior-Settings-Human-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestProtectionWarrior-Settings-Human-p1_balanced-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 831.10607 tps: 2403.87441 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-FullBuffs-LongMultiTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-FullBuffs-LongMultiTarget" value: { dps: 1490.53905 tps: 3923.57859 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-FullBuffs-LongSingleTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-FullBuffs-LongSingleTarget" value: { dps: 1490.53905 tps: 3873.54526 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-FullBuffs-ShortSingleTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-FullBuffs-ShortSingleTarget" value: { dps: 1682.8701 tps: 4348.51957 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-NoBuffs-LongMultiTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-NoBuffs-LongMultiTarget" value: { dps: 1063.03306 tps: 3372.37903 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-NoBuffs-LongSingleTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-NoBuffs-LongSingleTarget" value: { dps: 880.11232 tps: 2527.63516 } } dps_results: { - key: "TestProtectionWarrior-Settings-Orc-P1-Basic-default-NoBuffs-ShortSingleTarget" + key: "TestProtectionWarrior-Settings-Orc-p1_balanced-Basic-default-NoBuffs-ShortSingleTarget" value: { dps: 853.54235 tps: 2468.41035 diff --git a/sim/warrior/protection/protection_warrior_test.go b/sim/warrior/protection/protection_warrior_test.go index 3206e6342a..3d01bba754 100644 --- a/sim/warrior/protection/protection_warrior_test.go +++ b/sim/warrior/protection/protection_warrior_test.go @@ -18,7 +18,7 @@ func TestProtectionWarrior(t *testing.T) { Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceHuman}, - GearSet: core.GearSetCombo{Label: "P1", GearSet: P1Gear}, + GearSet: core.GetGearSet("../../../ui/protection_warrior/gear_sets", "p1_balanced"), Talents: DefaultTalents, Glyphs: DefaultGlyphs, Consumes: FullConsumes, @@ -58,7 +58,7 @@ func BenchmarkSimulate(b *testing.B) { &proto.Player{ Race: proto.Race_RaceOrc, Class: proto.Class_ClassWarrior, - Equipment: P1Gear, + Equipment: core.GetGearSet("../../../ui/protection_warrior/gear_sets", "p1_balanced").GearSet, Consumes: FullConsumes, Spec: PlayerOptionsBasic, Buffs: core.FullIndividualBuffs, @@ -105,23 +105,3 @@ var FullConsumes = &proto.Consumes{ BattleElixir: proto.BattleElixir_ElixirOfMastery, GuardianElixir: proto.GuardianElixir_GiftOfArthas, } - -var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - {"id":40546,"enchant":3818,"gems":[41380,40034]}, - {"id":40387}, - {"id":39704,"enchant":3852,"gems":[40034]}, - {"id":40722,"enchant":3605}, - {"id":44000,"enchant":3832,"gems":[40034,40015]}, - {"id":39764,"enchant":3850,"gems":[0]}, - {"id":40545,"enchant":3860,"gems":[40034,0]}, - {"id":39759,"enchant":3601,"gems":[40008,36767]}, - {"id":40589,"enchant":3822}, - {"id":39717,"enchant":3232,"gems":[40089]}, - {"id":40370}, - {"id":40718}, - {"id":40257}, - {"id":44063,"gems":[36767,40089]}, - {"id":40402,"enchant":3788}, - {"id":40400,"enchant":3849}, - {"id":41168,"gems":[36767]} -]}`) diff --git a/ui/balance_druid/gear_sets/p1.gear.json b/ui/balance_druid/gear_sets/p1.gear.json new file mode 100644 index 0000000000..2dfde74f37 --- /dev/null +++ b/ui/balance_druid/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40467,"enchant":3820,"gems":[41285,42144]}, + {"id":44661,"gems":[40026]}, + {"id":40470,"enchant":3810,"gems":[42144]}, + {"id":44005,"enchant":3859,"gems":[40026]}, + {"id":40469,"enchant":3832,"gems":[42144,39998]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40466,"enchant":3604,"gems":[39998,0]}, + {"id":40561,"enchant":3601,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40519,"enchant":3606}, + {"id":40399}, + {"id":40080}, + {"id":40255}, + {"id":40432}, + {"id":40395,"enchant":3834}, + {"id":40192}, + {"id":40321} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p2.gear.json b/ui/balance_druid/gear_sets/p2.gear.json new file mode 100644 index 0000000000..c3cdcf8e72 --- /dev/null +++ b/ui/balance_druid/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,42144]}, + {"id":45133,"gems":[40048]}, + {"id":46196,"enchant":3810,"gems":[39998]}, + {"id":45242,"enchant":3859,"gems":[40048]}, + {"id":45519,"enchant":3832,"gems":[40051,42144,40026]}, + {"id":45446,"enchant":2332,"gems":[42144,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"gems":[39998,39998,39998]}, + {"id":46192,"enchant":3719,"gems":[39998,39998]}, + {"id":45537,"enchant":3606,"gems":[39998,40026]}, + {"id":46046,"gems":[39998]}, + {"id":45495,"gems":[39998]}, + {"id":45466}, + {"id":45518}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":40321} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p3_alliance.gear.json b/ui/balance_druid/gear_sets/p3_alliance.gear.json new file mode 100644 index 0000000000..e4f9bf9421 --- /dev/null +++ b/ui/balance_druid/gear_sets/p3_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48171,"enchant":3820,"gems":[41285,40153]}, + {"id":47144,"gems":[40153]}, + {"id":48168,"enchant":3810,"gems":[40153]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":48169,"enchant":3832,"gems":[40113,40113]}, + {"id":47066,"enchant":2332,"gems":[40113,0]}, + {"id":48172,"enchant":3604,"gems":[40113,0]}, + {"id":47084,"gems":[40133,40113,40113]}, + {"id":47190,"enchant":3719,"gems":[40113,40113,40113]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":47237,"gems":[40113]}, + {"id":46046,"gems":[40113]}, + {"id":45518}, + {"id":47188}, + {"id":47206,"enchant":3834}, + {"id":47064}, + {"id":47670} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p3_horde.gear.json b/ui/balance_druid/gear_sets/p3_horde.gear.json new file mode 100644 index 0000000000..aa2d4b42d4 --- /dev/null +++ b/ui/balance_druid/gear_sets/p3_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48174,"enchant":3820,"gems":[41285,40155]}, + {"id":47468,"gems":[40155]}, + {"id":48177,"enchant":3810,"gems":[40153]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":48176,"enchant":3832,"gems":[40113,40113]}, + {"id":47467,"enchant":2332,"gems":[40155,0]}, + {"id":48173,"enchant":3604,"gems":[40113,0]}, + {"id":47447,"gems":[40133,40113,40113]}, + {"id":47479,"enchant":3719,"gems":[40113,40113,40113]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":47489,"gems":[40155]}, + {"id":46046,"gems":[40155]}, + {"id":45518}, + {"id":47477}, + {"id":47483,"enchant":3834}, + {"id":47437}, + {"id":47670} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/preraid.gear.json b/ui/balance_druid/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..30ee66ce80 --- /dev/null +++ b/ui/balance_druid/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{ "items": [ + {"id":42554,"enchant":3820,"gems":[41285,40049]}, + {"id":40680}, + {"id":37673,"enchant":3810,"gems":[42144]}, + {"id":41610,"enchant":3859}, + {"id":39547,"enchant":3832,"gems":[42144,40026]}, + {"id":37884,"enchant":2332,"gems":[0]}, + {"id":39544,"enchant":3604,"gems":[42144,0]}, + {"id":40696,"enchant":3601,"gems":[40014,39998]}, + {"id":37854,"enchant":3719}, + {"id":44202,"enchant":3606,"gems":[39998]}, + {"id":40585}, + {"id":43253,"gems":[40026]}, + {"id":37873}, + {"id":40682}, + {"id":45085,"enchant":3834}, + {"id":40698}, + {"id":40712} +]} \ No newline at end of file diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 2868086a76..3cf3357fa5 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -1,7 +1,7 @@ import { Consumes, Debuffs, - EquipmentSpec, Explosive, Faction, + Explosive, Flask, Food, Glyphs, @@ -9,8 +9,9 @@ import { PartyBuffs, Potions, RaidBuffs, - UnitReference, Spec, - TristateEffect + UnitReference, + TristateEffect, + Faction } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; @@ -26,8 +27,12 @@ import { } from '../core/proto/druid.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; -import { Player } from "../core/player"; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; +import P3AllianceGear from './gear_sets/p3_alliance.gear.json'; +import P3HordeGear from './gear_sets/p3_horde.gear.json'; import BasicP3AplJson from './apls/basic_p3.apl.json'; import P4AplJson from './apls/p4.apl.json'; @@ -36,6 +41,15 @@ import P4AplJson from './apls/p4.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); +export const P3_PRESET_ALLI = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance }); +export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde }); + +export const ROTATION_PRESET_P3_APL = PresetUtils.makePresetAPLRotation('P3', BasicP3AplJson); +export const ROTATION_PRESET_P4_APL = PresetUtils.makePresetAPLRotation('P4', P4AplJson); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const Phase1Talents = { @@ -163,131 +177,3 @@ export const DefaultDebuffs = Debuffs.create({ export const OtherDefaults = { distanceFromTarget: 18, }; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(` { - "items": [ - {"id":45497,"enchant":3820,"gems":[41285,42144]}, - {"id":45133,"gems":[40048]}, - {"id":46196,"enchant":3810,"gems":[39998]}, - {"id":45242,"enchant":3859,"gems":[40048]}, - {"id":45519,"enchant":3832,"gems":[40051,42144,40026]}, - {"id":45446,"enchant":2332,"gems":[42144,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"gems":[39998,39998,39998]}, - {"id":46192,"enchant":3719,"gems":[39998,39998]}, - {"id":45537,"enchant":3606,"gems":[39998,40026]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":40321} - ] - }`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40467,"enchant":3820,"gems":[41285,42144]}, - {"id":44661,"gems":[40026]}, - {"id":40470,"enchant":3810,"gems":[42144]}, - {"id":44005,"enchant":3859,"gems":[40026]}, - {"id":40469,"enchant":3832,"gems":[42144,39998]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40466,"enchant":3604,"gems":[39998,0]}, - {"id":40561,"enchant":3601,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40519,"enchant":3606}, - {"id":40399}, - {"id":40080}, - {"id":40255}, - {"id":40432}, - {"id":40395,"enchant":3834}, - {"id":40192}, - {"id":40321} - ]}`), -}; - -export const PRE_RAID_PRESET = { - name: 'Pre-raid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":42554,"enchant":3820,"gems":[41285,40049]}, - {"id":40680}, - {"id":37673,"enchant":3810,"gems":[42144]}, - {"id":41610,"enchant":3859}, - {"id":39547,"enchant":3832,"gems":[42144,40026]}, - {"id":37884,"enchant":2332,"gems":[0]}, - {"id":39544,"enchant":3604,"gems":[42144,0]}, - {"id":40696,"enchant":3601,"gems":[40014,39998]}, - {"id":37854,"enchant":3719}, - {"id":44202,"enchant":3606,"gems":[39998]}, - {"id":40585}, - {"id":43253,"gems":[40026]}, - {"id":37873}, - {"id":40682}, - {"id":45085,"enchant":3834}, - {"id":40698}, - {"id":40712} - ]}`), -}; - -export const P3_PRESET_HORDE = { - name: 'P3 Preset [H]', - enableWhen: (player: Player) => player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48174,"enchant":3820,"gems":[41285,40155]}, - {"id":47468,"gems":[40155]}, - {"id":48177,"enchant":3810,"gems":[40153]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":48176,"enchant":3832,"gems":[40113,40113]}, - {"id":47467,"enchant":2332,"gems":[40155,0]}, - {"id":48173,"enchant":3604,"gems":[40113,0]}, - {"id":47447,"gems":[40133,40113,40113]}, - {"id":47479,"enchant":3719,"gems":[40113,40113,40113]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":47489,"gems":[40155]}, - {"id":46046,"gems":[40155]}, - {"id":45518}, - {"id":47477}, - {"id":47483,"enchant":3834}, - {"id":47437}, - {"id":47670} - ] - }`), -}; - -export const P3_PRESET_ALLI = { - name: 'P3 Preset [A]', - enableWhen: (player: Player) => player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48171,"enchant":3820,"gems":[41285,40153]}, - {"id":47144,"gems":[40153]}, - {"id":48168,"enchant":3810,"gems":[40153]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":48169,"enchant":3832,"gems":[40113,40113]}, - {"id":47066,"enchant":2332,"gems":[40113,0]}, - {"id":48172,"enchant":3604,"gems":[40113,0]}, - {"id":47084,"gems":[40133,40113,40113]}, - {"id":47190,"enchant":3719,"gems":[40113,40113,40113]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":47237,"gems":[40113]}, - {"id":46046,"gems":[40113]}, - {"id":45518}, - {"id":47188}, - {"id":47206,"enchant":3834}, - {"id":47064}, - {"id":47670} - ]}`), -}; - -export const ROTATION_PRESET_P3_APL = PresetUtils.makePresetAPLRotation('P3', BasicP3AplJson); -export const ROTATION_PRESET_P4_APL = PresetUtils.makePresetAPLRotation('P4', P4AplJson); diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts index 84c276a91d..98aa2c5e6b 100644 --- a/ui/balance_druid/sim.ts +++ b/ui/balance_druid/sim.ts @@ -124,7 +124,7 @@ export class BalanceDruidSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.PRE_RAID_PRESET, + Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P2_PRESET, Presets.P3_PRESET_HORDE, diff --git a/ui/core/preset_utils.ts b/ui/core/preset_utils.ts index 7c0cc036ad..a62bb11136 100644 --- a/ui/core/preset_utils.ts +++ b/ui/core/preset_utils.ts @@ -4,6 +4,7 @@ import { } from './proto/apl'; import { EquipmentSpec, + Faction, Spec, } from './proto/common'; import { @@ -16,6 +17,8 @@ import { specTypeFunctions, } from './proto_utils/utils'; +import * as Tooltips from './constants/tooltips.js'; + export interface PresetGear { name: string; gear: EquipmentSpec; @@ -30,14 +33,53 @@ export interface PresetRotation { enableWhen?: (obj: Player) => boolean; } +export interface PresetGearOptions { + talentTree?: number, + talentTrees?: Array, + faction?: Faction, + customCondition?: (player: Player) => boolean, + + tooltip?: string, +} + export interface PresetRotationOptions { talentTree?: number, } +export function makePresetGear(name: string, gearJson: any, options?: PresetGearOptions): PresetGear { + const gear = EquipmentSpec.fromJson(gearJson); + return makePresetGearHelper(name, gear, options || {}); +} + +function makePresetGearHelper(name: string, gear: EquipmentSpec, options: PresetGearOptions): PresetGear { + let conditions: Array<(player: Player) => boolean> = []; + if (options.talentTree != undefined) { + conditions.push((player: Player) => player.getTalentTree() == options.talentTree); + } + if (options.talentTrees != undefined) { + conditions.push((player: Player) => (options.talentTrees || []).includes(player.getTalentTree())); + } + if (options.faction != undefined) { + conditions.push((player: Player) => player.getFaction() == options.faction); + } + if (options.customCondition != undefined) { + conditions.push(options.customCondition); + } + + return { + name: name, + tooltip: options.tooltip || Tooltips.BASIC_BIS_DISCLAIMER, + gear: gear, + enableWhen: conditions.length > 0 + ? (player: Player) => conditions.every(cond => cond(player)) + : undefined, + }; +} + export function makePresetAPLRotation(name: string, rotationJson: any, options?: PresetRotationOptions): PresetRotation { const rotation = SavedRotation.create({ specRotationOptionsJson: '{}', - rotation: APLRotation.fromJsonString(JSON.stringify(rotationJson)), + rotation: APLRotation.fromJson(rotationJson), }); return makePresetRotationHelper(name, rotation, options); } @@ -62,9 +104,16 @@ export function makePresetLegacyRotation(name: string, sp } function makePresetRotationHelper(name: string, rotation: SavedRotation, options?: PresetRotationOptions): PresetRotation { + let conditions: Array<(player: Player) => boolean> = []; + if (options?.talentTree != undefined) { + conditions.push((player: Player) => player.getTalentTree() == options.talentTree); + } + return { name: name, - enableWhen: options?.talentTree == undefined ? undefined : (player: Player) => player.getTalentTree() == options.talentTree, rotation: rotation, + enableWhen: conditions.length > 0 + ? (player: Player) => conditions.every(cond => cond(player)) + : undefined, }; } \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p1_blood.gear.json b/ui/deathknight/gear_sets/p1_blood.gear.json new file mode 100644 index 0000000000..adff11bfe7 --- /dev/null +++ b/ui/deathknight/gear_sets/p1_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41398,42702]}, + {"id":44664,"gems":[39996]}, + {"id":40557,"enchant":3808,"gems":[39996]}, + {"id":40403,"enchant":3831}, + {"id":40550,"enchant":3832,"gems":[42142,42142]}, + {"id":40330,"enchant":3845,"gems":[42142,0]}, + {"id":40552,"enchant":3604,"gems":[39996,0]}, + {"id":40278,"gems":[39996,39996]}, + {"id":40556,"enchant":3823,"gems":[39996,40037]}, + {"id":40591,"enchant":3606}, + {"id":40075}, + {"id":39401}, + {"id":40256}, + {"id":42987}, + {"id":40384,"enchant":3368}, + {}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p1_frost.gear.json b/ui/deathknight/gear_sets/p1_frost.gear.json new file mode 100644 index 0000000000..bf7a089418 --- /dev/null +++ b/ui/deathknight/gear_sets/p1_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41398,42702]}, + {"id":44664,"gems":[39996]}, + {"id":40557,"enchant":3808,"gems":[39996]}, + {"id":40403,"enchant":3831}, + {"id":40550,"enchant":3832,"gems":[42142,39996]}, + {"id":40330,"enchant":3845,"gems":[39996,0]}, + {"id":40552,"enchant":3604,"gems":[39996,0]}, + {"id":40278,"gems":[39996,42142]}, + {"id":40556,"enchant":3823,"gems":[42142,39996]}, + {"id":40591,"enchant":3606}, + {"id":39401}, + {"id":40075}, + {"id":40256}, + {"id":42987}, + {"id":40189,"enchant":3370}, + {"id":40189,"enchant":3368}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p1_frost_subUh.gear.json b/ui/deathknight/gear_sets/p1_frost_subUh.gear.json new file mode 100644 index 0000000000..6a902a45cb --- /dev/null +++ b/ui/deathknight/gear_sets/p1_frost_subUh.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41398,42702]}, + {"id":44664,"gems":[40003]}, + {"id":40557,"enchant":3808,"gems":[40003]}, + {"id":40403,"enchant":3831}, + {"id":40550,"enchant":3832,"gems":[42142,40003]}, + {"id":40330,"enchant":3845,"gems":[39996,0]}, + {"id":40552,"enchant":3604,"gems":[40058,0]}, + {"id":40278,"gems":[39996,42142]}, + {"id":40556,"enchant":3823,"gems":[42142,39996]}, + {"id":40591,"enchant":3606}, + {"id":39401}, + {"id":40075}, + {"id":40256}, + {"id":42987}, + {"id":40189,"enchant":3370}, + {"id":40189,"enchant":3368}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p1_uh_2h.gear.json b/ui/deathknight/gear_sets/p1_uh_2h.gear.json new file mode 100644 index 0000000000..a1e33c48e3 --- /dev/null +++ b/ui/deathknight/gear_sets/p1_uh_2h.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41400,49110]}, + {"id":44664,"gems":[39996]}, + {"id":40557,"enchant":3808,"gems":[39996]}, + {"id":40403,"enchant":3831}, + {"id":40550,"enchant":3832,"gems":[42142,39996]}, + {"id":40330,"enchant":3845,"gems":[39996,0]}, + {"id":40552,"enchant":3604,"gems":[40038,0]}, + {"id":40278,"gems":[42142,42142]}, + {"id":40556,"enchant":3823,"gems":[39996,39996]}, + {"id":40591,"enchant":3606}, + {"id":39401}, + {"id":40075}, + {"id":40256}, + {"id":42987}, + {"id":40384,"enchant":3368}, + {}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p1_uh_dw.gear.json b/ui/deathknight/gear_sets/p1_uh_dw.gear.json new file mode 100644 index 0000000000..aa2e944e92 --- /dev/null +++ b/ui/deathknight/gear_sets/p1_uh_dw.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41398,42702]}, + {"id":39421}, + {"id":40557,"enchant":3808,"gems":[39996]}, + {"id":40403,"enchant":3831}, + {"id":40550,"enchant":3832,"gems":[42142,39996]}, + {"id":40330,"enchant":3845,"gems":[39996,0]}, + {"id":40347,"enchant":3604,"gems":[39996,0]}, + {"id":40278,"gems":[42142,42142]}, + {"id":40294,"enchant":3823}, + {"id":39706,"enchant":3606,"gems":[39996]}, + {"id":39401}, + {"id":40075}, + {"id":37390}, + {"id":42987}, + {"id":40402,"enchant":3368}, + {"id":40491,"enchant":3368}, + {"id":42620} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p2_blood.gear.json b/ui/deathknight/gear_sets/p2_blood.gear.json new file mode 100644 index 0000000000..590e46d01b --- /dev/null +++ b/ui/deathknight/gear_sets/p2_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46115,"enchant":3817,"gems":[41398,42702]}, + {"id":45459,"gems":[39996]}, + {"id":46117,"enchant":3808,"gems":[39996]}, + {"id":46032,"enchant":3831,"gems":[39996,39996]}, + {"id":46111,"enchant":3832,"gems":[42142,42142]}, + {"id":45663,"enchant":3845,"gems":[42142,0]}, + {"id":46113,"enchant":3604,"gems":[39996,0]}, + {"id":45241,"gems":[39996,45862,39996]}, + {"id":45134,"enchant":3823,"gems":[39996,39996,39996]}, + {"id":45599,"enchant":3606,"gems":[39996,39996]}, + {"id":45534,"gems":[39996]}, + {"id":46048,"gems":[39996]}, + {"id":42987}, + {"id":45931}, + {"id":45516,"enchant":3368,"gems":[39996,39996]}, + {}, + {"id":45254} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p2_frost.gear.json b/ui/deathknight/gear_sets/p2_frost.gear.json new file mode 100644 index 0000000000..49dddb60e0 --- /dev/null +++ b/ui/deathknight/gear_sets/p2_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46115,"enchant":3817,"gems":[41398,42702]}, + {"id":45459,"gems":[39996]}, + {"id":46117,"enchant":3808,"gems":[39996]}, + {"id":46032,"enchant":3831,"gems":[39996,39996]}, + {"id":46111,"enchant":3832,"gems":[42142,42142]}, + {"id":45663,"enchant":3845,"gems":[39996,0]}, + {"id":46113,"enchant":3604,"gems":[39996,0]}, + {"id":45241,"gems":[42142,45862,39996]}, + {"id":45134,"enchant":3823,"gems":[39996,39996,39996]}, + {"id":45599,"enchant":3606,"gems":[39996,39996]}, + {"id":45608,"gems":[39996]}, + {"id":45534,"gems":[39996]}, + {"id":45931}, + {"id":42987}, + {"id":46097,"enchant":3370,"gems":[39996]}, + {"id":46097,"enchant":3368,"gems":[39996]}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p2_uh_dw.gear.json b/ui/deathknight/gear_sets/p2_uh_dw.gear.json new file mode 100644 index 0000000000..5ec619f5f5 --- /dev/null +++ b/ui/deathknight/gear_sets/p2_uh_dw.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45472,"enchant":3817,"gems":[41398,40041]}, + {"id":46040,"gems":[39996]}, + {"id":46117,"enchant":3808,"gems":[39996]}, + {"id":45588,"enchant":3831,"gems":[39996]}, + {"id":46111,"enchant":3832,"gems":[42142,42142]}, + {"id":45663,"enchant":3845,"gems":[39996,0]}, + {"id":45481,"enchant":3604,"gems":[0]}, + {"id":45241,"gems":[42142,45862,39996]}, + {"id":45134,"enchant":3823,"gems":[40041,39996,40022]}, + {"id":45599,"enchant":3606,"gems":[39996,39996]}, + {"id":45534,"gems":[39996]}, + {"id":45250}, + {"id":45609}, + {"id":42987}, + {"id":46097,"enchant":3368,"gems":[39996]}, + {"id":46036,"enchant":3368,"gems":[39996]}, + {"id":45254} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p3_blood.gear.json b/ui/deathknight/gear_sets/p3_blood.gear.json new file mode 100644 index 0000000000..b861910b9b --- /dev/null +++ b/ui/deathknight/gear_sets/p3_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48493,"enchant":3817,"gems":[41285,40142]}, + {"id":47458,"gems":[40142]}, + {"id":48495,"enchant":3808,"gems":[40111]}, + {"id":47546,"enchant":3831,"gems":[42142]}, + {"id":47449,"enchant":3832,"gems":[49110,42142,40142]}, + {"id":48008,"enchant":3845,"gems":[40111,0]}, + {"id":48492,"enchant":3604,"gems":[40142,0]}, + {"id":47429,"gems":[40142,40142,40111]}, + {"id":48494,"enchant":3823,"gems":[40142,40111]}, + {"id":45599,"enchant":3606,"gems":[40111,40111]}, + {"id":47993,"gems":[40111,45862]}, + {"id":47413,"gems":[40142]}, + {"id":45931}, + {"id":47464}, + {"id":47446,"enchant":3368,"gems":[42142,40141]}, + {}, + {"id":47673} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p3_frost.gear.json b/ui/deathknight/gear_sets/p3_frost.gear.json new file mode 100644 index 0000000000..d394bb4f5e --- /dev/null +++ b/ui/deathknight/gear_sets/p3_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48493,"enchant":3817,"gems":[41398,40142]}, + {"id":45459,"gems":[40111]}, + {"id":48495,"enchant":3808,"gems":[40111]}, + {"id":47548,"enchant":3831,"gems":[40111]}, + {"id":48491,"enchant":3832,"gems":[42142,42142]}, + {"id":45663,"enchant":3845,"gems":[40111,0]}, + {"id":47492,"enchant":3604,"gems":[49110,40111,0]}, + {"id":45241,"gems":[40111,42142,40111]}, + {"id":48494,"enchant":3823,"gems":[40142,40111]}, + {"id":47473,"enchant":3606,"gems":[40142,40111]}, + {"id":46966,"gems":[40111]}, + {"id":45534,"gems":[40111]}, + {"id":47464}, + {"id":45931}, + {"id":47528,"enchant":3370,"gems":[40111]}, + {"id":47528,"enchant":3368,"gems":[40111]}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p3_uh_dw.gear.json b/ui/deathknight/gear_sets/p3_uh_dw.gear.json new file mode 100644 index 0000000000..c965d9e00a --- /dev/null +++ b/ui/deathknight/gear_sets/p3_uh_dw.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48493,"enchant":3817,"gems":[41398,40146]}, + {"id":47458,"gems":[40146]}, + {"id":48495,"enchant":3808,"gems":[40111]}, + {"id":47548,"enchant":3831,"gems":[40111]}, + {"id":48491,"enchant":3832,"gems":[42142,42142]}, + {"id":45663,"enchant":3845,"gems":[40111,0]}, + {"id":48492,"enchant":3604,"gems":[40146,0]}, + {"id":47429,"gems":[40111,45862,40111]}, + {"id":47465,"enchant":3823,"gems":[49110,40111,40146]}, + {"id":45599,"enchant":3606,"gems":[40111,40111]}, + {"id":47413,"gems":[40146]}, + {"id":45534,"gems":[42142]}, + {"id":47464}, + {"id":45609}, + {"id":47528,"enchant":3368,"gems":[40111]}, + {"id":47528,"enchant":3368,"gems":[40111]}, + {"id":47673} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p4_blood.gear.json b/ui/deathknight/gear_sets/p4_blood.gear.json new file mode 100644 index 0000000000..374b431ec8 --- /dev/null +++ b/ui/deathknight/gear_sets/p4_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51312,"enchant":3817,"gems":[41398,40117]}, + {"id":50728,"gems":[40143]}, + {"id":51314,"enchant":3808,"gems":[40117]}, + {"id":50677,"enchant":3831,"gems":[42156]}, + {"id":51310,"enchant":3832,"gems":[40117,49110]}, + {"id":50659,"enchant":3845,"gems":[40162,0]}, + {"id":50675,"enchant":3604,"gems":[40143,40117,0]}, + {"id":50620,"gems":[40125,40117,40117]}, + {"id":51313,"enchant":3823,"gems":[40117,40117]}, + {"id":50639,"enchant":3606,"gems":[40125,40117]}, + {"id":50693,"gems":[40125]}, + {"id":52572,"gems":[40125]}, + {"id":50363}, + {"id":47464}, + {"id":49623,"enchant":3368,"gems":[40117,42153,42153]}, + {}, + {"id":47673} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p4_frost.gear.json b/ui/deathknight/gear_sets/p4_frost.gear.json new file mode 100644 index 0000000000..03bc1c5672 --- /dev/null +++ b/ui/deathknight/gear_sets/p4_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51312,"enchant":3817,"gems":[41398,42153]}, + {"id":50728,"gems":[40117]}, + {"id":51314,"enchant":3808,"gems":[42153]}, + {"id":47548,"enchant":3831,"gems":[40117]}, + {"id":51310,"enchant":3832,"gems":[42153,40117]}, + {"id":50659,"enchant":3845,"gems":[40117,0]}, + {"id":51311,"enchant":3604,"gems":[40117,0]}, + {"id":50620,"enchant":3601,"gems":[40143,40117,40117]}, + {"id":51817,"enchant":3823,"gems":[49110,40117,40143]}, + {"id":50639,"enchant":3606,"gems":[40143,40117]}, + {"id":52572,"gems":[40117]}, + {"id":50693,"gems":[40117]}, + {"id":50363}, + {"id":47464}, + {"id":50737,"enchant":3370,"gems":[40117]}, + {"id":50737,"enchant":3368,"gems":[40117]}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p4_uh_2h.gear.json b/ui/deathknight/gear_sets/p4_uh_2h.gear.json new file mode 100644 index 0000000000..052de90af2 --- /dev/null +++ b/ui/deathknight/gear_sets/p4_uh_2h.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51312,"enchant":3817,"gems":[41398,40111]}, + {"id":50647,"gems":[40111]}, + {"id":51314,"enchant":3808,"gems":[40111]}, + {"id":50677,"enchant":3831,"gems":[40146]}, + {"id":51310,"enchant":3832,"gems":[40111,40111]}, + {"id":50659,"enchant":3845,"gems":[40146,0]}, + {"id":51311,"enchant":3604,"gems":[40146,0]}, + {"id":50620,"gems":[40146,40111,40111]}, + {"id":50624,"enchant":3823,"gems":[40146,40111,49110]}, + {"id":50639,"enchant":3606,"gems":[40146,40111]}, + {"id":50693,"gems":[40146]}, + {"id":52572,"gems":[40146]}, + {"id":47464}, + {"id":50363}, + {"id":49623,"enchant":3368,"gems":[42142,42142,42142]}, + {}, + {"id":47673} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/p4_uh_dw.gear.json b/ui/deathknight/gear_sets/p4_uh_dw.gear.json new file mode 100644 index 0000000000..32da582b04 --- /dev/null +++ b/ui/deathknight/gear_sets/p4_uh_dw.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51312,"enchant":3817,"gems":[41398,40111]}, + {"id":50647,"gems":[40111]}, + {"id":51314,"enchant":3808,"gems":[40111]}, + {"id":50677,"enchant":3831,"gems":[40146]}, + {"id":51310,"enchant":3832,"gems":[42142,49110]}, + {"id":50659,"enchant":3845,"gems":[40146,0]}, + {"id":51311,"enchant":3604,"gems":[40146,0]}, + {"id":50620,"gems":[40146,40111,42142]}, + {"id":50624,"enchant":3823,"gems":[40111,42142,40111]}, + {"id":50639,"enchant":3606,"gems":[40146,40111]}, + {"id":52572,"gems":[40146]}, + {"id":51855,"gems":[40111]}, + {"id":47131}, + {"id":50363}, + {"id":50737,"enchant":3368,"gems":[40111]}, + {"id":50737,"enchant":3368,"gems":[40111]}, + {"id":47673} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/preraid_frost.gear.json b/ui/deathknight/gear_sets/preraid_frost.gear.json new file mode 100644 index 0000000000..47b1e05ab2 --- /dev/null +++ b/ui/deathknight/gear_sets/preraid_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41386,"enchant":3817,"gems":[41398,49110]}, + {"id":42645,"gems":[42142]}, + {"id":34388,"enchant":3808,"gems":[39996,39996]}, + {"id":37647,"enchant":3831}, + {"id":39617,"enchant":3832,"gems":[42142,39996]}, + {"id":41355,"enchant":3845,"gems":[0]}, + {"id":39618,"enchant":3604,"gems":[39996,0]}, + {"id":37171,"gems":[39996,39996]}, + {"id":37193,"enchant":3823,"gems":[42142,39996]}, + {"id":44306,"enchant":3606,"gems":[39996,39996]}, + {"id":42642,"gems":[39996]}, + {"id":44935}, + {"id":40684}, + {"id":42987}, + {"id":41383,"enchant":3370}, + {"id":43611,"enchant":3368}, + {"id":40715} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/preraid_uh_2h.gear.json b/ui/deathknight/gear_sets/preraid_uh_2h.gear.json new file mode 100644 index 0000000000..5d2cd4da04 --- /dev/null +++ b/ui/deathknight/gear_sets/preraid_uh_2h.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41386,"enchant":3817,"gems":[41400,49110]}, + {"id":37397}, + {"id":37627,"enchant":3808,"gems":[39996]}, + {"id":37647,"enchant":3831}, + {"id":39617,"enchant":3832,"gems":[42142,39996]}, + {"id":41355,"enchant":3845,"gems":[0]}, + {"id":39618,"enchant":3604,"gems":[39996,0]}, + {"id":40688,"gems":[39996,42142]}, + {"id":37193,"enchant":3823,"gems":[42142,39996]}, + {"id":44306,"enchant":3606,"gems":[39996,39996]}, + {"id":37642}, + {"id":44935}, + {"id":40684}, + {"id":42987}, + {"id":41257,"enchant":3368}, + {}, + {"id":40867} +]} \ No newline at end of file diff --git a/ui/deathknight/gear_sets/preraid_uh_dw.gear.json b/ui/deathknight/gear_sets/preraid_uh_dw.gear.json new file mode 100644 index 0000000000..12d234fdcb --- /dev/null +++ b/ui/deathknight/gear_sets/preraid_uh_dw.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41386,"enchant":3817,"gems":[41400,49110]}, + {"id":37397}, + {"id":37627,"enchant":3808,"gems":[39996]}, + {"id":37647,"enchant":3831}, + {"id":39617,"enchant":3832,"gems":[42142,39996]}, + {"id":41355,"enchant":3845,"gems":[0]}, + {"id":39618,"enchant":3604,"gems":[39996,0]}, + {"id":40688,"gems":[39996,42142]}, + {"id":37193,"enchant":3823,"gems":[42142,39996]}, + {"id":44306,"enchant":3606,"gems":[39996,39996]}, + {"id":37642}, + {"id":44935}, + {"id":40684}, + {"id":42987}, + {"id":41383,"enchant":3368}, + {"id":40703,"enchant":3368}, + {"id":40867} +]} \ No newline at end of file diff --git a/ui/deathknight/presets.ts b/ui/deathknight/presets.ts index 0ce2d79fbf..6647964892 100644 --- a/ui/deathknight/presets.ts +++ b/ui/deathknight/presets.ts @@ -2,7 +2,6 @@ import { Consumes, CustomRotation, CustomSpell, - EquipmentSpec, Explosive, Flask, Food, @@ -13,7 +12,6 @@ import { Spec } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Player } from '../core/player.js'; import { Deathknight_Options as DeathKnightOptions, @@ -30,15 +28,31 @@ import { } from '../core/proto/deathknight.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import P1BloodGear from './gear_sets/p1_blood.gear.json'; +import P2BloodGear from './gear_sets/p2_blood.gear.json'; +import P3BloodGear from './gear_sets/p3_blood.gear.json'; +import P4BloodGear from './gear_sets/p4_blood.gear.json'; +import PreraidUh2hGear from './gear_sets/preraid_uh_2h.gear.json'; +import P1Uh2hGear from './gear_sets/p1_uh_2h.gear.json'; +import P4Uh2hGear from './gear_sets/p4_uh_2h.gear.json'; +import PreraidUhDwGear from './gear_sets/preraid_uh_dw.gear.json'; +import P1UhDwGear from './gear_sets/p1_uh_dw.gear.json'; +import P2UhDwGear from './gear_sets/p2_uh_dw.gear.json'; +import P3UhDwGear from './gear_sets/p3_uh_dw.gear.json'; +import P4UhDwGear from './gear_sets/p4_uh_dw.gear.json'; +import PreraidFrostGear from './gear_sets/preraid_frost.gear.json'; +import P1FrostGear from './gear_sets/p1_frost.gear.json'; +import P2FrostGear from './gear_sets/p2_frost.gear.json'; +import P3FrostGear from './gear_sets/p3_frost.gear.json'; +import P4FrostGear from './gear_sets/p4_frost.gear.json'; +import P1FrostSubUhGear from './gear_sets/p1_frost_subUh.gear.json'; import BloodPestiApl from './apls/blood_pesti.apl.json'; import BloodPestiDDApl from './apls/blood_pesti_dd.apl.json'; import BloodPestiAoeApl from './apls/blood_pesti_aoe.apl.json'; - import FrostBlPestiApl from './apls/frost_bl_pesti.apl.json'; import FrostUhPestiApl from './apls/frost_uh_pesti.apl.json'; - import UhDwSsApl from './apls/unholy_dw_ss.apl.json'; import Uh2hSsApl from './apls/uh_2h_ss.apl.json'; import UhDndAoeApl from './apls/uh_dnd_aoe.apl.json'; @@ -47,6 +61,102 @@ import UhDndAoeApl from './apls/uh_dnd_aoe.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const P1_BLOOD_PRESET = PresetUtils.makePresetGear('P1 Blood', P1BloodGear, { talentTree: 0 }); +export const P2_BLOOD_PRESET = PresetUtils.makePresetGear('P2 Blood', P2BloodGear, { talentTree: 0 }); +export const P3_BLOOD_PRESET = PresetUtils.makePresetGear('P3 Blood', P3BloodGear, { talentTree: 0 }); +export const P4_BLOOD_PRESET = PresetUtils.makePresetGear('P4 Blood', P4BloodGear, { talentTree: 0 }); +export const PRERAID_FROST_PRESET = PresetUtils.makePresetGear('Pre-Raid Frost', PreraidFrostGear, { talentTree: 1 }); +export const P1_FROST_PRESET = PresetUtils.makePresetGear('P1 Frost', P1FrostGear, { talentTree: 1 }); +export const P2_FROST_PRESET = PresetUtils.makePresetGear('P2 Frost', P2FrostGear, { talentTree: 1 }); +export const P3_FROST_PRESET = PresetUtils.makePresetGear('P3 Frost', P3FrostGear, { talentTree: 1 }); +export const P4_FROST_PRESET = PresetUtils.makePresetGear('P4 Frost', P4FrostGear, { talentTree: 1 }); +export const P1_FROSTSUBUNH_PRESET = PresetUtils.makePresetGear('P1 Frost Sub Unh', P1FrostSubUhGear, { talentTree: 1 }); +export const PRERAID_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('Pre-Raid 2H Unholy', PreraidUh2hGear, { talentTree: 2 }); +export const P1_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('P1 2H Unholy', P1Uh2hGear, { talentTree: 2 }); +export const P4_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('P4 2H Unholy', P4Uh2hGear, { talentTree: 2 }); +export const PRERAID_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('Pre-Raid DW Unholy', PreraidUhDwGear, { talentTree: 2 }); +export const P1_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P1 DW Unholy', P1UhDwGear, { talentTree: 2 }); +export const P2_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P2 DW Unholy', P2UhDwGear, { talentTree: 2 }); +export const P3_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P3 DW Unholy', P3UhDwGear, { talentTree: 2 }); +export const P4_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P4 DW Unholy', P4UhDwGear, { talentTree: 2 }); + +export const DefaultUnholyRotation = DeathKnightRotation.create({ + useDeathAndDecay: true, + btGhoulFrenzy: true, + refreshHornOfWinter: false, + useGargoyle: true, + useEmpowerRuneWeapon: true, + holdErwArmy: false, + preNerfedGargoyle: false, + armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.AsMajorCd, + startingPresence: Deathknight_Rotation_Presence.Unholy, + blPresence: Deathknight_Rotation_Presence.Blood, + presence: Deathknight_Rotation_Presence.Blood, + gargoylePresence: Deathknight_Rotation_Presence.Unholy, + bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodBoil, + useAms: false, + drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, + bloodSpender: Deathknight_Rotation_BloodSpell.HS, + useDancingRuneWeapon: true +}); + +export const DefaultFrostRotation = DeathKnightRotation.create({ + useDeathAndDecay: false, + btGhoulFrenzy: false, + refreshHornOfWinter: false, + useEmpowerRuneWeapon: true, + preNerfedGargoyle: false, + startingPresence: Deathknight_Rotation_Presence.Blood, + presence: Deathknight_Rotation_Presence.Blood, + bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodBoil, + useAms: false, + avgAmsSuccessRate: 1.0, + avgAmsHit: 10000.0, + drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, + frostRotationType: Deathknight_Rotation_FrostRotationType.SingleTarget, + armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.PreCast, + frostCustomRotation: CustomRotation.create({ + spells: [ + CustomSpell.create({ spell: CustomSpellOption.CustomDeathAndDecay }), + CustomSpell.create({ spell: CustomSpellOption.CustomIcyTouch }), + CustomSpell.create({ spell: CustomSpellOption.CustomPlagueStrike }), + CustomSpell.create({ spell: CustomSpellOption.CustomPestilence }), + CustomSpell.create({ spell: CustomSpellOption.CustomHowlingBlastRime }), + CustomSpell.create({ spell: CustomSpellOption.CustomHowlingBlast }), + CustomSpell.create({ spell: CustomSpellOption.CustomBloodBoil }), + CustomSpell.create({ spell: CustomSpellOption.CustomObliterate }), + CustomSpell.create({ spell: CustomSpellOption.CustomFrostStrike }), + ], + }), +}); + +export const DefaultBloodRotation = DeathKnightRotation.create({ + refreshHornOfWinter: false, + useEmpowerRuneWeapon: true, + preNerfedGargoyle: false, + startingPresence: Deathknight_Rotation_Presence.Blood, + bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodStrike, + armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.PreCast, + holdErwArmy: false, + useAms: false, + drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, + bloodSpender: Deathknight_Rotation_BloodSpell.HS, + useDancingRuneWeapon: true, +}); + +export const BLOOD_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Blood Legacy', Spec.SpecDeathknight, DefaultBloodRotation, { talentTree: 0 }); +export const FROST_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Frost Legacy', Spec.SpecDeathknight, DefaultFrostRotation, { talentTree: 1 }); +export const UNHOLY_DW_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Unholy DW Legacy', Spec.SpecDeathknight, DefaultUnholyRotation, { talentTree: 2 }); + +export const BLOOD_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti', BloodPestiApl, { talentTree: 0 }); +export const BLOOD_PESTI_DD_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti DD', BloodPestiDDApl, { talentTree: 0 }); +export const BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti AOE', BloodPestiAoeApl, { talentTree: 0 }); +export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost BL Pesti', FrostBlPestiApl, { talentTree: 1 }); +export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost UH Pesti', FrostUhPestiApl, { talentTree: 1 }); +export const UNHOLY_DW_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DW SS', UhDwSsApl, { talentTree: 2 }); +export const UNHOLY_2H_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy 2H SS', Uh2hSsApl, { talentTree: 2 }); +export const UNHOLY_DND_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DND AOE', UhDndAoeApl, { talentTree: 2 }); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wotlk.wowhead.com/talent-calc and copy the numbers in the url. export const FrostTalents = { @@ -154,26 +264,6 @@ export const BloodTalents = { }), }; -export const DefaultUnholyRotation = DeathKnightRotation.create({ - useDeathAndDecay: true, - btGhoulFrenzy: true, - refreshHornOfWinter: false, - useGargoyle: true, - useEmpowerRuneWeapon: true, - holdErwArmy: false, - preNerfedGargoyle: false, - armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.AsMajorCd, - startingPresence: Deathknight_Rotation_Presence.Unholy, - blPresence: Deathknight_Rotation_Presence.Blood, - presence: Deathknight_Rotation_Presence.Blood, - gargoylePresence: Deathknight_Rotation_Presence.Unholy, - bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodBoil, - useAms: false, - drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, - bloodSpender: Deathknight_Rotation_BloodSpell.HS, - useDancingRuneWeapon: true -}); - export const DefaultUnholyOptions = DeathKnightOptions.create({ drwPestiApply: true, startingRunicPower: 0, @@ -184,36 +274,6 @@ export const DefaultUnholyOptions = DeathKnightOptions.create({ diseaseDowntime: 2, }); -export const DefaultFrostRotation = DeathKnightRotation.create({ - useDeathAndDecay: false, - btGhoulFrenzy: false, - refreshHornOfWinter: false, - useEmpowerRuneWeapon: true, - preNerfedGargoyle: false, - startingPresence: Deathknight_Rotation_Presence.Blood, - presence: Deathknight_Rotation_Presence.Blood, - bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodBoil, - useAms: false, - avgAmsSuccessRate: 1.0, - avgAmsHit: 10000.0, - drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, - frostRotationType: Deathknight_Rotation_FrostRotationType.SingleTarget, - armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.PreCast, - frostCustomRotation: CustomRotation.create({ - spells: [ - CustomSpell.create({ spell: CustomSpellOption.CustomDeathAndDecay }), - CustomSpell.create({ spell: CustomSpellOption.CustomIcyTouch }), - CustomSpell.create({ spell: CustomSpellOption.CustomPlagueStrike }), - CustomSpell.create({ spell: CustomSpellOption.CustomPestilence }), - CustomSpell.create({ spell: CustomSpellOption.CustomHowlingBlastRime }), - CustomSpell.create({ spell: CustomSpellOption.CustomHowlingBlast }), - CustomSpell.create({ spell: CustomSpellOption.CustomBloodBoil }), - CustomSpell.create({ spell: CustomSpellOption.CustomObliterate }), - CustomSpell.create({ spell: CustomSpellOption.CustomFrostStrike }), - ], - }), -}); - export const DefaultFrostOptions = DeathKnightOptions.create({ drwPestiApply: true, startingRunicPower: 0, @@ -223,20 +283,6 @@ export const DefaultFrostOptions = DeathKnightOptions.create({ diseaseDowntime: 0, }); -export const DefaultBloodRotation = DeathKnightRotation.create({ - refreshHornOfWinter: false, - useEmpowerRuneWeapon: true, - preNerfedGargoyle: false, - startingPresence: Deathknight_Rotation_Presence.Blood, - bloodRuneFiller: Deathknight_Rotation_BloodRuneFiller.BloodStrike, - armyOfTheDead: Deathknight_Rotation_ArmyOfTheDead.PreCast, - holdErwArmy: false, - useAms: false, - drwDiseases: Deathknight_Rotation_DrwDiseases.Pestilence, - bloodSpender: Deathknight_Rotation_BloodSpell.HS, - useDancingRuneWeapon: true, -}); - export const DefaultBloodOptions = DeathKnightOptions.create({ drwPestiApply: true, startingRunicPower: 0, @@ -258,468 +304,3 @@ export const DefaultConsumes = Consumes.create({ thermalSapper: true, fillerExplosive: Explosive.ExplosiveSaroniteBomb, }); - -export const BLOOD_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Blood Legacy', Spec.SpecDeathknight, DefaultBloodRotation, { talentTree: 0 }); -export const FROST_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Frost Legacy', Spec.SpecDeathknight, DefaultFrostRotation, { talentTree: 1 }); -export const UNHOLY_DW_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Unholy DW Legacy', Spec.SpecDeathknight, DefaultUnholyRotation, { talentTree: 2 }); - -export const BLOOD_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti', BloodPestiApl, { talentTree: 0 }); -export const BLOOD_PESTI_DD_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti DD', BloodPestiDDApl, { talentTree: 0 }); -export const BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti AOE', BloodPestiAoeApl, { talentTree: 0 }); -export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost BL Pesti', FrostBlPestiApl, { talentTree: 1 }); -export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost UH Pesti', FrostUhPestiApl, { talentTree: 1 }); -export const UNHOLY_DW_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DW SS', UhDwSsApl, { talentTree: 2 }); -export const UNHOLY_2H_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy 2H SS', Uh2hSsApl, { talentTree: 2 }); -export const UNHOLY_DND_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DND AOE', UhDndAoeApl, { talentTree: 2 }); - -export const P1_BLOOD_BIS_PRESET = { - name: 'P1 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":44006,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[39996]}, - {"id":40557,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3831}, - {"id":40550,"enchant":3832,"gems":[42142,42142]}, - {"id":40330,"enchant":3845,"gems":[42142,0]}, - {"id":40552,"enchant":3604,"gems":[39996,0]}, - {"id":40278,"gems":[39996,39996]}, - {"id":40556,"enchant":3823,"gems":[39996,40037]}, - {"id":40591,"enchant":3606}, - {"id":40075}, - {"id":39401}, - {"id":40256}, - {"id":42987}, - {"id":40384,"enchant":3368}, - {}, - {"id":40207} - ]}`), -}; - -export const P2_BLOOD_BIS_PRESET = { - name: 'P2 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46115,"enchant":3817,"gems":[41398,42702]}, - {"id":45459,"gems":[39996]}, - {"id":46117,"enchant":3808,"gems":[39996]}, - {"id":46032,"enchant":3831,"gems":[39996,39996]}, - {"id":46111,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[42142,0]}, - {"id":46113,"enchant":3604,"gems":[39996,0]}, - {"id":45241,"gems":[39996,45862,39996]}, - {"id":45134,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":45599,"enchant":3606,"gems":[39996,39996]}, - {"id":45534,"gems":[39996]}, - {"id":46048,"gems":[39996]}, - {"id":42987}, - {"id":45931}, - {"id":45516,"enchant":3368,"gems":[39996,39996]}, - {}, - {"id":45254} - ]}`), -}; - -export const P3_BLOOD_BIS_PRESET = { - name: 'P3 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48493,"enchant":3817,"gems":[41285,40142]}, - {"id":47458,"gems":[40142]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47546,"enchant":3831,"gems":[42142]}, - {"id":47449,"enchant":3832,"gems":[49110,42142,40142]}, - {"id":48008,"enchant":3845,"gems":[40111,0]}, - {"id":48492,"enchant":3604,"gems":[40142,0]}, - {"id":47429,"gems":[40142,40142,40111]}, - {"id":48494,"enchant":3823,"gems":[40142,40111]}, - {"id":45599,"enchant":3606,"gems":[40111,40111]}, - {"id":47993,"gems":[40111,45862]}, - {"id":47413,"gems":[40142]}, - {"id":45931}, - {"id":47464}, - {"id":47446,"enchant":3368,"gems":[42142,40141]}, - {}, - {"id":47673} - ]}`), -}; - -export const P4_BLOOD_BIS_PRESET = { - name: 'P4 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":51312,"enchant":3817,"gems":[41398,40117]}, - {"id":50728,"gems":[40143]}, - {"id":51314,"enchant":3808,"gems":[40117]}, - {"id":50677,"enchant":3831,"gems":[42156]}, - {"id":51310,"enchant":3832,"gems":[40117,49110]}, - {"id":50659,"enchant":3845,"gems":[40162,0]}, - {"id":50675,"enchant":3604,"gems":[40143,40117,0]}, - {"id":50620,"gems":[40125,40117,40117]}, - {"id":51313,"enchant":3823,"gems":[40117,40117]}, - {"id":50639,"enchant":3606,"gems":[40125,40117]}, - {"id":50693,"gems":[40125]}, - {"id":52572,"gems":[40125]}, - {"id":50363}, - {"id":47464}, - {"id":49623,"enchant":3368,"gems":[40117,42153,42153]}, - {}, - {"id":47673} - ]}`), -}; - -export const P1_UNHOLY_2H_PRERAID_PRESET = { - name: 'Pre-Raid 2H Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":41386,"enchant":3817,"gems":[41400,49110]}, - {"id":37397}, - {"id":37627,"enchant":3808,"gems":[39996]}, - {"id":37647,"enchant":3831}, - {"id":39617,"enchant":3832,"gems":[42142,39996]}, - {"id":41355,"enchant":3845,"gems":[0]}, - {"id":39618,"enchant":3604,"gems":[39996,0]}, - {"id":40688,"gems":[39996,42142]}, - {"id":37193,"enchant":3823,"gems":[42142,39996]}, - {"id":44306,"enchant":3606,"gems":[39996,39996]}, - {"id":37642}, - {"id":44935}, - {"id":40684}, - {"id":42987}, - {"id":41257,"enchant":3368}, - {}, - {"id":40867} - ]}`), -}; - -export const P1_UNHOLY_2H_BIS_PRESET = { - name: 'P1 2H Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":44006,"enchant":3817,"gems":[41400,49110]}, - {"id":44664,"gems":[39996]}, - {"id":40557,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3831}, - {"id":40550,"enchant":3832,"gems":[42142,39996]}, - {"id":40330,"enchant":3845,"gems":[39996,0]}, - {"id":40552,"enchant":3604,"gems":[40038,0]}, - {"id":40278,"gems":[42142,42142]}, - {"id":40556,"enchant":3823,"gems":[39996,39996]}, - {"id":40591,"enchant":3606}, - {"id":39401}, - {"id":40075}, - {"id":40256}, - {"id":42987}, - {"id":40384,"enchant":3368}, - {}, - {"id":40207} - ] - }`), -}; - -export const P4_UNHOLY_2H_BIS_PRESET = { - name: 'P4 2H Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":51312,"enchant":3817,"gems":[41398,40111]}, - {"id":50647,"gems":[40111]}, - {"id":51314,"enchant":3808,"gems":[40111]}, - {"id":50677,"enchant":3831,"gems":[40146]}, - {"id":51310,"enchant":3832,"gems":[40111,40111]}, - {"id":50659,"enchant":3845,"gems":[40146,0]}, - {"id":51311,"enchant":3604,"gems":[40146,0]}, - {"id":50620,"gems":[40146,40111,40111]}, - {"id":50624,"enchant":3823,"gems":[40146,40111,49110]}, - {"id":50639,"enchant":3606,"gems":[40146,40111]}, - {"id":50693,"gems":[40146]}, - {"id":52572,"gems":[40146]}, - {"id":47464}, - {"id":50363}, - {"id":49623,"enchant":3368,"gems":[42142,42142,42142]}, - {}, - {"id":47673} - ] - }`), -}; - -export const P1_UNHOLY_DW_PRERAID_PRESET = { - name: 'Pre-Raid DW Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":41386,"enchant":3817,"gems":[41400,49110]}, - {"id":37397}, - {"id":37627,"enchant":3808,"gems":[39996]}, - {"id":37647,"enchant":3831}, - {"id":39617,"enchant":3832,"gems":[42142,39996]}, - {"id":41355,"enchant":3845,"gems":[0]}, - {"id":39618,"enchant":3604,"gems":[39996,0]}, - {"id":40688,"gems":[39996,42142]}, - {"id":37193,"enchant":3823,"gems":[42142,39996]}, - {"id":44306,"enchant":3606,"gems":[39996,39996]}, - {"id":37642}, - {"id":44935}, - {"id":40684}, - {"id":42987}, - {"id":41383,"enchant":3368}, - {"id":40703,"enchant":3368}, - {"id":40867} - ]}`), -}; - -export const P1_UNHOLY_DW_BIS_PRESET = { - name: 'P1 DW Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":44006,"enchant":3817,"gems":[41398,42702]}, - {"id":39421}, - {"id":40557,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3831}, - {"id":40550,"enchant":3832,"gems":[42142,39996]}, - {"id":40330,"enchant":3845,"gems":[39996,0]}, - {"id":40347,"enchant":3604,"gems":[39996,0]}, - {"id":40278,"gems":[42142,42142]}, - {"id":40294,"enchant":3823}, - {"id":39706,"enchant":3606,"gems":[39996]}, - {"id":39401}, - {"id":40075}, - {"id":37390}, - {"id":42987}, - {"id":40402,"enchant":3368}, - {"id":40491,"enchant":3368}, - {"id":42620} - ]}`), -}; - -export const P2_UNHOLY_DW_BIS_PRESET = { - name: 'P2 DW Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45472,"enchant":3817,"gems":[41398,40041]}, - {"id":46040,"gems":[39996]}, - {"id":46117,"enchant":3808,"gems":[39996]}, - {"id":45588,"enchant":3831,"gems":[39996]}, - {"id":46111,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[39996,0]}, - {"id":45481,"enchant":3604,"gems":[0]}, - {"id":45241,"gems":[42142,45862,39996]}, - {"id":45134,"enchant":3823,"gems":[40041,39996,40022]}, - {"id":45599,"enchant":3606,"gems":[39996,39996]}, - {"id":45534,"gems":[39996]}, - {"id":45250}, - {"id":45609}, - {"id":42987}, - {"id":46097,"enchant":3368,"gems":[39996]}, - {"id":46036,"enchant":3368,"gems":[39996]}, - {"id":45254} - ]}`), -}; - -export const P3_UNHOLY_DW_BIS_PRESET = { - name: 'P3 DW Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48493,"enchant":3817,"gems":[41398,40146]}, - {"id":47458,"gems":[40146]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47548,"enchant":3831,"gems":[40111]}, - {"id":48491,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[40111,0]}, - {"id":48492,"enchant":3604,"gems":[40146,0]}, - {"id":47429,"gems":[40111,45862,40111]}, - {"id":47465,"enchant":3823,"gems":[49110,40111,40146]}, - {"id":45599,"enchant":3606,"gems":[40111,40111]}, - {"id":47413,"gems":[40146]}, - {"id":45534,"gems":[42142]}, - {"id":47464}, - {"id":45609}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":47673} - ]}`), -}; - -export const P4_UNHOLY_DW_BIS_PRESET = { - name: 'P4 DW Unholy', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51312,"enchant":3817,"gems":[41398,40111]}, - {"id":50647,"gems":[40111]}, - {"id":51314,"enchant":3808,"gems":[40111]}, - {"id":50677,"enchant":3831,"gems":[40146]}, - {"id":51310,"enchant":3832,"gems":[42142,49110]}, - {"id":50659,"enchant":3845,"gems":[40146,0]}, - {"id":51311,"enchant":3604,"gems":[40146,0]}, - {"id":50620,"gems":[40146,40111,42142]}, - {"id":50624,"enchant":3823,"gems":[40111,42142,40111]}, - {"id":50639,"enchant":3606,"gems":[40146,40111]}, - {"id":52572,"gems":[40146]}, - {"id":51855,"gems":[40111]}, - {"id":47131}, - {"id":50363}, - {"id":50737,"enchant":3368,"gems":[40111]}, - {"id":50737,"enchant":3368,"gems":[40111]}, - {"id":47673} - ]}`), -}; - -export const P1_FROST_PRE_BIS_PRESET = { - name: 'Pre-Raid Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":41386,"enchant":3817,"gems":[41398,49110]}, - {"id":42645,"gems":[42142]}, - {"id":34388,"enchant":3808,"gems":[39996,39996]}, - {"id":37647,"enchant":3831}, - {"id":39617,"enchant":3832,"gems":[42142,39996]}, - {"id":41355,"enchant":3845,"gems":[0]}, - {"id":39618,"enchant":3604,"gems":[39996,0]}, - {"id":37171,"gems":[39996,39996]}, - {"id":37193,"enchant":3823,"gems":[42142,39996]}, - {"id":44306,"enchant":3606,"gems":[39996,39996]}, - {"id":42642,"gems":[39996]}, - {"id":44935}, - {"id":40684}, - {"id":42987}, - {"id":41383,"enchant":3370}, - {"id":43611,"enchant":3368}, - {"id":40715} - ]}`), -}; - -export const P1_FROST_BIS_PRESET = { - name: 'P1 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":44006,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[39996]}, - {"id":40557,"enchant":3808,"gems":[39996]}, - {"id":40403,"enchant":3831}, - {"id":40550,"enchant":3832,"gems":[42142,39996]}, - {"id":40330,"enchant":3845,"gems":[39996,0]}, - {"id":40552,"enchant":3604,"gems":[39996,0]}, - {"id":40278,"gems":[39996,42142]}, - {"id":40556,"enchant":3823,"gems":[42142,39996]}, - {"id":40591,"enchant":3606}, - {"id":39401}, - {"id":40075}, - {"id":40256}, - {"id":42987}, - {"id":40189,"enchant":3370}, - {"id":40189,"enchant":3368}, - {"id":40207} - ]}`), -}; - -export const P2_FROST_BIS_PRESET = { - name: 'P2 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46115,"enchant":3817,"gems":[41398,42702]}, - {"id":45459,"gems":[39996]}, - {"id":46117,"enchant":3808,"gems":[39996]}, - {"id":46032,"enchant":3831,"gems":[39996,39996]}, - {"id":46111,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[39996,0]}, - {"id":46113,"enchant":3604,"gems":[39996,0]}, - {"id":45241,"gems":[42142,45862,39996]}, - {"id":45134,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":45599,"enchant":3606,"gems":[39996,39996]}, - {"id":45608,"gems":[39996]}, - {"id":45534,"gems":[39996]}, - {"id":45931}, - {"id":42987}, - {"id":46097,"enchant":3370,"gems":[39996]}, - {"id":46097,"enchant":3368,"gems":[39996]}, - {"id":40207} - ]}`), -}; - -export const P3_FROST_BIS_PRESET = { - name: 'P3 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48493,"enchant":3817,"gems":[41398,40142]}, - {"id":45459,"gems":[40111]}, - {"id":48495,"enchant":3808,"gems":[40111]}, - {"id":47548,"enchant":3831,"gems":[40111]}, - {"id":48491,"enchant":3832,"gems":[42142,42142]}, - {"id":45663,"enchant":3845,"gems":[40111,0]}, - {"id":47492,"enchant":3604,"gems":[49110,40111,0]}, - {"id":45241,"gems":[40111,42142,40111]}, - {"id":48494,"enchant":3823,"gems":[40142,40111]}, - {"id":47473,"enchant":3606,"gems":[40142,40111]}, - {"id":46966,"gems":[40111]}, - {"id":45534,"gems":[40111]}, - {"id":47464}, - {"id":45931}, - {"id":47528,"enchant":3370,"gems":[40111]}, - {"id":47528,"enchant":3368,"gems":[40111]}, - {"id":40207} - ]}`), -}; - -export const P4_FROST_BIS_PRESET = { - name: 'P4 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":51312,"enchant":3817,"gems":[41398,42153]}, - {"id":50728,"gems":[40117]}, - {"id":51314,"enchant":3808,"gems":[42153]}, - {"id":47548,"enchant":3831,"gems":[40117]}, - {"id":51310,"enchant":3832,"gems":[42153,40117]}, - {"id":50659,"enchant":3845,"gems":[40117,0]}, - {"id":51311,"enchant":3604,"gems":[40117,0]}, - {"id":50620,"enchant":3601,"gems":[40143,40117,40117]}, - {"id":51817,"enchant":3823,"gems":[49110,40117,40143]}, - {"id":50639,"enchant":3606,"gems":[40143,40117]}, - {"id":52572,"gems":[40117]}, - {"id":50693,"gems":[40117]}, - {"id":50363}, - {"id":47464}, - {"id":50737,"enchant":3370,"gems":[40117]}, - {"id":50737,"enchant":3368,"gems":[40117]}, - {"id":40207} - ]}`), -}; - -export const P1_FROSTSUBUNH_BIS_PRESET = { - name: 'P1 Frost Sub Unh', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":44006,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[40003]}, - {"id":40557,"enchant":3808,"gems":[40003]}, - {"id":40403,"enchant":3831}, - {"id":40550,"enchant":3832,"gems":[42142,40003]}, - {"id":40330,"enchant":3845,"gems":[39996,0]}, - {"id":40552,"enchant":3604,"gems":[40058,0]}, - {"id":40278,"gems":[39996,42142]}, - {"id":40556,"enchant":3823,"gems":[42142,39996]}, - {"id":40591,"enchant":3606}, - {"id":39401}, - {"id":40075}, - {"id":40256}, - {"id":42987}, - {"id":40189,"enchant":3370}, - {"id":40189,"enchant":3368}, - {"id":40207} - ]}`), -}; diff --git a/ui/deathknight/sim.ts b/ui/deathknight/sim.ts index 81f034c535..dc41028fc5 100644 --- a/ui/deathknight/sim.ts +++ b/ui/deathknight/sim.ts @@ -15,7 +15,6 @@ import { Deathknight, Deathknight_Rotation as DeathKnightRotation, DeathknightTa import * as IconInputs from '../core/components/icon_inputs.js'; import * as OtherInputs from '../core/components/other_inputs.js'; -import * as Tooltips from '../core/constants/tooltips.js'; import * as DeathKnightInputs from './inputs.js'; import * as Presets from './presets.js'; @@ -67,7 +66,7 @@ export class DeathknightSimUI extends IndividualSimUI { ], defaults: { // Default equipped gear. - gear: Presets.P2_UNHOLY_DW_BIS_PRESET.gear, + gear: Presets.P2_UNHOLY_DW_PRESET.gear, // Default EP weights for sorting gear in the gear picker. epWeights: Stats.fromMap({ [Stat.StatStrength]: 3.22, @@ -228,26 +227,26 @@ export class DeathknightSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.P1_BLOOD_BIS_PRESET, - Presets.P2_BLOOD_BIS_PRESET, - Presets.P3_BLOOD_BIS_PRESET, - Presets.P4_BLOOD_BIS_PRESET, - Presets.P1_FROST_BIS_PRESET, - Presets.P2_FROST_BIS_PRESET, - Presets.P3_FROST_BIS_PRESET, - Presets.P4_FROST_BIS_PRESET, - Presets.P1_UNHOLY_DW_BIS_PRESET, - Presets.P2_UNHOLY_DW_BIS_PRESET, - Presets.P3_UNHOLY_DW_BIS_PRESET, - Presets.P4_UNHOLY_DW_BIS_PRESET, - Presets.P4_UNHOLY_2H_BIS_PRESET, + Presets.P1_BLOOD_PRESET, + Presets.P2_BLOOD_PRESET, + Presets.P3_BLOOD_PRESET, + Presets.P4_BLOOD_PRESET, + Presets.P1_FROST_PRESET, + Presets.P2_FROST_PRESET, + Presets.P3_FROST_PRESET, + Presets.P4_FROST_PRESET, + Presets.P1_UNHOLY_DW_PRESET, + Presets.P2_UNHOLY_DW_PRESET, + Presets.P3_UNHOLY_DW_PRESET, + Presets.P4_UNHOLY_DW_PRESET, + Presets.P4_UNHOLY_2H_PRESET, // Not needed anymore just filling ui Space // Disabled on purpose - //Presets.P1_FROSTSUBUNH_BIS_PRESET, + //Presets.P1_FROSTSUBUNH_PRESET, //Presets.P1_FROST_PRE_BIS_PRESET, - //Presets.P1_UNHOLY_DW_PRERAID_PRESET, - //Presets.P1_UNHOLY_2H_PRERAID_PRESET, - //Presets.P1_UNHOLY_2H_BIS_PRESET, + //Presets.PRERAID_UNHOLY_DW_PRESET, + //Presets.PRERAID_UNHOLY_2H_PRESET, + //Presets.P1_UNHOLY_2H_PRESET, ], }, }); diff --git a/ui/elemental_shaman/gear_sets/p1.gear.json b/ui/elemental_shaman/gear_sets/p1.gear.json new file mode 100644 index 0000000000..950601f9d4 --- /dev/null +++ b/ui/elemental_shaman/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40516,"enchant":3820,"gems":[41285,40027]}, + {"id":44661,"gems":[39998]}, + {"id":40286,"enchant":3810}, + {"id":44005,"enchant":3722,"gems":[40027]}, + {"id":40514,"enchant":3832,"gems":[42144,42144]}, + {"id":40324,"enchant":2332,"gems":[42144,0]}, + {"id":40302,"enchant":3246,"gems":[0]}, + {"id":40301,"gems":[40014]}, + {"id":40560,"enchant":3721}, + {"id":40519,"enchant":3826}, + {"id":37694}, + {"id":40399}, + {"id":40432}, + {"id":40255}, + {"id":40395,"enchant":3834}, + {"id":40401,"enchant":1128}, + {"id":40267} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/p2.gear.json b/ui/elemental_shaman/gear_sets/p2.gear.json new file mode 100644 index 0000000000..8bafdcf78a --- /dev/null +++ b/ui/elemental_shaman/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46209,"enchant":3820,"gems":[41285,40048]}, + {"id":45933,"gems":[39998]}, + {"id":46211,"enchant":3810,"gems":[39998]}, + {"id":45242,"enchant":3722,"gems":[39998]}, + {"id":46206,"enchant":3832,"gems":[39998,39998]}, + {"id":45460,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45616,"enchant":3599,"gems":[39998,39998,39998]}, + {"id":46210,"enchant":3721,"gems":[39998,40027]}, + {"id":45537,"enchant":3606,"gems":[39998,40027]}, + {"id":46046,"gems":[39998]}, + {"id":45495,"gems":[39998]}, + {"id":45518}, + {"id":40255}, + {"id":45612,"enchant":3834,"gems":[39998]}, + {"id":45470,"enchant":1128,"gems":[39998]}, + {"id":40267} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/p3_alliance.gear.json b/ui/elemental_shaman/gear_sets/p3_alliance.gear.json new file mode 100644 index 0000000000..e4508f54cc --- /dev/null +++ b/ui/elemental_shaman/gear_sets/p3_alliance.gear.json @@ -0,0 +1,19 @@ +{"items":[ + {"id":48323,"enchant":3820,"gems":[41285,40155]}, + {"id":47144,"gems":[40155]}, + {"id":48321,"enchant":3810,"gems":[40113]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":48325,"enchant":3832,"gems":[40113,40132]}, + {"id":45460,"enchant":2332,"gems":[40113,0]}, + {"id":48324,"enchant":3604,"gems":[40155,0]}, + {"id":47084,"enchant":3599,"gems":[40132,40113,40113]}, + {"id":47190,"enchant":3721,"gems":[40113,40113,40113]}, + {"id":47099,"enchant":3606,"gems":[40113,40113]}, + {"id":46046,"gems":[40155]}, + {"id":45495,"gems":[40113]}, + {"id":47188}, + {"id":45518}, + {"id":46980,"enchant":3834,"gems":[40113]}, + {"id":47085,"enchant":1128,"gems":[40155]}, + {"id":47666} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/p3_horde.gear.json b/ui/elemental_shaman/gear_sets/p3_horde.gear.json new file mode 100644 index 0000000000..30d6161088 --- /dev/null +++ b/ui/elemental_shaman/gear_sets/p3_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48328,"enchant":3820,"gems":[41285,40153]}, + {"id":47468,"gems":[40155]}, + {"id":48330,"enchant":3810,"gems":[40113]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":48326,"enchant":3832,"gems":[40113,40132]}, + {"id":45460,"enchant":2332,"gems":[40113,0]}, + {"id":48327,"enchant":3604,"gems":[40155,0]}, + {"id":47447,"enchant":3599,"gems":[40132,40113,40113]}, + {"id":47479,"enchant":3721,"gems":[40113,40113,40113]}, + {"id":47456,"enchant":3606,"gems":[40113,40113]}, + {"id":46046,"gems":[40155]}, + {"id":45495,"gems":[40113]}, + {"id":47477}, + {"id":45518}, + {"id":47422,"enchant":3834,"gems":[40113]}, + {"id":47448,"enchant":1128,"gems":[40155]}, + {"id":47666} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/p4.gear.json b/ui/elemental_shaman/gear_sets/p4.gear.json new file mode 100644 index 0000000000..495e2737fa --- /dev/null +++ b/ui/elemental_shaman/gear_sets/p4.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51237,"enchant":3820,"gems":[41285,40113]}, + {"id":50658,"gems":[40155]}, + {"id":50698,"enchant":3810,"gems":[40113,40113]}, + {"id":50628,"enchant":3722,"gems":[40155]}, + {"id":51239,"enchant":3832,"gems":[40113,40134]}, + {"id":50687,"enchant":2332,"gems":[40155,0]}, + {"id":51238,"enchant":3604,"gems":[40113,0]}, + {"id":50613,"gems":[40113,40113,40113]}, + {"id":51236,"enchant":3721,"gems":[40113,40155]}, + {"id":50699,"enchant":3826,"gems":[40134,40113]}, + {"id":50398,"gems":[40155]}, + {"id":50664,"gems":[40113]}, + {"id":50348}, + {"id":50365}, + {"id":50734,"enchant":3834,"gems":[40113]}, + {"id":50616,"enchant":1128,"gems":[40155]}, + {"id":50458} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/gear_sets/preraid.gear.json b/ui/elemental_shaman/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..21a52c10dc --- /dev/null +++ b/ui/elemental_shaman/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":37180,"enchant":3820,"gems":[41285,42144]}, + {"id":37595}, + {"id":37673,"enchant":3810,"gems":[42144]}, + {"id":41610,"enchant":3722}, + {"id":39592,"enchant":3832,"gems":[42144,40025]}, + {"id":37788,"enchant":2332,"gems":[0]}, + {"id":39593,"enchant":3246,"gems":[40051,0]}, + {"id":40696,"gems":[40049,39998]}, + {"id":37791,"enchant":3719}, + {"id":44202,"enchant":3826,"gems":[39998]}, + {"id":43253,"gems":[40027]}, + {"id":37694}, + {"id":40682}, + {"id":37873}, + {"id":41384,"enchant":3834}, + {"id":40698}, + {"id":40708} +]} \ No newline at end of file diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts index b2709996ee..9a805ae4f6 100644 --- a/ui/elemental_shaman/presets.ts +++ b/ui/elemental_shaman/presets.ts @@ -1,18 +1,21 @@ -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 { Potions } from '../core/proto/common.js'; +import { + Consumes, + Flask, + Food, + Glyphs, + Potions, + Faction, + Spec +} from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Spec } from '../core/proto/common.js'; -import { Player } from '../core/player.js'; - -import { ElementalShaman_Rotation as ElementalShamanRotation, ElementalShaman_Options as ElementalShamanOptions, ShamanShield, ShamanMajorGlyph, ShamanMinorGlyph } from '../core/proto/shaman.js'; -import { ElementalShaman_Rotation_RotationType as RotationType } from '../core/proto/shaman.js'; import { + ElementalShaman_Rotation_RotationType as RotationType, + ElementalShaman_Rotation as ElementalShamanRotation, + ElementalShaman_Options as ElementalShamanOptions, + ShamanShield, + ShamanMajorGlyph, + ShamanMinorGlyph, AirTotem, EarthTotem, FireTotem, @@ -21,8 +24,13 @@ import { } from '../core/proto/shaman.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; -import { Faction } from '../core/proto/common.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; +import P3AllianceGear from './gear_sets/p3_alliance.gear.json'; +import P3HordeGear from './gear_sets/p3_horde.gear.json'; +import P4Gear from './gear_sets/p4.gear.json'; import DefaultApl from './apls/default.apl.json'; import AdvancedApl from './apls/advanced.apl.json'; @@ -31,6 +39,33 @@ import AdvancedApl from './apls/advanced.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); +export const P3_PRESET_ALLI = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance }); +export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde }); +export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear); + +export const DefaultRotation = ElementalShamanRotation.create({ + totems: ShamanTotems.create({ + earth: EarthTotem.StrengthOfEarthTotem, + air: AirTotem.WrathOfAirTotem, + fire: FireTotem.TotemOfWrath, + water: WaterTotem.ManaSpringTotem, + useFireElemental: true, + }), + type: RotationType.Adaptive, + fnMinManaPer: 66, + clMinManaPer: 33, + useChainLightning: false, + useFireNova: false, + useThunderstorm: true, +}); + +export const ROTATION_PRESET_LEGACY = PresetUtils.makePresetLegacyRotation('Legacy', Spec.SpecElementalShaman, DefaultRotation); +export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); +export const ROTATION_PRESET_ADVANCED = PresetUtils.makePresetAPLRotation('Advanced', AdvancedApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const StandardTalents = { @@ -63,22 +98,6 @@ export const Phase4Talents = { }), }; -export const DefaultRotation = ElementalShamanRotation.create({ - totems: ShamanTotems.create({ - earth: EarthTotem.StrengthOfEarthTotem, - air: AirTotem.WrathOfAirTotem, - fire: FireTotem.TotemOfWrath, - water: WaterTotem.ManaSpringTotem, - useFireElemental: true, - }), - type: RotationType.Adaptive, - fnMinManaPer: 66, - clMinManaPer: 33, - useChainLightning: false, - useFireNova: false, - useThunderstorm: true, -}); - export const DefaultOptions = ElementalShamanOptions.create({ shield: ShamanShield.WaterShield, bloodlust: true, @@ -95,154 +114,4 @@ export const DefaultConsumes = Consumes.create({ defaultPotion: Potions.PotionOfWildMagic, flask: Flask.FlaskOfTheFrostWyrm, food: Food.FoodFishFeast, -}); - -export const PRE_RAID_PRESET = { - name: 'Pre-raid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":37180,"enchant":3820,"gems":[41285,42144]}, - {"id":37595}, - {"id":37673,"enchant":3810,"gems":[42144]}, - {"id":41610,"enchant":3722}, - {"id":39592,"enchant":3832,"gems":[42144,40025]}, - {"id":37788,"enchant":2332,"gems":[0]}, - {"id":39593,"enchant":3246,"gems":[40051,0]}, - {"id":40696,"gems":[40049,39998]}, - {"id":37791,"enchant":3719}, - {"id":44202,"enchant":3826,"gems":[39998]}, - {"id":43253,"gems":[40027]}, - {"id":37694}, - {"id":40682}, - {"id":37873}, - {"id":41384,"enchant":3834}, - {"id":40698}, - {"id":40708} - ]}`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40516,"enchant":3820,"gems":[41285,40027]}, - {"id":44661,"gems":[39998]}, - {"id":40286,"enchant":3810}, - {"id":44005,"enchant":3722,"gems":[40027]}, - {"id":40514,"enchant":3832,"gems":[42144,42144]}, - {"id":40324,"enchant":2332,"gems":[42144,0]}, - {"id":40302,"enchant":3246,"gems":[0]}, - {"id":40301,"gems":[40014]}, - {"id":40560,"enchant":3721}, - {"id":40519,"enchant":3826}, - {"id":37694}, - {"id":40399}, - {"id":40432}, - {"id":40255}, - {"id":40395,"enchant":3834}, - {"id":40401,"enchant":1128}, - {"id":40267} - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46209,"enchant":3820,"gems":[41285,40048]}, - {"id":45933,"gems":[39998]}, - {"id":46211,"enchant":3810,"gems":[39998]}, - {"id":45242,"enchant":3722,"gems":[39998]}, - {"id":46206,"enchant":3832,"gems":[39998,39998]}, - {"id":45460,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45616,"enchant":3599,"gems":[39998,39998,39998]}, - {"id":46210,"enchant":3721,"gems":[39998,40027]}, - {"id":45537,"enchant":3606,"gems":[39998,40027]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45518}, - {"id":40255}, - {"id":45612,"enchant":3834,"gems":[39998]}, - {"id":45470,"enchant":1128,"gems":[39998]}, - {"id":40267} - ]}`), -}; - -export const P3_PRESET_HORDE = { - name: 'P3 Preset [H]', - enableWhen: (player: Player) => player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48328,"enchant":3820,"gems":[41285,40153]}, - {"id":47468,"gems":[40155]}, - {"id":48330,"enchant":3810,"gems":[40113]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":48326,"enchant":3832,"gems":[40113,40132]}, - {"id":45460,"enchant":2332,"gems":[40113,0]}, - {"id":48327,"enchant":3604,"gems":[40155,0]}, - {"id":47447,"enchant":3599,"gems":[40132,40113,40113]}, - {"id":47479,"enchant":3721,"gems":[40113,40113,40113]}, - {"id":47456,"enchant":3606,"gems":[40113,40113]}, - {"id":46046,"gems":[40155]}, - {"id":45495,"gems":[40113]}, - {"id":47477}, - {"id":45518}, - {"id":47422,"enchant":3834,"gems":[40113]}, - {"id":47448,"enchant":1128,"gems":[40155]}, - {"id":47666} - ]}`), -}; - -export const P3_PRESET_ALLI = { - name: 'P3 Preset [A]', - enableWhen: (player: Player) => player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items":[ - {"id":48323,"enchant":3820,"gems":[41285,40155]}, - {"id":47144,"gems":[40155]}, - {"id":48321,"enchant":3810,"gems":[40113]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":48325,"enchant":3832,"gems":[40113,40132]}, - {"id":45460,"enchant":2332,"gems":[40113,0]}, - {"id":48324,"enchant":3604,"gems":[40155,0]}, - {"id":47084,"enchant":3599,"gems":[40132,40113,40113]}, - {"id":47190,"enchant":3721,"gems":[40113,40113,40113]}, - {"id":47099,"enchant":3606,"gems":[40113,40113]}, - {"id":46046,"gems":[40155]}, - {"id":45495,"gems":[40113]}, - {"id":47188}, - {"id":45518}, - {"id":46980,"enchant":3834,"gems":[40113]}, - {"id":47085,"enchant":1128,"gems":[40155]}, - {"id":47666} - ]}`), -}; - -export const P4_PRESET = { - name: 'P4 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51237,"enchant":3820,"gems":[41285,40113]}, - {"id":50658,"gems":[40155]}, - {"id":50698,"enchant":3810,"gems":[40113,40113]}, - {"id":50628,"enchant":3722,"gems":[40155]}, - {"id":51239,"enchant":3832,"gems":[40113,40134]}, - {"id":50687,"enchant":2332,"gems":[40155,0]}, - {"id":51238,"enchant":3604,"gems":[40113,0]}, - {"id":50613,"gems":[40113,40113,40113]}, - {"id":51236,"enchant":3721,"gems":[40113,40155]}, - {"id":50699,"enchant":3826,"gems":[40134,40113]}, - {"id":50398,"gems":[40155]}, - {"id":50664,"gems":[40113]}, - {"id":50348}, - {"id":50365}, - {"id":50734,"enchant":3834,"gems":[40113]}, - {"id":50616,"enchant":1128,"gems":[40155]}, - {"id":50458} - ]}`), -}; - -export const ROTATION_PRESET_LEGACY = PresetUtils.makePresetLegacyRotation('Legacy', Spec.SpecElementalShaman, DefaultRotation); -export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); -export const ROTATION_PRESET_ADVANCED = PresetUtils.makePresetAPLRotation('Advanced', AdvancedApl); \ No newline at end of file +}); \ No newline at end of file diff --git a/ui/elemental_shaman/sim.ts b/ui/elemental_shaman/sim.ts index 52af6bd7a6..9626c04136 100644 --- a/ui/elemental_shaman/sim.ts +++ b/ui/elemental_shaman/sim.ts @@ -15,7 +15,6 @@ import { Stats } from '../core/proto_utils/stats.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; import { EventID, TypedEvent } from '../core/typed_event.js'; import { TotemsSection } from '../core/components/totem_inputs.js'; -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 * as ShamanInputs from './inputs.js'; @@ -165,7 +164,7 @@ export class ElementalShamanSimUI extends IndividualSimUI) => player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48353,"enchant":3817,"gems":[41398,40128]}, - {"id":47060,"gems":[40159]}, - {"id":48351,"enchant":3808,"gems":[40128]}, - {"id":47552,"enchant":3722,"gems":[40159]}, - {"id":46965,"enchant":3832,"gems":[40159,49110,40128]}, - {"id":47916,"enchant":3845,"gems":[40159,0]}, - {"id":48354,"enchant":3604,"gems":[40128,0]}, - {"id":47112,"enchant":3599,"gems":[40128,40159,40128]}, - {"id":48352,"enchant":3823,"gems":[40128,40128]}, - {"id":47099,"enchant":3606,"gems":[40128,40128]}, - {"id":46046,"gems":[40128]}, - {"id":47075,"gems":[40128]}, - {"id":47188}, - {"id":45609}, - {"id":47206,"enchant":3789}, - {"id":47156,"enchant":3789,"gems":[40128]}, - {"id":47666} - ]}`), -}; - -export const P3_PRESET_HORDE = { - name: 'P3 Preset [H]', - enableWhen: (player: Player) => player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48358,"enchant":3817,"gems":[41398,40128]}, - {"id":47433,"gems":[40159]}, - {"id":48360,"enchant":3808,"gems":[40128]}, - {"id":47551,"enchant":3722,"gems":[40159]}, - {"id":47412,"enchant":3832,"gems":[40159,49110,40128]}, - {"id":47989,"enchant":3845,"gems":[40159,0]}, - {"id":48357,"enchant":3604,"gems":[40128,0]}, - {"id":47460,"enchant":3599,"gems":[40128,40159,40128]}, - {"id":48359,"enchant":3823,"gems":[40128,40128]}, - {"id":47456,"enchant":3606,"gems":[40128,40128]}, - {"id":46046,"gems":[40128]}, - {"id":47443,"gems":[40128]}, - {"id":47477}, - {"id":45609}, - {"id":47483,"enchant":3789}, - {"id":47475,"enchant":3789,"gems":[40128]}, - {"id":47666} - ]}`), -}; diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts index 01630bb42f..82895ac270 100644 --- a/ui/enhancement_shaman/sim.ts +++ b/ui/enhancement_shaman/sim.ts @@ -162,7 +162,7 @@ export class EnhancementShamanSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.PreRaid_PRESET, + Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P2_PRESET, Presets.P3_PRESET, diff --git a/ui/feral_tank_druid/gear_sets/p1.gear.json b/ui/feral_tank_druid/gear_sets/p1.gear.json new file mode 100644 index 0000000000..ffcd320515 --- /dev/null +++ b/ui/feral_tank_druid/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40329,"enchant":67839,"gems":[41339,40008]}, + {"id":40387}, + {"id":40494,"enchant":44957,"gems":[40008]}, + {"id":40252,"enchant":3294}, + {"id":40471,"enchant":3832,"gems":[42702,40088]}, + {"id":40186,"enchant":3850,"gems":[40008,0]}, + {"id":40472,"enchant":63770,"gems":[40008,0]}, + {"id":43591,"gems":[40008,40008,40008]}, + {"id":44011,"enchant":38373,"gems":[40008,40008]}, + {"id":40243,"enchant":55016,"gems":[40008]}, + {"id":40370}, + {"id":37784}, + {"id":44253}, + {"id":37220}, + {"id":40280,"enchant":2673}, + {}, + {"id":38365} +]} \ No newline at end of file diff --git a/ui/feral_tank_druid/gear_sets/p2.gear.json b/ui/feral_tank_druid/gear_sets/p2.gear.json new file mode 100644 index 0000000000..673e73acd2 --- /dev/null +++ b/ui/feral_tank_druid/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41678,"enchant":67839,"gems":[41339,45880]}, + {"id":45517,"gems":[40008]}, + {"id":45245,"enchant":44957,"gems":[40008,40008]}, + {"id":45496,"enchant":3294,"gems":[42702]}, + {"id":45473,"enchant":3832,"gems":[40008,40008,40008]}, + {"id":45611,"enchant":3850,"gems":[40008,0]}, + {"id":46043,"enchant":63770,"gems":[40008,40008,0]}, + {"id":46095,"gems":[40008,40008,40008]}, + {"id":45536,"enchant":38373,"gems":[40008,40008,40008]}, + {"id":45232,"enchant":55016,"gems":[40008]}, + {"id":45471,"gems":[40091]}, + {"id":45608,"gems":[40008]}, + {"id":45158}, + {"id":46021}, + {"id":45533,"enchant":3870,"gems":[40008,40008]}, + {}, + {"id":45509} +]} \ No newline at end of file diff --git a/ui/feral_tank_druid/presets.ts b/ui/feral_tank_druid/presets.ts index f08f96be9c..428e5610a3 100644 --- a/ui/feral_tank_druid/presets.ts +++ b/ui/feral_tank_druid/presets.ts @@ -2,7 +2,6 @@ import { BattleElixir, Conjured, Consumes, - EquipmentSpec, Explosive, Food, Glyphs, @@ -20,7 +19,9 @@ import { } from '../core/proto/druid.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; import DefaultApl from './apls/default.apl.json'; @@ -28,6 +29,17 @@ import DefaultApl from './apls/default.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const P1_PRESET = PresetUtils.makePresetGear('P1 Boss Tanking', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Boss Tanking', P2Gear); + +export const DefaultRotation = DruidRotation.create({ + maulRageThreshold: 25, + maintainDemoralizingRoar: true, + lacerateTime: 8.0, +}); + +export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const StandardTalents = { @@ -45,14 +57,6 @@ export const StandardTalents = { }), }; -export const DefaultRotation = DruidRotation.create({ - maulRageThreshold: 25, - maintainDemoralizingRoar: true, - lacerateTime: 8.0, -}); - -export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); - export const DefaultOptions = DruidOptions.create({ innervateTarget: UnitReference.create(), startingRage: 20, @@ -68,51 +72,3 @@ export const DefaultConsumes = Consumes.create({ thermalSapper: true, fillerExplosive: Explosive.ExplosiveSaroniteBomb, }); - -export const P1_PRESET = { - name: 'P1 Boss Tanking', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40329,"enchant":67839,"gems":[41339,40008]}, - {"id":40387}, - {"id":40494,"enchant":44957,"gems":[40008]}, - {"id":40252,"enchant":3294}, - {"id":40471,"enchant":3832,"gems":[42702,40088]}, - {"id":40186,"enchant":3850,"gems":[40008,0]}, - {"id":40472,"enchant":63770,"gems":[40008,0]}, - {"id":43591,"gems":[40008,40008,40008]}, - {"id":44011,"enchant":38373,"gems":[40008,40008]}, - {"id":40243,"enchant":55016,"gems":[40008]}, - {"id":40370}, - {"id":37784}, - {"id":44253}, - {"id":37220}, - {"id":40280,"enchant":2673}, - {}, - {"id":38365} - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Boss Tanking', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":41678,"enchant":67839,"gems":[41339,45880]}, - {"id":45517,"gems":[40008]}, - {"id":45245,"enchant":44957,"gems":[40008,40008]}, - {"id":45496,"enchant":3294,"gems":[42702]}, - {"id":45473,"enchant":3832,"gems":[40008,40008,40008]}, - {"id":45611,"enchant":3850,"gems":[40008,0]}, - {"id":46043,"enchant":63770,"gems":[40008,40008,0]}, - {"id":46095,"gems":[40008,40008,40008]}, - {"id":45536,"enchant":38373,"gems":[40008,40008,40008]}, - {"id":45232,"enchant":55016,"gems":[40008]}, - {"id":45471,"gems":[40091]}, - {"id":45608,"gems":[40008]}, - {"id":45158}, - {"id":46021}, - {"id":45533,"enchant":3870,"gems":[40008,40008]}, - {}, - {"id":45509} - ]}`), -}; diff --git a/ui/healing_priest/gear_sets/p1_disc.gear.json b/ui/healing_priest/gear_sets/p1_disc.gear.json new file mode 100644 index 0000000000..7e26c12dc0 --- /dev/null +++ b/ui/healing_priest/gear_sets/p1_disc.gear.json @@ -0,0 +1,19 @@ +{"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} +]} \ No newline at end of file diff --git a/ui/healing_priest/gear_sets/p1_holy.gear.json b/ui/healing_priest/gear_sets/p1_holy.gear.json new file mode 100644 index 0000000000..6df7c55e21 --- /dev/null +++ b/ui/healing_priest/gear_sets/p1_holy.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40447,"enchant":3819,"gems":[41401,40051]}, + {"id":44657,"gems":[40012]}, + {"id":40450,"enchant":3809,"gems":[40012]}, + {"id":40723,"enchant":3831}, + {"id":40381,"enchant":3832,"gems":[40012,49110]}, + {"id":40741,"enchant":1119,"gems":[0]}, + {"id":40454,"enchant":3604,"gems":[40051,0]}, + {"id":40271,"enchant":3601,"gems":[40012,40012]}, + {"id":40398,"enchant":3719,"gems":[42148,42148]}, + {"id":40326,"enchant":3606,"gems":[42148]}, + {"id":40719}, + {"id":40375}, + {"id":37111}, + {"id":42413,"gems":[40012,40012]}, + {"id":40395,"enchant":3834}, + {"id":40350}, + {"id":40245} +]} \ No newline at end of file diff --git a/ui/healing_priest/gear_sets/p2_disc.gear.json b/ui/healing_priest/gear_sets/p2_disc.gear.json new file mode 100644 index 0000000000..e0da88b62a --- /dev/null +++ b/ui/healing_priest/gear_sets/p2_disc.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46197,"enchant":3819,"gems":[41401,45883]}, + {"id":45933,"gems":[39998]}, + {"id":45390,"enchant":3809,"gems":[39998]}, + {"id":45486,"enchant":3859,"gems":[39998]}, + {"id":46193,"enchant":3832,"gems":[39998,39998]}, + {"id":45146,"enchant":3758,"gems":[0]}, + {"id":45520,"enchant":3246,"gems":[39998,39998,0]}, + {"id":45558,"gems":[39998,40047,39998]}, + {"id":45388,"enchant":3721,"gems":[39998,39998]}, + {"id":46050,"enchant":3606,"gems":[39998,39998]}, + {"id":45946,"gems":[39998]}, + {"id":46096,"gems":[39998]}, + {"id":40432}, + {"id":45535}, + {"id":45612,"enchant":3834,"gems":[40027]}, + {"id":45314}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/healing_priest/gear_sets/p2_holy.gear.json b/ui/healing_priest/gear_sets/p2_holy.gear.json new file mode 100644 index 0000000000..730d290d00 --- /dev/null +++ b/ui/healing_priest/gear_sets/p2_holy.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46197,"enchant":3819,"gems":[41401,45883]}, + {"id":45447,"gems":[40017]}, + {"id":45390,"enchant":3809,"gems":[40051]}, + {"id":45486,"enchant":3859,"gems":[40017]}, + {"id":46193,"enchant":3832,"gems":[40051,40017]}, + {"id":44008,"enchant":3758,"gems":[40051,0]}, + {"id":45520,"enchant":3246,"gems":[40017,40017,0]}, + {"id":45558,"gems":[40051,40017,40017]}, + {"id":45388,"enchant":3721,"gems":[40026,40017]}, + {"id":46050,"enchant":3606,"gems":[40026,40017]}, + {"id":45946,"gems":[40017]}, + {"id":46323,"gems":[40017]}, + {"id":46051}, + {"id":45535}, + {"id":46035,"enchant":3834,"gems":[40017]}, + {"id":45271}, + {"id":45511} +]} \ No newline at end of file diff --git a/ui/healing_priest/gear_sets/preraid_disc.gear.json b/ui/healing_priest/gear_sets/preraid_disc.gear.json new file mode 100644 index 0000000000..ed64a048eb --- /dev/null +++ b/ui/healing_priest/gear_sets/preraid_disc.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":37294,"enchant":3819,"gems":[41401,39998]}, + {"id":40681}, + {"id":37691,"enchant":3809}, + {"id":37630,"enchant":3859}, + {"id":39515,"enchant":3832,"gems":[42144,42144]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":39519,"enchant":3246,"gems":[42144,0]}, + {"id":40697,"enchant":3601,"gems":[39998,39998]}, + {"id":37622,"enchant":3719}, + {"id":44202,"enchant":3606,"gems":[40027]}, + {"id":44283}, + {"id":37195}, + {"id":37660}, + {"id":42413,"gems":[40012,40012]}, + {"id":37360,"enchant":3854}, + {}, + {"id":37238} +]} \ No newline at end of file diff --git a/ui/healing_priest/gear_sets/preraid_holy.gear.json b/ui/healing_priest/gear_sets/preraid_holy.gear.json new file mode 100644 index 0000000000..4e99b74405 --- /dev/null +++ b/ui/healing_priest/gear_sets/preraid_holy.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42553,"enchant":3819,"gems":[41401,42148]}, + {"id":40681}, + {"id":37655,"enchant":3809}, + {"id":37291,"enchant":3831}, + {"id":39515,"enchant":3832,"gems":[40012,40012]}, + {"id":37361,"enchant":1119,"gems":[0]}, + {"id":39519,"enchant":3604,"gems":[40012,0]}, + {"id":40697,"enchant":3601,"gems":[42148,42148]}, + {"id":37189,"enchant":3719,"gems":[40047,49110]}, + {"id":44202,"enchant":3606,"gems":[40092]}, + {"id":44283}, + {"id":37694}, + {"id":37111}, + {"id":42413,"gems":[40012,40012]}, + {"id":37360,"enchant":3854}, + {}, + {"id":37619} +]} \ No newline at end of file diff --git a/ui/healing_priest/presets.ts b/ui/healing_priest/presets.ts index 7374d9943b..af2c434648 100644 --- a/ui/healing_priest/presets.ts +++ b/ui/healing_priest/presets.ts @@ -3,7 +3,6 @@ import { CustomRotation, CustomSpell, Debuffs, - EquipmentSpec, IndividualBuffs, Flask, Food, @@ -14,7 +13,6 @@ import { UnitReference, } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Player } from '../core/player.js'; import { HealingPriest_Rotation as Rotation, @@ -26,7 +24,13 @@ import { } from '../core/proto/priest.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidDiscGear from './gear_sets/preraid_disc.gear.json'; +import PreraidHolyGear from './gear_sets/preraid_holy.gear.json'; +import P1DiscGear from './gear_sets/p1_disc.gear.json'; +import P1HolyGear from './gear_sets/p1_holy.gear.json'; +import P2DiscGear from './gear_sets/p2_disc.gear.json'; +import P2HolyGear from './gear_sets/p2_holy.gear.json'; import DiscApl from './apls/disc.apl.json'; import HolyApl from './apls/holy.apl.json'; @@ -35,6 +39,40 @@ import HolyApl from './apls/holy.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const DISC_PRERAID_PRESET = PresetUtils.makePresetGear('Disc Preraid Preset', PreraidDiscGear, { talentTree: 0 }); +export const DISC_P1_PRESET = PresetUtils.makePresetGear('Disc P1 Preset', P1DiscGear, { talentTree: 0 }); +export const DISC_P2_PRESET = PresetUtils.makePresetGear('Disc P2 Preset', P2DiscGear, { talentTree: 0 }); +export const HOLY_PRERAID_PRESET = PresetUtils.makePresetGear('Holy Preraid Preset', PreraidHolyGear, { talentTree: 1 }); +export const HOLY_P1_PRESET = PresetUtils.makePresetGear('Holy P1 Preset', P1HolyGear, { talentTree: 1 }); +export const HOLY_P2_PRESET = PresetUtils.makePresetGear('Holy P2 Preset', P2HolyGear, { talentTree: 1 }); + +export const DiscDefaultRotation = Rotation.create({ + type: RotationType.Cycle, + customRotation: CustomRotation.create({ + spells: [ + CustomSpell.create({ spell: SpellOption.PowerWordShield, castsPerMinute: 18 }), + CustomSpell.create({ spell: SpellOption.Penance, castsPerMinute: 4 }), + CustomSpell.create({ spell: SpellOption.PrayerOfMending, castsPerMinute: 2 }), + CustomSpell.create({ spell: SpellOption.GreaterHeal, castsPerMinute: 1 }), + ], + }), +}); + +export const HolyDefaultRotation = Rotation.create({ + type: RotationType.Cycle, + customRotation: CustomRotation.create({ + spells: [ + CustomSpell.create({ spell: SpellOption.GreaterHeal, castsPerMinute: 10 }), + CustomSpell.create({ spell: SpellOption.CircleOfHealing, castsPerMinute: 5 }), + CustomSpell.create({ spell: SpellOption.Renew, castsPerMinute: 10 }), + CustomSpell.create({ spell: SpellOption.PrayerOfMending, castsPerMinute: 2 }), + ], + }), +}); + +export const ROTATION_PRESET_DISC = PresetUtils.makePresetAPLRotation('Disc', DiscApl); +export const ROTATION_PRESET_HOLY = PresetUtils.makePresetAPLRotation('Holy', HolyApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const DiscTalents = { @@ -66,33 +104,6 @@ export const HolyTalents = { }), }; -export const DiscDefaultRotation = Rotation.create({ - type: RotationType.Cycle, - customRotation: CustomRotation.create({ - spells: [ - CustomSpell.create({ spell: SpellOption.PowerWordShield, castsPerMinute: 18 }), - CustomSpell.create({ spell: SpellOption.Penance, castsPerMinute: 4 }), - CustomSpell.create({ spell: SpellOption.PrayerOfMending, castsPerMinute: 2 }), - CustomSpell.create({ spell: SpellOption.GreaterHeal, castsPerMinute: 1 }), - ], - }), -}); - -export const HolyDefaultRotation = Rotation.create({ - type: RotationType.Cycle, - customRotation: CustomRotation.create({ - spells: [ - CustomSpell.create({ spell: SpellOption.GreaterHeal, castsPerMinute: 10 }), - CustomSpell.create({ spell: SpellOption.CircleOfHealing, castsPerMinute: 5 }), - CustomSpell.create({ spell: SpellOption.Renew, castsPerMinute: 10 }), - CustomSpell.create({ spell: SpellOption.PrayerOfMending, castsPerMinute: 2 }), - ], - }), -}); - -export const ROTATION_PRESET_DISC = PresetUtils.makePresetAPLRotation('Disc', DiscApl); -export const ROTATION_PRESET_HOLY = PresetUtils.makePresetAPLRotation('Holy', HolyApl); - export const DefaultOptions = Options.create({ useInnerFire: true, useShadowfiend: true, @@ -133,153 +144,3 @@ export const DefaultIndividualBuffs = IndividualBuffs.create({ export const DefaultDebuffs = Debuffs.create({ }); - -export const DISC_PRERAID_PRESET = { - name: 'Disc Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":37294,"enchant":3819,"gems":[41401,39998]}, - {"id":40681}, - {"id":37691,"enchant":3809}, - {"id":37630,"enchant":3859}, - {"id":39515,"enchant":3832,"gems":[42144,42144]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":39519,"enchant":3246,"gems":[42144,0]}, - {"id":40697,"enchant":3601,"gems":[39998,39998]}, - {"id":37622,"enchant":3719}, - {"id":44202,"enchant":3606,"gems":[40027]}, - {"id":44283}, - {"id":37195}, - {"id":37660}, - {"id":42413,"gems":[40012,40012]}, - {"id":37360,"enchant":3854}, - {}, - {"id":37238} - ]}`), -}; - -export const DISC_P1_PRESET = { - name: 'Disc P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"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} - ]}`), -}; - -export const HOLY_PRERAID_PRESET = { - name: 'Holy Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42553,"enchant":3819,"gems":[41401,42148]}, - {"id":40681}, - {"id":37655,"enchant":3809}, - {"id":37291,"enchant":3831}, - {"id":39515,"enchant":3832,"gems":[40012,40012]}, - {"id":37361,"enchant":1119,"gems":[0]}, - {"id":39519,"enchant":3604,"gems":[40012,0]}, - {"id":40697,"enchant":3601,"gems":[42148,42148]}, - {"id":37189,"enchant":3719,"gems":[40047,49110]}, - {"id":44202,"enchant":3606,"gems":[40092]}, - {"id":44283}, - {"id":37694}, - {"id":37111}, - {"id":42413,"gems":[40012,40012]}, - {"id":37360,"enchant":3854}, - {}, - {"id":37619} - ]}`), -}; - -export const HOLY_P1_PRESET = { - name: 'Holy P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40447,"enchant":3819,"gems":[41401,40051]}, - {"id":44657,"gems":[40012]}, - {"id":40450,"enchant":3809,"gems":[40012]}, - {"id":40723,"enchant":3831}, - {"id":40381,"enchant":3832,"gems":[40012,49110]}, - {"id":40741,"enchant":1119,"gems":[0]}, - {"id":40454,"enchant":3604,"gems":[40051,0]}, - {"id":40271,"enchant":3601,"gems":[40012,40012]}, - {"id":40398,"enchant":3719,"gems":[42148,42148]}, - {"id":40326,"enchant":3606,"gems":[42148]}, - {"id":40719}, - {"id":40375}, - {"id":37111}, - {"id":42413,"gems":[40012,40012]}, - {"id":40395,"enchant":3834}, - {"id":40350}, - {"id":40245} - ]}`), -}; - -export const DISC_P2_PRESET = { - name: 'Disc P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46197,"enchant":3819,"gems":[41401,45883]}, - {"id":45933,"gems":[39998]}, - {"id":45390,"enchant":3809,"gems":[39998]}, - {"id":45486,"enchant":3859,"gems":[39998]}, - {"id":46193,"enchant":3832,"gems":[39998,39998]}, - {"id":45146,"enchant":3758,"gems":[0]}, - {"id":45520,"enchant":3246,"gems":[39998,39998,0]}, - {"id":45558,"gems":[39998,40047,39998]}, - {"id":45388,"enchant":3721,"gems":[39998,39998]}, - {"id":46050,"enchant":3606,"gems":[39998,39998]}, - {"id":45946,"gems":[39998]}, - {"id":46096,"gems":[39998]}, - {"id":40432}, - {"id":45535}, - {"id":45612,"enchant":3834,"gems":[40027]}, - {"id":45314}, - {"id":45294,"gems":[39998]} - ]}`), -}; - -export const HOLY_P2_PRESET = { - name: 'Holy P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46197,"enchant":3819,"gems":[41401,45883]}, - {"id":45447,"gems":[40017]}, - {"id":45390,"enchant":3809,"gems":[40051]}, - {"id":45486,"enchant":3859,"gems":[40017]}, - {"id":46193,"enchant":3832,"gems":[40051,40017]}, - {"id":44008,"enchant":3758,"gems":[40051,0]}, - {"id":45520,"enchant":3246,"gems":[40017,40017,0]}, - {"id":45558,"gems":[40051,40017,40017]}, - {"id":45388,"enchant":3721,"gems":[40026,40017]}, - {"id":46050,"enchant":3606,"gems":[40026,40017]}, - {"id":45946,"gems":[40017]}, - {"id":46323,"gems":[40017]}, - {"id":46051}, - {"id":45535}, - {"id":46035,"enchant":3834,"gems":[40017]}, - {"id":45271}, - {"id":45511} - ]}`), -}; diff --git a/ui/holy_paladin/gear_sets/p1.gear.json b/ui/holy_paladin/gear_sets/p1.gear.json new file mode 100644 index 0000000000..fb84dc2cbc --- /dev/null +++ b/ui/holy_paladin/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"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} +]} \ No newline at end of file diff --git a/ui/holy_paladin/gear_sets/p2.gear.json b/ui/holy_paladin/gear_sets/p2.gear.json new file mode 100644 index 0000000000..8a654712ba --- /dev/null +++ b/ui/holy_paladin/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46180,"enchant":3820,"gems":[41401,40094]}, + {"id":45443,"gems":[40012]}, + {"id":46182,"enchant":3810,"gems":[40012]}, + {"id":45486,"enchant":3831,"gems":[40012]}, + {"id":45445,"enchant":3832,"gems":[42148,42148,42148]}, + {"id":45460,"enchant":1119,"gems":[40012,0]}, + {"id":46179,"enchant":3604,"gems":[40047,0]}, + {"id":45616,"gems":[40012,40012,40012]}, + {"id":46181,"enchant":3721,"gems":[40012,40012]}, + {"id":45537,"enchant":3606,"gems":[40012,40012]}, + {"id":45614,"gems":[45882]}, + {"id":45946,"gems":[40012]}, + {"id":46051}, + {"id":37111}, + {"id":46017,"enchant":2666}, + {"id":45470,"enchant":1128,"gems":[40012]}, + {"id":40705} +]} \ No newline at end of file diff --git a/ui/holy_paladin/gear_sets/preraid.gear.json b/ui/holy_paladin/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..e84bb08416 --- /dev/null +++ b/ui/holy_paladin/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44949,"enchant":3819,"gems":[41401,40012]}, + {"id":42647,"gems":[42702]}, + {"id":37673,"enchant":3809,"gems":[40012]}, + {"id":41609,"enchant":3831}, + {"id":39629,"enchant":3832,"gems":[40012,40012]}, + {"id":37788,"enchant":1119,"gems":[0]}, + {"id":39632,"enchant":3604,"gems":[40012,0]}, + {"id":40691,"gems":[40012,40012]}, + {"id":37362,"enchant":3721,"gems":[40012,40012]}, + {"id":44202,"enchant":3606,"gems":[40094]}, + {"id":44283}, + {"id":37694}, + {"id":44255}, + {"id":37111}, + {"id":37169,"enchant":2666}, + {"id":40700,"enchant":1128}, + {"id":40705} +]} \ No newline at end of file diff --git a/ui/holy_paladin/presets.ts b/ui/holy_paladin/presets.ts index 897f523f33..751b6587f4 100644 --- a/ui/holy_paladin/presets.ts +++ b/ui/holy_paladin/presets.ts @@ -1,13 +1,10 @@ import { Consumes, - EquipmentSpec, Flask, Food, Potions, - Spec, } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Player } from '../core/player.js'; import { PaladinAura, @@ -18,12 +15,20 @@ import { HolyPaladin_Options as HolyPaladinOptions, } from '../core/proto/paladin.js'; -import * as Tooltips from '../core/constants/tooltips.js'; +import * as PresetUtils from '../core/preset_utils.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('PreRaid', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. @@ -55,78 +60,3 @@ export const DefaultConsumes = Consumes.create({ flask: Flask.FlaskOfTheFrostWyrm, food: Food.FoodFishFeast, }); - -export const PRERAID_PRESET = { - name: 'Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":44949,"enchant":3819,"gems":[41401,40012]}, - {"id":42647,"gems":[42702]}, - {"id":37673,"enchant":3809,"gems":[40012]}, - {"id":41609,"enchant":3831}, - {"id":39629,"enchant":3832,"gems":[40012,40012]}, - {"id":37788,"enchant":1119,"gems":[0]}, - {"id":39632,"enchant":3604,"gems":[40012,0]}, - {"id":40691,"gems":[40012,40012]}, - {"id":37362,"enchant":3721,"gems":[40012,40012]}, - {"id":44202,"enchant":3606,"gems":[40094]}, - {"id":44283}, - {"id":37694}, - {"id":44255}, - {"id":37111}, - {"id":37169,"enchant":2666}, - {"id":40700,"enchant":1128}, - {"id":40705} - ]}`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{"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} - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46180,"enchant":3820,"gems":[41401,40094]}, - {"id":45443,"gems":[40012]}, - {"id":46182,"enchant":3810,"gems":[40012]}, - {"id":45486,"enchant":3831,"gems":[40012]}, - {"id":45445,"enchant":3832,"gems":[42148,42148,42148]}, - {"id":45460,"enchant":1119,"gems":[40012,0]}, - {"id":46179,"enchant":3604,"gems":[40047,0]}, - {"id":45616,"gems":[40012,40012,40012]}, - {"id":46181,"enchant":3721,"gems":[40012,40012]}, - {"id":45537,"enchant":3606,"gems":[40012,40012]}, - {"id":45614,"gems":[45882]}, - {"id":45946,"gems":[40012]}, - {"id":46051}, - {"id":37111}, - {"id":46017,"enchant":2666}, - {"id":45470,"enchant":1128,"gems":[40012]}, - {"id":40705} - ]}`), -}; diff --git a/ui/hunter/gear_sets/p1_mm.gear.json b/ui/hunter/gear_sets/p1_mm.gear.json new file mode 100644 index 0000000000..d86f75d470 --- /dev/null +++ b/ui/hunter/gear_sets/p1_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40543,"enchant":3817,"gems":[41398,42143]}, + {"id":44664,"gems":[42143]}, + {"id":40507,"enchant":3808,"gems":[39997]}, + {"id":40403,"enchant":3605}, + {"id":43998,"enchant":3832,"gems":[42143,39997]}, + {"id":40282,"enchant":3845,"gems":[39997,0]}, + {"id":40541,"enchant":3604,"gems":[0]}, + {"id":40275,"enchant":3601,"gems":[39997]}, + {"id":40506,"enchant":3823,"gems":[39997,49110]}, + {"id":40549,"enchant":3606}, + {"id":40074}, + {"id":40474}, + {"id":40684}, + {"id":44253}, + {"id":40388,"enchant":3827}, + {}, + {"id":40385,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p1_sv.gear.json b/ui/hunter/gear_sets/p1_sv.gear.json new file mode 100644 index 0000000000..d0efd053bc --- /dev/null +++ b/ui/hunter/gear_sets/p1_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40505,"enchant":3817,"gems":[41398,42143]}, + {"id":44664,"gems":[42143]}, + {"id":40507,"enchant":3808,"gems":[39997]}, + {"id":40403,"enchant":3605}, + {"id":43998,"enchant":3832,"gems":[42143,39997]}, + {"id":40282,"enchant":3845,"gems":[39997,0]}, + {"id":40541,"enchant":3604,"gems":[0]}, + {"id":39762,"enchant":3601,"gems":[39997]}, + {"id":40331,"enchant":3823,"gems":[39997,49110]}, + {"id":40549,"enchant":3606}, + {"id":40074}, + {"id":40474}, + {"id":40684}, + {"id":44253}, + {"id":40388,"enchant":3827}, + {}, + {"id":40385,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p2_mm.gear.json b/ui/hunter/gear_sets/p2_mm.gear.json new file mode 100644 index 0000000000..420134ef87 --- /dev/null +++ b/ui/hunter/gear_sets/p2_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45610,"enchant":3817,"gems":[41398,42702]}, + {"id":45517,"gems":[42143]}, + {"id":45300,"enchant":3808,"gems":[40043]}, + {"id":46032,"enchant":3605,"gems":[42143,40043]}, + {"id":45473,"enchant":3832,"gems":[39997,39997,39997]}, + {"id":45869,"enchant":3845,"gems":[40044,0]}, + {"id":45444,"enchant":3604,"gems":[42143,39997,0]}, + {"id":45467,"enchant":3601,"gems":[39997]}, + {"id":45536,"enchant":3823,"gems":[39997,39997,39997]}, + {"id":45244,"enchant":3606,"gems":[39997,39997]}, + {"id":45608,"gems":[39997]}, + {"id":46322,"gems":[39997]}, + {"id":45931}, + {"id":46038}, + {"id":45613,"enchant":3827,"gems":[45879,39997]}, + {}, + {"id":45570,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p2_sv.gear.json b/ui/hunter/gear_sets/p2_sv.gear.json new file mode 100644 index 0000000000..579682570a --- /dev/null +++ b/ui/hunter/gear_sets/p2_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45610,"enchant":3817,"gems":[41398,40023]}, + {"id":45517,"gems":[39997]}, + {"id":45300,"enchant":3808,"gems":[39997]}, + {"id":46032,"enchant":3605,"gems":[39997,40044]}, + {"id":45473,"enchant":3832,"gems":[39997,39997,45879]}, + {"id":45869,"enchant":3845,"gems":[40043,0]}, + {"id":45444,"enchant":3604,"gems":[39997,40023,0]}, + {"id":46095,"gems":[42143,42143,42143]}, + {"id":45536,"enchant":3823,"gems":[39997,39997,39997]}, + {"id":45244,"enchant":3606,"gems":[39997,40023]}, + {"id":45608,"gems":[39997]}, + {"id":46322,"gems":[39997]}, + {"id":44253}, + {"id":45931}, + {"id":45613,"enchant":3827,"gems":[39997,39997]}, + {}, + {"id":45570,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p3_mm.gear.json b/ui/hunter/gear_sets/p3_mm.gear.json new file mode 100644 index 0000000000..36a8afc893 --- /dev/null +++ b/ui/hunter/gear_sets/p3_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48262,"enchant":3817,"gems":[41398,40147]}, + {"id":47060,"gems":[42143]}, + {"id":48260,"enchant":3808,"gems":[40112]}, + {"id":47545,"enchant":3605,"gems":[40112]}, + {"id":46965,"enchant":3832,"gems":[40112,40112,40112]}, + {"id":47074,"enchant":3845,"gems":[40147,0]}, + {"id":48263,"enchant":3604,"gems":[40148,0]}, + {"id":47153,"gems":[40148,42143,42143]}, + {"id":48261,"enchant":3823,"gems":[49110,40112]}, + {"id":47109,"enchant":3606,"gems":[40147,40147]}, + {"id":47075,"gems":[40112]}, + {"id":45608,"gems":[40112]}, + {"id":47131}, + {"id":45931}, + {"id":47239,"enchant":3827,"gems":[40147,40112]}, + {}, + {"id":47521,"enchant":3608,"gems":[40147]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p3_sv.gear.json b/ui/hunter/gear_sets/p3_sv.gear.json new file mode 100644 index 0000000000..a9278ca698 --- /dev/null +++ b/ui/hunter/gear_sets/p3_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48262,"enchant":3817,"gems":[41398,40147]}, + {"id":47060,"gems":[42143]}, + {"id":48260,"enchant":3808,"gems":[40112]}, + {"id":47545,"enchant":3605,"gems":[40112]}, + {"id":48264,"enchant":3832,"gems":[40112,40147]}, + {"id":47074,"enchant":3845,"gems":[40148,0]}, + {"id":48263,"enchant":3604,"gems":[40148,0]}, + {"id":47153,"gems":[40147,42143,42143]}, + {"id":47191,"enchant":3823,"gems":[49110,40147,40112]}, + {"id":47109,"enchant":3606,"gems":[40112,40112]}, + {"id":47075,"gems":[40112]}, + {"id":45608,"gems":[40112]}, + {"id":47131}, + {"id":44253}, + {"id":47239,"enchant":3827,"gems":[40147,40112]}, + {}, + {"id":47521,"enchant":3608,"gems":[40112]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p4_mm.gear.json b/ui/hunter/gear_sets/p4_mm.gear.json new file mode 100644 index 0000000000..a7fcd72288 --- /dev/null +++ b/ui/hunter/gear_sets/p4_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40117]}, + {"id":50633,"gems":[40117]}, + {"id":51288,"enchant":3808,"gems":[40117]}, + {"id":47546,"enchant":3605,"gems":[42153]}, + {"id":51289,"enchant":3832,"gems":[40117,40117]}, + {"id":50655,"enchant":3845,"gems":[40117,0]}, + {"id":51285,"enchant":3604,"gems":[40117,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42153,42153]}, + {"id":50645,"enchant":3823,"gems":[49110,40117,40147]}, + {"id":50607,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[40117]}, + {"id":50402,"gems":[40148]}, + {"id":50363}, + {"id":47131}, + {"id":50735,"enchant":3827,"gems":[40117,40117,40117]}, + {}, + {"id":50733,"enchant":3608,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p4_sv.gear.json b/ui/hunter/gear_sets/p4_sv.gear.json new file mode 100644 index 0000000000..a2fa8b43b6 --- /dev/null +++ b/ui/hunter/gear_sets/p4_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40112]}, + {"id":50633,"gems":[40112]}, + {"id":51288,"enchant":3808,"gems":[40112]}, + {"id":47546,"enchant":3605,"gems":[42143]}, + {"id":51289,"enchant":3832,"gems":[40112,40112]}, + {"id":50655,"enchant":3845,"gems":[40112,0]}, + {"id":51285,"enchant":3604,"gems":[40112,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42143,42143]}, + {"id":50645,"enchant":3823,"gems":[49110,40112,40150]}, + {"id":50607,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[45879]}, + {"id":50402,"gems":[40148]}, + {"id":50363}, + {"id":47131}, + {"id":50735,"enchant":3827,"gems":[40112,40112,40112]}, + {}, + {"id":50733,"enchant":3608,"gems":[40112]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p5_mm.gear.json b/ui/hunter/gear_sets/p5_mm.gear.json new file mode 100644 index 0000000000..f6d876bed0 --- /dev/null +++ b/ui/hunter/gear_sets/p5_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40117]}, + {"id":50633,"gems":[40117]}, + {"id":51288,"enchant":3808,"gems":[40117]}, + {"id":47546,"enchant":3605,"gems":[42153]}, + {"id":51289,"enchant":3832,"gems":[40112,40112]}, + {"id":54580,"enchant":3845,"gems":[40117,0]}, + {"id":51285,"enchant":3604,"gems":[40117,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42153,42153]}, + {"id":50645,"enchant":3823,"gems":[49110,40112,40147]}, + {"id":54577,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[40117]}, + {"id":54576,"gems":[40148]}, + {"id":50363}, + {"id":54590}, + {"id":50735,"enchant":3247,"gems":[40112,40112,40112]}, + {}, + {"id":50733,"enchant":3608,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p5_sv.gear.json b/ui/hunter/gear_sets/p5_sv.gear.json new file mode 100644 index 0000000000..792ff5ad17 --- /dev/null +++ b/ui/hunter/gear_sets/p5_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51286,"enchant":3817,"gems":[41398,40112]}, + {"id":50633,"gems":[40112]}, + {"id":51288,"enchant":3808,"gems":[40112]}, + {"id":47546,"enchant":3605,"gems":[42143]}, + {"id":51289,"enchant":3832,"gems":[40112,40112]}, + {"id":50655,"enchant":3845,"gems":[40112,0]}, + {"id":51285,"enchant":3604,"gems":[40112,0]}, + {"id":50688,"enchant":3601,"gems":[40148,42143,42143]}, + {"id":50645,"enchant":3823,"gems":[49110,40112,40150]}, + {"id":54577,"enchant":3606,"gems":[40148,40148]}, + {"id":50618,"gems":[45879]}, + {"id":54576,"gems":[40148]}, + {"id":50363}, + {"id":54590}, + {"id":50735,"enchant":3827,"gems":[40112,40112,40112]}, + {}, + {"id":50733,"enchant":3608,"gems":[40112]} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/preraid_mm.gear.json b/ui/hunter/gear_sets/preraid_mm.gear.json new file mode 100644 index 0000000000..5a8c8a182a --- /dev/null +++ b/ui/hunter/gear_sets/preraid_mm.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42551,"enchant":3817,"gems":[41398,42143]}, + {"id":40678}, + {"id":37373,"enchant":3808}, + {"id":43566,"enchant":3605}, + {"id":39579,"enchant":3832,"gems":[39997,49110]}, + {"id":37170,"enchant":3845,"gems":[0]}, + {"id":39582,"enchant":3604,"gems":[40014,0]}, + {"id":37407,"enchant":3601,"gems":[42143]}, + {"id":37669,"enchant":3823}, + {"id":37167,"enchant":3606,"gems":[42143,39997]}, + {"id":37685}, + {"id":42642,"gems":[40044]}, + {"id":40684}, + {"id":44253}, + {"id":44249,"enchant":3827}, + {}, + {"id":37191,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/gear_sets/preraid_sv.gear.json b/ui/hunter/gear_sets/preraid_sv.gear.json new file mode 100644 index 0000000000..e65c67172b --- /dev/null +++ b/ui/hunter/gear_sets/preraid_sv.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42551,"enchant":3817,"gems":[41398,42143]}, + {"id":40678}, + {"id":37373,"enchant":3808}, + {"id":43406,"enchant":3605}, + {"id":39579,"enchant":3832,"gems":[39997,49110]}, + {"id":37170,"enchant":3845,"gems":[0]}, + {"id":39582,"enchant":3604,"gems":[39997,0]}, + {"id":37407,"enchant":3601,"gems":[42143]}, + {"id":37669,"enchant":3823}, + {"id":37167,"enchant":3606,"gems":[42143,39997]}, + {"id":37685}, + {"id":42642,"gems":[39997]}, + {"id":40684}, + {"id":44253}, + {"id":44249,"enchant":3827}, + {}, + {"id":37191,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts index 7ee64e0a72..d61dc1e303 100644 --- a/ui/hunter/presets.ts +++ b/ui/hunter/presets.ts @@ -1,6 +1,5 @@ import { Consumes, - EquipmentSpec, Flask, Food, Glyphs, @@ -10,7 +9,6 @@ import { } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; import { ferocityDefault, ferocityBMDefault } from '../core/talents/hunter_pet.js'; -import { Player } from '../core/player.js'; import { Hunter_Rotation as HunterRotation, @@ -24,7 +22,19 @@ import { } from '../core/proto/hunter.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidMMGear from './gear_sets/preraid_mm.gear.json'; +import P1MMGear from './gear_sets/p1_mm.gear.json'; +import P2MMGear from './gear_sets/p2_mm.gear.json'; +import P3MMGear from './gear_sets/p3_mm.gear.json'; +import P4MMGear from './gear_sets/p4_mm.gear.json'; +import P5MMGear from './gear_sets/p5_mm.gear.json'; +import PreraidSVGear from './gear_sets/preraid_sv.gear.json'; +import P1SVGear from './gear_sets/p1_sv.gear.json'; +import P2SVGear from './gear_sets/p2_sv.gear.json'; +import P3SVGear from './gear_sets/p3_sv.gear.json'; +import P4SVGear from './gear_sets/p4_sv.gear.json'; +import P5SVGear from './gear_sets/p5_sv.gear.json'; import BmApl from './apls/bm.apl.json'; import MmApl from './apls/mm.apl.json'; @@ -37,6 +47,37 @@ import AoeApl from './apls/aoe.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const MM_PRERAID_PRESET = PresetUtils.makePresetGear('MM PreRaid Preset', PreraidMMGear, { talentTrees: [0, 1] }); +export const MM_P1_PRESET = PresetUtils.makePresetGear('MM P1 Preset', P1MMGear, { talentTrees: [0, 1] }); +export const MM_P2_PRESET = PresetUtils.makePresetGear('MM P2 Preset', P2MMGear, { talentTrees: [0, 1] }); +export const MM_P3_PRESET = PresetUtils.makePresetGear('MM P3 Preset', P3MMGear, { talentTrees: [0, 1] }); +export const MM_P4_PRESET = PresetUtils.makePresetGear('MM P4 Preset', P4MMGear, { talentTrees: [0, 1] }); +export const MM_P5_PRESET = PresetUtils.makePresetGear('MM P5 Preset', P5MMGear, { talentTrees: [0, 1] }); +export const SV_PRERAID_PRESET = PresetUtils.makePresetGear('SV PreRaid Preset', PreraidSVGear, { talentTree: 2 }); +export const SV_P1_PRESET = PresetUtils.makePresetGear('SV P1 Preset', P1SVGear, { talentTree: 2 }); +export const SV_P2_PRESET = PresetUtils.makePresetGear('SV P2 Preset', P2SVGear, { talentTree: 2 }); +export const SV_P3_PRESET = PresetUtils.makePresetGear('SV P3 Preset', P3SVGear, { talentTree: 2 }); +export const SV_P4_PRESET = PresetUtils.makePresetGear('SV P4 Preset', P4SVGear, { talentTree: 2 }); +export const SV_P5_PRESET = PresetUtils.makePresetGear('SV P5 Preset', P5SVGear, { talentTree: 2 }); + +export const DefaultRotation = HunterRotation.create({ + type: RotationType.SingleTarget, + sting: StingType.SerpentSting, + trapWeave: true, + viperStartManaPercent: 0.1, + viperStopManaPercent: 0.3, + multiDotSerpentSting: true, + allowExplosiveShotDownrank: true, +}); + +export const ROTATION_PRESET_SIMPLE_DEFAULT = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecHunter, DefaultRotation); +export const ROTATION_PRESET_BM = PresetUtils.makePresetAPLRotation('BM', BmApl, { talentTree: 0 }); +export const ROTATION_PRESET_MM = PresetUtils.makePresetAPLRotation('MM', MmApl, { talentTree: 1 }); +export const ROTATION_PRESET_MM_ADVANCED = PresetUtils.makePresetAPLRotation('MM (Advanced)', MmAdvApl, { talentTree: 1 }); +export const ROTATION_PRESET_SV = PresetUtils.makePresetAPLRotation('SV', SvApl, { talentTree: 2 }); +export const ROTATION_PRESET_SV_ADVANCED = PresetUtils.makePresetAPLRotation('SV (Advanced)', SvAdvApl, { talentTree: 2 }); +export const ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('AOE', AoeApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const BeastMasteryTalents = { @@ -84,24 +125,6 @@ export const SurvivalTalents = { }), }; -export const DefaultRotation = HunterRotation.create({ - type: RotationType.SingleTarget, - sting: StingType.SerpentSting, - trapWeave: true, - viperStartManaPercent: 0.1, - viperStopManaPercent: 0.3, - multiDotSerpentSting: true, - allowExplosiveShotDownrank: true, -}); - -export const ROTATION_PRESET_SIMPLE_DEFAULT = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecHunter, DefaultRotation); -export const ROTATION_PRESET_BM = PresetUtils.makePresetAPLRotation('BM', BmApl, { talentTree: 0 }); -export const ROTATION_PRESET_MM = PresetUtils.makePresetAPLRotation('MM', MmApl, { talentTree: 1 }); -export const ROTATION_PRESET_MM_ADVANCED = PresetUtils.makePresetAPLRotation('MM (Advanced)', MmAdvApl, { talentTree: 1 }); -export const ROTATION_PRESET_SV = PresetUtils.makePresetAPLRotation('SV', SvApl, { talentTree: 2 }); -export const ROTATION_PRESET_SV_ADVANCED = PresetUtils.makePresetAPLRotation('SV (Advanced)', SvAdvApl, { talentTree: 2 }); -export const ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('AOE', AoeApl); - export const DefaultOptions = HunterOptions.create({ ammo: Ammo.SaroniteRazorheads, useHuntersMark: true, @@ -128,303 +151,3 @@ export const DefaultConsumes = Consumes.create({ food: Food.FoodFishFeast, petFood: PetFood.PetFoodSpicedMammothTreats, }); - -export const MM_PRERAID_PRESET = { - name: 'MM Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42551,"enchant":3817,"gems":[41398,42143]}, - {"id":40678}, - {"id":37373,"enchant":3808}, - {"id":43566,"enchant":3605}, - {"id":39579,"enchant":3832,"gems":[39997,49110]}, - {"id":37170,"enchant":3845,"gems":[0]}, - {"id":39582,"enchant":3604,"gems":[40014,0]}, - {"id":37407,"enchant":3601,"gems":[42143]}, - {"id":37669,"enchant":3823}, - {"id":37167,"enchant":3606,"gems":[42143,39997]}, - {"id":37685}, - {"id":42642,"gems":[40044]}, - {"id":40684}, - {"id":44253}, - {"id":44249,"enchant":3827}, - {}, - {"id":37191,"enchant":3608} - ]}`), -}; - -export const MM_P1_PRESET = { - name: 'MM P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40543,"enchant":3817,"gems":[41398,42143]}, - {"id":44664,"gems":[42143]}, - {"id":40507,"enchant":3808,"gems":[39997]}, - {"id":40403,"enchant":3605}, - {"id":43998,"enchant":3832,"gems":[42143,39997]}, - {"id":40282,"enchant":3845,"gems":[39997,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40275,"enchant":3601,"gems":[39997]}, - {"id":40506,"enchant":3823,"gems":[39997,49110]}, - {"id":40549,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":40388,"enchant":3827}, - {}, - {"id":40385,"enchant":3608} - ]}`), -}; - -export const MM_P2_PRESET = { - name: 'MM P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45610,"enchant":3817,"gems":[41398,42702]}, - {"id":45517,"gems":[42143]}, - {"id":45300,"enchant":3808,"gems":[40043]}, - {"id":46032,"enchant":3605,"gems":[42143,40043]}, - {"id":45473,"enchant":3832,"gems":[39997,39997,39997]}, - {"id":45869,"enchant":3845,"gems":[40044,0]}, - {"id":45444,"enchant":3604,"gems":[42143,39997,0]}, - {"id":45467,"enchant":3601,"gems":[39997]}, - {"id":45536,"enchant":3823,"gems":[39997,39997,39997]}, - {"id":45244,"enchant":3606,"gems":[39997,39997]}, - {"id":45608,"gems":[39997]}, - {"id":46322,"gems":[39997]}, - {"id":45931}, - {"id":46038}, - {"id":45613,"enchant":3827,"gems":[45879,39997]}, - {}, - {"id":45570,"enchant":3608} - ]}`), -}; - -export const MM_P3_PRESET = { - name: 'MM P3 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48262,"enchant":3817,"gems":[41398,40147]}, - {"id":47060,"gems":[42143]}, - {"id":48260,"enchant":3808,"gems":[40112]}, - {"id":47545,"enchant":3605,"gems":[40112]}, - {"id":46965,"enchant":3832,"gems":[40112,40112,40112]}, - {"id":47074,"enchant":3845,"gems":[40147,0]}, - {"id":48263,"enchant":3604,"gems":[40148,0]}, - {"id":47153,"gems":[40148,42143,42143]}, - {"id":48261,"enchant":3823,"gems":[49110,40112]}, - {"id":47109,"enchant":3606,"gems":[40147,40147]}, - {"id":47075,"gems":[40112]}, - {"id":45608,"gems":[40112]}, - {"id":47131}, - {"id":45931}, - {"id":47239,"enchant":3827,"gems":[40147,40112]}, - {}, - {"id":47521,"enchant":3608,"gems":[40147]} - ]}`), -}; - -export const MM_P4_PRESET = { - name: 'MM P4 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51286,"enchant":3817,"gems":[41398,40117]}, - {"id":50633,"gems":[40117]}, - {"id":51288,"enchant":3808,"gems":[40117]}, - {"id":47546,"enchant":3605,"gems":[42153]}, - {"id":51289,"enchant":3832,"gems":[40117,40117]}, - {"id":50655,"enchant":3845,"gems":[40117,0]}, - {"id":51285,"enchant":3604,"gems":[40117,0]}, - {"id":50688,"enchant":3601,"gems":[40148,42153,42153]}, - {"id":50645,"enchant":3823,"gems":[49110,40117,40147]}, - {"id":50607,"enchant":3606,"gems":[40148,40148]}, - {"id":50618,"gems":[40117]}, - {"id":50402,"gems":[40148]}, - {"id":50363}, - {"id":47131}, - {"id":50735,"enchant":3827,"gems":[40117,40117,40117]}, - {}, - {"id":50733,"enchant":3608,"gems":[40117]} - ]}`), -}; - -export const MM_P5_PRESET = { - name: 'MM P5 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51286,"enchant":3817,"gems":[41398,40117]}, - {"id":50633,"gems":[40117]}, - {"id":51288,"enchant":3808,"gems":[40117]}, - {"id":47546,"enchant":3605,"gems":[42153]}, - {"id":51289,"enchant":3832,"gems":[40112,40112]}, - {"id":54580,"enchant":3845,"gems":[40117,0]}, - {"id":51285,"enchant":3604,"gems":[40117,0]}, - {"id":50688,"enchant":3601,"gems":[40148,42153,42153]}, - {"id":50645,"enchant":3823,"gems":[49110,40112,40147]}, - {"id":54577,"enchant":3606,"gems":[40148,40148]}, - {"id":50618,"gems":[40117]}, - {"id":54576,"gems":[40148]}, - {"id":50363}, - {"id":54590}, - {"id":50735,"enchant":3247,"gems":[40112,40112,40112]}, - {}, - {"id":50733,"enchant":3608,"gems":[40117]} - ]}`), -}; - -export const SV_PRERAID_PRESET = { - name: 'SV Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42551,"enchant":3817,"gems":[41398,42143]}, - {"id":40678}, - {"id":37373,"enchant":3808}, - {"id":43406,"enchant":3605}, - {"id":39579,"enchant":3832,"gems":[39997,49110]}, - {"id":37170,"enchant":3845,"gems":[0]}, - {"id":39582,"enchant":3604,"gems":[39997,0]}, - {"id":37407,"enchant":3601,"gems":[42143]}, - {"id":37669,"enchant":3823}, - {"id":37167,"enchant":3606,"gems":[42143,39997]}, - {"id":37685}, - {"id":42642,"gems":[39997]}, - {"id":40684}, - {"id":44253}, - {"id":44249,"enchant":3827}, - {}, - {"id":37191,"enchant":3608} - ]}`), -}; - -export const SV_P1_PRESET = { - name: 'SV P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40505,"enchant":3817,"gems":[41398,42143]}, - {"id":44664,"gems":[42143]}, - {"id":40507,"enchant":3808,"gems":[39997]}, - {"id":40403,"enchant":3605}, - {"id":43998,"enchant":3832,"gems":[42143,39997]}, - {"id":40282,"enchant":3845,"gems":[39997,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":39762,"enchant":3601,"gems":[39997]}, - {"id":40331,"enchant":3823,"gems":[39997,49110]}, - {"id":40549,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":40388,"enchant":3827}, - {}, - {"id":40385,"enchant":3608} - ]}`), -}; - -export const SV_P2_PRESET = { - name: 'SV P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45610,"enchant":3817,"gems":[41398,40023]}, - {"id":45517,"gems":[39997]}, - {"id":45300,"enchant":3808,"gems":[39997]}, - {"id":46032,"enchant":3605,"gems":[39997,40044]}, - {"id":45473,"enchant":3832,"gems":[39997,39997,45879]}, - {"id":45869,"enchant":3845,"gems":[40043,0]}, - {"id":45444,"enchant":3604,"gems":[39997,40023,0]}, - {"id":46095,"gems":[42143,42143,42143]}, - {"id":45536,"enchant":3823,"gems":[39997,39997,39997]}, - {"id":45244,"enchant":3606,"gems":[39997,40023]}, - {"id":45608,"gems":[39997]}, - {"id":46322,"gems":[39997]}, - {"id":44253}, - {"id":45931}, - {"id":45613,"enchant":3827,"gems":[39997,39997]}, - {}, - {"id":45570,"enchant":3608} - ]}`), -}; - -export const SV_P3_PRESET = { - name: 'SV P3 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48262,"enchant":3817,"gems":[41398,40147]}, - {"id":47060,"gems":[42143]}, - {"id":48260,"enchant":3808,"gems":[40112]}, - {"id":47545,"enchant":3605,"gems":[40112]}, - {"id":48264,"enchant":3832,"gems":[40112,40147]}, - {"id":47074,"enchant":3845,"gems":[40148,0]}, - {"id":48263,"enchant":3604,"gems":[40148,0]}, - {"id":47153,"gems":[40147,42143,42143]}, - {"id":47191,"enchant":3823,"gems":[49110,40147,40112]}, - {"id":47109,"enchant":3606,"gems":[40112,40112]}, - {"id":47075,"gems":[40112]}, - {"id":45608,"gems":[40112]}, - {"id":47131}, - {"id":44253}, - {"id":47239,"enchant":3827,"gems":[40147,40112]}, - {}, - {"id":47521,"enchant":3608,"gems":[40112]} - ]}`), -}; - -export const SV_P4_PRESET = { - name: 'SV P4 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51286,"enchant":3817,"gems":[41398,40112]}, - {"id":50633,"gems":[40112]}, - {"id":51288,"enchant":3808,"gems":[40112]}, - {"id":47546,"enchant":3605,"gems":[42143]}, - {"id":51289,"enchant":3832,"gems":[40112,40112]}, - {"id":50655,"enchant":3845,"gems":[40112,0]}, - {"id":51285,"enchant":3604,"gems":[40112,0]}, - {"id":50688,"enchant":3601,"gems":[40148,42143,42143]}, - {"id":50645,"enchant":3823,"gems":[49110,40112,40150]}, - {"id":50607,"enchant":3606,"gems":[40148,40148]}, - {"id":50618,"gems":[45879]}, - {"id":50402,"gems":[40148]}, - {"id":50363}, - {"id":47131}, - {"id":50735,"enchant":3827,"gems":[40112,40112,40112]}, - {}, - {"id":50733,"enchant":3608,"gems":[40112]} - ]}`), -}; - -export const SV_P5_PRESET = { - name: 'SV P5 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51286,"enchant":3817,"gems":[41398,40112]}, - {"id":50633,"gems":[40112]}, - {"id":51288,"enchant":3808,"gems":[40112]}, - {"id":47546,"enchant":3605,"gems":[42143]}, - {"id":51289,"enchant":3832,"gems":[40112,40112]}, - {"id":50655,"enchant":3845,"gems":[40112,0]}, - {"id":51285,"enchant":3604,"gems":[40112,0]}, - {"id":50688,"enchant":3601,"gems":[40148,42143,42143]}, - {"id":50645,"enchant":3823,"gems":[49110,40112,40150]}, - {"id":54577,"enchant":3606,"gems":[40148,40148]}, - {"id":50618,"gems":[45879]}, - {"id":54576,"gems":[40148]}, - {"id":50363}, - {"id":54590}, - {"id":50735,"enchant":3827,"gems":[40112,40112,40112]}, - {}, - {"id":50733,"enchant":3608,"gems":[40112]} - ]}`), -}; diff --git a/ui/mage/gear_sets/p1_arcane.gear.json b/ui/mage/gear_sets/p1_arcane.gear.json new file mode 100644 index 0000000000..f943da733f --- /dev/null +++ b/ui/mage/gear_sets/p1_arcane.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40416,"enchant":3820,"gems":[41285,39998]}, + {"id":44661,"gems":[40026]}, + {"id":40419,"enchant":3810,"gems":[40051]}, + {"id":44005,"enchant":3722,"gems":[40026]}, + {"id":44002,"enchant":3832,"gems":[39998,39998]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40415,"enchant":3604,"gems":[39998,0]}, + {"id":40561,"gems":[39998]}, + {"id":40417,"enchant":3719,"gems":[39998,40051]}, + {"id":40558,"enchant":3606}, + {"id":40719}, + {"id":40399}, + {"id":39229}, + {"id":40255}, + {"id":40396,"enchant":3834}, + {"id":40273}, + {"id":39426} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p1_fire.gear.json b/ui/mage/gear_sets/p1_fire.gear.json new file mode 100644 index 0000000000..bac7a7be06 --- /dev/null +++ b/ui/mage/gear_sets/p1_fire.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40416,"enchant":3820,"gems":[41285,39998]}, + {"id":44661,"gems":[40026]}, + {"id":40419,"enchant":3810,"gems":[40049]}, + {"id":44005,"enchant":3722,"gems":[40026]}, + {"id":40418,"enchant":3832,"gems":[39998,40048]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40415,"enchant":3604,"gems":[39998,0]}, + {"id":40301,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40246,"enchant":3606}, + {"id":40399}, + {"id":40719}, + {"id":40255}, + {"id":40432}, + {"id":40396,"enchant":3834}, + {"id":40273}, + {"id":39712} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p1_frost.gear.json b/ui/mage/gear_sets/p1_frost.gear.json new file mode 100644 index 0000000000..42d38f2c2c --- /dev/null +++ b/ui/mage/gear_sets/p1_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40416,"enchant":3820,"gems":[41285,39998]}, + {"id":44661,"gems":[40026]}, + {"id":40419,"enchant":3810,"gems":[40051]}, + {"id":44005,"enchant":3722,"gems":[40026]}, + {"id":40418,"enchant":3832,"gems":[39998,40048]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40415,"enchant":3604,"gems":[39998,0]}, + {"id":40301,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40558,"enchant":3606}, + {"id":40399}, + {"id":40719}, + {"id":40255}, + {"id":40432}, + {"id":40396,"enchant":3834}, + {"id":39766}, + {"id":39712} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p2_arcane.gear.json b/ui/mage/gear_sets/p2_arcane.gear.json new file mode 100644 index 0000000000..beb970434a --- /dev/null +++ b/ui/mage/gear_sets/p2_arcane.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,45883]}, + {"id":45243,"gems":[39998]}, + {"id":46134,"enchant":3810,"gems":[39998]}, + {"id":45618,"enchant":3722,"gems":[40026]}, + {"id":46130,"enchant":3832,"gems":[39998,39998]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"gems":[39998,39998,39998]}, + {"id":45488,"enchant":3719,"gems":[39998,40051,40026]}, + {"id":45135,"enchant":3606,"gems":[39998,39998]}, + {"id":46046,"gems":[39998]}, + {"id":45495,"gems":[39998]}, + {"id":45466}, + {"id":45518}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p2_ffb.gear.json b/ui/mage/gear_sets/p2_ffb.gear.json new file mode 100644 index 0000000000..99fdb641fb --- /dev/null +++ b/ui/mage/gear_sets/p2_ffb.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,45883]}, + {"id":45133,"gems":[40048]}, + {"id":46134,"enchant":3810,"gems":[39998]}, + {"id":45618,"enchant":3722,"gems":[39998]}, + {"id":46130,"enchant":3832,"gems":[39998,39998]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"gems":[40048,40048,39998]}, + {"id":45488,"enchant":3719,"gems":[39998,40048,40026]}, + {"id":45537,"enchant":3606,"gems":[39998,40026]}, + {"id":45495,"gems":[39998]}, + {"id":46046,"gems":[39998]}, + {"id":45466}, + {"id":45518}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p2_fire.gear.json b/ui/mage/gear_sets/p2_fire.gear.json new file mode 100644 index 0000000000..fc190f245c --- /dev/null +++ b/ui/mage/gear_sets/p2_fire.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46129,"enchant":3820,"gems":[41285,45883]}, + {"id":45133,"gems":[40048]}, + {"id":46134,"enchant":3810,"gems":[39998]}, + {"id":45242,"enchant":3722,"gems":[39998]}, + {"id":46130,"enchant":3832,"gems":[39998,39998]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[40026,40048,0]}, + {"id":45619,"gems":[40048,40048,39998]}, + {"id":46133,"enchant":3719,"gems":[39998,39998]}, + {"id":45537,"enchant":3606,"gems":[39998,40026]}, + {"id":45495,"gems":[39998]}, + {"id":46046,"gems":[39998]}, + {"id":45466}, + {"id":45518}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p2_frost.gear.json b/ui/mage/gear_sets/p2_frost.gear.json new file mode 100644 index 0000000000..8ce57aba2f --- /dev/null +++ b/ui/mage/gear_sets/p2_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,45883]}, + {"id":45133,"gems":[40051]}, + {"id":46134,"enchant":3810,"gems":[39998]}, + {"id":45618,"enchant":3722,"gems":[40026]}, + {"id":46130,"enchant":3832,"gems":[39998,39998]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"gems":[40049,40049,39998]}, + {"id":45488,"enchant":3719,"gems":[39998,40051,40026]}, + {"id":45135,"enchant":3606,"gems":[39998,40049]}, + {"id":46046,"gems":[39998]}, + {"id":45495,"gems":[39998]}, + {"id":45466}, + {"id":45518}, + {"id":45620,"enchant":3834,"gems":[40026]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_arcane_alliance.gear.json b/ui/mage/gear_sets/p3_arcane_alliance.gear.json new file mode 100644 index 0000000000..b4072e5a0a --- /dev/null +++ b/ui/mage/gear_sets/p3_arcane_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47761,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47758,"enchant":3810,"gems":[40133]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":46993,"enchant":3832,"gems":[40133,40113,40155]}, + {"id":47208,"enchant":2332,"gems":[40133,0]}, + {"id":47762,"enchant":3604,"gems":[40113,0]}, + {"id":46973,"gems":[40133,40113,40113]}, + {"id":47760,"enchant":3719,"gems":[40155,40155]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40155]}, + {"id":47188}, + {"id":45518}, + {"id":46980,"enchant":3834,"gems":[40133]}, + {"id":47958,"gems":[40155]}, + {"id":47922} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_arcane_horde.gear.json b/ui/mage/gear_sets/p3_arcane_horde.gear.json new file mode 100644 index 0000000000..005caf1a85 --- /dev/null +++ b/ui/mage/gear_sets/p3_arcane_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47764,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":47767,"enchant":3810,"gems":[40133]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47425,"enchant":3832,"gems":[40133,40113,40155]}, + {"id":47485,"enchant":2332,"gems":[40133,0]}, + {"id":47763,"enchant":3604,"gems":[40113,0]}, + {"id":47419,"gems":[40133,40113,40113]}, + {"id":47765,"enchant":3719,"gems":[40155,40155]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40155]}, + {"id":47477}, + {"id":45518}, + {"id":47422,"enchant":3834,"gems":[40133]}, + {"id":48032,"gems":[40155]}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_ffb_alliance.gear.json b/ui/mage/gear_sets/p3_ffb_alliance.gear.json new file mode 100644 index 0000000000..9f93d3bb3d --- /dev/null +++ b/ui/mage/gear_sets/p3_ffb_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47761,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47758,"enchant":3810,"gems":[40133]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":46993,"enchant":3832,"gems":[40133,40113,40153]}, + {"id":47208,"enchant":2332,"gems":[40133,0]}, + {"id":47762,"enchant":3604,"gems":[40113,0]}, + {"id":47084,"gems":[40133,40113,40113]}, + {"id":47760,"enchant":3719,"gems":[40155,40155]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47237,"gems":[40155]}, + {"id":47188}, + {"id":45518}, + {"id":47517,"enchant":3834,"gems":[40155]}, + {"id":47064}, + {"id":45294,"gems":[40155]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_ffb_horde.gear.json b/ui/mage/gear_sets/p3_ffb_horde.gear.json new file mode 100644 index 0000000000..3c59b33723 --- /dev/null +++ b/ui/mage/gear_sets/p3_ffb_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47764,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":47767,"enchant":3810,"gems":[40133]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47425,"enchant":3832,"gems":[40133,40113,40155]}, + {"id":47467,"enchant":2332,"gems":[40155,0]}, + {"id":47763,"enchant":3604,"gems":[40113,0]}, + {"id":47447,"gems":[40133,40113,40113]}, + {"id":47765,"enchant":3719,"gems":[40155,40155]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40155]}, + {"id":47477}, + {"id":45518}, + {"id":47518,"enchant":3834,"gems":[40155]}, + {"id":47437}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_fire_alliance.gear.json b/ui/mage/gear_sets/p3_fire_alliance.gear.json new file mode 100644 index 0000000000..f610b1284d --- /dev/null +++ b/ui/mage/gear_sets/p3_fire_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47761,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47758,"enchant":3810,"gems":[40133]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":47129,"enchant":3832,"gems":[40133,40153,40113]}, + {"id":47208,"enchant":2332,"gems":[40133,0]}, + {"id":47762,"enchant":3604,"gems":[40113,0]}, + {"id":47084,"gems":[40133,40113,40113]}, + {"id":47760,"enchant":3719,"gems":[40155,40155]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47237,"gems":[40155]}, + {"id":47188}, + {"id":45518}, + {"id":47517,"enchant":3834,"gems":[40155]}, + {"id":47064}, + {"id":45294,"gems":[40153]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_fire_horde.gear.json b/ui/mage/gear_sets/p3_fire_horde.gear.json new file mode 100644 index 0000000000..7557f21d20 --- /dev/null +++ b/ui/mage/gear_sets/p3_fire_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47764,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":47767,"enchant":3810,"gems":[40133]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47462,"enchant":3832,"gems":[40133,40155,40113]}, + {"id":47467,"enchant":2332,"gems":[40155,0]}, + {"id":47763,"enchant":3604,"gems":[40113,0]}, + {"id":47447,"gems":[40133,40113,40113]}, + {"id":47765,"enchant":3719,"gems":[40155,40155]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40155]}, + {"id":47477}, + {"id":45518}, + {"id":47518,"enchant":3834,"gems":[40155]}, + {"id":47437}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_frost_alliance.gear.json b/ui/mage/gear_sets/p3_frost_alliance.gear.json new file mode 100644 index 0000000000..d46cd0663c --- /dev/null +++ b/ui/mage/gear_sets/p3_frost_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47761,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47758,"enchant":3810,"gems":[40133]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":47129,"enchant":3832,"gems":[40133,40153,40155]}, + {"id":47208,"enchant":2332,"gems":[40155,0]}, + {"id":47762,"enchant":3604,"gems":[40113,0]}, + {"id":46973,"gems":[40133,40113,40113]}, + {"id":47760,"enchant":3719,"gems":[40155,40155]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":46046,"gems":[40155]}, + {"id":47188}, + {"id":45518}, + {"id":47517,"enchant":3834,"gems":[40155]}, + {"id":47958,"gems":[40155]}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p3_frost_horde.gear.json b/ui/mage/gear_sets/p3_frost_horde.gear.json new file mode 100644 index 0000000000..4d7d1df9fe --- /dev/null +++ b/ui/mage/gear_sets/p3_frost_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47764,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":47767,"enchant":3810,"gems":[40133]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47462,"enchant":3832,"gems":[40133,40155,40155]}, + {"id":47485,"enchant":2332,"gems":[40155,0]}, + {"id":47763,"enchant":3604,"gems":[40113,0]}, + {"id":47419,"gems":[40133,40113,40113]}, + {"id":47765,"enchant":3719,"gems":[40155,40155]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":46046,"gems":[40113]}, + {"id":47477}, + {"id":45518}, + {"id":47422,"enchant":3834,"gems":[40155]}, + {"id":48032,"gems":[40155]}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_arcane_alliance.gear.json b/ui/mage/gear_sets/p4_arcane_alliance.gear.json new file mode 100644 index 0000000000..1a2075fcb2 --- /dev/null +++ b/ui/mage/gear_sets/p4_arcane_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40153]}, + {"id":50628,"enchant":3722,"gems":[40153]}, + {"id":51283,"enchant":3832,"gems":[40113,40133]}, + {"id":54582,"enchant":2332,"gems":[40155,0]}, + {"id":50722,"enchant":3604,"gems":[40153,40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40155]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40155]}, + {"id":47188}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40155]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_arcane_horde.gear.json b/ui/mage/gear_sets/p4_arcane_horde.gear.json new file mode 100644 index 0000000000..95be502a67 --- /dev/null +++ b/ui/mage/gear_sets/p4_arcane_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40153]}, + {"id":50628,"enchant":3722,"gems":[40153]}, + {"id":51283,"enchant":3832,"gems":[40113,40133]}, + {"id":54582,"enchant":2332,"gems":[40155,0]}, + {"id":50722,"enchant":3604,"gems":[40153,40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40153]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40153]}, + {"id":47188}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40153]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_ffb_alliance.gear.json b/ui/mage/gear_sets/p4_ffb_alliance.gear.json new file mode 100644 index 0000000000..7f7f959fbe --- /dev/null +++ b/ui/mage/gear_sets/p4_ffb_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40153]}, + {"id":50628,"enchant":3722,"gems":[40153]}, + {"id":51283,"enchant":3832,"gems":[40113,40133]}, + {"id":50686,"enchant":2332,"gems":[40133,0]}, + {"id":51280,"enchant":3604,"gems":[40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40152]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40152]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40152]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_ffb_horde.gear.json b/ui/mage/gear_sets/p4_ffb_horde.gear.json new file mode 100644 index 0000000000..74dd746a82 --- /dev/null +++ b/ui/mage/gear_sets/p4_ffb_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40152]}, + {"id":50628,"enchant":3722,"gems":[40152]}, + {"id":51283,"enchant":3832,"gems":[40113,40133]}, + {"id":50651,"enchant":2332,"gems":[40152,0]}, + {"id":51280,"enchant":3604,"gems":[40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40152]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40152]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40152]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_fire_alliance.gear.json b/ui/mage/gear_sets/p4_fire_alliance.gear.json new file mode 100644 index 0000000000..1845ba7e8c --- /dev/null +++ b/ui/mage/gear_sets/p4_fire_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40152]}, + {"id":50628,"enchant":3722,"gems":[40152]}, + {"id":50629,"enchant":3832,"gems":[40113,40133,40155]}, + {"id":50686,"enchant":2332,"gems":[40133,0]}, + {"id":51280,"enchant":3604,"gems":[40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40152]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40152]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40153]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/p4_fire_horde.gear.json b/ui/mage/gear_sets/p4_fire_horde.gear.json new file mode 100644 index 0000000000..e10eb2cc9a --- /dev/null +++ b/ui/mage/gear_sets/p4_fire_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51281,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40133]}, + {"id":51284,"enchant":3810,"gems":[40152]}, + {"id":50628,"enchant":3722,"gems":[40152]}, + {"id":50629,"enchant":3832,"gems":[40113,40133,40152]}, + {"id":50651,"enchant":2332,"gems":[40152,0]}, + {"id":51280,"enchant":3604,"gems":[40133,0]}, + {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":51282,"enchant":3872,"gems":[40133,40152]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40133]}, + {"id":50398,"gems":[40152]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40152]} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/preraid_arcane.gear.json b/ui/mage/gear_sets/preraid_arcane.gear.json new file mode 100644 index 0000000000..ed7534329d --- /dev/null +++ b/ui/mage/gear_sets/preraid_arcane.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42553,"enchant":3820,"gems":[41285,40049]}, + {"id":39472}, + {"id":37673,"enchant":3810,"gems":[39998]}, + {"id":41610,"enchant":3722}, + {"id":39492,"enchant":3832,"gems":[39998,40049]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":39495,"enchant":3604,"gems":[39998,0]}, + {"id":40696,"gems":[40049,40026]}, + {"id":37854,"enchant":3719}, + {"id":44202,"enchant":3606,"gems":[40026]}, + {"id":40585}, + {"id":37694}, + {"id":37873}, + {"id":40682}, + {"id":37360,"enchant":3854}, + {}, + {"id":37238} +]} \ No newline at end of file diff --git a/ui/mage/gear_sets/preraid_fire.gear.json b/ui/mage/gear_sets/preraid_fire.gear.json new file mode 100644 index 0000000000..50df4f9141 --- /dev/null +++ b/ui/mage/gear_sets/preraid_fire.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42553,"enchant":3820,"gems":[41285,40014]}, + {"id":39472}, + {"id":34210,"enchant":3810,"gems":[40049,40014]}, + {"id":41610,"enchant":3859}, + {"id":39492,"enchant":3832,"gems":[40049,40014]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":39495,"enchant":3604,"gems":[40049,0]}, + {"id":40696,"gems":[40014,40026]}, + {"id":37854,"enchant":3719}, + {"id":44202,"enchant":3826,"gems":[40026]}, + {"id":40585}, + {"id":42644,"gems":[40049]}, + {"id":37873}, + {"id":40682}, + {"id":45085,"enchant":3834}, + {"id":40698}, + {"id":37177} +]} \ No newline at end of file diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 5044b232f0..d5cc06540d 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -1,7 +1,6 @@ import { Conjured, Consumes, - EquipmentSpec, Faction, Flask, Food, @@ -24,7 +23,30 @@ import { } from '../core/proto/mage.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidArcaneGear from './gear_sets/preraid_arcane.gear.json'; +import P1ArcaneGear from './gear_sets/p1_arcane.gear.json'; +import P2ArcaneGear from './gear_sets/p2_arcane.gear.json'; +import P3ArcaneAllianceGear from './gear_sets/p3_arcane_alliance.gear.json'; +import P3ArcaneHordeGear from './gear_sets/p3_arcane_horde.gear.json'; +import P4ArcaneAllianceGear from './gear_sets/p4_arcane_alliance.gear.json'; +import P4ArcaneHordeGear from './gear_sets/p4_arcane_horde.gear.json'; +import PreraidFireGear from './gear_sets/preraid_fire.gear.json'; +import P1FireGear from './gear_sets/p1_fire.gear.json'; +import P2FireGear from './gear_sets/p2_fire.gear.json'; +import P3FireAllianceGear from './gear_sets/p3_fire_alliance.gear.json'; +import P3FireHordeGear from './gear_sets/p3_fire_horde.gear.json'; +import P4FireAllianceGear from './gear_sets/p4_fire_alliance.gear.json'; +import P4FireHordeGear from './gear_sets/p4_fire_horde.gear.json'; +import P2FfbGear from './gear_sets/p2_ffb.gear.json'; +import P3FfbAllianceGear from './gear_sets/p3_ffb_alliance.gear.json'; +import P3FfbHordeGear from './gear_sets/p3_ffb_horde.gear.json'; +import P4FfbAllianceGear from './gear_sets/p4_ffb_alliance.gear.json'; +import P4FfbHordeGear from './gear_sets/p4_ffb_horde.gear.json'; +import P1FrostGear from './gear_sets/p1_frost.gear.json'; +import P2FrostGear from './gear_sets/p2_frost.gear.json'; +import P3FrostAllianceGear from './gear_sets/p3_frost_alliance.gear.json'; +import P3FrostHordeGear from './gear_sets/p3_frost_horde.gear.json'; import ArcaneApl from './apls/arcane.apl.json'; import FireApl from './apls/fire.apl.json'; @@ -38,6 +60,51 @@ import FrostFireApl from './apls/frostfire.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const ARCANE_PRERAID_PRESET = PresetUtils.makePresetGear('Arcane Preraid Preset', PreraidArcaneGear, { talentTree: 0 }); +export const ARCANE_P1_PRESET = PresetUtils.makePresetGear('Arcane P1 Preset', P1ArcaneGear, { talentTree: 0 }); +export const ARCANE_P2_PRESET = PresetUtils.makePresetGear('Arcane P2 Preset', P2ArcaneGear, { talentTree: 0 }); +export const ARCANE_P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('Arcane P3 Preset [A]', P3ArcaneAllianceGear, { talentTree: 0, faction: Faction.Alliance }); +export const ARCANE_P3_PRESET_HORDE = PresetUtils.makePresetGear('Arcane P3 Preset [H]', P3ArcaneHordeGear, { talentTree: 0, faction: Faction.Horde }); +export const ARCANE_P4_PRESET_ALLIANCE = PresetUtils.makePresetGear('Arcane P4 Preset [A]', P4ArcaneAllianceGear, { talentTree: 0, faction: Faction.Alliance }); +export const ARCANE_P4_PRESET_HORDE = PresetUtils.makePresetGear('Arcane P4 Preset [H]', P4ArcaneHordeGear, { talentTree: 0, faction: Faction.Horde }); +export const FIRE_PRERAID_PRESET = PresetUtils.makePresetGear('Fire Preraid Preset', PreraidFireGear, { talentTree: 1 }); +export const FIRE_P1_PRESET = PresetUtils.makePresetGear('Fire P1 Preset', P1FireGear, { talentTree: 1 }); +export const FIRE_P2_PRESET = PresetUtils.makePresetGear('Fire P2 Preset', P2FireGear, { talentTree: 1, customCondition: (player: Player) => !player.getTalents().icyVeins }); +export const FIRE_P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('Fire P3 Preset [A]', P3FireAllianceGear, { talentTree: 1, faction: Faction.Alliance, customCondition: (player: Player) => !player.getTalents().icyVeins }); +export const FIRE_P3_PRESET_HORDE = PresetUtils.makePresetGear('Fire P3 Preset [H]', P3FireHordeGear, { talentTree: 1, faction: Faction.Horde, customCondition: (player: Player) => !player.getTalents().icyVeins }); +export const FIRE_P4_PRESET_ALLIANCE = PresetUtils.makePresetGear('Fire P4 Preset [A]', P4FireAllianceGear, { talentTree: 1, faction: Faction.Alliance, customCondition: (player: Player) => !player.getTalents().icyVeins }); +export const FIRE_P4_PRESET_HORDE = PresetUtils.makePresetGear('Fire P4 Preset [H]', P4FireHordeGear, { talentTree: 1, faction: Faction.Horde, customCondition: (player: Player) => !player.getTalents().icyVeins }); +export const FFB_P2_PRESET = PresetUtils.makePresetGear('FFB P2 Preset', P2FfbGear, { talentTree: 1, customCondition: (player: Player) => player.getTalents().icyVeins }); +export const FFB_P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('FFB P3 Preset [A]', P3FfbAllianceGear, { talentTree: 1, customCondition: (player: Player) => player.getTalents().icyVeins }); +export const FFB_P3_PRESET_HORDE = PresetUtils.makePresetGear('FFB P3 Preset [H]', P3FfbHordeGear, { talentTree: 1, customCondition: (player: Player) => player.getTalents().icyVeins }); +export const FFB_P4_PRESET_ALLIANCE = PresetUtils.makePresetGear('FFB P4 Preset [A]', P4FfbAllianceGear, { talentTree: 1, customCondition: (player: Player) => player.getTalents().icyVeins }); +export const FFB_P4_PRESET_HORDE = PresetUtils.makePresetGear('FFB P4 Preset [H]', P4FfbHordeGear, { talentTree: 1, customCondition: (player: Player) => player.getTalents().icyVeins }); +export const FROST_P1_PRESET = PresetUtils.makePresetGear('Frost P1 Preset', P1FrostGear, { talentTree: 2 }); +export const FROST_P2_PRESET = PresetUtils.makePresetGear('Frost P2 Preset', P2FrostGear, { talentTree: 2 }); +export const FROST_P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('Frost P3 Preset [A]', P3FrostAllianceGear, { talentTree: 2, faction: Faction.Alliance }); +export const FROST_P3_PRESET_HORDE = PresetUtils.makePresetGear('Frost P3 Preset [H]', P3FrostHordeGear, { talentTree: 2, faction: Faction.Horde }); + +export const DefaultSimpleRotation = MageRotation.create({ + only3ArcaneBlastStacksBelowManaPercent: 0.15, + blastWithoutMissileBarrageAboveManaPercent: 0.2, + missileBarrageBelowManaPercent: 0, + useArcaneBarrage: false, + + primaryFireSpell: PrimaryFireSpell.Fireball, + maintainImprovedScorch: false, + + useIceLance: false, +}); + +export const ROTATION_PRESET_SIMPLE = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecMage, DefaultSimpleRotation); +export const ARCANE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Arcane', ArcaneApl, { talentTree: 0 }); +export const ARCANE_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Arcane AOE', ArcaneAoeApl, { talentTree: 0 }); +export const FIRE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Fire', FireApl, { talentTree: 1 }); +export const FROSTFIRE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frostfire', FrostFireApl, { talentTree: 1 }); +export const FIRE_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Fire AOE', FireAoeApl, { talentTree: 1 }); +export const FROST_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost', FrostApl, { talentTree: 2 }); +export const FROST_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Frost AOE', FrostAoeApl, { talentTree: 2 }); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const ArcaneTalents = { @@ -112,18 +179,6 @@ export const FrostTalents = { }), }; -export const DefaultSimpleRotation = MageRotation.create({ - only3ArcaneBlastStacksBelowManaPercent: 0.15, - blastWithoutMissileBarrageAboveManaPercent: 0.2, - missileBarrageBelowManaPercent: 0, - useArcaneBarrage: false, - - primaryFireSpell: PrimaryFireSpell.Fireball, - maintainImprovedScorch: false, - - useIceLance: false, -}); - export const DefaultFFBOptions = MageOptions.create({ armor: ArmorType.MoltenArmor, }); @@ -173,588 +228,3 @@ export const OtherDefaults = { profession1: Profession.Engineering, profession2: Profession.Tailoring, }; - -export const ROTATION_PRESET_SIMPLE = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecMage, DefaultSimpleRotation); -export const ARCANE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Arcane', ArcaneApl, { talentTree: 0 }); -export const ARCANE_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Arcane AOE', ArcaneAoeApl, { talentTree: 0 }); -export const FIRE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Fire', FireApl, { talentTree: 1 }); -export const FROSTFIRE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frostfire', FrostFireApl, { talentTree: 1 }); -export const FIRE_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Fire AOE', FireAoeApl, { talentTree: 1 }); -export const FROST_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost', FrostApl, { talentTree: 2 }); -export const FROST_ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('Frost AOE', FrostAoeApl, { talentTree: 2 }); - -export const ARCANE_PRERAID_PRESET = { - name: "Arcane Preraid Preset", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42553,"enchant":3820,"gems":[41285,40049]}, - {"id":39472}, - {"id":37673,"enchant":3810,"gems":[39998]}, - {"id":41610,"enchant":3722}, - {"id":39492,"enchant":3832,"gems":[39998,40049]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":39495,"enchant":3604,"gems":[39998,0]}, - {"id":40696,"gems":[40049,40026]}, - {"id":37854,"enchant":3719}, - {"id":44202,"enchant":3606,"gems":[40026]}, - {"id":40585}, - {"id":37694}, - {"id":37873}, - {"id":40682}, - {"id":37360,"enchant":3854}, - {}, - {"id":37238} - ]}`), -}; - -export const FIRE_PRERAID_PRESET = { - name: "Fire Preraid Preset", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42553,"enchant":3820,"gems":[41285,40014]}, - {"id":39472}, - {"id":34210,"enchant":3810,"gems":[40049,40014]}, - {"id":41610,"enchant":3859}, - {"id":39492,"enchant":3832,"gems":[40049,40014]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":39495,"enchant":3604,"gems":[40049,0]}, - {"id":40696,"gems":[40014,40026]}, - {"id":37854,"enchant":3719}, - {"id":44202,"enchant":3826,"gems":[40026]}, - {"id":40585}, - {"id":42644,"gems":[40049]}, - {"id":37873}, - {"id":40682}, - {"id":45085,"enchant":3834}, - {"id":40698}, - {"id":37177} - ]}`), -}; - -export const ARCANE_P1_PRESET = { - name: 'Arcane P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40416,"enchant":3820,"gems":[41285,39998]}, - {"id":44661,"gems":[40026]}, - {"id":40419,"enchant":3810,"gems":[40051]}, - {"id":44005,"enchant":3722,"gems":[40026]}, - {"id":44002,"enchant":3832,"gems":[39998,39998]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40415,"enchant":3604,"gems":[39998,0]}, - {"id":40561,"gems":[39998]}, - {"id":40417,"enchant":3719,"gems":[39998,40051]}, - {"id":40558,"enchant":3606}, - {"id":40719}, - {"id":40399}, - {"id":39229}, - {"id":40255}, - {"id":40396,"enchant":3834}, - {"id":40273}, - {"id":39426} - ]}`), -}; - -export const FIRE_P1_PRESET = { - name: 'Fire P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40416,"enchant":3820,"gems":[41285,39998]}, - {"id":44661,"gems":[40026]}, - {"id":40419,"enchant":3810,"gems":[40049]}, - {"id":44005,"enchant":3722,"gems":[40026]}, - {"id":40418,"enchant":3832,"gems":[39998,40048]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40415,"enchant":3604,"gems":[39998,0]}, - {"id":40301,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40246,"enchant":3606}, - {"id":40399}, - {"id":40719}, - {"id":40255}, - {"id":40432}, - {"id":40396,"enchant":3834}, - {"id":40273}, - {"id":39712} - ]}`), -}; - -export const FROST_P1_PRESET = { - name: 'Frost P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40416,"enchant":3820,"gems":[41285,39998]}, - {"id":44661,"gems":[40026]}, - {"id":40419,"enchant":3810,"gems":[40051]}, - {"id":44005,"enchant":3722,"gems":[40026]}, - {"id":40418,"enchant":3832,"gems":[39998,40048]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40415,"enchant":3604,"gems":[39998,0]}, - {"id":40301,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40558,"enchant":3606}, - {"id":40399}, - {"id":40719}, - {"id":40255}, - {"id":40432}, - {"id":40396,"enchant":3834}, - {"id":39766}, - {"id":39712} - ]}`), -}; - -export const ARCANE_P2_PRESET = { - name: 'Arcane P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,45883]}, - {"id":45243,"gems":[39998]}, - {"id":46134,"enchant":3810,"gems":[39998]}, - {"id":45618,"enchant":3722,"gems":[40026]}, - {"id":46130,"enchant":3832,"gems":[39998,39998]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"gems":[39998,39998,39998]}, - {"id":45488,"enchant":3719,"gems":[39998,40051,40026]}, - {"id":45135,"enchant":3606,"gems":[39998,39998]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ]}`), -}; - -export const FIRE_P2_PRESET = { - name: 'Fire P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46129,"enchant":3820,"gems":[41285,45883]}, - {"id":45133,"gems":[40048]}, - {"id":46134,"enchant":3810,"gems":[39998]}, - {"id":45242,"enchant":3722,"gems":[39998]}, - {"id":46130,"enchant":3832,"gems":[39998,39998]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[40026,40048,0]}, - {"id":45619,"gems":[40048,40048,39998]}, - {"id":46133,"enchant":3719,"gems":[39998,39998]}, - {"id":45537,"enchant":3606,"gems":[39998,40026]}, - {"id":45495,"gems":[39998]}, - {"id":46046,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ]}`), -}; - -export const FROST_P2_PRESET = { - name: 'Frost P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,45883]}, - {"id":45133,"gems":[40051]}, - {"id":46134,"enchant":3810,"gems":[39998]}, - {"id":45618,"enchant":3722,"gems":[40026]}, - {"id":46130,"enchant":3832,"gems":[39998,39998]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"gems":[40049,40049,39998]}, - {"id":45488,"enchant":3719,"gems":[39998,40051,40026]}, - {"id":45135,"enchant":3606,"gems":[39998,40049]}, - {"id":46046,"gems":[39998]}, - {"id":45495,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[40026]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ]}`), -}; - -export const FFB_P2_PRESET = { - name: 'FFB P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1 && player.getTalents().icyVeins, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,45883]}, - {"id":45133,"gems":[40048]}, - {"id":46134,"enchant":3810,"gems":[39998]}, - {"id":45618,"enchant":3722,"gems":[39998]}, - {"id":46130,"enchant":3832,"gems":[39998,39998]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"gems":[40048,40048,39998]}, - {"id":45488,"enchant":3719,"gems":[39998,40048,40026]}, - {"id":45537,"enchant":3606,"gems":[39998,40026]}, - {"id":45495,"gems":[39998]}, - {"id":46046,"gems":[39998]}, - {"id":45466}, - {"id":45518}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ]}`), -}; - -export const ARCANE_P3_PRESET_HORDE = { - name: 'Arcane P3 Preset [H]', - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47764,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47767,"enchant":3810,"gems":[40133]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47425,"enchant":3832,"gems":[40133,40113,40155]}, - {"id":47485,"enchant":2332,"gems":[40133,0]}, - {"id":47763,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"gems":[40133,40113,40113]}, - {"id":47765,"enchant":3719,"gems":[40155,40155]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":47477}, - {"id":45518}, - {"id":47422,"enchant":3834,"gems":[40133]}, - {"id":48032,"gems":[40155]}, - {"id":45294,"gems":[40113]} - ]}`), -}; - -export const ARCANE_P3_PRESET_ALLIANCE = { - name: 'Arcane P3 Preset [A]', - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47761,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47758,"enchant":3810,"gems":[40133]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":46993,"enchant":3832,"gems":[40133,40113,40155]}, - {"id":47208,"enchant":2332,"gems":[40133,0]}, - {"id":47762,"enchant":3604,"gems":[40113,0]}, - {"id":46973,"gems":[40133,40113,40113]}, - {"id":47760,"enchant":3719,"gems":[40155,40155]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":47188}, - {"id":45518}, - {"id":46980,"enchant":3834,"gems":[40133]}, - {"id":47958,"gems":[40155]}, - {"id":47922} - ]}`), -}; - -export const FROST_P3_PRESET_HORDE = { - name: 'Frost P3 Preset [H]', - enableWhen: (player: Player) => player.getTalentTree() == 2 && player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47764,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47767,"enchant":3810,"gems":[40133]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47462,"enchant":3832,"gems":[40133,40155,40155]}, - {"id":47485,"enchant":2332,"gems":[40155,0]}, - {"id":47763,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"gems":[40133,40113,40113]}, - {"id":47765,"enchant":3719,"gems":[40155,40155]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":46046,"gems":[40113]}, - {"id":47477}, - {"id":45518}, - {"id":47422,"enchant":3834,"gems":[40155]}, - {"id":48032,"gems":[40155]}, - {"id":45294,"gems":[40113]} - ]}`), -}; - -export const FROST_P3_PRESET_ALLIANCE = { - name: 'Frost P3 Preset [A]', - enableWhen: (player: Player) => player.getTalentTree() == 2 && player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47761,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47758,"enchant":3810,"gems":[40133]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":47129,"enchant":3832,"gems":[40133,40153,40155]}, - {"id":47208,"enchant":2332,"gems":[40155,0]}, - {"id":47762,"enchant":3604,"gems":[40113,0]}, - {"id":46973,"gems":[40133,40113,40113]}, - {"id":47760,"enchant":3719,"gems":[40155,40155]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":46046,"gems":[40155]}, - {"id":47188}, - {"id":45518}, - {"id":47517,"enchant":3834,"gems":[40155]}, - {"id":47958,"gems":[40155]}, - {"id":45294,"gems":[40113]} - ]}`), -}; - -export const FIRE_P3_PRESET_HORDE = { - name: 'Fire P3 Preset [H]', - enableWhen: (player: Player) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47764,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47767,"enchant":3810,"gems":[40133]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47462,"enchant":3832,"gems":[40133,40155,40113]}, - {"id":47467,"enchant":2332,"gems":[40155,0]}, - {"id":47763,"enchant":3604,"gems":[40113,0]}, - {"id":47447,"gems":[40133,40113,40113]}, - {"id":47765,"enchant":3719,"gems":[40155,40155]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":47477}, - {"id":45518}, - {"id":47518,"enchant":3834,"gems":[40155]}, - {"id":47437}, - {"id":45294,"gems":[40113]} - ]}`), -}; - -export const FIRE_P4_PRESET_ALLIANCE = { - name: 'Fire P4 Preset [A]', - enableWhen: (player: Player) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40152]}, - {"id":50628,"enchant":3722,"gems":[40152]}, - {"id":50629,"enchant":3832,"gems":[40113,40133,40155]}, - {"id":50686,"enchant":2332,"gems":[40133,0]}, - {"id":51280,"enchant":3604,"gems":[40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40152]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40152]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40153]} - ]}`), -}; - -export const FIRE_P4_PRESET_HORDE = { - name: 'Fire P4 Preset [H]', - enableWhen: (player: Player) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40152]}, - {"id":50628,"enchant":3722,"gems":[40152]}, - {"id":50629,"enchant":3832,"gems":[40113,40133,40152]}, - {"id":50651,"enchant":2332,"gems":[40152,0]}, - {"id":51280,"enchant":3604,"gems":[40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40152]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40152]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40152]} - ]}`), -}; - -export const FIRE_P3_PRESET_ALLIANCE = { - name: 'Fire P3 Preset [A]', - enableWhen: (player: Player) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":47761,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47758,"enchant":3810,"gems":[40133]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":47129,"enchant":3832,"gems":[40133,40153,40113]}, - {"id":47208,"enchant":2332,"gems":[40133,0]}, - {"id":47762,"enchant":3604,"gems":[40113,0]}, - {"id":47084,"gems":[40133,40113,40113]}, - {"id":47760,"enchant":3719,"gems":[40155,40155]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47237,"gems":[40155]}, - {"id":47188}, - {"id":45518}, - {"id":47517,"enchant":3834,"gems":[40155]}, - {"id":47064}, - {"id":45294,"gems":[40153]} - ]}`), -}; - - -export const FFB_P3_PRESET_HORDE = { - name: 'FFB P3 Preset [H]', - enableWhen: (player: Player) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47764,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47767,"enchant":3810,"gems":[40133]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47425,"enchant":3832,"gems":[40133,40113,40155]}, - {"id":47467,"enchant":2332,"gems":[40155,0]}, - {"id":47763,"enchant":3604,"gems":[40113,0]}, - {"id":47447,"gems":[40133,40113,40113]}, - {"id":47765,"enchant":3719,"gems":[40155,40155]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":47477}, - {"id":45518}, - {"id":47518,"enchant":3834,"gems":[40155]}, - {"id":47437}, - {"id":45294,"gems":[40113]} - ]}`), -}; - -export const FFB_P3_PRESET_ALLIANCE = { - name: 'FFB P3 Preset [A]', - enableWhen: (player: Player) => player.getFaction() == Faction.Alliance && player.getTalentTree() == 1 && player.getTalents().icyVeins, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":47761,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47758,"enchant":3810,"gems":[40133]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":46993,"enchant":3832,"gems":[40133,40113,40153]}, - {"id":47208,"enchant":2332,"gems":[40133,0]}, - {"id":47762,"enchant":3604,"gems":[40113,0]}, - {"id":47084,"gems":[40133,40113,40113]}, - {"id":47760,"enchant":3719,"gems":[40155,40155]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47237,"gems":[40155]}, - {"id":47188}, - {"id":45518}, - {"id":47517,"enchant":3834,"gems":[40155]}, - {"id":47064}, - {"id":45294,"gems":[40155]} - ]}`), -}; - -export const FFB_P4_PRESET_HORDE = { - name: 'FFB P4 Preset [H]', - enableWhen: (player: Player) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40152]}, - {"id":50628,"enchant":3722,"gems":[40152]}, - {"id":51283,"enchant":3832,"gems":[40113,40133]}, - {"id":50651,"enchant":2332,"gems":[40152,0]}, - {"id":51280,"enchant":3604,"gems":[40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40152]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40152]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40152]} - ]}`), -}; - -export const FFB_P4_PRESET_ALLIANCE = { - name: 'FFB P4 Preset [A]', - enableWhen: (player: Player) => player.getFaction() == Faction.Alliance && player.getTalentTree() == 1 && player.getTalents().icyVeins, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40153]}, - {"id":50628,"enchant":3722,"gems":[40153]}, - {"id":51283,"enchant":3832,"gems":[40113,40133]}, - {"id":50686,"enchant":2332,"gems":[40133,0]}, - {"id":51280,"enchant":3604,"gems":[40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40152]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40152]}, - {"id":50365}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40152]} - ]}`), -}; - -export const ARCANE_P4_PRESET_HORDE = { - name: 'Arcane P4 Preset [H]', - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40153]}, - {"id":50628,"enchant":3722,"gems":[40153]}, - {"id":51283,"enchant":3832,"gems":[40113,40133]}, - {"id":54582,"enchant":2332,"gems":[40155,0]}, - {"id":50722,"enchant":3604,"gems":[40153,40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40153]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40153]}, - {"id":47188}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40153]} - ]}`), -}; - -export const ARCANE_P4_PRESET_ALLIANCE = { - name: 'Arcane P4 Preset [A]', - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance, - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":51281,"enchant":3820,"gems":[41285,40133]}, - {"id":50724,"gems":[40133]}, - {"id":51284,"enchant":3810,"gems":[40153]}, - {"id":50628,"enchant":3722,"gems":[40153]}, - {"id":51283,"enchant":3832,"gems":[40113,40133]}, - {"id":54582,"enchant":2332,"gems":[40155,0]}, - {"id":50722,"enchant":3604,"gems":[40153,40133,0]}, - {"id":50613,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":51282,"enchant":3872,"gems":[40133,40155]}, - {"id":50699,"enchant":3606,"gems":[40133,40113]}, - {"id":50664,"gems":[40133]}, - {"id":50398,"gems":[40155]}, - {"id":47188}, - {"id":50348}, - {"id":50732,"enchant":3834,"gems":[40113]}, - {"id":50719}, - {"id":50684,"gems":[40155]} - ]}`), -}; diff --git a/ui/protection_paladin/gear_sets/p1.gear.json b/ui/protection_paladin/gear_sets/p1.gear.json new file mode 100644 index 0000000000..d9f99570e8 --- /dev/null +++ b/ui/protection_paladin/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40581,"enchant":3818,"gems":[41380,36767]}, + {"id":40387}, + {"id":40584,"enchant":3852,"gems":[40008]}, + {"id":40410,"enchant":3605}, + {"id":40579,"enchant":3832,"gems":[36767,40022]}, + {"id":39764,"enchant":3850,"gems":[0]}, + {"id":40580,"enchant":3860,"gems":[40008,0]}, + {"id":39759,"enchant":3601,"gems":[40008,40008]}, + {"id":40589,"enchant":3822}, + {"id":39717,"enchant":3606,"gems":[40089]}, + {"id":40718}, + {"id":40107}, + {"id":44063,"gems":[36767,40089]}, + {"id":37220}, + {"id":40345,"enchant":3788}, + {"id":40400,"enchant":3849}, + {"id":40707} +]} \ No newline at end of file diff --git a/ui/protection_paladin/gear_sets/p2.gear.json b/ui/protection_paladin/gear_sets/p2.gear.json new file mode 100644 index 0000000000..4b6a0a9b68 --- /dev/null +++ b/ui/protection_paladin/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46175,"enchant":3818,"gems":[41380,40088]}, + {"id":45485,"gems":[40088]}, + {"id":46177,"enchant":3852,"gems":[40034]}, + {"id":45496,"enchant":3605,"gems":[40034]}, + {"id":46039,"enchant":3832,"gems":[36767,36767]}, + {"id":45111,"enchant":3850,"gems":[0]}, + {"id":45487,"enchant":3860,"gems":[40008,40008,0]}, + {"id":45825,"enchant":3601,"gems":[40008]}, + {"id":45594,"enchant":3822,"gems":[40034,45880,40088]}, + {"id":45988,"enchant":3606,"gems":[40008,40008]}, + {"id":45471,"gems":[40088]}, + {"id":45326}, + {"id":45158}, + {"id":46021}, + {"id":45947,"enchant":3788,"gems":[40088]}, + {"id":45587,"enchant":3849,"gems":[36767]}, + {"id":45145} +]} \ No newline at end of file diff --git a/ui/protection_paladin/gear_sets/preraid.gear.json b/ui/protection_paladin/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..caabf63ed9 --- /dev/null +++ b/ui/protection_paladin/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42549,"enchant":3818,"gems":[41396,49110]}, + {"id":40679}, + {"id":37635,"enchant":3852,"gems":[40015]}, + {"id":44188,"enchant":3605}, + {"id":39638,"enchant":1953,"gems":[36767,40089]}, + {"id":37682,"enchant":3850,"gems":[0]}, + {"id":39639,"enchant":3860,"gems":[36767,0]}, + {"id":37379,"enchant":3601,"gems":[40022,40008]}, + {"id":37292,"enchant":3822,"gems":[40089]}, + {"id":44243,"enchant":3606}, + {"id":37186}, + {"id":37257}, + {"id":44063,"gems":[36767,40015]}, + {"id":37220}, + {"id":37179,"enchant":2673}, + {"id":43085,"enchant":3849}, + {"id":40707} +]} \ No newline at end of file diff --git a/ui/protection_paladin/presets.ts b/ui/protection_paladin/presets.ts index 04ea73877d..30894e3815 100644 --- a/ui/protection_paladin/presets.ts +++ b/ui/protection_paladin/presets.ts @@ -2,7 +2,6 @@ import { Consumes, CustomRotation, CustomSpell, - EquipmentSpec, Flask, Food, Potions, @@ -20,7 +19,10 @@ import { } from '../core/proto/paladin.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; import DefaultApl from './apls/default.apl.json'; @@ -28,23 +30,9 @@ import DefaultApl from './apls/default.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. -// Default talents. Uses the wowhead calculator format, make the talents on -// https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. - -export const GenericAoeTalents = { - name: 'Baseline Example', - data: SavedTalents.create({ - talentsString: '-05005135200132311333312321-511302012003', - glyphs: { - major1: PaladinMajorGlyph.GlyphOfSealOfVengeance, - major2: PaladinMajorGlyph.GlyphOfRighteousDefense, - major3: PaladinMajorGlyph.GlyphOfDivinePlea, - minor1: PaladinMinorGlyph.GlyphOfSenseUndead, - minor2: PaladinMinorGlyph.GlyphOfLayOnHands, - minor3: PaladinMinorGlyph.GlyphOfBlessingOfKings - } - }), -}; +export const PRERAID_PRESET = PresetUtils.makePresetGear('PreRaid', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); export const DefaultRotation = ProtectionPaladinRotation.create({ hammerFirst: false, @@ -67,6 +55,24 @@ export const DefaultRotation = ProtectionPaladinRotation.create({ export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('Default (969)', DefaultApl); +// Default talents. Uses the wowhead calculator format, make the talents on +// https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. + +export const GenericAoeTalents = { + name: 'Baseline Example', + data: SavedTalents.create({ + talentsString: '-05005135200132311333312321-511302012003', + glyphs: { + major1: PaladinMajorGlyph.GlyphOfSealOfVengeance, + major2: PaladinMajorGlyph.GlyphOfRighteousDefense, + major3: PaladinMajorGlyph.GlyphOfDivinePlea, + minor1: PaladinMinorGlyph.GlyphOfSenseUndead, + minor2: PaladinMinorGlyph.GlyphOfLayOnHands, + minor3: PaladinMinorGlyph.GlyphOfBlessingOfKings + } + }), +}; + export const DefaultOptions = ProtectionPaladinOptions.create({ aura: PaladinAura.RetributionAura, judgement: PaladinJudgement.JudgementOfWisdom, @@ -78,80 +84,3 @@ export const DefaultConsumes = Consumes.create({ defaultPotion: Potions.IndestructiblePotion, prepopPotion: Potions.IndestructiblePotion, }); - -export const PRERAID_PRESET = { - name: 'Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42549,"enchant":3818,"gems":[41396,49110]}, - {"id":40679}, - {"id":37635,"enchant":3852,"gems":[40015]}, - {"id":44188,"enchant":3605}, - {"id":39638,"enchant":1953,"gems":[36767,40089]}, - {"id":37682,"enchant":3850,"gems":[0]}, - {"id":39639,"enchant":3860,"gems":[36767,0]}, - {"id":37379,"enchant":3601,"gems":[40022,40008]}, - {"id":37292,"enchant":3822,"gems":[40089]}, - {"id":44243,"enchant":3606}, - {"id":37186}, - {"id":37257}, - {"id":44063,"gems":[36767,40015]}, - {"id":37220}, - {"id":37179,"enchant":2673}, - {"id":43085,"enchant":3849}, - {"id":40707} - ]}`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40581,"enchant":3818,"gems":[41380,36767]}, - {"id":40387}, - {"id":40584,"enchant":3852,"gems":[40008]}, - {"id":40410,"enchant":3605}, - {"id":40579,"enchant":3832,"gems":[36767,40022]}, - {"id":39764,"enchant":3850,"gems":[0]}, - {"id":40580,"enchant":3860,"gems":[40008,0]}, - {"id":39759,"enchant":3601,"gems":[40008,40008]}, - {"id":40589,"enchant":3822}, - {"id":39717,"enchant":3606,"gems":[40089]}, - {"id":40718}, - {"id":40107}, - {"id":44063,"gems":[36767,40089]}, - {"id":37220}, - {"id":40345,"enchant":3788}, - {"id":40400,"enchant":3849}, - {"id":40707} - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - {"id":46175,"enchant":3818,"gems":[41380,40088]}, - {"id":45485,"gems":[40088]}, - {"id":46177,"enchant":3852,"gems":[40034]}, - {"id":45496,"enchant":3605,"gems":[40034]}, - {"id":46039,"enchant":3832,"gems":[36767,36767]}, - {"id":45111,"enchant":3850,"gems":[0]}, - {"id":45487,"enchant":3860,"gems":[40008,40008,0]}, - {"id":45825,"enchant":3601,"gems":[40008]}, - {"id":45594,"enchant":3822,"gems":[40034,45880,40088]}, - {"id":45988,"enchant":3606,"gems":[40008,40008]}, - {"id":45471,"gems":[40088]}, - {"id":45326}, - {"id":45158}, - {"id":46021}, - {"id":45947,"enchant":3788,"gems":[40088]}, - {"id":45587,"enchant":3849,"gems":[36767]}, - {"id":45145} - ] - }`), -}; - - - diff --git a/ui/protection_warrior/gear_sets/p1_balanced.gear.json b/ui/protection_warrior/gear_sets/p1_balanced.gear.json new file mode 100644 index 0000000000..a7e2f624e1 --- /dev/null +++ b/ui/protection_warrior/gear_sets/p1_balanced.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40546,"enchant":3818,"gems":[41380,40034]}, + {"id":40387}, + {"id":39704,"enchant":3852,"gems":[40034]}, + {"id":40722,"enchant":3605}, + {"id":44000,"enchant":3832,"gems":[40034,40015]}, + {"id":39764,"enchant":3850,"gems":[0]}, + {"id":40545,"enchant":3860,"gems":[40034,0]}, + {"id":39759,"enchant":3601,"gems":[40008,36767]}, + {"id":40589,"enchant":3822}, + {"id":39717,"enchant":3232,"gems":[40089]}, + {"id":40370}, + {"id":40718}, + {"id":40257}, + {"id":44063,"gems":[36767,40089]}, + {"id":40402,"enchant":3788}, + {"id":40400,"enchant":3849}, + {"id":41168,"gems":[36767]} +]} \ No newline at end of file diff --git a/ui/protection_warrior/gear_sets/p2_survival.gear.json b/ui/protection_warrior/gear_sets/p2_survival.gear.json new file mode 100644 index 0000000000..66abd56650 --- /dev/null +++ b/ui/protection_warrior/gear_sets/p2_survival.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46166,"enchant":3818,"gems":[41380,40008]}, + {"id":45485,"gems":[40008]}, + {"id":46167,"enchant":3852,"gems":[40008]}, + {"id":45496,"enchant":3605,"gems":[40023]}, + {"id":46162,"enchant":3832,"gems":[40008,40008]}, + {"id":45111,"enchant":3850,"gems":[0]}, + {"id":45487,"enchant":3860,"gems":[40008,40008,0]}, + {"id":45139,"enchant":3601,"gems":[40008]}, + {"id":46169,"enchant":3822,"gems":[40088,40008]}, + {"id":45988,"enchant":3232,"gems":[36767,36767]}, + {"id":45471,"gems":[45880]}, + {"id":45247}, + {"id":45158}, + {"id":46021}, + {"id":45442,"enchant":3788,"gems":[40034]}, + {"id":45587,"enchant":3849,"gems":[36767]}, + {"id":45137,"enchant":3608} +]} \ No newline at end of file diff --git a/ui/protection_warrior/gear_sets/preraid_balanced.gear.json b/ui/protection_warrior/gear_sets/preraid_balanced.gear.json new file mode 100644 index 0000000000..06b202f412 --- /dev/null +++ b/ui/protection_warrior/gear_sets/preraid_balanced.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42549,"enchant":3818,"gems":[41380,40015]}, + {"id":40679}, + {"id":37814,"enchant":3852}, + {"id":37728,"enchant":3605}, + {"id":39611,"enchant":1953,"gems":[40008,40008]}, + {"id":37620,"enchant":3850,"gems":[0]}, + {"id":39622,"enchant":3860,"gems":[40034,0]}, + {"id":37379,"enchant":3601,"gems":[40034,36767]}, + {"id":43500,"enchant":3822,"gems":[40034]}, + {"id":44201,"enchant":3232}, + {"id":37784}, + {"id":37186}, + {"id":37220}, + {"id":44063,"gems":[36767,40089]}, + {"id":37401,"enchant":3788}, + {"id":43085,"enchant":3849}, + {"id":41168,"gems":[36767]} +]} \ No newline at end of file diff --git a/ui/protection_warrior/presets.ts b/ui/protection_warrior/presets.ts index 6a363fd213..18e5a1cf08 100644 --- a/ui/protection_warrior/presets.ts +++ b/ui/protection_warrior/presets.ts @@ -3,7 +3,6 @@ import { Consumes, CustomRotation, CustomSpell, - EquipmentSpec, Explosive, Food, Glyphs, @@ -24,7 +23,10 @@ import { } from '../core/proto/warrior.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidBalancedGear from './gear_sets/preraid_balanced.gear.json'; +import P1BalancedGear from './gear_sets/p1_balanced.gear.json'; +import P2SurvivalGear from './gear_sets/p2_survival.gear.json'; import DefaultApl from './apls/default.apl.json'; @@ -32,6 +34,32 @@ import DefaultApl from './apls/default.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_BALANCED_PRESET = PresetUtils.makePresetGear('PreRaid Balanced', PreraidBalancedGear); +export const P1_BALANCED_PRESET = PresetUtils.makePresetGear('P1 Balanced Preset', P1BalancedGear); +export const P2_SURVIVAL_PRESET = PresetUtils.makePresetGear('P2 Survival Preset', P2SurvivalGear); + +export const DefaultRotation = ProtectionWarriorRotation.create({ + customRotation: CustomRotation.create({ + spells: [ + CustomSpell.create({ spell: SpellOption.ShieldSlam }), + CustomSpell.create({ spell: SpellOption.Revenge }), + CustomSpell.create({ spell: SpellOption.Shout }), + CustomSpell.create({ spell: SpellOption.ThunderClap }), + CustomSpell.create({ spell: SpellOption.DemoralizingShout }), + CustomSpell.create({ spell: SpellOption.MortalStrike }), + CustomSpell.create({ spell: SpellOption.Devastate }), + CustomSpell.create({ spell: SpellOption.SunderArmor }), + CustomSpell.create({ spell: SpellOption.ConcussionBlow }), + CustomSpell.create({ spell: SpellOption.Shockwave }), + ], + }), + demoShoutChoice: DemoShoutChoice.DemoShoutChoiceNone, + thunderClapChoice: ThunderClapChoice.ThunderClapChoiceNone, + hsRageThreshold: 30, +}); + +export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const StandardTalents = { @@ -64,28 +92,6 @@ export const UATalents = { }), }; -export const DefaultRotation = ProtectionWarriorRotation.create({ - customRotation: CustomRotation.create({ - spells: [ - CustomSpell.create({ spell: SpellOption.ShieldSlam }), - CustomSpell.create({ spell: SpellOption.Revenge }), - CustomSpell.create({ spell: SpellOption.Shout }), - CustomSpell.create({ spell: SpellOption.ThunderClap }), - CustomSpell.create({ spell: SpellOption.DemoralizingShout }), - CustomSpell.create({ spell: SpellOption.MortalStrike }), - CustomSpell.create({ spell: SpellOption.Devastate }), - CustomSpell.create({ spell: SpellOption.SunderArmor }), - CustomSpell.create({ spell: SpellOption.ConcussionBlow }), - CustomSpell.create({ spell: SpellOption.Shockwave }), - ], - }), - demoShoutChoice: DemoShoutChoice.DemoShoutChoiceNone, - thunderClapChoice: ThunderClapChoice.ThunderClapChoiceNone, - hsRageThreshold: 30, -}); - -export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); - export const DefaultOptions = ProtectionWarriorOptions.create({ shout: WarriorShout.WarriorShoutCommanding, useShatteringThrow: false, @@ -101,77 +107,3 @@ export const DefaultConsumes = Consumes.create({ thermalSapper: true, fillerExplosive: Explosive.ExplosiveSaroniteBomb, }); - -export const P1_PRERAID_BALANCED_PRESET = { - name: 'P1 Pre-Raid Balanced Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42549,"enchant":3818,"gems":[41380,40015]}, - {"id":40679}, - {"id":37814,"enchant":3852}, - {"id":37728,"enchant":3605}, - {"id":39611,"enchant":1953,"gems":[40008,40008]}, - {"id":37620,"enchant":3850,"gems":[0]}, - {"id":39622,"enchant":3860,"gems":[40034,0]}, - {"id":37379,"enchant":3601,"gems":[40034,36767]}, - {"id":43500,"enchant":3822,"gems":[40034]}, - {"id":44201,"enchant":3232}, - {"id":37784}, - {"id":37186}, - {"id":37220}, - {"id":44063,"gems":[36767,40089]}, - {"id":37401,"enchant":3788}, - {"id":43085,"enchant":3849}, - {"id":41168,"gems":[36767]} - ]}`), -}; - -export const P1_BALANCED_PRESET = { - name: 'P1 Balanced Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":40546,"enchant":3818,"gems":[41380,40034]}, - {"id":40387}, - {"id":39704,"enchant":3852,"gems":[40034]}, - {"id":40722,"enchant":3605}, - {"id":44000,"enchant":3832,"gems":[40034,40015]}, - {"id":39764,"enchant":3850,"gems":[0]}, - {"id":40545,"enchant":3860,"gems":[40034,0]}, - {"id":39759,"enchant":3601,"gems":[40008,36767]}, - {"id":40589,"enchant":3822}, - {"id":39717,"enchant":3232,"gems":[40089]}, - {"id":40370}, - {"id":40718}, - {"id":40257}, - {"id":44063,"gems":[36767,40089]}, - {"id":40402,"enchant":3788}, - {"id":40400,"enchant":3849}, - {"id":41168,"gems":[36767]} - ]}`), -}; - -export const P2_SURVIVAL_PRESET = { - name: 'P2 Survival Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - {"id":46166,"enchant":3818,"gems":[41380,40008]}, - {"id":45485,"gems":[40008]}, - {"id":46167,"enchant":3852,"gems":[40008]}, - {"id":45496,"enchant":3605,"gems":[40023]}, - {"id":46162,"enchant":3832,"gems":[40008,40008]}, - {"id":45111,"enchant":3850,"gems":[0]}, - {"id":45487,"enchant":3860,"gems":[40008,40008,0]}, - {"id":45139,"enchant":3601,"gems":[40008]}, - {"id":46169,"enchant":3822,"gems":[40088,40008]}, - {"id":45988,"enchant":3232,"gems":[36767,36767]}, - {"id":45471,"gems":[45880]}, - {"id":45247}, - {"id":45158}, - {"id":46021}, - {"id":45442,"enchant":3788,"gems":[40034]}, - {"id":45587,"enchant":3849,"gems":[36767]}, - {"id":45137,"enchant":3608} - ] - }`), -}; diff --git a/ui/protection_warrior/sim.ts b/ui/protection_warrior/sim.ts index f78d147902..6de21d26d6 100644 --- a/ui/protection_warrior/sim.ts +++ b/ui/protection_warrior/sim.ts @@ -13,13 +13,11 @@ import { import { Stats } from '../core/proto_utils/stats.js'; import { Player } from '../core/player.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; -import { TypedEvent } from '../core/typed_event.js'; import { ProtectionWarrior, ProtectionWarrior_Rotation as ProtectionWarriorRotation, WarriorTalents as WarriorTalents, ProtectionWarrior_Options as ProtectionWarriorOptions } from '../core/proto/warrior.js'; import * as IconInputs from '../core/components/icon_inputs.js'; import * as OtherInputs from '../core/components/other_inputs.js'; -import * as Tooltips from '../core/constants/tooltips.js'; import * as ProtectionWarriorInputs from './inputs.js'; import * as Presets from './presets.js'; @@ -199,7 +197,7 @@ export class ProtectionWarriorSimUI extends IndividualSimUI> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: DeathknightPresets.P1_BLOOD_BIS_PRESET.gear, - 2: DeathknightPresets.P2_BLOOD_BIS_PRESET.gear, - 3: DeathknightPresets.P3_BLOOD_BIS_PRESET.gear, + 1: DeathknightPresets.P1_BLOOD_PRESET.gear, + 2: DeathknightPresets.P2_BLOOD_PRESET.gear, + 3: DeathknightPresets.P3_BLOOD_PRESET.gear, }, [Faction.Horde]: { - 1: DeathknightPresets.P1_BLOOD_BIS_PRESET.gear, - 2: DeathknightPresets.P2_BLOOD_BIS_PRESET.gear, - 3: DeathknightPresets.P3_BLOOD_BIS_PRESET.gear, + 1: DeathknightPresets.P1_BLOOD_PRESET.gear, + 2: DeathknightPresets.P2_BLOOD_PRESET.gear, + 3: DeathknightPresets.P3_BLOOD_PRESET.gear, }, }, tooltip: 'Blood DPS Death Knight', @@ -173,14 +173,14 @@ export const playerPresets: Array> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: DeathknightPresets.P1_FROST_BIS_PRESET.gear, - 2: DeathknightPresets.P2_FROST_BIS_PRESET.gear, - 3: DeathknightPresets.P3_FROST_BIS_PRESET.gear, + 1: DeathknightPresets.P1_FROST_PRESET.gear, + 2: DeathknightPresets.P2_FROST_PRESET.gear, + 3: DeathknightPresets.P3_FROST_PRESET.gear, }, [Faction.Horde]: { - 1: DeathknightPresets.P1_FROST_BIS_PRESET.gear, - 2: DeathknightPresets.P2_FROST_BIS_PRESET.gear, - 3: DeathknightPresets.P3_FROST_BIS_PRESET.gear, + 1: DeathknightPresets.P1_FROST_PRESET.gear, + 2: DeathknightPresets.P2_FROST_PRESET.gear, + 3: DeathknightPresets.P3_FROST_PRESET.gear, }, }, otherDefaults: DeathknightPresets.OtherDefaults, @@ -202,14 +202,14 @@ export const playerPresets: Array> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: DeathknightPresets.P1_UNHOLY_DW_BIS_PRESET.gear, - 2: DeathknightPresets.P2_UNHOLY_DW_BIS_PRESET.gear, - 3: DeathknightPresets.P3_UNHOLY_DW_BIS_PRESET.gear, + 1: DeathknightPresets.P1_UNHOLY_DW_PRESET.gear, + 2: DeathknightPresets.P2_UNHOLY_DW_PRESET.gear, + 3: DeathknightPresets.P3_UNHOLY_DW_PRESET.gear, }, [Faction.Horde]: { - 1: DeathknightPresets.P1_UNHOLY_DW_BIS_PRESET.gear, - 2: DeathknightPresets.P2_UNHOLY_DW_BIS_PRESET.gear, - 3: DeathknightPresets.P3_UNHOLY_DW_BIS_PRESET.gear, + 1: DeathknightPresets.P1_UNHOLY_DW_PRESET.gear, + 2: DeathknightPresets.P2_UNHOLY_DW_PRESET.gear, + 3: DeathknightPresets.P3_UNHOLY_DW_PRESET.gear, }, }, otherDefaults: DeathknightPresets.OtherDefaults, @@ -929,14 +929,14 @@ export const playerPresets: Array> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: WarlockPresets.P1_Preset_Affliction.gear, - 2: WarlockPresets.P2_Preset_Affliction.gear, - 3: WarlockPresets.P3_Preset_Affliction_Alliance.gear, + 1: WarlockPresets.P1_AFFLICTION_PRESET.gear, + 2: WarlockPresets.P2_AFFLICTION_PRESET.gear, + 3: WarlockPresets.P3_AFFLICTION_ALLIANCE_PRESET.gear, }, [Faction.Horde]: { - 1: WarlockPresets.P1_Preset_Affliction.gear, - 2: WarlockPresets.P2_Preset_Affliction.gear, - 3: WarlockPresets.P3_Preset_Affliction_Horde.gear, + 1: WarlockPresets.P1_AFFLICTION_PRESET.gear, + 2: WarlockPresets.P2_AFFLICTION_PRESET.gear, + 3: WarlockPresets.P3_AFFLICTION_HORDE_PRESET.gear, }, }, otherDefaults: WarlockPresets.OtherDefaults, @@ -958,14 +958,14 @@ export const playerPresets: Array> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: WarlockPresets.P1_Preset_Demo_Destro.gear, - 2: WarlockPresets.P2_Preset_Demo_Destro.gear, - 3: WarlockPresets.P3_Preset_Demo_Alliance.gear, + 1: WarlockPresets.P1_DEMODESTRO_PRESET.gear, + 2: WarlockPresets.P2_DEMODESTRO_PRESET.gear, + 3: WarlockPresets.P3_DEMO_ALLIANCE_PRESET.gear, }, [Faction.Horde]: { - 1: WarlockPresets.P1_Preset_Demo_Destro.gear, - 2: WarlockPresets.P2_Preset_Demo_Destro.gear, - 3: WarlockPresets.P3_Preset_Demo_Horde.gear, + 1: WarlockPresets.P1_DEMODESTRO_PRESET.gear, + 2: WarlockPresets.P2_DEMODESTRO_PRESET.gear, + 3: WarlockPresets.P3_DEMO_HORDE_PRESET.gear, }, }, otherDefaults: WarlockPresets.OtherDefaults, @@ -987,14 +987,14 @@ export const playerPresets: Array> = [ defaultGear: { [Faction.Unknown]: {}, [Faction.Alliance]: { - 1: WarlockPresets.P1_Preset_Demo_Destro.gear, - 2: WarlockPresets.P2_Preset_Demo_Destro.gear, - 3: WarlockPresets.P3_Preset_Destro_Alliance.gear, + 1: WarlockPresets.P1_DEMODESTRO_PRESET.gear, + 2: WarlockPresets.P2_DEMODESTRO_PRESET.gear, + 3: WarlockPresets.P3_DESTRO_ALLIANCE_PRESET.gear, }, [Faction.Horde]: { - 1: WarlockPresets.P1_Preset_Demo_Destro.gear, - 2: WarlockPresets.P2_Preset_Demo_Destro.gear, - 3: WarlockPresets.P3_Preset_Destro_Horde.gear, + 1: WarlockPresets.P1_DEMODESTRO_PRESET.gear, + 2: WarlockPresets.P2_DEMODESTRO_PRESET.gear, + 3: WarlockPresets.P3_DESTRO_HORDE_PRESET.gear, }, }, otherDefaults: WarlockPresets.OtherDefaults, diff --git a/ui/restoration_druid/gear_sets/p1.gear.json b/ui/restoration_druid/gear_sets/p1.gear.json new file mode 100644 index 0000000000..c9245b50eb --- /dev/null +++ b/ui/restoration_druid/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"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} +]} \ No newline at end of file diff --git a/ui/restoration_druid/gear_sets/p2.gear.json b/ui/restoration_druid/gear_sets/p2.gear.json new file mode 100644 index 0000000000..499a10dac3 --- /dev/null +++ b/ui/restoration_druid/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46184,"enchant":3819,"gems":[41401,39998]}, + {"id":45243,"gems":[39998]}, + {"id":46187,"enchant":3809,"gems":[39998]}, + {"id":45618,"enchant":3831,"gems":[39998]}, + {"id":45519,"enchant":3832,"gems":[40017,39998,40026]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":46183,"enchant":3246,"gems":[39998,0]}, + {"id":45616,"gems":[39998,39998,39998]}, + {"id":46185,"enchant":3719,"gems":[40026,39998]}, + {"id":45135,"enchant":3606,"gems":[39998,40017]}, + {"id":45495,"gems":[40017]}, + {"id":45946,"gems":[40017]}, + {"id":45703}, + {"id":45535}, + {"id":46017,"enchant":3834}, + {"id":45271}, + {"id":40342} +]} \ No newline at end of file diff --git a/ui/restoration_druid/gear_sets/preraid.gear.json b/ui/restoration_druid/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..5ddcf3d85a --- /dev/null +++ b/ui/restoration_druid/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{ "items": [ + {"id":37149,"enchant":3819,"gems":[41401,40051]}, + {"id":42339,"gems":[40026]}, + {"id":37673,"enchant":3809,"gems":[39998]}, + {"id":41610,"enchant":3831}, + {"id":42102,"enchant":3832}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":42113,"enchant":3246,"gems":[0]}, + {"id":37643,"enchant":3601,"gems":[39998]}, + {"id":37791,"enchant":3719}, + {"id":44202,"enchant":3232,"gems":[39998]}, + {"id":37694}, + {"id":37192}, + {"id":37111}, + {"id":37657}, + {"id":37169,"enchant":3834}, + {"id":40699}, + {"id":33508} +]} \ No newline at end of file diff --git a/ui/restoration_druid/presets.ts b/ui/restoration_druid/presets.ts index c01dafa6c3..51f5449229 100644 --- a/ui/restoration_druid/presets.ts +++ b/ui/restoration_druid/presets.ts @@ -1,7 +1,6 @@ import { Consumes, Debuffs, - EquipmentSpec, Flask, Food, Glyphs, @@ -21,12 +20,23 @@ import { DruidMinorGlyph, } from '../core/proto/druid.js'; -import * as Tooltips from '../core/constants/tooltips.js'; +import * as PresetUtils from '../core/preset_utils.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('PreRaid', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); + +export const DefaultRotation = RestorationDruidRotation.create({ +}); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const CelestialFocusTalents = { @@ -58,9 +68,6 @@ export const ThiccRestoTalents = { }), }; -export const DefaultRotation = RestorationDruidRotation.create({ -}); - export const DefaultOptions = RestorationDruidOptions.create({ innervateTarget: UnitReference.create(), }); @@ -111,75 +118,3 @@ export const DefaultDebuffs = Debuffs.create({ export const OtherDefaults = { distanceFromTarget: 18, }; - -export const PRE_RAID_PRESET = { - name: 'Pre-raid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":37149,"enchant":3819,"gems":[41401,40051]}, - {"id":42339,"gems":[40026]}, - {"id":37673,"enchant":3809,"gems":[39998]}, - {"id":41610,"enchant":3831}, - {"id":42102,"enchant":3832}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":42113,"enchant":3246,"gems":[0]}, - {"id":37643,"enchant":3601,"gems":[39998]}, - {"id":37791,"enchant":3719}, - {"id":44202,"enchant":3232,"gems":[39998]}, - {"id":37694}, - {"id":37192}, - {"id":37111}, - {"id":37657}, - {"id":37169,"enchant":3834}, - {"id":40699}, - {"id":33508} - ]}`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"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} - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46184,"enchant":3819,"gems":[41401,39998]}, - {"id":45243,"gems":[39998]}, - {"id":46187,"enchant":3809,"gems":[39998]}, - {"id":45618,"enchant":3831,"gems":[39998]}, - {"id":45519,"enchant":3832,"gems":[40017,39998,40026]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":46183,"enchant":3246,"gems":[39998,0]}, - {"id":45616,"gems":[39998,39998,39998]}, - {"id":46185,"enchant":3719,"gems":[40026,39998]}, - {"id":45135,"enchant":3606,"gems":[39998,40017]}, - {"id":45495,"gems":[40017]}, - {"id":45946,"gems":[40017]}, - {"id":45703}, - {"id":45535}, - {"id":46017,"enchant":3834}, - {"id":45271}, - {"id":40342} - ]}`), -}; diff --git a/ui/restoration_druid/sim.ts b/ui/restoration_druid/sim.ts index 8c547d901a..053ec3d528 100644 --- a/ui/restoration_druid/sim.ts +++ b/ui/restoration_druid/sim.ts @@ -106,7 +106,7 @@ export class RestorationDruidSimUI extends IndividualSimUI) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46125,"enchant":3817,"gems":[41398,39999]}, - {"id":45517,"gems":[39999]}, - {"id":45245,"enchant":3808,"gems":[39999,39999]}, - {"id":45461,"enchant":3605,"gems":[40053]}, - {"id":45473,"enchant":3832,"gems":[40053,42702,39999]}, - {"id":45611,"enchant":3845,"gems":[40053,0]}, - {"id":46124,"enchant":3604,"gems":[40003,0]}, - {"id":46095,"enchant":3599,"gems":[39999,39999,39999]}, - {"id":45536,"enchant":3823,"gems":[39999,39999,39999]}, - {"id":45564,"enchant":3606,"gems":[39999,39999]}, - {"id":45608,"gems":[39999]}, - {"id":45456,"gems":[39999]}, - {"id":45609}, - {"id":46038}, - {"id":45484,"enchant":3789,"gems":[40003]}, - {"id":45484,"enchant":3789,"gems":[40003]}, - {"id":45570,"enchant":3608} - ]}`), -}; - -export const P2_PRESET_COMBAT = { - name: 'P2 Combat', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46125,"enchant":3817,"gems":[41398,39999]}, - {"id":45517,"gems":[39999]}, - {"id":46127,"enchant":3808,"gems":[39999]}, - {"id":45461,"enchant":3605,"gems":[40053]}, - {"id":45473,"enchant":3832,"gems":[40053,42702,39999]}, - {"id":45611,"enchant":3845,"gems":[40044,0]}, - {"id":46043,"enchant":3604,"gems":[39999,40053,0]}, - {"id":46095,"enchant":3599,"gems":[39999,39999,39999]}, - {"id":45536,"enchant":3823,"gems":[39999,39999,39999]}, - {"id":45564,"enchant":3606,"gems":[39999,39999]}, - {"id":45608,"gems":[39999]}, - {"id":46048,"gems":[39999]}, - {"id":45609}, - {"id":45931}, - {"id":45132,"enchant":3789,"gems":[40053]}, - {"id":45484,"enchant":3789,"gems":[40003]}, - {"id":45296,"gems":[40053]} - ]}`), -}; - -export const P3_PRESET_ASSASSINATION = { - name: 'P3 Assassination', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48230,"enchant":3817,"gems":[41398,49110]}, - {"id":47060,"gems":[40114]}, - {"id":48228,"enchant":3808,"gems":[40114]}, - {"id":47545,"enchant":3605,"gems":[40114]}, - {"id":48232,"enchant":3832,"gems":[40114,40114]}, - {"id":47155,"enchant":3845,"gems":[40114,40114,0]}, - {"id":48231,"enchant":3604,"gems":[40114,0]}, - {"id":47112,"enchant":3599,"gems":[40156,40114,40114]}, - {"id":46975,"enchant":3823,"gems":[40118,40118,40118]}, - {"id":47077,"enchant":3606,"gems":[40156,40114]}, - {"id":47075,"gems":[40114]}, - {"id":45608,"gems":[40114]}, - {"id":47131}, - {"id":45609}, - {"id":46969,"enchant":3789,"gems":[40156]}, - {"id":46969,"enchant":3789,"gems":[40156]}, - {"id":47521,"gems":[40156]} - ]}`), -}; - -export const P3_PRESET_COMBAT = { - name: 'P3 Combat', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48230,"enchant":3817,"gems":[41398,49110]}, - {"id":47060,"gems":[40114]}, - {"id":48228,"enchant":3808,"gems":[40114]}, - {"id":47545,"enchant":3605,"gems":[40114]}, - {"id":48232,"enchant":3832,"gems":[40114,40114]}, - {"id":47155,"enchant":3845,"gems":[40114,40114,0]}, - {"id":48231,"enchant":3604,"gems":[40114,0]}, - {"id":47112,"enchant":3599,"gems":[40157,40114,40114]}, - {"id":46975,"enchant":3823,"gems":[40114,40114,40114]}, - {"id":47077,"enchant":3606,"gems":[40157,40114]}, - {"id":47075,"gems":[40114]}, - {"id":47934,"gems":[40157]}, - {"id":47131}, - {"id":45609}, - {"id":47156,"enchant":3789,"gems":[40157]}, - {"id":47001,"enchant":3789,"gems":[40157]}, - {"id":47521,"gems":[40157]} - ]}`), -}; - -export const PRERAID_PRESET_ASSASSINATION = { - name: 'Pre-Raid Assassination', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42550,"enchant":3817,"gems":[41398,40058]}, - {"id":40678}, - {"id":43481,"enchant":3808}, - {"id":38614,"enchant":3605}, - {"id":39558,"enchant":3832,"gems":[40003,42702]}, - {"id":34448,"enchant":3845,"gems":[40003,0]}, - {"id":39560,"enchant":3604,"gems":[40058,0]}, - {"id":40694,"gems":[40003,40003]}, - {"id":37644,"enchant":3823}, - {"id":34575,"enchant":3606,"gems":[40003]}, - {"id":40586}, - {"id":37642}, - {"id":40684}, - {"id":44253}, - {"id":37856,"enchant":3789}, - {"id":37667,"enchant":3789}, - {"id":43612} - ]}`), -}; - -export const PRERAID_PRESET_COMBAT = { - name: 'Pre-Raid Combat', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42550,"enchant":3817,"gems":[41398,40014]}, - {"id":40678}, - {"id":37139,"enchant":3808,"gems":[39999]}, - {"id":34241,"enchant":3605,"gems":[40014]}, - {"id":39558,"enchant":3832,"gems":[39999,40014]}, - {"id":34448,"enchant":3845,"gems":[39999,0]}, - {"id":39560,"enchant":3604,"gems":[40014,0]}, - {"id":40694,"gems":[42702,39999]}, - {"id":37644,"enchant":3823}, - {"id":34575,"enchant":3606,"gems":[39999]}, - {"id":40586}, - {"id":37642}, - {"id":40684}, - {"id":44253}, - {"id":37693,"enchant":3789}, - {"id":37856,"enchant":3789}, - {"id":44504,"gems":[40053]} - ]}`), -} - -export const P1_PRESET_ASSASSINATION = { - name: 'P1 Assassination', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":40499,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[40003]}, - {"id":40502,"enchant":3808,"gems":[40003]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[40003]}, - {"id":39765,"enchant":3845,"gems":[40003,0]}, - {"id":40496,"enchant":3604,"gems":[40053,0]}, - {"id":40260,"gems":[39999]}, - {"id":40500,"enchant":3823,"gems":[40003,40003]}, - {"id":39701,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":39714,"enchant":3789}, - {"id":40386,"enchant":3789}, - {"id":40385} - ]}`), -} - -export const P1_PRESET_HEMO_SUB = { - name: "P1 Hemo Sub", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":40499,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[40029]}, - {"id":40502,"enchant":3808,"gems":[40003]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[39999]}, - {"id":40186,"enchant":3845,"gems":[0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[40003]}, - {"id":44011,"enchant":3823,"gems":[40003,40034]}, - {"id":39701,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40256}, - {"id":44253}, - {"id":40383,"enchant":3789}, - {"id":39714,"enchant":3789}, - {"id":40385} - ]}`), -} - -export const P1_PRESET_COMBAT = { - name: 'P1 Combat', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 1, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40499,"enchant":3817,"gems":[41398,42702]}, - {"id":44664,"gems":[39999]}, - {"id":40502,"enchant":3808,"gems":[39999]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[39999]}, - {"id":39765,"enchant":3845,"gems":[39999,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[39999]}, - {"id":44011,"enchant":3823,"gems":[39999,39999]}, - {"id":39701,"enchant":3606}, - {"id":40074}, - {"id":40474}, - {"id":40684}, - {"id":44253}, - {"id":40383,"enchant":3789}, - {"id":39714,"enchant":3789}, - {"id":40385} - ]}`), -} - -export const P2_PRESET_HEMO_SUB = { - name: "P2 Hemo Sub", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46125,"enchant":3817,"gems":[41398,42143]}, - {"id":45517,"gems":[49110]}, - {"id":45245,"enchant":3808,"gems":[40023,40003]}, - {"id":45461,"enchant":3605,"gems":[40044]}, - {"id":45473,"enchant":3832,"gems":[40044,40023,40003]}, - {"id":45611,"enchant":3845,"gems":[40044,0]}, - {"id":46124,"enchant":3604,"gems":[39997,0]}, - {"id":46095,"enchant":3599,"gems":[42143,42143,39997]}, - {"id":45536,"enchant":3823,"gems":[40044,39997,40023]}, - {"id":45564,"enchant":3606,"gems":[40023,40003]}, - {"id":45608,"gems":[39997]}, - {"id":46048,"gems":[39997]}, - {"id":45609}, - {"id":45931}, - {"id":45132,"enchant":3789,"gems":[40044]}, - {"id":45484,"enchant":3789,"gems":[39997]}, - {"id":45296,"gems":[39997]} - ]}`), -} - -export const P3_PRESET_HEMO_SUB = { - name: "P3 Hemo Sub", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items":[ - {"id":48235,"enchant":3817,"gems":[41398,49110]}, - {"id":47060,"gems":[40112]}, - {"id":48237,"enchant":3808,"gems":[40112]}, - {"id":47546,"enchant":3605,"gems":[40112]}, - {"id":47431,"enchant":3832,"gems":[40148,40130,40112]}, - {"id":45611,"enchant":3845,"gems":[40148,0]}, - {"id":48234,"enchant":3604,"gems":[40112,0]}, - {"id":47460,"gems":[40148,40112,40162]}, - {"id":47420,"enchant":3823,"gems":[40112,40112,40148]}, - {"id":47445,"enchant":3606,"gems":[40148,40112]}, - {"id":47443, - "gems": [40112]}, - {"id":46048,"gems":[40112]}, - {"id":45609}, - {"id":47131}, - {"id":47475,"enchant":3789,"gems":[40148]}, - {"id":47416,"enchant":3789,"gems":[40148]}, - {"id":45296,"gems":[40112]} - ]}`), -} - -export const P3_PRESET_DANCE_SUB = { - name: "P3 Dance Sub", - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 2, - gear: EquipmentSpec.fromJsonString(`{ "items":[ - {"id":48235,"enchant":3817,"gems":[41398,49110]}, - {"id":47060,"gems":[40112]}, - {"id":48237,"enchant":3808,"gems":[40112]}, - {"id":47546,"enchant":3605,"gems":[40112]}, - {"id":47431,"enchant":3832,"gems":[40148,40130,40112]}, - {"id":45611,"enchant":3845,"gems":[40148,0]}, - {"id":48234, - "enchant" :3604, - "gems": [ - 40112, - 0 - ] - }, - {"id":47460,"gems":[40148,40112,40162]}, - {"id":47420,"enchant":3823,"gems":[40112,40112,40148]}, - {"id":47445,"enchant":3606,"gems":[40148,40112]}, - {"id":47443,"gems":[40112]}, - {"id":46048,"gems":[40112]}, - {"id":45609}, - {"id":47131}, - {"id":47416,"enchant":3789,"gems":[40148]}, - {"id":47416,"enchant":3789,"gems":[40148]}, - {"id":45296,"gems":[40112]} - ]}`), -} diff --git a/ui/shadow_priest/gear_sets/p1.gear.json b/ui/shadow_priest/gear_sets/p1.gear.json new file mode 100644 index 0000000000..c1dd117125 --- /dev/null +++ b/ui/shadow_priest/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40562,"enchant":3820,"gems":[41285,39998]}, + {"id":44661,"gems":[40026]}, + {"id":40459,"enchant":3810,"gems":[39998]}, + {"id":44005,"enchant":3722,"gems":[40026]}, + {"id":44002,"enchant":1144,"gems":[39998,39998]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40454,"enchant":3604,"gems":[40049,0]}, + {"id":40561,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40558,"enchant":3606}, + {"id":40719}, + {"id":40399}, + {"id":40255}, + {"id":40432}, + {"id":40395,"enchant":3834}, + {"id":40273}, + {"id":39712} +]} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/p2.gear.json b/ui/shadow_priest/gear_sets/p2.gear.json new file mode 100644 index 0000000000..671ee361f2 --- /dev/null +++ b/ui/shadow_priest/gear_sets/p2.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46172,"enchant":3820,"gems":[41285,45883]}, + {"id":45243,"gems":[39998]}, + {"id":46165,"enchant":3810,"gems":[39998]}, + {"id":45242,"enchant":3722,"gems":[40049]}, + {"id":46168,"enchant":1144,"gems":[39998,39998]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"enchant":3601,"gems":[39998,39998,39998]}, + {"id":46170,"enchant":3719,"gems":[39998,40049]}, + {"id":45135,"enchant":3606,"gems":[39998,40049]}, + {"id":45495,"gems":[40026]}, + {"id":46046,"gems":[39998]}, + {"id":45518}, + {"id":45466}, + {"id":45620,"enchant":3834,"gems":[40026]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/p3.gear.json b/ui/shadow_priest/gear_sets/p3.gear.json new file mode 100644 index 0000000000..ebd301f675 --- /dev/null +++ b/ui/shadow_priest/gear_sets/p3.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48088,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":48091,"enchant":3810,"gems":[40155]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":48090,"enchant":1144,"gems":[40113,40133]}, + {"id":47467,"enchant":2332,"gems":[40155,0]}, + {"id":45665,"enchant":3604,"gems":[40113,40113,0]}, + {"id":47419,"enchant":3601,"gems":[40133,40113,40113]}, + {"id":48089,"enchant":3719,"gems":[40113,40133]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":47489,"gems":[40155]}, + {"id":45495,"gems":[40113]}, + {"id":45518}, + {"id":47477}, + {"id":47483,"enchant":3834}, + {"id":47437}, + {"id":47995} +]} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/preraid.gear.json b/ui/shadow_priest/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..43746ad014 --- /dev/null +++ b/ui/shadow_priest/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42553,"enchant":3820,"gems":[41285,40049]}, + {"id":40680}, + {"id":34210,"enchant":3810,"gems":[39998,40026]}, + {"id":41610,"enchant":3722}, + {"id":43792,"enchant":1144,"gems":[39998,40051]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":39530,"enchant":3604,"gems":[40049,0]}, + {"id":40696,"gems":[40049,39998]}, + {"id":37854,"enchant":3719}, + {"id":44202,"enchant":3826,"gems":[40026]}, + {"id":40585}, + {"id":37694}, + {"id":37835}, + {"id":37873}, + {"id":41384,"enchant":3834}, + {"id":40698}, + {"id":37177} +]} \ No newline at end of file diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index 574a543fb9..c415c1cb79 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -1,7 +1,6 @@ import { Consumes, Debuffs, - EquipmentSpec, Flask, Food, Glyphs, @@ -21,13 +20,29 @@ import { } from '../core/proto/priest.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; +import P2Gear from './gear_sets/p2.gear.json'; +import P3Gear from './gear_sets/p3.gear.json'; + import DefaultApl from './apls/default.apl.json' // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); +export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear); + +export const DefaultRotation = Rotation.create({ + rotationType: ShadowPriest_Rotation_RotationType.Ideal, +}); + +export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const StandardTalents = { @@ -45,10 +60,6 @@ export const StandardTalents = { }), }; -export const DefaultRotation = Rotation.create({ - rotationType: ShadowPriest_Rotation_RotationType.Ideal, -}); - export const DefaultOptions = Options.create({ useShadowfiend: true, useMindBlast: true, @@ -99,100 +110,3 @@ export const DefaultDebuffs = Debuffs.create({ export const OtherDefaults = { channelClipDelay: 100, }; - -export const PreBis_PRESET = { - name: 'PreBis Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42553,"enchant":3820,"gems":[41285,40049]}, - {"id":40680}, - {"id":34210,"enchant":3810,"gems":[39998,40026]}, - {"id":41610,"enchant":3722}, - {"id":43792,"enchant":1144,"gems":[39998,40051]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":39530,"enchant":3604,"gems":[40049,0]}, - {"id":40696,"gems":[40049,39998]}, - {"id":37854,"enchant":3719}, - {"id":44202,"enchant":3826,"gems":[40026]}, - {"id":40585}, - {"id":37694}, - {"id":37835}, - {"id":37873}, - {"id":41384,"enchant":3834}, - {"id":40698}, - {"id":37177} - ]}`), -}; -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(` {"items": [ - {"id":40562,"enchant":3820,"gems":[41285,39998]}, - {"id":44661,"gems":[40026]}, - {"id":40459,"enchant":3810,"gems":[39998]}, - {"id":44005,"enchant":3722,"gems":[40026]}, - {"id":44002,"enchant":1144,"gems":[39998,39998]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40454,"enchant":3604,"gems":[40049,0]}, - {"id":40561,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40558,"enchant":3606}, - {"id":40719}, - {"id":40399}, - {"id":40255}, - {"id":40432}, - {"id":40395,"enchant":3834}, - {"id":40273}, - {"id":39712} - ]}`), -}; -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46172,"enchant":3820,"gems":[41285,45883]}, - {"id":45243,"gems":[39998]}, - {"id":46165,"enchant":3810,"gems":[39998]}, - {"id":45242,"enchant":3722,"gems":[40049]}, - {"id":46168,"enchant":1144,"gems":[39998,39998]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"enchant":3601,"gems":[39998,39998,39998]}, - {"id":46170,"enchant":3719,"gems":[39998,40049]}, - {"id":45135,"enchant":3606,"gems":[39998,40049]}, - {"id":45495,"gems":[40026]}, - {"id":46046,"gems":[39998]}, - {"id":45518}, - {"id":45466}, - {"id":45620,"enchant":3834,"gems":[40026]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ] - }`), -}; -export const P3_PRESET = { - name: 'P3 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48088,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":48091,"enchant":3810,"gems":[40155]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":48090,"enchant":1144,"gems":[40113,40133]}, - {"id":47467,"enchant":2332,"gems":[40155,0]}, - {"id":45665,"enchant":3604,"gems":[40113,40113,0]}, - {"id":47419,"enchant":3601,"gems":[40133,40113,40113]}, - {"id":48089,"enchant":3719,"gems":[40113,40133]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":47489,"gems":[40155]}, - {"id":45495,"gems":[40113]}, - {"id":45518}, - {"id":47477}, - {"id":47483,"enchant":3834}, - {"id":47437}, - {"id":47995} - ] - }`), -}; - -export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl); diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts index f8bd8c4d88..08a2a2bbea 100644 --- a/ui/shadow_priest/sim.ts +++ b/ui/shadow_priest/sim.ts @@ -133,7 +133,7 @@ export class ShadowPriestSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.PreBis_PRESET, + Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P2_PRESET, Presets.P3_PRESET, diff --git a/ui/smite_priest/gear_sets/p1.gear.json b/ui/smite_priest/gear_sets/p1.gear.json new file mode 100644 index 0000000000..c75d9bd640 --- /dev/null +++ b/ui/smite_priest/gear_sets/p1.gear.json @@ -0,0 +1,19 @@ +{"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} +]} \ No newline at end of file diff --git a/ui/smite_priest/gear_sets/preraid.gear.json b/ui/smite_priest/gear_sets/preraid.gear.json new file mode 100644 index 0000000000..62dc004dd2 --- /dev/null +++ b/ui/smite_priest/gear_sets/preraid.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":42553,"enchant":3820,"gems":[41333,40014]}, + {"id":40680}, + {"id":34210,"enchant":3810,"gems":[42144,40014]}, + {"id":41610,"enchant":3859}, + {"id":43792,"enchant":1144,"gems":[42144,40049]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":39285,"enchant":3246,"gems":[40014,0]}, + {"id":40696,"gems":[40049,39998]}, + {"id":37854,"enchant":3719}, + {"id":44202,"enchant":3826,"gems":[40026]}, + {"id":43253,"gems":[42144]}, + {"id":39250}, + {"id":37835}, + {"id":37873}, + {"id":41384,"enchant":3834}, + {"id":40698}, + {"id":37177} +]} \ No newline at end of file diff --git a/ui/smite_priest/presets.ts b/ui/smite_priest/presets.ts index af59a4184c..8230c407c6 100644 --- a/ui/smite_priest/presets.ts +++ b/ui/smite_priest/presets.ts @@ -1,7 +1,6 @@ import { Consumes, Debuffs, - EquipmentSpec, Flask, Food, Glyphs, @@ -22,7 +21,9 @@ import { } from '../core/proto/priest.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidGear from './gear_sets/preraid.gear.json'; +import P1Gear from './gear_sets/p1.gear.json'; import DefaultApl from './apls/default.apl.json' @@ -30,6 +31,17 @@ import DefaultApl from './apls/default.apl.json' // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. +export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear); +export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); + +export const DefaultRotation = Rotation.create({ + useDevouringPlague: true, + useShadowWordDeath: false, + useMindBlast: false, +}); +export const ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Legacy Default', Spec.SpecSmitePriest, DefaultRotation); +export const ROTATION_PRESET_APL = PresetUtils.makePresetAPLRotation('Default', DefaultApl); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const StandardTalents = { @@ -47,14 +59,6 @@ export const StandardTalents = { }), }; -export const DefaultRotation = Rotation.create({ - useDevouringPlague: true, - useShadowWordDeath: false, - useMindBlast: false, -}); -export const ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Legacy Default', Spec.SpecSmitePriest, DefaultRotation); -export const ROTATION_PRESET_APL = PresetUtils.makePresetAPLRotation('Default', DefaultApl); - export const DefaultOptions = Options.create({ useInnerFire: true, useShadowfiend: true, @@ -93,51 +97,3 @@ export const DefaultDebuffs = Debuffs.create({ heartOfTheCrusader: true, judgementOfWisdom: true, }); - -export const PRERAID_PRESET = { - name: 'Preraid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":42553,"enchant":3820,"gems":[41333,40014]}, - {"id":40680}, - {"id":34210,"enchant":3810,"gems":[42144,40014]}, - {"id":41610,"enchant":3859}, - {"id":43792,"enchant":1144,"gems":[42144,40049]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":39285,"enchant":3246,"gems":[40014,0]}, - {"id":40696,"gems":[40049,39998]}, - {"id":37854,"enchant":3719}, - {"id":44202,"enchant":3826,"gems":[40026]}, - {"id":43253,"gems":[42144]}, - {"id":39250}, - {"id":37835}, - {"id":37873}, - {"id":41384,"enchant":3834}, - {"id":40698}, - {"id":37177} - ]}`), -}; - -export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"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} - ]}`), -}; diff --git a/ui/tank_deathknight/gear_sets/p1_blood.gear.json b/ui/tank_deathknight/gear_sets/p1_blood.gear.json new file mode 100644 index 0000000000..ea1eabda49 --- /dev/null +++ b/ui/tank_deathknight/gear_sets/p1_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40565,"enchant":3878,"gems":[41380,36767]}, + {"id":40387}, + {"id":39704,"enchant":3852,"gems":[40008]}, + {"id":40252,"enchant":3605}, + {"id":40559,"gems":[40008,40022]}, + {"id":40306,"enchant":3850,"gems":[40008,0]}, + {"id":40563,"enchant":3860,"gems":[40008,0]}, + {"id":39759,"gems":[40008,40008]}, + {"id":40567,"enchant":3822,"gems":[40008,40008]}, + {"id":40297,"enchant":3232}, + {"id":40718}, + {"id":40107}, + {"id":44063,"gems":[36767,36767]}, + {"id":42341,"gems":[40008,40008]}, + {"id":40406,"enchant":3847}, + {}, + {"id":40207} +]} \ No newline at end of file diff --git a/ui/tank_deathknight/gear_sets/p1_frost.gear.json b/ui/tank_deathknight/gear_sets/p1_frost.gear.json new file mode 100644 index 0000000000..44c4db6cd4 --- /dev/null +++ b/ui/tank_deathknight/gear_sets/p1_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40565,"enchant":3878,"gems":[41380,36767]}, + {"id":40387}, + {"id":40568,"enchant":3852,"gems":[40008]}, + {"id":40252,"enchant":3605}, + {"id":40559,"gems":[40008,40022]}, + {"id":40306,"enchant":3850,"gems":[40008,0]}, + {"id":40563,"enchant":3860,"gems":[40008,0]}, + {"id":39759,"gems":[40008,40008]}, + {"id":40589,"enchant":3822}, + {"id":40297,"enchant":3232}, + {"id":40718}, + {"id":40107}, + {"id":44063,"gems":[36767,36767]}, + {"id":40257}, + {"id":40345,"enchant":3370}, + {"id":40345,"enchant":3368}, + {"id":40714} +]} \ No newline at end of file diff --git a/ui/tank_deathknight/gear_sets/p2_blood.gear.json b/ui/tank_deathknight/gear_sets/p2_blood.gear.json new file mode 100644 index 0000000000..26246905de --- /dev/null +++ b/ui/tank_deathknight/gear_sets/p2_blood.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46120,"enchant":3878,"gems":[41380,36767]}, + {"id":45485,"gems":[40008]}, + {"id":46122,"enchant":3852,"gems":[40008]}, + {"id":45496,"enchant":3605,"gems":[40022]}, + {"id":46118,"gems":[36767,36767]}, + {"id":45111,"enchant":3850,"gems":[0]}, + {"id":46119,"enchant":3860,"gems":[40008,0]}, + {"id":45551,"gems":[40008,40008,40008]}, + {"id":45594,"enchant":3822,"gems":[40008,40008,40008]}, + {"id":45988,"enchant":3232,"gems":[40008,40008]}, + {"id":45471,"gems":[40008]}, + {"id":45326}, + {"id":45158}, + {"id":46021}, + {"id":45533,"enchant":3370,"gems":[40008,40008]}, + {}, + {"id":45144} +]} \ No newline at end of file diff --git a/ui/tank_deathknight/gear_sets/p2_frost.gear.json b/ui/tank_deathknight/gear_sets/p2_frost.gear.json new file mode 100644 index 0000000000..d7ae18a959 --- /dev/null +++ b/ui/tank_deathknight/gear_sets/p2_frost.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46120,"enchant":3878,"gems":[41380,36767]}, + {"id":45485,"gems":[40008]}, + {"id":46122,"enchant":3852,"gems":[40008]}, + {"id":45496,"enchant":3605,"gems":[40022]}, + {"id":46118,"gems":[36767,36767]}, + {"id":45111,"enchant":3850,"gems":[0]}, + {"id":46119,"enchant":3860,"gems":[40008,0]}, + {"id":45551,"gems":[40008,40008,40008]}, + {"id":45594,"enchant":3822,"gems":[40008,40008,40008]}, + {"id":45988,"enchant":3232,"gems":[40008,40008]}, + {"id":45471,"gems":[40008]}, + {"id":45326}, + {"id":45158}, + {"id":46021}, + {"id":46097,"enchant":3370,"gems":[40008]}, + {"id":46097,"enchant":3368,"gems":[40008]}, + {"id":45144} +]} \ No newline at end of file diff --git a/ui/tank_deathknight/presets.ts b/ui/tank_deathknight/presets.ts index 2b0d0b95cc..9fb7b3b988 100644 --- a/ui/tank_deathknight/presets.ts +++ b/ui/tank_deathknight/presets.ts @@ -1,6 +1,5 @@ import { Consumes, - EquipmentSpec, Flask, Food, Glyphs, @@ -21,11 +20,31 @@ import { } from '../core/proto/deathknight.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import P1BloodGear from './gear_sets/p1_blood.gear.json'; +import P2BloodGear from './gear_sets/p2_blood.gear.json'; +import P1FrostGear from './gear_sets/p1_frost.gear.json'; +import P2FrostGear from './gear_sets/p2_frost.gear.json'; import BloodAggroApl from './apls/blood_aggro.apl.json'; import BloodIcyTouchApl from './apls/blood_icy_touch.apl.json'; +export const P1_BLOOD_PRESET = PresetUtils.makePresetGear('P1 Blood', P1BloodGear); +export const P2_BLOOD_PRESET = PresetUtils.makePresetGear('P2 Blood', P2BloodGear); +export const P1_FROST_PRESET = PresetUtils.makePresetGear('P1 Frost', P1FrostGear); +export const P2_FROST_PRESET = PresetUtils.makePresetGear('P2 Frost', P2FrostGear); + +export const DefaultRotation = TankDeathKnightRotation.create({ + opener: Opener.Threat, + optimizationSetting: OptimizationSetting.Hps, + bloodSpell: BloodSpell.BloodStrike, + presence: Presence.Frost, +}); + +export const BLOOD_LEGACY_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Blood Legacy', Spec.SpecTankDeathknight, DefaultRotation); +export const BLOOD_IT_SPAM_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Icy Touch', BloodIcyTouchApl); +export const BLOOD_AGGRO_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Aggro', BloodAggroApl); + export const BloodTalents = { name: 'Blood', data: SavedTalents.create({ @@ -101,13 +120,6 @@ export const DoubleBuffFrostTalents = { }), }; -export const DefaultRotation = TankDeathKnightRotation.create({ - opener: Opener.Threat, - optimizationSetting: OptimizationSetting.Hps, - bloodSpell: BloodSpell.BloodStrike, - presence: Presence.Frost, -}); - export const DefaultOptions = TankDeathKnightOptions.create({ startingRunicPower: 0, }); @@ -118,103 +130,3 @@ export const DefaultConsumes = Consumes.create({ defaultPotion: Potions.IndestructiblePotion, prepopPotion: Potions.IndestructiblePotion, }); - -export const BLOOD_LEGACY_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Blood Legacy', Spec.SpecTankDeathknight, DefaultRotation); -export const BLOOD_IT_SPAM_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Icy Touch', BloodIcyTouchApl); -export const BLOOD_AGGRO_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Aggro', BloodAggroApl); - -export const P1_BLOOD_PRESET = { - name: 'P1 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":40565,"enchant":3878,"gems":[41380,36767]}, - {"id":40387}, - {"id":39704,"enchant":3852,"gems":[40008]}, - {"id":40252,"enchant":3605}, - {"id":40559,"gems":[40008,40022]}, - {"id":40306,"enchant":3850,"gems":[40008,0]}, - {"id":40563,"enchant":3860,"gems":[40008,0]}, - {"id":39759,"gems":[40008,40008]}, - {"id":40567,"enchant":3822,"gems":[40008,40008]}, - {"id":40297,"enchant":3232}, - {"id":40718}, - {"id":40107}, - {"id":44063,"gems":[36767,36767]}, - {"id":42341,"gems":[40008,40008]}, - {"id":40406,"enchant":3847}, - {}, - {"id":40207} - ]}`), -}; - -export const P2_BLOOD_PRESET = { - name: 'P2 Blood', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46120,"enchant":3878,"gems":[41380,36767]}, - {"id":45485,"gems":[40008]}, - {"id":46122,"enchant":3852,"gems":[40008]}, - {"id":45496,"enchant":3605,"gems":[40022]}, - {"id":46118,"gems":[36767,36767]}, - {"id":45111,"enchant":3850,"gems":[0]}, - {"id":46119,"enchant":3860,"gems":[40008,0]}, - {"id":45551,"gems":[40008,40008,40008]}, - {"id":45594,"enchant":3822,"gems":[40008,40008,40008]}, - {"id":45988,"enchant":3232,"gems":[40008,40008]}, - {"id":45471,"gems":[40008]}, - {"id":45326}, - {"id":45158}, - {"id":46021}, - {"id":45533,"enchant":3370,"gems":[40008,40008]}, - {}, - {"id":45144} - ]}`), -}; - -export const P1_FROST_PRESET = { - name: 'P1 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":40565,"enchant":3878,"gems":[41380,36767]}, - {"id":40387}, - {"id":40568,"enchant":3852,"gems":[40008]}, - {"id":40252,"enchant":3605}, - {"id":40559,"gems":[40008,40022]}, - {"id":40306,"enchant":3850,"gems":[40008,0]}, - {"id":40563,"enchant":3860,"gems":[40008,0]}, - {"id":39759,"gems":[40008,40008]}, - {"id":40589,"enchant":3822}, - {"id":40297,"enchant":3232}, - {"id":40718}, - {"id":40107}, - {"id":44063,"gems":[36767,36767]}, - {"id":40257}, - {"id":40345,"enchant":3370}, - {"id":40345,"enchant":3368}, - {"id":40714} - ]}`), -}; - -export const P2_FROST_PRESET = { - name: 'P2 Frost', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46120,"enchant":3878,"gems":[41380,36767]}, - {"id":45485,"gems":[40008]}, - {"id":46122,"enchant":3852,"gems":[40008]}, - {"id":45496,"enchant":3605,"gems":[40022]}, - {"id":46118,"gems":[36767,36767]}, - {"id":45111,"enchant":3850,"gems":[0]}, - {"id":46119,"enchant":3860,"gems":[40008,0]}, - {"id":45551,"gems":[40008,40008,40008]}, - {"id":45594,"enchant":3822,"gems":[40008,40008,40008]}, - {"id":45988,"enchant":3232,"gems":[40008,40008]}, - {"id":45471,"gems":[40008]}, - {"id":45326}, - {"id":45158}, - {"id":46021}, - {"id":46097,"enchant":3370,"gems":[40008]}, - {"id":46097,"enchant":3368,"gems":[40008]}, - {"id":45144} - ]}`), -}; diff --git a/ui/warlock/gear_sets/p1_affliction.gear.json b/ui/warlock/gear_sets/p1_affliction.gear.json new file mode 100644 index 0000000000..3cb6b40768 --- /dev/null +++ b/ui/warlock/gear_sets/p1_affliction.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40421,"enchant":3820,"gems":[41285,40051]}, + {"id":44661,"gems":[40026]}, + {"id":40424,"enchant":3810,"gems":[39998]}, + {"id":44005,"enchant":3722,"gems":[40026]}, + {"id":40423,"enchant":3832,"gems":[39998,40051]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40420,"enchant":3604,"gems":[39998,0]}, + {"id":40561,"gems":[39998]}, + {"id":40560,"enchant":3719}, + {"id":40558,"enchant":3606}, + {"id":40399}, + {"id":40719}, + {"id":40432}, + {"id":40255}, + {"id":40396,"enchant":3834}, + {"id":39766}, + {"id":39712} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p1_demodestro.gear.json b/ui/warlock/gear_sets/p1_demodestro.gear.json new file mode 100644 index 0000000000..45ec35d42a --- /dev/null +++ b/ui/warlock/gear_sets/p1_demodestro.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40421,"enchant":3820,"gems":[41285,40014]}, + {"id":44661,"gems":[40099]}, + {"id":40424,"enchant":3810,"gems":[40049]}, + {"id":44005,"enchant":3722,"gems":[40099]}, + {"id":40423,"enchant":3832,"gems":[40049,40014]}, + {"id":44008,"enchant":2332,"gems":[39998,0]}, + {"id":40420,"enchant":3604,"gems":[39998,0]}, + {"id":40561,"gems":[40014]}, + {"id":40560,"enchant":3719}, + {"id":40558,"enchant":3606}, + {"id":40399}, + {"id":40719}, + {"id":40432}, + {"id":40255}, + {"id":40396,"enchant":3834}, + {"id":39766}, + {"id":39712} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p2_affliction.gear.json b/ui/warlock/gear_sets/p2_affliction.gear.json new file mode 100644 index 0000000000..006c9a98cf --- /dev/null +++ b/ui/warlock/gear_sets/p2_affliction.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,45883]}, + {"id":45133,"gems":[40051]}, + {"id":46068,"enchant":3810,"gems":[39998,40049]}, + {"id":45618,"enchant":3722,"gems":[40026]}, + {"id":46137,"enchant":1144,"gems":[39998,40014]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"enchant":3601,"gems":[40051,40051,39998]}, + {"id":46139,"enchant":3872,"gems":[39998,39998]}, + {"id":45135,"enchant":3606,"gems":[39998,40051]}, + {"id":45495,"gems":[40026]}, + {"id":46046,"gems":[39998]}, + {"id":45518}, + {"id":45466}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":45294,"gems":[40051]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p2_demodestro.gear.json b/ui/warlock/gear_sets/p2_demodestro.gear.json new file mode 100644 index 0000000000..760b1c8a7e --- /dev/null +++ b/ui/warlock/gear_sets/p2_demodestro.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":45497,"enchant":3820,"gems":[41285,45883]}, + {"id":45243,"gems":[39998]}, + {"id":46068,"enchant":3810,"gems":[39998,40051]}, + {"id":45618,"enchant":3722,"gems":[40026]}, + {"id":46137,"enchant":1144,"gems":[39998,40051]}, + {"id":45446,"enchant":2332,"gems":[39998,0]}, + {"id":45520,"enchant":3604,"gems":[39998,39998,0]}, + {"id":45619,"enchant":3601,"gems":[39998,39998,39998]}, + {"id":46139,"enchant":3872,"gems":[39998,39998]}, + {"id":45135,"enchant":3606,"gems":[39998,39998]}, + {"id":45495,"gems":[40026]}, + {"id":45297,"gems":[39998]}, + {"id":45518}, + {"id":45148}, + {"id":45620,"enchant":3834,"gems":[39998]}, + {"id":45617}, + {"id":45294,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_affliction_alliance.gear.json b/ui/warlock/gear_sets/p3_affliction_alliance.gear.json new file mode 100644 index 0000000000..71918f3a8e --- /dev/null +++ b/ui/warlock/gear_sets/p3_affliction_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47789,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47792,"enchant":3810,"gems":[40155]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":47129,"enchant":1144,"gems":[40133,40155,40113]}, + {"id":47208,"enchant":2332,"gems":[40113,0]}, + {"id":47788,"enchant":3604,"gems":[40113,0]}, + {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47790,"enchant":3872,"gems":[40113,40155]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40113]}, + {"id":47237,"gems":[40155]}, + {"id":45518}, + {"id":45466}, + {"id":46980,"enchant":3834,"gems":[40113]}, + {"id":47958,"gems":[40155]}, + {"id":45294,"gems":[40155]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_affliction_horde.gear.json b/ui/warlock/gear_sets/p3_affliction_horde.gear.json new file mode 100644 index 0000000000..42b2106d98 --- /dev/null +++ b/ui/warlock/gear_sets/p3_affliction_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47796,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40155]}, + {"id":47793,"enchant":3810,"gems":[40155]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47462,"enchant":1144,"gems":[40133,40155,40113]}, + {"id":47485,"enchant":2332,"gems":[40113,0]}, + {"id":47797,"enchant":3604,"gems":[40113,0]}, + {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47795,"enchant":3872,"gems":[40113,40153]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40113]}, + {"id":47489,"gems":[40155]}, + {"id":45518}, + {"id":45466}, + {"id":47422,"enchant":3834,"gems":[40113]}, + {"id":48032,"gems":[40155]}, + {"id":45294,"gems":[40051]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_demo_alliance.gear.json b/ui/warlock/gear_sets/p3_demo_alliance.gear.json new file mode 100644 index 0000000000..ef4535b1d3 --- /dev/null +++ b/ui/warlock/gear_sets/p3_demo_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47789,"enchant":3820,"gems":[41285,40133]}, + {"id":45243,"gems":[40113]}, + {"id":47792,"enchant":3810,"gems":[40153]}, + {"id":47553,"enchant":3722,"gems":[40113]}, + {"id":47791,"enchant":1144,"gems":[40153,40133]}, + {"id":47208,"enchant":2332,"gems":[40133,0]}, + {"id":47788,"enchant":3604,"gems":[40113,0]}, + {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47062,"enchant":3872,"gems":[40113,40133,40133]}, + {"id":47097,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47237,"gems":[40153]}, + {"id":45518}, + {"id":40255}, + {"id":46980,"enchant":3834,"gems":[40133]}, + {"id":47146}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_demo_horde.gear.json b/ui/warlock/gear_sets/p3_demo_horde.gear.json new file mode 100644 index 0000000000..e9a8e83d46 --- /dev/null +++ b/ui/warlock/gear_sets/p3_demo_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47796,"enchant":3820,"gems":[41285,40133]}, + {"id":45133,"gems":[40153]}, + {"id":47793,"enchant":3810,"gems":[40113]}, + {"id":47554,"enchant":3722,"gems":[40113]}, + {"id":47794,"enchant":1144,"gems":[40113,40133]}, + {"id":47485,"enchant":2332,"gems":[40133,0]}, + {"id":47797,"enchant":3604,"gems":[40113,0]}, + {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40113]}, + {"id":45518}, + {"id":40255}, + {"id":47422,"enchant":3834,"gems":[40133]}, + {"id":47470}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_destro_alliance.gear.json b/ui/warlock/gear_sets/p3_destro_alliance.gear.json new file mode 100644 index 0000000000..519561e318 --- /dev/null +++ b/ui/warlock/gear_sets/p3_destro_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47789,"enchant":3820,"gems":[41285,40133]}, + {"id":47144,"gems":[40155]}, + {"id":47792,"enchant":3810,"gems":[40155]}, + {"id":47552,"enchant":3722,"gems":[40113]}, + {"id":47129,"enchant":1144,"gems":[40133,40155,40113]}, + {"id":47208,"enchant":2332,"gems":[40133,0]}, + {"id":47788,"enchant":3604,"gems":[40113,0]}, + {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47790,"enchant":3872,"gems":[40113,40155]}, + {"id":47205,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47237,"gems":[40155]}, + {"id":45518}, + {"id":47188}, + {"id":46980,"enchant":3834,"gems":[40133]}, + {"id":47958,"gems":[40155]}, + {"id":45294,"gems":[40155]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/p3_destro_horde.gear.json b/ui/warlock/gear_sets/p3_destro_horde.gear.json new file mode 100644 index 0000000000..23ba7b6558 --- /dev/null +++ b/ui/warlock/gear_sets/p3_destro_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":47796,"enchant":3820,"gems":[41285,40133]}, + {"id":47468,"gems":[40153]}, + {"id":47793,"enchant":3810,"gems":[40155]}, + {"id":47551,"enchant":3722,"gems":[40113]}, + {"id":47794,"enchant":1144,"gems":[40113,40133]}, + {"id":47467,"enchant":2332,"gems":[40153,0]}, + {"id":47797,"enchant":3604,"gems":[40113,0]}, + {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, + {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, + {"id":47454,"enchant":3606,"gems":[40133,40113]}, + {"id":45495,"gems":[40133]}, + {"id":47489,"gems":[40155]}, + {"id":45518}, + {"id":47477}, + {"id":47422,"enchant":3834,"gems":[40133]}, + {"id":47437}, + {"id":45294,"gems":[40113]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/preraid_affliction.gear.json b/ui/warlock/gear_sets/preraid_affliction.gear.json new file mode 100644 index 0000000000..8f485bd928 --- /dev/null +++ b/ui/warlock/gear_sets/preraid_affliction.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44910,"enchant":3820,"gems":[41285,39998]}, + {"id":42647,"gems":[39998]}, + {"id":34210,"enchant":3810,"gems":[39998,40051]}, + {"id":41610,"enchant":3722}, + {"id":39497,"enchant":3832,"gems":[39998,40051]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":42113,"enchant":3604,"gems":[0]}, + {"id":40696,"gems":[40051,39998]}, + {"id":34181,"enchant":3719,"gems":[39998,39998,40051]}, + {"id":44202,"enchant":3606,"gems":[40026]}, + {"id":43253,"gems":[40026]}, + {"id":37694}, + {"id":40682}, + {"id":37873}, + {"id":45085,"enchant":3834}, + {"id":40698}, + {"id":34348,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/preraid_demodestro.gear.json b/ui/warlock/gear_sets/preraid_demodestro.gear.json new file mode 100644 index 0000000000..49139cf5a0 --- /dev/null +++ b/ui/warlock/gear_sets/preraid_demodestro.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44910,"enchant":3820,"gems":[41285,39998]}, + {"id":42647,"gems":[40049]}, + {"id":34210,"enchant":3810,"gems":[39998,40014]}, + {"id":41610,"enchant":3722}, + {"id":39497,"enchant":3832,"gems":[39998,40014]}, + {"id":37361,"enchant":2332,"gems":[0]}, + {"id":42113,"enchant":3604,"gems":[0]}, + {"id":40696,"gems":[40014,39998]}, + {"id":34181,"enchant":3719,"gems":[39998,39998,40014]}, + {"id":44202,"enchant":3606,"gems":[40026]}, + {"id":43253,"gems":[40026]}, + {"id":37694}, + {"id":40682}, + {"id":37873}, + {"id":45085,"enchant":3834}, + {"id":40698}, + {"id":34348,"gems":[39998]} +]} \ No newline at end of file diff --git a/ui/warlock/gear_sets/swp.gear.json b/ui/warlock/gear_sets/swp.gear.json new file mode 100644 index 0000000000..98ab8b3ea5 --- /dev/null +++ b/ui/warlock/gear_sets/swp.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":34340,"enchant":3002,"gems":[34220,32215]}, + {"id":34204}, + {"id":31054,"enchant":2982,"gems":[32215,35760]}, + {"id":34242,"enchant":2621,"gems":[32196]}, + {"id":34364,"enchant":2661,"gems":[32196,35488,32196]}, + {"id":34436,"enchant":2650,"gems":[35760,0]}, + {"id":34344,"enchant":2937,"gems":[35760,32196,0]}, + {"id":34541,"gems":[35760,0]}, + {"id":34181,"enchant":2748,"gems":[32196,32196,35760]}, + {"id":34564,"enchant":2940,"gems":[35760]}, + {"id":34362,"enchant":2928}, + {"id":34230,"enchant":2928}, + {"id":32483}, + {"id":34429}, + {"id":34336,"enchant":2672}, + {"id":34179}, + {"id":34347,"gems":[35760]} +]} \ No newline at end of file diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts index d946e05eb9..1f8f03c272 100644 --- a/ui/warlock/presets.ts +++ b/ui/warlock/presets.ts @@ -4,7 +4,6 @@ import { Food, PetFood, Glyphs, - EquipmentSpec, Potions, RaidBuffs, IndividualBuffs, @@ -14,7 +13,6 @@ import { Spec, Profession, } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Player } from '../core/player.js'; import { Warlock_Rotation as WarlockRotation, @@ -32,11 +30,74 @@ import { import * as PresetUtils from '../core/preset_utils.js'; +import SwpGear from './gear_sets/swp.gear.json'; +import PreraidAfflictionGear from './gear_sets/preraid_affliction.gear.json'; +import P1AfflictionGear from './gear_sets/p1_affliction.gear.json'; +import P2AfflictionGear from './gear_sets/p2_affliction.gear.json'; +import P3AfflictionAllianceGear from './gear_sets/p3_affliction_alliance.gear.json'; +import P3AfflictionHordeGear from './gear_sets/p3_affliction_horde.gear.json'; +import PreraidDemoDestroGear from './gear_sets/preraid_demodestro.gear.json'; +import P1DemoDestroGear from './gear_sets/p1_demodestro.gear.json'; +import P2DemoDestroGear from './gear_sets/p2_demodestro.gear.json'; +import P3DemoAllianceGear from './gear_sets/p3_demo_alliance.gear.json'; +import P3DemoHordeGear from './gear_sets/p3_demo_horde.gear.json'; +import P3DestroAllianceGear from './gear_sets/p3_destro_alliance.gear.json'; +import P3DestroHordeGear from './gear_sets/p3_destro_horde.gear.json'; + import DemoApl from './apls/demo.apl.json'; import DestroApl from './apls/destro.apl.json'; export const BIS_TOOLTIP = 'This gear preset is inspired from Zephan\'s Affliction guide: https://www.warcrafttavern.com/wotlk/guides/pve-affliction-warlock/'; +export const SWP_BIS = PresetUtils.makePresetGear('Straight Outa SWP', SwpGear); +export const PRERAID_AFFLICTION_PRESET = PresetUtils.makePresetGear('Preraid Affliction', PreraidAfflictionGear, { tooltip: BIS_TOOLTIP, talentTree: 0 }); +export const P1_AFFLICTION_PRESET = PresetUtils.makePresetGear('P1 Affliction', P1AfflictionGear, { tooltip: BIS_TOOLTIP, talentTree: 0 }); +export const P2_AFFLICTION_PRESET = PresetUtils.makePresetGear('P2 Affliction', P2AfflictionGear, { tooltip: BIS_TOOLTIP, talentTree: 0 }); +export const P3_AFFLICTION_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Affliction [A]', P3AfflictionAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 0, faction: Faction.Alliance }); +export const P3_AFFLICTION_HORDE_PRESET = PresetUtils.makePresetGear('P3 Affliction [H]', P3AfflictionHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 0, faction: Faction.Horde }); +export const PRERAID_DEMODESTRO_PRESET = PresetUtils.makePresetGear('Preraid Demo/Destro', PreraidDemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); +export const P1_DEMODESTRO_PRESET = PresetUtils.makePresetGear('P1 Demo/Destro', P1DemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); +export const P2_DEMODESTRO_PRESET = PresetUtils.makePresetGear('P2 Demo/Destro', P2DemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); +export const P3_DEMO_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Demo [A]', P3DemoAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 1, faction: Faction.Alliance }); +export const P3_DEMO_HORDE_PRESET = PresetUtils.makePresetGear('P3 Demo [H]', P3DemoHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 1, faction: Faction.Horde }); +export const P3_DESTRO_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Destro [A]', P3DestroAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 2, faction: Faction.Alliance }); +export const P3_DESTRO_HORDE_PRESET = PresetUtils.makePresetGear('P3 Destro [H]', P3DestroHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 2, faction: Faction.Horde }); + +export const AfflictionRotation = WarlockRotation.create({ + primarySpell: PrimarySpell.ShadowBolt, + secondaryDot: SecondaryDot.UnstableAffliction, + specSpell: SpecSpell.Haunt, + curse: Curse.Agony, + corruption: true, + useInfernal: false, + detonateSeed: true, +}); + +export const DemonologyRotation = WarlockRotation.create({ + primarySpell: PrimarySpell.ShadowBolt, + secondaryDot: SecondaryDot.Immolate, + specSpell: SpecSpell.NoSpecSpell, + curse: Curse.Doom, + corruption: true, + useInfernal: false, + detonateSeed: true, +}); + +export const DestructionRotation = WarlockRotation.create({ + primarySpell: PrimarySpell.Incinerate, + secondaryDot: SecondaryDot.Immolate, + specSpell: SpecSpell.ChaosBolt, + curse: Curse.Doom, + corruption: false, + useInfernal: false, + detonateSeed: true, +}); + +export const APL_Demo_Legacy = PresetUtils.makePresetLegacyRotation('Demo Legacy', Spec.SpecWarlock, DemonologyRotation); +export const APL_Demo_Default = PresetUtils.makePresetAPLRotation('Demo', DemoApl, { talentTree: 1 }); +export const APL_Destro_Legacy = PresetUtils.makePresetLegacyRotation('Destro Legacy', Spec.SpecWarlock, DestructionRotation); +export const APL_Destro_Default = PresetUtils.makePresetAPLRotation('Destro', DestroApl, { talentTree: 2 }); + // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. @@ -85,36 +146,6 @@ export const DestructionTalents = { }), }; -export const AfflictionRotation = WarlockRotation.create({ - primarySpell: PrimarySpell.ShadowBolt, - secondaryDot: SecondaryDot.UnstableAffliction, - specSpell: SpecSpell.Haunt, - curse: Curse.Agony, - corruption: true, - useInfernal: false, - detonateSeed: true, -}); - -export const DemonologyRotation = WarlockRotation.create({ - primarySpell: PrimarySpell.ShadowBolt, - secondaryDot: SecondaryDot.Immolate, - specSpell: SpecSpell.NoSpecSpell, - curse: Curse.Doom, - corruption: true, - useInfernal: false, - detonateSeed: true, -}); - -export const DestructionRotation = WarlockRotation.create({ - primarySpell: PrimarySpell.Incinerate, - secondaryDot: SecondaryDot.Immolate, - specSpell: SpecSpell.ChaosBolt, - curse: Curse.Doom, - corruption: false, - useInfernal: false, - detonateSeed: true, -}); - export const AfflictionOptions = WarlockOptions.create({ armor: Armor.FelArmor, summon: Summon.Felhunter, @@ -196,338 +227,3 @@ export const OtherDefaults = { profession2: Profession.Tailoring, channelClipDelay: 150, }; - -export const SWP_BIS = { - name: 'Straight Outa SWP', - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":34340,"enchant":3002,"gems":[34220,32215]}, - {"id":34204}, - {"id":31054,"enchant":2982,"gems":[32215,35760]}, - {"id":34242,"enchant":2621,"gems":[32196]}, - {"id":34364,"enchant":2661,"gems":[32196,35488,32196]}, - {"id":34436,"enchant":2650,"gems":[35760,0]}, - {"id":34344,"enchant":2937,"gems":[35760,32196,0]}, - {"id":34541,"gems":[35760,0]}, - {"id":34181,"enchant":2748,"gems":[32196,32196,35760]}, - {"id":34564,"enchant":2940,"gems":[35760]}, - {"id":34362,"enchant":2928}, - {"id":34230,"enchant":2928}, - {"id":32483}, - {"id":34429}, - {"id":34336,"enchant":2672}, - {"id":34179}, - {"id":34347,"gems":[35760]} - ]}`), -}; -export const P1_PreBiS_11 = { - name: 'Pre-Raid Affliction', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":44910,"enchant":3820,"gems":[41285,39998]}, - {"id":42647,"gems":[39998]}, - {"id":34210,"enchant":3810,"gems":[39998,40051]}, - {"id":41610,"enchant":3722}, - {"id":39497,"enchant":3832,"gems":[39998,40051]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":42113,"enchant":3604,"gems":[0]}, - {"id":40696,"gems":[40051,39998]}, - {"id":34181,"enchant":3719,"gems":[39998,39998,40051]}, - {"id":44202,"enchant":3606,"gems":[40026]}, - {"id":43253,"gems":[40026]}, - {"id":37694}, - {"id":40682}, - {"id":37873}, - {"id":45085,"enchant":3834}, - {"id":40698}, - {"id":34348,"gems":[39998]} - ]}`), -} -export const P1_Preset_Demo_Destro = { - name: 'P1 Demo / Destro', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() > 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40421,"enchant":3820,"gems":[41285,40014]}, - {"id":44661,"gems":[40099]}, - {"id":40424,"enchant":3810,"gems":[40049]}, - {"id":44005,"enchant":3722,"gems":[40099]}, - {"id":40423,"enchant":3832,"gems":[40049,40014]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40420,"enchant":3604,"gems":[39998,0]}, - {"id":40561,"gems":[40014]}, - {"id":40560,"enchant":3719}, - {"id":40558,"enchant":3606}, - {"id":40399}, - {"id":40719}, - {"id":40432}, - {"id":40255}, - {"id":40396,"enchant":3834}, - {"id":39766}, - {"id":39712} - ]}`), -} - - -// will have only rare gems, but a Lightweave Embroidery on cloak. -export const P1_Preset_Affliction = { - name: 'P1 Affliction', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40421,"enchant":3820,"gems":[41285,40051]}, - {"id":44661,"gems":[40026]}, - {"id":40424,"enchant":3810,"gems":[39998]}, - {"id":44005,"enchant":3722,"gems":[40026]}, - {"id":40423,"enchant":3832,"gems":[39998,40051]}, - {"id":44008,"enchant":2332,"gems":[39998,0]}, - {"id":40420,"enchant":3604,"gems":[39998,0]}, - {"id":40561,"gems":[39998]}, - {"id":40560,"enchant":3719}, - {"id":40558,"enchant":3606}, - {"id":40399}, - {"id":40719}, - {"id":40432}, - {"id":40255}, - {"id":40396,"enchant":3834}, - {"id":39766}, - {"id":39712} - ]}`), -} - - -export const P1_PreBiS_14 = { - name: 'Pre-Raid', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() > 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":44910,"enchant":3820,"gems":[41285,39998]}, - {"id":42647,"gems":[40049]}, - {"id":34210,"enchant":3810,"gems":[39998,40014]}, - {"id":41610,"enchant":3722}, - {"id":39497,"enchant":3832,"gems":[39998,40014]}, - {"id":37361,"enchant":2332,"gems":[0]}, - {"id":42113,"enchant":3604,"gems":[0]}, - {"id":40696,"gems":[40014,39998]}, - {"id":34181,"enchant":3719,"gems":[39998,39998,40014]}, - {"id":44202,"enchant":3606,"gems":[40026]}, - {"id":43253,"gems":[40026]}, - {"id":37694}, - {"id":40682}, - {"id":37873}, - {"id":45085,"enchant":3834}, - {"id":40698}, - {"id":34348,"gems":[39998]} - ]}`), -} - -export const P2_Preset_Affliction = { - name: 'P2 Affliction', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,45883]}, - {"id":45133,"gems":[40051]}, - {"id":46068,"enchant":3810,"gems":[39998,40049]}, - {"id":45618,"enchant":3722,"gems":[40026]}, - {"id":46137,"enchant":1144,"gems":[39998,40014]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45665,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"enchant":3601,"gems":[40051,40051,39998]}, - {"id":46139,"enchant":3872,"gems":[39998,39998]}, - {"id":45135,"enchant":3606,"gems":[39998,40051]}, - {"id":45495,"gems":[40026]}, - {"id":46046,"gems":[39998]}, - {"id":45518}, - {"id":45466}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":45294,"gems":[40051]} - ]}`), -} - -export const P2_Preset_Demo_Destro = { - name: 'P2 Demo / Destro', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() > 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":45497,"enchant":3820,"gems":[41285,45883]}, - {"id":45243,"gems":[39998]}, - {"id":46068,"enchant":3810,"gems":[39998,40051]}, - {"id":45618,"enchant":3722,"gems":[40026]}, - {"id":46137,"enchant":1144,"gems":[39998,40051]}, - {"id":45446,"enchant":2332,"gems":[39998,0]}, - {"id":45520,"enchant":3604,"gems":[39998,39998,0]}, - {"id":45619,"enchant":3601,"gems":[39998,39998,39998]}, - {"id":46139,"enchant":3872,"gems":[39998,39998]}, - {"id":45135,"enchant":3606,"gems":[39998,39998]}, - {"id":45495,"gems":[40026]}, - {"id":45297,"gems":[39998]}, - {"id":45518}, - {"id":45148}, - {"id":45620,"enchant":3834,"gems":[39998]}, - {"id":45617}, - {"id":45294,"gems":[39998]} - ]}`), -} - -export const P3_Preset_Affliction_Horde = { - name: 'P3 Affliction [H]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 0 - && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40155]}, - {"id":47793,"enchant":3810,"gems":[40155]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47462,"enchant":1144,"gems":[40133,40155,40113]}, - {"id":47485,"enchant":2332,"gems":[40113,0]}, - {"id":47797,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47795,"enchant":3872,"gems":[40113,40153]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40113]}, - {"id":47489,"gems":[40155]}, - {"id":45518}, - {"id":45466}, - {"id":47422,"enchant":3834,"gems":[40113]}, - {"id":48032,"gems":[40155]}, - {"id":45294,"gems":[40051]} - ]}`), -} - -export const P3_Preset_Affliction_Alliance = { - name: 'P3 Affliction [A]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 0 - && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47789,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47792,"enchant":3810,"gems":[40155]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":47129,"enchant":1144,"gems":[40133,40155,40113]}, - {"id":47208,"enchant":2332,"gems":[40113,0]}, - {"id":47788,"enchant":3604,"gems":[40113,0]}, - {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47790,"enchant":3872,"gems":[40113,40155]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40113]}, - {"id":47237,"gems":[40155]}, - {"id":45518}, - {"id":45466}, - {"id":46980,"enchant":3834,"gems":[40113]}, - {"id":47958,"gems":[40155]}, - {"id":45294,"gems":[40155]} - ]}`), -} - -export const P3_Preset_Demo_Horde = { - name: 'P3 Demo [H]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 1 - && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":45133,"gems":[40153]}, - {"id":47793,"enchant":3810,"gems":[40113]}, - {"id":47554,"enchant":3722,"gems":[40113]}, - {"id":47794,"enchant":1144,"gems":[40113,40133]}, - {"id":47485,"enchant":2332,"gems":[40133,0]}, - {"id":47797,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40113]}, - {"id":45518}, - {"id":40255}, - {"id":47422,"enchant":3834,"gems":[40133]}, - {"id":47470}, - {"id":45294,"gems":[40113]} - ]}`), -} - -export const P3_Preset_Demo_Alliance = { - name: 'P3 Demo [A]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 1 - && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47789,"enchant":3820,"gems":[41285,40133]}, - {"id":45243,"gems":[40113]}, - {"id":47792,"enchant":3810,"gems":[40153]}, - {"id":47553,"enchant":3722,"gems":[40113]}, - {"id":47791,"enchant":1144,"gems":[40153,40133]}, - {"id":47208,"enchant":2332,"gems":[40133,0]}, - {"id":47788,"enchant":3604,"gems":[40113,0]}, - {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47062,"enchant":3872,"gems":[40113,40133,40133]}, - {"id":47097,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47237,"gems":[40153]}, - {"id":45518}, - {"id":40255}, - {"id":46980,"enchant":3834,"gems":[40133]}, - {"id":47146}, - {"id":45294,"gems":[40113]} - ]}`), -} - -export const P3_Preset_Destro_Horde = { - name: 'P3 Destro [H]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 2 - && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47796,"enchant":3820,"gems":[41285,40133]}, - {"id":47468,"gems":[40153]}, - {"id":47793,"enchant":3810,"gems":[40155]}, - {"id":47551,"enchant":3722,"gems":[40113]}, - {"id":47794,"enchant":1144,"gems":[40113,40133]}, - {"id":47467,"enchant":2332,"gems":[40153,0]}, - {"id":47797,"enchant":3604,"gems":[40113,0]}, - {"id":47419,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47435,"enchant":3872,"gems":[40113,40133,40133]}, - {"id":47454,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47489,"gems":[40155]}, - {"id":45518}, - {"id":47477}, - {"id":47422,"enchant":3834,"gems":[40133]}, - {"id":47437}, - {"id":45294,"gems":[40113]} - ]}`), -} - -export const P3_Preset_Destro_Alliance = { - name: 'P3 Destro [A]', - tooltip: BIS_TOOLTIP, - enableWhen: (player: Player) => player.getTalentTree() == 2 - && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":47789,"enchant":3820,"gems":[41285,40133]}, - {"id":47144,"gems":[40155]}, - {"id":47792,"enchant":3810,"gems":[40155]}, - {"id":47552,"enchant":3722,"gems":[40113]}, - {"id":47129,"enchant":1144,"gems":[40133,40155,40113]}, - {"id":47208,"enchant":2332,"gems":[40133,0]}, - {"id":47788,"enchant":3604,"gems":[40113,0]}, - {"id":46973,"enchant":3599,"gems":[40133,40113,40113]}, - {"id":47790,"enchant":3872,"gems":[40113,40155]}, - {"id":47205,"enchant":3606,"gems":[40133,40113]}, - {"id":45495,"gems":[40133]}, - {"id":47237,"gems":[40155]}, - {"id":45518}, - {"id":47188}, - {"id":46980,"enchant":3834,"gems":[40133]}, - {"id":47958,"gems":[40155]}, - {"id":45294,"gems":[40155]} - ]}`), -} - -export const APL_Demo_Legacy = PresetUtils.makePresetLegacyRotation('Demo Legacy', Spec.SpecWarlock, DemonologyRotation); -export const APL_Demo_Default = PresetUtils.makePresetAPLRotation('Demo', DemoApl, { talentTree: 1 }); -export const APL_Destro_Legacy = PresetUtils.makePresetLegacyRotation('Destro Legacy', Spec.SpecWarlock, DestructionRotation); -export const APL_Destro_Default = PresetUtils.makePresetAPLRotation('Destro', DestroApl, { talentTree: 2 }); diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts index 6bcd58fd72..69291f82c6 100644 --- a/ui/warlock/sim.ts +++ b/ui/warlock/sim.ts @@ -49,7 +49,7 @@ export class WarlockSimUI extends IndividualSimUI { defaults: { // Default equipped gear. - gear: Presets.P3_Preset_Affliction_Horde.gear, + gear: Presets.P3_AFFLICTION_HORDE_PRESET.gear, // Default EP weights for sorting gear in the gear picker. epWeights: Stats.fromMap({ @@ -149,18 +149,18 @@ export class WarlockSimUI extends IndividualSimUI { // Preset gear configurations that the user can quickly select. gear: [ Presets.SWP_BIS, - Presets.P1_PreBiS_11, - Presets.P1_PreBiS_14, - Presets.P1_Preset_Affliction, - Presets.P1_Preset_Demo_Destro, - Presets.P2_Preset_Affliction, - Presets.P2_Preset_Demo_Destro, - Presets.P3_Preset_Affliction_Horde, - Presets.P3_Preset_Affliction_Alliance, - Presets.P3_Preset_Demo_Horde, - Presets.P3_Preset_Demo_Alliance, - Presets.P3_Preset_Destro_Horde, - Presets.P3_Preset_Destro_Alliance, + Presets.PRERAID_AFFLICTION_PRESET, + Presets.PRERAID_DEMODESTRO_PRESET, + Presets.P1_AFFLICTION_PRESET, + Presets.P1_DEMODESTRO_PRESET, + Presets.P2_AFFLICTION_PRESET, + Presets.P2_DEMODESTRO_PRESET, + Presets.P3_AFFLICTION_ALLIANCE_PRESET, + Presets.P3_AFFLICTION_HORDE_PRESET, + Presets.P3_DEMO_ALLIANCE_PRESET, + Presets.P3_DEMO_HORDE_PRESET, + Presets.P3_DESTRO_ALLIANCE_PRESET, + Presets.P3_DESTRO_HORDE_PRESET, ], }, }); diff --git a/ui/warrior/gear_sets/p1_arms.gear.json b/ui/warrior/gear_sets/p1_arms.gear.json new file mode 100644 index 0000000000..bd71dc35bd --- /dev/null +++ b/ui/warrior/gear_sets/p1_arms.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":40528,"enchant":3817,"gems":[41398,42153]}, + {"id":44664,"gems":[39996]}, + {"id":40530,"enchant":3808,"gems":[40038]}, + {"id":40403,"enchant":3605}, + {"id":40539,"enchant":3832,"gems":[42153]}, + {"id":40330,"enchant":3845,"gems":[40002,0]}, + {"id":40541,"enchant":3604,"gems":[0]}, + {"id":40205,"gems":[42153]}, + {"id":40318,"enchant":3823,"gems":[49110,40038]}, + {"id":40591,"enchant":3606}, + {"id":43993,"gems":[40002]}, + {"id":40474}, + {"id":42987}, + {"id":40256}, + {"id":40384,"enchant":3789}, + {}, + {"id":40385} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p1_fury.gear.json b/ui/warrior/gear_sets/p1_fury.gear.json new file mode 100644 index 0000000000..61590cf80e --- /dev/null +++ b/ui/warrior/gear_sets/p1_fury.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":44006,"enchant":3817,"gems":[41285,42702]}, + {"id":44664,"gems":[39996]}, + {"id":40530,"enchant":3808,"gems":[40037]}, + {"id":40403,"enchant":3605}, + {"id":40539,"enchant":3832,"gems":[42142]}, + {"id":39765,"enchant":3845,"gems":[39996,0]}, + {"id":40541,"enchant":3604,"gems":[0]}, + {"id":40205,"gems":[42142]}, + {"id":40529,"enchant":3823,"gems":[39996,40022]}, + {"id":40591,"enchant":3606}, + {"id":43993,"gems":[42142]}, + {"id":40717}, + {"id":42987}, + {"id":40256}, + {"id":40384,"enchant":3789}, + {"id":40384,"enchant":3789}, + {"id":40385} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p2_arms.gear.json b/ui/warrior/gear_sets/p2_arms.gear.json new file mode 100644 index 0000000000..63e2d0f676 --- /dev/null +++ b/ui/warrior/gear_sets/p2_arms.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46151,"enchant":3817,"gems":[41398,42142]}, + {"id":45459,"gems":[40002]}, + {"id":46149,"enchant":3808,"gems":[42153]}, + {"id":46032,"enchant":3605,"gems":[39996,40037]}, + {"id":46146,"enchant":3832,"gems":[42153,39996]}, + {"id":45663,"enchant":3845,"gems":[39996,0]}, + {"id":46148,"enchant":3604,"gems":[40037,0]}, + {"id":45241,"gems":[49110,40037,39996]}, + {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, + {"id":45599,"enchant":3606,"gems":[40002,40002]}, + {"id":45608,"gems":[39996]}, + {"id":46322,"gems":[39996]}, + {"id":46038}, + {"id":45931}, + {"id":45533,"enchant":3789,"gems":[39996,39996]}, + {}, + {"id":45296,"gems":[39996]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p2_fury.gear.json b/ui/warrior/gear_sets/p2_fury.gear.json new file mode 100644 index 0000000000..1cfa0fad51 --- /dev/null +++ b/ui/warrior/gear_sets/p2_fury.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":46151,"enchant":3817,"gems":[41398,39996]}, + {"id":45517,"gems":[39996]}, + {"id":46149,"enchant":3808,"gems":[39996]}, + {"id":46032,"enchant":3605,"gems":[39996,40037]}, + {"id":46146,"enchant":3832,"gems":[39996,42702]}, + {"id":45611,"enchant":3845,"gems":[40037,0]}, + {"id":46148,"enchant":3604,"gems":[40058]}, + {"id":46095,"gems":[42154,42142,42142]}, + {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, + {"id":40591,"enchant":3606}, + {"id":45608,"gems":[39996]}, + {"id":45534,"gems":[39996]}, + {"id":42987}, + {"id":45931}, + {"id":45516,"enchant":3789,"gems":[39996,39996]}, + {"id":45516,"enchant":3789,"gems":[39996,39996]}, + {"id":45296,"gems":[39996]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_arms_2p_alliance.gear.json b/ui/warrior/gear_sets/p3_arms_2p_alliance.gear.json new file mode 100644 index 0000000000..54725ecdb0 --- /dev/null +++ b/ui/warrior/gear_sets/p3_arms_2p_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":49478,"enchant":3817,"gems":[41398,40117]}, + {"id":47915,"gems":[40117]}, + {"id":48381,"enchant":3808,"gems":[42142]}, + {"id":47545,"enchant":3605,"gems":[40117]}, + {"id":48385,"enchant":3832,"gems":[42142,42142]}, + {"id":47074,"enchant":3845,"gems":[40143,0]}, + {"id":47240,"enchant":3604,"gems":[49110,40117,0]}, + {"id":47153,"gems":[40143,40117,40117]}, + {"id":47191,"enchant":3823,"gems":[40117,40117,40117]}, + {"id":47077,"enchant":3606,"gems":[40143,40117]}, + {"id":47934,"gems":[40142]}, + {"id":45608,"gems":[40117]}, + {"id":47131}, + {"id":46038}, + {"id":47078,"enchant":3789,"gems":[40117,40117]}, + {}, + {"id":45296,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_arms_2p_horde.gear.json b/ui/warrior/gear_sets/p3_arms_2p_horde.gear.json new file mode 100644 index 0000000000..4044716d80 --- /dev/null +++ b/ui/warrior/gear_sets/p3_arms_2p_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":49478,"enchant":3817,"gems":[41398,40111]}, + {"id":45459,"gems":[40111]}, + {"id":48400,"enchant":3808,"gems":[42153]}, + {"id":47546,"enchant":3605,"gems":[40111]}, + {"id":48396,"enchant":3832,"gems":[42153,42153]}, + {"id":47442,"enchant":3845,"gems":[40143,0]}, + {"id":47492,"enchant":3604,"gems":[49110,40117,0]}, + {"id":47472,"gems":[40143,40117,40117]}, + {"id":47480,"enchant":3823,"gems":[40117,40117,40117]}, + {"id":47445,"enchant":3606,"gems":[40143,40117]}, + {"id":48007,"gems":[40143]}, + {"id":45608,"gems":[40117]}, + {"id":47464}, + {"id":46038}, + {"id":47446,"enchant":3789,"gems":[40111,40111]}, + {}, + {"id":47428,"gems":[40111]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_arms_4p_alliance.gear.json b/ui/warrior/gear_sets/p3_arms_4p_alliance.gear.json new file mode 100644 index 0000000000..32fd5c1649 --- /dev/null +++ b/ui/warrior/gear_sets/p3_arms_4p_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48383,"enchant":3817,"gems":[41398,40117]}, + {"id":47915,"gems":[40117]}, + {"id":48381,"enchant":3808,"gems":[42153]}, + {"id":47545,"enchant":3605,"gems":[40117]}, + {"id":48385,"enchant":3832,"gems":[42153,42153]}, + {"id":47074,"enchant":3845,"gems":[40117,0]}, + {"id":47240,"enchant":3604,"gems":[49110,40117,0]}, + {"id":47153,"gems":[40117,40117,40117]}, + {"id":48382,"enchant":3823,"gems":[40142,40117]}, + {"id":47077,"enchant":3606,"gems":[40117,40117]}, + {"id":47934,"gems":[40117]}, + {"id":45608,"gems":[40117]}, + {"id":46038}, + {"id":47131}, + {"id":47078,"enchant":3789,"gems":[40117,40117]}, + {}, + {"id":46995,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_arms_4p_horde.gear.json b/ui/warrior/gear_sets/p3_arms_4p_horde.gear.json new file mode 100644 index 0000000000..4295b02c1f --- /dev/null +++ b/ui/warrior/gear_sets/p3_arms_4p_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48398,"enchant":3817,"gems":[41398,40117]}, + {"id":47988,"gems":[40117]}, + {"id":48400,"enchant":3808,"gems":[42153]}, + {"id":47546,"enchant":3605,"gems":[40117]}, + {"id":48396,"enchant":3832,"gems":[42153,42153]}, + {"id":47442,"enchant":3845,"gems":[40117,0]}, + {"id":47492,"enchant":3604,"gems":[49110,40117,0]}, + {"id":47472,"gems":[40117,40117,40117]}, + {"id":48399,"enchant":3823,"gems":[40142,40117]}, + {"id":47445,"enchant":3606,"gems":[40117,40117]}, + {"id":48007,"gems":[40117]}, + {"id":45608,"gems":[40117]}, + {"id":46038}, + {"id":47464}, + {"id":47446,"enchant":3789,"gems":[40117,40117]}, + {}, + {"id":47428,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_fury_alliance.gear.json b/ui/warrior/gear_sets/p3_fury_alliance.gear.json new file mode 100644 index 0000000000..332bb23fe2 --- /dev/null +++ b/ui/warrior/gear_sets/p3_fury_alliance.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48383,"enchant":3817,"gems":[41398,49110]}, + {"id":47060,"gems":[40117]}, + {"id":48381,"enchant":3808,"gems":[40111]}, + {"id":47545,"enchant":3831,"gems":[40111]}, + {"id":48385,"enchant":3832,"gems":[40117,40117]}, + {"id":47074,"enchant":3845,"gems":[40143,0]}, + {"id":47240,"enchant":3604,"gems":[40111,40111,0]}, + {"id":47002,"gems":[40143,40143,40111]}, + {"id":48382,"enchant":3823,"gems":[40142,40117]}, + {"id":47154,"enchant":3606,"gems":[40142,40117]}, + {"id":46966,"gems":[40143]}, + {"id":47075,"gems":[40111]}, + {"id":45931}, + {"id":47131}, + {"id":47078,"enchant":3789,"gems":[42142,40111]}, + {"id":47078,"enchant":3789,"gems":[42142,42142]}, + {"id":46995,"gems":[40111]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/p3_fury_horde.gear.json b/ui/warrior/gear_sets/p3_fury_horde.gear.json new file mode 100644 index 0000000000..6b939ba277 --- /dev/null +++ b/ui/warrior/gear_sets/p3_fury_horde.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":48398,"enchant":3817,"gems":[41398,49110]}, + {"id":47433,"gems":[40111]}, + {"id":48400,"enchant":3808,"gems":[40117]}, + {"id":47546,"enchant":3831,"gems":[40111]}, + {"id":48396,"enchant":3832,"gems":[40111,40111]}, + {"id":47414,"enchant":3845,"gems":[40142,0]}, + {"id":47240,"enchant":3604,"gems":[40111,40111,0]}, + {"id":47429,"gems":[40142,40142,42142]}, + {"id":48399,"enchant":3823,"gems":[40142,40111]}, + {"id":47445,"enchant":3606,"gems":[40142,45862]}, + {"id":47413,"gems":[40142]}, + {"id":47443,"gems":[40111]}, + {"id":45931}, + {"id":47464}, + {"id":47446,"enchant":3789,"gems":[40117,40117]}, + {"id":47446,"enchant":3789,"gems":[42142,42142]}, + {"id":47428,"gems":[40117]} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/preraid_arms.gear.json b/ui/warrior/gear_sets/preraid_arms.gear.json new file mode 100644 index 0000000000..541c2a4d55 --- /dev/null +++ b/ui/warrior/gear_sets/preraid_arms.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41386,"enchant":3817,"gems":[41285,42702]}, + {"id":42645,"gems":[40002]}, + {"id":44195,"enchant":3808}, + {"id":37647,"enchant":3605}, + {"id":39606,"enchant":3832,"gems":[40002,40002]}, + {"id":41355,"enchant":3845,"gems":[0]}, + {"id":39609,"enchant":3604,"gems":[40037,0]}, + {"id":40694,"gems":[42149,42149]}, + {"id":37193,"enchant":3823,"gems":[40002,40037]}, + {"id":44306,"enchant":3606,"gems":[40086,40002]}, + {"id":42642,"gems":[42149]}, + {"id":37642}, + {"id":42987}, + {"id":40684}, + {"id":37852,"enchant":3789}, + {}, + {"id":37191} +]} \ No newline at end of file diff --git a/ui/warrior/gear_sets/preraid_fury.gear.json b/ui/warrior/gear_sets/preraid_fury.gear.json new file mode 100644 index 0000000000..b62a9135ae --- /dev/null +++ b/ui/warrior/gear_sets/preraid_fury.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":41386,"enchant":3817,"gems":[41398,42702]}, + {"id":42645,"gems":[40003]}, + {"id":44195,"enchant":3808}, + {"id":37647,"enchant":3605}, + {"id":39606,"enchant":3832,"gems":[40003,40003]}, + {"id":44203,"enchant":3845,"gems":[0]}, + {"id":39609,"enchant":3604,"gems":[40037,0]}, + {"id":40694,"gems":[42149,42149]}, + {"id":44205,"enchant":3823}, + {"id":44306,"enchant":3606,"gems":[40037,40037]}, + {"id":42642,"gems":[42149]}, + {"id":37642}, + {"id":42987}, + {"id":40684}, + {"id":37852,"enchant":3789}, + {"id":37852,"enchant":3789}, + {"id":37191} +]} \ No newline at end of file diff --git a/ui/warrior/presets.ts b/ui/warrior/presets.ts index 2197a6eeef..55b172b449 100644 --- a/ui/warrior/presets.ts +++ b/ui/warrior/presets.ts @@ -1,15 +1,12 @@ import { Consumes, - EquipmentSpec, Faction, Flask, Food, Glyphs, Potions, - Spec, } from '../core/proto/common.js'; import { SavedTalents } from '../core/proto/ui.js'; -import { Player } from '../core/player.js'; import { WarriorShout, @@ -23,7 +20,19 @@ import { } from '../core/proto/warrior.js'; import * as PresetUtils from '../core/preset_utils.js'; -import * as Tooltips from '../core/constants/tooltips.js'; + +import PreraidArmsGear from './gear_sets/preraid_arms.gear.json'; +import P1ArmsGear from './gear_sets/p1_arms.gear.json'; +import P2ArmsGear from './gear_sets/p2_arms.gear.json'; +import P3Arms2pAllianceGear from './gear_sets/p3_arms_2p_alliance.gear.json'; +import P3Arms4pAllianceGear from './gear_sets/p3_arms_4p_alliance.gear.json'; +import P3Arms2pHordeGear from './gear_sets/p3_arms_2p_horde.gear.json'; +import P3Arms4pHordeGear from './gear_sets/p3_arms_4p_horde.gear.json'; +import PreraidFuryGear from './gear_sets/preraid_fury.gear.json'; +import P1FuryGear from './gear_sets/p1_fury.gear.json'; +import P2FuryGear from './gear_sets/p2_fury.gear.json'; +import P3FuryAllianceGear from './gear_sets/p3_fury_alliance.gear.json'; +import P3FuryHordeGear from './gear_sets/p3_fury_horde.gear.json'; import FuryApl from './apls/fury.apl.json'; import FurySunderApl from './apls/fury_sunder.apl.json'; @@ -32,37 +41,18 @@ import FurySunderApl from './apls/fury_sunder.apl.json'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. -// Default talents. Uses the wowhead calculator format, make the talents on -// https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. -export const ArmsTalents = { - name: 'Arms', - data: SavedTalents.create({ - talentsString: '3022032023335100102012213231251-305-2033', - glyphs: Glyphs.create({ - major1: WarriorMajorGlyph.GlyphOfRending, - major2: WarriorMajorGlyph.GlyphOfMortalStrike, - major3: WarriorMajorGlyph.GlyphOfExecution, - minor1: WarriorMinorGlyph.GlyphOfThunderClap, - minor2: WarriorMinorGlyph.GlyphOfCommand, - minor3: WarriorMinorGlyph.GlyphOfShatteringThrow, - }), - }), -}; - -export const FuryTalents = { - name: 'Fury', - data: SavedTalents.create({ - talentsString: '32002301233-305053000520310053120500351', - glyphs: Glyphs.create({ - major1: WarriorMajorGlyph.GlyphOfWhirlwind, - major2: WarriorMajorGlyph.GlyphOfHeroicStrike, - major3: WarriorMajorGlyph.GlyphOfExecution, - minor1: WarriorMinorGlyph.GlyphOfCommand, - minor2: WarriorMinorGlyph.GlyphOfShatteringThrow, - minor3: WarriorMinorGlyph.GlyphOfCharge, - }), - }), -}; +export const PRERAID_ARMS_PRESET = PresetUtils.makePresetGear('Preraid Arms', PreraidArmsGear, { talentTree: 0 }); +export const P1_ARMS_PRESET = PresetUtils.makePresetGear('P1 Arms', P1ArmsGear, { talentTree: 0 }); +export const P2_ARMS_PRESET = PresetUtils.makePresetGear('P2 Arms', P2ArmsGear, { talentTree: 0 }); +export const P3_ARMS_2P_PRESET_ALLIANCE = PresetUtils.makePresetGear('P2 Arms 2p [A]', P3Arms2pAllianceGear, { talentTree: 0, faction: Faction.Alliance }); +export const P3_ARMS_4P_PRESET_ALLIANCE = PresetUtils.makePresetGear('P2 Arms 4p [A]', P3Arms4pAllianceGear, { talentTree: 0, faction: Faction.Alliance }); +export const P3_ARMS_2P_PRESET_HORDE = PresetUtils.makePresetGear('P2 Arms 2p [H]', P3Arms2pHordeGear, { talentTree: 0, faction: Faction.Horde }); +export const P3_ARMS_4P_PRESET_HORDE = PresetUtils.makePresetGear('P2 Arms 4p [H]', P3Arms4pHordeGear, { talentTree: 0, faction: Faction.Horde }); +export const PRERAID_FURY_PRESET = PresetUtils.makePresetGear('Preraid Fury', PreraidFuryGear, { talentTrees: [1,2] }); +export const P1_FURY_PRESET = PresetUtils.makePresetGear('P1 Fury', P1FuryGear, { talentTrees: [1,2] }); +export const P2_FURY_PRESET = PresetUtils.makePresetGear('P2 Fury', P2FuryGear, { talentTrees: [1,2] }); +export const P3_FURY_PRESET_ALLIANCE = PresetUtils.makePresetGear('P3 Fury [A]', P3FuryAllianceGear, { talentTrees: [1,2], faction: Faction.Alliance }); +export const P3_FURY_PRESET_HORDE = PresetUtils.makePresetGear('P3 Fury [H]', P3FuryHordeGear, { talentTrees: [1,2], faction: Faction.Horde }); export const DefaultRotation = WarriorRotation.create({ useRend: true, @@ -104,6 +94,38 @@ export const ArmsRotation = WarriorRotation.create({ export const ROTATION_FURY = PresetUtils.makePresetAPLRotation('Fury', FuryApl, { talentTree: 1 }); export const ROTATION_FURY_SUNDER = PresetUtils.makePresetAPLRotation('Fury + Sunder', FurySunderApl, { talentTree: 1 }); +// Default talents. Uses the wowhead calculator format, make the talents on +// https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. +export const ArmsTalents = { + name: 'Arms', + data: SavedTalents.create({ + talentsString: '3022032023335100102012213231251-305-2033', + glyphs: Glyphs.create({ + major1: WarriorMajorGlyph.GlyphOfRending, + major2: WarriorMajorGlyph.GlyphOfMortalStrike, + major3: WarriorMajorGlyph.GlyphOfExecution, + minor1: WarriorMinorGlyph.GlyphOfThunderClap, + minor2: WarriorMinorGlyph.GlyphOfCommand, + minor3: WarriorMinorGlyph.GlyphOfShatteringThrow, + }), + }), +}; + +export const FuryTalents = { + name: 'Fury', + data: SavedTalents.create({ + talentsString: '32002301233-305053000520310053120500351', + glyphs: Glyphs.create({ + major1: WarriorMajorGlyph.GlyphOfWhirlwind, + major2: WarriorMajorGlyph.GlyphOfHeroicStrike, + major3: WarriorMajorGlyph.GlyphOfExecution, + minor1: WarriorMinorGlyph.GlyphOfCommand, + minor2: WarriorMinorGlyph.GlyphOfShatteringThrow, + minor3: WarriorMinorGlyph.GlyphOfCharge, + }), + }), +}; + export const DefaultOptions = WarriorOptions.create({ startingRage: 0, useRecklessness: true, @@ -117,304 +139,4 @@ export const DefaultConsumes = Consumes.create({ food: Food.FoodSpicedWormBurger, defaultPotion: Potions.IndestructiblePotion, prepopPotion: Potions.PotionOfSpeed, -}); - -export const P1_PRERAID_FURY_PRESET = { - name: 'P1 Pre-Raid Fury Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":41386,"enchant":3817,"gems":[41398,42702]}, - {"id":42645,"gems":[40003]}, - {"id":44195,"enchant":3808}, - {"id":37647,"enchant":3605}, - {"id":39606,"enchant":3832,"gems":[40003,40003]}, - {"id":44203,"enchant":3845,"gems":[0]}, - {"id":39609,"enchant":3604,"gems":[40037,0]}, - {"id":40694,"gems":[42149,42149]}, - {"id":44205,"enchant":3823}, - {"id":44306,"enchant":3606,"gems":[40037,40037]}, - {"id":42642,"gems":[42149]}, - {"id":37642}, - {"id":42987}, - {"id":40684}, - {"id":37852,"enchant":3789}, - {"id":37852,"enchant":3789}, - {"id":37191} - ]}`), -}; - -export const P1_FURY_PRESET = { - name: 'P1 Fury Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":44006,"enchant":3817,"gems":[41285,42702]}, - {"id":44664,"gems":[39996]}, - {"id":40530,"enchant":3808,"gems":[40037]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[42142]}, - {"id":39765,"enchant":3845,"gems":[39996,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[42142]}, - {"id":40529,"enchant":3823,"gems":[39996,40022]}, - {"id":40591,"enchant":3606}, - {"id":43993,"gems":[42142]}, - {"id":40717}, - {"id":42987}, - {"id":40256}, - {"id":40384,"enchant":3789}, - {"id":40384,"enchant":3789}, - {"id":40385} - ]}`), -}; - -export const P2_FURY_PRESET = { - name: 'P2 Fury Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":46151,"enchant":3817,"gems":[41398,39996]}, - {"id":45517,"gems":[39996]}, - {"id":46149,"enchant":3808,"gems":[39996]}, - {"id":46032,"enchant":3605,"gems":[39996,40037]}, - {"id":46146,"enchant":3832,"gems":[39996,42702]}, - {"id":45611,"enchant":3845,"gems":[40037,0]}, - {"id":46148,"enchant":3604,"gems":[40058]}, - {"id":46095,"gems":[42154,42142,42142]}, - {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":40591,"enchant":3606}, - {"id":45608,"gems":[39996]}, - {"id":45534,"gems":[39996]}, - {"id":42987}, - {"id":45931}, - {"id":45516,"enchant":3789,"gems":[39996,39996]}, - {"id":45516,"enchant":3789,"gems":[39996,39996]}, - {"id":45296,"gems":[39996]} - ]}`), -}; - -export const P3_FURY_PRESET_ALLIANCE = { - name: 'P3 Fury Preset [A]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0 && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48383,"enchant":3817,"gems":[41398,49110]}, - {"id":47060,"gems":[40117]}, - {"id":48381,"enchant":3808,"gems":[40111]}, - {"id":47545,"enchant":3831,"gems":[40111]}, - {"id":48385,"enchant":3832,"gems":[40117,40117]}, - {"id":47074,"enchant":3845,"gems":[40143,0]}, - {"id":47240,"enchant":3604,"gems":[40111,40111,0]}, - {"id":47002,"gems":[40143,40143,40111]}, - {"id":48382,"enchant":3823,"gems":[40142,40117]}, - {"id":47154,"enchant":3606,"gems":[40142,40117]}, - {"id":46966,"gems":[40143]}, - {"id":47075,"gems":[40111]}, - {"id":45931}, - {"id":47131}, - {"id":47078,"enchant":3789,"gems":[42142,40111]}, - {"id":47078,"enchant":3789,"gems":[42142,42142]}, - {"id":46995,"gems":[40111]} - ]}`) -} - -export const P3_FURY_PRESET_HORDE = { - name: 'P3 Fury Preset [H]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() != 0 && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":48398,"enchant":3817,"gems":[41398,49110]}, - {"id":47433,"gems":[40111]}, - {"id":48400,"enchant":3808,"gems":[40117]}, - {"id":47546,"enchant":3831,"gems":[40111]}, - {"id":48396,"enchant":3832,"gems":[40111,40111]}, - {"id":47414,"enchant":3845,"gems":[40142,0]}, - {"id":47240,"enchant":3604,"gems":[40111,40111,0]}, - {"id":47429,"gems":[40142,40142,42142]}, - {"id":48399,"enchant":3823,"gems":[40142,40111]}, - {"id":47445,"enchant":3606,"gems":[40142,45862]}, - {"id":47413,"gems":[40142]}, - {"id":47443,"gems":[40111]}, - {"id":45931}, - {"id":47464}, - {"id":47446,"enchant":3789,"gems":[40117,40117]}, - {"id":47446,"enchant":3789,"gems":[42142,42142]}, - {"id":47428,"gems":[40117]} - ]}`) -} - -export const P1_PRERAID_ARMS_PRESET = { - name: 'P1 Pre-Raid Arms Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - {"id":41386,"enchant":3817,"gems":[41285,42702]}, - {"id":42645,"gems":[40002]}, - {"id":44195,"enchant":3808}, - {"id":37647,"enchant":3605}, - {"id":39606,"enchant":3832,"gems":[40002,40002]}, - {"id":41355,"enchant":3845,"gems":[0]}, - {"id":39609,"enchant":3604,"gems":[40037,0]}, - {"id":40694,"gems":[42149,42149]}, - {"id":37193,"enchant":3823,"gems":[40002,40037]}, - {"id":44306,"enchant":3606,"gems":[40086,40002]}, - {"id":42642,"gems":[42149]}, - {"id":37642}, - {"id":42987}, - {"id":40684}, - {"id":37852,"enchant":3789}, - {}, - {"id":37191} - ]}`), -}; - -export const P1_ARMS_PRESET = { - name: 'P1 Arms Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":40528,"enchant":3817,"gems":[41398,42153]}, - {"id":44664,"gems":[39996]}, - {"id":40530,"enchant":3808,"gems":[40038]}, - {"id":40403,"enchant":3605}, - {"id":40539,"enchant":3832,"gems":[42153]}, - {"id":40330,"enchant":3845,"gems":[40002,0]}, - {"id":40541,"enchant":3604,"gems":[0]}, - {"id":40205,"gems":[42153]}, - {"id":40318,"enchant":3823,"gems":[49110,40038]}, - {"id":40591,"enchant":3606}, - {"id":43993,"gems":[40002]}, - {"id":40474}, - {"id":42987}, - {"id":40256}, - {"id":40384,"enchant":3789}, - {}, - {"id":40385} - ]}`), -}; - -export const P2_ARMS_PRESET = { - name: 'P2 Arms Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":46151,"enchant":3817,"gems":[41398,42142]}, - {"id":45459,"gems":[40002]}, - {"id":46149,"enchant":3808,"gems":[42153]}, - {"id":46032,"enchant":3605,"gems":[39996,40037]}, - {"id":46146,"enchant":3832,"gems":[42153,39996]}, - {"id":45663,"enchant":3845,"gems":[39996,0]}, - {"id":46148,"enchant":3604,"gems":[40037,0]}, - {"id":45241,"gems":[49110,40037,39996]}, - {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":45599,"enchant":3606,"gems":[40002,40002]}, - {"id":45608,"gems":[39996]}, - {"id":46322,"gems":[39996]}, - {"id":46038}, - {"id":45931}, - {"id":45533,"enchant":3789,"gems":[39996,39996]}, - {}, - {"id":45296,"gems":[39996]} - ]}`), -}; - -export const P3_ARMS_2P_PRESET_ALLIANCE = { - name: 'P3 Arms 2p Preset [A]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":49478,"enchant":3817,"gems":[41398,40117]}, - {"id":47915,"gems":[40117]}, - {"id":48381,"enchant":3808,"gems":[42142]}, - {"id":47545,"enchant":3605,"gems":[40117]}, - {"id":48385,"enchant":3832,"gems":[42142,42142]}, - {"id":47074,"enchant":3845,"gems":[40143,0]}, - {"id":47240,"enchant":3604,"gems":[49110,40117,0]}, - {"id":47153,"gems":[40143,40117,40117]}, - {"id":47191,"enchant":3823,"gems":[40117,40117,40117]}, - {"id":47077,"enchant":3606,"gems":[40143,40117]}, - {"id":47934,"gems":[40142]}, - {"id":45608,"gems":[40117]}, - {"id":47131}, - {"id":46038}, - {"id":47078,"enchant":3789,"gems":[40117,40117]}, - {}, - {"id":45296,"gems":[40117]} - ]}`), -}; - -export const P3_ARMS_4P_PRESET_ALLIANCE = { - name: 'P3 Arms 4p Preset [A]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48383,"enchant":3817,"gems":[41398,40117]}, - {"id":47915,"gems":[40117]}, - {"id":48381,"enchant":3808,"gems":[42153]}, - {"id":47545,"enchant":3605,"gems":[40117]}, - {"id":48385,"enchant":3832,"gems":[42153,42153]}, - {"id":47074,"enchant":3845,"gems":[40117,0]}, - {"id":47240,"enchant":3604,"gems":[49110,40117,0]}, - {"id":47153,"gems":[40117,40117,40117]}, - {"id":48382,"enchant":3823,"gems":[40142,40117]}, - {"id":47077,"enchant":3606,"gems":[40117,40117]}, - {"id":47934,"gems":[40117]}, - {"id":45608,"gems":[40117]}, - {"id":46038}, - {"id":47131}, - {"id":47078,"enchant":3789,"gems":[40117,40117]}, - {}, - {"id":46995,"gems":[40117]} - ]}`), -}; - -export const P3_ARMS_2P_PRESET_HORDE = { - name: 'P3 Arms 2p Preset [H]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":49478,"enchant":3817,"gems":[41398,40111]}, - {"id":45459,"gems":[40111]}, - {"id":48400,"enchant":3808,"gems":[42153]}, - {"id":47546,"enchant":3605,"gems":[40111]}, - {"id":48396,"enchant":3832,"gems":[42153,42153]}, - {"id":47442,"enchant":3845,"gems":[40143,0]}, - {"id":47492,"enchant":3604,"gems":[49110,40117,0]}, - {"id":47472,"gems":[40143,40117,40117]}, - {"id":47480,"enchant":3823,"gems":[40117,40117,40117]}, - {"id":47445,"enchant":3606,"gems":[40143,40117]}, - {"id":48007,"gems":[40143]}, - {"id":45608,"gems":[40117]}, - {"id":47464}, - {"id":46038}, - {"id":47446,"enchant":3789,"gems":[40111,40111]}, - {}, - {"id":47428,"gems":[40111]} - ]}`), -}; - -export const P3_ARMS_4P_PRESET_HORDE = { - name: 'P3 Arms 4p Preset [H]', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde, - gear: EquipmentSpec.fromJsonString(`{"items": [ - {"id":48398,"enchant":3817,"gems":[41398,40117]}, - {"id":47988,"gems":[40117]}, - {"id":48400,"enchant":3808,"gems":[42153]}, - {"id":47546,"enchant":3605,"gems":[40117]}, - {"id":48396,"enchant":3832,"gems":[42153,42153]}, - {"id":47442,"enchant":3845,"gems":[40117,0]}, - {"id":47492,"enchant":3604,"gems":[49110,40117,0]}, - {"id":47472,"gems":[40117,40117,40117]}, - {"id":48399,"enchant":3823,"gems":[40142,40117]}, - {"id":47445,"enchant":3606,"gems":[40117,40117]}, - {"id":48007,"gems":[40117]}, - {"id":45608,"gems":[40117]}, - {"id":46038}, - {"id":47464}, - {"id":47446,"enchant":3789,"gems":[40117,40117]}, - {}, - {"id":47428,"gems":[40117]} - ]}`), -}; +}); \ No newline at end of file diff --git a/ui/warrior/sim.ts b/ui/warrior/sim.ts index 5620bcace2..90bc1e58cd 100644 --- a/ui/warrior/sim.ts +++ b/ui/warrior/sim.ts @@ -170,12 +170,12 @@ export class WarriorSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.P1_PRERAID_FURY_PRESET, + Presets.PRERAID_FURY_PRESET, Presets.P1_FURY_PRESET, Presets.P2_FURY_PRESET, Presets.P3_FURY_PRESET_ALLIANCE, Presets.P3_FURY_PRESET_HORDE, - Presets.P1_PRERAID_ARMS_PRESET, + Presets.PRERAID_ARMS_PRESET, Presets.P1_ARMS_PRESET, Presets.P2_ARMS_PRESET, Presets.P3_ARMS_2P_PRESET_ALLIANCE, From 5362ccc69344d78629902c236c5c07bee677ed40 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Mon, 16 Oct 2023 22:05:52 -0700 Subject: [PATCH 2/2] Resolve ui conflict --- ui/elemental_shaman/presets.ts | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts index f83961b2e6..7718807d5f 100644 --- a/ui/elemental_shaman/presets.ts +++ b/ui/elemental_shaman/presets.ts @@ -1,22 +1,13 @@ -<<<<<<< HEAD import { Consumes, + Faction, Flask, Food, Glyphs, Potions, - Faction, - Spec + Profession, + Spec, } from '../core/proto/common.js'; -======= -import {Consumes, Profession} 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 { Potions } from '../core/proto/common.js'; ->>>>>>> 6868808ba6beb98244ee1a4c5a8b70f48c3931c0 import { SavedTalents } from '../core/proto/ui.js'; import {