Merge branch 'master' of https://github.com/wowsims/sod

wowsims · Jan 14, 2025 · 69abee4 · 69abee4
2 parents ac1115b + 47f9ec5
commit 69abee4
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 175 deletions.
diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go
@@ -96,6 +96,10 @@ func init() {
 
 			w.BaseDamageMin += 2
 			w.BaseDamageMax += 2
+
+			w = character.AutoAttacks.Ranged()
+			w.BaseDamageMin += 2
+			w.BaseDamageMax += 2
 		}
 	})
 
@@ -189,6 +193,10 @@ func init() {
 
 			w.BaseDamageMin += 6
 			w.BaseDamageMax += 6
+
+			w = character.AutoAttacks.Ranged()
+			w.BaseDamageMin += 6
+			w.BaseDamageMax += 6
 		}
 	})
 
@@ -204,6 +212,10 @@ func init() {
 
 			w.BaseDamageMin += 6
 			w.BaseDamageMax += 6
+
+			w = character.AutoAttacks.Ranged()
+			w.BaseDamageMin += 6
+			w.BaseDamageMax += 6
 		}
 	})
 

diff --git a/sim/core/consumes.go b/sim/core/consumes.go
@@ -193,6 +193,7 @@ func addImbueStats(character *Character, imbue proto.WeaponImbue, isMh bool, sha
 			character.AddStats(stats.Stats{
 				stats.MeleeCrit: 2 * CritRatingPerCritChance,
 			})
+			character.AddBonusRangedCritRating(-2.0)
 		case proto.WeaponImbue_BlackfathomSharpeningStone:
 			character.AddStats(stats.Stats{
 				stats.MeleeHit: 2 * MeleeHitRatingPerHitChance,

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -410,6 +410,14 @@ func (unit *Unit) AddBonusRangedHitRating(amount float64) {
 	})
 }
 
+func (unit *Unit) AddBonusRangedCritRating(amount float64) {
+	unit.OnSpellRegistered(func(spell *Spell) {
+		if spell.ProcMask.Matches(ProcMaskRanged) {
+			spell.BonusCritRating += amount
+		}
+	})
+}
+
 func (unit *Unit) SetCurrentPowerBar(bar PowerBarType) {
 	unit.currentPowerBar = bar
 }

diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
@@ -421,96 +421,96 @@ dps_results: {
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4680.01463
-  tps: 5334.38396
+  dps: 4646.24644
+  tps: 5300.61577
   hps: 17.71737
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2698.53775
-  tps: 2731.21431
+  dps: 2665.60409
+  tps: 2698.28066
   hps: 17.92142
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2667.58565
-  tps: 2698.90083
+  dps: 2653.89565
+  tps: 2685.21084
   hps: 16.2045
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2431.2512
-  tps: 3052.97629
+  dps: 2408.17569
+  tps: 3029.90079
   hps: 9.23821
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1257.5962
-  tps: 1288.68245
+  dps: 1238.58545
+  tps: 1269.6717
   hps: 9.30873
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1319.82215
-  tps: 1343.55002
+  dps: 1302.61803
+  tps: 1326.34591
   hps: 8.92667
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5051.80858
-  tps: 5688.85924
+  dps: 5004.96134
+  tps: 5642.012
   hps: 17.7196
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2868.17158
-  tps: 2900.09936
+  dps: 2824.23633
+  tps: 2856.16411
   hps: 17.66612
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2938.84718
-  tps: 2970.17843
+  dps: 2893.32708
+  tps: 2924.65833
   hps: 15.94173
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2432.3139
-  tps: 3027.07006
+  dps: 2409.73439
+  tps: 3004.49054
   hps: 9.34711
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1241.14115
-  tps: 1270.87896
+  dps: 1221.34751
+  tps: 1251.08532
   hps: 9.36407
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1337.00706
-  tps: 1360.73493
+  dps: 1314.25856
+  tps: 1337.98643
   hps: 8.74813
  }
 }