Merge from master

wowsims · Oct 17, 2023 · ca0a513 · ca0a513
2 parents 7e5ceab + 6868808
commit ca0a513
Show file tree

Hide file tree

Showing 13 changed files with 724 additions and 707 deletions.
diff --git a/sim/deathknight/blood_tap.go b/sim/deathknight/blood_tap.go
@@ -30,7 +30,7 @@ func (dk *Deathknight) registerBloodTapSpell() {
 
 	dk.BloodTap = dk.RegisterSpell(core.SpellConfig{
 		ActionID: actionID,
-		Flags:    core.SpellFlagNoOnCastComplete | core.SpellFlagAPL,
+		Flags:    core.SpellFlagAPL,
 
 		Cast: core.CastConfig{
 			CD: core.Cooldown{

diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
@@ -144,7 +144,7 @@ func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet {
 		}, func(ownerStats stats.Stats) stats.Stats {
 			return stats.Stats{
 				stats.AttackPower: ownerStats[stats.AttackPower],
-				stats.MeleeHaste:  ownerStats[stats.MeleeHaste] * PetHasteScale,
+				stats.MeleeHaste:  ownerStats[stats.MeleeHaste],
 
 				stats.MeleeHit: ownerStats[stats.MeleeHit],
 				stats.SpellHit: ownerStats[stats.MeleeHit] * PetSpellHitScale,

diff --git a/sim/deathknight/deathknight.go b/sim/deathknight/deathknight.go
@@ -19,9 +19,9 @@ const (
 )
 
 const (
-	PetSpellHitScale  = 17.0 / 8.0 * core.SpellHitRatingPerHitChance / core.MeleeHitRatingPerHitChance    // 1.7
-	PetExpertiseScale = 3.25 * core.ExpertisePerQuarterPercentReduction / core.MeleeHitRatingPerHitChance // 0.8125
-	PetHasteScale     = core.HasteRatingPerHastePercent / (core.HasteRatingPerHastePercent / 1.3)         // 1.3
+	PetSpellHitScale   = 17.0 / 8.0 * core.SpellHitRatingPerHitChance / core.MeleeHitRatingPerHitChance    // 1.7
+	PetExpertiseScale  = 3.25 * core.ExpertisePerQuarterPercentReduction / core.MeleeHitRatingPerHitChance // 0.8125
+	PetSpellHasteScale = 1.3
 )
 
 var TalentTreeSizes = [3]int{28, 29, 31}