From 25cd0a85a5df50797847eedeee45fff5b3303f29 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 7 Nov 2023 21:52:42 -0500 Subject: [PATCH] add starfire glyph APL preset (#4018) --- .../{p4.apl.json => p4_focus_glyph.apl.json} | 0 .../apls/p4_starfire_glyph.apl.json | 26 +++++++++++++++++++ ui/balance_druid/presets.ts | 6 +++-- ui/balance_druid/sim.ts | 3 ++- 4 files changed, 32 insertions(+), 3 deletions(-) rename ui/balance_druid/apls/{p4.apl.json => p4_focus_glyph.apl.json} (100%) create mode 100644 ui/balance_druid/apls/p4_starfire_glyph.apl.json diff --git a/ui/balance_druid/apls/p4.apl.json b/ui/balance_druid/apls/p4_focus_glyph.apl.json similarity index 100% rename from ui/balance_druid/apls/p4.apl.json rename to ui/balance_druid/apls/p4_focus_glyph.apl.json diff --git a/ui/balance_druid/apls/p4_starfire_glyph.apl.json b/ui/balance_druid/apls/p4_starfire_glyph.apl.json new file mode 100644 index 0000000000..ffed8379fe --- /dev/null +++ b/ui/balance_druid/apls/p4_starfire_glyph.apl.json @@ -0,0 +1,26 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":48470}}},"doAtValue":{"const":{"val":"-2.3s"}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":48461}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"5s"}}}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":48463}}}}, + {"action":{"castSpell":{"spellId":{"itemId":41119}}}}, + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":65861}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"spellId":53201}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":48518}}},"rhs":{"const":{"val":"8s"}}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48518}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":48518}}},"rhs":{"const":{"val":"8s"}}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48518}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48468}}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":48518}}},"rhs":{"const":{"val":"11s"}}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48518}}}]}},"castSpell":{"spellId":{"spellId":48468}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48468}}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":48517}}},"rhs":{"const":{"val":"2s"}}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48517}}}]}},"castSpell":{"spellId":{"spellId":48468}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIcdIsReadyWithReactionTime":{"auraId":{"spellId":48518}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":48517}}},"rhs":{"const":{"val":"0s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48463}}}}},{"auraIsActive":{"auraId":{"spellId":16886}}}]}},"castSpell":{"spellId":{"spellId":48463}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48518}}}]}},"castSpell":{"spellId":{"spellId":48465}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48517}}}]}},"castSpell":{"spellId":{"spellId":48461}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48468}}}}}]}},"castSpell":{"spellId":{"spellId":48468}}}}, + {"action":{"condition":{"not":{"val":{"auraIcdIsReadyWithReactionTime":{"auraId":{"spellId":48518}}}}},"castSpell":{"spellId":{"spellId":48465}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48461}}}} + ] +} \ No newline at end of file diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index fac932a70e..656852dc1a 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -38,7 +38,8 @@ import P4HordeGear from './gear_sets/p4_horde.gear.json'; import P4AllianceGear from './gear_sets/p4_alliance.gear.json'; import BasicP3AplJson from './apls/basic_p3.apl.json'; -import P4AplJson from './apls/p4.apl.json'; +import P4FocusAplJson from './apls/p4_focus_glyph.apl.json'; +import P4StarfireAplJson from './apls/p4_starfire_glyph.apl.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -53,7 +54,8 @@ export const P4_PRESET_ALLI = PresetUtils.makePresetGear('P4 Preset [A]', P4Alli export const P4_PRESET_HORDE = PresetUtils.makePresetGear('P4 Preset [H]', P4HordeGear, { faction: Faction.Horde }); export const ROTATION_PRESET_P3_APL = PresetUtils.makePresetAPLRotation('P3', BasicP3AplJson); -export const ROTATION_PRESET_P4_APL = PresetUtils.makePresetAPLRotation('P4', P4AplJson); +export const ROTATION_PRESET_P4_FOCUS_APL = PresetUtils.makePresetAPLRotation('P4 Focus Glyph', P4FocusAplJson); +export const ROTATION_PRESET_P4_STARFIRE_APL = PresetUtils.makePresetAPLRotation('P4 Starfire Glyph', P4StarfireAplJson); // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts index ad76e3c1f7..075217e95f 100644 --- a/ui/balance_druid/sim.ts +++ b/ui/balance_druid/sim.ts @@ -121,7 +121,8 @@ export class BalanceDruidSimUI extends IndividualSimUI { ], rotations: [ Presets.ROTATION_PRESET_P3_APL, - Presets.ROTATION_PRESET_P4_APL, + Presets.ROTATION_PRESET_P4_FOCUS_APL, + Presets.ROTATION_PRESET_P4_STARFIRE_APL, ], // Preset gear configurations that the user can quickly select. gear: [