Merge pull request #770 from wowsims/fix-ea

Fix everlasting corruption
wowsims · May 17, 2024 · 60d9a1f · 60d9a1f
2 parents 1f1070f + 3aa255f
commit 60d9a1f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/sim/warlock/apl_values.go b/sim/warlock/apl_values.go
@@ -114,26 +114,32 @@ func (value *APLValueWarlockShouldRefreshCorruption) GetBool(sim *core.Simulatio
 	warlock := value.warlock
 	target := value.target.Get()
 
-	dot := warlock.Corruption.Dot(target)
-	if !dot.IsActive() {
+	var dot *core.Dot
+	for _, spell := range warlock.Corruption {
+		dot = spell.Dot(target)
+		if dot.IsActive() {
+			break
+		}
+	}
+	if dot == nil || !dot.IsActive() {
 		return true
 	}
 
 	attackTable := warlock.AttackTables[target.UnitIndex][dot.Spell.CastType]
 
 	// check if reapplying corruption is worthwhile
 	snapshotCrit := dot.SnapshotCritChance
-	snapshotMult := dot.SnapshotAttackerMultiplier * (snapshotCrit*(warlock.Corruption.CritMultiplier(attackTable)-1) + 1)
+	snapshotMult := dot.SnapshotAttackerMultiplier * (snapshotCrit*(dot.Spell.CritMultiplier(attackTable)-1) + 1)
 
-	curCrit := warlock.Corruption.SpellCritChance(target)
-	curDmg := dot.Spell.AttackerDamageMultiplier(attackTable) * (curCrit*(warlock.Corruption.CritMultiplier(attackTable)-1) + 1)
+	curCrit := dot.Spell.SpellCritChance(target)
+	curDmg := dot.Spell.AttackerDamageMultiplier(attackTable) * (curCrit*(dot.Spell.CritMultiplier(attackTable)-1) + 1)
 
 	relDmgInc := curDmg / snapshotMult
 
-	snapshotDmg := warlock.Corruption.ExpectedTickDamageFromCurrentSnapshot(sim, target)
+	snapshotDmg := dot.Spell.ExpectedTickDamageFromCurrentSnapshot(sim, target)
 	snapshotDmg *= float64(sim.GetRemainingDuration()) / float64(dot.TickPeriod())
 	snapshotDmg *= relDmgInc - 1
-	snapshotDmg -= warlock.Corruption.ExpectedTickDamageFromCurrentSnapshot(sim, target)
+	snapshotDmg -= dot.Spell.ExpectedTickDamageFromCurrentSnapshot(sim, target)
 
 	//if sim.Log != nil {
 	//	warlock.Log(sim, "Relative Corruption Inc: [%.2f], expected dmg gain: [%.2f]", relDmgInc, snapshotDmg)

diff --git a/sim/warlock/corruption.go b/sim/warlock/corruption.go
@@ -91,9 +91,15 @@ func (warlock *Warlock) getCorruptionConfig(rank int) core.SpellConfig {
 		ExpectedTickDamage: func(sim *core.Simulation, target *core.Unit, spell *core.Spell, useSnapshot bool) *core.SpellResult {
 			if useSnapshot {
 				dot := spell.Dot(target)
+				if hasPandemicRune {
+					return dot.CalcSnapshotDamage(sim, target, dot.Spell.OutcomeExpectedMagicCrit)
+				}
 				return dot.CalcSnapshotDamage(sim, target, dot.Spell.OutcomeExpectedMagicAlwaysHit)
 			} else {
 				baseDamage := baseDamage / float64(ticks)
+				if hasPandemicRune {
+					return spell.CalcPeriodicDamage(sim, target, baseDamage, spell.OutcomeExpectedMagicCrit)
+				}
 				return spell.CalcPeriodicDamage(sim, target, baseDamage, spell.OutcomeExpectedMagicAlwaysHit)
 			}
 		},
@@ -103,11 +109,12 @@ func (warlock *Warlock) getCorruptionConfig(rank int) core.SpellConfig {
 func (warlock *Warlock) registerCorruptionSpell() {
 	maxRank := 7
 
+	warlock.Corruption = make([]*core.Spell, 0)
 	for i := 1; i <= maxRank; i++ {
 		config := warlock.getCorruptionConfig(i)
 
 		if config.RequiredLevel <= int(warlock.Level) {
-			warlock.Corruption = warlock.GetOrRegisterSpell(config)
+			warlock.Corruption = append(warlock.Corruption, warlock.GetOrRegisterSpell(config))
 		}
 	}
 }
diff --git a/sim/warlock/runes.go b/sim/warlock/runes.go
@@ -33,8 +33,10 @@ func (warlock *Warlock) EverlastingAfflictionRefresh(sim *core.Simulation, targe
 		return
 	}
 
-	if warlock.Corruption.Dot(target).IsActive() {
-		warlock.Corruption.Dot(target).Rollover(sim)
+	for _, spell := range warlock.Corruption {
+		if spell.Dot(target).IsActive() {
+			spell.Dot(target).Rollover(sim)
+		}
 	}
 }
 

diff --git a/sim/warlock/warlock.go b/sim/warlock/warlock.go
@@ -29,7 +29,7 @@ type Warlock struct {
 
 	ChaosBolt          *core.Spell
 	Conflagrate        *core.Spell
-	Corruption         *core.Spell
+	Corruption         []*core.Spell
 	DarkPact           *core.Spell
 	DrainSoul          *core.Spell
 	Haunt              *core.Spell