Merge pull request #1310 from wowsims/feature/add-trinket-swapping

Add full item swap to Sub sim
wowsims · Jan 17, 2025 · 86c2697 · 86c2697
2 parents 883b546 + 0e902b5
commit 86c2697
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/sim/core/attack.go b/sim/core/attack.go
@@ -845,6 +845,13 @@ func (aa *AutoAttacks) NewPPMManager(ppm float64, procMask ProcMask) *DynamicPro
 	return &dpm
 }
 
+// PPMManager for static ProcMasks and no item swap callback
+func (aa *AutoAttacks) NewStaticPPMManager(ppm float64, procMask ProcMask) *DynamicProcManager {
+	dpm := aa.newDynamicProcManager(ppm, 0, procMask)
+
+	return &dpm
+}
+
 // Dynamic Proc Manager for dynamic ProcMasks on weapon enchants
 func (aa *AutoAttacks) NewDynamicProcManagerForEnchant(effectID int32, ppm float64, fixedProcChance float64) *DynamicProcManager {
 	return aa.newDynamicProcManagerWithDynamicProcMask(ppm, fixedProcChance, func() ProcMask {

diff --git a/sim/rogue/poisons.go b/sim/rogue/poisons.go
@@ -331,7 +331,7 @@ func (rogue *Rogue) UpdateInstantPoisonPPM(bonusChance float64) {
 	const basePPM = 0.2 / (1.4 / 60) // ~8.57, the former 20% normalized to a 1.4 speed weapon
 
 	ppm := basePPM * (1 + core.TernaryFloat64(rogue.Spec == proto.Spec_SpecAssassinationRogue, 0.5, 0) + bonusChance)
-	rogue.instantPoisonPPMM = rogue.AutoAttacks.NewPPMManager(ppm, procMask)
+	rogue.instantPoisonPPMM = rogue.AutoAttacks.NewStaticPPMManager(ppm, procMask)
 }
 
 func (rogue *Rogue) applyInstantPoison() {

diff --git a/ui/rogue/subtlety/sim.ts b/ui/rogue/subtlety/sim.ts
@@ -136,7 +136,25 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecSubtletyRogue, {
 			OtherInputs.InputDelay,
 		],
 	},
-	itemSwapSlots: [ItemSlot.ItemSlotMainHand, ItemSlot.ItemSlotOffHand],
+	itemSwapSlots: [
+		ItemSlot.ItemSlotHead,
+		ItemSlot.ItemSlotNeck,
+		ItemSlot.ItemSlotShoulder,
+		ItemSlot.ItemSlotBack,
+		ItemSlot.ItemSlotChest,
+		ItemSlot.ItemSlotWrist,
+		ItemSlot.ItemSlotHands,
+		ItemSlot.ItemSlotWaist,
+		ItemSlot.ItemSlotLegs,
+		ItemSlot.ItemSlotFeet,
+		ItemSlot.ItemSlotFinger1,
+		ItemSlot.ItemSlotFinger2,
+		ItemSlot.ItemSlotTrinket1,
+		ItemSlot.ItemSlotTrinket2,
+		ItemSlot.ItemSlotMainHand,
+		ItemSlot.ItemSlotOffHand,
+		ItemSlot.ItemSlotRanged,
+	],
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
 		showExecuteProportion: false,