Prepull damage shouldn't count (#4016)

* do not count prepull spells towards DPS / threat * update tests
wowsims · Nov 8, 2023 · c3c785d · c3c785d
1 parent fe2066d
commit c3c785d
Show file tree

Hide file tree

Showing 3 changed files with 342 additions and 340 deletions.
diff --git a/sim/core/spell_result.go b/sim/core/spell_result.go
@@ -230,8 +230,10 @@ func (spell *Spell) CalcAndDealOutcome(sim *Simulation, target *Unit, outcomeApp
 
 // Applies the fully computed spell result to the sim.
 func (spell *Spell) dealDamageInternal(sim *Simulation, isPeriodic bool, result *SpellResult) {
-	spell.SpellMetrics[result.Target.UnitIndex].TotalDamage += result.Damage
-	spell.SpellMetrics[result.Target.UnitIndex].TotalThreat += result.Threat
+	if sim.CurrentTime >= 0 {
+		spell.SpellMetrics[result.Target.UnitIndex].TotalDamage += result.Damage
+		spell.SpellMetrics[result.Target.UnitIndex].TotalThreat += result.Threat
+	}
 
 	// Mark total damage done in raid so far for health based fights.
 	// Don't include damage done by EnemyUnits to Players