Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warrior: update fury APL #4045

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Warrior: update fury APL #4045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sim/rogue/TestAssassination.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ character_stats_results: {
final_stats: 221
final_stats: 0
final_stats: 5504.84
final_stats: 469.94995
final_stats: 469.94994
final_stats: 2072.9756
final_stats: 221
final_stats: 94
Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/TestCombat.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ character_stats_results: {
final_stats: 264
final_stats: 0
final_stats: 5996.3904
final_stats: 418.94995
final_stats: 418.94994
final_stats: 2218.9399
final_stats: 264
final_stats: 94
Expand Down
48 changes: 24 additions & 24 deletions sim/warrior/dps/TestFury.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,43 +932,43 @@ dps_results: {
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-LongMultiTarget"
value: {
dps: 10279.11986
tps: 8011.90491
dps: 10294.60824
tps: 8016.90735
}
}
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-LongSingleTarget"
value: {
dps: 6975.30394
tps: 5188.47019
dps: 6955.40821
tps: 5169.2826
}
}
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-FullBuffs-ShortSingleTarget"
value: {
dps: 8351.86484
tps: 6205.71951
dps: 8347.45997
tps: 6188.65399
}
}
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-LongMultiTarget"
value: {
dps: 4398.47104
tps: 3574.68804
dps: 4394.68747
tps: 3569.94332
}
}
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-LongSingleTarget"
value: {
dps: 2781.44964
tps: 2099.54141
dps: 2797.06729
tps: 2107.61812
}
}
dps_results: {
key: "TestFury-Settings-Human-p1_fury-Basic-fury-NoBuffs-ShortSingleTarget"
value: {
dps: 2993.62836
tps: 2267.44841
dps: 3038.98566
tps: 2297.15898
}
}
dps_results: {
Expand Down Expand Up @@ -1016,43 +1016,43 @@ dps_results: {
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-LongMultiTarget"
value: {
dps: 10441.07954
tps: 8135.12736
dps: 10435.10341
tps: 8132.46118
}
}
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-LongSingleTarget"
value: {
dps: 6957.8002
tps: 5172.53591
dps: 6964.93261
tps: 5177.34824
}
}
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-FullBuffs-ShortSingleTarget"
value: {
dps: 8433.41303
tps: 6256.22466
dps: 8385.2664
tps: 6218.08828
}
}
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-LongMultiTarget"
value: {
dps: 4440.7641
tps: 3610.83804
dps: 4418.12696
tps: 3589.70524
}
}
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-LongSingleTarget"
value: {
dps: 2829.25095
tps: 2134.76157
dps: 2797.24399
tps: 2107.99386
}
}
dps_results: {
key: "TestFury-Settings-Orc-p1_fury-Basic-fury-NoBuffs-ShortSingleTarget"
value: {
dps: 3106.30985
tps: 2350.90578
dps: 3131.51163
tps: 2357.99182
}
}
dps_results: {
Expand Down
63 changes: 33 additions & 30 deletions ui/warrior/apls/fury.apl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
{
"type": "TypeAPL",
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-20s"}}},
{"action":{"castSpell":{"spellId":{"spellId":2687}}},"doAtValue":{"const":{"val":"-10s"}}},
{"action":{"castSpell":{"spellId":{"spellId":18499}}},"doAtValue":{"const":{"val":"-5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":1719}}},"doAtValue":{"const":{"val":"-3s"}}},
{"action":{"castSpell":{"spellId":{"spellId":12292}}},"doAtValue":{"const":{"val":"-1.5s"}}},
{"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-0.5s"}}}
],
"priorityList": [
{"action":{"autocastOtherCooldowns":{}}},
{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":2458}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":2687}}}},
{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":47467}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}}}}]}},"castSpell":{"spellId":{"spellId":47467}}}},
{"hide":true,"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":47467},"maxOverlap":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":47467}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":12292}}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":47520,"tag":1}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":47450,"tag":1}}}},
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"castSpell":{"spellId":{"spellId":23881}}}},
{"action":{"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"spellId":64382}}}},
{"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":70847}}},{"auraIsActive":{"auraId":{"spellId":46916}}}]}},"castSpell":{"spellId":{"spellId":47475}}}},
{"hide":true,"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":47467},"maxOverlap":{"const":{"val":"8s"}}}},"castSpell":{"spellId":{"spellId":47467}}}},
{"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":47471}}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":47465}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":1680}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":23881}}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":2457}}},{"castSpell":{"spellId":{"spellId":47465}}},{"castSpell":{"spellId":{"spellId":2458}}}]}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":68051}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":1680}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":23881}}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":2457}}},{"castSpell":{"spellId":{"spellId":7384}}},{"castSpell":{"spellId":{"spellId":2458}}}]}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":57755}}}},
{"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2458}}}}},"castSpell":{"spellId":{"spellId":2458}}}}
]
}
"type": "TypeAPL",
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-20s"}}},
{"action":{"castSpell":{"spellId":{"spellId":2687}}},"doAtValue":{"const":{"val":"-10s"}}},
{"action":{"castSpell":{"spellId":{"spellId":18499}}},"doAtValue":{"const":{"val":"-5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":1719}}},"doAtValue":{"const":{"val":"-3s"}}},
{"action":{"castSpell":{"spellId":{"spellId":12292}}},"doAtValue":{"const":{"val":"-1.5s"}}},
{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-0.5s"}}}
],
"priorityList": [
{"action":{"autocastOtherCooldowns":{}}},
{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":2458}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":2687}}}},
{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":47467}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}}}}]}},"castSpell":{"spellId":{"spellId":47467}}}},
{"hide":true,"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":47467},"maxOverlap":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":47467}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":12292}}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":47520,"tag":1}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":47450,"tag":1}}}},
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"castSpell":{"spellId":{"spellId":23881}}}},
{"action":{"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"6s"}}}},"castSpell":{"spellId":{"spellId":64382}}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":46916}}},{"auraIsActive":{"auraId":{"spellId":70847}}}]}}]}},"castSpell":{"spellId":{"spellId":47475}}}},
{"hide":true,"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":47467},"maxOverlap":{"const":{"val":"8s"}}}},"castSpell":{"spellId":{"spellId":47467}}}},
{"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":47471}}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":47465}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":23881}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":2457}}},{"castSpell":{"spellId":{"spellId":47465}}},{"castSpell":{"spellId":{"spellId":2458}}}]}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":68051}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":23881}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":2457}}},{"castSpell":{"spellId":{"spellId":7384}}},{"castSpell":{"spellId":{"spellId":2458}}}]}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":23881}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":57755}}}},
{"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2458}}}}},"castSpell":{"spellId":{"spellId":2458}}}}
]
}



Loading
Loading