update warrior t1 2pc, glad APL

sim/warrior/dps_warrior/TestFury.results

@@ -148,8 +148,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFury-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.34702
-  weights: 1.51325
+  weights: 1.93661
+  weights: 1.54557
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.78259
-  weights: 4.44411
-  weights: 28.44748
+  weights: 0.51497
+  weights: 2.03844
+  weights: 29.07513
   weights: 0
   weights: 0
   weights: 0
@@ -302,8 +302,8 @@ dps_results: {
 dps_results: {
  key: "TestFury-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 2701.25948
-  tps: 2393.18087
+  dps: 2749.0753
+  tps: 2413.27332
  }
 }
 dps_results: {
@@ -316,126 +316,126 @@ dps_results: {
 dps_results: {
  key: "TestFury-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 2514.32909
-  tps: 2224.58399
+  dps: 2522.936
+  tps: 2216.02454
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 2476.74384
-  tps: 2194.90854
+  dps: 2479.1275
+  tps: 2177.6068
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 2514.32909
-  tps: 2224.58399
+  dps: 2522.936
+  tps: 2216.02454
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 2930.22662
-  tps: 2582.66553
+  dps: 2946.05312
+  tps: 2576.9268
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Average-Default"
  value: {
-  dps: 3328.94174
-  tps: 2903.75953
+  dps: 3334.80184
+  tps: 2892.30589
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 2023.22705
-  tps: 2780.11355
+  dps: 1316.3779
+  tps: 1386.7248
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 579.50611
-  tps: 581.35348
+  dps: 448.83751
+  tps: 443.53966
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 702.77623
-  tps: 686.8357
+  dps: 551.01097
+  tps: 533.61084
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 875.73453
-  tps: 1705.08842
+  dps: 591.0626
+  tps: 708.6469
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 278.45192
-  tps: 325.88225
+  dps: 233.88886
+  tps: 258.83686
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 348.39472
-  tps: 384.8481
+  dps: 291.41074
+  tps: 308.12864
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 2198.37054
-  tps: 2937.36437
+  dps: 1345.60841
+  tps: 1411.0242
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 608.10665
-  tps: 603.49167
+  dps: 467.69074
+  tps: 458.55232
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 747.77583
-  tps: 722.65288
+  dps: 555.05046
+  tps: 534.48153
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 917.51195
-  tps: 1738.97415
+  dps: 589.30254
+  tps: 704.20304
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 279.12212
-  tps: 324.60076
+  dps: 232.74478
+  tps: 256.74558
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 356.43051
-  tps: 389.02023
+  dps: 284.40991
+  tps: 299.78561
  }
 }
 dps_results: {
  key: "TestFury-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2608.7657
-  tps: 2295.02585
+  dps: 2609.25225
+  tps: 2272.79992
  }
 }

sim/warrior/item_sets_pve.go

@@ -61,16 +61,44 @@ var ItemSetBattlegearOfValor = core.NewItemSet(core.ItemSet{
 var ItemSetUnstoppableMight = core.NewItemSet(core.ItemSet{
 	Name: "Unstoppable Might",
 	Bonuses: map[int32]core.ApplyEffect{
-		// You gain 10 Rage when you change stances.
+		// After changing stances, your next offensive ability's rage cost is reduced by 10.
 		2: func(agent core.Agent) {
 			warrior := agent.(WarriorAgent).GetWarrior()
-			rageMetrics := warrior.NewRageMetrics(core.ActionID{SpellID: 457652})
+
+			var affectedSpells []*core.Spell
+			tacticianAura := warrior.RegisterAura(core.Aura{
+				ActionID: core.ActionID{SpellID: 464241},
+				Label:    "Tactician",
+				Duration: time.Second * 10,
+				OnInit: func(aura *core.Aura, sim *core.Simulation) {
+					for _, spell := range warrior.Spellbook {
+						if spell.Cost != nil && spell.Cost.CostType() == core.CostTypeRage && !spell.Flags.Matches(core.SpellFlagHelpful) {
+							affectedSpells = append(affectedSpells, spell)
+						}
+					}
+				},
+				OnGain: func(aura *core.Aura, sim *core.Simulation) {
+					for _, spell := range affectedSpells {
+						spell.Cost.FlatModifier -= 10
+					}
+				},
+				OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+					for _, spell := range affectedSpells {
+						spell.Cost.FlatModifier += 10
+					}
+				},
+				OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
+					if slices.Contains(affectedSpells, spell) {
+						aura.Deactivate(sim)
+					}
+				},
+			})
+
 			core.MakePermanent(warrior.RegisterAura(core.Aura{
-				ActionID: core.ActionID{SpellID: 457652}, // Intentionally exposing for stance-dancing APL conditions
-				Label:    "S03 - Item - T1 - Warrior - Damage 2P Bonus Trigger",
+				Label: "S03 - Item - T1 - Warrior - Damage 2P Bonus Trigger",
 				OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 					if slices.Contains(StanceCodes, spell.SpellCode) {
-						warrior.AddRage(sim, 10, rageMetrics)
+						tacticianAura.Activate(sim)
 					}
 				},
 			}))

sim/warrior/sweeping_strikes.go

@@ -81,6 +81,7 @@ func (warrior *Warrior) registerSweepingStrikesCD() {
 	SweepingStrikes := warrior.RegisterSpell(BattleStance, core.SpellConfig{
 		ActionID:    actionID,
 		SpellSchool: core.SpellSchoolPhysical,
+		Flags:       core.SpellFlagHelpful,
 
 		RageCost: core.RageCostOptions{
 			Cost: 30,

sim/warrior/talents.go

@@ -329,6 +329,7 @@ func (warrior *Warrior) registerDeathWishCD() {
 
 	DeathWish := warrior.RegisterSpell(AnyStance, core.SpellConfig{
 		ActionID: actionID,
+		Flags:    core.SpellFlagHelpful,
 		RageCost: core.RageCostOptions{
 			Cost: 10,
 		},

ui/warrior/apls/phase_4_fury.apl.json

@@ -1,8 +1,6 @@
 {
   "type": "TypeAPL",
   "prepullActions": [
-    {"action":{"castSpell":{"spellId":{"spellId":2457}}},"doAtValue":{"const":{"val":"-6s"}}},
-    {"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-4s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":2457}}},"doAtValue":{"const":{"val":"-2s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-1s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":24427}}},"doAtValue":{"const":{"val":"-1s"}}}
@@ -26,8 +24,8 @@
     {"action":{"castSpell":{"spellId":{"spellId":23894,"rank":4}}}},
     {"action":{"castSpell":{"spellId":{"spellId":20662,"rank":5}}}},
     {"action":{"castSpell":{"spellId":{"spellId":11585,"rank":4}}}},
-    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":457652}}},{"auraIsActive":{"auraId":{"spellId":2457}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"34"}}}}]}},"castSpell":{"spellId":{"spellId":2458}}}},
-    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":457652}}},{"auraIsActive":{"auraId":{"spellId":2458}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"34"}}}}]}},"castSpell":{"spellId":{"spellId":2457}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":464241}}},{"auraIsActive":{"auraId":{"spellId":2457}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"25"}}}}]}},"castSpell":{"spellId":{"spellId":2458}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":464241}}},{"auraIsActive":{"auraId":{"spellId":2458}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"25"}}}}]}},"castSpell":{"spellId":{"spellId":2457}}}},
     {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},"castSpell":{"spellId":{"spellId":2687}}}},
     {"action":{"castSpell":{"spellId":{"spellId":1680}}}},
     {"action":{"castSpell":{"spellId":{"spellId":402911}}}},

