Merge pull request #1358 from wowsims/feature/shadow-p4

Last APL changes
wowsims · Feb 7, 2025 · 9449028 · 9449028
2 parents f8a761c + e400c97
commit 9449028
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/ui/priest/shadow/apls/p4.apl.json b/ui/priest/shadow/apls/p4.apl.json
@@ -10,20 +10,22 @@
 	"priorityList": [
 		{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"200ms"}}}},"moveDuration":{"duration":{"gcdTimeToReady":{}}}}},
 		{"action":{"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}},
-		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":87118}}},"rhs":{"const":{"val":"5"}}}}]}},"sequence":{"name":"sf-da","actions":[{"castSpell":{"spellId":{"spellId":34433}}},{"castSpell":{"spellId":{"spellId":87153}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":87118}}},"rhs":{"const":{"val":"5"}}}},{"spellIsReady":{"spellId":{"spellId":87153}}}]}},"sequence":{"name":"fiend","actions":[{"castSpell":{"spellId":{"spellId":34433}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"gcdIsReady":{}}]}},"sequence":{"name":"archangel","actions":[{"castSpell":{"spellId":{"spellId":87153}}}]}}},
 		{"action":{"condition":{"and":{"vals":[{"isExecutePhase":{"threshold":"E25"}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"90s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":34433}}},"rhs":{"const":{"val":"90s"}}}}]}}]}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
 		{"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"90s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":34433}}},"rhs":{"const":{"val":"90s"}}}}]}}]}},"castAllStatBuffCooldowns":{"statType1":11,"statType2":3,"statType3":14}}},
 		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"spellTimeToReady":{"spellId":{"spellId":34433}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numStatBuffCooldowns":{"statType1":14,"statType2":3,"statType3":11}},"rhs":{"const":{"val":"0"}}}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":34433}}}}}]}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"itemId":77114}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"itemId":77114}}},"rhs":{"const":{"val":"10s"}}}}]}},{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":34433}}}}},{"not":{"val":{"auraIsKnown":{"auraId":{"itemId":77114}}}}},{"cmp":{"op":"OpGt","lhs":{"numStatBuffCooldowns":{"statType1":14,"statType2":3,"statType3":11}},"rhs":{"const":{"val":"0"}}}}]}}]}},"castSpell":{"spellId":{"spellId":82174}}}},
 		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34433}}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":87118}}},"rhs":{"const":{"val":"5"}}}}]}},"channelSpell":{"spellId":{"spellId":15407},"interruptIf":{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":87118}}},"rhs":{"const":{"val":"5"}}}}}}},
-		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"sf-da"}},{"spellIsReady":{"spellId":{"spellId":34433}}},{"spellIsReady":{"spellId":{"spellId":87153}}}]}},"resetSequence":{"sequenceName":"sf-da"}}},
+		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"fiend"}},{"spellIsReady":{"spellId":{"spellId":34433}}}]}},"resetSequence":{"sequenceName":"fiend"}}},
+		{"action":{"condition":{"and":{"vals":[{"sequenceIsComplete":{"sequenceName":"archangel"}},{"spellIsReady":{"spellId":{"spellId":87153}}}]}},"resetSequence":{"sequenceName":"archangel"}}},
 		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":87153}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":77487}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":8092}}}},
 		{"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":32379}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":32379}}}},
 		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":8092}}},"rhs":{"math":{"op":"OpMul","lhs":{"dotTickFrequency":{"spellId":{"spellId":15407}}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":73510}}}},
 		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":34433}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"spellIsReady":{"spellId":{"spellId":8092}}},"rhs":{"gcdTimeToReady":{}}}}}}]}},"channelSpell":{"spellId":{"spellId":15407},"interruptIf":{"spellIsReady":{"spellId":{"spellId":8092}}}}}},
-		{"action":{"condition":{"or":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"sf-da"}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":87153}}},"rhs":{"const":{"val":"10s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":26297}}}},
-		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"sf-da"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":589}}}}}]}},"castSpell":{"spellId":{"spellId":589}}}},
-		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"sf-da"}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":34914}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":34914}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":34914}}}}}}}]}},"castSpell":{"spellId":{"spellId":34914}}}},
-		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"sf-da"}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":2944}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":2944}}}}}]}},"castSpell":{"spellId":{"spellId":2944}}}},
+		{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"archangel"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":87153}}},"rhs":{"const":{"val":"10s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":26297}}}},
+		{"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"archangel"}}}}]}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":589}}}}}]}},"castSpell":{"spellId":{"spellId":589}}}},
+		{"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"archangel"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":34914}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":34914}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":34914}}}}}}}]}},"castSpell":{"spellId":{"spellId":34914}}}},
+		{"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"not":{"val":{"sequenceIsReady":{"sequenceName":"archangel"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":2944}}},"rhs":{"dotTickFrequency":{"spellId":{"spellId":2944}}}}}]}},"castSpell":{"spellId":{"spellId":2944}}}},
 		{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":77487}}}]}},"castSpell":{"spellId":{"spellId":8092}}}},
 		{"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":32379}}},{"isExecutePhase":{"threshold":"E25"}}]}},"castSpell":{"spellId":{"spellId":32379}}}},
 		{"action":{"channelSpell":{"spellId":{"spellId":15407},"interruptIf":{"cmp":{"op":"OpLe","lhs":{"gcdTimeToReady":{}},"rhs":{"channelClipDelay":{}}}}}}},