Implemented Mangle, Lacerate, and Maul.

 On branch guardian
 Changes to be committed:
	deleted:    sim/druid/_lacerate.go
	modified:   sim/druid/druid.go
	modified:   sim/druid/faerie_fire.go
	new file:   sim/druid/lacerate.go
	renamed:    sim/druid/_mangle.go -> sim/druid/mangle.go
	renamed:    sim/druid/_maul.go -> sim/druid/maul.go

Author: NerdEgghead

sim/druid/_lacerate.go

@@ -50,9 +50,7 @@ type Druid struct {
 	MangleBear            *DruidSpell
 	MangleCat             *DruidSpell
 	Maul                  *DruidSpell
-	MaulQueueSpell        *DruidSpell
 	Moonfire              *DruidSpell
-	Pulverize             *DruidSpell
 	Rebirth               *DruidSpell
 	Rake                  *DruidSpell
 	Ravage                *DruidSpell
@@ -79,8 +77,8 @@ type Druid struct {
 	BarkskinAura             *core.Aura
 	BlazeOfGloryAura         *core.Aura
 	BearFormAura             *core.Aura
-	BerserkAura              *core.Aura
-	BerserkProcAura          *core.Aura
+	BerserkBearAura          *core.Aura
+	BerserkCatAura           *core.Aura
 	CatFormAura              *core.Aura
 	ClearcastingAura         *core.Aura
 	DemoralizingRoarAuras    core.AuraArray
@@ -98,11 +96,7 @@ type Druid struct {
 	StampedeBearAura         *core.Aura
 	SurvivalInstinctsAura    *core.Aura
 
-	BleedCategories core.ExclusiveCategoryArray
-
-	PrimalMadnessRageMetrics       *core.ResourceMetrics
-	PrimalPrecisionRecoveryMetrics *core.ResourceMetrics
-	SavageRoarDurationTable        [6]time.Duration
+	SavageRoarDurationTable [6]time.Duration
 
 	ProcOoc func(sim *core.Simulation)
 
@@ -119,8 +113,6 @@ type Druid struct {
 	GuardianLeatherSpecDep     *stats.StatDependency
 
 	// Item sets
-	T11Feral2pBonus *core.Aura
-	T11Feral4pBonus *core.Aura
 	T13Feral4pBonus *core.Aura
 }
 
@@ -299,10 +291,10 @@ func (druid *Druid) RegisterFeralCatSpells() {
 	// druid.registerCatCharge()
 	druid.registerCatFormSpell()
 	druid.registerFerociousBiteSpell()
-	// druid.registerLacerateSpell()
-	// druid.registerMangleBearSpell()
-	// druid.registerMangleCatSpell()
-	// druid.registerMaulSpell()
+	druid.registerLacerateSpell()
+	druid.registerMangleBearSpell()
+	druid.registerMangleCatSpell()
+	druid.registerMaulSpell()
 	// druid.registerRakeSpell()
 	// druid.registerRavageSpell()
 	druid.registerRipSpell()
@@ -321,10 +313,9 @@ func (druid *Druid) RegisterFeralTankSpells() {
 	//druid.registerDemoralizingRoarSpell()
 	// druid.registerEnrageSpell()
 	druid.registerFrenziedRegenerationSpell()
-	// druid.registerMangleBearSpell()
-	// druid.registerMaulSpell()
-	// druid.registerLacerateSpell()
-	// druid.registerPulverizeSpell()
+	druid.registerMangleBearSpell()
+	druid.registerMaulSpell()
+	druid.registerLacerateSpell()
 	// druid.registerRakeSpell()
 	// druid.registerRipSpell()
 	//druid.registerSavageDefensePassive()
@@ -402,11 +393,6 @@ func (ds *DruidSpell) IsEqual(s *core.Spell) bool {
 func (druid *Druid) UpdateBleedPower(bleedSpell *DruidSpell, sim *core.Simulation, target *core.Unit, updateCurrent bool, updateNew bool) {
 	snapshotPower := bleedSpell.ExpectedTickDamage(sim, target)
 
-	// Assume that Mangle will be up soon if not currently active.
-	if !druid.BleedCategories.Get(target).AnyActive() {
-		snapshotPower *= 1.3
-	}
-
 	if updateCurrent {
 		bleedSpell.CurrentSnapshotPower = snapshotPower
 

sim/druid/druid.go

@@ -59,14 +59,20 @@ func (druid *Druid) registerFaerieFireSpell() {
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			baseDamage := 0.0
 			outcome := spell.OutcomeMagicHit
+
 			if druid.InForm(Bear) {
 				baseDamage = 10.0 + 0.302*spell.MeleeAttackPower()
 				outcome = spell.OutcomeMagicHitAndCrit
 			}
 
 			result := spell.CalcAndDealDamage(sim, target, baseDamage, outcome)
+
 			if result.Landed() {
 				druid.TryApplyFaerieFireEffect(sim, target)
+
+				if druid.InForm(Bear) && sim.Proc(0.25, "Mangle CD Reset") {
+					druid.MangleBear.CD.Reset()
+				}
 			}
 		},
 

sim/druid/faerie_fire.go

@@ -0,0 +1,80 @@
+package druid
+
+import (
+	"time"
+
+	"github.com/wowsims/mop/sim/core"
+)
+
+func (druid *Druid) registerLacerateSpell() {
+	druid.Lacerate = druid.RegisterSpell(Bear, core.SpellConfig{
+		ActionID:    core.ActionID{SpellID: 33745},
+		SpellSchool: core.SpellSchoolPhysical,
+		ProcMask:    core.ProcMaskMeleeMHSpecial,
+		Flags:       core.SpellFlagMeleeMetrics | core.SpellFlagAPL,
+
+		Cast: core.CastConfig{
+			DefaultCast: core.Cast{
+				GCD: core.GCDDefault,
+			},
+
+			CD: core.Cooldown{
+				Timer:    druid.NewTimer(),
+				Duration: time.Second * 3,
+			},
+
+			IgnoreHaste: true,
+		},
+
+		BonusCritPercent: 0,
+		DamageMultiplier: 1,
+		CritMultiplier:   druid.DefaultCritMultiplier(),
+		ThreatMultiplier: 1, // Changed in Cata
+		MaxRange:         core.MaxMeleeRange,
+		FlatThreatBonus:  0, // Removed in Cata
+
+		Dot: core.DotConfig{
+			Aura: druid.applyRendAndTear(core.Aura{
+				Label:     "Lacerate",
+				MaxStacks: 3,
+				Duration:  time.Second * 15,
+			}),
+			NumberOfTicks: 5,
+			TickLength:    time.Second * 3,
+
+			OnSnapshot: func(_ *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) {
+				if isRollover {
+					panic("Lacerate cannot roll over snapshots!")
+				}
+
+				dot.SnapshotPhysical(target, 0.0512 * dot.Spell.MeleeAttackPower() * float64(dot.Aura.GetStacks()))
+			},
+
+			OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
+				dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.OutcomeSnapshotCrit)
+			},
+		},
+
+		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+			baseDamage := 0.616 * spell.MeleeAttackPower()
+			result := spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)
+
+			if result.Landed() {
+				dot := spell.Dot(target)
+				if dot.IsActive() {
+					dot.Refresh(sim)
+					dot.AddStack(sim)
+					dot.TakeSnapshot(sim, false)
+				} else {
+					dot.Apply(sim)
+					dot.SetStacks(sim, 1)
+					dot.TakeSnapshot(sim, false)
+				}
+
+				if sim.Proc(0.25, "Mangle CD Reset") {
+					druid.MangleBear.CD.Reset()
+				}
+			}
+		},
+	})
+}