Adjust optimised gear & APL

wowsims · Sep 24, 2024 · f598470 · f598470
1 parent cc6ad23
commit f598470
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 36 deletions.
diff --git a/ui/warrior/protection/apls/default.apl.json b/ui/warrior/protection/apls/default.apl.json
@@ -1,41 +1,125 @@
 {
 	"type": "TypeAPL",
 	"simple": {
-	  "cooldowns": {
-	  }
+		"cooldowns": {}
 	},
 	"prepullActions": [
-	  {"action":{"castSpell":{"spellId":{"spellId":71}}},"doAtValue":{"const":{"val":"-10s"}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":6673}}},"doAtValue":{"const":{"val":"-3s"}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":18499}}},"doAtValue":{"const":{"val":"-1.5s"}}},
-	  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
+		{ "action": { "castSpell": { "spellId": { "spellId": 71 } } }, "doAtValue": { "const": { "val": "-10s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 6673 } } }, "doAtValue": { "const": { "val": "-3s" } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 18499 } } }, "doAtValue": { "const": { "val": "-1.5s" } } },
+		{ "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAtValue": { "const": { "val": "-1s" } } }
 	],
 	"priorityList": [
-	  {"action":{"schedule":{"schedule":"0s","innerAction":{"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}}}},
-	  {"action":{"schedule":{"schedule":"60s","innerAction":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}}},
-	  {"hide":true,"action":{"schedule":{"schedule":"0","innerAction":{"castSpell":{"spellId":{"spellId":64382}}}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":89637}}}},
-	  {"hide":true,"action":{"castSpell":{"spellId":{"spellId":82176}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":82174}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":2565}}}},
-	  {"hide":true,"action":{"schedule":{"schedule":"0s, 30s","innerAction":{"castSpell":{"spellId":{"spellId":2565}}}}}},
-	  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":12975}}}},
-	  {"hide":true,"action":{"schedule":{"schedule":"29s, 209s","innerAction":{"castSpell":{"spellId":{"spellId":12975}}}}}},
-	  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"20%"}}}},"castSpell":{"spellId":{"spellId":871}}}},
-	  {"hide":true,"action":{"schedule":{"schedule":"29s, 209s","innerAction":{"castSpell":{"spellId":{"spellId":871}}}}}},
-	  {"hide":true,"action":{"autocastOtherCooldowns":{}}},
-	  {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":78}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":23922}}}},
-	  {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":94009}}}}},"castSpell":{"spellId":{"spellId":772}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":6572}}}},
-	  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":94009}}},"rhs":{"const":{"val":"14s"}}}},"castSpell":{"spellId":{"spellId":6343}}}},
-	  {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":6343},"maxOverlap":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":6343}}}},
-	  {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":1160},"maxOverlap":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":1160}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":12809}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":46968}}}},
-	  {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":87096}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":46968}}}},
-	  {"action":{"condition":{"auraShouldRefresh":{"sourceUnit":{"type":"Self"},"auraId":{"spellId":6673},"maxOverlap":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":6673}}}},
-	  {"action":{"castSpell":{"spellId":{"spellId":20243}}}},
-	  {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":71}}}}},"castSpell":{"spellId":{"spellId":71}}}}
+		{ "action": { "schedule": { "schedule": "0s", "innerAction": { "castSpell": { "spellId": { "spellId": 2825, "tag": -1 } } } } } },
+		{ "action": { "schedule": { "schedule": "60s", "innerAction": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } } } } },
+		{ "hide": true, "action": { "schedule": { "schedule": "0", "innerAction": { "castSpell": { "spellId": { "spellId": 64382 } } } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 89637 } } } },
+		{
+			"action": {
+				"sequence": {
+					"name": "tinkers",
+					"actions": [{ "castSpell": { "spellId": { "spellId": 82174 } } }, { "castSpell": { "spellId": { "spellId": 82176 } } }]
+				}
+			}
+		},
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpLe", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "35%" } } } },
+				"sequence": {
+					"name": "trinkets",
+					"actions": [
+						{ "castSpell": { "spellId": { "itemId": 69109 } } },
+						{ "castSpell": { "spellId": { "itemId": 68915 } } },
+						{ "castSpell": { "spellId": { "itemId": 68996 } } }
+					]
+				}
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 2565 } } } },
+		{
+			"action": {
+				"condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 2565 } } } } },
+				"castSpell": { "spellId": { "itemId": 65109 } }
+			}
+		},
+		{ "hide": true, "action": { "schedule": { "schedule": "0s, 30s", "innerAction": { "castSpell": { "spellId": { "spellId": 2565 } } } } } },
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpLe", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "40%" } } } },
+				"castSpell": { "spellId": { "spellId": 12975 } }
+			}
+		},
+		{ "hide": true, "action": { "schedule": { "schedule": "29s, 209s", "innerAction": { "castSpell": { "spellId": { "spellId": 12975 } } } } } },
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpLe", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "30%" } } } },
+				"castSpell": { "spellId": { "spellId": 871 } }
+			}
+		},
+		{ "hide": true, "action": { "schedule": { "schedule": "29s, 209s", "innerAction": { "castSpell": { "spellId": { "spellId": 871 } } } } } },
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpLe", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "20%" } } } },
+				"castSpell": { "spellId": { "itemId": 5512 } }
+			}
+		},
+		{ "hide": true, "action": { "autocastOtherCooldowns": {} } },
+		{
+			"action": {
+				"condition": { "cmp": { "op": "OpGe", "lhs": { "currentRage": {} }, "rhs": { "const": { "val": "50" } } } },
+				"castSpell": { "spellId": { "spellId": 78 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 23922 } } } },
+		{
+			"action": {
+				"condition": { "not": { "val": { "auraIsActive": { "sourceUnit": { "type": "CurrentTarget" }, "auraId": { "spellId": 94009 } } } } },
+				"castSpell": { "spellId": { "spellId": 772 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 6572 } } } },
+		{
+			"action": {
+				"condition": {
+					"cmp": {
+						"op": "OpLe",
+						"lhs": { "auraRemainingTime": { "sourceUnit": { "type": "CurrentTarget" }, "auraId": { "spellId": 94009 } } },
+						"rhs": { "const": { "val": "14s" } }
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 6343 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraShouldRefresh": { "auraId": { "spellId": 6343 }, "maxOverlap": { "const": { "val": "3s" } } } },
+				"castSpell": { "spellId": { "spellId": 6343 } }
+			}
+		},
+		{
+			"action": {
+				"condition": { "auraShouldRefresh": { "auraId": { "spellId": 1160 }, "maxOverlap": { "const": { "val": "3s" } } } },
+				"castSpell": { "spellId": { "spellId": 1160 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 12809 } } } },
+		{ "action": { "castSpell": { "spellId": { "spellId": 46968 } } } },
+		{
+			"hide": true,
+			"action": {
+				"condition": { "cmp": { "op": "OpGe", "lhs": { "auraNumStacks": { "auraId": { "spellId": 87096 } } }, "rhs": { "const": { "val": "1" } } } },
+				"castSpell": { "spellId": { "spellId": 46968 } }
+			}
+		},
+		{
+			"action": {
+				"condition": {
+					"auraShouldRefresh": { "sourceUnit": { "type": "Self" }, "auraId": { "spellId": 6673 }, "maxOverlap": { "const": { "val": "3s" } } }
+				},
+				"castSpell": { "spellId": { "spellId": 6673 } }
+			}
+		},
+		{ "action": { "castSpell": { "spellId": { "spellId": 20243 } } } },
+		{ "action": { "condition": { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 71 } } } } }, "castSpell": { "spellId": { "spellId": 71 } } } }
 	]
 }
