From b55c1788b67b0f166669af45bbd92bb4d15b3131 Mon Sep 17 00:00:00 2001
From: The Grox Empire <47816228+TheGroxEmpire@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:56:19 +0700
Subject: [PATCH 1/2] Warrior T10 4pc tweaks and default preset changes

---
 sim/warrior/talents.go | 16 +++++++---------
 ui/warrior/presets.ts  | 15 ++++++---------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/sim/warrior/talents.go b/sim/warrior/talents.go
index e35b877bc6..0c90e5a6e4 100644
--- a/sim/warrior/talents.go
+++ b/sim/warrior/talents.go
@@ -227,17 +227,13 @@ func (warrior *Warrior) applyBloodsurge() {
 
 	procChance := []float64{0, 0.07, 0.13, 0.2}[warrior.Talents.Bloodsurge]
 
+	ymirjar4Set := warrior.HasSetBonus(ItemSetYmirjarLordsBattlegear, 4)
+
 	warrior.BloodsurgeAura = warrior.RegisterAura(core.Aura{
 		Label:    "Bloodsurge Proc",
 		ActionID: core.ActionID{SpellID: 46916},
 		Duration: time.Second * 5,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			if warrior.Ymirjar4pcProcAura.IsActive() {
-				aura.Deactivate(sim)
-				warrior.Ymirjar4pcProcAura.Refresh(sim)
-				return
-			}
-
 			warrior.Slam.DefaultCast.CastTime = 0
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
@@ -250,8 +246,6 @@ func (warrior *Warrior) applyBloodsurge() {
 		},
 	})
 
-	ymirjar4Set := warrior.HasSetBonus(ItemSetYmirjarLordsBattlegear, 4)
-
 	if ymirjar4Set {
 		warrior.Ymirjar4pcProcAura = warrior.RegisterAura(core.Aura{
 			Label:     "Ymirjar 4pc (Bloodsurge) Proc",
@@ -302,8 +296,10 @@ func (warrior *Warrior) applyBloodsurge() {
 
 			// as per https://www.wowhead.com/wotlk/spell=70847/item-warrior-t10-melee-4p-bonus#comments,
 			//  the improved aura is not overwritten by the regular one, but simply refreshed
-			if ymirjar4Set && (warrior.Ymirjar4pcProcAura.IsActive() || sim.RandomFloat("Ymirjar 4pc") < 0.2) {
+			if ymirjar4Set && (sim.RandomFloat("Ymirjar 4pc") < 0.2 || warrior.Ymirjar4pcProcAura.IsActive()) {
+				warrior.BloodsurgeAura.Deactivate(sim)
 				warrior.Ymirjar4pcProcAura.Activate(sim)
+
 				warrior.BloodsurgeValidUntil = sim.CurrentTime + warrior.Ymirjar4pcProcAura.Duration
 				return
 			}
@@ -674,6 +670,8 @@ func (warrior *Warrior) applySuddenDeath() {
 			// as per https://www.wowhead.com/wotlk/spell=70847/item-warrior-t10-melee-4p-bonus#comments,
 			//  the improved aura is not overwritten by the regular one, but simply refreshed
 			if ymirjar4Set && (warrior.Ymirjar4pcProcAura.IsActive() || sim.RandomFloat("Ymirjar 4pc") < 0.2) {
+				warrior.SuddenDeathAura.Deactivate(sim)
+
 				warrior.Ymirjar4pcProcAura.Activate(sim)
 				return
 			}
diff --git a/ui/warrior/presets.ts b/ui/warrior/presets.ts
index 53762f4363..ff38c41f00 100644
--- a/ui/warrior/presets.ts
+++ b/ui/warrior/presets.ts
@@ -42,7 +42,7 @@ export const ArmsTalents = {
 			major3: WarriorMajorGlyph.GlyphOfExecution,
 			minor1: WarriorMinorGlyph.GlyphOfThunderClap,
 			minor2: WarriorMinorGlyph.GlyphOfCommand,
-			minor3: WarriorMinorGlyph.GlyphOfCharge,
+			minor3: WarriorMinorGlyph.GlyphOfShatteringThrow,
 		}),
 	}),
 };
@@ -55,8 +55,8 @@ export const FuryTalents = {
 			major1: WarriorMajorGlyph.GlyphOfWhirlwind,
 			major2: WarriorMajorGlyph.GlyphOfHeroicStrike,
 			major3: WarriorMajorGlyph.GlyphOfExecution,
-			minor1: WarriorMinorGlyph.GlyphOfBattle,
-			minor2: WarriorMinorGlyph.GlyphOfBloodrage,
+			minor1: WarriorMinorGlyph.GlyphOfCommand,
+			minor2: WarriorMinorGlyph.GlyphOfShatteringThrow,
 			minor3: WarriorMinorGlyph.GlyphOfCharge,
 		}),
 	}),
@@ -64,17 +64,15 @@ export const FuryTalents = {
 
 export const DefaultRotation = WarriorRotation.create({
 	useRend: true,
-	useMs: true,
 	useCleave: false,
 	useOverpower: false,
 	executePhaseOverpower: false,
 
-	mainGcd: MainGcd.Slam,
+	mainGcd: MainGcd.Bloodthirst,
 
 	sunderArmor: SunderArmor.SunderArmorMaintain,
 
-	msRageThreshold: 35,
-	hsRageThreshold: 30,
+	hsRageThreshold: 12,
 	rendHealthThresholdAbove: 20,
 	rendRageThresholdBelow: 100,
 	slamRageThreshold: 25,
@@ -83,7 +81,6 @@ export const DefaultRotation = WarriorRotation.create({
 	useBtDuringExecute: true,
 	useWwDuringExecute: true,
 	useSlamOverExecute: true,
-	spamExecute: true,
 	stanceOption: StanceOption.DefaultStance,
 });
 
@@ -92,7 +89,7 @@ export const ArmsRotation = WarriorRotation.create({
 	useMs: true,
 	useCleave: false,
 	sunderArmor: SunderArmor.SunderArmorMaintain,
-	msRageThreshold: 355,
+	msRageThreshold: 30,
 	slamRageThreshold: 25,
 	hsRageThreshold: 50,
 	rendCdThreshold: 0,

From e7ba07aca646d9e470cf1c364f01f2fbfa9bb58a Mon Sep 17 00:00:00 2001
From: The Grox Empire <47816228+TheGroxEmpire@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:58:04 +0700
Subject: [PATCH 2/2] Update tests

---
 sim/warrior/dps/TestArms.results | 4 ++--
 sim/warrior/dps/TestFury.results | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index b06670c569..61b2546a02 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -855,8 +855,8 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 8522.22314
-  tps: 7018.62732
+  dps: 8502.64564
+  tps: 7003.65911
  }
 }
 dps_results: {
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index 94e67d412b..93de1fbbc2 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -855,8 +855,8 @@ dps_results: {
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 7099.20759
-  tps: 5249.15637
+  dps: 7113.95726
+  tps: 5259.3417
  }
 }
 dps_results: {