Merge pull request #1235 from hillerstorm/fiery_blaze

Fix fiery blaze proc masks
wowsims · Jan 20, 2025 · eb0689d · eb0689d
2 parents 87ea927 + 1139b24
commit eb0689d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go
@@ -54,6 +54,9 @@ func init() {
 			},
 		})
 
+		procMaskOnAuto := core.ProcMaskDamageProc     // Both spell and melee proc combo
+		procMaskOnSpecial := core.ProcMaskSpellDamage // TODO: check if core.ProcMaskSpellDamage remains on special
+
 		aura := character.GetOrRegisterAura(core.Aura{
 			Label:    "Fiery Blaze",
 			Duration: core.NeverExpires,
@@ -66,6 +69,11 @@ func init() {
 				}
 
 				if sim.RandomFloat("Fiery Blaze") < procChance {
+					if spell.ProcMask.Matches(core.ProcMaskMeleeSpecial) {
+						procSpell.ProcMask = procMaskOnSpecial
+					} else {
+						procSpell.ProcMask = procMaskOnAuto
+					}
 					procSpell.Cast(sim, result.Target)
 				}
 			},

diff --git a/sim/paladin/item_sets_pve_phase_7.go b/sim/paladin/item_sets_pve_phase_7.go
@@ -82,21 +82,21 @@ func (paladin *Paladin) applyNaxxramasRetribution6PBonus() {
 					critChanceBonus := 0.0
 
 					if target.MobType == proto.MobType_MobTypeUndead {
-						critChanceBonus = paladin.GetStat(stats.SpellCrit) / 100.0 + paladin.GetSchoolBonusCritChance(spell) / 100.0
+						critChanceBonus = paladin.GetStat(stats.SpellCrit)/100.0 + paladin.GetSchoolBonusCritChance(spell)/100.0
 						/*
-						// TODO: This most likely only uses sheet spell crit and doesn't care about spell specific crit unfortunately, verify!
-						// Meaning this 6pc is quite a bit worse than the T2.5 4pc, but who's counting?
-						if spell.SpellCode == SpellCode_PaladinExorcism {
-							critChanceBonus = 1.0
-						} else {
-							critChanceBonus = spell.SpellCritChance(target)
-							if paladin.hasRune(proto.PaladinRune_RuneHeadWrath) {
-								critChanceBonus += paladin.GetStat(stats.MeleeCrit) / 100.0
+							// TODO: This most likely only uses sheet spell crit and doesn't care about spell specific crit unfortunately, verify!
+							// Meaning this 6pc is quite a bit worse than the T2.5 4pc, but who's counting?
+							if spell.SpellCode == SpellCode_PaladinExorcism {
+								critChanceBonus = 1.0
+							} else {
+								critChanceBonus = spell.SpellCritChance(target)
+								if paladin.hasRune(proto.PaladinRune_RuneHeadWrath) {
+									critChanceBonus += paladin.GetStat(stats.MeleeCrit) / 100.0
+								}
 							}
-						}
 						*/
 					}
-					
+
 					critChanceBonus = min(critChanceBonus, 1.0)
 
 					spell.DamageMultiplierAdditive += critChanceBonus