simpler

wowsims · Jul 7, 2023 · ada5e2f · ada5e2f
1 parent 3309245
commit ada5e2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/sim/core/runic_power.go b/sim/core/runic_power.go
@@ -298,20 +298,6 @@ func (rp *RunicPowerBar) NormalSpentBloodRuneReadyAt(sim *Simulation) time.Durat
 	return readyAt
 }
 
-func (rp *RunicPowerBar) NormalBloodRuneReadyAt(sim *Simulation) time.Duration {
-	readyAt := NeverExpires
-	if rp.runeStates&isDeaths[0] == 0 && rp.runeStates&isSpents[0] != 0 {
-		readyAt = rp.runeMeta[0].regenAt
-	}
-	if rp.runeStates&isDeaths[1] == 0 && rp.runeStates&isSpents[1] != 0 {
-		readyAt = MinDuration(readyAt, rp.runeMeta[3].regenAt)
-	}
-	if (rp.runeStates&isDeaths[0] == 0 && rp.runeStates&isSpents[0] == 0) || (rp.runeStates&isDeaths[1] == 0 && rp.runeStates&isSpents[1] == 0) {
-		readyAt = sim.CurrentTime
-	}
-	return readyAt
-}
-
 func (rp *RunicPowerBar) NormalSpentFrostRuneReadyAt(sim *Simulation) time.Duration {
 	readyAt := NeverExpires
 	if rp.runeStates&isDeaths[2] == 0 && rp.runeStates&isSpents[2] != 0 {

diff --git a/sim/deathknight/dps/rotation_frost.go b/sim/deathknight/dps/rotation_frost.go
@@ -151,7 +151,7 @@ func (dk *DpsDeathknight) castAllMajorCooldowns(sim *core.Simulation) {
 
 func (dk *DpsDeathknight) RotationActionCallback_UA_Frost(sim *core.Simulation, target *core.Unit, s *deathknight.Sequence) time.Duration {
 	if dk.UnbreakableArmor != nil {
-		if dk.NormalCurrentBloodRunes() < 2 && !dk.LeftBloodRuneReady() {
+		if !dk.LeftBloodRuneReady() {
 			dk.BloodTap.Cast(sim, nil)
 		}
 		casted := dk.UnbreakableArmor.Cast(sim, target)

diff --git a/sim/deathknight/dps/rotation_frost_sub_blood.go b/sim/deathknight/dps/rotation_frost_sub_blood.go
@@ -157,7 +157,7 @@ func (dk *DpsDeathknight) RotationActionCallback_FrostSubBlood_FS_Dump(sim *core
 		fr := dk.NormalCurrentFrostRunes()
 		uh := dk.NormalCurrentUnholyRunes()
 		b := dk.NormalCurrentBloodRunes()
-		bAt := dk.NormalBloodRuneReadyAt(sim)
+		bAt := dk.BloodRuneReadyAt(sim)
 		frAt := dk.NormalFrostRuneReadyAt(sim)
 		uhAt := dk.NormalUnholyRuneReadyAt(sim)
 		obAt := core.MaxDuration(frAt, uhAt)
@@ -195,9 +195,8 @@ func (dk *DpsDeathknight) RotationActionCallback_FrostSubBlood_FS_Dump(sim *core
 				casted = dk.FrostStrike.Cast(sim, target)
 			} else {
 				if dk.canCastFrostUnholySpell(sim, target) {
-					bAt = core.TernaryDuration(b > 0, sim.CurrentTime, bAt)
 					dndAt := core.MaxDuration(bAt-sim.CurrentTime, dk.DeathAndDecay.TimeToReady(sim))
-					if dk.Rotation.UseDeathAndDecay && dk.Env.GetNumTargets() >= 3 && dndAt < 1*time.Second && !dk.UnbreakableArmorAura.IsActive() && dk.UnbreakableArmor.TimeToReady(sim) > 8*time.Second {
+					if dk.Rotation.UseDeathAndDecay && dk.Env.GetNumTargets() >= 3 && dndAt < 3*time.Second && !dk.UnbreakableArmorAura.IsActive() && dk.UnbreakableArmor.TimeToReady(sim) > 8*time.Second {
 						if b > 0 {
 							casted = dk.DeathAndDecay.Cast(sim, target)
 							dk.fr.oblitCount += 1