Merge branch 'master' into feature/generic-auto-gemming

wowsims · Oct 28, 2023 · 169f583 · 169f583
2 parents 9378f3e + f698c5b
commit 169f583
Show file tree

Hide file tree

Showing 15 changed files with 379 additions and 318 deletions.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -215,7 +215,7 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 		apl.unit.DoNothing()
 	}
 
-	apl.unit.DoneAPLLoop(sim, gcdReady)
+	apl.unit.DoneAPLLoop(sim, !gcdReady)
 }
 
 func (apl *APLRotation) getNextAction(sim *Simulation) *APLAction {

diff --git a/sim/core/gcd.go b/sim/core/gcd.go
@@ -110,7 +110,9 @@ func (unit *Unit) WaitUntil(sim *Simulation, readyTime time.Duration) {
 	if readyTime < sim.CurrentTime {
 		panic(unit.Label + ": cannot wait negative time")
 	}
-	unit.waitStartTime = sim.CurrentTime
+	if !unit.IsWaiting() {
+		unit.waitStartTime = sim.CurrentTime
+	}
 	unit.SetGCDTimer(sim, readyTime)
 	if sim.Log != nil && readyTime > sim.CurrentTime {
 		unit.Log(sim, "Pausing GCD for %s due to rotation / CDs.", readyTime-sim.CurrentTime)

diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
@@ -170,6 +170,7 @@ func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet {
 	runeWeapon.AutoAttacks.MH.SwingSpeed = 3.5
 	runeWeapon.AutoAttacks.MH.NormalizedSwingSpeed = 3.3
 	runeWeapon.PseudoStats.DamageTakenMultiplier = 0
+	runeWeapon.PseudoStats.MeleeHasteRatingPerHastePercent = dk.PseudoStats.MeleeHasteRatingPerHastePercent
 
 	if dk.Inputs.NewDrw {
 		baseDamage := (mhWeapon.BaseDamageMin + mhWeapon.BaseDamageMax) / 2