Merge pull request #731 from wowsims/fixes

Fix battle shout
wowsims · Aug 21, 2022 · 5915d0e · 5915d0e
2 parents 1b4718a + 41be5d8
commit 5915d0e
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 143 deletions.
diff --git a/sim/core/buffs.go b/sim/core/buffs.go
@@ -190,14 +190,10 @@ func applyBuffEffects(agent Agent, raidBuffs proto.RaidBuffs, partyBuffs proto.P
 	}
 
 	if raidBuffs.BattleShout > 0 || individualBuffs.BlessingOfMight > 0 {
-		bonusAP := 550 * GetTristateValueFloat(raidBuffs.BattleShout, 1, 1.25)
-		bomAP := 550 * GetTristateValueFloat(individualBuffs.BlessingOfMight, 1, 1.25)
-		if bomAP > bonusAP {
-			bonusAP = bomAP
-		}
+		bonusAP := 550 * GetTristateValueFloat(MaxTristate(raidBuffs.BattleShout, individualBuffs.BlessingOfMight), 1, 1.25)
 		character.AddStats(stats.Stats{
-			stats.AttackPower:       math.Floor(bomAP),
-			stats.RangedAttackPower: math.Floor(bomAP),
+			stats.AttackPower:       math.Floor(bonusAP),
+			stats.RangedAttackPower: math.Floor(bonusAP),
 		})
 	}
 	character.AddStats(stats.Stats{