Merge pull request wowsims#392 from wowsims/feral

Feral DPS Bear-Weaving Implementation
ToxicKevinFerm · May 10, 2024 · 23750d5 · 23750d5
2 parents e461795 + 8ff30cc
commit 23750d5
Show file tree

Hide file tree

Showing 20 changed files with 652 additions and 908 deletions.
diff --git a/proto/apl.proto b/proto/apl.proto
@@ -288,6 +288,8 @@ message APLActionCatOptimalRotationAction {
     bool bite_during_execute = 9;
     bool allow_aoe_berserk = 10;
     bool melee_weave = 11;
+    bool bear_weave = 12;
+    bool snek_weave = 13;
 }
 
 message APLActionMove {

diff --git a/proto/druid.proto b/proto/druid.proto
@@ -158,7 +158,7 @@ message FeralDruid {
       Analytical = 1;
     }
 
-    BearweaveType bear_weave_type = 1;
+	bool bear_weave = 1;
 	bool maintain_faerie_fire = 2;
 	int32 min_combos_for_rip = 3;
 	bool use_rake = 4;
@@ -168,7 +168,6 @@ message FeralDruid {
 	int32 min_combos_for_bite = 8;
 	bool bite_during_execute = 13;
 	int32 rip_leeway = 19;
-	bool powerbear = 10;
 	float min_roar_offset = 11;
 	BiteModeType bite_mode_type = 12;
 	bool snek_weave = 14;

diff --git a/sim/core/mana.go b/sim/core/mana.go
@@ -142,7 +142,7 @@ func (mb *manaBar) doneIteration(sim *Simulation) {
 			// Vampiric Touch mana threat goes to the priest, so it's handled in the priest code.
 			continue
 		}
-		if resourceMetrics.ActualGain <= 0 {
+		if resourceMetrics.ActualGainForCurrentIteration() <= 0 {
 			continue
 		}
 

diff --git a/sim/core/rage.go b/sim/core/rage.go
@@ -192,7 +192,7 @@ func (rb *rageBar) doneIteration() {
 		if resourceMetrics.ActionID.SameActionIgnoreTag(ActionID{OtherID: proto.OtherAction_OtherActionRefund}) {
 			continue
 		}
-		if resourceMetrics.ActualGain <= 0 {
+		if resourceMetrics.ActualGainForCurrentIteration() <= 0 {
 			continue
 		}
 

diff --git a/sim/druid/druid.go b/sim/druid/druid.go
@@ -285,23 +285,22 @@ func (druid *Druid) RegisterBalanceSpells() {
 }
 
 func (druid *Druid) RegisterFeralCatSpells() {
+	druid.registerBearFormSpell()
 	druid.registerBerserkCD()
 	druid.registerCatCharge()
 	druid.registerCatFormSpell()
-
-	// 	druid.registerBearFormSpell()
-	// 	druid.registerEnrageSpell()
+	druid.registerEnrageSpell()
 	druid.registerFerociousBiteSpell()
 	druid.registerLacerateSpell()
-	// 	druid.registerMangleBearSpell()
+	druid.registerMangleBearSpell()
 	druid.registerMangleCatSpell()
-	// 	druid.registerMaulSpell()
+	druid.registerMaulSpell()
 	druid.registerRakeSpell()
 	druid.registerRavageSpell()
 	druid.registerRipSpell()
 	druid.registerSavageRoarSpell()
 	druid.registerShredSpell()
-	// 	druid.registerSwipeBearSpell()
+	druid.registerSwipeBearSpell()
 	druid.registerSwipeCatSpell()
 	druid.registerThrashBearSpell()
 	druid.registerTigersFurySpell()
@@ -328,10 +327,10 @@ func (druid *Druid) RegisterFeralCatSpells() {
 func (druid *Druid) Reset(_ *core.Simulation) {
 
 	druid.eclipseEnergyBar.reset()
-	// druid.BleedsActive = 0
-	// druid.form = druid.StartingForm
-	// druid.disabledMCDs = []*core.MajorCooldown{}
-	// druid.RebirthUsed = false
+	druid.BleedsActive = 0
+	druid.form = druid.StartingForm
+	druid.disabledMCDs = []*core.MajorCooldown{}
+	druid.RebirthUsed = false
 	// druid.LunarICD.Timer.Reset()
 	// druid.SolarICD.Timer.Reset()
 }