Merge pull request #1179 from hillerstorm/fix_prepull_unholy_blight

[Unholy] Fix Unholy Blight to not proc from glyphed coils during prepull
wowsims · Nov 7, 2024 · a0197eb · a0197eb
2 parents 5aa9aa9 + e97d008
commit a0197eb
Show file tree

Hide file tree

Showing 3 changed files with 621 additions and 614 deletions.
diff --git a/sim/death_knight/death_coil.go b/sim/death_knight/death_coil.go
@@ -32,7 +32,13 @@ func (dk *DeathKnight) registerDeathCoilSpell() {
 		ThreatMultiplier: 1.0,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := dk.ClassSpellScaling*0.87599998713 + spell.MeleeAttackPower()*0.23
+			var baseDamage float64
+			if hasGlyphOfDeathsEmbrace && sim.CurrentTime < 0 {
+				baseDamage = 0
+			} else {
+				baseDamage = dk.ClassSpellScaling*0.87599998713 + spell.MeleeAttackPower()*0.23
+			}
+
 			spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit)
 
 			// Instead of actually healing the ghoul, we just add the runic power

diff --git a/sim/death_knight/talents_unholy.go b/sim/death_knight/talents_unholy.go
@@ -209,6 +209,7 @@ func (dk *DeathKnight) applyUnholyBlight() {
 		Callback:       core.CallbackOnSpellHitDealt,
 		ClassSpellMask: DeathKnightSpellDeathCoil,
 		Outcome:        core.OutcomeLanded,
+		Harmful:        true,
 
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			dot := unholyBlight.Dot(result.Target)