From ac9820102068edebbb81d5b166c1b7a850cfe4eb Mon Sep 17 00:00:00 2001 From: Shaklor Date: Thu, 23 Nov 2023 01:36:20 +1100 Subject: [PATCH 1/3] Consolidated Blood DK DPS APLs into 'Blood DPS' --- ui/deathknight/apls/blood_dps.apl.json | 33 +++++++++++++++++++++ ui/deathknight/apls/blood_pesti.apl.json | 33 --------------------- ui/deathknight/apls/blood_pesti_dd.apl.json | 33 --------------------- ui/deathknight/presets.ts | 6 ++-- ui/deathknight/sim.ts | 7 ++--- 5 files changed, 38 insertions(+), 74 deletions(-) create mode 100644 ui/deathknight/apls/blood_dps.apl.json delete mode 100644 ui/deathknight/apls/blood_pesti.apl.json delete mode 100644 ui/deathknight/apls/blood_pesti_dd.apl.json diff --git a/ui/deathknight/apls/blood_dps.apl.json b/ui/deathknight/apls/blood_dps.apl.json new file mode 100644 index 0000000000..02a3e427a8 --- /dev/null +++ b/ui/deathknight/apls/blood_dps.apl.json @@ -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}}}} + ] +} \ No newline at end of file diff --git a/ui/deathknight/apls/blood_pesti.apl.json b/ui/deathknight/apls/blood_pesti.apl.json deleted file mode 100644 index 568bace276..0000000000 --- a/ui/deathknight/apls/blood_pesti.apl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-6s"}}}, - {"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":"8.5s"}}}},"castSpell":{"spellId":{"spellId":64382,"tag":-1}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55095}}}}},"resetSequence":{"sequenceName":"IT"}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55078}}}}},"resetSequence":{"sequenceName":"PS"}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpEq","lhs":{"runeCooldown":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpGe","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"1"}}}}]}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55095}}}}}]}},"sequence":{"name":"IT","actions":[{"castSpell":{"spellId":{"spellId":59131}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpEq","lhs":{"runeCooldown":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpGe","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"1"}}}}]}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55078}}}}}]}},"sequence":{"name":"PS","actions":[{"castSpell":{"spellId":{"spellId":49921,"tag":1}}}]}}}, - {"action":{"sequence":{"name":"Opener","actions":[{"castSpell":{"spellId":{"spellId":49016}}},{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":54758}}},{"castSpell":{"spellId":{"spellId":49924,"tag":1}}},{"castSpell":{"spellId":{"spellId":55262,"tag":1}}},{"castSpell":{"spellId":{"spellId":55262,"tag":1}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}},{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},{"cmp":{"op":"OpEq","lhs":{"currentRuneCount":{"runeType":"RuneDeath"}},"rhs":{"const":{"val":"0"}}}}]}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":46584}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"3s"}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":49028}}}}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}}]}},"castSpell":{"spellId":{"spellId":50842}}}}, - {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"math":{"op":"OpAdd","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"const":{"val":"4s"}}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"const":{"val":"2s"}}}},{"auraIsActive":{"auraId":{"spellId":49028}}},{"sequenceIsComplete":{"sequenceName":"IT"}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":45529}}},{"castSpell":{"spellId":{"spellId":50842}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":49016}}},{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"gcdIsReady":{}}]}},{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"15"}}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":26297}}},"rhs":{"const":{"val":"10"}}}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"auraIsActive":{"auraId":{"spellId":33697}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"15"}}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49016}}},"rhs":{"const":{"val":"9"}}}}}}]}},{"gcdIsReady":{}}]}},{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":33697}}},{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"gcdIsReady":{}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12"}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"55"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"20"}}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49016}}},"rhs":{"const":{"val":"20"}}}}}},{"gcdIsReady":{}},{"spellIsReady":{"spellId":{"spellId":26297}}}]}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":47568}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":49016}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":46584}}},{"castSpell":{"spellId":{"spellId":49028}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"currentRuneActive":{"runeSlot":"SlotLeftBlood"}}}},{"sequenceIsComplete":{"sequenceName":"Opener"}},{"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":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":45529}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},{"cmp":{"op":"OpGt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"8s"}}}}]}},{"not":{"val":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneFrost"}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}}}},{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneUnholy"}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}}}}]}}}}]}},"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"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":49895}}}}, - {"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"}}}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"0.5"}}}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57623}}}} - ] -} \ No newline at end of file diff --git a/ui/deathknight/apls/blood_pesti_dd.apl.json b/ui/deathknight/apls/blood_pesti_dd.apl.json deleted file mode 100644 index 72f43e534b..0000000000 --- a/ui/deathknight/apls/blood_pesti_dd.apl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-6s"}}}, - {"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":"8.5s"}}}},"castSpell":{"spellId":{"spellId":64382,"tag":-1}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55095}}}}},"resetSequence":{"sequenceName":"IT"}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55078}}}}},"resetSequence":{"sequenceName":"PS"}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpEq","lhs":{"runeCooldown":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpGe","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneFrost"}},"rhs":{"const":{"val":"1"}}}}]}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55095}}}}}]}},"sequence":{"name":"IT","actions":[{"castSpell":{"spellId":{"spellId":59131}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":49028}}},{"cmp":{"op":"OpEq","lhs":{"runeCooldown":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"0"}}}},{"cmp":{"op":"OpGe","lhs":{"currentNonDeathRuneCount":{"runeType":"RuneUnholy"}},"rhs":{"const":{"val":"1"}}}}]}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55078}}}}}]}},"sequence":{"name":"PS","actions":[{"castSpell":{"spellId":{"spellId":49921,"tag":1}}}]}}}, - {"action":{"sequence":{"name":"Opener","actions":[{"castSpell":{"spellId":{"spellId":49016}}},{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":54758}}},{"castSpell":{"spellId":{"spellId":49924,"tag":1}}},{"castSpell":{"spellId":{"spellId":55262,"tag":1}}},{"castSpell":{"spellId":{"spellId":55262,"tag":1}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}},{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},{"cmp":{"op":"OpEq","lhs":{"currentRuneCount":{"runeType":"RuneDeath"}},"rhs":{"const":{"val":"0"}}}}]}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":46584}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49028}}},"rhs":{"const":{"val":"3s"}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":49028}}}}},{"dotIsActive":{"spellId":{"spellId":55095}}},{"dotIsActive":{"spellId":{"spellId":55078}}}]}}]}},"castSpell":{"spellId":{"spellId":50842}}}}, - {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"math":{"op":"OpAdd","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"const":{"val":"4s"}}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"const":{"val":"2s"}}}},{"auraIsActive":{"auraId":{"spellId":49028}}},{"sequenceIsComplete":{"sequenceName":"IT"}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":45529}}},{"castSpell":{"spellId":{"spellId":50842}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":49016}}},{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"gcdIsReady":{}}]}},{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"15"}}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":26297}}},"rhs":{"const":{"val":"10"}}}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"auraIsActive":{"auraId":{"spellId":33697}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"15"}}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49016}}},"rhs":{"const":{"val":"9"}}}}}}]}},{"gcdIsReady":{}}]}},{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":33697}}},{"spellIsReady":{"spellId":{"spellId":46584}}},{"spellIsReady":{"spellId":{"spellId":49028}}},{"gcdIsReady":{}}]}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12"}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"55"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":33697}}},"rhs":{"const":{"val":"20"}}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":49016}}},"rhs":{"const":{"val":"20"}}}}}},{"gcdIsReady":{}},{"spellIsReady":{"spellId":{"spellId":26297}}}]}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":47568}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":49016}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":33697}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":54758}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":46584}}},{"castSpell":{"spellId":{"spellId":49028}}},{"resetSequence":{"sequenceName":"IT"}},{"resetSequence":{"sequenceName":"PS"}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"currentRuneActive":{"runeSlot":"SlotLeftBlood"}}}},{"sequenceIsComplete":{"sequenceName":"Opener"}},{"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":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":49028}}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":45529}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}}}},{"cmp":{"op":"OpGt","lhs":{"nextRuneCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"8s"}}}}]}},{"not":{"val":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneFrost"}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}}}},{"cmp":{"op":"OpGe","lhs":{"nextRuneCooldown":{"runeType":"RuneUnholy"}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":71227}}}}}]}}}}]}},"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"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":49895}}}}, - {"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"}}}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"runeCooldown":{"runeType":"RuneBlood"}},"rhs":{"const":{"val":"0.5"}}}},{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57623}}}} - ] -} \ No newline at end of file diff --git a/ui/deathknight/presets.ts b/ui/deathknight/presets.ts index 6647964892..aeaa53fb19 100644 --- a/ui/deathknight/presets.ts +++ b/ui/deathknight/presets.ts @@ -48,8 +48,7 @@ import P3FrostGear from './gear_sets/p3_frost.gear.json'; import P4FrostGear from './gear_sets/p4_frost.gear.json'; import P1FrostSubUhGear from './gear_sets/p1_frost_subUh.gear.json'; -import BloodPestiApl from './apls/blood_pesti.apl.json'; -import BloodPestiDDApl from './apls/blood_pesti_dd.apl.json'; +import BloodDPSApl from './apls/blood_dps.apl.json'; import BloodPestiAoeApl from './apls/blood_pesti_aoe.apl.json'; import FrostBlPestiApl from './apls/frost_bl_pesti.apl.json'; import FrostUhPestiApl from './apls/frost_uh_pesti.apl.json'; @@ -148,8 +147,7 @@ export const BLOOD_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacy export const FROST_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Frost Legacy', Spec.SpecDeathknight, DefaultFrostRotation, { talentTree: 1 }); export const UNHOLY_DW_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Unholy DW Legacy', Spec.SpecDeathknight, DefaultUnholyRotation, { talentTree: 2 }); -export const BLOOD_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti', BloodPestiApl, { talentTree: 0 }); -export const BLOOD_PESTI_DD_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti DD', BloodPestiDDApl, { talentTree: 0 }); +export const BLOOD_DPS_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood DPS', BloodDPSApl, { talentTree: 0 }); export const BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti AOE', BloodPestiAoeApl, { talentTree: 0 }); export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost BL Pesti', FrostBlPestiApl, { talentTree: 1 }); export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost UH Pesti', FrostUhPestiApl, { talentTree: 1 }); diff --git a/ui/deathknight/sim.ts b/ui/deathknight/sim.ts index dc41028fc5..2a4e28efad 100644 --- a/ui/deathknight/sim.ts +++ b/ui/deathknight/sim.ts @@ -135,10 +135,10 @@ export class DeathknightSimUI extends IndividualSimUI { if (numTargets > 5) { return Presets.BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT.rotation.rotation!; } else { - return Presets.BLOOD_PESTI_ROTATION_PRESET_DEFAULT.rotation.rotation!; + return Presets.BLOOD_DPS_ROTATION_PRESET_DEFAULT.rotation.rotation!; } } else { - return Presets.BLOOD_PESTI_DD_ROTATION_PRESET_DEFAULT.rotation.rotation!; + return Presets.BLOOD_DPS_ROTATION_PRESET_DEFAULT.rotation.rotation!; } case 1: const talentPoints = player.getTalentTreePoints() @@ -216,8 +216,7 @@ export class DeathknightSimUI extends IndividualSimUI { Presets.BLOOD_ROTATION_PRESET_LEGACY_DEFAULT, Presets.FROST_ROTATION_PRESET_LEGACY_DEFAULT, Presets.UNHOLY_DW_ROTATION_PRESET_LEGACY_DEFAULT, - Presets.BLOOD_PESTI_ROTATION_PRESET_DEFAULT, - Presets.BLOOD_PESTI_DD_ROTATION_PRESET_DEFAULT, + Presets.BLOOD_DPS_ROTATION_PRESET_DEFAULT, Presets.BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT, Presets.FROST_BL_PESTI_ROTATION_PRESET_DEFAULT, Presets.FROST_UH_PESTI_ROTATION_PRESET_DEFAULT, From 2c2ba8c53b342ab4f5c06779b340f5402f54bbf8 Mon Sep 17 00:00:00 2001 From: Shaklor Date: Thu, 23 Nov 2023 02:32:20 +1100 Subject: [PATCH 2/3] Updated dps_deathknight test with new filename. --- sim/deathknight/dps/dps_deathknight_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sim/deathknight/dps/dps_deathknight_test.go b/sim/deathknight/dps/dps_deathknight_test.go index 3090e8b677..1b76a09f4a 100644 --- a/sim/deathknight/dps/dps_deathknight_test.go +++ b/sim/deathknight/dps/dps_deathknight_test.go @@ -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, From 6cd808c013d5eef254f94e0ea0e7f4b6c2008d9c Mon Sep 17 00:00:00 2001 From: rosenrusinov Date: Thu, 23 Nov 2023 10:38:18 +0100 Subject: [PATCH 3/3] update test results --- sim/deathknight/dps/TestBlood.results | 156 ++++++-------------------- 1 file changed, 36 insertions(+), 120 deletions(-) diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results index 9d759762bc..a9333a0541 100644 --- a/sim/deathknight/dps/TestBlood.results +++ b/sim/deathknight/dps/TestBlood.results @@ -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: { @@ -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: {