Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Phase 3 Presets for Mutilate and Combat #3112

Merged
merged 2 commits into from
May 23, 2023
Merged

Add Phase 3 Presets for Mutilate and Combat #3112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
045bb8f
Added P3 Presets for Mutilate and Combat
where-fore May 22, 2023
1f82722
Shortened Combat Talent Names
where-fore May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/raid/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ export const playerPresets: Array<PresetSpecSettings<any>> = [
{
spec: Spec.SpecRogue,
rotation: RoguePresets.DefaultRotation,
talents: RoguePresets.CombatTalents.data,
talents: RoguePresets.CombatCQCTalents.data,
specOptions: RoguePresets.DefaultOptions,
consumes: RoguePresets.DefaultConsumes,
defaultName: 'Combat',
Expand Down
268 changes: 265 additions & 3 deletions ui/rogue/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
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',
data: SavedTalents.create({
talentsString: '00532010414-0252051050035010223100501251',
glyphs: Glyphs.create({
major1: RogueMajorGlyph.GlyphOfKillingSpree,
major2: RogueMajorGlyph.GlyphOfTricksOfTheTrade,
Expand Down Expand Up @@ -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<any>) => 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<any>) => 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,
Expand Down
5 changes: 4 additions & 1 deletion ui/rogue/sim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ export class RogueSimUI extends IndividualSimUI<Spec.SpecRogue> {
// Preset talents that the user can quickly select.
talents: [
Presets.AssassinationTalents,
Presets.CombatTalents,
Presets.CombatHackTalents,
Presets.CombatCQCTalents,
Presets.SubtletyTalents,
Presets.HemoSubtletyTalents,
],
Expand All @@ -292,6 +293,8 @@ export class RogueSimUI extends IndividualSimUI<Spec.SpecRogue> {
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,
Expand Down