Merge pull request #1354 from wowsims/feature/rrpm-reset-on-encounter-start

Make RPPM effects reset their lastProc and lastAttempt on encounter start

Author: hillerstorm

sim/core/character.go

@@ -18,6 +18,8 @@ func (cbp CharacterBuildPhase) Matches(other CharacterBuildPhase) bool {
 	return (cbp & other) != 0
 }
 
+type OnEncounterStartEffect func()
+
 const (
 	CharacterBuildPhaseNone CharacterBuildPhase = 0
 	CharacterBuildPhaseBase CharacterBuildPhase = 1 << iota
@@ -82,6 +84,8 @@ type Character struct {
 	spellCategoryTimers map[int32]*Timer
 
 	Pets []*Pet // cached in AddPet, for advance()
+
+	OnEncounterStartEffects []OnEncounterStartEffect
 }
 
 func NewCharacter(party *Party, partyIndex int, player *proto.Player) Character {
@@ -805,3 +809,11 @@ func (character *Character) ApplyArmorSpecializationEffect(primaryStat stats.Sta
 	trackerAura.AttachStatDependency(armorSpecializationDependency)
 	return trackerAura
 }
+
+func (character *Character) RegisterOnEncounterStartEffect(onEncounterStartEffect OnEncounterStartEffect) {
+	if onEncounterStartEffect == nil {
+		return
+	}
+
+	character.OnEncounterStartEffects = append(character.OnEncounterStartEffects, onEncounterStartEffect)
+}

sim/core/environment.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"slices"
 	"time"
 
 	"github.com/wowsims/mop/sim/core/proto"
@@ -215,7 +216,7 @@ func (env *Environment) finalize(raidProto *proto.Raid, _ *proto.Encounter, raid
 		sim := newSimWithEnv(env, &proto.SimOptions{
 			Iterations: 1,
 		}, simsignals.CreateSignals())
-		sim.reset()
+		sim.reset(true)
 		sim.PrePull()
 		sim.Cleanup()
 	}
@@ -269,10 +270,7 @@ func (env *Environment) IsFinalized() bool {
 	return env.State >= Finalized
 }
 
-func (env *Environment) reset(sim *Simulation) {
-	// Randomize heartbeat timer for pet stat inheritance.
-	env.heartbeatOffset = env.PrepullStartTime(sim) - PetUpdateInterval + DurationFromSeconds(PetUpdateInterval.Seconds()*sim.RandomFloat("Pet Stat Inheritance"))
-
+func (env *Environment) reset(sim *Simulation, firstIteration bool) {
 	// Reset primary targets damage taken for tracking health fights.
 	env.Encounter.DamageTaken = 0
 
@@ -283,6 +281,26 @@ func (env *Environment) reset(sim *Simulation) {
 	}
 
 	env.Raid.reset(sim)
+
+	// Re-evaluate dynamic prepull action times on the first iteration.
+	// Must happen after Raid.reset (which re-applies auras like 5% spell haste)
+	// but before heartbeatOffset and initManaTickAction (which read PrepullStartTime).
+	if firstIteration {
+		for _, action := range env.prepullActions {
+			action.doAtTime = action.DoAt.GetDuration(sim)
+		}
+
+		env.prepullActions = FilterSlice(env.prepullActions, func(action *PrepullAction) bool {
+			return action.doAtTime <= sim.CurrentTime
+		})
+
+		slices.SortStableFunc(env.prepullActions, func(a1, a2 *PrepullAction) int {
+			return int(a1.doAtTime - a2.doAtTime)
+		})
+	}
+
+	// Randomize heartbeat timer for pet stat inheritance.
+	env.heartbeatOffset = env.PrepullStartTime(sim) - PetUpdateInterval + DurationFromSeconds(PetUpdateInterval.Seconds()*sim.RandomFloat("Pet Stat Inheritance"))
 }
 
 // The maximum possible duration for any iteration.

sim/core/procs.go

@@ -1,6 +1,8 @@
 package core
 
 import (
+	"time"
+
 	"github.com/wowsims/mop/sim/core/proto"
 )
 
@@ -263,9 +265,16 @@ func (character *Character) NewRPPMProcManager(effectID int32, isEnchant bool, i
 	dpm := builder()
 
 	// Keep track of the lastProc and lastCheck values when weapon swapping.
-	lastProc := -RppmLastProcResetValue
-	lastCheck := -RppmLastCheckCap
-	isFirstProc := true
+	var lastProc time.Duration
+	var lastCheck time.Duration
+	var isFirstProc bool
+
+	resetProc := func() {
+		lastProc = -RppmLastProcResetValue
+		lastCheck = -RppmLastCheckCap
+		isFirstProc = true
+	}
+	resetProc()
 
 	character.RegisterItemSwapCallback(slotList, func(_ *Simulation, _ proto.ItemSlot) {
 		for _, proc := range dpm.procChances {
@@ -286,9 +295,18 @@ func (character *Character) NewRPPMProcManager(effectID int32, isEnchant bool, i
 	})
 
 	character.RegisterResetEffect(func(_ *Simulation) {
-		lastProc = -RppmLastProcResetValue
-		lastCheck = -RppmLastCheckCap
-		isFirstProc = true
+		resetProc()
+	})
+
+	character.RegisterOnEncounterStartEffect(func() {
+		resetProc()
+
+		for _, proc := range dpm.procChances {
+			resolvedProc := proc.(*RPPMProc)
+			resolvedProc.lastProc = lastProc
+			resolvedProc.lastCheck = lastCheck
+			resolvedProc.isFirstProc = isFirstProc
+		}
 	})
 
 	return &dpm

sim/core/sim.go

@@ -286,7 +286,7 @@ func (sim *Simulation) Proc(p float64, label string) bool {
 }
 
 func (sim *Simulation) Reset() {
-	sim.reset()
+	sim.reset(false)
 }
 
 func (sim *Simulation) Reseed(seed int64) {
@@ -379,21 +379,7 @@ func (sim *Simulation) run() *proto.RaidSimResult {
 // RunOnce is the main event loop. It will run the simulation for number of seconds.
 func (sim *Simulation) runOnce(firstIteration bool) {
 	sim.isInPrepull = true
-	sim.reset()
-
-	if firstIteration {
-		for _, action := range sim.Environment.prepullActions {
-			action.doAtTime = action.DoAt.GetDuration(sim)
-		}
-
-		sim.Environment.prepullActions = FilterSlice(sim.Environment.prepullActions, func(action *PrepullAction) bool {
-			return action.doAtTime <= sim.CurrentTime
-		})
-
-		slices.SortStableFunc(sim.Environment.prepullActions, func(a1, a2 *PrepullAction) int {
-			return int(a1.doAtTime - a2.doAtTime)
-		})
-	}
+	sim.reset(firstIteration)
 
 	sim.PrePull()
 	sim.isInPrepull = false
@@ -412,7 +398,7 @@ var (
 
 // Reset will set sim back and erase all current state.
 // This is automatically called before every 'Run'.
-func (sim *Simulation) reset() {
+func (sim *Simulation) reset(firstIteration bool) {
 	if sim.Encounter.DurationIsEstimate && sim.CurrentTime != 0 {
 		sim.BaseDuration = sim.CurrentTime
 		sim.Encounter.DurationIsEstimate = false
@@ -449,7 +435,7 @@ func (sim *Simulation) reset() {
 	sim.tasks = sim.tasks[:0]
 	sim.minTaskTime = NeverExpires
 
-	sim.Environment.reset(sim)
+	sim.Environment.reset(sim, firstIteration)
 
 	sim.initManaTickAction()
 }

sim/core/unit.go

@@ -812,6 +812,12 @@ func (unit *Unit) reset(sim *Simulation, _ Agent) {
 func (unit *Unit) onEncounterStart(sim *Simulation) {
 	if agent := unit.Env.GetAgentFromUnit(unit); agent != nil {
 		agent.OnEncounterStart(sim)
+
+		if character := agent.GetCharacter(); character != nil {
+			for i := range character.OnEncounterStartEffects {
+				character.OnEncounterStartEffects[i]()
+			}
+		}
 	}
 
 	// Reduce Haste fakepoints arising from overly precise swing timings relative to the GCD timer.