Skip to content

Commit

Permalink
Merge pull request wowsims#4031 from wowsims/update-ele-presets
Browse files Browse the repository at this point in the history 
update ele advanced APL + talents
  • Loading branch information
@kayla-glick
kayla-glick authored Nov 12, 2023
2 parents 64e9835 + 90fd76f commit 7de4275
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 84 deletions.
96 changes: 48 additions & 48 deletions sim/shaman/elemental/TestElemental.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,43 +1029,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-LongMultiTarget"
value: {
dps: 8993.67995
tps: 4016.89247
dps: 9840.69885
tps: 4752.84315
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-LongSingleTarget"
value: {
dps: 6322.84125
tps: 3490.3117
dps: 7458.6682
tps: 4125.47809
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-FullBuffs-ShortSingleTarget"
value: {
dps: 9331.908
tps: 4971.78415
dps: 8955.74736
tps: 4674.30922
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-LongMultiTarget"
value: {
dps: 5070.48894
tps: 1770.31215
dps: 5624.96049
tps: 2381.13178
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-LongSingleTarget"
value: {
dps: 2977.50744
tps: 1503.49874
dps: 3878.88818
tps: 2052.11172
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-Adaptive-advanced-NoBuffs-ShortSingleTarget"
value: {
dps: 6049.10665
tps: 3183.46629
dps: 6509.36129
tps: 3357.28864
}
}
dps_results: {
Expand Down Expand Up @@ -1113,43 +1113,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-LongMultiTarget"
value: {
dps: 8993.67995
tps: 4016.89247
dps: 9840.69885
tps: 4752.84315
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-LongSingleTarget"
value: {
dps: 6322.84125
tps: 3490.3117
dps: 7458.6682
tps: 4125.47809
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget"
value: {
dps: 9331.908
tps: 4971.78415
dps: 8955.74736
tps: 4674.30922
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-LongMultiTarget"
value: {
dps: 5070.48894
tps: 1770.31215
dps: 5624.96049
tps: 2381.13178
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-LongSingleTarget"
value: {
dps: 2977.50744
tps: 1503.49874
dps: 3878.88818
tps: 2052.11172
}
}
dps_results: {
key: "TestElemental-Settings-Orc-p1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget"
value: {
dps: 6049.10665
tps: 3183.46629
dps: 6509.36129
tps: 3357.28864
}
}
dps_results: {
Expand Down Expand Up @@ -1197,43 +1197,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-LongMultiTarget"
value: {
dps: 8765.33632
tps: 4002.05751
dps: 9546.15132
tps: 4680.47017
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-LongSingleTarget"
value: {
dps: 6224.1282
tps: 3466.37714
dps: 7396.36835
tps: 4126.68301
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-FullBuffs-ShortSingleTarget"
value: {
dps: 9150.21717
tps: 4927.2039
dps: 9159.66165
tps: 4943.86712
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-LongMultiTarget"
value: {
dps: 4856.26349
tps: 1732.5399
dps: 5462.52243
tps: 2391.51442
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-LongSingleTarget"
value: {
dps: 2931.3259
tps: 1500.98827
dps: 3805.33866
tps: 2029.18744
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-Adaptive-advanced-NoBuffs-ShortSingleTarget"
value: {
dps: 5914.071
tps: 3153.70901
dps: 6557.0291
tps: 3454.07046
}
}
dps_results: {
Expand Down Expand Up @@ -1281,43 +1281,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-LongMultiTarget"
value: {
dps: 8765.33632
tps: 4002.05751
dps: 9546.15132
tps: 4680.47017
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-LongSingleTarget"
value: {
dps: 6224.1282
tps: 3466.37714
dps: 7396.36835
tps: 4126.68301
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-FullBuffs-ShortSingleTarget"
value: {
dps: 9150.21717
tps: 4927.2039
dps: 9159.66165
tps: 4943.86712
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-LongMultiTarget"
value: {
dps: 4856.26349
tps: 1732.5399
dps: 5462.52243
tps: 2391.51442
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-LongSingleTarget"
value: {
dps: 2931.3259
tps: 1500.98827
dps: 3805.33866
tps: 2029.18744
}
}
dps_results: {
key: "TestElemental-Settings-Troll-p1-EleFireElemental-advanced-NoBuffs-ShortSingleTarget"
value: {
dps: 5914.071
tps: 3153.70901
dps: 6557.0291
tps: 3454.07046
}
}
dps_results: {
Expand Down
40 changes: 21 additions & 19 deletions ui/elemental_shaman/apls/advanced.apl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,27 @@
"enabled": true,
"type": "TypeAPL",
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":59159}}},"doAtValue":{"const":{"val":"-5s"}}},
{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}},
{"action":{"castSpell":{"spellId":{"spellId":49238}}},"doAtValue":{"const":{"val":"-1.00s"}}}
{"action":{"castSpell":{"spellId":{"spellId":59159}}},"doAtValue":{"const":{"val":"-5"}}},
{"action":{"castSpell":{"spellId":{"spellId":49238}}},"doAtValue":{"const":{"val":"-3.5"}}},
{"action":{"castSpell":{"spellId":{"spellId":49271}}},"doAtValue":{"const":{"val":"-1.5"}}}
],
"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":{"spellId":60494}}},{"auraIsActive":{"auraId":{"spellId":60064}}},{"auraIsActive":{"auraId":{"itemId":37660}}},{"auraIsActive":{"auraId":{"spellId":64713}}},{"auraIsActive":{"auraId":{"spellId":75466}}},{"auraIsActive":{"auraId":{"spellId":75473}}},{"auraIsActive":{"auraId":{"itemId":47213}}},{"auraIsActive":{"auraId":{"itemId":45490}}},{"auraIsActive":{"auraId":{"spellId":71605}}},{"auraIsActive":{"auraId":{"spellId":71636}}},{"auraIsActive":{"auraId":{"spellId":71570}}},{"auraIsActive":{"auraId":{"spellId":71572}}},{"auraIsActive":{"auraId":{"spellId":72416}}},{"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":40212}}},{"castSpell":{"spellId":{"itemId":37873}}},{"castSpell":{"spellId":{"itemId":45148}}},{"castSpell":{"spellId":{"itemId":48724}}},{"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}}}}
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}}]}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"0s"}}}}]}},"castSpell":{"spellId":{"spellId":2825}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.1s"}}}},"castSpell":{"spellId":{"spellId":16166}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.1s"}}}},"castSpell":{"spellId":{"spellId":54758}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.1s"}}}},"castSpell":{"spellId":{"spellId":26297}}}},
{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":60479}}},{"auraIsActive":{"auraId":{"spellId":60064}}},{"auraIsActive":{"auraId":{"spellId":60494}}},{"auraIsActive":{"auraId":{"spellId":64741}}},{"auraIsActive":{"auraId":{"spellId":64713}}},{"auraIsActive":{"auraId":{"spellId":67669}}},{"auraIsActive":{"auraId":{"spellId":71605}}},{"auraIsActive":{"auraId":{"spellId":71636}}},{"auraIsActive":{"auraId":{"spellId":75466}}},{"auraIsActive":{"auraId":{"spellId":75473}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":40432}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":45308}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50340}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50345}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50353}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50348}}},"rhs":{"const":{"val":"10"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":60479}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":60479}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":60064}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":60064}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":60494}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":60494}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":64741}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":64741}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":64713}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":64713}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":67669}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":67669}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":71605}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":71605}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":71636}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":71636}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75466}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":75466}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75473}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":75473}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":50353}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":50353}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":50348}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":50348}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":40212}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":55637}}},{"auraIsActive":{"auraId":{"spellId":72416}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":40212}}},"rhs":{"const":{"val":"1s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":60479}}},{"auraIsActive":{"auraId":{"spellId":60064}}},{"auraIsActive":{"auraId":{"spellId":60494}}},{"auraIsActive":{"auraId":{"spellId":64741}}},{"auraIsActive":{"auraId":{"spellId":64713}}},{"auraIsActive":{"auraId":{"spellId":67669}}},{"auraIsActive":{"auraId":{"spellId":71605}}},{"auraIsActive":{"auraId":{"spellId":71636}}},{"auraIsActive":{"auraId":{"spellId":75466}}},{"auraIsActive":{"auraId":{"spellId":75473}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":40432}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":45308}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50340}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"itemId":50345}}},"rhs":{"const":{"val":"10"}}}}]}}]}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"itemId":37873}}},{"castSpell":{"spellId":{"itemId":45148}}},{"castSpell":{"spellId":{"itemId":48724}}},{"castSpell":{"spellId":{"itemId":50357}}},{"castSpell":{"spellId":{"spellId":2894}}}]}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58704}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58734}}}}}]}},"castSpell":{"spellId":{"spellId":58704}}}},
{"action":{"multidot":{"spellId":{"spellId":49233},"maxDots":3,"maxOverlap":{"const":{"val":"250ms"}}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"spellCastTime":{"spellId":{"spellId":60043}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":60043}}}}}]}},"castSpell":{"spellId":{"spellId":60043}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49271}}},"rhs":{"const":{"val":".92s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":49271}}}}},{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"4%"}}}}}}]}},"castSpell":{"spellId":{"spellId":49271}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":49238}}},"rhs":{"const":{"val":"1.00s"}}}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"60s"}}}},"castSpell":{"spellId":{"spellId":33697}}}},
{"action":{"castSpell":{"spellId":{"itemId":42641}}}},
{"action":{"castSpell":{"spellId":{"itemId":41119}}}},
{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":49238}}}}},"castSpell":{"spellId":{"spellId":49236}}}},
{"action":{"castSpell":{"spellId":{"spellId":49238}}}},
{"action":{"castSpell":{"spellId":{"spellId":59159}}}}
]
}
}
17 changes: 1 addition & 16 deletions ui/elemental_shaman/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,10 @@ export const ROTATION_PRESET_ADVANCED = PresetUtils.makePresetAPLRotation('Advan
// https://wowhead.com/wotlk/talent-calc and copy the numbers in the url.
export const StandardTalents = {
name: 'Standard',
data: SavedTalents.create({
talentsString: '0532001523212351322301351-005052031',
glyphs: Glyphs.create({
major1: ShamanMajorGlyph.GlyphOfLava,
major2: ShamanMajorGlyph.GlyphOfTotemOfWrath,
major3: ShamanMajorGlyph.GlyphOfLightningBolt,
minor1: ShamanMinorGlyph.GlyphOfThunderstorm,
minor2: ShamanMinorGlyph.GlyphOfWaterShield,
minor3: ShamanMinorGlyph.GlyphOfGhostWolf,
}),
}),
};

export const Phase4Talents = {
name: 'Phase 4',
data: SavedTalents.create({
talentsString: '0533001523213351322301351-005050031',
glyphs: Glyphs.create({
major1: ShamanMajorGlyph.GlyphOfFlameShock,
major1: ShamanMajorGlyph.GlyphOfFlametongueWeapon,
major2: ShamanMajorGlyph.GlyphOfTotemOfWrath,
major3: ShamanMajorGlyph.GlyphOfLightningBolt,
minor1: ShamanMinorGlyph.GlyphOfThunderstorm,
Expand Down
1 change: 0 additions & 1 deletion ui/elemental_shaman/sim.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ 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: [
Expand Down

0 comments on commit 7de4275

Please sign in to comment.