From bcd3900e3a0a8fa5e79db73d019cce6865d17367 Mon Sep 17 00:00:00 2001 From: Eric Taylor Date: Sat, 23 Nov 2024 21:02:27 -0500 Subject: [PATCH 1/2] Initial presets fix --- ui/index.html | 24 ++++----- ui/shadow_priest/apls/p1.apl.json | 8 +++ ui/shadow_priest/apls/phase_1.apl.json | 15 ------ ui/shadow_priest/apls/phase_2.apl.json | 19 ------- ui/shadow_priest/apls/phase_3.apl.json | 21 -------- ui/shadow_priest/apls/phase_4.apl.json | 28 ----------- ui/shadow_priest/apls/phase_5.apl.json | 30 ----------- ui/shadow_priest/gear_sets/blank.gear.json | 1 - ui/shadow_priest/gear_sets/p0.bis.gear.json | 19 +++++++ ui/shadow_priest/gear_sets/p1.bis.gear.json | 19 +++++++ ui/shadow_priest/presets.ts | 55 ++++++--------------- ui/shadow_priest/sim.ts | 10 +--- 12 files changed, 74 insertions(+), 175 deletions(-) create mode 100644 ui/shadow_priest/apls/p1.apl.json delete mode 100644 ui/shadow_priest/apls/phase_1.apl.json delete mode 100644 ui/shadow_priest/apls/phase_2.apl.json delete mode 100644 ui/shadow_priest/apls/phase_3.apl.json delete mode 100644 ui/shadow_priest/apls/phase_4.apl.json delete mode 100644 ui/shadow_priest/apls/phase_5.apl.json delete mode 100644 ui/shadow_priest/gear_sets/blank.gear.json create mode 100644 ui/shadow_priest/gear_sets/p0.bis.gear.json create mode 100644 ui/shadow_priest/gear_sets/p1.bis.gear.json diff --git a/ui/index.html b/ui/index.html index 822ce0077..9618fca28 100644 --- a/ui/index.html +++ b/ui/index.html @@ -93,7 +93,7 @@

Classic

Priest - Phase 5 - Alpha + Phase 1 - Alpha
@@ -116,7 +116,7 @@

Classic

Druid Balance - Phase 5 - Alpha + Phase 1 - Alpha
@@ -128,7 +128,7 @@

Classic

Druid Feral DPS - Phase 5 - Alpha + Phase 1 - Alpha
@@ -164,7 +164,7 @@

Classic

Hunter - Phase 5 - Alpha + Phase 1 - Alpha
@@ -186,7 +186,7 @@

Classic

Shaman Elemental - Phase 5 - Alpha + Phase 1 - Alpha
@@ -198,7 +198,7 @@

Classic

Shaman Enhancement - Phase 5 - Alpha + Phase 1 - Alpha
@@ -210,7 +210,7 @@

Classic

Shaman Warden - Phase 5 - Alpha + Phase 1 - Alpha
@@ -223,7 +223,7 @@

Classic

Mage - Phase 5 - Alpha + Phase 1 - Alpha
@@ -256,7 +256,7 @@

Classic

Paladin Protection - Phase 5 - Alpha + Phase 1 - Alpha
@@ -268,7 +268,7 @@

Classic

Paladin Retribution - Phase 5 - Alpha + Phase 1 - Alpha
@@ -293,7 +293,7 @@

Classic

Warrior DPS - Phase 5 - Alpha + Phase 1 - Alpha
@@ -307,7 +307,7 @@

Classic

