diff --git a/sim/hunter/TestP1Hunter.results b/sim/hunter/TestP1Hunter.results new file mode 100644 index 000000000..af9b53656 --- /dev/null +++ b/sim/hunter/TestP1Hunter.results @@ -0,0 +1,198 @@ +character_stats_results: { + key: "TestP1Hunter-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 287.155 + final_stats: 511.06 + final_stats: 490.25075 + final_stats: 217.58 + final_stats: 244.145 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 47.25 + final_stats: 3 + final_stats: 28.19007 + final_stats: 0 + final_stats: 0 + final_stats: 1608.215 + final_stats: 3 + final_stats: 31.65903 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 4703.7 + final_stats: 0 + final_stats: 0 + final_stats: 3269.12 + final_stats: 1842.12 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 6878.87795 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 384 + final_stats: 0 + final_stats: 35 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Hunter-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0 + weights: 0.25006 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.09121 + weights: 6.47715 + weights: 1.9727 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.04107 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-AllItems-DevilsaurEye-19991" + value: { + dps: 494.9685 + tps: 164.58742 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-AllItems-DevilsaurTooth-19992" + value: { + dps: 489.7566 + tps: 161.18148 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Average-Default" + value: { + dps: 485.54398 + tps: 160.63978 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 309.29052 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 309.29052 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 324.81294 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 82.02021 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 82.02021 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Dwarf-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 88.52133 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 326.50738 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 326.50738 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 343.60282 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 86.22379 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 86.22379 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-Settings-Orc-p0.bis-Hunter-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 93.06899 + } +} +dps_results: { + key: "TestP1Hunter-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 465.4777 + tps: 138.30025 + } +} diff --git a/sim/hunter/hunter_test.go b/sim/hunter/hunter_test.go index 188920b0f..c3b9d0d99 100644 --- a/sim/hunter/hunter_test.go +++ b/sim/hunter/hunter_test.go @@ -12,68 +12,21 @@ func init() { RegisterHunter() } -func TestBM(t *testing.T) { +func TestP1Hunter(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassHunter, - Level: 40, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - - Talents: Phase2BMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p2_melee"), - Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: Phase2PlayerOptions}, - - OtherRotations: []core.RotationCombo{core.GetAplRotation("../../ui/hunter/apls", "p2_ranged_bm")}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - })) -} - -func TestMM(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassHunter, - Phase: 4, - Level: 60, - Race: proto.Race_RaceOrc, - OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - - Talents: Phase4RangedMMTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_ranged"), - Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatAttackPower, - StatsToWeigh: Stats, - }, - })) -} - -func TestSV(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassHunter, - Phase: 4, + Phase: 1, Level: 60, Race: proto.Race_RaceOrc, OtherRaces: []proto.Race{proto.Race_RaceDwarf}, - Talents: Phase4WeaveTalents, - GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "placeholder"), - Rotation: core.GetAplRotation("../../ui/hunter/apls", "p4_weave"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../ui/hunter/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../ui/hunter/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Weave", SpecOptions: Phase4PlayerOptions}, + Consumes: P1Consumes, + SpecOptions: core.SpecOptionsCombo{Label: "Hunter", SpecOptions: P1PlayerOptions}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -82,20 +35,10 @@ func TestSV(t *testing.T) { })) } -var Phase1BMTalents = "53000200501" -var Phase1MMTalents = "-050515" -var Phase1SVTalents = "--33502001101" - -var Phase2BMTalents = "5300021150501251" -var Phase2MMTalents = "-05551001503051" -var Phase2SVTalents = "--335020051030315" - -var Phase4WeaveTalents = "-055500005-3305202202303051" -var Phase4RangedMMTalents = "-05451002503051-33400023023" -var Phase4RangedSVTalents = "1-054510005-334000250230305" +var P1Talents = "-05451002503051-33400023023" -var Phase4Consumes = core.ConsumesCombo{ - Label: "P4-Consumes", +var P1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ AgilityElixir: proto.AgilityElixir_ElixirOfTheMongoose, AttackPowerBuff: proto.AttackPowerBuff_JujuMight, @@ -110,7 +53,7 @@ var Phase4Consumes = core.ConsumesCombo{ }, } -var Phase1PlayerOptions = &proto.Player_Hunter{ +var P1PlayerOptions = &proto.Player_Hunter{ Hunter: &proto.Hunter{ Options: &proto.Hunter_Options{ Ammo: proto.Hunter_Options_RazorArrow, @@ -121,29 +64,6 @@ var Phase1PlayerOptions = &proto.Player_Hunter{ }, } -var Phase2PlayerOptions = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: &proto.Hunter_Options{ - Ammo: proto.Hunter_Options_JaggedArrow, - PetType: proto.Hunter_Options_Cat, - PetUptime: 1, - PetAttackSpeed: 2.0, - }, - }, -} - -var Phase4PlayerOptions = &proto.Player_Hunter{ - Hunter: &proto.Hunter{ - Options: &proto.Hunter_Options{ - Ammo: proto.Hunter_Options_JaggedArrow, - PetType: proto.Hunter_Options_PetNone, - PetUptime: 1, - PetAttackSpeed: 2.0, - SniperTrainingUptime: 1.0, - }, - }, -} - var ItemFilters = core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeMail, WeaponTypes: []proto.WeaponType{ diff --git a/ui/hunter/apls/p1.apl.json b/ui/hunter/apls/p1.apl.json new file mode 100644 index 000000000..6ca76d990 --- /dev/null +++ b/ui/hunter/apls/p1.apl.json @@ -0,0 +1,8 @@ +{ + "type": "TypeAPL", + "prepullActions": [], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":2643,"rank":1}}}} + ] +} diff --git a/ui/hunter/apls/p1_weave.apl.json b/ui/hunter/apls/p1_weave.apl.json deleted file mode 100644 index 6e79c76bd..000000000 --- a/ui/hunter/apls/p1_weave.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14318,"rank":2}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13550,"rank":3}}},"doAtValue":{"const":{"val":"0s"}}} - ], - "priorityList": [ - {"action":{"castSpell":{"spellId":{"spellId":2643,"rank":1}}}}, - {"action":{"castSpell":{"spellId":{"spellId":429867}}}}, - {"action":{"multidot":{"spellId":{"spellId":13550,"rank":3},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14282,"rank":3}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415338}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":2643,"rank":1}}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1.5s"}}}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}} - ] -} diff --git a/ui/hunter/apls/p2_melee.apl.json b/ui/hunter/apls/p2_melee.apl.json deleted file mode 100644 index 4d743783e..000000000 --- a/ui/hunter/apls/p2_melee.apl.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"move":{"rangeFromTarget":{"const":{"val":"5"}}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":14320,"rank":4}}},"doAtValue":{"const":{"val":"-1.5s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":415341,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"castSpell":{"spellId":{"spellId":14320,"rank":4}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"castSpell":{"spellId":{"spellId":425711}}}}, - {"action":{"castSpell":{"spellId":{"itemId":215127}}}}, - {"action":{"castSpell":{"spellId":{"itemId":215168}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14267,"rank":2}}}} - ] -} \ No newline at end of file diff --git a/ui/hunter/apls/p2_ranged_bm.apl.json b/ui/hunter/apls/p2_ranged_bm.apl.json deleted file mode 100644 index 3ed737f55..000000000 --- a/ui/hunter/apls/p2_ranged_bm.apl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14320,"rank":4}}},"doAtValue":{"const":{"val":"-3s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":409379}}},"doAtValue":{"const":{"val":"-3s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":14288,"rank":2}}},"doAtValue":{"const":{"val":"-0.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":3045}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":437349}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":19574}}},"doAtValue":{"const":{"val":"0s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"or":{"vals":[{"spellTimeToReady":{"spellId":{"spellId":19574}}},{"spellCanCast":{"spellId":{"spellId":19574}}}]}},"rhs":{"const":{"val":"60s"}}}},"castSpell":{"spellId":{"spellId":409379}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":437349}}}}},"castSpell":{"spellId":{"spellId":429867}}}}, - {"action":{"castSpell":{"spellId":{"spellId":3045}}}}, - {"action":{"castSpell":{"spellId":{"spellId":19574}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14320,"rank":4}}}}},{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"90%"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":14320,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"gcdIsReady":{}}}},{"auraIsActive":{"auraId":{"spellId":415423}}},{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":".9"}}}}]}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13552,"rank":5}}}}},"castSpell":{"spellId":{"spellId":13552,"rank":5}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"0.4s"}}}},"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"spellCastTime":{"spellId":{"spellId":14288,"rank":2}}}}},"castSpell":{"spellId":{"spellId":14288,"rank":2}}}}, - {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"spellCastTime":{"spellId":{"spellId":437123}}}}},"castSpell":{"spellId":{"spellId":437123}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415341}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14264,"tag":3,"rank":6}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":14288,"rank":2}}}}},{"spellIsReady":{"spellId":{"spellId":14264,"tag":1,"rank":6}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}},{"spellIsReady":{"spellId":{"spellId":415341,"rank":6}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, - {"hide":true,"action":{"condition":{"or":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":14264,"tag":1,"rank":6}}}}},{"spellCanCast":{"spellId":{"spellId":409433}}},{"spellCanCast":{"spellId":{"spellId":14288,"rank":2}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":415341,"rank":6}}}}},{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"MainHand"}},"rhs":{"autoSwingTime":{"autoType":"MainHand"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},"castSpell":{"spellId":{"spellId":14284,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"gcdIsReady":{}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":409526,"rank":3}}}}}]}},"castSpell":{"spellId":{"spellId":409526,"rank":3}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"itemId":3827}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":".1"}}}},"castSpell":{"spellId":{"spellId":415423}}}} - ] -} diff --git a/ui/hunter/apls/p2_ranged_mm.apl.json b/ui/hunter/apls/p2_ranged_mm.apl.json deleted file mode 100644 index 96f3b53a1..000000000 --- a/ui/hunter/apls/p2_ranged_mm.apl.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14320,"rank":4}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":14288,"rank":2}}},"doAtValue":{"const":{"val":"-0.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20901,"rank":3}}},"doAtValue":{"const":{"val":"-2.5s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"95%"}}}},{"auraIsActive":{"auraId":{"spellId":415423}}}]}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":437349}}}}},"castSpell":{"spellId":{"spellId":429867}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13552,"rank":5}}}}},"castSpell":{"spellId":{"spellId":13552,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"autoSwingTime":{"autoType":"Ranged"}}}},"castSpell":{"spellId":{"spellId":20901,"rank":3}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"325ms"}}}},"castSpell":{"spellId":{"spellId":14288,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.3s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":20901,"rank":3}}},"rhs":{"const":{"val":"0.3s"}}}}]}},"castSpell":{"spellId":{"spellId":409526,"rank":3}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14320,"rank":4}}}}}]}},"castSpell":{"spellId":{"spellId":14320,"rank":4}}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTimePercent":{}},"rhs":{"const":{"val":"100%"}}}},"castSpell":{"spellId":{"spellId":20572}}}} - ] -} \ No newline at end of file diff --git a/ui/hunter/apls/p3_melee_bm.apl.json b/ui/hunter/apls/p3_melee_bm.apl.json deleted file mode 100644 index f84ceae87..000000000 --- a/ui/hunter/apls/p3_melee_bm.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"move":{"rangeFromTarget":{"const":{"val":"5"}}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":14321,"rank":5}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":19574}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":415342}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"castSpell":{"spellId":{"spellId":14321,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14267,"rank":2}}}}, - {"action":{"castSpell":{"spellId":{"itemId":215168}}}} - ] -} \ No newline at end of file diff --git a/ui/hunter/apls/p3_ranged_mm.apl.json b/ui/hunter/apls/p3_ranged_mm.apl.json deleted file mode 100644 index b7f642b89..000000000 --- a/ui/hunter/apls/p3_ranged_mm.apl.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":13809}}},"doAtValue":{"const":{"val":"-15s"}},"hide":true}, - {"action":{"castSpell":{"spellId":{"spellId":14321,"rank":5}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":409528}}},"doAtValue":{"const":{"val":"-0.2s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20902}}},"doAtValue":{"const":{"val":"-3.3s"}}}, - {"action":{"activateAura":{"auraId":{"spellId":10060,"tag":-1}}},"doAtValue":{"const":{"val":"-0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":429868}}},"doAtValue":{"const":{"val":"-0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":429867}}},"doAtValue":{"const":{"val":"-0s"}},"hide":true}, - {"action":{"castSpell":{"spellId":{"spellId":437349}}},"doAtValue":{"const":{"val":"-0s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0s"}}}, - {"action":{"activateAuraWithStacks":{"auraId":{"spellId":428726},"numStacks":"5"}},"doAtValue":{"const":{"val":"-6s"}}}, - {"action":{"activateAuraWithStacks":{"auraId":{"spellId":428728},"numStacks":"5"}},"doAtValue":{"const":{"val":"-4s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"95%"}}}},{"auraIsActive":{"auraId":{"spellId":415423}}}]}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":428726}}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":428728}}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":428726}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":428726}}},"rhs":{"const":{"val":"0.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":428728}}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":428726}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13554}}}}},"castSpell":{"spellId":{"spellId":13554}}}}, - {"action":{"castSpell":{"spellId":{"spellId":3045}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"4.5s"}}}}]}},"castSpell":{"spellId":{"spellId":3045}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"hide":true,"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":437349}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":3045}}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"5s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":429867}}}}}]}},"castSpell":{"spellId":{"spellId":437349}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":437349}}}}},{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":429867}}}}, - {"action":{"condition":{"and":{}},"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.8s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":409528}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.8s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":13809}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1100ms"}}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"spellCastTime":{"spellId":{"spellId":14288,"rank":2}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":14289,"rank":3}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"math":{"op":"OpSub","lhs":{"autoSwingTime":{"autoType":"Ranged"}},"rhs":{"const":{"val":"350ms"}}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCastTime":{"spellId":{"spellId":20901,"rank":3}}},"rhs":{"const":{"val":"2s"}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":20902}}}}, - {"hide":true,"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1380ms"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCastTime":{"spellId":{"spellId":20902}}},"rhs":{"const":{"val":"0.65s"}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":14285,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":409528}}}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"0.3s"}}}}]}},"castSpell":{"spellId":{"spellId":14285,"rank":6}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1380ms"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":409528}}}}}]}},"castSpell":{"spellId":{"spellId":14285,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"8%"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14320,"rank":4}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.45s"}}}}]}},"castSpell":{"spellId":{"spellId":14321,"rank":5}}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTimePercent":{}},"rhs":{"const":{"val":"100%"}}}},"castSpell":{"spellId":{"spellId":20572}}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTimePercent":{}},"rhs":{"const":{"val":"100%"}}}},"castSpell":{"spellId":{"spellId":429867}}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentTimePercent":{}},"rhs":{"const":{"val":"100%"}}}},"castSpell":{"spellId":{"spellId":10060,"tag":-1}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"itemId":215168}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"spellCastTime":{"spellId":{"spellId":437123}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCastTime":{"spellId":{"spellId":437123}}},"rhs":{"const":{"val":"0.05s"}}}}}}]}},"castSpell":{"spellId":{"spellId":437123}}}} - ] -} \ No newline at end of file diff --git a/ui/hunter/apls/p4_ranged.apl.json b/ui/hunter/apls/p4_ranged.apl.json deleted file mode 100644 index aeed1504f..000000000 --- a/ui/hunter/apls/p4_ranged.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14322,"rank":6}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-0.45s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13555,"rank":8}}}}},"castSpell":{"spellId":{"spellId":13555,"rank":8}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"55%"}}}},"castSpell":{"spellId":{"itemId":13444}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},{"auraIsActive":{"auraId":{"spellId":415423}}}]}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":409535}}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":409530}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":409535}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":415413}}},"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":409510}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":415413}}},"castSpell":{"spellId":{"spellId":20904,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14290,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14322,"rank":6}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.45s"}}}}]}},"castSpell":{"spellId":{"spellId":14322,"rank":6}}}} - ] -} diff --git a/ui/hunter/apls/p4_weave.apl.json b/ui/hunter/apls/p4_weave.apl.json deleted file mode 100644 index 646bcc465..000000000 --- a/ui/hunter/apls/p4_weave.apl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14322,"rank":6}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-0.4s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"55%"}}}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1.5s"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":409433}}}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":14290,"rank":4}}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":14290,"rank":4}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}}]}},"castSpell":{"spellId":{"spellId":14290,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":409433}}}]}},"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}}, - {"hide":true,"action":{"condition":{"dotIsActive":{"spellId":{"spellId":409530}}},"castSpell":{"spellId":{"spellId":409535}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":409530}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409535}}}}, - {"action":{"castSpell":{"spellId":{"spellId":458482}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409535}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14322,"rank":6}}}}}]}},"castSpell":{"spellId":{"spellId":14322,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409535}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":20572}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409535}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409535}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":14268,"rank":3}}}} - ] -} diff --git a/ui/hunter/apls/p5_melee_bm.apl.json b/ui/hunter/apls/p5_melee_bm.apl.json deleted file mode 100644 index 8da5e67f5..000000000 --- a/ui/hunter/apls/p5_melee_bm.apl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"move":{"rangeFromTarget":{"const":{"val":"5"}}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":469145}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":19574}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415358}}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415343}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14271,"rank":4}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"castSpell":{"spellId":{"spellId":469145}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409530}}}}, - {"action":{"castSpell":{"spellId":{"itemId":10646}}}} - ] -} diff --git a/ui/hunter/apls/p5_melee_sv.apl.json b/ui/hunter/apls/p5_melee_sv.apl.json deleted file mode 100644 index 1bb1d44dc..000000000 --- a/ui/hunter/apls/p5_melee_sv.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"move":{"rangeFromTarget":{"const":{"val":"5"}}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":469145}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"100%"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":415320}}},{"castSpell":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}]}}}, - {"action":{"castSpell":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415358}}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":467331}}}]}},"castSpell":{"spellId":{"spellId":458482}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14271,"rank":4}}}}, - {"action":{"castSpell":{"spellId":{"spellId":458482}}}}, - {"action":{"castSpell":{"spellId":{"spellId":415320}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":469145}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409530}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409530}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14271,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":415320}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":14268,"rank":3}}}}, - {"action":{"castSpell":{"spellId":{"itemId":10646}}}} - ] -} diff --git a/ui/hunter/apls/p5_ranged.apl.json b/ui/hunter/apls/p5_ranged.apl.json deleted file mode 100644 index 4f95f50f4..000000000 --- a/ui/hunter/apls/p5_ranged.apl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":14322,"rank":6}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-0.45s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13555,"rank":8}}}}},"castSpell":{"spellId":{"spellId":13555,"rank":8}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"55%"}}}},"castSpell":{"spellId":{"itemId":13444}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},{"auraIsActive":{"auraId":{"spellId":415423}}}]}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":409535}}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":409530}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":409535}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14290,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":409510}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":14322,"rank":6}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.45s"}}}}]}},"castSpell":{"spellId":{"spellId":14322,"rank":6}}}} - ] -} diff --git a/ui/hunter/apls/p5_weave.apl.json b/ui/hunter/apls/p5_weave.apl.json deleted file mode 100644 index f41f37f18..000000000 --- a/ui/hunter/apls/p5_weave.apl.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":469145}}},"doAtValue":{"const":{"val":"-5s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}},"hide":true}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-2s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":26297,"tag":2}}},"doAtValue":{"const":{"val":"-0.45s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.45s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":3045}}},"doAtValue":{"const":{"val":"-0.45s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":13555,"rank":8}}},"doAtValue":{"const":{"val":"-0.45s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"55%"}}}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"50%"}}}},"cancelAura":{"auraId":{"spellId":415423}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":13555,"rank":8}}}}},"castSpell":{"spellId":{"spellId":13555,"rank":8}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"0.7s"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1s"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"gcdIsReady":{}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14290,"rank":4}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}}]}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1s"}}}},{"or":{"vals":[{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"1s"}}}},{"and":{"vals":[{"gcdIsReady":{}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14290,"rank":4}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}}]}},{"auraIsActive":{"auraId":{"spellId":3045}}}]}},"move":{"rangeFromTarget":{"const":{"val":"6"}}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellCanCast":{"spellId":{"spellId":14287,"rank":8}}}}},{"auraIsActive":{"auraId":{"spellId":3045}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":14268,"rank":3}}}}},{"gcdIsReady":{}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}},"rhs":{"const":{"val":"0.5s"}}}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}}, - {"action":{"castSpell":{"spellId":{"spellId":458482}}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":14268,"rank":3}}},"castSpell":{"spellId":{"spellId":409593}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14290,"rank":4}}}}, - {"action":{"castSpell":{"spellId":{"spellId":409593}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14287,"rank":8}}}}, - {"action":{"castSpell":{"spellId":{"spellId":14268,"rank":3}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"8%"}}}}]}},"castSpell":{"spellId":{"spellId":415423}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":469145}}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"1.45s"}}}}]}},"castSpell":{"spellId":{"spellId":469145}}}} - ] -} diff --git a/ui/hunter/gear_sets/blank.gear.json b/ui/hunter/gear_sets/blank.gear.json deleted file mode 100644 index 4bcab0861..000000000 --- a/ui/hunter/gear_sets/blank.gear.json +++ /dev/null @@ -1 +0,0 @@ -{"items": []} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p0.bis.gear.json b/ui/hunter/gear_sets/p0.bis.gear.json new file mode 100644 index 000000000..c77b8f5c8 --- /dev/null +++ b/ui/hunter/gear_sets/p0.bis.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":16677}, + {}, + {"id":16679}, + {}, + {"id":16674}, + {"id":16681}, + {"id":16676}, + {"id":16680}, + {"id":16678}, + {"id":16675}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p1.bis.gear.json b/ui/hunter/gear_sets/p1.bis.gear.json new file mode 100644 index 000000000..24b451423 --- /dev/null +++ b/ui/hunter/gear_sets/p1.bis.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":16846}, + {}, + {"id":16848}, + {}, + {"id":16845}, + {"id":16850}, + {"id":16852}, + {"id":16851}, + {"id":16847}, + {"id":16849}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/placeholder.gear.json b/ui/hunter/gear_sets/placeholder.gear.json deleted file mode 100644 index 022a9d11b..000000000 --- a/ui/hunter/gear_sets/placeholder.gear.json +++ /dev/null @@ -1,19 +0,0 @@ -{"items": [ - {"id":18421}, - {"id":19540}, - {"id":14817}, - {"id":15138,"enchant":247}, - {"id":14811,"enchant":866}, - {"id":18458}, - {"id":15063,"enchant":904}, - {"id":18393}, - {"id":8309}, - {"id":6423,"enchant":849}, - {"id":2951}, - {"id":9533}, - {"id":13515}, - {"id":18473}, - {"id":22317,"enchant":7210}, - {"id":22317,"enchant":7210}, - {"id":16996} -]} \ No newline at end of file diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts index e518d1af9..8772d1ae5 100644 --- a/ui/hunter/presets.ts +++ b/ui/hunter/presets.ts @@ -31,19 +31,9 @@ import { Hunter_Options_QuiverBonus, } from '../core/proto/hunter.js'; import { SavedTalents } from '../core/proto/ui.js'; -import MeleeWeaveP1 from './apls/p1_weave.apl.json'; -import MeleeP2 from './apls/p2_melee.apl.json'; -import RangedBmP2 from './apls/p2_ranged_bm.apl.json'; -import RangedMmP2 from './apls/p2_ranged_mm.apl.json'; -import MeleeBmP3 from './apls/p3_melee_bm.apl.json'; -import RangedMmP3 from './apls/p3_ranged_mm.apl.json'; -import RangedP4 from './apls/p4_ranged.apl.json'; -import WeaveP4 from './apls/p4_weave.apl.json'; -import Phase5AplMeleeBm from './apls/p5_melee_bm.apl.json'; -import Phase5AplMeleeSv from './apls/p5_melee_sv.apl.json'; -import Phase5AplRanged from './apls/p5_ranged.apl.json'; -import Phase5AplWeave from './apls/p5_weave.apl.json'; -import BlankGear from './gear_sets/blank.gear.json'; +import P1APL from './apls/p1.apl.json'; +import P0BISGear from './gear_sets/p0.bis.gear.json'; +import P1BISGear from './gear_sets/p1.bis.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -52,46 +42,26 @@ import BlankGear from './gear_sets/blank.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); +export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); -export const GearPresets = {}; +export const GearPresets = { + [Phase.Phase1]: [GearP0BIS, GearP1BIS], +}; -export const DefaultGear = GearBlank; +export const DefaultGear = GearP0BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLMeleeWeavePhase1 = PresetUtils.makePresetAPLRotation('P1 Melee Weave', MeleeWeaveP1, { customCondition: player => player.getLevel() === 25 }); - -export const APLMeleePhase2 = PresetUtils.makePresetAPLRotation('P2 Melee', MeleeP2, { customCondition: player => player.getLevel() === 40 }); -export const APLRangedBmPhase2 = PresetUtils.makePresetAPLRotation('P2 Ranged BM', RangedBmP2, { customCondition: player => player.getLevel() === 40 }); -export const APLRangedMmPhase2 = PresetUtils.makePresetAPLRotation('P2 Ranged MM', RangedMmP2, { customCondition: player => player.getLevel() === 40 }); - -export const APLMeleeBmPhase3 = PresetUtils.makePresetAPLRotation('P3 Melee BM', MeleeBmP3, { customCondition: player => player.getLevel() === 50 }); -export const APLRangedMmPhase3 = PresetUtils.makePresetAPLRotation('P3 Ranged MM', RangedMmP3, { customCondition: player => player.getLevel() === 50 }); - -export const APLWeavePhase4 = PresetUtils.makePresetAPLRotation('P4 Weave', WeaveP4, { customCondition: player => player.getLevel() === 60 }); -export const APLRangedPhase4 = PresetUtils.makePresetAPLRotation('P4 Ranged', RangedP4, { customCondition: player => player.getLevel() === 60 }); - -export const APLWeavePhase5 = PresetUtils.makePresetAPLRotation('P5 Weave', Phase5AplWeave, { customCondition: player => player.getLevel() === 60 }); -export const APLRanged31Phase5 = PresetUtils.makePresetAPLRotation('P5 Ranged 3-1-1', Phase5AplRanged, { customCondition: player => player.getLevel() === 60 }); -export const APLRanged22Phase5 = PresetUtils.makePresetAPLRotation('P5 Ranged 2-2', RangedP4, { customCondition: player => player.getLevel() === 60 }); -export const APLMeleeBMPhase5 = PresetUtils.makePresetAPLRotation('P5 Melee BM', Phase5AplMeleeBm, { customCondition: player => player.getLevel() === 60 }); -export const APLMeleeSVPhase5 = PresetUtils.makePresetAPLRotation('P5 Melee SV', Phase5AplMeleeSv, { customCondition: player => player.getLevel() === 60 }); +export const APLP1 = PresetUtils.makePresetAPLRotation('Marksmanship', P1APL, { customCondition: player => player.getLevel() === 60 }); export const APLPresets = { - [Phase.Phase1]: [APLMeleeWeavePhase1], - [Phase.Phase2]: [APLRangedBmPhase2, APLRangedMmPhase2, APLMeleePhase2], - [Phase.Phase3]: [APLRangedMmPhase3, APLMeleeBmPhase3], - [Phase.Phase4]: [], //[APLWeavePhase4, APLRangedPhase4], - [Phase.Phase5]: [APLWeavePhase5, APLRanged31Phase5, APLRanged22Phase5, APLMeleeBMPhase5, APLMeleeSVPhase5], + [Phase.Phase1]: [APLP1], }; -export const DefaultAPLWeave = APLPresets[Phase.Phase5][0]; -export const DefaultAPLRanged = APLPresets[Phase.Phase5][1]; -export const DefaultAPLMeleeBM = APLPresets[Phase.Phase5][3]; -export const DefaultAPLMeleeSV = APLPresets[Phase.Phase5][4]; +export const DefaultAPL = APLPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Talent Presets @@ -100,104 +70,15 @@ export const DefaultAPLMeleeSV = APLPresets[Phase.Phase5][4]; // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/classic/talent-calc and copy the numbers in the url. -export const TalentsBeastMasteryPhase1 = PresetUtils.makePresetTalents('P1 Beast Mastery', SavedTalents.create({ talentsString: '53000200501' }), { - customCondition: player => player.getLevel() === 25, -}); - -export const TalentsMarksmanPhase1 = PresetUtils.makePresetTalents('P1 Marksmanship', SavedTalents.create({ talentsString: '-050515' }), { - customCondition: player => player.getLevel() === 25, -}); - -export const TalentsSurvivalPhase1 = PresetUtils.makePresetTalents('P1 Survival', SavedTalents.create({ talentsString: '--33502001101' }), { - customCondition: player => player.getLevel() === 25, -}); - -export const TalentsBeastMasteryPhase2 = PresetUtils.makePresetTalents('P2 Beast Mastery', SavedTalents.create({ talentsString: '5300021150501251' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const TalentsMarksmanPhase2 = PresetUtils.makePresetTalents('P2 Marksmanship', SavedTalents.create({ talentsString: '-05551001503051' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const TalentsSurvivalPhase2 = PresetUtils.makePresetTalents('P2 Survival', SavedTalents.create({ talentsString: '--335020051030315' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const TalentsRangedMMPhase3 = PresetUtils.makePresetTalents('P3 Ranged MM', SavedTalents.create({ talentsString: '5-05051404503051-3' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsMeleeBMPhase3 = PresetUtils.makePresetTalents('P3 Melee BM', SavedTalents.create({ talentsString: '0500321150521251--33002' }), { - customCondition: player => player.getLevel() === 50, -}); - -export const TalentsWeavePhase4 = PresetUtils.makePresetTalents('60 Weave', SavedTalents.create({ talentsString: '-055500005-3305202202303051' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsRangedMMPhase4 = PresetUtils.makePresetTalents('60 Ranged MM', SavedTalents.create({ talentsString: '-05451002503051-33400023023' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsRangedSVPhase4 = PresetUtils.makePresetTalents('60 Ranged SV', SavedTalents.create({ talentsString: '1-054510005-334000250230305' }), { - customCondition: player => player.getLevel() === 60, -}); - -export const TalentsWeavePhase5 = PresetUtils.makePresetTalents('P5 Weave', SavedTalents.create({ talentsString: '-055500005-3305202202303051' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsRangedMMPhase5 = PresetUtils.makePresetTalents('P5 Ranged MM', SavedTalents.create({ talentsString: '5-05451005503051-3320202' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsRangedSVPhase5 = PresetUtils.makePresetTalents('P5 Ranged SV', SavedTalents.create({ talentsString: '1-054510005-334000250230305' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsMeleeBMPhase5 = PresetUtils.makePresetTalents('P5 Melee BM', SavedTalents.create({ talentsString: '5500020050521251-0505-33002' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsMeleeSVPhase5 = PresetUtils.makePresetTalents('P5 Melee SV', SavedTalents.create({ talentsString: '-055500005-3320202412303051' }), { +export const TalentsP1 = PresetUtils.makePresetTalents('Marksmanship', SavedTalents.create({ talentsString: '-05451002503051-33400023023' }), { customCondition: player => player.getLevel() === 60, }); export const TalentPresets = { - [Phase.Phase1]: [TalentsBeastMasteryPhase1, TalentsMarksmanPhase1, TalentsSurvivalPhase1], - [Phase.Phase2]: [TalentsBeastMasteryPhase2, TalentsMarksmanPhase2, TalentsSurvivalPhase2], - [Phase.Phase3]: [TalentsRangedMMPhase3, TalentsMeleeBMPhase3], - [Phase.Phase4]: [], //[TalentsWeavePhase4, TalentsRangedMMPhase4, TalentsRangedSVPhase4], - [Phase.Phase5]: [TalentsWeavePhase5, TalentsRangedMMPhase5, TalentsRangedSVPhase5, TalentsMeleeBMPhase5, TalentsMeleeSVPhase5], + [Phase.Phase1]: [TalentsP1], }; -export const DefaultTalentsWeave = TalentPresets[Phase.Phase5][0]; -export const DefaultTalentsRangedMM = TalentPresets[Phase.Phase5][1]; -export const DefaultTalentsRangedSV = TalentPresets[Phase.Phase5][2]; -export const DefaultTalentsMeleeBM = TalentPresets[Phase.Phase5][3]; -export const DefaultTalentsMeleeSV = TalentPresets[Phase.Phase5][4]; - -export const DefaultTalents = DefaultTalentsWeave; - -export const PresetBuildWeave = PresetUtils.makePresetBuild('Weave', { - gear: DefaultGear, - talents: DefaultTalentsWeave, - rotation: DefaultAPLWeave, -}); -export const PresetBuildRangedMM = PresetUtils.makePresetBuild('Ranged MM', { - gear: DefaultGear, - talents: DefaultTalentsRangedMM, - rotation: DefaultAPLRanged, -}); -export const PresetBuildRangedSV = PresetUtils.makePresetBuild('Ranged SV', { - gear: DefaultGear, - talents: DefaultTalentsRangedSV, - rotation: DefaultAPLRanged, -}); -export const PresetBuildMeleeBM = PresetUtils.makePresetBuild('Melee BM', { - gear: DefaultGear, - talents: DefaultTalentsMeleeBM, - rotation: DefaultAPLMeleeBM, -}); -export const PresetBuildMeleeSV = PresetUtils.makePresetBuild('Melee SV', { - gear: DefaultGear, - talents: DefaultTalentsMeleeSV, - rotation: DefaultAPLMeleeSV, -}); +export const DefaultTalents = TalentPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts index cafd44b27..e5f88becb 100644 --- a/ui/hunter/sim.ts +++ b/ui/hunter/sim.ts @@ -141,25 +141,16 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { presets: { // Preset talents that the user can quickly select. talents: [ - ...Presets.TalentPresets[Phase.Phase5], - ...Presets.TalentPresets[Phase.Phase4], - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1], ], // Preset rotations that the user can quickly select. rotations: [ - ...Presets.APLPresets[Phase.Phase5], - ...Presets.APLPresets[Phase.Phase4], - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1], ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase1], ], - builds: [Presets.PresetBuildRangedMM, Presets.PresetBuildRangedSV, Presets.PresetBuildMeleeBM, Presets.PresetBuildMeleeSV, Presets.PresetBuildWeave], }, autoRotation: player => { @@ -168,32 +159,34 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { //player.hasRune(ItemSlot.ItemSlotWaist, HunterRune.RuneBeltMeleeSpecialist) || //player.hasRune(ItemSlot.ItemSlotFeet, HunterRune.RuneBootsDualWieldSpecialization) || //player.hasRune(ItemSlot.ItemSlotFeet, HunterRune.RuneBootsWyvernStrike); - - if (isMelee) { - switch (level) { - case 25: - return Presets.APLMeleeWeavePhase1.rotation.rotation!; - case 40: - return Presets.APLMeleePhase2.rotation.rotation!; - case 50: - return Presets.APLMeleeBmPhase3.rotation.rotation!; - case 60: - return Presets.APLWeavePhase4.rotation.rotation!; - } - } else { - switch (level) { - case 25: - return Presets.APLMeleeWeavePhase1.rotation.rotation!; - case 40: - return player.getTalentTree() === 1 ? Presets.APLRangedMmPhase2.rotation.rotation! : Presets.APLRangedBmPhase2.rotation.rotation!; - case 50: - return Presets.APLRangedMmPhase3.rotation.rotation!; - case 60: - return Presets.APLRangedPhase4.rotation.rotation!; - } - } - - throw new Error('Auto rotation not supported for your current configuration.'); + + return Presets.DefaultAPL.rotation.rotation!; + + // COMMENTING OUT TO SAVE FOR FUTURE IMPLEMENTATION. + // if (isMelee) { + // switch (level) { + // case 25: + // return Presets.APLMeleeWeavePhase1.rotation.rotation!; + // case 40: + // return Presets.APLMeleePhase2.rotation.rotation!; + // case 50: + // return Presets.APLMeleeBmPhase3.rotation.rotation!; + // case 60: + // return Presets.APLWeavePhase4.rotation.rotation!; + // } + // } else { + // switch (level) { + // case 25: + // return Presets.APLMeleeWeavePhase1.rotation.rotation!; + // case 40: + // return player.getTalentTree() === 1 ? Presets.APLRangedMmPhase2.rotation.rotation! : Presets.APLRangedBmPhase2.rotation.rotation!; + // case 50: + // return Presets.APLRangedMmPhase3.rotation.rotation!; + // case 60: + // return Presets.APLRangedPhase4.rotation.rotation!; + // } + // } + //throw new Error('Auto rotation not supported for your current configuration.'); }, raidSimPresets: [