Skip to content

Commit

Permalink
Updated apl to include edge case which is sorrowsong
Browse files Browse the repository at this point in the history
  • Loading branch information
@Polynomix
Polynomix committed Nov 4, 2024
1 parent 4e9b5dd commit d836e6b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions sim/shaman/elemental/TestElemental.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1441,8 +1441,8 @@ dps_results: {
dps_results: {
key: "TestElemental-AllItems-Sorrowsong-56400"
value: {
dps: 40255.08429
tps: 637.71639
dps: 40824.08732
tps: 634.25982
}
}
dps_results: {
Expand Down
4 changes: 2 additions & 2 deletions ui/shaman/elemental/apls/aoe.apl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"priorityList": [
{"action":{"autocastOtherCooldowns":{}}},
{"action":{"castSpell":{"spellId":{"spellId":2825}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"currentTime":{}},"rhs":{"remainingTime":{}}}},"rhs":{"const":{"val":"200s"}}}},{"auraIsActive":{"auraId":{"spellId":64701}}}]}},{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"shamanCanSnapshotStrongerFireElemental":{}},{"cmp":{"op":"OpLe","lhs":{"totemRemainingTime":{"totemType":"Fire"}},"rhs":{"const":{"val":"30s"}}}}]}}]}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
{"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"shamanCanSnapshotStrongerFireElemental":{}},{"cmp":{"op":"OpLe","lhs":{"totemRemainingTime":{"totemType":"Fire"}},"rhs":{"const":{"val":"30s"}}}}]}}]}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"math":{"op":"OpAdd","lhs":{"currentTime":{}},"rhs":{"remainingTime":{}}}},"rhs":{"const":{"val":"200s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"30s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":66843}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"currentTime":{}},"rhs":{"remainingTime":{}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"shamanFireElementalDuration":{}},"rhs":{"const":{"val":"20s"}}}}}},{"auraIsActive":{"auraId":{"spellId":64701}}}]}},{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsKnown":{"auraId":{"spellId":91002}}}}},{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":91002}}},{"or":{"vals":[{"and":{"vals":[{"isExecutePhase":{"threshold":"E35"}},{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}},{"and":{"vals":[{"not":{"val":{"isExecutePhase":{"threshold":"E35"}}}},{"or":{"vals":[{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}}]}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"shamanCanSnapshotStrongerFireElemental":{}},{"cmp":{"op":"OpLe","lhs":{"totemRemainingTime":{"totemType":"Fire"}},"rhs":{"const":{"val":"30s"}}}}]}}]}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"math":{"op":"OpAdd","lhs":{"currentTime":{}},"rhs":{"remainingTime":{}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"shamanFireElementalDuration":{}},"rhs":{"const":{"val":"20s"}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"30s"}}}}]}},{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsKnown":{"auraId":{"spellId":91002}}}}},{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":91002}}},{"or":{"vals":[{"and":{"vals":[{"isExecutePhase":{"threshold":"E35"}},{"or":{"vals":[{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}},{"and":{"vals":[{"not":{"val":{"isExecutePhase":{"threshold":"E35"}}}},{"or":{"vals":[{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1.7s"}}}}]}},{"and":{"vals":[{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1"}}}},{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}}]}}]}}]}}]}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"shamanCanSnapshotStrongerFireElemental":{}},{"cmp":{"op":"OpLe","lhs":{"totemRemainingTime":{"totemType":"Fire"}},"rhs":{"const":{"val":"30s"}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":66843}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":8050,"tag":1}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":51505}}}},
{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}},"multidot":{"spellId":{"spellId":8050},"maxDots":2,"maxOverlap":{"const":{"val":"3"}}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":324}}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":8050}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":8042}}}},
Expand Down
Loading

0 comments on commit d836e6b

Please sign in to comment.