Merge pull request #189 from wowsims/deathknight

Deathknight damage coefficient stacking and bug fixes
wowsims · Jul 19, 2022 · 4bd2d8c · 4bd2d8c
2 parents 930979b + 3169b62
commit 4bd2d8c
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 27 deletions.
diff --git a/sim/core/runic_power.go b/sim/core/runic_power.go
@@ -219,6 +219,21 @@ func RuneReadyAt(sim *Simulation, runes *[2]Rune) time.Duration {
 	return readyAt
 }
 
+func NextRuneReadyAt(sim *Simulation, runes *[2]Rune) time.Duration {
+	readyAt := NeverExpires
+	pa := runes[0].pas[0]
+	if pa != nil {
+		readyAt = MinDuration(readyAt, pa.NextActionAt)
+	}
+
+	pa = runes[1].pas[0]
+	if pa != nil {
+		readyAt = MinDuration(readyAt, pa.NextActionAt)
+	}
+
+	return readyAt
+}
+
 func (rp *runicPowerBar) BloodRuneReadyAt(sim *Simulation) time.Duration {
 	return RuneReadyAt(sim, &rp.bloodRunes)
 }
@@ -231,6 +246,18 @@ func (rp *runicPowerBar) UnholyRuneReadyAt(sim *Simulation) time.Duration {
 	return RuneReadyAt(sim, &rp.unholyRunes)
 }
 
+func (rp *runicPowerBar) NextBloodRuneReadyAt(sim *Simulation) time.Duration {
+	return NextRuneReadyAt(sim, &rp.bloodRunes)
+}
+
+func (rp *runicPowerBar) NextFrostRuneReadyAt(sim *Simulation) time.Duration {
+	return NextRuneReadyAt(sim, &rp.frostRunes)
+}
+
+func (rp *runicPowerBar) NextUnholyRuneReadyAt(sim *Simulation) time.Duration {
+	return NextRuneReadyAt(sim, &rp.unholyRunes)
+}
+
 func (rp *runicPowerBar) CurrentBloodRunes() int32 {
 	return CurrentRunesOfType(&rp.bloodRunes, RuneState_Normal)
 }
@@ -405,9 +432,9 @@ func RegenRuneAndCancelPAs(sim *Simulation, r *Rune) {
 	} else if r.state == RuneState_DeathSpent {
 		r.state = RuneState_Death
 	}
-	r.lastRegenTime = sim.CurrentTime
 
 	if r.pas[0] != nil {
+		r.lastRegenTime = sim.CurrentTime
 		r.pas[0].Cancel(sim)
 		r.pas[0] = nil
 	}

diff --git a/sim/deathknight/blood_strike.go b/sim/deathknight/blood_strike.go
@@ -11,7 +11,7 @@ var BloodStrikeOHOutcome = core.OutcomeHit
 func (deathKnight *DeathKnight) newBloodStrikeSpell(isMH bool) *core.Spell {
 	weaponBaseDamage := core.BaseDamageFuncMeleeWeapon(core.MainHand, false, 306.0, 0.4, true)
 	if !isMH {
-		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 306.0, 0.4, true)
+		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 306.0, 0.4*deathKnight.nervesOfColdSteelBonus(), true)
 	}
 
 	guileOfGorefiend := deathKnight.Talents.GuileOfGorefiend > 0

diff --git a/sim/deathknight/bone_shield.go b/sim/deathknight/bone_shield.go
@@ -24,6 +24,7 @@ func (deathKnight *DeathKnight) registerBoneShieldSpell() {
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
 			deathKnight.BoneShieldAura.Activate(sim)
 			deathKnight.BoneShieldAura.UpdateExpires(sim.CurrentTime + time.Minute*4)
+			deathKnight.BoneShieldAura.SetStacks(sim, 3)
 		},
 		OnSpellHitTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, spellEffect *core.SpellEffect) {
 			aura.RemoveStack(sim)
@@ -32,11 +33,13 @@ func (deathKnight *DeathKnight) registerBoneShieldSpell() {
 			}
 		},
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1.02
+			deathKnight.ModifyAdditiveDamageModifier(sim, 0.02)
+
 			aura.Unit.PseudoStats.DamageTakenMultiplier *= 0.8
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1.02
+			deathKnight.ModifyAdditiveDamageModifier(sim, -0.02)
+
 			aura.Unit.PseudoStats.DamageTakenMultiplier /= 0.8
 		},
 	})

