Merge pull request #2316 from wowsims/fixes

Ignore pyroblast delay when not doing fireball rotation
wowsims · Jan 8, 2023 · d72ffd8 · d72ffd8
2 parents c157be0 + 193e65e
commit d72ffd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sim/mage/mage.go b/sim/mage/mage.go
@@ -170,7 +170,7 @@ func NewMage(character core.Character, options *proto.Player) *Mage {
  if mage.Talents.ImprovedScorch == 0 {
  mage.Rotation.MaintainImprovedScorch = false
  }
- if !mage.Options.IgniteMunching {
+ if !mage.Options.IgniteMunching || mage.Rotation.PrimaryFireSpell != proto.Mage_Rotation_Fireball {
  mage.PyroblastDelayMs = 0
  }
 

diff --git a/ui/mage/inputs.ts b/ui/mage/inputs.ts
@@ -130,7 +130,7 @@ export const MageRotationConfig = {
  <p>Adds a delay to Pyroblast after a Hot Streak to prevent ignite munching. 50ms is a good default for this.</p>
  <p>There is no way to do this perfectly in-game, but a cqs macro can do this with about 70-90% reliability.</p>
  `,
- showWhen: (player: Player<Spec.SpecMage>) => player.getRotation().type == RotationType.Fire && player.getSpecOptions().igniteMunching,
+ showWhen: (player: Player<Spec.SpecMage>) => player.getRotation().type == RotationType.Fire && player.getRotation().primaryFireSpell == PrimaryFireSpell.Fireball && player.getSpecOptions().igniteMunching,
  changeEmitter: (player: Player<Spec.SpecMage>) => TypedEvent.onAny([player.rotationChangeEmitter, player.specOptionsChangeEmitter]),
  }),
  // ********************************************************