From 3df76c89f775226f31f7d68ad2f80fa45324dae6 Mon Sep 17 00:00:00 2001 From: Nathan Berman Date: Thu, 19 Dec 2024 20:00:28 +0000 Subject: [PATCH 1/2] updated presets --- ui/core/preset_utils.tsx | 1 + ui/hunter/presets.ts | 246 +++++++++++++++++++++++++++++++-------- ui/hunter/sim.ts | 5 +- 3 files changed, 203 insertions(+), 49 deletions(-) diff --git a/ui/core/preset_utils.tsx b/ui/core/preset_utils.tsx index 11d1ba9de4..7faa6d378e 100644 --- a/ui/core/preset_utils.tsx +++ b/ui/core/preset_utils.tsx @@ -16,6 +16,7 @@ import { Spec, UnitReference, } from './proto/common.js'; +import { Hunter_Options } from './proto/hunter'; import { SavedRotation, SavedTalents } from './proto/ui.js'; import { Stats } from './proto_utils/stats.js'; import { SpecRotation, specTypeFunctions } from './proto_utils/utils.js'; diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts index 04c3b63d7c..a03533226a 100644 --- a/ui/hunter/presets.ts +++ b/ui/hunter/presets.ts @@ -44,6 +44,11 @@ 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 Phase6AplMeleeBm from './apls/p6_melee_bm.apl.json'; +import Phase6AplMeleeSv from './apls/p6_melee_sv.apl.json'; +import Phase6AplRangedDraconic from './apls/p6_ranged_draconic.apl.json'; +import Phase6AplRangedKillshot from './apls/p6_ranged_killshot.apl.json'; +import Phase6AplWeave from './apls/p6_weave.apl.json'; import Phase2GearMelee from './gear_sets/p2_melee.gear.json'; import Phase2GearRangedBm from './gear_sets/p2_ranged_bm.gear.json'; import Phase2GearRangedMm from './gear_sets/p2_ranged_mm.gear.json'; @@ -55,6 +60,11 @@ import Phase5GearMeleeBm from './gear_sets/p5_melee_bm.gear.json'; import Phase5GearMeleeSv from './gear_sets/p5_melee_sv.gear.json'; import Phase5GearRangedSv from './gear_sets/p5_ranged_sv.gear.json'; import Phase5GearWeave from './gear_sets/p5_weave.gear.json'; +import Phase6GearMeleeBm from './gear_sets/p6_melee_bm.gear.json'; +import Phase6GearMeleeSv from './gear_sets/p6_melee_sv.gear.json'; +import Phase6GearRangedDraconic from './gear_sets/p6_ranged_draconic.gear.json'; +import Phase6GearRangedKillshot from './gear_sets/p6_ranged_killshot.gear.json'; +import Phase6GearWeave from './gear_sets/p6_weave.gear.json'; import Phase1Gear from './gear_sets/phase1.gear.json'; // Preset options for this spec. @@ -84,21 +94,28 @@ export const GearRangedSVPhase5 = PresetUtils.makePresetGear('P5 Ranged SV', Pha export const GearMeleeBMPhase5 = PresetUtils.makePresetGear('P5 Melee BM', Phase5GearMeleeBm, { customCondition: player => player.getLevel() === 60 }); export const GearMeleeSVPhase5 = PresetUtils.makePresetGear('P5 Melee SV', Phase5GearMeleeSv, { customCondition: player => player.getLevel() === 60 }); +export const GearWeavePhase6 = PresetUtils.makePresetGear('P6 Weave', Phase6GearWeave, { customCondition: player => player.getLevel() === 60 }); +export const GearRangedDraconicPhase6 = PresetUtils.makePresetGear('P6 Ranged Draconic', Phase6GearRangedDraconic, { customCondition: player => player.getLevel() === 60 }); +export const GearRangedKillshotPhase6 = PresetUtils.makePresetGear('P6 Ranged Killshot', Phase6GearRangedKillshot, { customCondition: player => player.getLevel() === 60 }); +export const GearMeleeBMPhase6 = PresetUtils.makePresetGear('P6 Melee BM', Phase6GearMeleeBm, { customCondition: player => player.getLevel() === 60 }); +export const GearMeleeSVPhase6 = PresetUtils.makePresetGear('P6 Melee SV', Phase6GearMeleeSv, { customCondition: player => player.getLevel() === 60 }); + export const GearPresets = { [Phase.Phase1]: [GearBeastMasteryPhase1, GearMarksmanPhase1, GearSurvivalPhase1], [Phase.Phase2]: [GearRangedBmPhase2, GearRangedMmPhase2, GearMeleePhase2], [Phase.Phase3]: [GearRangedMmPhase3, GearMeleeBmPhase3], [Phase.Phase4]: [], //[GearWeavePhase4, GearRangedSVPhase4], - [Phase.Phase5]: [GearWeavePhase5, GearRangedMMPhase5, GearRangedSVPhase5, GearMeleeBMPhase5, GearMeleeSVPhase5], + [Phase.Phase5]: [], //[GearWeavePhase5, GearRangedMMPhase5, GearRangedSVPhase5, GearMeleeBMPhase5, GearMeleeSVPhase5], + [Phase.Phase6]: [GearWeavePhase6, GearRangedDraconicPhase6, GearRangedKillshotPhase6, GearMeleeBMPhase6, GearMeleeSVPhase6], }; -export const DefaultGearWeave = GearPresets[Phase.Phase5][0]; -export const DefaultGearRangedMM = GearPresets[Phase.Phase5][1]; -export const DefaultGearRangedSV = GearPresets[Phase.Phase5][2]; -export const DefaultGearMeleeBM = GearPresets[Phase.Phase5][3]; -export const DefaultGearMeleeSV = GearPresets[Phase.Phase5][4]; +export const DefaultGearWeave = GearPresets[Phase.Phase6][0]; +export const DefaultGearRangedDraconic = GearPresets[Phase.Phase6][1]; +export const DefaultGearRangedKillshot = GearPresets[Phase.Phase6][2]; +export const DefaultGearMeleeBM = GearPresets[Phase.Phase6][3]; +export const DefaultGearMeleeSV = GearPresets[Phase.Phase6][4]; -export const DefaultGear = DefaultGearRangedSV; +export const DefaultGear = DefaultGearRangedKillshot; /////////////////////////////////////////////////////////////////////////// // APL Presets @@ -122,18 +139,26 @@ export const APLRanged22Phase5 = PresetUtils.makePresetAPLRotation('P5 Ranged 2- 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 APLWeavePhase6 = PresetUtils.makePresetAPLRotation('P6 Weave', Phase6AplWeave, { customCondition: player => player.getLevel() === 60 }); +export const APLRangedDraconicPhase6 = PresetUtils.makePresetAPLRotation('P6 Ranged Draconic', Phase6AplRangedDraconic, { customCondition: player => player.getLevel() === 60 }); +export const APLRangedKillshotPhase6 = PresetUtils.makePresetAPLRotation('P6 Ranged Killshot', Phase6AplRangedKillshot, { customCondition: player => player.getLevel() === 60 }); +export const APLMeleeBMPhase6 = PresetUtils.makePresetAPLRotation('P6 Melee BM', Phase6AplMeleeBm, { customCondition: player => player.getLevel() === 60 }); +export const APLMeleeSVPhase6 = PresetUtils.makePresetAPLRotation('P6 Melee SV', Phase6AplMeleeSv, { 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.Phase5]: [], //[APLWeavePhase5, APLRanged31Phase5, APLRanged22Phase5, APLMeleeBMPhase5, APLMeleeSVPhase5], + [Phase.Phase6]: [APLWeavePhase6, APLRangedDraconicPhase6, APLRangedKillshotPhase6, APLMeleeBMPhase6, APLMeleeSVPhase6], }; -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 DefaultAPLWeave = APLPresets[Phase.Phase6][0]; +export const DefaultAPLRangedDraconic = APLPresets[Phase.Phase6][1]; +export const DefaultAPLRangedKillshot = APLPresets[Phase.Phase6][2]; +export const DefaultAPLMeleeBM = APLPresets[Phase.Phase6][3]; +export const DefaultAPLMeleeSV = APLPresets[Phase.Phase6][4]; /////////////////////////////////////////////////////////////////////////// // Talent Presets @@ -199,53 +224,44 @@ export const TalentsMeleeSVPhase5 = PresetUtils.makePresetTalents('P5 Melee SV', customCondition: player => player.getLevel() === 60, }); +export const TalentsWeavePhase6 = PresetUtils.makePresetTalents('P6 Weave', SavedTalents.create({ talentsString: '-054510005-3305202202303051' }), { + customCondition: player => player.getLevel() === 60, +}); +export const TalentsRangedMMPhase6 = PresetUtils.makePresetTalents('P6 Ranged MM', SavedTalents.create({ talentsString: '5-05451005503051-3320202' }), { + customCondition: player => player.getLevel() === 60, +}); +export const TalentsRangedSVPhase6 = PresetUtils.makePresetTalents('P6 Ranged SV', SavedTalents.create({ talentsString: '-054510015-334000250230305' }), { + customCondition: player => player.getLevel() === 60, +}); +export const TalentsMeleeBMPhase6 = PresetUtils.makePresetTalents('P6 Melee BM', SavedTalents.create({ talentsString: '5500020050501251-0505-33202' }), { + customCondition: player => player.getLevel() === 60, +}); +export const TalentsMeleeSVPhase6 = PresetUtils.makePresetTalents('P6 Melee SV', SavedTalents.create({ talentsString: '-055500005-3320202412303051' }), { + 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.Phase5]: [], //[TalentsWeavePhase5, TalentsRangedMMPhase5, TalentsRangedSVPhase5, TalentsMeleeBMPhase5, TalentsMeleeSVPhase5], + [Phase.Phase6]: [TalentsWeavePhase6, TalentsRangedMMPhase6, TalentsRangedSVPhase6, TalentsMeleeBMPhase6, TalentsMeleeSVPhase6], }; -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 DefaultTalentsWeave = TalentPresets[Phase.Phase6][0]; +export const DefaultTalentsRangedDraconic = TalentPresets[Phase.Phase6][2]; +export const DefaultTalentsRangedKillshot = TalentPresets[Phase.Phase6][2]; +export const DefaultTalentsMeleeBM = TalentPresets[Phase.Phase6][3]; +export const DefaultTalentsMeleeSV = TalentPresets[Phase.Phase6][4]; -export const DefaultTalents = DefaultTalentsWeave; - -export const PresetBuildWeave = PresetUtils.makePresetBuild('Weave', { - gear: DefaultGearWeave, - talents: DefaultTalentsWeave, - rotation: DefaultAPLWeave, -}); -export const PresetBuildRangedMM = PresetUtils.makePresetBuild('Ranged MM', { - gear: DefaultGearRangedMM, - talents: DefaultTalentsRangedMM, - rotation: DefaultAPLRanged, -}); -export const PresetBuildRangedSV = PresetUtils.makePresetBuild('Ranged SV', { - gear: DefaultGearRangedSV, - talents: DefaultTalentsRangedSV, - rotation: DefaultAPLRanged, -}); -export const PresetBuildMeleeBM = PresetUtils.makePresetBuild('Melee BM', { - gear: DefaultGearMeleeBM, - talents: DefaultTalentsMeleeBM, - rotation: DefaultAPLMeleeBM, -}); -export const PresetBuildMeleeSV = PresetUtils.makePresetBuild('Melee SV', { - gear: DefaultGearMeleeSV, - talents: DefaultTalentsMeleeSV, - rotation: DefaultAPLMeleeSV, -}); +export const DefaultTalents = DefaultTalentsRangedKillshot; /////////////////////////////////////////////////////////////////////////// // Options /////////////////////////////////////////////////////////////////////////// -export const DefaultOptions = HunterOptions.create({ +export const OptionsRangedLonewolf = HunterOptions.create({ ammo: Ammo.ThoriumHeadedArrow, quiverBonus: Hunter_Options_QuiverBonus.Speed15, petAttackSpeed: 2.0, @@ -255,7 +271,31 @@ export const DefaultOptions = HunterOptions.create({ sniperTrainingUptime: 1.0, }); -export const DefaultConsumes = Consumes.create({ +export const OptionsRangedPet = HunterOptions.create({ + ammo: Ammo.ThoriumHeadedArrow, + quiverBonus: Hunter_Options_QuiverBonus.Speed15, + petAttackSpeed: 2.0, + petTalents: {}, + petType: PetType.WindSerpent, + petUptime: 1, + sniperTrainingUptime: 1.0, +}); + +export const OptionsMeleePet = HunterOptions.create({ + ammo: Ammo.ThoriumHeadedArrow, + quiverBonus: Hunter_Options_QuiverBonus.Speed15, + petAttackSpeed: 2.0, + petTalents: {}, + petType: PetType.Cat, + petUptime: 1, + sniperTrainingUptime: 1.0, +}); + +export const DefaultOptions = OptionsRangedLonewolf; + +// Consumable Presets + +export const MeleeConsumes = Consumes.create({ agilityElixir: AgilityElixir.ElixirOfTheHoneyBadger, alcohol: Alcohol.AlcoholRumseyRumBlackLabel, attackPowerBuff: AttackPowerBuff.JujuMight, @@ -263,7 +303,7 @@ export const DefaultConsumes = Consumes.create({ defaultPotion: Potions.MajorManaPotion, dragonBreathChili: true, enchantedSigil: EnchantedSigil.WrathOfTheStormSigil, - flask: Flask.FlaskOfAncientKnowledge, + flask: Flask.FlaskOfMadness, food: Food.FoodSmokedDesertDumpling, healthElixir: HealthElixir.ElixirOfFortitude, mainHandImbue: WeaponImbue.WildStrikes, @@ -278,6 +318,52 @@ export const DefaultConsumes = Consumes.create({ zanzaBuff: ZanzaBuff.GroundScorpokAssay, }); +export const RangedConsumes = Consumes.create({ + agilityElixir: AgilityElixir.ElixirOfTheHoneyBadger, + alcohol: Alcohol.AlcoholRumseyRumBlackLabel, + attackPowerBuff: AttackPowerBuff.JujuMight, + defaultConjured: Conjured.ConjuredDemonicRune, + defaultPotion: Potions.MajorManaPotion, + dragonBreathChili: false, + enchantedSigil: EnchantedSigil.WrathOfTheStormSigil, + flask: Flask.FlaskOfAncientKnowledge, + food: Food.FoodGrilledSquid, + healthElixir: HealthElixir.ElixirOfFortitude, + mainHandImbue: WeaponImbue.EnchantedRepellent, + manaRegenElixir: ManaRegenElixir.MagebloodPotion, + offHandImbue: WeaponImbue.EnchantedRepellent, + petAttackPowerConsumable: 1, + petAgilityConsumable: 1, + petStrengthConsumable: 1, + sapperExplosive: SapperExplosive.SapperFumigator, + spellPowerBuff: SpellPowerBuff.ElixirOfTheMageLord, + zanzaBuff: ZanzaBuff.GroundScorpokAssay, +}); + +export const WeaveConsumes = Consumes.create({ + agilityElixir: AgilityElixir.ElixirOfTheHoneyBadger, + alcohol: Alcohol.AlcoholRumseyRumBlackLabel, + attackPowerBuff: AttackPowerBuff.JujuMight, + defaultConjured: Conjured.ConjuredDemonicRune, + defaultPotion: Potions.MajorManaPotion, + dragonBreathChili: false, + enchantedSigil: EnchantedSigil.WrathOfTheStormSigil, + flask: Flask.FlaskOfAncientKnowledge, + food: Food.FoodGrilledSquid, + healthElixir: HealthElixir.ElixirOfFortitude, + mainHandImbue: WeaponImbue.WildStrikes, + manaRegenElixir: ManaRegenElixir.MagebloodPotion, + offHandImbue: WeaponImbue.EnchantedRepellent, + petAttackPowerConsumable: 1, + petAgilityConsumable: 1, + petStrengthConsumable: 1, + sapperExplosive: SapperExplosive.SapperFumigator, + spellPowerBuff: SpellPowerBuff.ElixirOfTheMageLord, + zanzaBuff: ZanzaBuff.GroundScorpokAssay, +}); + +export const DefaultConsumes = RangedConsumes; + export const DefaultRaidBuffs = RaidBuffs.create({ arcaneBrilliance: true, aspectOfTheLion: true, @@ -333,3 +419,67 @@ export const OtherDefaults = { profession2: Profession.Engineering, race: Race.RaceTroll, }; + +/////////////////////////////////////////////////////////////////////////// +// Encounters +/////////////////////////////////////////////////////////////////////////// + +export const EncounterWeavePhase6 = PresetUtils.makePresetEncounter( + 'Weave', + 'https://wowsims.github.io/sod/hunter/#eJztV2toHFUU3nN3djM5acbJzWv2Jmm321anYzad3c3GpGm7k+CPEqWGWKG/pIZWaikkuCD6r5YWbbUS8kcaUVOtNgQjJaBgEVIjQqtoW6Ulvgui+ECM/SFVaeOZ12Z2G03FCopelt17zzn3O4/73cdiXGYqizOdmdAOFtsKJ9m2MYDdbA8MMTjGoLtJgzGnZ8EMwAWAXnYMtu2AUWAnAXhIHI1htHfXPQ9tv1+NaOvizBgDrFCnn1W0Dzr1iYkYSuqvwwqWqW+Q6OUa0k2OK9rZqH7uR0GDN0n6haIfIMMK9cmDivZ1p37lJXvwNA321ugfXtFQVg8dVPTROY3EJ1zkn53BM2TzuaL/cLmBbD56QdEf32v3Xjys6I9RT1KfOqzQ96Un7AAujira+RoMUXffYUX7pjPdLJeroEed5GGjNMTYg2WPQmQI2ChIVIcTAO+DpEKcco+s/UrCCyz0f/tbG9/9ny/xtyzUXd0OxD8iJfTCFtgKO2AQehqSZrY1mzJNM5vMZMxs2kzTJ2NSN9UrbYH+0M4zVVoYq1EWUZTkQ2cbE2UYwXAym8cYopAxKo89T4xPlCMpkpmWbF4DrEV5p23/ykQsoMA6D+aTUUgg0txkqqWD5JorV38ZqvTkZkurA+TPeO1dCGoK8lcf6SmS12OZoPDkL+tLgDQv2NNvgV4e1PEGEcMq4wY5zFl/SDjZZbOrhIRMq+RxsRRreXWpQRsZ0I/6Uz9vEg2ONhqYbq7qs4ObmojxlSKBmlEnSxx3FvzboSPL5p0U6Dji60UntvBmrDWq5QiPTDMmMztclFItt+Sx2qgicXgYQq7QJOEwOF1kqTSfBfE94AXgn4JjG3UhIq6fVB77RK8TpAfiizt5B4YPQAjrjVrSlY+DF1DBImbUk6Ji3HYmv0exz2PeJe5EYWhUliXjQIssHx+Ih3XZ1afzji6ykC7jwpbOc7PGykQFlk86gRx5pxGX2Gs1Ce6aDoNTX4QspSyD+A7wM+Afg1O3QtJeidr/VWkXciwpQCHlNt5FGa/HFF+DSmIJ4oitkU8P6HJw/PqAHnaTW6hqkmBrQ0HKrvUom864ZCSPvJ38tKLBdac+Ub8+Fy83FBIJxEhbvDAzSTNXY5wvdQ2e8+saHNowblzOzlMNxYvDwW7N+8pGIRZQeqcEv5n8LONNxfQo8drnG6+gsJZhnVFjJzMN3rkh3LL6/iwyWodpbmK1qApgRt6m9YHShALVd7KnxwNfI5K4gi9feP5CE+4gl7dhF88t6pKKFhwen9OC610AXC1uwibeUMSN4sALpnYBFzEtcJ/HBNWWk3KkCMc+uSpFhZhnM6dDVngB8w1/VM8gXUvY4Ye4icrTgxbfUEK30iPCY0mPxxLa90WsEF7FeD/h3Y2bed+fxrOpIwXPCYc6mQV8zLNocR9S0IeDMEUIt4pubOdtv7P3UvlSJl6dq107S2zAVp6+ZpSrEfz959567oW1SvjXGi268HnDm4Uxv+ndHKeKU6Z3g/9+KJDUPWMDoXn3nXct0hvhGk3Vh48o3BD6YqY+3wZPwn5wH0a6dYnBKe99KFtnvV6HNcNgBELT0MgFveijidBqVzObS/mdjSwxHS53R5usKrez0oqNHLLbqVyHKzmTW36v087n0sNheWZPJZdv3/7A9l3xNlPLxcPGP+wfgL7fui44N078JRxVzF2fOKi5SzZ41Oq4b2B236nN53JdnsbaAr8BPTHkGg==', +); + +export const EncounterRangedDraconicPhase6 = PresetUtils.makePresetEncounter( + 'Ranged Draconic', + 'https://wowsims.github.io/sod/hunter/#eJztVl1oHFUUnnNnZnf2pBknt5vN5DbGcUllHLth9mdCfpSdRh9i1bKKD3nU0EgrhQYDom8lpGiV1BipYH0wwdqEQiQEFOxLa6CQIGojWKKCFkRRn2ofpCi4nvnZ7RpbI1hB0Puwc+79vvvdc86cc2cxqzGDWcxmLvSCz4bgMVhl+xYADrMJmGawxGDwVhMWQsuHDYBLABW2BPv2wyywVQAuiaUWTFQOPv7s6FNG0rzbYs4CYJPxypRuvj9gv7PYjorxy4yOSeNlWno7Tdjyad1cT9jrPwqavEqrX+v2C0RsMl6iyXcD9uLxAJma083JtP3ZryZqxvSUbs9WTVo+90aoPB9uOE4bvtLt89WA8/lbun1scgdZp+Z0+0WyFOPqMZ1+X58LHLgyq5sX0yiReYS0vx8o3KWlDLATYfgwpIwln+l8HtRpYLOgUBrOAXwCigEWha72f6vgJSb9P/7RwQ//51P8A5MGt/cC1R/VJFRgmNpyP4zBHpFzvZKXd928lysWS67rFjy3UHSLrldRhmFEevKLlCljKyaFirL2TVtWwwQquUJh3ATMIAqaaxfOg52Mkbw7jm3x+sKb1AnZFCZRzRW7vXGklhJE0t59bk8WkSg5t7tUCqRixPhyXt+EZGLk5+nmRqSu9d6H8Aet6PiPya1UI8Y7hEA9uw2xUMevMUO0xblFUzgbkQQ5jbLn7QwCNyYPXA/tidGfRnin6EDuGFqCs35JhKkoUMS1aP8MD2Lmt2kgdlyXEeWdW0S48RGUhPAIU2QwtQzxqbEZHNAv8S5SsDDjpEkhtVLjBPoI+brKw8R6CO/lu7HNadVUnjodMs9WzYCCrDj+e+BUA9CcbaqdTrd0KHnygw7uim7s4tkwe5HzYfby3g13JMgJ4vFdwkGLd9Z21t+Ku7O26+xi+yPxk1fEXryPD24SDd2Va+7S1R+5W6AKcjJBKs7UA4zccqOUnqmavEeU0OH2X1UUsVDd7037GqYUpYjTx6laRazEt4mG1qnPPqL6VHmv6MFd3MFWZzvlX11hTFOjOsgHzRUkSeXyDEiRP/mouiZO6twSnZjmHA1Hj+s3ZFD51nL3gLgf7+EDjS7SctQsy0CJ0a4cshMoHPPaqw8iD5s7312iOqzfBOFxQaUCj4srfLghg2rMYlsy5C0ZypYMdUtGYmwVjkJ0Rdr+VQZr8ZdC89djq8/fYHACpBXo4II+7YmsdGeEXC7na8YQy67IqWi212+JjC6//cRrwVgr90UrF8q3PxGOi+XCjKxtTDRz7cHRp0cPWj2uWbZk51/2X8A+6t8UnTsW/5aOIao3xw8a0Ssbm/f7Dhy6fGTt0U/Lu2PEH4bfAEReM3g=', +); + +export const EncounterRangedKillshotPhase6 = PresetUtils.makePresetEncounter( + 'Ranged Killshot', + 'https://wowsims.github.io/sod/hunter/#eJztVE1oVFcUfufOvJn7Tszr82aSvFxjGR8ir1NG3sxkJPGHebqK8W8WLrIQseIUG0QHB0q7k1TxDyUEXKgLE40aAiMSULArHRESS6sRlOiiFYqiXRTbRbEtGM/7yRjrshYK7VnMfPd855x7vnPvu2hxZrAks5kDneCybtgGE2zHKMA+1g8DDC4zWLPQhFEfuTAN8BigyC7Djp0wBGwCQCjyq0aMFXd98mVprxE3VyZZahSwwaid0c0bK+xqtQ2jxp+DOsaNG+S6lCBufEw3p2L21C+SFjfJ+6NuH6HABuPnEd18RlknPObYsG7uT9gPX5nIjVcjuj00Y5L7elD5d39xnxJ+0O1bM17Mo/O6fXz/AkIXhnX7KKGo8fK4Tr+nh70Gfh3SzQcJVAgeoNrPV2Q/5poBdsyXD93RcvyLDw+BOgBsCKI0husA9yBqQJKkq8ufRvExU/63f9TEvv/8iH9iypqmTqD7R3cSitBLn+VOKEPPgkzayXfkM47j5NO5XAf9Z/NONufknHwx2gvblb6qakawBVFyjPG7t8COW4Qwms44FWwN/aPn6M5bGsZRTeeW5iuUwCUFGX8MNFqIFJJ2lnaQ3wwT7lAh7S8M76MMfqXaNtdvgmiXEnVrHmK2nvmmhlgn12JBrMLmVBNXhVpjjKvS7zDjNTI/9QG5I4OgeP0gywSuiGA9iqR2MZJzKn6r/SO62Cq3ID8L5OVPWkURY5vKpd2lvcIXw+ndCBE9FSH6uo6uHuwJkPH9RV0EMr+jFtU52ZZMYksqwWNCq0GYJGk3hLwfc+1bEIulhWaqhVrEvjeC/eaXVeqVemS3L7s11UyR2hiExGygT6jvEB0V1M5CKEGGOhNSIB8PVdf1bZDrcLUovF2I5AaFaLRtqVYiGsagrjSgOut7hNvykW/aRbNsQm0cwmVdB83pHeztPou9+c6Tc6fZIDXv4PidPTYXhtRRvU1nDp4Y47ft5Qk4DMGtt92XDCbDj5+7UyHqcqcZnAKlBu1C0msds5SPAuZFITMLuplVi2jBaqM7PwCL3bZTJz2bLHQFnruFRZ/69qCQHYzw6f5GwdeXPi/tSi5zzEIykvqXPe/2Yfe91FlS/Vt1DDnzfvogC46sfNHt+mzPiwOTm+8XVoeM2wuvAX2b+Tk=', +); + +export const EncounterMeleeBMPhase6 = PresetUtils.makePresetEncounter( + 'Melee BM', + 'https://wowsims.github.io/sod/hunter/#eJztVF1IFFEU3nN3dnf2mNN0XXX2arBtaePCyuzYVGqxmxVJDyHUg48lWZqli0tQPa1m9IckQaT1oEJUSP4QPUQQlhQY9GeQ+RBURFERqC/hSz937q76UD1VENQZmPud73z33HPP3LmYLxOVBIhODFgNMbId4iRJWqGDwBCBCqbBZYFiMAFQRYZgZx30ABkFoA42mIHuqr07DtY2qy5tTYCEBgEz1JFeRbtdrvf3+1FSO08p6FHvcGrAx2P3uxVtzK2PTTPu3OLsa0Xv/KJx52y7or0r179c8XPn2hlFa/PpXZ/zUFaHzij6jKDPt4vME8K5zWe/UPRnST/XJHsV/WSbrX7Yreg3D+fxpc/3Kvx94qhdwHSPon20wYPuNDgxkqm9LzdXyh6V6G6xeaiUOgg54EmCdAxcHUB6QLoMMARwHWAG4BbAEyAq74Sr7K2EL4njv/1Ro8l/vsUfiKNCFWcTqqAatkMdxGFznmUZhmEahsWfiGlFwjYKl5SYhlklVUONY887p+bEHMTT4EEXOhGsoIxulMIRI4FZKDOO5a6x/KAIh60E5iIyLpEf3QXdG/QiD4QjxTyQnVY/74Ef0Z86Z2mjOJKgEiNlDlrAliKjGuaEfLKbekfAVvIfl4laTHuQ3+RSi5VgEV2OmcEM9F4VIvsGsGc5v5sVYWmXRtlaLKERzA1l27obczo+IjETP1l2PgHfqcCTHGcwL+PVy8NNujQXsEUmM7CQLkM1pPBVSI0jld4qEIybks1pZkVCzBnu99PFLA8XhRbaUa4XvbWMgtlm041sPZbSVegP5dr19UG6CCa+jWgrC2myi2IfzNY0HxNpbnzV6AIZUnWqLReU+Cgch9Rp8cVmCJwDxwhk0yxZVt0aBB1FA5teHfINTEYrPcFxpzel3BJblALLYv5zXbbdi5ammMfRJbuEjUfNi055ojWT5m/d39hQ2xjYVrsvvrc2sKF5x+6mxob6xkBFUyKhRQPu0F92GU61xH5LnsL+X8qjBlau+y11cIuId/xSrLS+aerIvW1Po7OpY9XwDYq30s4=', +); + +export const EncounterMeleeSVPhase6 = PresetUtils.makePresetEncounter( + 'Melee SV', + 'https://wowsims.github.io/sod/hunter/#eJztVF1IFFEU3nP3b/aY03j9m5012ra0aWhjZteJzGI36UF8CCEffLTI0jRdWqJ6szL6wxAfKotIX0oiQ3qI8EXbelCIyCLxISqIoiLQ6kUIrTt3d6wwnzII6gzMnPOd73z33HNnBgMCkUiQqESHDRAndZAgbWRTJ4EBAhVFMvRxLw4TANVkAHY1QA+QEYBKoA7lyRL0VDfvOFy/X3LLm4JE6wPMklK9ovykXO3v96NL+tIlole6z6CbeSz34Iooj3nUpx8VFgwz9JWoXpiVWXC+Q5TflquzN/wsuMyC9jy1eyaAgtTdIarTHL7UwZUneHCXVb8Q1UnOaesV1bPtlvfwiqieYZ5Len5NZPdLvVYDfYz8QUQHc0+nsuV35ZGo4JWI6uHbhkpXJyGHvCfB3QmkB1x9AAMAdwCmAYYBHgOR2ATcG9+48CVx/Lc/arTtnx/xe+KokPiLCdVQC3XQAAmoCoR10zR1ZmY4Go3o7Co1IlE9qptGtasWdjr2nnPLTixA7AIvutGJYIYE9KArbOhJzEVBYb7QPVYU4umwmWRkn8IC4XOjKoR8yNywsY7h+Rnysx74FXz7RFUG1tcZSeoRQCEbHXQley7HAi1P8FBfCiwm+1oV3krEegivC2lE0XGtoi1EQ0kTGc7krJWQGDoTNpUorqGrMTuUhb5bvML6VVgSznkSUSUT0piyGaPUwEIt3+INzvG4ciS5QA/GnEC+kmuvd+xeEYc/zQT4Forpyp/LZ+1yE31dTrvEGu5Qq+qiqKRHN8lkbd/SylJ880nW2tYiJXQVn4eTkp2ZeZjF9oSqMkhpktcM9fvpMiWAOdpSK8v4/JRNvdg+dnpQOYBNtBFlrUBw/zgPzmQnzDNsR9ch0+oCGdb494xfK2QZvA72NuZSfOHBr3JiBE5B+t3Oi08TuAiOFOTTXEGQPDKEHGvSualYpTc07vSlo23xHLvEf7HbstFYWRp5FFuxm9t4LHLVKUwczaZF2w+0NNW3BGvq9yWa64Nb9+/Y09rS1NgSrGhNJuVY0KP9Zb/uqSPxRdEp6f8tHSm4fsui9MHM4PfEtXhZY+vU8dGapzFbOl4L3wABv+hb', +); + +/////////////////////////////////////////////////////////////////////////// +// Presets +/////////////////////////////////////////////////////////////////////////// + +export const PresetBuildWeave = PresetUtils.makePresetBuild('Weave', { + gear: DefaultGearWeave, + talents: DefaultTalentsWeave, + rotation: DefaultAPLWeave, + encounter: EncounterWeavePhase6, +}); +export const PresetBuildRangedDraconic = PresetUtils.makePresetBuild('Ranged Draconic', { + gear: DefaultGearRangedDraconic, + talents: DefaultTalentsRangedDraconic, + rotation: DefaultAPLRangedDraconic, + encounter: EncounterRangedDraconicPhase6, +}); +export const PresetBuildRangedKillshot = PresetUtils.makePresetBuild('Ranged Killshot', { + gear: DefaultGearRangedKillshot, + talents: DefaultTalentsRangedKillshot, + rotation: DefaultAPLRangedKillshot, + encounter: EncounterRangedKillshotPhase6, +}); +export const PresetBuildMeleeBM = PresetUtils.makePresetBuild('Melee DW', { + gear: DefaultGearMeleeBM, + talents: DefaultTalentsMeleeBM, + rotation: DefaultAPLMeleeBM, + encounter: EncounterMeleeBMPhase6, +}); +export const PresetBuildMeleeSV = PresetUtils.makePresetBuild('Melee 2H', { + gear: DefaultGearMeleeSV, + talents: DefaultTalentsMeleeSV, + rotation: DefaultAPLMeleeSV, + encounter: EncounterMeleeSVPhase6, +}); \ No newline at end of file diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts index 129d65504f..f9564eb189 100644 --- a/ui/hunter/sim.ts +++ b/ui/hunter/sim.ts @@ -143,6 +143,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { 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], @@ -151,6 +152,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { ], // 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], @@ -159,13 +161,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, { ], // 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.PresetBuildRangedMM, Presets.PresetBuildRangedSV, Presets.PresetBuildMeleeBM, Presets.PresetBuildMeleeSV, Presets.PresetBuildWeave], + builds: [Presets.PresetBuildRangedDraconic, Presets.PresetBuildRangedKillshot, Presets.PresetBuildMeleeBM, Presets.PresetBuildMeleeSV, Presets.PresetBuildWeave], }, autoRotation: player => { From 584acd7158c58dae54f8bc890d960fbe24e811ee Mon Sep 17 00:00:00 2001 From: Nathan Berman Date: Thu, 19 Dec 2024 20:00:39 +0000 Subject: [PATCH 2/2] updated presets --- ui/hunter/apls/p6_melee_bm.apl.json | 23 ++++++++ ui/hunter/apls/p6_melee_sv.apl.json | 26 ++++++++++ ui/hunter/apls/p6_ranged_draconic.apl.json | 42 +++++++++++++++ ui/hunter/apls/p6_ranged_killshot.apl.json | 27 ++++++++++ ui/hunter/apls/p6_weave.apl.json | 52 +++++++++++++++++++ ui/hunter/gear_sets/p6_melee_bm.gear.json | 21 ++++++++ ui/hunter/gear_sets/p6_melee_sv.gear.json | 21 ++++++++ .../gear_sets/p6_ranged_draconic.gear.json | 21 ++++++++ .../gear_sets/p6_ranged_killshot.gear.json | 21 ++++++++ ui/hunter/gear_sets/p6_weave.gear.json | 21 ++++++++ 10 files changed, 275 insertions(+) create mode 100644 ui/hunter/apls/p6_melee_bm.apl.json create mode 100644 ui/hunter/apls/p6_melee_sv.apl.json create mode 100644 ui/hunter/apls/p6_ranged_draconic.apl.json create mode 100644 ui/hunter/apls/p6_ranged_killshot.apl.json create mode 100644 ui/hunter/apls/p6_weave.apl.json create mode 100644 ui/hunter/gear_sets/p6_melee_bm.gear.json create mode 100644 ui/hunter/gear_sets/p6_melee_sv.gear.json create mode 100644 ui/hunter/gear_sets/p6_ranged_draconic.gear.json create mode 100644 ui/hunter/gear_sets/p6_ranged_killshot.gear.json create mode 100644 ui/hunter/gear_sets/p6_weave.gear.json diff --git a/ui/hunter/apls/p6_melee_bm.apl.json b/ui/hunter/apls/p6_melee_bm.apl.json new file mode 100644 index 0000000000..1c7041f772 --- /dev/null +++ b/ui/hunter/apls/p6_melee_bm.apl.json @@ -0,0 +1,23 @@ +{ + "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":25295,"rank":9}}},"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":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415358}}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"1"}}}}]}},"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":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":415343}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":14271,"rank":4}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":409530}}}}, + {"hide":true,"action":{"castSpell":{"spellId":{"itemId":233985}}}} + ] +} \ No newline at end of file diff --git a/ui/hunter/apls/p6_melee_sv.apl.json b/ui/hunter/apls/p6_melee_sv.apl.json new file mode 100644 index 0000000000..e97a56e01d --- /dev/null +++ b/ui/hunter/apls/p6_melee_sv.apl.json @@ -0,0 +1,26 @@ +{ + "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":1213366}}},"doAtValue":{"const":{"val":"-0.1s"}}} + ], + "priorityList": [ + {"hide":true,"action":{"autocastOtherCooldowns":{}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"2"}}}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10"}}}}]}},"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":{"condition":{"auraIsActive":{"auraId":{"spellId":467331}}},"castSpell":{"spellId":{"spellId":458482}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":415358}}},"rhs":{"const":{"val":"5"}}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":467331}}}]}},"castSpell":{"spellId":{"spellId":14271,"rank":4}}}}, + {"action":{"castSpell":{"spellId":{"spellId":415343}}}}, + {"action":{"castSpell":{"spellId":{"spellId":458482}}}}, + {"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":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":415320}}},"rhs":{"const":{"val":"1.5"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":415343}}},"rhs":{"const":{"val":"1.5"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1.5"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":14271,"rank":4}}},"rhs":{"const":{"val":"1.5"}}}}]}},"castSpell":{"spellId":{"spellId":409530}}}} + ] +} \ No newline at end of file diff --git a/ui/hunter/apls/p6_ranged_draconic.apl.json b/ui/hunter/apls/p6_ranged_draconic.apl.json new file mode 100644 index 0000000000..42b8dc9ec6 --- /dev/null +++ b/ui/hunter/apls/p6_ranged_draconic.apl.json @@ -0,0 +1,42 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":3045}}},"doAtValue":{"const":{"val":"-22s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":25296,"rank":7}}},"doAtValue":{"const":{"val":"-10s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":1213366}}},"doAtValue":{"const":{"val":"-0.44s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"itemId":234462}}},"doAtValue":{"const":{"val":"-0.44s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.44s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":26297}}},"doAtValue":{"const":{"val":"-0.44s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":25295,"rank":9}}},"doAtValue":{"const":{"val":"-0.44s"}}} + ], + "priorityList": [ + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":25295,"rank":9}}}}},"castSpell":{"spellId":{"spellId":25295,"rank":9}}}}, + {"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":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2.5s"}}}},"castSpell":{"spellId":{"spellId":1213366}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2.5s"}}}},"castSpell":{"spellId":{"itemId":234462}}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2.5s"}}}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2.5s"}}}},"castSpell":{"spellId":{"spellId":26297}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":1213366}}},{"auraIsActive":{"auraId":{"itemId":234462}}}]}},"autocastOtherCooldowns":{}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":1213366}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":26297}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409535}}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409510}}},"rhs":{"const":{"val":"3s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":468388}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"15s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}}]}},"castSpell":{"spellId":{"spellId":468388}}}}, + {"hide":true,"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":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}}]}},"castSpell":{"spellId":{"spellId":409510}}}}, + {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, + {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}}}, + {"action":{"castSpell":{"spellId":{"spellId":25294,"rank":5}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"itemId":233986}}}}, + {"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":25296,"rank":7}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}},"castSpell":{"spellId":{"spellId":26297,"tag":2}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}},"castSpell":{"spellId":{"spellId":26297,"tag":3}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}},"castSpell":{"spellId":{"spellId":26297,"tag":4}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}},"castSpell":{"spellId":{"spellId":26297,"tag":5}}}}, + {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}},"castSpell":{"spellId":{"spellId":26297,"tag":6}}}} + ] +} \ No newline at end of file diff --git a/ui/hunter/apls/p6_ranged_killshot.apl.json b/ui/hunter/apls/p6_ranged_killshot.apl.json new file mode 100644 index 0000000000..0e12662e15 --- /dev/null +++ b/ui/hunter/apls/p6_ranged_killshot.apl.json @@ -0,0 +1,27 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":25296,"rank":7}}},"doAtValue":{"const":{"val":"-10s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":20904,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.45s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":25295,"rank":9}}},"doAtValue":{"const":{"val":"-0.45s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":415413}}},"doAtValue":{"const":{"val":"-0.45s"}},"hide":true} + ], + "priorityList": [ + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":25295,"rank":9}}}}},"castSpell":{"spellId":{"spellId":25295,"rank":9}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGt","lhs":{"gcdTimeToReady":{}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"30s"}}}}]}},"castSpell":{"spellId":{"itemId":233986}}}}, + {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":3045}}},"sequence":{"name":"Opener","actions":[{"castSpell":{"spellId":{"spellId":409433}}},{"castSpell":{"spellId":{"spellId":409593}}},{"castSpell":{"spellId":{"spellId":409530}}},{"castSpell":{"spellId":{"spellId":1213366}}},{"castSpell":{"spellId":{"itemId":234462}}},{"castSpell":{"spellId":{"spellId":25294,"rank":5}}},{"castSpell":{"spellId":{"spellId":409433}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":1213366}}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":26297}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":25295,"rank":9}}},"rhs":{"const":{"val":"6s"}}}},"castSpell":{"spellId":{"spellId":409433}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"4s"}}}},{"spellIsReady":{"spellId":{"spellId":409593}}}]}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":3045}}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":409530}}},"rhs":{"const":{"val":"5s"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":25294,"rank":5}}},"rhs":{"const":{"val":"8s"}}}},{"spellIsReady":{"spellId":{"spellId":409433}}}]}},"castSpell":{"spellId":{"spellId":468388}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":468388}}},"castSpell":{"spellId":{"spellId":409433}}}}, + {"action":{"castSpell":{"spellId":{"spellId":409433}}}}, + {"action":{"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"castSpell":{"spellId":{"spellId":409530}}}}, + {"action":{"castSpell":{"spellId":{"spellId":25294,"rank":5}}}}, + {"action":{"castSpell":{"spellId":{"spellId":14287,"rank":8}}}}, + {"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"itemId":12662}}}} + ] +} \ No newline at end of file diff --git a/ui/hunter/apls/p6_weave.apl.json b/ui/hunter/apls/p6_weave.apl.json new file mode 100644 index 0000000000..377964ee05 --- /dev/null +++ b/ui/hunter/apls/p6_weave.apl.json @@ -0,0 +1,52 @@ +{ + "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":{"activateAura":{"auraId":{"spellId":415413}}},"doAtValue":{"const":{"val":"-3.5s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.95s"}}}, + {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.45s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":26297}}},"doAtValue":{"const":{"val":"-0.45s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":1213366}}},"doAtValue":{"const":{"val":"-0.45s"}}}, + {"action":{"castSpell":{"spellId":{"spellId":3045}}},"doAtValue":{"const":{"val":"-0.45s"}},"hide":true}, + {"action":{"castSpell":{"spellId":{"spellId":25295,"rank":9}}},"doAtValue":{"const":{"val":"-0.45s"}}} + ], + "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":{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":25295,"rank":9}}},"rhs":{"const":{"val":"5s"}}}},"castSpell":{"spellId":{"spellId":409433}}}}, + {"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.6s"}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"12"}}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","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":25294,"rank":5}}},"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"}}}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":3045}}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Ranged"}},"rhs":{"const":{"val":"0.8s"}}}},{"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":25294,"rank":5}}},"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}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}}]}},"move":{"rangeFromTarget":{"const":{"val":"6"}}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellCanCast":{"spellId":{"spellId":14287,"rank":8}}}}},{"not":{"val":{"spellCanCast":{"spellId":{"spellId":14268,"rank":3}}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":3045}}}]}},"move":{"rangeFromTarget":{"const":{"val":"5"}}}}}, + {"action":{"autocastOtherCooldowns":{}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"19s"}}}},"castSpell":{"spellId":{"spellId":468388}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"3s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409530}}},"rhs":{"const":{"val":"3s"}}}}]}},"castSpell":{"spellId":{"spellId":468388}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":458482}}}}}]}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"itemId":215162}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":3045}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}}]}},"cancelAura":{"auraId":{"itemId":215162}}}}, + {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":1213366}}},"rhs":{"const":{"val":"6"}}}},"castSpell":{"spellId":{"spellId":3045}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":3045}}},{"isExecutePhase":{"threshold":"E20"}}]}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}},{"spellCanCast":{"spellId":{"spellId":14287,"rank":8}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":3045}}},{"isExecutePhase":{"threshold":"E20"}}]}},{"spellCanCast":{"spellId":{"spellId":14287,"rank":8}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"hide":true,"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":3045}}},{"isExecutePhase":{"threshold":"E20"}}]}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":458482}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409530}}}}},{"spellCanCast":{"spellId":{"spellId":14268,"rank":3}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":3045}}},{"isExecutePhase":{"threshold":"E20"}}]}},{"spellCanCast":{"spellId":{"spellId":14268,"rank":3}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":458482}}}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":25294,"rank":5}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":25294,"rank":5}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}}]}},"castSpell":{"spellId":{"spellId":25294,"rank":5}}}}, + {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":409433}}}]}},"castSpell":{"spellId":{"spellId":409433}}}}, + {"action":{"castSpell":{"spellId":{"spellId":14266,"tag":3,"rank":8}}}}, + {"action":{"castSpell":{"spellId":{"spellId":458482}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":3045}}}}}]}},"castSpell":{"spellId":{"spellId":409530}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":409433}}},"rhs":{"const":{"val":"3"}}}},{"auraIsActive":{"auraId":{"spellId":3045}}}]}},"castSpell":{"spellId":{"spellId":409530}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415413}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":468388}}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}}]}},"castSpell":{"spellId":{"spellId":409535}}}}, + {"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}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":3045}}}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":458482}}},"rhs":{"const":{"val":"1s"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":409433}}}}},{"auraIsActive":{"auraId":{"spellId":3045}}}]}},"castSpell":{"spellId":{"spellId":409593}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}},"castSpell":{"spellId":{"spellId":415423}}}}, + {"action":{"castSpell":{"spellId":{"spellId":14287,"rank":8}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":415423}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":469145}}}}}]}},"castSpell":{"spellId":{"spellId":469145}}}}, + {"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":233985}}}}, + {"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}}}} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p6_melee_bm.gear.json b/ui/hunter/gear_sets/p6_melee_bm.gear.json new file mode 100644 index 0000000000..ee28f8e084 --- /dev/null +++ b/ui/hunter/gear_sets/p6_melee_bm.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":233666,"enchant":7617,"rune":415405}, + {"id":231320}, + {"id":233668,"enchant":2606}, + {"id":233420,"enchant":849,"rune":440529}, + {"id":233664,"enchant":1891,"rune":409368}, + {"id":231063,"enchant":7656,"rune":415358}, + {"id":232116,"enchant":2564,"rune":458393}, + {"id":232112,"rune":415352}, + {"id":231067,"enchant":7617,"rune":415320}, + {"id":233665,"enchant":1887,"rune":409687}, + {"id":233600,"rune":442891}, + {"id":233422,"rune":442813}, + {"id":233627}, + {"id":230282}, + {"id":233585,"enchant":1900}, + {"id":233421,"enchant":1900}, + {"id":221450,"enchant":7657} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p6_melee_sv.gear.json b/ui/hunter/gear_sets/p6_melee_sv.gear.json new file mode 100644 index 0000000000..1606b690c1 --- /dev/null +++ b/ui/hunter/gear_sets/p6_melee_sv.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":233666,"enchant":7635,"rune":415405}, + {"id":231803}, + {"id":233668,"enchant":2606}, + {"id":233420,"enchant":849,"rune":440533}, + {"id":233664,"enchant":1891,"rune":409368}, + {"id":231063,"enchant":7656,"rune":415358}, + {"id":231069,"enchant":2564,"rune":458393}, + {"id":231065,"rune":415352}, + {"id":231067,"enchant":7635,"rune":415320}, + {"id":233665,"enchant":1887,"rune":458479}, + {"id":233600,"rune":442894}, + {"id":233422,"rune":442891}, + {"id":234462}, + {"id":233627}, + {"id":233640,"enchant":1900}, + {}, + {"id":221450,"enchant":7657} + ] + } \ No newline at end of file diff --git a/ui/hunter/gear_sets/p6_ranged_draconic.gear.json b/ui/hunter/gear_sets/p6_ranged_draconic.gear.json new file mode 100644 index 0000000000..c848966842 --- /dev/null +++ b/ui/hunter/gear_sets/p6_ranged_draconic.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":231059,"enchant":7617,"rune":415413}, + {"id":231803}, + {"id":231057,"enchant":2606}, + {"id":234802,"enchant":849,"rune":440529}, + {"id":231062,"enchant":1891,"rune":415370}, + {"id":231055,"enchant":7656,"rune":428717}, + {"id":233613,"enchant":2564,"rune":409433}, + {"id":231056,"rune":409504}, + {"id":233408,"enchant":7617,"rune":415399}, + {"id":231061,"enchant":1887,"rune":409541}, + {"id":234202,"rune":442894}, + {"id":233638,"rune":442891}, + {"id":231288}, + {"id":233627}, + {"id":233586,"enchant":2646}, + {}, + {"id":233605,"enchant":7657} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p6_ranged_killshot.gear.json b/ui/hunter/gear_sets/p6_ranged_killshot.gear.json new file mode 100644 index 0000000000..e52d126040 --- /dev/null +++ b/ui/hunter/gear_sets/p6_ranged_killshot.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":233410,"enchant":7617,"rune":415405}, + {"id":231803}, + {"id":233409,"enchant":2606}, + {"id":234802,"enchant":849,"rune":440529}, + {"id":233411,"enchant":1891,"rune":415370}, + {"id":234065,"enchant":7656,"rune":428717}, + {"id":233613,"enchant":2564,"rune":409433}, + {"id":234110,"rune":409504}, + {"id":233408,"enchant":7617,"rune":409593}, + {"id":234069,"enchant":1887,"rune":409541}, + {"id":234202,"rune":442894}, + {"id":233638,"rune":442891}, + {"id":231288}, + {"id":233627}, + {"id":233586,"enchant":2646}, + {}, + {"id":233605,"enchant":7657} + ] +} \ No newline at end of file diff --git a/ui/hunter/gear_sets/p6_weave.gear.json b/ui/hunter/gear_sets/p6_weave.gear.json new file mode 100644 index 0000000000..c169ebea25 --- /dev/null +++ b/ui/hunter/gear_sets/p6_weave.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":233410,"enchant":7635,"rune":415405}, + {"id":231803}, + {"id":233409,"enchant":2606}, + {"id":234802,"enchant":849,"rune":440529}, + {"id":231071,"enchant":1891,"rune":415370}, + {"id":231063,"enchant":7656,"rune":428717}, + {"id":231069,"enchant":2564,"rune":409433}, + {"id":231065,"rune":409504}, + {"id":233408,"enchant":7635,"rune":409593}, + {"id":233407,"enchant":1887,"rune":458479}, + {"id":234202,"rune":442892}, + {"id":233638,"rune":442891}, + {"id":233627}, + {"id":231288}, + {"id":233586,"enchant":2646}, + {}, + {"id":233605,"enchant":7657} + ] +} \ No newline at end of file