Merge pull request wowsims#3501 from wowsims/apl

Update feral tank for APL and add preset rotation
vigo2 · Aug 19, 2023 · 117218f · 117218f
2 parents 2e3504f + b59c0c3
commit 117218f
Show file tree

Hide file tree

Showing 11 changed files with 1,324 additions and 1,271 deletions.
diff --git a/sim/druid/berserk.go b/sim/druid/berserk.go
@@ -45,6 +45,8 @@ func (druid *Druid) registerBerserkCD() {
 
 	druid.Berserk = druid.RegisterSpell(core.SpellConfig{
 		ActionID: actionId,
+		Flags:    core.SpellFlagAPL,
+
 		Cast: core.CastConfig{
 			DefaultCast: core.Cast{
 				GCD: time.Second,
@@ -59,4 +61,9 @@ func (druid *Druid) registerBerserkCD() {
 			druid.BerserkAura.Activate(sim)
 		},
 	})
+
+	druid.AddMajorCooldown(core.MajorCooldown{
+		Spell: druid.Berserk,
+		Type:  core.CooldownTypeDPS,
+	})
 }
diff --git a/sim/druid/druid.go b/sim/druid/druid.go
@@ -48,6 +48,7 @@ type Druid struct {
 	MangleBear           *core.Spell
 	MangleCat            *core.Spell
 	Maul                 *core.Spell
+	MaulQueueSpell       *core.Spell
 	Moonfire             *core.Spell
 	Rebirth              *core.Spell
 	Rake                 *core.Spell

diff --git a/sim/druid/enrage.go b/sim/druid/enrage.go
@@ -39,16 +39,20 @@ func (druid *Druid) registerEnrageSpell() {
 		},
 	})
 
-	spell := druid.RegisterSpell(core.SpellConfig{
+	druid.Enrage = druid.RegisterSpell(core.SpellConfig{
 		ActionID: actionID,
 		Flags:    core.SpellFlagAPL,
+
 		Cast: core.CastConfig{
 			CD: core.Cooldown{
 				Timer:    druid.NewTimer(),
 				Duration: time.Minute,
 			},
 			IgnoreHaste: true,
 		},
+		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+			return druid.InForm(Bear)
+		},
 
 		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
 			druid.AddRage(sim, instantRage, rageMetrics)
@@ -67,5 +71,8 @@ func (druid *Druid) registerEnrageSpell() {
 		},
 	})
 
-	druid.Enrage = spell
+	druid.AddMajorCooldown(core.MajorCooldown{
+		Spell: druid.Enrage,
+		Type:  core.CooldownTypeDPS,
+	})
 }