simplified / made more readable

wowsims · Apr 11, 2024 · e68be22 · e68be22
1 parent c0bb9cc
commit e68be22
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/sim/hunter/explosive_shot.go b/sim/hunter/explosive_shot.go
@@ -52,7 +52,7 @@ func (hunter *Hunter) registerExplosiveShotSpell(timer *core.Timer) {
 
 		CritDamageBonus: hunter.mortalShots(),
 
-		DamageMultiplier: hunter.applyTntDamageMultiplier(),
+		DamageMultiplier: hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
@@ -102,4 +102,4 @@ func (hunter *Hunter) calcExplosiveShotDamageMultipliers() float64 {
 		damageMultiplier *= 1.1
 	}
 	return damageMultiplier
-}
+}
diff --git a/sim/hunter/explosive_trap.go b/sim/hunter/explosive_trap.go
@@ -43,7 +43,7 @@ func (hunter *Hunter) getExplosiveTrapConfig(rank int, timer *core.Timer) core.S
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 
-		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.applyTntDamageMultiplier(),
+		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{

diff --git a/sim/hunter/immolation_trap.go b/sim/hunter/immolation_trap.go
@@ -40,7 +40,7 @@ func (hunter *Hunter) getImmolationTrapConfig(rank int, timer *core.Timer) core.
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 
-		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.applyTntDamageMultiplier(),
+		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{

diff --git a/sim/hunter/runes.go b/sim/hunter/runes.go
@@ -225,10 +225,9 @@ func (hunter *Hunter) applyRaptorFury() {
 	})
 }
 
-func (hunter *Hunter) applyTntDamageMultiplier() float64 {
-	damageMult := 1.0
+func (hunter *Hunter) tntDamageMultiplier() float64 {
 	if hunter.HasRune(proto.HunterRune_RuneBracersTNT) {
-		damageMult *= 1.1
+		return 1.1
 	}
-	return damageMult
-}
+	return 1.0
+}