[Paladin] Move mana regen outside of build phase auras

Author: hillerstorm

sim/core/sim.go

@@ -608,20 +608,18 @@ func (sim *Simulation) AddPendingAction(pa *PendingAction) {
 	//	panic(fmt.Sprintf("Cant add action in the past: %s", pa.NextActionAt))
 	//}
 	pa.consumed = false
-	if len(sim.pendingActions) > 0 {
-		for index, v := range sim.pendingActions[1:] {
-			if v.NextActionAt < pa.NextActionAt || (v.NextActionAt == pa.NextActionAt && v.Priority >= pa.Priority) {
-				//if sim.Log != nil {
-				//	sim.Log("Adding action at index %d for time %s", index - len(sim.pendingActions), pa.NextActionAt)
-				//	for i := index; i < len(sim.pendingActions); i++ {
-				//		sim.Log("Upcoming action at %s", sim.pendingActions[i].NextActionAt)
-				//	}
-				//}
-				sim.pendingActions = append(sim.pendingActions, pa)
-				copy(sim.pendingActions[index+2:], sim.pendingActions[index+1:])
-				sim.pendingActions[index+1] = pa
-				return
-			}
+	for index, v := range sim.pendingActions[1:] {
+		if v.NextActionAt < pa.NextActionAt || (v.NextActionAt == pa.NextActionAt && v.Priority >= pa.Priority) {
+			//if sim.Log != nil {
+			//	sim.Log("Adding action at index %d for time %s", index - len(sim.pendingActions), pa.NextActionAt)
+			//	for i := index; i < len(sim.pendingActions); i++ {
+			//		sim.Log("Upcoming action at %s", sim.pendingActions[i].NextActionAt)
+			//	}
+			//}
+			sim.pendingActions = append(sim.pendingActions, pa)
+			copy(sim.pendingActions[index+2:], sim.pendingActions[index+1:])
+			sim.pendingActions[index+1] = pa
+			return
 		}
 	}
 	//if sim.Log != nil {

sim/paladin/protection/_protection_test.go

@@ -88,7 +88,7 @@ var DefaultOptions = &proto.Player_ProtectionPaladin{
 	ProtectionPaladin: &proto.ProtectionPaladin{
 		Options: &proto.ProtectionPaladin_Options{
 			ClassOptions: &proto.PaladinOptions{
-				Seal: proto.PaladinSeal_Truth,
+				Seal: proto.PaladinSeal_Insight,
 			},
 		},
 	},

sim/paladin/protection/guarded_by_the_light.go

@@ -21,7 +21,6 @@ Grants 15% of your maximum mana every 2 sec.
 */
 func (prot *ProtectionPaladin) registerGuardedByTheLight() {
 	actionID := core.ActionID{SpellID: 53592}
-	manaMetrics := prot.NewManaMetrics(actionID)
 
 	oldGetSpellPowerValue := prot.GetSpellPowerValue
 	newGetSpellPowerValue := func(spell *core.Spell) float64 {
@@ -34,14 +33,6 @@ func (prot *ProtectionPaladin) registerGuardedByTheLight() {
 		BuildPhase: core.CharacterBuildPhaseTalents,
 
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			core.StartPeriodicAction(sim, core.PeriodicActionOptions{
-				Period:   time.Second * 2,
-				Priority: core.ActionPriorityRegen,
-				OnAction: func(*core.Simulation) {
-					prot.AddMana(sim, 0.15*prot.MaxMana(), manaMetrics)
-				},
-			})
-
 			prot.GetSpellPowerValue = newGetSpellPowerValue
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
@@ -66,4 +57,18 @@ func (prot *ProtectionPaladin) registerGuardedByTheLight() {
 		ClassMask: paladin.SpellMaskJudgment,
 		IntValue:  -40,
 	})
+
+	manaMetrics := prot.NewManaMetrics(actionID)
+	core.MakePermanent(prot.RegisterAura(core.Aura{
+		Label: "Guarded by the Light Mana Regen" + prot.Label,
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			core.StartPeriodicAction(sim, core.PeriodicActionOptions{
+				Period:   time.Second * 2,
+				Priority: core.ActionPriorityRegen,
+				OnAction: func(*core.Simulation) {
+					prot.AddMana(sim, 0.15*prot.MaxMana(), manaMetrics)
+				},
+			})
+		},
+	}))
 }

sim/paladin/retribution/sword_of_light.go

@@ -20,7 +20,6 @@ Increases the healing done by Word of Glory by 60% and Flash of Light by 100%.
 */
 func (ret *RetributionPaladin) registerSwordOfLight() {
 	actionID := core.ActionID{SpellID: 53503}
-	manaMetrics := ret.NewManaMetrics(actionID)
 	swordOfLightHpActionID := core.ActionID{SpellID: 141459}
 	ret.CanTriggerHolyAvengerHpGain(swordOfLightHpActionID)
 
@@ -43,14 +42,6 @@ func (ret *RetributionPaladin) registerSwordOfLight() {
 			}
 		},
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			core.StartPeriodicAction(sim, core.PeriodicActionOptions{
-				Period:   time.Second * 2,
-				Priority: core.ActionPriorityRegen,
-				OnAction: func(*core.Simulation) {
-					ret.AddMana(sim, 0.06*ret.MaxMana(), manaMetrics)
-				},
-			})
-
 			ret.GetSpellPowerValue = newGetSpellPowerValue
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
@@ -90,6 +81,20 @@ func (ret *RetributionPaladin) registerSwordOfLight() {
 		TimeValue: time.Minute * -1,
 	})
 
+	manaMetrics := ret.NewManaMetrics(actionID)
+	core.MakePermanent(ret.RegisterAura(core.Aura{
+		Label: "Sword of Light Mana Regen" + ret.Label,
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			core.StartPeriodicAction(sim, core.PeriodicActionOptions{
+				Period:   time.Second * 2,
+				Priority: core.ActionPriorityRegen,
+				OnAction: func(*core.Simulation) {
+					ret.AddMana(sim, 0.06*ret.MaxMana(), manaMetrics)
+				},
+			})
+		},
+	}))
+
 	holyTwoHandDamageMod := ret.AddDynamicMod(core.SpellModConfig{
 		Kind:       core.SpellMod_DamageDone_Pct,
 		ClassMask:  paladin.SpellMaskDamageModifiedBySwordOfLight,