ui/warrior/apls/phase_4_glad.apl.json

@@ -1,13 +1,12 @@
 {
   "type": "TypeAPL",
   "prepullActions": [
-    {"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-4s"}}},
-    {"action":{"castSpell":{"spellId":{"spellId":412513}}},"doAtValue":{"const":{"val":"-3s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":2458}}},"doAtValue":{"const":{"val":"-2s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":412513}}},"doAtValue":{"const":{"val":"-1s"}}}
   ],
   "priorityList": [
-    {"hide":true,"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":412513}}}}},"castSpell":{"spellId":{"spellId":412513}}}},
+    {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":412513}}}}},"castSpell":{"spellId":{"spellId":412513}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":457816}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":457816}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentRage":{}},"rhs":{"const":{"val":"65"}}}}]}},"castSpell":{"spellId":{"spellId":2458}}}},
     {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}},"castSpell":{"spellId":{"itemId":13442}}}},
     {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"12"}}}},"castSpell":{"spellId":{"spellId":2687}}}},
     {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"36s"}}}},"castSpell":{"spellId":{"spellId":426940}}}},

ui/warrior/presets.ts

@@ -201,7 +201,6 @@ export const DefaultConsumes = Consumes.create({
 	dragonBreathChili: true,
 	enchantedSigil: EnchantedSigil.FlowingWatersSigil,
 	food: Food.FoodSmokedDesertDumpling,
-	flask: Flask.FlaskOfTheTitans,
 	healthElixir: HealthElixir.ElixirOfFortitude,
 	mainHandImbue: WeaponImbue.WildStrikes,
 	miscConsumes: {