diff --git a/sim/rogue/items_sets_pve.go b/sim/rogue/items_sets_pve.go index e2e3440567..ad2f8fe02f 100644 --- a/sim/rogue/items_sets_pve.go +++ b/sim/rogue/items_sets_pve.go @@ -421,7 +421,6 @@ var ItemSetDeathdealersThrill = core.NewItemSet(core.ItemSet{ rogue.RegisterAura(core.Aura{ Label: "S03 - Item - TAQ - Rogue - Damage 2P Bonus", OnInit: func(aura *core.Aura, sim *core.Simulation) { - rogue.SinisterStrike.DamageMultiplierAdditive += 0.20 if rogue.SaberSlash != nil { rogue.SaberSlash.DamageMultiplierAdditive += 0.20 rogue.saberSlashTick.DamageMultiplierAdditive += 0.20 diff --git a/ui/tank_rogue/apls/P6_MG.apl.json b/ui/tank_rogue/apls/P6_MG.apl.json new file mode 100644 index 0000000000..6d730444d8 --- /dev/null +++ b/ui/tank_rogue/apls/P6_MG.apl.json @@ -0,0 +1,40 @@ +{ + "type": "TypeAPL", + "simple": { + "cooldowns": { + "hpPercentForDefensives": 0.2 + } + }, + "prepullActions": [ + {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":26297,"tag":6}}},"doAtValue":{"const":{"val":"-1.5s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},"doAtValue":{"const":{"val":"-5"}},"hide":true}, + {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-10"}}}, + {"action":{"castSpell":{"spellId":{"spellId":13877}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":6774,"rank":2}}},"doAtValue":{"const":{"val":"-1"}}} + ], + "priorityList": [ + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":425012}}},{"castSpell":{"spellId":{"itemId":19948}}},{"castSpell":{"spellId":{"spellId":400012}}},{"castSpell":{"spellId":{"spellId":436564}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":234462}}},{"spellCanCast":{"spellId":{"itemId":234462}}}]}},"castSpell":{"spellId":{"itemId":234462}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"spellId":1213366}}},{"spellCanCast":{"spellId":{"spellId":1213366}}}]}},"castSpell":{"spellId":{"spellId":1213366}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"spellId":14251}}},{"spellCanCast":{"spellId":{"spellId":14251}}}]}},"castSpell":{"spellId":{"spellId":14251}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":439462}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, + {"hide":true,"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11198,"rank":5}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"itemId":19948}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":400012}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"itemId":19948}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}]}},"castSpell":{"spellId":{"itemId":233985}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424919}}},{"spellCanCast":{"spellId":{"spellId":424919}}}]}},"castSpell":{"spellId":{"spellId":424919}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":400012}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":400012}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"spellId":436564}}},{"auraIsActive":{"auraId":{"spellId":400012}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":436564}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":11294,"rank":8}}}} + ] +} \ No newline at end of file diff --git a/ui/tank_rogue/apls/P6_saber.apl.json b/ui/tank_rogue/apls/P6_saber.apl.json new file mode 100644 index 0000000000..8e2b7573b6 --- /dev/null +++ b/ui/tank_rogue/apls/P6_saber.apl.json @@ -0,0 +1,42 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":26297,"tag":6}}},"doAtValue":{"const":{"val":"-1.5s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},"doAtValue":{"const":{"val":"-5"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":1213366}}},"doAtValue":{"const":{"val":"-11s"}}}, + {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-10"}}}, + {"action":{"castSpell":{"spellId":{"spellId":13877}}},"doAtValue":{"const":{"val":"-2.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":6774,"rank":2}}},"doAtValue":{"const":{"val":"-1"}}} + ], + "priorityList": [ + {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":425012}}},{"castSpell":{"spellId":{"spellId":400012}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":425012}}},{"castSpell":{"spellId":{"itemId":19948}}},{"castSpell":{"spellId":{"spellId":400012}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"itemId":19948}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":400012}}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"itemId":19948}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":234462}}},{"spellCanCast":{"spellId":{"itemId":234462}}}]}},"castSpell":{"spellId":{"itemId":234462}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"spellId":14251}}},{"spellCanCast":{"spellId":{"spellId":14251}}}]}},"castSpell":{"spellId":{"spellId":14251}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, + {"hide":true,"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}]}},"castSpell":{"spellId":{"itemId":233985}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"2"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2"}}}}}},{"auraIsActive":{"auraId":{"spellId":400012}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"2"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":13750}}}}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":13750}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"45"}}}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":400012}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":400012}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}}]}},"castSpell":{"spellId":{"spellId":400012}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":436611}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":436611}}},"rhs":{"const":{"val":"2"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":436611}}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"spellIsKnown":{"spellId":{"spellId":412096}}},{"auraIsActive":{"auraId":{"spellId":400012}}}]}},"castSpell":{"spellId":{"spellId":412096}}}}, + {"action":{"condition":{"and":{"vals":[{"spellIsKnown":{"spellId":{"spellId":436564}}},{"auraIsActive":{"auraId":{"spellId":400012}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":436564}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"0"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"auraIsActive":{"auraId":{"spellId":400012}}}]}},"castSpell":{"spellId":{"spellId":11275,"rank":6}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"auraIsActive":{"auraId":{"spellId":13750}}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"0"}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":4395}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"cmp":{"op":"OpEq","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, + {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{}]}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"7"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} + ] +} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p6_mg.gear.json b/ui/tank_rogue/gear_sets/p6_mg.gear.json new file mode 100644 index 0000000000..68c31d160c --- /dev/null +++ b/ui/tank_rogue/gear_sets/p6_mg.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":233661,"enchant":7624,"rune":432264}, + {"id":233642}, + {"id":233663,"enchant":2606}, + {"id":233432,"enchant":2622,"rune":436564}, + {"id":233659,"enchant":7645,"rune":400014}, + {"id":233612,"enchant":7656,"rune":432273}, + {"id":233618,"enchant":2564,"rune":424919}, + {"id":233577,"rune":425012}, + {"id":233662,"enchant":7624,"rune":400012}, + {"id":233590,"enchant":1887,"rune":400016}, + {"id":233434,"rune":442813}, + {"id":234035,"rune":459312}, + {"id":19948}, + {"id":233992}, + {"id":234650,"enchant":1900}, + {"id":235006,"enchant":2564}, + {"id":234121,"enchant":2523} + ] +} \ No newline at end of file diff --git a/ui/tank_rogue/gear_sets/p6_saber.gear.json b/ui/tank_rogue/gear_sets/p6_saber.gear.json new file mode 100644 index 0000000000..bde20f8c57 --- /dev/null +++ b/ui/tank_rogue/gear_sets/p6_saber.gear.json @@ -0,0 +1,21 @@ +{ +"items": [ + {"id":231043,"enchant":7624,"rune":432264}, + {"id":233642}, + {"id":233387,"enchant":2606}, + {"id":233432,"enchant":2622,"rune":412096}, + {"id":233389,"enchant":7645,"rune":400014}, + {"id":231046,"enchant":7656,"rune":432273}, + {"id":233618,"enchant":2564,"rune":424785}, + {"id":233577,"rune":425012}, + {"id":231044,"enchant":7624,"rune":400012}, + {"id":231041,"enchant":1887,"rune":400016}, + {"id":233434,"rune":442813}, + {"id":234035,"rune":459312}, + {"id":19948}, + {"id":233627}, + {"id":234650,"enchant":1900}, + {"id":235006,"enchant":2564}, + {"id":234997,"enchant":2523} + ] +} \ No newline at end of file diff --git a/ui/tank_rogue/presets.ts b/ui/tank_rogue/presets.ts index 404dd6d593..34fbbc3888 100644 --- a/ui/tank_rogue/presets.ts +++ b/ui/tank_rogue/presets.ts @@ -28,6 +28,8 @@ import P3MutilateApl from './apls/Mutilate_DPS_50.apl.json'; import MutilateIEAApl from './apls/mutilate_IEA.apl.json'; import P3ExposeMutilateApl from './apls/Mutilate_IEA_50.apl.json'; import P5SaberAPL from './apls/P5_Saber.apl.json'; +import P6MGAPL from './apls/P6_MG.apl.json'; +import P6SaberAPL from './apls/P6_saber.apl.json'; import P3SaberApl from './apls/Saber_DPS_50.apl.json'; import P3SaberIEAApl from './apls/Saber_IEA_50.apl.json'; import P4SaberWeaveApl from './apls/Saber_Weave_60.apl.json'; @@ -39,6 +41,8 @@ import P3DaggersGear from './gear_sets/p3_daggers.gear.json'; import P3SaberGear from './gear_sets/p3_saber.gear.json'; import P4SaberGear from './gear_sets/p4_saber.gear.json'; import P5SaberGear from './gear_sets/p5_saber.gear.json'; +import P6MGGear from './gear_sets/p6_mg.gear.json'; +import P6SaberGear from './gear_sets/p6_saber.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -57,6 +61,8 @@ export const GearDaggersP3 = PresetUtils.makePresetGear('P3 Daggers', P3DaggersG export const GearSaberP3 = PresetUtils.makePresetGear('P3 Saber', P3SaberGear, { customCondition: player => player.getLevel() == 50 }); export const GearSaberP4 = PresetUtils.makePresetGear('P4 Saber', P4SaberGear, { customCondition: player => player.getLevel() == 60 }); export const GearSaberP5 = PresetUtils.makePresetGear('P5 Saber', P5SaberGear, { customCondition: player => player.getLevel() == 60 }); +export const GearMGP6 = PresetUtils.makePresetGear('P6 Main Gauche', P6MGGear, { customCondition: player => player.getLevel() == 60 }); +export const GearSaberP6 = PresetUtils.makePresetGear('P6 Saber', P6SaberGear, { customCondition: player => player.getLevel() == 60 }); export const GearPresets = { [Phase.Phase1]: [GearDaggersP1, GearCombatP1], @@ -64,9 +70,10 @@ export const GearPresets = { [Phase.Phase3]: [GearDaggersP3, GearSaberP3], [Phase.Phase4]: [GearSaberP4], [Phase.Phase5]: [GearSaberP5], + [Phase.Phase6]: [GearMGP6, GearSaberP6], }; -export const DefaultGear = GearPresets[Phase.Phase5][0]; +export const DefaultGear = GearPresets[Phase.Phase6][0]; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -92,6 +99,12 @@ export const ROTATION_PRESET_SABER_WEAVE_P4 = PresetUtils.makePresetAPLRotation( export const ROTATION_PRESET_SABER_P5 = PresetUtils.makePresetAPLRotation('P5 Saber', P5SaberAPL, { customCondition: player => player.getLevel() === 60, }); +export const ROTATION_PRESET_MG_P6 = PresetUtils.makePresetAPLRotation('P6 Main Gauche', P6MGAPL, { + customCondition: player => player.getLevel() === 60, +}); +export const ROTATION_PRESET_SABER_P6 = PresetUtils.makePresetAPLRotation('P6 Saber', P6SaberAPL, { + customCondition: player => player.getLevel() === 60, +}); export const APLPresets = { [Phase.Phase1]: [ROTATION_PRESET_MUTILATE], @@ -99,6 +112,7 @@ export const APLPresets = { [Phase.Phase3]: [ROTATION_PRESET_MUTILATE_P3, ROTATION_PRESET_MUTILATE_IEA_P3, ROTATION_PRESET_SABER_P3, ROTATION_PRESET_SABER_IEA_P3], [Phase.Phase4]: [ROTATION_PRESET_SABER_WEAVE_P4], [Phase.Phase5]: [ROTATION_PRESET_SABER_P5], + [Phase.Phase6]: [ROTATION_PRESET_MG_P6, ROTATION_PRESET_SABER_P6], }; export const DefaultAPLs: Record> = { @@ -118,9 +132,8 @@ export const DefaultAPLs: Record player.getLevel() === 60, }); +export const P6TankMGTalents = PresetUtils.makePresetTalents('P6 Main Gauche', SavedTalents.create({ talentsString: '305303125-023055010005013013' }), { + customCondition: player => player.getLevel() === 60, +}); + +export const P6TankSaberTalents = PresetUtils.makePresetTalents('P6 Saber', SavedTalents.create({ talentsString: '305303105-0230550100050130231' }), { + customCondition: player => player.getLevel() === 60, +}); + export const TalentPresets = { [Phase.Phase1]: [CombatDagger25Talents], [Phase.Phase2]: [ColdBloodMutilate40Talents, IEAMutilate40Talents, CombatMutilate40Talents], [Phase.Phase3]: [TankMutilate50Talents, TankSaber50Talents, TankBladeFlurry50Talents], [Phase.Phase4]: [TankSaber60Talents], [Phase.Phase5]: [P5TankSaberTalents], + [Phase.Phase6]: [P6TankMGTalents, P6TankSaberTalents], }; -export const DefaultTalentsAssassin = TalentPresets[Phase.Phase5][0]; -export const DefaultTalentsCombat = TalentPresets[Phase.Phase5][0]; -export const DefaultTalentsSubtlety = TalentPresets[Phase.Phase5][0]; +export const DefaultTalentsAssassin = TalentPresets[Phase.Phase6][0]; +export const DefaultTalentsCombat = TalentPresets[Phase.Phase6][0]; +export const DefaultTalentsSubtlety = TalentPresets[Phase.Phase6][0]; -export const DefaultTalents = DefaultTalentsCombat; +export const DefaultTalents = P6TankMGTalents; /////////////////////////////////////////////////////////////////////////// // Encounters /////////////////////////////////////////////////////////////////////////// -export const PresetBuildEncounterDefault = PresetUtils.makePresetBuild('Default', { + +export const PresetBuildMG = PresetUtils.makePresetBuild('Main Gauche IEA', { + gear: GearMGP6, + talents: P6TankMGTalents, + rotation: ROTATION_PRESET_MG_P6, encounter: PresetUtils.makePresetEncounter( - 'Default', - 'http://localhost:5173/sod/tank_rogue/?i=ce#eJyTklFgM5LgYBRg1GC0YHRgrGBvYJSYwMi8gJH5BiOr0gFmTgYwiHMQhDD0HCRnzQSBk/aWEJEL9oppYHDN3mgCM8eNJl4hDp/UstQcBTMDCXutB0wMgwlodDpQxRy1tRSZIyD1nzruAAJDMFmw3MEyM/9D68mQq/aOUBmHCEYAjL4g7A==', + 'Main Gauche', + 'http://localhost:5173/sod/tank_rogue/#eJztVl1oHFUU3nNndnL3xJ1Obrbp7E2sybaGcXGT2d1sTTaRnQa1aayaB8HgH1WI2hJosCDqU6wVUygafdIIJi2xjS3V/gpGGoNPyYNQiz9BUQOCtNKH4EMtVNR7Z2ZnN7vWFysIehnmnnvuOd+c33sH11NikGZiEYdshzcIjJKBcQLHxQNkiUDvOhNm3LUD5wCWAZ6CBYA+yBMDWIgfqkdtYPix54aeNqjZ06wl3wesNc4e0M2FbmvsBEfVOHJAxxrjY8F6Lyb2liZ1cy5mfX6ei8VHgvttt/XKGVMs9ovFhW7rtRNy53Wx2BuzvvoljtS4OKVbp6/EBXvOQ97vKlye0s3vdWtcLKjx9aRunX2xUVCnpnXr+N4m8elLb4F4j01LAybe1c1LkvjtqEQWxL53dPOb+kw7RQMsrVN42KeOE/JszSg0jQGOgzIF6jzAeQgtQXgZtAsAKwD5H1VcJqH/xz862Oh/PsQ/kVBvfSfMgKxMGIBB2C66bwT6m7J2Lmtn05lcys4IOmenbdsW76x4BtRB+nikbuJNORYLO0/VmkqilpU4WI81O8Oo0KvRhIYqEnu3CRhH5BQ1+uGn0KwlIliD4VS6LSe31mKEiyWd1y3wNFI5wa5DbRYUBrmE2EQllbZRdBWXyGeGfYSMQBDf8/Qvd1jE10+zzVwYwupwTTJKFUbyIamIkM5YSLkQorLfXcrtYo8n296jxPHBNvIEmqwBIwdVKfbdYR0jE+CT3J8rpOgHL/f7UpLk/sxa+E3YwGJID6rSgaO7kE6AR3FvYjHOUE/cgHgSpDdXo5aaD7Et/E7s4Xk0kjpVGXk+xF0PRTBa2cYit7/ErZDrsCW88Ws3u5dvw17mIE+aQiA6C8jEySzMO3SRe7HJuMoKU/aAH61cJdwmuxg7dgcF7mCOZzHN2rExGRea+izUCtSwMH/uAStcDgLlsG66pATbwZ/ER9hD2JCMCf3ILPgJ8QSzrmq4TDWL65JrA0mZsMBzCRGugrCLiWU38kZk3ECdBTGWFeMXFEtyC9ezpsoUrBKVyC9Ml+X8iJtzeYn4ORck92eW553Yxm4tSr0q7p1oohYjJ4umu95pZd6lA2P7+F3Yw/LX8nZ3lWrWww4+FSDJ4mlnqXIrylyUblVjBe3EHuYP4n3sHjSTDcIOnF0Viz81pMPnBEWZsStNC9CLXvq9I+/siugopdq7za6qz46gV9O8HW9mG9x29xqirIDKzcu4KjM/A7ubb8UCvx1jjFVXqAtWHeMK+I4ArJ2ncANrKXop/0xkP1dXflEhw0sd/Jctly213Fa+xT0Lrq2nVYVLXRUuGfm3By06sgCjAFcILPq3IHU+86kuR/yWTUBrxF05k06df104t3jzSiGedccPhWbtEyK6k56GxLziKYQeLSq0OfHildDlcc4VWp5wx5eFzLhCl/ZEGd029MzQcPMm2ywk/2U/PdY+57rgtB77WzgG//362CFG2n2PHHa6duxaeWnx/i8Km/0dZxD+AMAtU0s=', ), }); -export const PresetBuildEncounterVael = PresetUtils.makePresetBuild('Vael', { +export const PresetBuildSaber = PresetUtils.makePresetBuild('Saber Slash', { + gear: GearSaberP6, + talents: P6TankSaberTalents, + rotation: ROTATION_PRESET_SABER_P6, encounter: PresetUtils.makePresetEncounter( - 'Vael', - 'http://localhost:5173/sod/tank_rogue/?i=ce#eJyTkldgM5LmYBRg1GC0YHRgrGBvYGSZwMi8gJH5EiPDDUZWpe8snAxgEOcgCGHoOUjOmgkCJ+0tISIX7BXTwOCavdFxFo47qUJqTjmJydnlmXnpCj6JmUUKYYmpOYnFJUWJxVUKJRmpCs75RUWlBSUS9grMWg+YGAYT0Oh0oIo5amspMiejyd+RKu4AAkMw2bHZwVI2KsX6vv9Ve5jRDhGMRVMZORiFFEIyc1MVnEqL8kBx5phSlJqXmJOZl6oQlJqcmlmWmqKV75FfrpCTD5TNzCvJB8diWmZ6Rgk2TZnFCsnA6FbIzwOrK8hJrEwt0lNwyywCCoJlgCqMDIoVNIJTc1KTSxQMFIBG5qWWpRYpFEEs1AQAp5dhnw==', + 'Saber Slash', + 'http://localhost:5173/sod/tank_rogue/#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', ), }); @@ -208,7 +237,7 @@ export const PresetBuildEncounterVael = PresetUtils.makePresetBuild('Vael', { export const DefaultOptions = RogueOptions.create({ honorAmongThievesCritRate: 100, - pkSwap: false + pkSwap: false, }); /////////////////////////////////////////////////////////////////////////// diff --git a/ui/tank_rogue/sim.ts b/ui/tank_rogue/sim.ts index 6518c04290..77dbd46bc7 100644 --- a/ui/tank_rogue/sim.ts +++ b/ui/tank_rogue/sim.ts @@ -64,7 +64,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { Stat.StatShadowResistance, ], displayPseudoStats: [], - + defaults: { // Default equipped gear. gear: Presets.DefaultGear.gear, @@ -130,7 +130,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { OtherInputs.HpPercentForDefensives, OtherInputs.InspirationUptime, HonorOfThievesCritRate, - pkSwap + pkSwap, ], }, encounterPicker: { @@ -141,6 +141,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { presets: { // Preset talents that the user can quickly select. talents: [ + ...Presets.TalentPresets[Phase.Phase6], ...Presets.TalentPresets[Phase.Phase5], ...Presets.TalentPresets[Phase.Phase4], ...Presets.TalentPresets[Phase.Phase3], @@ -149,6 +150,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { ], // Preset rotations that the user can quickly select. rotations: [ + ...Presets.APLPresets[Phase.Phase6], ...Presets.APLPresets[Phase.Phase5], ...Presets.APLPresets[Phase.Phase4], ...Presets.APLPresets[Phase.Phase3], @@ -157,13 +159,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, { ], // Preset gear configurations that the user can quickly select. gear: [ + ...Presets.GearPresets[Phase.Phase6], ...Presets.GearPresets[Phase.Phase5], ...Presets.GearPresets[Phase.Phase4], ...Presets.GearPresets[Phase.Phase3], ...Presets.GearPresets[Phase.Phase2], ...Presets.GearPresets[Phase.Phase1], ], - builds: [Presets.PresetBuildEncounterDefault, Presets.PresetBuildEncounterVael], + builds: [Presets.PresetBuildMG, Presets.PresetBuildSaber], }, autoRotation: player => {