diff --git a/sim/deathknight/deathknight.go b/sim/deathknight/deathknight.go
@@ -111,14 +111,19 @@ type DeathKnight struct {
 	EbonPlagueAura *core.Aura
 
 	// Dynamic trackers
-	RageOfRivendareActive bool
-	TundraStalkerActive   bool
+	additiveDamageModifier float64
 
 	// TODO: Is there a better way?
 	// Item Auras
 	SigilOfAwarenessAura *core.Aura
 }
 
+func (deathKnight *DeathKnight) ModifyAdditiveDamageModifier(sim *core.Simulation, value float64) {
+	deathKnight.PseudoStats.DamageDealtMultiplier /= deathKnight.additiveDamageModifier
+	deathKnight.additiveDamageModifier += value
+	deathKnight.PseudoStats.DamageDealtMultiplier *= deathKnight.additiveDamageModifier
+}
+
 func (deathKnight *DeathKnight) GetCharacter() *core.Character {
 	return &deathKnight.Character
 }
@@ -219,6 +224,8 @@ func NewDeathKnight(character core.Character, options proto.Player) *DeathKnight
 		Talents:   *deathKnightOptions.Talents,
 		Options:   *deathKnightOptions.Options,
 		Rotation:  *deathKnightOptions.Rotation,
+
+		additiveDamageModifier: 1,
 	}
 
 	maxRunicPower := 100.0 + 15.0*float64(deathKnight.Talents.RunicPowerMastery)

diff --git a/sim/deathknight/empower_rune_weapon.go b/sim/deathknight/empower_rune_weapon.go
@@ -22,14 +22,22 @@ func (deathKnight *DeathKnight) registerEmpowerRuneWeaponSpell() {
 			},
 		},
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+			blood := deathKnight.CurrentBloodRunes()
+			frost := deathKnight.CurrentFrostRunes()
+			unholy := deathKnight.CurrentUnholyRunes()
+
 			deathKnight.RegenAllRunes(sim)
 
+			deathKnight.GainRuneMetrics(sim, deathKnight.EmpowerRuneWeapon.BloodRuneMetrics(), "blood", blood, deathKnight.CurrentBloodRunes())
+			deathKnight.GainRuneMetrics(sim, deathKnight.EmpowerRuneWeapon.FrostRuneMetrics(), "frost", frost, deathKnight.CurrentFrostRunes())
+			deathKnight.GainRuneMetrics(sim, deathKnight.EmpowerRuneWeapon.UnholyRuneMetrics(), "unholy", unholy, deathKnight.CurrentUnholyRunes())
+
 			amountOfRunicPower := 25.0
-			deathKnight.AddRunicPower(sim, amountOfRunicPower, deathKnight.UnbreakableArmor.RunicPowerMetrics())
+			deathKnight.AddRunicPower(sim, amountOfRunicPower, deathKnight.EmpowerRuneWeapon.RunicPowerMetrics())
 		},
 	})
 }
 
 func (deathKnight *DeathKnight) CanEmpowerRuneWeapon(sim *core.Simulation) bool {
-	return deathKnight.EmpowerRuneWeapon.IsReady(sim) && deathKnight.EmpowerRuneWeapon.CD.IsReady(sim)
+	return deathKnight.EmpowerRuneWeapon.IsReady(sim)
 }
