Skip to content

Commit

Permalink
Merge pull request #4058 from Shaklor/blood_dk_apl_consolidation
Browse files Browse the repository at this point in the history 
Set Ardyk Blood DK DPS APL as default
  • Loading branch information
@rosenrusinov
rosenrusinov authored Nov 23, 2023
2 parents 2dca17b + 6cd808c commit c45eb51
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 196 deletions.
156 changes: 36 additions & 120 deletions sim/deathknight/dps/TestBlood.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,87 +867,45 @@ dps_results: {
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-FullBuffs-LongMultiTarget"
value: {
dps: 28951.18292
tps: 15720.99978
dps: 28139.90638
tps: 15108.50144
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-FullBuffs-LongSingleTarget"
value: {
dps: 10331.16727
tps: 5474.36126
dps: 10799.86524
tps: 5457.71051
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-FullBuffs-ShortSingleTarget"
value: {
dps: 14103.30036
tps: 6473.24717
dps: 14071.67977
tps: 6364.68779
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-NoBuffs-LongMultiTarget"
value: {
dps: 15854.16826
tps: 8640.46288
dps: 14150.92248
tps: 7833.97981
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-NoBuffs-LongSingleTarget"
value: {
dps: 5928.15696
tps: 3157.98341
dps: 6238.76131
tps: 3166.87838
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget"
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_dps-NoBuffs-ShortSingleTarget"
value: {
dps: 7455.47863
tps: 3383.84205
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget"
value: {
dps: 27355.96888
tps: 15582.79538
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget"
value: {
dps: 10250.01878
tps: 5416.21838
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget"
value: {
dps: 13772.45173
tps: 6214.02319
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget"
value: {
dps: 14565.12591
tps: 8249.45013
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget"
value: {
dps: 5797.85968
tps: 3081.19385
}
}
dps_results: {
key: "TestBlood-Settings-Human-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget"
value: {
dps: 7230.17097
tps: 3241.53317
dps: 7462.83055
tps: 3351.28085
}
}
dps_results: {
Expand Down Expand Up @@ -993,87 +951,45 @@ dps_results: {
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongMultiTarget"
value: {
dps: 29214.1003
tps: 15764.84094
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-LongSingleTarget"
value: {
dps: 10451.38922
tps: 5506.62831
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-FullBuffs-ShortSingleTarget"
value: {
dps: 14343.80138
tps: 6519.4248
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongMultiTarget"
value: {
dps: 16026.11956
tps: 8681.04755
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-LongSingleTarget"
value: {
dps: 5992.87941
tps: 3175.15581
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti-NoBuffs-ShortSingleTarget"
value: {
dps: 7584.50062
tps: 3409.42861
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongMultiTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-FullBuffs-LongMultiTarget"
value: {
dps: 27435.83336
tps: 15583.92529
dps: 28379.47981
tps: 15149.37461
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-LongSingleTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-FullBuffs-LongSingleTarget"
value: {
dps: 10344.8979
tps: 5433.10233
dps: 10922.48275
tps: 5475.95425
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-FullBuffs-ShortSingleTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-FullBuffs-ShortSingleTarget"
value: {
dps: 14017.38132
tps: 6258.46268
dps: 14322.42988
tps: 6412.37915
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongMultiTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-NoBuffs-LongMultiTarget"
value: {
dps: 14581.7378
tps: 8230.81728
dps: 14237.94211
tps: 7850.23063
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-LongSingleTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-NoBuffs-LongSingleTarget"
value: {
dps: 5851.11811
tps: 3091.2155
dps: 6308.28269
tps: 3177.31227
}
}
dps_results: {
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_pesti_dd-NoBuffs-ShortSingleTarget"
key: "TestBlood-Settings-Orc-p3_blood-Basic-blood_dps-NoBuffs-ShortSingleTarget"
value: {
dps: 7363.20325
tps: 3268.95549
dps: 7597.49472
tps: 3378.5377
}
}
dps_results: {
Expand Down
3 changes: 1 addition & 2 deletions sim/deathknight/dps/dps_deathknight_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ func TestBlood(t *testing.T) {
Consumes: FullConsumes,
SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBlood},
OtherRotations: []core.RotationCombo{
core.GetAplRotation("../../../ui/deathknight/apls", "blood_pesti"),
core.GetAplRotation("../../../ui/deathknight/apls", "blood_pesti_dd"),
core.GetAplRotation("../../../ui/deathknight/apls", "blood_dps"),
},

ItemFilter: ItemFilter,
Expand Down
33 changes: 33 additions & 0 deletions ui/deathknight/apls/blood_dps.apl.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "TypeAPL",
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}},
{"action":{"castSpell":{"spellId":{"spellId":49938}}},"doAtValue":{"const":{"val":"-16s"}}},
{"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-8.5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-4.5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":57623}}},"doAtValue":{"const":{"val":"-1.5s"}}},
{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
],
"priorityList": [
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"11s"}}}},"castSpell":{"spellId":{"spellId":64382,"tag":-1}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"97s"}}}},"castSpell":{"spellId":{"spellId":57933,"tag":-1}}}},
{"action":{"autocastOtherCooldowns":{}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}}}}]}},{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55095}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9"}}}}]}}]}},"castSpell":{"spellId":{"spellId":59131}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55078}}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}}}}]}},{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55078}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9"}}}}]}}]}},"castSpell":{"spellId":{"spellId":49921,"tag":1}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"or":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}}]}},{"gcdIsReady":{}},{"dotIsActive":{"spellId":{"spellId":55078}}},{"dotIsActive":{"spellId":{"spellId":55095}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}},
{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}}]}},{"gcdIsReady":{}},{"dotIsActive":{"spellId":{"spellId":55078}}},{"dotIsActive":{"spellId":{"spellId":55095}}}]}},"castSpell":{"spellId":{"spellId":49016}}}},
{"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49016}}}]}},"castSpell":{"spellId":{"spellId":26297}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"gcdIsReady":{}},{"dotIsActive":{"spellId":{"spellId":55078}}},{"dotIsActive":{"spellId":{"spellId":55095}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"spellId":33697}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"or":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}}]}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49016}}},"rhs":{"const":{"val":"15"}}}}}},{"auraIsActive":{"auraId":{"spellId":49016}}}]}},{"gcdIsReady":{}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}},
{"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"cmp":{"op":"OpEq","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpEq","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpEq","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":47568}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":47568}}}}}]}}]}},"castSpell":{"spellId":{"spellId":46584}}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":46584}}}}},{"gcdIsReady":{}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":47568}}}}}]}},"castSpell":{"spellId":{"spellId":49028}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneFrost"}},"rhs":{"math":{"op":"OpSub","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneUnholy"}},"rhs":{"math":{"op":"OpSub","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentRuneCount":{"runeType":"RuneDeath"}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"6"}}}},{"not":{"val":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":67383}}},{"cmp":{"op":"OpEq","lhs":{"auraRemainingTime":{"auraId":{"spellId":67383}}},"rhs":{"const":{"val":"0"}}}}]}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":49924,"tag":1}}}},
{"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55078}}},"rhs":{"const":{"val":"4"}}}}]}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":50842}}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"runeSlotCooldown":{"runeSlot":"SlotLeftBlood"}},"rhs":{"const":{"val":"6s"}}}},{"spellIsReady":{"spellId":{"spellId":45529}}},{"gcdIsReady":{}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"40"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":49028}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}}]}}]}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":47568}}}}}]}},"castSpell":{"spellId":{"spellId":45529}}}},
{"action":{"condition":{"or":{}},"castSpell":{"spellId":{"spellId":55262,"tag":1}}}},
{"action":{"condition":{"not":{"val":{}}},"castSpell":{"spellId":{"spellId":49924,"tag":1}}}},
{"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"0.5"}}}},{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"0.5"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpEq","lhs":{"currentRunicPower":{}},"rhs":{"const":{"val":"100"}}}}]}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"0.3"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpEq","lhs":{"currentRunicPower":{}},"rhs":{"const":{"val":"100"}}}}]}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}}}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9"}}}}]}},"castSpell":{"spellId":{"spellId":49895}}}},
{"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"0.5"}}}},{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"0.5"}}}}]}},{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"0.3"}}}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}},"rhs":{"const":{"val":"1.5s"}}}}}}]}},"castSpell":{"spellId":{"spellId":57623}}}}
]
}
Loading

0 comments on commit c45eb51

Please sign in to comment.