update fiery weapon, lifestealing

wowsims · Dec 30, 2024 · 4ba229f · 4ba229f
1 parent 07f8dc8
commit 4ba229f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go
@@ -124,7 +124,7 @@ func init() {
 	})
 
 	// Weapon - Fiery Weapon
-	core.NewEnchantEffect(803, func(agent core.Agent) {
+	core.AddWeaponEffect(803, func(agent core.Agent, _ proto.ItemSlot) {
 		character := agent.GetCharacter()
 
 		procMask := character.GetProcMaskForEnchant(803)
@@ -147,12 +147,8 @@ func init() {
 			},
 		})
 
-		aura := character.GetOrRegisterAura(core.Aura{
-			Label:    "Fiery Weapon",
-			Duration: core.NeverExpires,
-			OnReset: func(aura *core.Aura, sim *core.Simulation) {
-				aura.Activate(sim)
-			},
+		aura := core.MakePermanent(character.GetOrRegisterAura(core.Aura{
+			Label: "Fiery Weapon",
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 				if !result.Landed() || spell.Flags.Matches(core.SpellFlagSuppressWeaponProcs) {
 					return
@@ -166,7 +162,7 @@ func init() {
 					procSpell.Cast(sim, result.Target)
 				}
 			},
-		})
+		}))
 
 		character.ItemSwap.RegisterOnSwapItemForEffectWithPPMManager(803, 6.0, &ppmm, aura)
 	})
@@ -255,15 +251,14 @@ func init() {
 	core.AddWeaponEffect(1898, func(agent core.Agent, slot proto.ItemSlot) {
 		character := agent.GetCharacter()
 
-		isMH := slot == proto.ItemSlot_ItemSlotMainHand
 		procMask := character.GetProcMaskForEnchant(1898)
 		ppmm := character.AutoAttacks.NewPPMManager(6.66, procMask)
 
 		procMaskOnAuto := core.ProcMaskDamageProc     // Both spell and melee proc combo
 		procMaskOnSpecial := core.ProcMaskSpellDamage // TODO: check if core.ProcMaskSpellDamage remains on special
 
 		procSpell := character.RegisterSpell(core.SpellConfig{
-			ActionID:    core.ActionID{SpellID: 20004}.WithTag(core.TernaryInt32(isMH, 1, 2)),
+			ActionID:    core.ActionID{SpellID: 20004},
 			SpellSchool: core.SpellSchoolShadow,
 			DefenseType: core.DefenseTypeMagic,
 			ProcMask:    procMaskOnAuto,

diff --git a/ui/core/proto_utils/action_id.ts b/ui/core/proto_utils/action_id.ts
@@ -333,7 +333,6 @@ export class ActionId {
 			case 'Slam':
 			case 'Windfury Weapon':
 			case 'Holy Strength': // Weapon - Crusader Enchant
-			case 'Life Steal': // Weapon - Lifestealing Enchant
 				if (this.tag === 1) {
 					name = `${name} (Main-Hand)`;
 				} else if (this.tag === 2) {