Merge pull request #1117 from hillerstorm/ptr_fixes

Some trinket and T12 fixes after PTR testing
wowsims · Oct 20, 2024 · fe9ace2 · fe9ace2
2 parents 245bd74 + a999fc4
commit fe9ace2
Show file tree

Hide file tree

Showing 7 changed files with 1,099 additions and 1,088 deletions.
diff --git a/sim/common/cata/other_effects.go b/sim/common/cata/other_effects.go
@@ -566,6 +566,19 @@ func init() {
 				MaxStacks: 5,
 			})
 
+			offHandBlacklist := map[int32]bool{
+				// DK: Threat of Thassarian crits doesn't proc
+				49143: true, // Frost Strike
+				49998: true, // Death Strike
+				85948: true, // Festering Strike
+				49020: true, // Obliterate
+				45462: true, // Plague Strike
+				56815: true, // Rune Strike
+
+				// Warrior: Whirlwind off-hand crits doesn't trigger procs
+				1680: true, // Whirlwind
+			}
+
 			core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 				Name:       "Titanic Power Aura" + labelSuffix,
 				ActionID:   core.ActionID{SpellID: 96924},
@@ -578,6 +591,16 @@ func init() {
 						return
 					}
 
+					// Warrior: Raging Blow crits doesn't trigger procs (both MH and OH)
+					if spell.ActionID.SpellID == 85288 {
+						return
+					}
+
+					// Off-hand blacklist
+					if _, blacklisted := offHandBlacklist[spell.ActionID.SpellID]; spell.ProcMask.Matches(core.ProcMaskMeleeOHSpecial) && blacklisted {
+						return
+					}
+
 					titanicPower.Activate(sim)
 					titanicPower.AddStack(sim)
 				},
@@ -632,6 +655,46 @@ func init() {
 			})
 		})
 
+		vesselItemID := core.TernaryInt32(heroic, 69167, 68995)
+		core.NewItemEffect(vesselItemID, func(agent core.Agent) {
+			character := agent.GetCharacter()
+
+			procAura := core.MakeStackingAura(character, core.StackingStatAura{
+				Aura: core.Aura{
+					Label:     "Accelerated",
+					ActionID:  core.ActionID{SpellID: core.TernaryInt32(heroic, 97142, 96980)},
+					Duration:  time.Second * 20,
+					MaxStacks: 5,
+				},
+				BonusPerStack: stats.Stats{stats.CritRating: core.TernaryFloat64(heroic, 92, 82)},
+			})
+
+			offHandBlacklist := map[int32]bool{
+				// Warrior: Slam and Whirlwind off-hand crits doesn't trigger procs
+				1464: true, // Slam
+				1680: true, // Whirlwind
+			}
+
+			core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+				ActionID:   core.ActionID{ItemID: vesselItemID},
+				Name:       "Vessel of Acceleration" + labelSuffix,
+				Callback:   core.CallbackOnSpellHitDealt,
+				ProcMask:   core.ProcMaskMeleeOrProc,
+				Outcome:    core.OutcomeCrit,
+				ProcChance: 1,
+				Harmful:    false,
+				Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
+					// Off-hand blacklist
+					if _, blacklisted := offHandBlacklist[spell.ActionID.SpellID]; spell.ProcMask.Matches(core.ProcMaskMeleeOHSpecial) && blacklisted {
+						return
+					}
+
+					procAura.Activate(sim)
+					procAura.AddStack(sim)
+				},
+			})
+		})
+
 		jawsItemID := core.TernaryInt32(heroic, 69111, 68926)
 		core.NewItemEffect(jawsItemID, func(agent core.Agent) {
 			character := agent.GetCharacter()
@@ -1038,10 +1101,11 @@ func init() {
 
 		// These spells ignore the slot the weapon is in.
 		// Any other ability should only trigger the proc if the weapon is in the right slot.
-		ignoresSlot := make(map[int32]bool)
-		ignoresSlot[23881] = true // Bloodthirst
-		ignoresSlot[6544] = true  // Heroic Leap
-		ignoresSlot[6343] = true  // Thunder Clap
+		ignoresSlot := map[int32]bool{
+			23881: true, // Bloodthirst
+			6544:  true, // Heroic Leap
+			6343:  true, // Thunder Clap
+		}
 
 		// Souldrinker
 		// Equip: Your melee attacks have a chance to drain your target's health, damaging the target for an amount equal to 1.3%/1.5%/1.7% of your maximum health and healing you for twice that amount.

diff --git a/sim/common/cata/stat_bonus_stacking.go b/sim/common/cata/stat_bonus_stacking.go
@@ -119,34 +119,6 @@ func init() {
 		ProcChance: 1,
 	})
 
-	shared.NewStackingStatBonusEffect(shared.StackingStatBonusEffect{
-		Name:       "Vessel of Acceleration",
-		ID:         68995,
-		AuraID:     96980,
-		Bonus:      stats.Stats{stats.CritRating: 82},
-		MaxStacks:  5,
-		ProcMask:   core.ProcMaskMeleeOrProc,
-		Duration:   time.Second * 20,
-		Outcome:    core.OutcomeCrit,
-		Callback:   core.CallbackOnSpellHitDealt,
-		Harmful:    false,
-		ProcChance: 1,
-	})
-
-	shared.NewStackingStatBonusEffect(shared.StackingStatBonusEffect{
-		Name:       "Vessel of Acceleration (Heroic)",
-		ID:         69167,
-		AuraID:     97142,
-		Bonus:      stats.Stats{stats.CritRating: 92},
-		MaxStacks:  5,
-		ProcMask:   core.ProcMaskMeleeOrProc,
-		Duration:   time.Second * 20,
-		Outcome:    core.OutcomeCrit,
-		Callback:   core.CallbackOnSpellHitDealt,
-		Harmful:    false,
-		ProcChance: 1,
-	})
-
 	shared.NewStackingStatBonusEffect(shared.StackingStatBonusEffect{
 		Name:       "Necromantic Focus",
 		ID:         68982,