Remove 120s duration check and update apl

wowsims · Nov 1, 2024 · 01e3936 · 01e3936
1 parent 0c9f09c
commit 01e3936
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ui/shaman/elemental/apls/aoe.apl.json b/ui/shaman/elemental/apls/aoe.apl.json
@@ -10,7 +10,7 @@
 		{"action":{"castSpell":{"spellId":{"spellId":2825}}}},
 		{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":2894}}},"rhs":{"const":{"val":"90"}}}},"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}}},
 		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":2894}}},"rhs":{"const":{"val":"30"}}}}}},{"spellIsReady":{"spellId":{"spellId":2894}}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
-		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}}]}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}}]}},"strictSequence":{"actions":[{"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}},{"castSpell":{"spellId":{"spellId":66843}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}}]}}]}}]}},{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}}]}},"strictSequence":{"actions":[{"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}},{"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}}}},

diff --git a/ui/shaman/elemental/apls/default.apl.json b/ui/shaman/elemental/apls/default.apl.json
@@ -10,7 +10,7 @@
 		{"action":{"castSpell":{"spellId":{"spellId":2825}}}},
 		 {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":2894}}},"rhs":{"const":{"val":"90"}}}},"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}}},
 		{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":2894}}},"rhs":{"const":{"val":"30"}}}}}},{"spellIsReady":{"spellId":{"spellId":2894}}}]}},"castSpell":{"spellId":{"itemId":58091}}}},
-		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}}]}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"120s"}}}}]}},{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}}]}},"strictSequence":{"actions":[{"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}},{"castSpell":{"spellId":{"spellId":66843}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"allTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}},{"cmp":{"op":"OpLe","lhs":{"trinketProcsMinRemainingTime":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"auraIsActive":{"auraId":{"itemId":58091}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":75170}}},{"auraIsActive":{"auraId":{"spellId":74241}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":58091}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpEq","lhs":{"numEquippedStatProcTrinkets":{"statType1":3,"statType2":14,"statType3":-1}},"rhs":{"const":{"val":"0"}}}}]}}]}}]}},{"anyTrinketStatProcsActive":{"statType1":3,"statType2":14,"statType3":-1}}]}}]}},{"spellCanCast":{"spellId":{"spellId":2894}}}]}},"strictSequence":{"actions":[{"castAllStatBuffCooldowns":{"statType1":3,"statType2":14,"statType3":-1}},{"castSpell":{"spellId":{"spellId":66843}}}]}}},
 		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":3599}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"spellId":3599}}}},
 		{"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"}}}}},

diff --git a/ui/shaman/elemental/presets.ts b/ui/shaman/elemental/presets.ts
@@ -154,12 +154,12 @@ export const DefaultConsumes = Consumes.create({
 
 const ENCOUNTER_SINGLE_TARGET = PresetUtils.makePresetEncounter(
 	'Single Target Dummy',
-	'http://localhost:5173/cata/shaman/elemental/?i=e#eJyTYhJgVzrO5MHMyQACDWkOgmAGg4iD5KyZIHDS3hIicsFeMQ0Mrtk7nj0DAm/sjXqYClZ9ZqziDkrMTFEISSxKTy1RiJBg17rByEAPENDiQE3jGlKOI5vnYzF3jiO6GnBoNCzidJzJCAmgm/ZQNSwOAHLgKDE=',
+	'http://localhost:5173/cata/shaman/elemental/?i=e#eJyTYhJgVzrO5MHMyQACB4ocBMEMBj8HyVkzQeCkvSVE5IK9YhoYXLN3PHsGBN7YG/UwFaz6zFjFHZSYmaIQkliUnlqiECHBrnWDkYEeIKDFgZrGNaQcRzbPx2LuHEd0NeDQaFjE6TiTERJAN+2halgcABeZKLc=',
 );
 
 const ENCOUNTER_CLEAVE = PresetUtils.makePresetEncounter(
 	'Cleave',
-	'http://localhost:5173/cata/shaman/elemental/?i=e#eJyTYhJgV7rG4sHMyQACDWkOgmAGg4iD5KyZIHDS3hIicsFeMQ0Mrtk7nj0DAm/sjXqYClZ9ZqziDkrMTFEISSxKTy1RiJBg17rByEAPENDiQE3jGlKOI5vnYzF3jiO6GnBoNCzidJzJCAmgm/ZQNSwOo8GBEhwAGew9pg==',
+	'http://localhost:5173/cata/shaman/elemental/?i=e#eJyTYhJgV7rG4sHMyQACB4ocBMEMBj8HyVkzQeCkvSVE5IK9YhoYXLN3PHsGBN7YG/UwFaz6zFjFHZSYmaIQkliUnlqiECHBrnWDkYEeIKDFgZrGNaQcRzbPx2LuHEd0NeDQaFjE6TiTERJAN+2halgcRoMDJTgATH8+LA==',
 );
 
 const ENCOUNTER_AOE = PresetUtils.makePresetEncounter(