Merge branch 'master' into vigo/resource-tasks

# Conflicts: # sim/deathknight/dps/TestBlood.results # sim/deathknight/ghoul_pet.go # sim/druid/balance/TestBalance.results # sim/druid/feral/TestFeral.results # sim/rogue/TestCombat.results
wowsims · Oct 17, 2023 · 0e8623e · 0e8623e
2 parents 79fa3d2 + c30e977
commit 0e8623e
Show file tree

Hide file tree

Showing 249 changed files with 8,635 additions and 10,097 deletions.
diff --git a/sim/core/test_utils.go b/sim/core/test_utils.go
@@ -245,3 +245,13 @@ func GetAplRotation(dir string, file string) RotationCombo {
 
 	return RotationCombo{Label: file, Rotation: APLRotationFromJsonString(string(data))}
 }
+
+func GetGearSet(dir string, file string) GearSetCombo {
+	filePath := dir + "/" + file + ".gear.json"
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		log.Fatalf("failed to load gear json file: %s, %s", filePath, err)
+	}
+
+	return GearSetCombo{Label: file, GearSet: EquipmentSpecFromJsonString(string(data))}
+}
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}