Merge pull request #3079 from wowsims/subtlety-builder-option

Add dropdown menu for Subtlety builder
wowsims · May 12, 2023 · 16a4fd6 · 16a4fd6
2 parents b231381 + 04eeb85
commit 16a4fd6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/proto/rogue.proto b/proto/rogue.proto
@@ -172,6 +172,12 @@ message Rogue {
 		}
 		AssassinationPriority assassination_finisher_priority = 5;
 
+		enum SubtletyBuilder {
+			Hemorrhage = 0;
+			BackstabSub = 1;
+		}
+		SubtletyBuilder subtlety_builder = 26;
+
 		enum SubtletyPriority {
 			SubtletyEviscerate = 0;
 			SubtletyEnvenom = 1;

diff --git a/sim/rogue/rotation_subtlety.go b/sim/rogue/rotation_subtlety.go
@@ -1,10 +1,11 @@
 package rogue
 
 import (
-	"golang.org/x/exp/slices"
 	"log"
 	"time"
 
+	"golang.org/x/exp/slices"
+
 	"github.com/wowsims/wotlk/sim/core"
 	"github.com/wowsims/wotlk/sim/core/proto"
 )
@@ -320,7 +321,7 @@ func (x *rotation_subtlety) setSubtletyBuilder(sim *core.Simulation, rogue *Rogu
 		return
 	}
 	// Backstab
-	if !rogue.Rotation.HemoWithDagger && !rogue.PseudoStats.InFrontOfTarget && rogue.HasDagger(core.MainHand) {
+	if rogue.Rotation.SubtletyBuilder == proto.Rogue_Rotation_BackstabSub && !rogue.PseudoStats.InFrontOfTarget && rogue.HasDagger(core.MainHand) {
 		x.builder = rogue.Backstab
 		return
 	}

diff --git a/ui/rogue/inputs.ts b/ui/rogue/inputs.ts
@@ -8,6 +8,7 @@ import {
 	Rogue_Rotation_AssassinationPriority as AssassinationPriority,
 	Rogue_Rotation_CombatPriority as CombatPriority,
 	Rogue_Rotation_CombatBuilder as CombatBuilder,
+	Rogue_Rotation_SubtletyBuilder as SubtletyBuilder,
 	Rogue_Rotation_SubtletyPriority as SubtletyPriority,
 	Rogue_Rotation_Frequency as Frequency,
 	Rogue_Options_PoisonImbue as Poison,
@@ -114,6 +115,16 @@ export const RogueRotationConfig = {
 			],
 			showWhen: (player: Player<Spec.SpecRogue>) => player.getTalents().mutilate
 		}),
+		InputHelpers.makeRotationEnumInput<Spec.SpecRogue, SubtletyBuilder>({
+			fieldName: 'subtletyBuilder',
+			label: "Builder",
+			labelTooltip: 'Use Hemorrhage or Backstab as builder.',
+			values: [
+				{ name: "Hemorrhage", value: SubtletyBuilder.Hemorrhage },
+				{ name: "Backstab", value: SubtletyBuilder.BackstabSub },
+			],
+			showWhen: (player: Player<Spec.SpecRogue>) => player.getTalents().honorAmongThieves > 0
+		}),
 		InputHelpers.makeRotationEnumInput<Spec.SpecRogue, SubtletyPriority>({
 			fieldName: 'subtletyFinisherPriority',
 			label: "Finisher Priority",
@@ -141,12 +152,6 @@ export const RogueRotationConfig = {
 			labelTooltip: 'Minimum number of combo points spent if Slice and Dice has frequency: Once',
 			showWhen: (player: Player<Spec.SpecRogue>) => player.getRotation().multiTargetSliceFrequency == Frequency.Once
 		}),
-		InputHelpers.makeRotationBooleanInput<Spec.SpecRogue>({
-			fieldName: 'hemoWithDagger',
-			label: 'Hemorrhage with Dagger',
-			labelTooltip: 'Use Hemorrhage with Dagger in mainhand',
-			showWhen: (player: Player<Spec.SpecRogue>) => player.getTalents().hemorrhage
-		}),
 		InputHelpers.makeRotationBooleanInput<Spec.SpecRogue>({
 			fieldName: 'openWithGarrote',
 			label: 'Open with Garrote',

diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts
@@ -10,6 +10,7 @@ import {
 	Rogue_Rotation_CombatBuilder,
 	Rogue_Rotation_CombatPriority,
 	Rogue_Rotation_Frequency,
+	Rogue_Rotation_SubtletyBuilder,
 	Rogue_Rotation_SubtletyPriority,
 	RogueMajorGlyph,
 } from '../core/proto/rogue.js';
@@ -73,10 +74,10 @@ export const DefaultRotation = RogueRotation.create({
 	assassinationFinisherPriority: Rogue_Rotation_AssassinationPriority.EnvenomRupture,
 	combatBuilder: Rogue_Rotation_CombatBuilder.SinisterStrike,
 	combatFinisherPriority: Rogue_Rotation_CombatPriority.RuptureEviscerate,
+	subtletyBuilder: Rogue_Rotation_SubtletyBuilder.Hemorrhage,
 	subtletyFinisherPriority: Rogue_Rotation_SubtletyPriority.SubtletyEviscerate,
 	minimumComboPointsPrimaryFinisher: 4,
 	minimumComboPointsSecondaryFinisher: 4,
-	hemoWithDagger: true,
 });
 
 export const DefaultOptions = RogueOptions.create({