Merge pull request #4068 from Horatio27/fix_black_bruise

Added Registration of ItemSwapCallback to Black Bruise
wowsims · Nov 29, 2023 · dac6877 · dac6877
2 parents c45eb51 + c83e344
commit dac6877
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/sim/common/wotlk/enchant_effects.go b/sim/common/wotlk/enchant_effects.go
@@ -144,7 +144,7 @@ func init() {
 			},
 		})
 
-		character.ItemSwap.RegisterOnSwapItemForEffect(3748, aura)
+		character.ItemSwap.RegisterOnSwapItemForEnchantEffect(3748, aura)
 	})
 
 	core.NewEnchantEffect(3247, func(agent core.Agent) {
@@ -259,7 +259,7 @@ func init() {
 			},
 		})
 
-		character.ItemSwap.RegisterOnSwapItemForEffect(3790, aura)
+		character.ItemSwap.RegisterOnSwapItemForEnchantEffect(3790, aura)
 	})
 
 	core.AddWeaponEffect(3843, func(agent core.Agent, _ proto.ItemSlot) {

diff --git a/sim/common/wotlk/other_effects.go b/sim/common/wotlk/other_effects.go
@@ -988,7 +988,7 @@ func init() {
 				},
 			})
 
-			core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			aura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 				Name:       name + " Trigger",
 				Callback:   core.CallbackOnSpellHitDealt,
 				ProcMask:   core.ProcMaskMelee,
@@ -998,6 +998,8 @@ func init() {
 					procAura.Activate(sim)
 				},
 			})
+
+			character.ItemSwap.RegisterOnSwapItemForItemEffect(itemID, aura)
 		})
 	})
 

diff --git a/sim/core/item_swaps.go b/sim/core/item_swaps.go
@@ -70,8 +70,22 @@ func (swap *ItemSwap) RegisterOnSwapItemForEffectWithPPMManager(effectID int32,
 
 }
 
+// Helper for handling Effects that use the itemID to toggle the aura on and off
+func (swap *ItemSwap) RegisterOnSwapItemForItemEffect(itemID int32, aura *Aura) {
+	character := swap.character
+	character.RegisterOnItemSwap(func(sim *Simulation) {
+		procMask := character.GetProcMaskForItem(itemID)
+
+		if procMask == ProcMaskUnknown {
+			aura.Deactivate(sim)
+		} else {
+			aura.Activate(sim)
+		}
+	})
+}
+
 // Helper for handling Effects that use the effectID to toggle the aura on and off
-func (swap *ItemSwap) RegisterOnSwapItemForEffect(effectID int32, aura *Aura) {
+func (swap *ItemSwap) RegisterOnSwapItemForEnchantEffect(effectID int32, aura *Aura) {
 	character := swap.character
 	character.RegisterOnItemSwap(func(sim *Simulation) {
 		procMask := character.GetProcMaskForEnchant(effectID)