Merge pull request #1971 from Horatio27/Fire_ele_snapshot_fix

Fire Ele snapshot fix for Enh. It was using the spell gcd for checking if it can snapshot or not, but due to Enh having spells that use the 1.5s GCD, it would wait to long and miss procs.
wowsims · Nov 29, 2022 · 5ef5341 · 5ef5341
2 parents c570db8 + ef0d33d
commit 5ef5341
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
@@ -738,36 +738,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget"
  value: {
- dps: 18437.31478
- tps: 10251.67884
+ dps: 18468.93502
+ tps: 10295.96356
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget"
  value: {
- dps: 6539.08899
- tps: 3395.52813
+ dps: 6543.07266
+ tps: 3396.94522
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget"
  value: {
- dps: 8106.22997
- tps: 3748.26426
+ dps: 8124.13453
+ tps: 3761.88364
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget"
  value: {
- dps: 12687.85751
- tps: 7516.69322
+ dps: 12684.85104
+ tps: 7508.5982
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget"
  value: {
- dps: 3744.07992
- tps: 1910.34124
+ dps: 3707.24394
+ tps: 1887.09665
  }
 }
 dps_results: {
@@ -822,36 +822,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget"
  value: {
- dps: 18198.39229
- tps: 10217.94181
+ dps: 18225.38021
+ tps: 10245.9404
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget"
  value: {
- dps: 6490.86821
- tps: 3411.86914
+ dps: 6502.02136
+ tps: 3421.0632
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget"
  value: {
- dps: 8021.47526
- tps: 3807.43762
+ dps: 8048.8596
+ tps: 3822.02819
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget"
  value: {
- dps: 12411.40468
- tps: 7451.38959
+ dps: 12650.22465
+ tps: 7630.44162
  }
 }
 dps_results: {
  key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget"
  value: {
- dps: 3655.92041
- tps: 1893.40167
+ dps: 3678.05146
+ tps: 1910.59547
  }
 }
 dps_results: {

diff --git a/sim/shaman/fire_elemental_totem.go b/sim/shaman/fire_elemental_totem.go
@@ -58,11 +58,13 @@ func (shaman *Shaman) registerFireElementalTotem() {
  },
  })
 
+ //Enh has 1.5seconds GCD also, so just going to wait the normal 1.5 instead of using the dynamic Spell GCD
+ var castWindow = 1550 * time.Millisecond
  shaman.AddMajorCooldown(core.MajorCooldown{
  Spell: shaman.FireElementalTotem,
  Type: core.CooldownTypeUnknown,
  ShouldActivate: func(sim *core.Simulation, character *core.Character) bool {
- success := shaman.fireElementalSnapShot.CanSnapShot(sim, shaman.SpellGCD()+50*time.Millisecond)
+ success := shaman.fireElementalSnapShot.CanSnapShot(sim, castWindow)
 
  if (sim.Encounter.Duration <= 120*time.Second && sim.CurrentTime >= 10*time.Second) || (sim.Encounter.Duration > 120*time.Second && sim.CurrentTime >= 20*time.Second) {
  success = true