Skip to content

Fix Hamstring spellid in Warrior APLs #124

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

Merged
kayla-glick merged 2 commits into from
May 1, 2025
Merged

Fix Hamstring spellid in Warrior APLs #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f52fa9
Fixed Hamstring spellid in APL.
xorrbit May 1, 2025
4c2da73
Update tests.
xorrbit May 1, 2025
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
58 changes: 29 additions & 29 deletions sim/warrior/dps_warrior/TestP1DPSWarrior.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ character_stats_results: {
stat_weights_results: {
key: "TestP1DPSWarrior-Phase1-StatWeights-Default"
value: {
weights: 0.96616
weights: 0.77151
weights: -0.00261
weights: 0.98078
weights: 0
weights: 0
weights: 0
Expand All @@ -67,9 +67,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: -0.37791
weights: 6.68846
weights: 13.13074
weights: -0.27391
weights: 5.89582
weights: 13.07437
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -99,78 +99,78 @@ stat_weights_results: {
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofHeroism"
value: {
dps: 1498.45336
tps: 1321.24124
dps: 1514.26115
tps: 1342.30038
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofMight"
value: {
dps: 1405.04901
tps: 1241.16647
dps: 1411.58087
tps: 1253.49716
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofWrath"
value: {
dps: 1381.46031
tps: 1222.5459
dps: 1372.62887
tps: 1219.44572
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Champion'sBattlearmor"
value: {
dps: 1542.41851
tps: 1358.53171
dps: 1554.81624
tps: 1374.5202
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Conqueror'sBattlegear"
value: {
dps: 1711.19026
tps: 1503.77901
dps: 1716.98661
tps: 1517.09137
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Dreadnaught'sBattlegear"
value: {
dps: 1426.2555
tps: 1261.16983
dps: 1445.60846
tps: 1283.14519
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-FieldMarshal'sBattlegear"
value: {
dps: 1626.41559
tps: 1431.17041
dps: 1639.21533
tps: 1447.52893
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-LieutenantCommander'sBattlearmor"
value: {
dps: 1542.41851
tps: 1358.53171
dps: 1554.81624
tps: 1374.5202
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Vindicator'sBattlegear"
value: {
dps: 1628.05011
tps: 1437.52616
dps: 1632.96755
tps: 1448.30904
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Warlord'sBattlegear"
value: {
dps: 1626.41559
tps: 1431.17041
dps: 1639.21533
tps: 1447.52893
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Average-Default"
value: {
dps: 1701.62573
tps: 1497.51482
dps: 1711.85471
tps: 1513.92658
}
}
dps_results: {
Expand Down Expand Up @@ -344,7 +344,7 @@ dps_results: {
dps_results: {
key: "TestP1DPSWarrior-Phase1-SwitchInFrontOfTarget-Default"
value: {
dps: 1341.09997
tps: 1184.35514
dps: 1339.11955
tps: 1188.8625
}
}
52 changes: 26 additions & 26 deletions sim/warrior/tank_warrior/TestP1TankWarrior.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ character_stats_results: {
stat_weights_results: {
key: "TestP1TankWarrior-Phase1-StatWeights-Default"
value: {
weights: 0.29453
weights: 0.51166
weights: 0
weights: 0
weights: 0
Expand All @@ -67,7 +67,7 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.33688
weights: 0.14528
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -99,78 +99,78 @@ stat_weights_results: {
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-BattlegearofHeroism"
value: {
dps: 386.24893
tps: 365.43662
dps: 391.23058
tps: 370.6934
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-BattlegearofMight"
value: {
dps: 355.54174
tps: 337.04463
dps: 356.96416
tps: 338.57824
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-BattlegearofWrath"
value: {
dps: 360.92336
tps: 343.55771
dps: 358.69195
tps: 341.97087
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-Champion'sBattlearmor"
value: {
dps: 382.0021
tps: 361.62707
dps: 379.35624
tps: 359.22822
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-Conqueror'sBattlegear"
value: {
dps: 401.17877
tps: 379.50961
dps: 404.28287
tps: 382.85364
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-Dreadnaught'sBattlegear"
value: {
dps: 373.92162
tps: 355.22216
dps: 375.76145
tps: 357.43963
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-FieldMarshal'sBattlegear"
value: {
dps: 404.81728
tps: 382.91819
dps: 405.76713
tps: 383.9593
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-LieutenantCommander'sBattlearmor"
value: {
dps: 382.0021
tps: 361.62707
dps: 379.35624
tps: 359.22822
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-Vindicator'sBattlegear"
value: {
dps: 392.88924
tps: 374.25074
dps: 396.61178
tps: 377.90627
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-AllItems-Warlord'sBattlegear"
value: {
dps: 404.81728
tps: 382.91819
dps: 405.76713
tps: 383.9593
}
}
dps_results: {
key: "TestP1TankWarrior-Phase1-Average-Default"
value: {
dps: 363.12074
tps: 344.27893
dps: 362.96674
tps: 344.38038
}
}
dps_results: {
Expand Down Expand Up @@ -344,7 +344,7 @@ dps_results: {
dps_results: {
key: "TestP1TankWarrior-Phase1-SwitchInFrontOfTarget-Default"
value: {
dps: 304.48298
tps: 291.09941
dps: 305.27226
tps: 292.04107
}
}
2 changes: 1 addition & 1 deletion ui/warrior/apls/dps_no_reck.apl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":11567,"tag":1,"rank":8}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":20569,"tag":1,"rank":5}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":27584,"rank":3}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":7373,"rank":3}}}},
{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"90"}}}},"castSpell":{"spellId":{"spellId":2687}}}},
{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":18499}}}},
{"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":11551,"rank":6}}}}},"castSpell":{"spellId":{"spellId":11551,"rank":6}}}},
Expand Down
2 changes: 1 addition & 1 deletion ui/warrior/apls/dps_reck.apl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},"castSpell":{"spellId":{"spellId":1680}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":11567,"tag":1,"rank":8}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},{"isExecutePhase":{"threshold":"E20"}}]}}]}},"castSpell":{"spellId":{"spellId":20569,"tag":1,"rank":5}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":27584,"rank":3}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":7373,"rank":3}}}},
{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"90"}}}},"castSpell":{"spellId":{"spellId":2687}}}},
{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":1680}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":18499}}}},
{"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":11551,"rank":6}}}}},"castSpell":{"spellId":{"spellId":11551,"rank":6}}}},
Expand Down
Loading