Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Warrior T10 4pc tweaks and default preset changes #3497

Merged
merged 3 commits into from
Aug 19, 2023
Merged

Warrior T10 4pc tweaks and default preset changes #3497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55c178
Warrior T10 4pc tweaks and default preset changes
TheGroxEmpire Aug 19, 2023
20ea0ed
Merge remote-tracking branch 'upstream/master'
TheGroxEmpire Aug 19, 2023
e7ba07a
Update tests
TheGroxEmpire Aug 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sim/warrior/dps/TestArms.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 2 additions & 2 deletions sim/warrior/dps/TestFury.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
16 changes: 7 additions & 9 deletions sim/warrior/talents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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",
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
15 changes: 6 additions & 9 deletions ui/warrior/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const ArmsTalents = {
major3: WarriorMajorGlyph.GlyphOfExecution,
minor1: WarriorMinorGlyph.GlyphOfThunderClap,
minor2: WarriorMinorGlyph.GlyphOfCommand,
minor3: WarriorMinorGlyph.GlyphOfCharge,
minor3: WarriorMinorGlyph.GlyphOfShatteringThrow,
}),
}),
};
Expand All @@ -55,26 +55,24 @@ 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,
}),
}),
};

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,
Expand All @@ -83,7 +81,6 @@ export const DefaultRotation = WarriorRotation.create({
useBtDuringExecute: true,
useWwDuringExecute: true,
useSlamOverExecute: true,
spamExecute: true,
stanceOption: StanceOption.DefaultStance,
});

Expand All @@ -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,
Expand Down
Loading