Merge pull request #1040 from wowsims/feature/trinket-soo-readiness-trinkets

Fix Readiness trinket for warrior

Author: 1337LutZ

sim/warrior/arms/TestArms.results

@@ -187,8 +187,8 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-EvilEyeofGalakras-105491"
  value: {
-  dps: 157444.24319
-  tps: 105253.64179
+  dps: 158574.68794
+  tps: 104011.3719
  }
 }
 dps_results: {

sim/warrior/fury/TestFury.results

@@ -187,8 +187,8 @@ dps_results: {
 dps_results: {
  key: "TestFury-AllItems-EvilEyeofGalakras-105491"
  value: {
-  dps: 159386.80711
-  tps: 105318.62501
+  dps: 160286.64656
+  tps: 105589.10704
  }
 }
 dps_results: {

sim/warrior/protection/TestProtectionWarrior.results

@@ -777,9 +777,9 @@ dps_results: {
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EvilEyeofGalakras-105491"
  value: {
-  dps: 124371.74306
-  tps: 766722.2523
-  dtps: 11979.54615
+  dps: 120665.3866
+  tps: 755878.76682
+  dtps: 11852.71472
  }
 }
 dps_results: {

sim/warrior/talents.go

@@ -101,12 +101,17 @@ func (war *Warrior) registerDragonRoar() {
 
 	damageMultipliers := []float64{1, 0.75, 0.65, 0.55, 0.50}
 
+	flags := core.SpellFlagAPL | core.SpellFlagMeleeMetrics | core.SpellFlagIgnoreArmor
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	spell := war.RegisterSpell(core.SpellConfig{
 		ActionID:       actionID,
 		SpellSchool:    core.SpellSchoolPhysical,
 		ClassSpellMask: SpellMaskDragonRoar,
 		ProcMask:       core.ProcMaskMeleeMHSpecial,
-		Flags:          core.SpellFlagAPL | core.SpellFlagMeleeMetrics | core.SpellFlagIgnoreArmor | core.SpellFlagReadinessTrinket,
+		Flags:          flags,
 
 		Cast: core.CastConfig{
 			DefaultCast: core.Cast{
@@ -194,11 +199,16 @@ func (war *Warrior) registerBladestorm() {
 		Kind:      core.SpellMod_AllowCastWhileChanneling,
 	})
 
+	flags := core.SpellFlagChanneled | core.SpellFlagMeleeMetrics | core.SpellFlagAPL | core.SpellFlagCastWhileChanneling
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	spell := war.RegisterSpell(core.SpellConfig{
 		ActionID:       actionID.WithTag(0),
 		SpellSchool:    core.SpellSchoolPhysical,
 		ClassSpellMask: SpellMaskBladestorm,
-		Flags:          core.SpellFlagChanneled | core.SpellFlagMeleeMetrics | core.SpellFlagAPL | core.SpellFlagCastWhileChanneling,
+		Flags:          flags,
 		ProcMask:       core.ProcMaskEmpty,
 
 		Cast: core.CastConfig{
@@ -251,12 +261,17 @@ func (war *Warrior) registerShockwave() {
 		return
 	}
 
+	flags := core.SpellFlagAoE | core.SpellFlagMeleeMetrics | core.SpellFlagAPL
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	war.RegisterSpell(core.SpellConfig{
 		ActionID:       core.ActionID{SpellID: 46968},
 		SpellSchool:    core.SpellSchoolPhysical,
 		ProcMask:       core.ProcMaskMeleeMHSpecial,
 		ClassSpellMask: SpellMaskShockwave,
-		Flags:          core.SpellFlagAoE | core.SpellFlagMeleeMetrics | core.SpellFlagAPL | core.SpellFlagReadinessTrinket,
+		Flags:          flags,
 
 		Cast: core.CastConfig{
 			DefaultCast: core.Cast{
@@ -296,11 +311,16 @@ func (war *Warrior) registerAvatar() {
 		Duration: 24 * time.Second,
 	}).AttachMultiplicativePseudoStatBuff(&war.Unit.PseudoStats.DamageDealtMultiplier, 1.2)
 
+	flags := core.SpellFlagAPL
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	avatar := war.RegisterSpell(core.SpellConfig{
 		ActionID:       actionId,
 		SpellSchool:    core.SpellSchoolPhysical,
 		ProcMask:       core.ProcMaskEmpty,
-		Flags:          core.SpellFlagAPL | core.SpellFlagReadinessTrinket,
+		Flags:          flags,
 		ClassSpellMask: SpellMaskAvatar,
 
 		Cast: core.CastConfig{
@@ -361,11 +381,16 @@ func (war *Warrior) registerBloodbath() {
 		},
 	})
 
+	flags := core.SpellFlagAPL
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	spell := war.RegisterSpell(core.SpellConfig{
 		ActionID:       spellActionID,
 		SpellSchool:    core.SpellSchoolPhysical,
 		ClassSpellMask: SpellMaskBloodbath,
-		Flags:          core.SpellFlagAPL | core.SpellFlagReadinessTrinket,
+		Flags:          flags,
 		ProcMask:       core.ProcMaskEmpty,
 
 		Cast: core.CastConfig{
@@ -418,11 +443,16 @@ func (war *Warrior) registerStormBolt() {
 		},
 	})
 
+	flags := core.SpellFlagMeleeMetrics | core.SpellFlagAPL
+	if war.Spec != proto.Spec_SpecProtectionWarrior {
+		flags |= core.SpellFlagReadinessTrinket
+	}
+
 	war.RegisterSpell(core.SpellConfig{
 		ActionID:       actionID.WithTag(1),
 		SpellSchool:    core.SpellSchoolPhysical,
 		ProcMask:       core.ProcMaskMeleeMHSpecial,
-		Flags:          core.SpellFlagMeleeMetrics | core.SpellFlagAPL | core.SpellFlagReadinessTrinket,
+		Flags:          flags,
 		ClassSpellMask: SpellMaskStormBolt,
 		MaxRange:       30,