From 045bb8f4df3f7f3a2b98bb813d83dba44d233f5f Mon Sep 17 00:00:00 2001 From: wherefore Date: Mon, 22 May 2023 18:18:39 -0400 Subject: [PATCH 1/2] Added P3 Presets for Mutilate and Combat Including Talents for Combat for Hack and Slash and Close Quarters Combat.. the names are pretty long but very descriptive, any shorter names --- ui/raid/presets.ts | 2 +- ui/rogue/presets.ts | 268 +++++++++++++++++++++++++++++++++++++++++++- ui/rogue/sim.ts | 5 +- 3 files changed, 270 insertions(+), 5 deletions(-) diff --git a/ui/raid/presets.ts b/ui/raid/presets.ts index a8d5c12b77..dbed75d86b 100644 --- a/ui/raid/presets.ts +++ b/ui/raid/presets.ts @@ -503,7 +503,7 @@ export const playerPresets: Array> = [ { spec: Spec.SpecRogue, rotation: RoguePresets.DefaultRotation, - talents: RoguePresets.CombatTalents.data, + talents: RoguePresets.CombatCQCTalents.data, specOptions: RoguePresets.DefaultOptions, consumes: RoguePresets.DefaultConsumes, defaultName: 'Combat', diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index 9fd3203416..9aa656b17e 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -19,10 +19,22 @@ import * as Tooltips from '../core/constants/tooltips.js'; // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. -export const CombatTalents = { - name: 'Combat', +export const CombatHackTalents = { + name: 'Combat Axes/Swords/Hack and Slash', data: SavedTalents.create({ - talentsString: '00532000514-0252051050035010223100501251', + talentsString: '00532010414-0252051000035015223100501251', + glyphs: Glyphs.create({ + major1: RogueMajorGlyph.GlyphOfKillingSpree, + major2: RogueMajorGlyph.GlyphOfTricksOfTheTrade, + major3: RogueMajorGlyph.GlyphOfRupture, + }) + }), +}; + +export const CombatCQCTalents = { + name: 'Combat Fists/Daggers/Close Quarters Combat', + data: SavedTalents.create({ + talentsString: '00532010414-0252051050035010223100501251', glyphs: Glyphs.create({ major1: RogueMajorGlyph.GlyphOfKillingSpree, major2: RogueMajorGlyph.GlyphOfTricksOfTheTrade, @@ -346,6 +358,256 @@ export const P2_PRESET_COMBAT = { ]}`), }; +export const P3_PRESET_ASSASSINATION = { + name: 'P3 Assassination', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + enableWhen: (player: Player) => player.getTalentTree() == 0, + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 48230, + "enchant": 3817, + "gems": [ + 41398, + 49110 + ] + }, + { + "id": 47060, + "gems": [ + 40114 + ] + }, + { + "id": 48228, + "enchant": 3808, + "gems": [ + 40114 + ] + }, + { + "id": 47545, + "enchant": 3605, + "gems": [ + 40114 + ] + }, + { + "id": 48232, + "enchant": 3832, + "gems": [ + 40114, + 40114 + ] + }, + { + "id": 47155, + "enchant": 3845, + "gems": [ + 40114, + 40114, + 0 + ] + }, + { + "id": 48231, + "enchant": 3604, + "gems": [ + 40114, + 0 + ] + }, + { + "id": 47112, + "enchant": 3599, + "gems": [ + 40156, + 40114, + 40114 + ] + }, + { + "id": 46975, + "enchant": 3823, + "gems": [ + 40118, + 40118, + 40118 + ] + }, + { + "id": 47077, + "enchant": 3606, + "gems": [ + 40156, + 40114 + ] + }, + { + "id": 47075, + "gems": [ + 40114 + ] + }, + { + "id": 45608, + "gems": [ + 40114 + ] + }, + { + "id": 47131 + }, + { + "id": 45609 + }, + { + "id": 46969, + "enchant": 3789, + "gems": [ + 40156 + ] + }, + { + "id": 46969, + "enchant": 3789, + "gems": [ + 40156 + ] + }, + { + "id": 47521, + "gems": [ + 40156 + ] + } + ]}`), + }; + +export const P3_PRESET_COMBAT = { + name: 'P3 Combat', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + enableWhen: (player: Player) => player.getTalentTree() == 1, + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 48230, + "enchant": 3817, + "gems": [ + 41398, + 49110 + ] + }, + { + "id": 47060, + "gems": [ + 40114 + ] + }, + { + "id": 48228, + "enchant": 3808, + "gems": [ + 40114 + ] + }, + { + "id": 47545, + "enchant": 3605, + "gems": [ + 40114 + ] + }, + { + "id": 48232, + "enchant": 3832, + "gems": [ + 40114, + 40114 + ] + }, + { + "id": 47155, + "enchant": 3845, + "gems": [ + 40114, + 40114, + 0 + ] + }, + { + "id": 48231, + "enchant": 3604, + "gems": [ + 40114, + 0 + ] + }, + { + "id": 47112, + "enchant": 3599, + "gems": [ + 40157, + 40114, + 40114 + ] + }, + { + "id": 46975, + "enchant": 3823, + "gems": [ + 40114, + 40114, + 40114 + ] + }, + { + "id": 47077, + "enchant": 3606, + "gems": [ + 40157, + 40114 + ] + }, + { + "id": 47075, + "gems": [ + 40114 + ] + }, + { + "id": 47934, + "gems": [ + 40157 + ] + }, + { + "id": 47131 + }, + { + "id": 45609 + }, + { + "id": 47156, + "enchant": 3789, + "gems": [ + 40157 + ] + }, + { + "id": 47001, + "enchant": 3789, + "gems": [ + 40157 + ] + }, + { + "id": 47521, + "gems": [ + 40157 + ] + } + ]}`), +}; + export const PRERAID_PRESET_ASSASSINATION = { name: 'Pre-Raid Assassination', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts index 36f3b01b56..745b55b5c9 100644 --- a/ui/rogue/sim.ts +++ b/ui/rogue/sim.ts @@ -279,7 +279,8 @@ export class RogueSimUI extends IndividualSimUI { // Preset talents that the user can quickly select. talents: [ Presets.AssassinationTalents, - Presets.CombatTalents, + Presets.CombatHackTalents, + Presets.CombatCQCTalents, Presets.SubtletyTalents, Presets.HemoSubtletyTalents, ], @@ -292,6 +293,8 @@ export class RogueSimUI extends IndividualSimUI { Presets.P1_PRESET_HEMO_SUB, Presets.P2_PRESET_ASSASSINATION, Presets.P2_PRESET_COMBAT, + Presets.P3_PRESET_ASSASSINATION, + Presets.P3_PRESET_COMBAT, Presets.P2_PRESET_HEMO_SUB, Presets.P3_PRESET_HEMO_SUB, Presets.P3_PRESET_DANCE_SUB, From 1f82722cb112316aad877b26a4ba5770dba641fb Mon Sep 17 00:00:00 2001 From: wherefore Date: Mon, 22 May 2023 18:21:02 -0400 Subject: [PATCH 2/2] Shortened Combat Talent Names --- ui/rogue/presets.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index 9aa656b17e..09bf670feb 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -20,7 +20,7 @@ import * as Tooltips from '../core/constants/tooltips.js'; // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url. export const CombatHackTalents = { - name: 'Combat Axes/Swords/Hack and Slash', + name: 'Combat Axes/Swords', data: SavedTalents.create({ talentsString: '00532010414-0252051000035015223100501251', glyphs: Glyphs.create({ @@ -32,7 +32,7 @@ export const CombatHackTalents = { }; export const CombatCQCTalents = { - name: 'Combat Fists/Daggers/Close Quarters Combat', + name: 'Combat Fists', data: SavedTalents.create({ talentsString: '00532010414-0252051050035010223100501251', glyphs: Glyphs.create({