[Core] 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/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/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.

sim/druid/feral/TestFeral.results

@@ -1266,7 +1266,7 @@ dps_results: {
  key: "TestFeral-AllItems-Horridon'sLastGasp-96757"
  value: {
   dps: 223125.75057
-  tps: 329197.79855
+  tps: 329198.49284
   hps: 15408.66764
  }
 }