Merge pull request #2862 from jarveson/jake/feral-hotfix-rot-fix

feral: fix rotation prepopOoc/zerk interaction
wowsims · Apr 4, 2023 · 06bbe35 · 06bbe35
2 parents c4bdea9 + 177d2f7
commit 06bbe35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/sim/druid/feral/feral.go b/sim/druid/feral/feral.go
@@ -96,15 +96,16 @@ func (cat *FeralDruid) Initialize() {
  cat.Druid.Initialize()
  cat.RegisterFeralCatSpells()
 
- if cat.PrePopBerserk && cat.Talents.Berserk {
- cat.RegisterPrepullAction(-time.Second, func(sim *core.Simulation) {
- cat.Berserk.Cast(sim, nil)
+ if cat.prepopOoc && cat.Talents.OmenOfClarity {
+ time := core.Ternary(cat.PrePopBerserk, time.Second*2, time.Second)
+ cat.RegisterPrepullAction(-time, func(sim *core.Simulation) {
+ cat.FaerieFire.Cast(sim, nil)
  })
  }
 
- if cat.prepopOoc && cat.Talents.OmenOfClarity {
- cat.RegisterPrepullAction(-cat.SpellGCD(), func(sim *core.Simulation) {
- cat.FaerieFire.Cast(sim, nil)
+ if cat.PrePopBerserk && cat.Talents.Berserk {
+ cat.RegisterPrepullAction(-time.Second, func(sim *core.Simulation) {
+ cat.Berserk.Cast(sim, nil)
  })
  }
 }

diff --git a/ui/feral_druid/inputs.ts b/ui/feral_druid/inputs.ts
@@ -44,7 +44,7 @@ export const LatencyMs = InputHelpers.makeSpecOptionsNumberInput<Spec.SpecFeralD
 export const PrepopOoc = InputHelpers.makeSpecOptionsBooleanInput<Spec.SpecFeralDruid>({
  fieldName: 'prepopOoc',
  label: 'Pre-pop Clearcasting',
- labelTooltip: 'Start fight with clearcasting active',
+ labelTooltip: 'Start fight with clearcasting using FFF',
  showWhen: (player: Player<Spec.SpecFeralDruid>) => player.getTalents().omenOfClarity,
  changeEmitter: (player: Player<Spec.SpecFeralDruid>) => TypedEvent.onAny([player.rotationChangeEmitter, player.talentsChangeEmitter]),
 })