Merge pull request #813 from wowsims/p4/priest

Priest rune updates
wowsims · Jun 22, 2024 · 47ddecf · 47ddecf
2 parents c6f433b + 4c20b16
commit 47ddecf
Show file tree

Hide file tree

Showing 11 changed files with 230 additions and 122 deletions.
diff --git a/sim/core/aura.go b/sim/core/aura.go
@@ -173,6 +173,10 @@ func (aura *Aura) Refresh(sim *Simulation) {
 			sim.rescheduleTracker(aura.expires)
 		}
 	}
+
+	if sim.Log != nil && aura.IsActive() && !aura.ActionID.IsEmptyAction() {
+		aura.Unit.Log(sim, "Aura refreshed: %s", aura.ActionID)
+	}
 }
 
 func (aura *Aura) GetStacks() int32 {
@@ -549,9 +553,6 @@ restart:
 func (aura *Aura) Activate(sim *Simulation) {
 	aura.metrics.Procs++
 	if aura.IsActive() {
-		if sim.Log != nil && !aura.ActionID.IsEmptyAction() {
-			aura.Unit.Log(sim, "Aura refreshed: %s", aura.ActionID)
-		}
 		aura.Refresh(sim)
 		return
 	}
@@ -575,9 +576,9 @@ func (aura *Aura) Activate(sim *Simulation) {
 		}
 	}
 
-	aura.active = true
 	aura.startTime = sim.CurrentTime
 	aura.Refresh(sim)
+	aura.active = true
 
 	if aura.Duration != NeverExpires {
 		aura.activeIndex = int32(len(aura.Unit.activeAuras))

diff --git a/sim/priest/mind_blast.go b/sim/priest/mind_blast.go
@@ -37,10 +37,10 @@ func (priest *Priest) getMindBlastBaseConfig(rank int, cdTimer *core.Timer) core
 	manaCost := MindBlastManaCost[rank]
 	level := MindBlastLevel[rank]
 
-	hasPainAndSuffering := priest.HasRune(proto.PriestRune_RuneHelmPainAndSuffering)
 	hasMindSpike := priest.HasRune(proto.PriestRune_RuneWaistMindSpike)
 
 	return core.SpellConfig{
+		SpellCode:   SpellCode_PriestMindBlast,
 		ActionID:    core.ActionID{SpellID: spellId},
 		SpellSchool: core.SpellSchoolShadow,
 		DefenseType: core.DefenseTypeMagic,
@@ -72,14 +72,14 @@ func (priest *Priest) getMindBlastBaseConfig(rank int, cdTimer *core.Timer) core
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			baseDamage := sim.Roll(baseDamageLow, baseDamageHigh)
 
-			var mindSpike *core.Aura
+			var mindSpikeAura *core.Aura
 			if hasMindSpike {
-				mindSpike = priest.MindSpikeAuras.Get(target)
+				mindSpikeAura = priest.MindSpikeAuras.Get(target)
 			}
 
 			oldBonusCrit := spell.BonusCritRating
 			oldMultiplier := spell.DamageMultiplier
-			spell.BonusCritRating += float64(mindSpike.GetStacks()) * 30 * core.CritRatingPerCritChance
+			spell.BonusCritRating += float64(mindSpikeAura.GetStacks()) * 30 * core.CritRatingPerCritChance
 			spell.DamageMultiplier *= priest.MindBlastModifier
 
 			result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit)
@@ -89,16 +89,8 @@ func (priest *Priest) getMindBlastBaseConfig(rank int, cdTimer *core.Timer) core
 
 			if result.Landed() {
 				priest.AddShadowWeavingStack(sim, target)
-				if mindSpike != nil {
-					mindSpike.Deactivate(sim)
-				}
-
-				if hasPainAndSuffering {
-					for _, spell := range priest.ShadowWordPain {
-						if spell != nil && spell.Dot(target).IsActive() {
-							spell.Dot(target).Rollover(sim)
-						}
-					}
+				if mindSpikeAura != nil {
+					mindSpikeAura.Deactivate(sim)
 				}
 			}
 

diff --git a/sim/priest/mind_flay.go b/sim/priest/mind_flay.go
@@ -58,6 +58,7 @@ func (priest *Priest) newMindFlaySpellConfig(rank int, tickIdx int32) core.Spell
 	hasDespairRune := priest.HasRune(proto.PriestRune_RuneBracersDespair)
 
 	return core.SpellConfig{
+		SpellCode:   SpellCode_PriestMindFlay,
 		ActionID:    core.ActionID{SpellID: spellId}.WithTag(tickIdx),
 		SpellSchool: core.SpellSchoolShadow,
 		DefenseType: core.DefenseTypeMagic,

diff --git a/sim/priest/mind_sear.go b/sim/priest/mind_sear.go
@@ -62,10 +62,8 @@ func (priest *Priest) newMindSearSpellConfig(tickIdx int32) core.SpellConfig {
 			TickLength:    tickLength,
 			OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
 				for _, aoeTarget := range sim.Encounter.TargetUnits {
-					if aoeTarget != target {
-						mindSearTickSpell.Cast(sim, aoeTarget)
-						mindSearTickSpell.SpellMetrics[target.UnitIndex].Casts -= 1
-					}
+					mindSearTickSpell.Cast(sim, aoeTarget)
+					mindSearTickSpell.SpellMetrics[target.UnitIndex].Casts -= 1
 				}
 			},
 		},

diff --git a/sim/priest/mind_spike.go b/sim/priest/mind_spike.go
@@ -28,6 +28,7 @@ func (priest *Priest) newMindSpikeSpellConfig() core.SpellConfig {
 	})
 
 	return core.SpellConfig{
+		SpellCode:   SpellCode_PriestMindSpike,
 		ActionID:    core.ActionID{SpellID: int32(proto.PriestRune_RuneWaistMindSpike)},
 		SpellSchool: core.SpellSchoolShadow | core.SpellSchoolFrost,
 		DefenseType: core.DefenseTypeMagic,

diff --git a/sim/priest/priest.go b/sim/priest/priest.go
@@ -17,6 +17,9 @@ const (
 	SpellCode_PriestFlashHeal
 	SpellCode_PriestGreaterHeal
 	SpellCode_PriestHeal
+	SpellCode_PriestMindBlast
+	SpellCode_PriestMindFlay
+	SpellCode_PriestMindSpike
 	SpellCode_PriestHolyFire
 	SpellCode_PriestSmite
 )
@@ -56,6 +59,7 @@ type Priest struct {
 	ShadowWordDeath   *core.Spell
 	ShadowWordPain    []*core.Spell
 	Smite             []*core.Spell
+	VampiricEmbrace   *core.Spell
 	VampiricTouch     *core.Spell
 	VoidPlague        *core.Spell
 
@@ -67,9 +71,10 @@ type Priest struct {
 	ShadowformAura   *core.Aura
 	SurgeOfLightAura *core.Aura
 
-	MindSpikeAuras     core.AuraArray
-	ShadowWeavingAuras core.AuraArray
-	WeakenedSouls      core.AuraArray
+	MindSpikeAuras       core.AuraArray
+	ShadowWeavingAuras   core.AuraArray
+	VampiricEmbraceAuras core.AuraArray
+	WeakenedSouls        core.AuraArray
 
 	EyeOfTheVoidPet *EyeOfTheVoid
 	HomunculiPets   []*Homunculus

diff --git a/sim/priest/runes.go b/sim/priest/runes.go
@@ -1,6 +1,7 @@
 package priest
 
 import (
+	"slices"
 	"time"
 
 	"github.com/wowsims/sod/sim/core"
@@ -10,6 +11,7 @@ import (
 func (priest *Priest) ApplyRunes() {
 	// Head
 	priest.registerEyeOfTheVoidCD()
+	priest.applyPainAndSuffering()
 
 	// Cloak
 	priest.registerVampiricTouchSpell()
@@ -39,6 +41,47 @@ func (priest *Priest) ApplyRunes() {
 	priest.registerShadowfiendSpell()
 }
 
+func (priest *Priest) applyPainAndSuffering() {
+	if !priest.HasRune(proto.PriestRune_RuneHelmPainAndSuffering) {
+		return
+	}
+
+	affectedSpellcodes := []int32{SpellCode_PriestMindBlast, SpellCode_PriestMindFlay, SpellCode_PriestMindSpike}
+	priest.RegisterAura(core.Aura{
+		Label:    "Pain and Suffering Trigger",
+		Duration: core.NeverExpires,
+		OnReset: func(aura *core.Aura, sim *core.Simulation) {
+			aura.Activate(sim)
+		},
+		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+			if slices.Contains(affectedSpellcodes, spell.SpellCode) && result.Landed() {
+				target := result.Target
+
+				var dotToRollover *core.Dot
+				dotSpells := core.FilterSlice(
+					core.Flatten([][]*core.Spell{priest.ShadowWordPain, {priest.VoidPlague, priest.VampiricTouch}}),
+					func(spell *core.Spell) bool {
+						return spell != nil && spell.Dot(target).IsActive()
+					},
+				)
+
+				if len(dotSpells) > 0 {
+					dotToRollover = dotSpells[0].Dot(target)
+					for _, spell := range dotSpells {
+						dot := spell.Dot(target)
+						if dot.RemainingDuration(sim) < dotToRollover.RemainingDuration(sim) {
+							dotToRollover = dot
+						}
+					}
+
+					dotToRollover.NumberOfTicks = dotToRollover.OriginalNumberOfTicks
+					dotToRollover.Rollover(sim)
+				}
+			}
+		},
+	})
+}
+
 func (priest *Priest) applySurgeOfLight() {
 	if !priest.HasRune(proto.PriestRune_RuneBracersSurgeOfLight) {
 		return