use same method for damage multiplier

wowsims · Aug 4, 2024 · 67bd922 · 67bd922
1 parent 4518e82
commit 67bd922
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/sim/warrior/fury/death_wish.go b/sim/warrior/fury/death_wish.go
@@ -18,7 +18,8 @@ func (war *FuryWarrior) RegisterDeathWish() {
 		Duration: 30 * time.Second,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
 			if sim.CurrentTime < 0 && war.Options.PrepullMastery > 0 {
-				prepullMultiplier := war.GetMasteryBonusMultiplierFromMasteryRating(float64(war.Options.PrepullMastery))
+				masteryPoints := core.MasteryRatingToMasteryPoints(float64(war.Options.PrepullMastery))
+				prepullMultiplier := war.GetMasteryBonusMultiplier(masteryPoints)
 				bonusSnapshot = 1.0 + (0.2 * prepullMultiplier)
 			} else {
 				bonusSnapshot = 1.0 + (0.2 * war.EnrageEffectMultiplier)

diff --git a/sim/warrior/fury/fury.go b/sim/warrior/fury/fury.go
@@ -69,9 +69,9 @@ func (war *FuryWarrior) RegisterSpecializationEffects() {
 	// The actual effects of Unshackled Fury need to be handled by specific spells
 	// as it modifies the "benefit" of them (e.g. it both increases Raging Blow's damage
 	// and Enrage's damage bonus)
-	war.EnrageEffectMultiplier = war.GetMasteryBonusMultiplier()
+	war.EnrageEffectMultiplier = war.GetMasteryBonusMultiplier(war.GetMasteryPoints())
 	war.AddOnMasteryStatChanged(func(sim *core.Simulation, oldMastery, newMastery float64) {
-		war.EnrageEffectMultiplier = war.GetMasteryBonusMultiplier()
+		war.EnrageEffectMultiplier = war.GetMasteryBonusMultiplier(war.GetMasteryPoints())
 	})
 
 	// Dual Wield specialization
@@ -87,12 +87,7 @@ func (war *FuryWarrior) RegisterSpecializationEffects() {
 	war.AutoAttacks.OHConfig().DamageMultiplier *= 1.4
 }
 
-func (war *FuryWarrior) GetMasteryBonusMultiplier() float64 {
-	return 1 + (11.2+5.6*war.GetMasteryPoints())/100
-}
-
-func (war *FuryWarrior) GetMasteryBonusMultiplierFromMasteryRating(masteryRating float64) float64 {
-	masteryPoints := core.MasteryRatingToMasteryPoints(masteryRating)
+func (war *FuryWarrior) GetMasteryBonusMultiplier(masteryPoints float64) float64 {
 	return 1 + (11.2+5.6*masteryPoints)/100
 }