Skip to content

Commit

Permalink
Merge pull request #1055 from wowsims/feature/prot-warr-p3-gear
Browse files Browse the repository at this point in the history 
Adjust optimised gear & APL
  • Loading branch information
@1337LutZ
1337LutZ committed Sep 24, 2024
2 parents 9da767b + 4f51b6b commit 9102be2
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 60 deletions.
48 changes: 24 additions & 24 deletions sim/warrior/protection/TestProtectionWarrior.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-AllItems-AgonyandTorment"
value: {
dps: 4087.94024
tps: 23989.67021
dps: 4090.17781
tps: 24025.40622
}
}
dps_results: {
Expand Down Expand Up @@ -269,15 +269,15 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-AllItems-ColossalDragonplateArmor"
value: {
dps: 4596.05106
tps: 28008.98467
dps: 4597.17686
tps: 28012.07496
}
}
dps_results: {
key: "TestProtectionWarrior-AllItems-ColossalDragonplateBattlegear"
value: {
dps: 5516.56878
tps: 33503.70862
dps: 5520.56479
tps: 33520.72215
}
}
dps_results: {
Expand Down Expand Up @@ -381,15 +381,15 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-AllItems-EarthenBattleplate"
value: {
dps: 4737.01543
tps: 28922.57271
dps: 4739.07464
tps: 28930.37392
}
}
dps_results: {
key: "TestProtectionWarrior-AllItems-EarthenWarplate"
value: {
dps: 5238.00055
tps: 31691.50824
dps: 5242.42067
tps: 31716.33422
}
}
dps_results: {
Expand Down Expand Up @@ -920,8 +920,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-AllItems-MoltenGiantBattleplate"
value: {
dps: 5041.81497
tps: 30508.90582
dps: 5044.57919
tps: 30516.38722
}
}
dps_results: {
Expand Down Expand Up @@ -1543,9 +1543,9 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Average-Default"
value: {
dps: 14642.38122
tps: 84385.04312
dtps: 15160.16151
dps: 14597.59284
tps: 84091.26201
dtps: 14659.32641
}
}
dps_results: {
Expand All @@ -1558,8 +1558,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Settings-Human-p1_bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 5259.74032
tps: 32200.33806
dps: 5260.49504
tps: 32206.26926
}
}
dps_results: {
Expand Down Expand Up @@ -1684,8 +1684,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-p1_bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 5232.20304
tps: 31919.73531
dps: 5233.05254
tps: 31924.34491
}
}
dps_results: {
Expand All @@ -1705,8 +1705,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-p1_bis-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 3425.09066
tps: 21161.42273
dps: 3424.26634
tps: 21157.30114
}
}
dps_results: {
Expand Down Expand Up @@ -1803,8 +1803,8 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-SwitchInFrontOfTarget-Default"
value: {
dps: 16972.19519
tps: 97784.85241
dtps: 15238.65149
dps: 16974.20751
tps: 97427.49502
dtps: 14745.81306
}
}
148 changes: 116 additions & 32 deletions ui/warrior/protection/apls/default.apl.json
View file
Original file line number Diff line number Diff line change
@@ -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 } } } }
]
}
2 changes: 1 addition & 1 deletion ui/warrior/protection/gear_sets/p3_bis.gear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions ui/warrior/protection/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}),
}),
};
Expand Down

0 comments on commit 9102be2

Please sign in to comment.