Merge branch 'master' into RogueP5Presetsv2

wowsims · Sep 23, 2024 · 48a2920 · 48a2920
2 parents e010608 + 5101c9f
commit 48a2920
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ui/elemental_shaman/apls/phase_5.apl.json b/ui/elemental_shaman/apls/phase_5.apl.json
@@ -15,8 +15,8 @@
     {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":10432,"rank":7}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"itemId":231281}}}},
     {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"itemId":231281}}},{"auraIsActive":{"auraId":{"itemId":231281}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":231281}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":10414,"rank":7}}}},
     {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"spellId":425336}}}},
-    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":29228,"rank":6}}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"itemId":231281}}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}}]}},"castSpell":{"spellId":{"spellId":29228,"rank":6}}}},
-    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":29228,"rank":6}}},"rhs":{"spellCastTime":{"spellId":{"spellId":408490}}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"itemId":231281}}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}}]}},"castSpell":{"spellId":{"spellId":408490}}}},
+    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":29228,"rank":6}}}}},{"or":{"vals":[{"not":{"val":{"auraIsKnown":{"auraId":{"itemId":231281}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"itemId":231281}}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}}]}},"castSpell":{"spellId":{"spellId":29228,"rank":6}}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":29228,"rank":6}}},"rhs":{"spellCastTime":{"spellId":{"spellId":408490}}}}},{"or":{"vals":[{"not":{"val":{"auraIsKnown":{"auraId":{"itemId":231281}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"itemId":231281}}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}}]}},"castSpell":{"spellId":{"spellId":408490}}}},
     {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":10432,"rank":7}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"spellId":10414,"rank":7}}}},
     {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":408427}}}},
     {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":29228,"rank":6}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":408490}}}}}]}},"castSpell":{"spellId":{"spellId":16166}}}},