Merge pull request #3480 from TheGroxEmpire/master

Add stance restriction on Rend, Overpower, and Whirlwind
wowsims · Aug 17, 2023 · d38a4f4 · d38a4f4
2 parents 2763fe6 + bff24be
commit d38a4f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/sim/warrior/overpower.go b/sim/warrior/overpower.go
@@ -62,7 +62,7 @@ func (warrior *Warrior) registerOverpowerSpell(cdTimer *core.Timer) {
 			},
 		},
 		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			return warrior.OverpowerAura.IsActive()
+			return warrior.OverpowerAura.IsActive() && warrior.StanceMatches(BattleStance)
 		},
 
 		BonusCritRating:  25 * core.CritRatingPerCritChance * float64(warrior.Talents.ImprovedOverpower),

diff --git a/sim/warrior/rend.go b/sim/warrior/rend.go
@@ -33,6 +33,10 @@ func (warrior *Warrior) RegisterRendSpell(rageThreshold float64, healthThreshold
 			IgnoreHaste: true,
 		},
 
+		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+			return warrior.StanceMatches(BattleStance)
+		},
+
 		DamageMultiplier: 1 + 0.1*float64(warrior.Talents.ImprovedRend),
 		ThreatMultiplier: 1,
 

diff --git a/sim/warrior/whirlwind.go b/sim/warrior/whirlwind.go
@@ -47,6 +47,9 @@ func (warrior *Warrior) registerWhirlwindSpell() {
 				Duration: core.TernaryDuration(warrior.HasMajorGlyph(proto.WarriorMajorGlyph_GlyphOfWhirlwind), time.Second*8, time.Second*10),
 			},
 		},
+		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+			return warrior.StanceMatches(BerserkerStance)
+		},
 
 		DamageMultiplier: 1 *
 			(1 + 0.02*float64(warrior.Talents.UnendingFury) + 0.1*float64(warrior.Talents.ImprovedWhirlwind)),