Merge pull request #2090 from lime-green/desync

Frost Sub-Blood Desync Rotation
wowsims · Dec 8, 2022 · cd2b965 · cd2b965
2 parents 93a1d76 + 36acec4
commit cd2b965
Show file tree

Hide file tree

Showing 27 changed files with 298 additions and 375 deletions.
diff --git a/sim/core/runic_power.go b/sim/core/runic_power.go
@@ -365,7 +365,10 @@ func (rp *RunicPowerBar) BloodRuneBothReadyAt() time.Duration {
 
 }
 
-func (rp *RunicPowerBar) RuneReadyAt(slot int8) time.Duration {
+func (rp *RunicPowerBar) RuneReadyAt(sim *Simulation, slot int8) time.Duration {
+ if rp.runeStates&isSpents[slot] != isSpents[slot] {
+ return sim.CurrentTime
+ }
  return rp.runeMeta[slot].regenAt
 }
 

diff --git a/sim/deathknight/army_of_the_dead.go b/sim/deathknight/army_of_the_dead.go
@@ -60,7 +60,7 @@ func (dk *Deathknight) registerArmyOfTheDeadCD() {
  Cost: baseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  CD: core.Cooldown{
  Timer: dk.NewTimer(),

diff --git a/sim/deathknight/blood_boil.go b/sim/deathknight/blood_boil.go
@@ -27,7 +27,7 @@ func (dk *Deathknight) registerBloodBoilSpell() {
  Cost: float64(baseCost),
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  },
 

diff --git a/sim/deathknight/blood_strike.go b/sim/deathknight/blood_strike.go
@@ -71,7 +71,7 @@ func (dk *Deathknight) newBloodStrikeSpell(isMH bool) *RuneSpell {
  Cost: conf.BaseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  IgnoreHaste: true,
  }

diff --git a/sim/deathknight/bone_shield.go b/sim/deathknight/bone_shield.go
@@ -57,7 +57,7 @@ func (dk *Deathknight) registerBoneShieldSpell() {
  Cost: baseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  CD: core.Cooldown{
  Timer: cdTimer,

diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
@@ -52,7 +52,7 @@ func (dk *Deathknight) registerDancingRuneWeaponCD() {
  Cost: baseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  CD: core.Cooldown{
  Timer: dk.NewTimer(),

diff --git a/sim/deathknight/death_and_decay.go b/sim/deathknight/death_and_decay.go
@@ -26,7 +26,7 @@ func (dk *Deathknight) registerDeathAndDecaySpell() {
  Cost: baseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  CD: core.Cooldown{
  Timer: dk.NewTimer(),

diff --git a/sim/deathknight/death_coil.go b/sim/deathknight/death_coil.go
@@ -28,7 +28,7 @@ func (dk *Deathknight) registerDeathCoilSpell() {
  cast.GCD = 0
  cast.Cost = 0
  } else {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  }
  },
  },

diff --git a/sim/deathknight/death_pact.go b/sim/deathknight/death_pact.go
@@ -29,7 +29,7 @@ func (dk *Deathknight) registerDeathPactSpell() {
  Cost: baseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  CD: core.Cooldown{
  Timer: cdTimer,

diff --git a/sim/deathknight/death_strike.go b/sim/deathknight/death_strike.go
@@ -78,7 +78,7 @@ func (dk *Deathknight) newDeathStrikeSpell(isMH bool) *RuneSpell {
  Cost: conf.BaseCost,
  },
  ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
- cast.GCD = dk.getModifiedGCD()
+ cast.GCD = dk.GetModifiedGCD()
  },
  IgnoreHaste: true,
  }