Merge pull request #1233 from hillerstorm/fix_speedstone

Fix Speedstone double-dip after haste item parsing was added
wowsims · Jan 20, 2025 · 542b768 · 542b768
2 parents b9fbdf8 + f564959
commit 542b768
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 50 deletions.
diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go
@@ -139,7 +139,6 @@ const (
 	JomGabbar                       = 233627 // 23570
 	TheBurrowersShield              = 233628 // 23558
 	NeretzekBloodDrinker            = 233647
-	Speedstone                      = 233990
 	ManslayerOfTheQiraji            = 234067
 	EyeOfMoam                       = 234080 // 21473
 	FetishOfChitinousSpikes         = 234092 // 21488
@@ -2850,14 +2849,6 @@ func init() {
 	// Equip: +81 Attack Power when fighting Undead.
 	core.NewMobTypeAttackPowerEffect(SealOfTheDawn, []proto.MobType{proto.MobType_MobTypeUndead}, 81)
 
-	// https://www.wowhead.com/classic/item=233990/speedstone
-	// Increases your attack speed by 2%.
-	core.NewItemEffect(Speedstone, func(agent core.Agent) {
-		character := agent.GetCharacter()
-		character.PseudoStats.MeleeSpeedMultiplier *= 1.02
-		character.PseudoStats.RangedSpeedMultiplier *= 1.02
-	})
-
 	// https://www.wowhead.com/classic/item=228255/talisman-of-ephemeral-power
 	// Use: Increases damage and healing done by magical spells and effects by up to 184 for 15 sec. (1 Min, 30 Sec Cooldown)
 	core.NewSimpleStatOffensiveTrinketEffect(TalismanOfEphemeralPower, stats.Stats{stats.SpellPower: 184}, time.Second*15, time.Second*90)

diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results
@@ -344,8 +344,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.64638
-  weights: 4.1997
+  weights: 4.50542
+  weights: 2.10941
   weights: 0
   weights: 0
   weights: 0
@@ -361,9 +361,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.39873
-  weights: 15.75984
-  weights: 41.73877
+  weights: 1.39801
+  weights: 14.97995
+  weights: 37.16359
   weights: 0
   weights: 0
   weights: 0
@@ -862,50 +862,50 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 3579.88699
-  tps: 3009.13205
+  dps: 3552.7797
+  tps: 2985.69898
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 2206.71277
-  tps: 1875.69906
+  dps: 2177.15656
+  tps: 1849.44781
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 2840.17925
-  tps: 2393.80241
+  dps: 2782.27111
+  tps: 2346.49931
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 2804.54272
-  tps: 2365.88927
+  dps: 2754.10543
+  tps: 2323.05276
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 2840.17925
-  tps: 2393.80241
+  dps: 2782.27111
+  tps: 2346.49931
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 3803.83077
-  tps: 3192.25589
+  dps: 3741.98611
+  tps: 3140.09061
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5838.90795
-  tps: 4756.83032
+  dps: 5770.55072
+  tps: 4700.25222
  }
 }
 dps_results: {
@@ -995,7 +995,7 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 4988.97068
-  tps: 4057.98562
+  dps: 4912.00696
+  tps: 3990.11534
  }
 }
diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.10158
-  weights: 2.29713
+  weights: 2.50694
+  weights: 2.63588
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.03635
+  weights: 1.21737
   weights: 0
-  weights: 40.5272
+  weights: 40.74009
   weights: 0
   weights: 0
   weights: 0
@@ -624,50 +624,50 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 3355.18495
-  tps: 2649.61636
+  dps: 3329.74744
+  tps: 2628.5065
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 1638.29161
-  tps: 1361.33659
+  dps: 1609.68108
+  tps: 1336.96516
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 2031.68969
-  tps: 1680.68025
+  dps: 2020.14121
+  tps: 1670.38272
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 2013.23096
-  tps: 1665.54574
+  dps: 1999.15987
+  tps: 1653.82917
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 2031.68969
-  tps: 1680.68025
+  dps: 2020.14121
+  tps: 1670.38272
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 3598.79083
-  tps: 2844.87807
+  dps: 3562.89893
+  tps: 2814.21198
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5919.34977
-  tps: 4677.22388
+  dps: 5876.962
+  tps: 4641.95555
  }
 }
 dps_results: {
@@ -757,7 +757,7 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5293.11955
-  tps: 4169.03072
+  dps: 5229.29769
+  tps: 4116.74232
  }
 }