Skip to content

Commit

Permalink
Merge pull request #3758 from wowsims/phase-4-bis
Browse files Browse the repository at this point in the history 
Add Elemental phase 4 presets
  • Loading branch information
@kayla-glick
kayla-glick authored Sep 26, 2023
2 parents c110da2 + 3be825c commit 28f44a0
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 58 deletions.
185 changes: 127 additions & 58 deletions ui/elemental_shaman/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ export const StandardTalents = {
}),
};

export const Phase4Talents = {
name: 'Phase 4',
data: SavedTalents.create({
talentsString: '0533001523213351322301351-005050031',
glyphs: Glyphs.create({
major1: ShamanMajorGlyph.GlyphOfFlameShock,
major2: ShamanMajorGlyph.GlyphOfTotemOfWrath,
major3: ShamanMajorGlyph.GlyphOfLightningBolt,
minor1: ShamanMinorGlyph.GlyphOfThunderstorm,
minor2: ShamanMinorGlyph.GlyphOfWaterShield,
minor3: ShamanMinorGlyph.GlyphOfGhostWolf,
}),
}),
};

export const DefaultRotation = ElementalShamanRotation.create({
totems: ShamanTotems.create({
earth: EarthTotem.StrengthOfEarthTotem,
Expand Down Expand Up @@ -125,76 +140,98 @@ 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}
]}`),
{"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<Spec.SpecElementalShaman>) => 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}
]
}`),
{"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<Spec.SpecElementalShaman>) => 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}
]
}`),
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_DEFAULT = {
Expand Down Expand Up @@ -224,4 +261,36 @@ export const ROTATION_PRESET_DEFAULT = {
]
}`),
}),
};
};

export const ROTATION_PRESET_ADVANCED = {
name: 'Advanced APL',
rotation: SavedRotation.create({
specRotationOptionsJson: ElementalShamanRotation.toJsonString(DefaultRotation),
rotation: APLRotation.fromJsonString(`{
"enabled": true,
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":59159}}},"doAtValue":{"const":{"val":"-3.75s"}}},
{"action":{"castSpell":{"spellId":{"spellId":49238}}},"doAtValue":{"const":{"val":"-2.50s"}}},
{"action":{"castSpell":{"spellId":{"spellId":49271}}},"doAtValue":{"const":{"val":"-1.03s"}}}
],
"priorityList": [
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}},{"spellIsReady":{"spellId":{"spellId":2825,"tag":-1}}}]}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}},
{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},{"spellIsReady":{"spellId":{"spellId":2825}}}]}},"castSpell":{"spellId":{"spellId":2825}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":16166}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.0s"}}}}]}},"castSpell":{"spellId":{"spellId":16166}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":54758}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2825,"tag":-1}}}}},{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"41s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"auraIsActive":{"auraId":{"itemId":40255}}},{"auraIsActive":{"auraId":{"itemId":40682}}},{"auraIsActive":{"auraId":{"itemId":37660}}},{"auraIsActive":{"auraId":{"itemId":45518}}},{"auraIsActive":{"auraId":{"itemId":54572}}},{"auraIsActive":{"auraId":{"itemId":54588}}},{"auraIsActive":{"auraId":{"itemId":47213}}},{"auraIsActive":{"auraId":{"itemId":45490}}},{"auraIsActive":{"auraId":{"spellId":71636}}},{"auraIsActive":{"auraId":{"itemId":50365}}},{"auraIsActive":{"auraId":{"itemId":50345}}},{"auraIsActive":{"auraId":{"itemId":50340}}},{"auraIsActive":{"auraId":{"itemId":50398}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":50353}}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":50348}}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":60486}}},"rhs":{"const":{"val":"10"}}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"itemId":50357}}},{"castSpell":{"spellId":{"spellId":2894}}}]}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58704}}}}},{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"120"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20s"}}}}]}},"castSpell":{"spellId":{"spellId":58704}}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49233}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}}]}},"multidot":{"spellId":{"spellId":49233},"maxDots":3,"maxOverlap":{"const":{"val":"10ms"}}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":49271}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49271}}},"rhs":{"const":{"val":".92s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":".98s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":60043}}}}}]}},"castSpell":{"spellId":{"spellId":49271}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":".98s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":".98s"}}}},{"spellIsReady":{"spellId":{"spellId":60043}}}]}},"castSpell":{"spellId":{"spellId":60043}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"itemId":40211}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.00s"}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":33697}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"itemId":42641}}}]}},"castSpell":{"spellId":{"itemId":42641}}}},
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"itemId":41119}}},{"not":{"val":{"spellIsReady":{"spellId":{"itemId":42641}}}}}]}},"castSpell":{"spellId":{"itemId":41119}}}},
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"1.25s"}}}},"castSpell":{"spellId":{"spellId":49238}}}},
{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":".97s"}}}},"castSpell":{"spellId":{"spellId":49236}}}}
]
}`),
}),
}
3 changes: 3 additions & 0 deletions ui/elemental_shaman/sim.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@ export class ElementalShamanSimUI extends IndividualSimUI<Spec.SpecElementalSham
// Preset talents that the user can quickly select.
talents: [
Presets.StandardTalents,
Presets.Phase4Talents,
],
// Preset rotations that the user can quickly select.
rotations: [
Presets.ROTATION_PRESET_DEFAULT,
Presets.ROTATION_PRESET_ADVANCED,
],
// Preset gear configurations that the user can quickly select.
gear: [
Expand All @@ -168,6 +170,7 @@ export class ElementalShamanSimUI extends IndividualSimUI<Spec.SpecElementalSham
Presets.P2_PRESET,
Presets.P3_PRESET_ALLI,
Presets.P3_PRESET_HORDE,
Presets.P4_PRESET,
],
},

Expand Down
2 changes: 2 additions & 0 deletions ui/raid/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,13 @@ export const playerPresets: Array<PresetSpecSettings<any>> = [
1: ElementalShamanPresets.P1_PRESET.gear,
2: ElementalShamanPresets.P2_PRESET.gear,
3: ElementalShamanPresets.P3_PRESET_ALLI.gear,
4: ElementalShamanPresets.P4_PRESET.gear,
},
[Faction.Horde]: {
1: ElementalShamanPresets.P1_PRESET.gear,
2: ElementalShamanPresets.P2_PRESET.gear,
3: ElementalShamanPresets.P3_PRESET_HORDE.gear,
4: ElementalShamanPresets.P4_PRESET.gear,
},
},
tooltip: specNames[Spec.SpecElementalShaman],
Expand Down

0 comments on commit 28f44a0

Please sign in to comment.