Skip to content

Commit

Permalink
Merge pull request #2598 from TheGroxEmpire/master
Browse files Browse the repository at this point in the history
Warrior: Only show mainGcd option on Fury spec
  • Loading branch information
TheGroxEmpire authored Feb 6, 2023
2 parents 60da5f9 + ffaa710 commit b85dffb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 4 additions & 3 deletions proto/warrior.proto
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,10 @@ message Warrior {
bool use_slam = 3;

enum MainGcd {
Slam = 0;
Bloodthirst = 1;
Whirlwind = 2;
None = 0;
Slam = 1;
Bloodthirst = 2;
Whirlwind = 3;
}
MainGcd main_gcd = 4;

Expand Down
2 changes: 2 additions & 0 deletions ui/warrior/inputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ export const WarriorRotationConfig = {
{ name: 'Bloodthirst', value: MainGcd.Bloodthirst },
{ name: 'Whirlwind', value: MainGcd.Whirlwind },
],
changeEmitter: (player: Player<Spec.SpecWarrior>) => TypedEvent.onAny([player.rotationChangeEmitter, player.talentsChangeEmitter]),
showWhen: (player: Player<Spec.SpecWarrior>) => player.getTalents().bloodthirst,
}),
InputHelpers.makeRotationNumberInput<Spec.SpecWarrior>({
fieldName: 'msRageThreshold',
Expand Down

0 comments on commit b85dffb

Please sign in to comment.