Fix tier bonuses

Author: 1337LutZ

sim/core/buffs.go

@@ -423,11 +423,11 @@ var CommandingShoutCategory = "CommandingShout"
 
 func CommandingShoutAura(char *Character, isPlayer bool, boomingVoicePoints int32, commandingPresenceMultiplier float64, hasT6Tank2P bool) *Aura {
 	baseHpBuff := 1080.0
-	hpBuff := baseHpBuff
 	if hasT6Tank2P {
-		hpBuff += 170
+		baseHpBuff += 170
 	}
-	nonPlayerHpBuff := hpBuff * commandingPresenceMultiplier
+
+	nonPlayerHpBuff := baseHpBuff * commandingPresenceMultiplier
 
 	var ee *ExclusiveEffect
 	aura := char.GetOrRegisterAura(Aura{

sim/core/spell_resistances.go

@@ -1,8 +1,6 @@
 package core
 
 import (
-	"math"
-
 	"github.com/wowsims/tbc/sim/core/stats"
 )
 

sim/warrior/items.go

@@ -138,31 +138,37 @@ var ItemSetDestroyerBattlegear = core.NewItemSet(core.ItemSet{
 	Name: "Destroyer Battlegear",
 	Bonuses: map[int32]core.ApplySetBonus{
 		2: func(agent core.Agent, setBonusAura *core.Aura) {
-			setBonusAura.
-				AttachSpellMod(core.SpellModConfig{
-					ClassMask: SpellMaskWhirlwind,
-					Kind:      core.SpellMod_PowerCost_Flat,
-					IntValue:  -5,
-				}).
-				ExposeToAPL(37518)
-		},
-		4: func(agent core.Agent, setBonusAura *core.Aura) {
 			warrior := agent.(WarriorAgent).GetWarrior()
-			actionID := core.ActionID{SpellID: 37521}
-			rageMetrics := warrior.NewRageMetrics(actionID)
+			actionID := core.ActionID{SpellID: 37529}
+
+			aura := warrior.NewTemporaryStatsAura(
+				"Overpower",
+				actionID,
+				stats.Stats{stats.AttackPower: 100},
+				time.Second*5,
+			)
 
 			setBonusAura.
 				AttachProcTrigger(core.ProcTrigger{
-					Name:               "Destroyer Battlegear - 4PC",
+					Name:               "Destroyer Battlegear - 2PC",
+					ClassSpellMask:     SpellMaskOverpower,
 					TriggerImmediately: true,
 					Callback:           core.CallbackOnSpellHitDealt,
-					Outcome:            core.OutcomeParry | core.OutcomeDodge,
 					Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-						warrior.AddRage(sim, 2, rageMetrics)
+						aura.Activate(sim)
 					},
 				}).
 				ExposeToAPL(actionID.SpellID)
 		},
+		4: func(agent core.Agent, setBonusAura *core.Aura) {
+			setBonusAura.
+				AttachSpellMod(core.SpellModConfig{
+					ClassMask: SpellMaskMortalStrike | SpellMaskBloodthirst,
+					Kind:      core.SpellMod_PowerCost_Flat,
+					IntValue:  -5,
+				}).
+				ExposeToAPL(37535)
+		},
 	},
 })
 
@@ -172,35 +178,59 @@ var ItemSetDestroyerArmor = core.NewItemSet(core.ItemSet{
 	Bonuses: map[int32]core.ApplySetBonus{
 		2: func(agent core.Agent, setBonusAura *core.Aura) {
 			warrior := agent.(WarriorAgent).GetWarrior()
-			actionID := core.ActionID{SpellID: 37529}
+			actionID := core.ActionID{SpellID: 37523}
 
 			aura := warrior.NewTemporaryStatsAura(
-				"Overpower",
+				"Reinforced Shield",
 				actionID,
-				stats.Stats{stats.AttackPower: 100},
-				time.Second*5,
+				stats.Stats{stats.BlockValue: 100},
+				time.Second*6,
 			)
 
 			setBonusAura.
 				AttachProcTrigger(core.ProcTrigger{
-					Name:               "Destroyer Armor - 2PC",
-					ClassSpellMask:     SpellMaskOverpower,
+					Name:               "Destroyer Armor - 2PC - Trigger",
+					ClassSpellMask:     SpellMaskShieldBlock,
 					TriggerImmediately: true,
 					Callback:           core.CallbackOnSpellHitDealt,
 					Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 						aura.Activate(sim)
 					},
 				}).
+				AttachProcTrigger(core.ProcTrigger{
+					Name:               "Destroyer Armor - 2PC - Consume",
+					TriggerImmediately: true,
+					Outcome:            core.OutcomeBlock,
+					Callback:           core.CallbackOnSpellHitTaken,
+					Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+						aura.Deactivate(sim)
+					},
+				}).
 				ExposeToAPL(actionID.SpellID)
 		},
 		4: func(agent core.Agent, setBonusAura *core.Aura) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			actionID := core.ActionID{SpellID: 37526}
+
+			aura := warrior.NewTemporaryStatsAura(
+				"Battle Rush",
+				actionID,
+				stats.Stats{stats.MeleeHasteRating: 200},
+				time.Second*10,
+			)
+
 			setBonusAura.
-				AttachSpellMod(core.SpellModConfig{
-					ClassMask: SpellMaskMortalStrike | SpellMaskBloodthirst,
-					Kind:      core.SpellMod_PowerCost_Flat,
-					IntValue:  -5,
+				AttachProcTrigger(core.ProcTrigger{
+					Name:               "Destroyer Armor - 4PC",
+					TriggerImmediately: true,
+					ProcChance:         0.07,
+					RequireDamageDealt: true,
+					Callback:           core.CallbackOnSpellHitTaken,
+					Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+						aura.Activate(sim)
+					},
 				}).
-				ExposeToAPL(37535)
+				ExposeToAPL(actionID.SpellID)
 		},
 	},
 })
@@ -235,6 +265,9 @@ var ItemSetOnslaughtArmor = core.NewItemSet(core.ItemSet{
 	Name: "Onslaught Armor",
 	Bonuses: map[int32]core.ApplySetBonus{
 		2: func(agent core.Agent, setBonusAura *core.Aura) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			warrior.T6Tank2P = setBonusAura
+
 			setBonusAura.ExposeToAPL(38408)
 		},
 		4: func(agent core.Agent, setBonusAura *core.Aura) {

sim/warrior/shouts.go

@@ -73,7 +73,7 @@ func (warrior *Warrior) registerShouts() {
 				warrior.DefaultShout != proto.WarriorShout_WarriorShoutNone,
 				warrior.Talents.BoomingVoice,
 				commandingPresenceMultiplier,
-				warrior.T6Tank2P != nil && warrior.T6Tank2P.IsActive(),
+				warrior.CouldHaveSetBonus(ItemSetOnslaughtArmor, 2),
 			)
 			aura.BuildPhase = core.Ternary(warrior.DefaultShout == proto.WarriorShout_WarriorShoutCommanding, core.CharacterBuildPhaseBuffs, core.CharacterBuildPhaseNone)
 			return aura