Warrior Tank - Phase 5 - Alpha + Phase 1 - Alpha
diff --git a/ui/shadow_priest/apls/p1.apl.json b/ui/shadow_priest/apls/p1.apl.json new file mode 100644 index 000000000..479045c3a --- /dev/null +++ b/ui/shadow_priest/apls/p1.apl.json @@ -0,0 +1,8 @@ +{ + "type": "TypeAPL", + "prepullActions": [], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":8103,"rank":3}}}} + ] +} \ No newline at end of file diff --git a/ui/shadow_priest/apls/phase_1.apl.json b/ui/shadow_priest/apls/phase_1.apl.json deleted file mode 100644 index 61f9de6a0..000000000 --- a/ui/shadow_priest/apls/phase_1.apl.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":15262,"rank":2}}},"doAtValue":{"const":{"val":"-3s"}}} - ], - "priorityList": [ - {"action":{"castSpell":{"spellId":{"spellId":402799}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401955}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":425204}}}}},"castSpell":{"spellId":{"spellId":425204}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":970,"rank":3}}}}},"castSpell":{"spellId":{"spellId":970,"rank":3}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":8103,"rank":3}}}}, - {"action":{"castSpell":{"spellId":{"spellId":984,"rank":4}}}} - ] -} \ No newline at end of file diff --git a/ui/shadow_priest/apls/phase_2.apl.json b/ui/shadow_priest/apls/phase_2.apl.json deleted file mode 100644 index 97c32941d..000000000 --- a/ui/shadow_priest/apls/phase_2.apl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":15473}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}},"doAtValue":{"const":{"val":"-1.5s"}}} - ], - "priorityList": [ - {"action":{"castSpell":{"spellId":{"spellId":402799}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"castSpell":{"spellId":{"spellId":401977}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":425294}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":425204}}}}},"castSpell":{"spellId":{"spellId":425204}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":2767,"rank":5}}}}},"castSpell":{"spellId":{"spellId":2767,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8106,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401955}}}}, - {"action":{"castSpell":{"spellId":{"spellId":19277,"rank":3}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}}} - ] -} \ No newline at end of file diff --git a/ui/shadow_priest/apls/phase_3.apl.json b/ui/shadow_priest/apls/phase_3.apl.json deleted file mode 100644 index c1b1c1ca9..000000000 --- a/ui/shadow_priest/apls/phase_3.apl.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":15473}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}},"doAtValue":{"const":{"val":"-1.5s"}}} - ], - "priorityList": [ - {"action":{"castSpell":{"spellId":{"spellId":402799}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}}]}},"castSpell":{"spellId":{"spellId":401977}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":425294}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":425204},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":10893,"rank":7},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":413259}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10945,"rank":7}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401955}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":431681}}}}, - {"action":{"castSpell":{"spellId":{"spellId":19278,"rank":4}}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}}} - ] -} diff --git a/ui/shadow_priest/apls/phase_4.apl.json b/ui/shadow_priest/apls/phase_4.apl.json deleted file mode 100644 index 986c82df8..000000000 --- a/ui/shadow_priest/apls/phase_4.apl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":15473}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}},"doAtValue":{"const":{"val":"-2.99s"}}}, - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionOffensiveEquip"}}},"doAtValue":{"const":{"val":"-1.48s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-1.48s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":402668}}},"doAtValue":{"const":{"val":"-1.48s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}}]}},"castSpell":{"spellId":{"spellId":401977}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":425294}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":425204},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":10894,"rank":8},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":402668},"maxDots":2,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"castSpell":{"spellId":{"spellId":402799}}}}, - {"action":{"castSpell":{"spellId":{"spellId":402789}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":413259}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10947,"rank":9}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456549}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":456549}}}]}},"castSpell":{"spellId":{"spellId":18807,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401955}}}}, - {"action":{"castSpell":{"spellId":{"spellId":431681}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":19279,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}}} - ] -} diff --git a/ui/shadow_priest/apls/phase_5.apl.json b/ui/shadow_priest/apls/phase_5.apl.json deleted file mode 100644 index b6c735aa9..000000000 --- a/ui/shadow_priest/apls/phase_5.apl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":15473}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}},"doAtValue":{"const":{"val":"-2.7s"}}}, - {"action":{"castSpell":{"spellId":{"otherId":"OtherActionOffensiveEquip"}}},"doAtValue":{"const":{"val":"-1.19s"}},"hide":true}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-1.19s"}},"hide":true}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}},"doAtValue":{"const":{"val":"-1.19s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":425294}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425464}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425464}}}}}]}},"castSpell":{"spellId":{"spellId":431655}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":14751}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":425204},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":10894,"rank":8},"maxDots":5,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":402668},"maxDots":2,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"castSpell":{"spellId":{"spellId":402799}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}}]}},"castSpell":{"spellId":{"spellId":401977}}}}, - {"action":{"castSpell":{"spellId":{"spellId":402789}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":413259}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401955}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10947,"rank":9}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456549}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":456549}}}]}},"castSpell":{"spellId":{"spellId":18807,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":431681}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":19279,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":431655}}}} - ] -} diff --git a/ui/shadow_priest/gear_sets/blank.gear.json b/ui/shadow_priest/gear_sets/blank.gear.json deleted file mode 100644 index 4bcab0861..000000000 --- a/ui/shadow_priest/gear_sets/blank.gear.json +++ /dev/null @@ -1 +0,0 @@ -{"items": []} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/p0.bis.gear.json b/ui/shadow_priest/gear_sets/p0.bis.gear.json new file mode 100644 index 000000000..19141f4df --- /dev/null +++ b/ui/shadow_priest/gear_sets/p0.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16693}, + {}, + {"id":16695}, + {}, + {"id":16690}, + {"id":16697}, + {"id":16692}, + {"id":16696}, + {"id":16694}, + {"id":16691}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ No newline at end of file diff --git a/ui/shadow_priest/gear_sets/p1.bis.gear.json b/ui/shadow_priest/gear_sets/p1.bis.gear.json new file mode 100644 index 000000000..db2781a17 --- /dev/null +++ b/ui/shadow_priest/gear_sets/p1.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16813}, + {}, + {"id":16816}, + {}, + {"id":16815}, + {"id":16819}, + {"id":16812}, + {"id":16817}, + {"id":16814}, + {"id":16811}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ No newline at end of file diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index 51f390a3a..7dc97e067 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -20,12 +20,9 @@ import { } from '../core/proto/common.js'; import { ShadowPriest_Options as Options } from '../core/proto/priest.js'; import { SavedTalents } from '../core/proto/ui.js'; -import Phase1APL from './apls/phase_1.apl.json'; -import Phase2APL from './apls/phase_2.apl.json'; -import Phase3APL from './apls/phase_3.apl.json'; -import Phase4APL from './apls/phase_4.apl.json'; -import Phase5APL from './apls/phase_5.apl.json'; -import BlankGear from './gear_sets/blank.gear.json'; +import P1APL from './apls/p1.apl.json'; +import P0BISGear from './gear_sets/p0.bis.gear.json'; +import P1BISGear from './gear_sets/p1.bis.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -35,35 +32,27 @@ import BlankGear from './gear_sets/blank.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); +export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); -export const GearPresets = {}; +export const GearPresets = { + [Phase.Phase1]: [GearP0BIS, GearP1BIS], +}; -export const DefaultGear = GearBlank; +export const DefaultGear = GearP0BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLPhase1 = PresetUtils.makePresetAPLRotation('Phase 1', Phase1APL, { customCondition: player => player.getLevel() === 25 }); -export const APLPhase2 = PresetUtils.makePresetAPLRotation('Phase 2', Phase2APL, { customCondition: player => player.getLevel() === 40 }); -export const APLPhase3 = PresetUtils.makePresetAPLRotation('Phase 3', Phase3APL, { customCondition: player => player.getLevel() === 50 }); -export const APLPhase4 = PresetUtils.makePresetAPLRotation('Phase 4', Phase4APL, { customCondition: player => player.getLevel() === 60 }); -export const APLPhase5 = PresetUtils.makePresetAPLRotation('Phase 5', Phase5APL, { customCondition: player => player.getLevel() === 60 }); +export const APLP1Shadow = PresetUtils.makePresetAPLRotation('Shadow', P1APL, { customCondition: player => player.getLevel() === 60 }); export const APLPresets = { - [Phase.Phase1]: [APLPhase1], - [Phase.Phase2]: [APLPhase2], - [Phase.Phase3]: [APLPhase3], - [Phase.Phase4]: [APLPhase4], - [Phase.Phase5]: [APLPhase5], + [Phase.Phase1]: [APLP1Shadow], }; export const DefaultAPLs: Record = { - 25: APLPresets[Phase.Phase1][0], - 40: APLPresets[Phase.Phase2][0], - 50: APLPresets[Phase.Phase3][0], - 60: APLPresets[Phase.Phase4][0], + 60: APLPresets[Phase.Phase1][0], }; /////////////////////////////////////////////////////////////////////////// @@ -73,29 +62,15 @@ export const DefaultAPLs: Record = { // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/classic/talent-calc and copy the numbers in the url. -export const TalentsPhase1 = PresetUtils.makePresetTalents('Level 25', SavedTalents.create({ talentsString: '-20535000001' }), { - customCondition: player => player.getLevel() === 25, -}); -export const TalentsPhase2 = PresetUtils.makePresetTalents('Level 40', SavedTalents.create({ talentsString: '--5022204002501251' }), { - customCondition: player => player.getLevel() === 40, -}); -export const TalentsPhase3 = PresetUtils.makePresetTalents('Level 50', SavedTalents.create({ talentsString: '-0055-5022204002501251' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsPhase4 = PresetUtils.makePresetTalents('Level 60', SavedTalents.create({ talentsString: '0512301302--5002504103501251' }), { +export const TalentsP1Shadow = PresetUtils.makePresetTalents('Shadow', SavedTalents.create({ talentsString: '0512301302--5002504103501251' }), { customCondition: player => player.getLevel() === 60, }); export const TalentPresets = { - [Phase.Phase1]: [TalentsPhase1], - [Phase.Phase2]: [TalentsPhase2], - [Phase.Phase3]: [TalentsPhase3], - [Phase.Phase4]: [TalentsPhase4], - [Phase.Phase5]: [], + [Phase.Phase1]: [TalentsP1Shadow], }; -// TODO: Add Phase 3 preset and pull from map -export const DefaultTalents = TalentPresets[Phase.Phase4][0]; +export const DefaultTalents = TalentPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts index 7b4b323aa..d4a88bfe1 100644 --- a/ui/shadow_priest/sim.ts +++ b/ui/shadow_priest/sim.ts @@ -115,21 +115,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecShadowPriest, { presets: { talents: [ - ...Presets.TalentPresets[Phase.Phase5], - ...Presets.TalentPresets[Phase.Phase4], - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1], ], rotations: [ - ...Presets.APLPresets[Phase.Phase5], - ...Presets.APLPresets[Phase.Phase4], - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1], ], gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase1], ], }, From 72d65bf7e0206569be41ca94f3fb9d18df02621a Mon Sep 17 00:00:00 2001 From: Eric Taylor Date: Sat, 23 Nov 2024 21:27:19 -0500 Subject: [PATCH 2/2] Updated Priest tests --- sim/priest/shadow/TestP1Shadow.results | 196 ++++++++++++++++++++++++ sim/priest/shadow/TestShadow.results | 196 ------------------------ sim/priest/shadow/shadow_priest_test.go | 25 ++- sim/warlock/dps/TestWarlock.results | 196 ------------------------ 4 files changed, 207 insertions(+), 406 deletions(-) create mode 100644 sim/priest/shadow/TestP1Shadow.results delete mode 100644 sim/priest/shadow/TestShadow.results delete mode 100644 sim/warlock/dps/TestWarlock.results diff --git a/sim/priest/shadow/TestP1Shadow.results b/sim/priest/shadow/TestP1Shadow.results new file mode 100644 index 000000000..b13c4b9e1 --- /dev/null +++ b/sim/priest/shadow/TestP1Shadow.results @@ -0,0 +1,196 @@ +character_stats_results: { + key: "TestP1Shadow-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 175.95 + final_stats: 180.55 + final_stats: 476.23225 + final_stats: 372.6 + final_stats: 363.4 + final_stats: 173 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 40 + final_stats: 41.25 + final_stats: 0 + final_stats: 28.05968 + final_stats: 0 + final_stats: 0 + final_stats: 795.95 + final_stats: 0 + final_stats: 16 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 6685 + final_stats: 0 + final_stats: 0 + final_stats: 1052.1 + final_stats: 540 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 3 + final_stats: 5 + final_stats: 0 + final_stats: 6279.3225 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 78 + final_stats: 384 + final_stats: 0 + final_stats: 35 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Shadow-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.08882 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.08882 + weights: 0 + weights: 0.45508 + weights: 0.22314 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Average-Default" + value: { + dps: 49.82754 + tps: 49.52526 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 49.33146 + tps: 82.7582 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 49.33146 + tps: 49.1282 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 48.66608 + tps: 48.15904 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 31.2971 + tps: 30.04522 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 31.2971 + tps: 30.04522 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Dwarf-p0.bis-Basic-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 31.0536 + tps: 29.81145 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 49.15098 + tps: 82.58494 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 49.15098 + tps: 48.95494 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 48.66608 + tps: 48.15904 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 31.2971 + tps: 30.04522 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 31.2971 + tps: 30.04522 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-Settings-Undead-p0.bis-Basic-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 31.0536 + tps: 29.81145 + } +} +dps_results: { + key: "TestP1Shadow-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 49.15098 + tps: 48.95494 + } +} diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results deleted file mode 100644 index b3478b8bf..000000000 --- a/sim/priest/shadow/TestShadow.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestShadow-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 178.25 - final_stats: 185.15 - final_stats: 354.1655 - final_stats: 216.2 - final_stats: 226.55 - final_stats: 150 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 40 - final_stats: 41.25 - final_stats: 0 - final_stats: 25.43216 - final_stats: 0 - final_stats: 0 - final_stats: 798.25 - final_stats: 0 - final_stats: 16 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4339 - final_stats: 0 - final_stats: 0 - final_stats: 370.3 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3 - final_stats: 5 - final_stats: 0 - final_stats: 5058.655 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestShadow-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.21637 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.21637 - weights: 0 - weights: 1.87704 - weights: 0.77573 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Average-Default" - value: { - dps: 286.06733 - tps: 276.95122 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 644.32784 - tps: 810.64669 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 280.56029 - tps: 271.6082 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 286.68517 - tps: 277.38896 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 286.20154 - tps: 448.27043 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 192.23402 - tps: 188.87547 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 196.52876 - tps: 188.66761 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 590.44037 - tps: 781.1205 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 284.04091 - tps: 275.05313 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 280.26214 - tps: 271.34086 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 294.10019 - tps: 455.85314 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 194.36975 - tps: 192.39595 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 191.14629 - tps: 183.50044 - } -} -dps_results: { - key: "TestShadow-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 284.04091 - tps: 275.05313 - } -} diff --git a/sim/priest/shadow/shadow_priest_test.go b/sim/priest/shadow/shadow_priest_test.go index 9e11bf810..ff12c1e71 100644 --- a/sim/priest/shadow/shadow_priest_test.go +++ b/sim/priest/shadow/shadow_priest_test.go @@ -12,20 +12,20 @@ func init() { RegisterShadowPriest() } -func TestShadow(t *testing.T) { +func TestP1Shadow(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassPriest, Level: 60, - Phase: 5, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, + Phase: 1, + Race: proto.Race_RaceUndead, + OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "phase_5"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../../ui/shadow_priest/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../../ui/shadow_priest/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase4Consumes, + Consumes: P1Consumes, SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic}, ItemFilter: ItemFilters, @@ -35,13 +35,10 @@ func TestShadow(t *testing.T) { })) } -var Phase1Talents = "-20535000001" -var Phase2Talents = "--5022204002501251" -var Phase3Talents = "-0055-5022204002501251" -var Phase4Talents = "0512301302--5002504103501251" +var P1Talents = "0512301302--5002504103501251" -var Phase4Consumes = core.ConsumesCombo{ - Label: "P4-Consumes", +var P1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ DefaultPotion: proto.Potions_MajorManaPotion, Flask: proto.Flask_FlaskOfSupremePower, diff --git a/sim/warlock/dps/TestWarlock.results b/sim/warlock/dps/TestWarlock.results deleted file mode 100644 index af3049fbc..000000000 --- a/sim/warlock/dps/TestWarlock.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestWarlock-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 195.5 - final_stats: 194.35 - final_stats: 559.682 - final_stats: 342.7 - final_stats: 258.9225 - final_stats: 496 - final_stats: 0 - final_stats: 40 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 161 - final_stats: 41.25 - final_stats: 0 - final_stats: 32.35455 - final_stats: 0 - final_stats: 0 - final_stats: 815.5 - final_stats: 0 - final_stats: 24.7175 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6233.5 - final_stats: 0 - final_stats: 0 - final_stats: 1974.7 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 11.7175 - final_stats: 5 - final_stats: 0 - final_stats: 7130.82 - final_stats: 43 - final_stats: 75 - final_stats: 76 - final_stats: 60 - final_stats: 85 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestWarlock-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.06971 - weights: 0 - weights: 0.85007 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 9.82568 - weights: 4.96062 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Average-Default" - value: { - dps: 922.93664 - tps: 985.15323 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-LongMultiTarget" - value: { - dps: 910.29517 - tps: 2100.18562 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-LongSingleTarget" - value: { - dps: 910.29517 - tps: 972.17928 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-ShortSingleTarget" - value: { - dps: 944.73183 - tps: 987.76278 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-LongMultiTarget" - value: { - dps: 528.6421 - tps: 1808.84642 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-LongSingleTarget" - value: { - dps: 528.6421 - tps: 593.64701 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-ShortSingleTarget" - value: { - dps: 562.41626 - tps: 613.12879 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongMultiTarget" - value: { - dps: 1122.5486 - tps: 2089.17391 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongSingleTarget" - value: { - dps: 1122.5486 - tps: 951.82139 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-ShortSingleTarget" - value: { - dps: 1177.62985 - tps: 988.25245 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-LongMultiTarget" - value: { - dps: 608.4618 - tps: 1804.7454 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-LongSingleTarget" - value: { - dps: 608.4618 - tps: 591.27545 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-ShortSingleTarget" - value: { - dps: 645.2379 - tps: 613.25236 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 910.29517 - tps: 972.17928 - } -}