diff --git a/sim/deathknight/frost_strike.go b/sim/deathknight/frost_strike.go
@@ -13,7 +13,7 @@ var FrostStrikeOHOutcome = core.OutcomeHit
 func (deathKnight *DeathKnight) newFrostStrikeHitSpell(isMH bool) *core.Spell {
 	weaponBaseDamage := core.BaseDamageFuncMeleeWeapon(core.MainHand, false, 138.0, 0.55, true)
 	if !isMH {
-		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 138.0, 0.55, true)
+		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 138.0, 0.55*deathKnight.nervesOfColdSteelBonus(), true)
 	}
 
 	effect := core.SpellEffect{

diff --git a/sim/deathknight/obliterate.go b/sim/deathknight/obliterate.go
@@ -33,7 +33,7 @@ func (deathKnight *DeathKnight) newObliterateHitSpell(isMH bool) *core.Spell {
 				bonusBaseDamage := core.TernaryFloat64(deathKnight.SigilOfAwarenessAura.IsActive(), 336.0, 0.0)
 				weaponBaseDamage := core.BaseDamageFuncMeleeWeapon(core.MainHand, false, 467.0+bonusBaseDamage, 0.8, true)
 				if !isMH {
-					weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 467.0+bonusBaseDamage, 0.8, true)
+					weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 467.0+bonusBaseDamage, 0.8*deathKnight.nervesOfColdSteelBonus(), true)
 				}
 
 				return weaponBaseDamage(sim, hitEffect, spell) *

diff --git a/sim/deathknight/pestilence.go b/sim/deathknight/pestilence.go
@@ -53,10 +53,10 @@ func (deathKnight *DeathKnight) registerPestilenceSpell() {
 					} else {
 						// Apply diseases on every other target
 						// TODO: Snapshot the current values of main target disease and roll over to off targets
-						if deathKnight.TargetHasDisease(FrostFeverAuraLabel, spellEffect.Target) {
+						if deathKnight.TargetHasDisease(FrostFeverAuraLabel, deathKnight.CurrentTarget) {
 							deathKnight.FrostFeverDisease[unitHit.Index].Apply(sim)
 						}
-						if deathKnight.TargetHasDisease(FrostFeverAuraLabel, spellEffect.Target) {
+						if deathKnight.TargetHasDisease(FrostFeverAuraLabel, deathKnight.CurrentTarget) {
 							deathKnight.BloodPlagueDisease[unitHit.Index].Apply(sim)
 						}
 					}

diff --git a/sim/deathknight/plague_strike.go b/sim/deathknight/plague_strike.go
@@ -11,7 +11,7 @@ var PlagueStrikeOHOutcome = core.OutcomeHit
 func (deathKnight *DeathKnight) newPlagueStrikeSpell(isMH bool) *core.Spell {
 	weaponBaseDamage := core.BaseDamageFuncMeleeWeapon(core.MainHand, false, 189.0, 0.5, true)
 	if !isMH {
-		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 189.0, 0.5, true)
+		weaponBaseDamage = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 189.0, 0.5*deathKnight.nervesOfColdSteelBonus(), true)
 	}
 
 	outbreakBonus := 1.0 + 0.1*float64(deathKnight.Talents.Outbreak)

diff --git a/sim/deathknight/presences.go b/sim/deathknight/presences.go
@@ -80,11 +80,13 @@ func (deathKnight *DeathKnight) registerBloodPresenceAura() {
 		Duration: core.NeverExpires,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
 			aura.Unit.PseudoStats.ThreatMultiplier *= threatMult
-			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1.0 + damageBonusCoeff
+
+			deathKnight.ModifyAdditiveDamageModifier(sim, damageBonusCoeff)
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
 			aura.Unit.PseudoStats.ThreatMultiplier /= threatMult
-			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1.0 + damageBonusCoeff
+
+			deathKnight.ModifyAdditiveDamageModifier(sim, -damageBonusCoeff)
 		},
 	})
 }

