add warrior T2.5 sets

wowsims · Nov 16, 2024 · 11d8e82 · 11d8e82
1 parent edb1723
commit 11d8e82
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 2 deletions.
diff --git a/sim/warrior/deep_wounds.go b/sim/warrior/deep_wounds.go
@@ -19,6 +19,7 @@ func (warrior *Warrior) applyDeepWounds() {
 	}[warrior.Talents.DeepWounds]
 
 	warrior.DeepWounds = warrior.RegisterSpell(AnyStance, core.SpellConfig{
+		SpellCode:   SpellCode_WarriorDeepWounds,
 		ActionID:    core.ActionID{SpellID: spellID},
 		SpellSchool: core.SpellSchoolPhysical,
 		ProcMask:    core.ProcMaskEmpty,

diff --git a/sim/warrior/item_sets_pve.go b/sim/warrior/item_sets_pve.go
@@ -455,3 +455,118 @@ var ItemSetVindicatorsBattlegear = core.NewItemSet(core.ItemSet{
 		},
 	},
 })
+
+///////////////////////////////////////////////////////////////////////////
+//                            SoD Phase 6 Item Sets
+///////////////////////////////////////////////////////////////////////////
+
+var ItemSetConquerorsAdvance = core.NewItemSet(core.ItemSet{
+	Name: "Conqueror's Advance",
+	Bonuses: map[int32]core.ApplyEffect{
+		// Reduces the cooldown on your Death Wish by 50%.
+		2: func(agent core.Agent) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			if !warrior.Talents.DeathWish {
+				return
+			}
+
+			warrior.RegisterAura(core.Aura{
+				Label: "S03 - Item - TAQ - Warrior - Damage 2P Bonus",
+				OnInit: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.DeathWish.CD.Duration /= 2
+				},
+			})
+		},
+		// You deal 10% increased damage while any nearby enemy is afflicted with both your Rend and your Deep Wounds.
+		4: func(agent core.Agent) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			if warrior.Talents.DeepWounds == 0 {
+				return
+			}
+
+			buffAura := warrior.RegisterAura(core.Aura{
+				ActionID: core.ActionID{SpellID: 1214166},
+				Label:    "Bloodythirsty",
+				Duration: time.Second * 3,
+				OnGain: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.PseudoStats.DamageDealtMultiplier *= 1.10
+				},
+				OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.PseudoStats.DamageDealtMultiplier *= 1.10
+				},
+			})
+
+			core.MakePermanent(warrior.RegisterAura(core.Aura{
+				Label: "S03 - Item - TAQ - Warrior - Damage 4P Bonus",
+				OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					if (spell.SpellCode == SpellCode_WarriorDeepWounds && warrior.Rend.Dot(result.Target).IsActive()) ||
+						(spell.SpellCode == SpellCode_WarriorRend && warrior.DeepWounds.Dot(result.Target).IsActive()) {
+						buffAura.Activate(sim)
+					}
+				},
+				OnPeriodicDamageDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					if (spell.SpellCode == SpellCode_WarriorDeepWounds && warrior.Rend.Dot(result.Target).IsActive()) ||
+						(spell.SpellCode == SpellCode_WarriorRend && warrior.DeepWounds.Dot(result.Target).IsActive()) {
+						buffAura.Activate(sim)
+					}
+				},
+			}))
+		},
+	},
+})
+
+var ItemSetConquerorsBulwark = core.NewItemSet(core.ItemSet{
+	Name: "Conqueror's Bulwark",
+	Bonuses: map[int32]core.ApplyEffect{
+		// Reduces the cooldown on Thunder Clap by 100%.
+		2: func(agent core.Agent) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+
+			warrior.RegisterAura(core.Aura{
+				Label: "S03 - Item - TAQ - Warrior - Tank 2P Bonus",
+				OnInit: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.ThunderClap.CD.Duration = 0
+				},
+			})
+		},
+		// Your Shield Slam deals 100% increased threat and its cooldown is reset if it is Dodged, Parried, or Blocked.
+		4: func(agent core.Agent) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			if !warrior.Talents.ShieldSlam {
+				return
+			}
+
+			core.MakePermanent(warrior.RegisterAura(core.Aura{
+				Label: "S03 - Item - TAQ - Warrior - Tank 4P Bonus",
+				OnInit: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.ShieldSlam.ThreatMultiplier *= 2
+				},
+				OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					if spell.SpellCode == SpellCode_WarriorShieldSlam && result.Outcome.Matches(core.OutcomeDodge|core.OutcomeParry|core.OutcomeBlock) {
+						spell.CD.Reset()
+					}
+				},
+			}))
+		},
+	},
+})
+
+var ItemSetBattlegearOfUnyieldingStrength = core.NewItemSet(core.ItemSet{
+	Name: "Battlegear of Unyielding Strength",
+	Bonuses: map[int32]core.ApplyEffect{
+		// Reduces the cooldown on Shockwave by 50%.
+		3: func(agent core.Agent) {
+			warrior := agent.(WarriorAgent).GetWarrior()
+			if !warrior.HasRune(proto.WarriorRune_RuneShockwave) {
+				return
+			}
+
+			warrior.RegisterAura(core.Aura{
+				Label: "S03 - Item - RAQ - Warrior - Tank 3P Bonus",
+				OnInit: func(aura *core.Aura, sim *core.Simulation) {
+					warrior.Shockwave.CD.Duration /= 2
+				},
+			})
+		},
+	},
+})
diff --git a/sim/warrior/talents.go b/sim/warrior/talents.go
@@ -421,7 +421,7 @@ func (warrior *Warrior) registerDeathWishCD() {
 	})
 	core.RegisterPercentDamageModifierEffect(deathWishAura, 1.2)
 
-	DeathWish := warrior.RegisterSpell(AnyStance, core.SpellConfig{
+	warrior.DeathWish = warrior.RegisterSpell(AnyStance, core.SpellConfig{
 		ActionID: actionID,
 		Flags:    core.SpellFlagHelpful,
 		RageCost: core.RageCostOptions{
@@ -444,7 +444,7 @@ func (warrior *Warrior) registerDeathWishCD() {
 	})
 
 	warrior.AddMajorCooldown(core.MajorCooldown{
-		Spell: DeathWish.Spell,
+		Spell: warrior.DeathWish.Spell,
 		Type:  core.CooldownTypeDPS,
 	})
 }

diff --git a/sim/warrior/warrior.go b/sim/warrior/warrior.go
@@ -17,6 +17,7 @@ const (
 	SpellCode_WarriorNone int32 = iota
 
 	SpellCode_WarriorBloodthirst
+	SpellCode_WarriorDeepWounds
 	SpellCode_WarriorDevastate
 	SpellCode_WarriorExecute
 	SpellCode_WarriorMortalStrike
@@ -96,6 +97,7 @@ type Warrior struct {
 	Bloodrage         *WarriorSpell
 	BerserkerRage     *WarriorSpell
 	Bloodthirst       *WarriorSpell
+	DeathWish         *WarriorSpell
 	DemoralizingShout *WarriorSpell
 	Execute           *WarriorSpell
 	MortalStrike      *WarriorSpell