Merge pull request #1207 from hillerstorm/warrior_normal_aok

[Warrior] Add normal Apparatus to Warrior APLs
wowsims · Nov 15, 2024 · 89e87d6 · 89e87d6
2 parents 3996908 + 0abf831
commit 89e87d6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/sim/warrior/arms/TestArms.results b/sim/warrior/arms/TestArms.results
@@ -73,8 +73,8 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 33583.76403
-  tps: 21820.0181
+  dps: 33503.08089
+  tps: 21737.63025
  }
 }
 dps_results: {

diff --git a/ui/warrior/arms/apls/arms.apl.json b/ui/warrior/arms/apls/arms.apl.json
@@ -8,14 +8,15 @@
 	],
 	"priorityList": [
 	{"action":{"autocastOtherCooldowns":{}}},
+	{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":96923}}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":86346}}}]}},"castSpell":{"spellId":{"itemId":68972}}}},
 	{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":96923}}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":86346}}}]}},"castSpell":{"spellId":{"itemId":69113}}}},
 	{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":46924}}}},
 	{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":12328}}}},
 	{"action":{"condition":{"const":{"val":"false"}},"castSpell":{"spellId":{"spellId":64382}}}},
-	{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
+	{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
 	{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"castSpell":{"spellId":{"spellId":1719}}}},
 	{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"119s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"130s"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":85730}}}},
-	{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":1134}}}},
+	{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"castSpell":{"spellId":{"spellId":1134}}}},
 	{"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}},
 	{"action":{"condition":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":86346}}},"castSpell":{"spellId":{"spellId":6544}}}},
 	{"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":772}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2457}}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":2457}}},{"castSpell":{"spellId":{"spellId":772}}}]}}},

diff --git a/ui/warrior/fury/apls/smf.apl.json b/ui/warrior/fury/apls/smf.apl.json
@@ -41,19 +41,19 @@
 		{ "action": { "condition": { "isExecutePhase": { "threshold": "E20" } }, "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } } },
 		{
 			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } }
-						]
-					}
-				},
+				"condition": { "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } },
+				"castSpell": { "spellId": { "itemId": 68972 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } },
 				"castSpell": { "spellId": { "itemId": 69113 } }
 			}
 		},
 		{
 			"action": {
-				"condition": { "and": { "vals": [{ "cmp": { "op": "OpGe", "lhs": { "currentRage": {} }, "rhs": { "const": { "val": "75" } } } }] } },
+				"condition": { "cmp": { "op": "OpGe", "lhs": { "currentRage": {} }, "rhs": { "const": { "val": "75" } } } },
 				"castSpell": { "spellId": { "spellId": 1134 } }
 			}
 		},
@@ -219,7 +219,7 @@
 				"castSpell": { "spellId": { "spellId": 1680, "tag": 1 } }
 			}
 		},
-		{ "action": { "condition": { "and": {} }, "castSpell": { "spellId": { "spellId": 18499 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 18499 } } } },
 		{
 			"action": {
 				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 99233 } } } } },

diff --git a/ui/warrior/fury/apls/tg.apl.json b/ui/warrior/fury/apls/tg.apl.json
@@ -41,19 +41,19 @@
 		{ "action": { "condition": { "isExecutePhase": { "threshold": "E20" } }, "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } } },
 		{
 			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{ "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } }
-						]
-					}
-				},
+				"condition": { "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } },
+				"castSpell": { "spellId": { "itemId": 68972 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpEq", "lhs": { "auraNumStacks": { "auraId": { "spellId": 96923 } } }, "rhs": { "const": { "val": "5" } } } },
 				"castSpell": { "spellId": { "itemId": 69113 } }
 			}
 		},
 		{
 			"action": {
-				"condition": { "and": { "vals": [{ "cmp": { "op": "OpGe", "lhs": { "currentRage": {} }, "rhs": { "const": { "val": "75" } } } }] } },
+				"condition": { "cmp": { "op": "OpGe", "lhs": { "currentRage": {} }, "rhs": { "const": { "val": "75" } } } },
 				"castSpell": { "spellId": { "spellId": 1134 } }
 			}
 		},
@@ -232,7 +232,7 @@
 				"castSpell": { "spellId": { "spellId": 1680, "tag": 1 } }
 			}
 		},
-		{ "action": { "condition": { "and": {} }, "castSpell": { "spellId": { "spellId": 18499 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 18499 } } } },
 		{
 			"action": {
 				"condition": { "not": { "val": { "auraIsKnown": { "auraId": { "spellId": 99233 } } } } },

diff --git a/ui/warrior/fury/presets.ts b/ui/warrior/fury/presets.ts
@@ -59,7 +59,7 @@ const FURY_TG_PRESET_OPTIONS = {
 export const P3_PRERAID_FURY_SMF_PRESET = PresetUtils.makePresetGear('Preraid - SMF', PreraidFurySMFGear, FURY_SMF_PRESET_OPTIONS);
 export const P3_PRERAID_FURY_TG_PRESET = PresetUtils.makePresetGear('Preraid - TG', PreraidFuryTGGear, FURY_TG_PRESET_OPTIONS);
 export const P1_BIS_FURY_SMF_PRESET = PresetUtils.makePresetGear('P1 - SMF', P1FurySMFGear, FURY_SMF_PRESET_OPTIONS);
-export const P1_BIS_FURY_TG_PRESET = PresetUtils.makePresetGear('P3 - TG', P1FuryTGGear, FURY_TG_PRESET_OPTIONS);
+export const P1_BIS_FURY_TG_PRESET = PresetUtils.makePresetGear('P1 - TG', P1FuryTGGear, FURY_TG_PRESET_OPTIONS);
 export const P3_BIS_FURY_SMF_PRESET = PresetUtils.makePresetGear('P3 - SMF', P3FurySMFGear, FURY_SMF_PRESET_OPTIONS);
 export const P3_BIS_FURY_TG_PRESET = PresetUtils.makePresetGear('P3 - TG', P3FuryTGGear, FURY_TG_PRESET_OPTIONS);