diff --git a/sim/deathknight/talents_frost.go b/sim/deathknight/talents_frost.go
@@ -29,18 +29,12 @@ func (deathKnight *DeathKnight) ApplyFrostTalents() {
 	// Pointless to Implement
 
 	// Black Ice
-	deathKnight.PseudoStats.FrostDamageDealtMultiplier += 0.02 * float64(deathKnight.Talents.BlackIce)
-	deathKnight.PseudoStats.ShadowDamageDealtMultiplier += 0.02 * float64(deathKnight.Talents.BlackIce)
+	deathKnight.PseudoStats.FrostDamageDealtMultiplier *= 1.0 + 0.02*float64(deathKnight.Talents.BlackIce)
+	deathKnight.PseudoStats.ShadowDamageDealtMultiplier *= 1.0 + 0.02*float64(deathKnight.Talents.BlackIce)
 
 	// Nerves Of Cold Steel
 	deathKnight.AddStat(stats.MeleeHit, core.MeleeHitRatingPerHitChance*float64(deathKnight.Talents.NervesOfColdSteel))
-	if deathKnight.Talents.NervesOfColdSteel == 1 {
-		deathKnight.AutoAttacks.OHEffect.BaseDamage.Calculator = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, 1.08, true)
-	} else if deathKnight.Talents.NervesOfColdSteel == 2 {
-		deathKnight.AutoAttacks.OHEffect.BaseDamage.Calculator = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, 1.16, true)
-	} else {
-		deathKnight.AutoAttacks.OHEffect.BaseDamage.Calculator = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, 1.25, true)
-	}
+	deathKnight.AutoAttacks.OHEffect.BaseDamage.Calculator = core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, deathKnight.nervesOfColdSteelBonus(), true)
 
 	// Icy Talons
 	deathKnight.applyIcyTalons()
@@ -93,6 +87,18 @@ func (deathKnight *DeathKnight) ApplyFrostTalents() {
 	deathKnight.AddStat(stats.Expertise, 1.0*float64(deathKnight.Talents.TundraStalker)*core.ExpertisePerQuarterPercentReduction)
 }
 
+func (deathKnight *DeathKnight) nervesOfColdSteelBonus() float64 {
+	bonusCoeff := 1.0
+	if deathKnight.Talents.NervesOfColdSteel == 1 {
+		bonusCoeff = 1.08
+	} else if deathKnight.Talents.NervesOfColdSteel == 2 {
+		bonusCoeff = 1.16
+	} else {
+		bonusCoeff = 1.25
+	}
+	return bonusCoeff
+}
+
 func (deathKnight *DeathKnight) glacielRotBonus(target *core.Unit) float64 {
 	glacierRotCoeff := 1.0
 	if deathKnight.Talents.GlacierRot == 1 {

diff --git a/sim/deathknight/talents_unholy.go b/sim/deathknight/talents_unholy.go
@@ -158,7 +158,7 @@ func (deathKnight *DeathKnight) applyBloodCakedBlade() {
 	target := deathKnight.CurrentTarget
 
 	mhBaseDamage := core.BaseDamageFuncMeleeWeapon(core.MainHand, false, 0, 1.0, true)
-	ohBaseDamage := core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, 1.0, true)
+	ohBaseDamage := core.BaseDamageFuncMeleeWeapon(core.OffHand, false, 0, 1.0*deathKnight.nervesOfColdSteelBonus(), true)
 
 	var isMH = false
 	bloodCakedBladeHit := deathKnight.RegisterSpell(core.SpellConfig{
@@ -230,16 +230,17 @@ func (deathKnight *DeathKnight) applyDesolation() {
 	}
 
 	actionID := core.ActionID{SpellID: 66803}
+	bonusDamageCoeff := 0.01 * float64(deathKnight.Talents.Desolation)
 
 	deathKnight.DesolationAura = deathKnight.RegisterAura(core.Aura{
 		ActionID: actionID,
 		Label:    "Desolation",
 		Duration: time.Second * 20.0,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1.0 + 0.01*float64(deathKnight.Talents.Desolation)
+			deathKnight.ModifyAdditiveDamageModifier(sim, bonusDamageCoeff)
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1.0 + 0.01*float64(deathKnight.Talents.Desolation)
+			deathKnight.ModifyAdditiveDamageModifier(sim, -bonusDamageCoeff)
 		},
 	})
 }