diff --git a/ui/warrior/protection/gear_sets/p3_bis.gear.json b/ui/warrior/protection/gear_sets/p3_bis.gear.json
@@ -13,7 +13,7 @@
 		{ "id": 70934, "gems": [52210], "reforging": 126 },
 		{ "id": 60226, "gems": [52242], "reforging": 143 },
 		{ "id": 69109 },
-		{ "id": 65048 },
+		{ "id": 69138 },
 		{ "id": 71406, "enchant": 4098 },
 		{ "id": 71460, "enchant": 4085, "gems": [52242, 52242], "reforging": 133 },
 		{ "id": 71592, "reforging": 161 }

diff --git a/ui/warrior/protection/presets.ts b/ui/warrior/protection/presets.ts
@@ -76,9 +76,9 @@ export const StandardTalents = {
 			major1: WarriorMajorGlyph.GlyphOfShieldWall,
 			major2: WarriorMajorGlyph.GlyphOfShockwave,
 			major3: WarriorMajorGlyph.GlyphOfThunderClap,
-			minor1: WarriorMinorGlyph.GlyphOfShatteringThrow,
-			minor2: WarriorMinorGlyph.GlyphOfDemoralizingShout,
-			minor3: WarriorMinorGlyph.GlyphOfCommand,
+			minor1: WarriorMinorGlyph.GlyphOfBattle,
+			minor2: WarriorMinorGlyph.GlyphOfBerserkerRage,
+			minor3: WarriorMinorGlyph.GlyphOfDemoralizingShout,
 		}),
 	}),
 };