wowsims · NerdEgghead · Jan 27, 2025 · Jan 27, 2025
diff --git a/sim/common/cata/other_effects.go b/sim/common/cata/other_effects.go
@@ -877,8 +877,7 @@ func init() {
 		})
 	}
 
-	for _, v := range []ItemVersion{ItemVersionLFR, ItemVersionNormal, ItemVersionHeroic} {
-		version := v // Gotta scope this for the closure
+	for _, version := range []ItemVersion{ItemVersionLFR, ItemVersionNormal, ItemVersionHeroic} {
 		labelSuffix := []string{" (LFR)", "", " (Heroic)"}[version]
 
 		vialItemID := []int32{77979, 77207, 77999}[version]
@@ -888,20 +887,16 @@ func init() {
 			actionID := core.ActionID{SpellID: []int32{109721, 107994, 109724}[version]}
 			minDmg := []float64{3568, 4028, 4546}[version]
 			maxDmg := []float64{5353, 6042, 6819}[version]
-			/* TODO:
 
-			There's conflicting information regarding if the trinket should have an AP modifier or not.
-			In the dbc files it's listed as not having one, but other resources like simc and wowpedia say it does.
-			We're assuming it doesn't have one for now and will need to confirm later on during PTR testing.
-			We should also track the issue filed on the cata-classic-bugs repo if anyone from Blizzard replies.
+			// 01/26/25: Testing during the first Dragon Soul PTR is consistent with these scaling
+			// coefficients from simC, refer to Discord discussion from here onwards:
+			// https://discord.com/channels/891730968493305867/1034670402150092841/1332728469427322982
+			apMod := []float64{0.266, 0.3, 0.339}[version]
 
-			dbc: https://wago.tools/db2/SpellEffect?build=4.4.1.56574&filter%5BSpellID%5D=109724&page=1
-			wowpedia: https://wowpedia.fandom.com/wiki/Vial_of_Shadows
-			issue: https://github.com/ClassicWoWCommunity/cata-classic-bugs/issues/1516
-			bluetracker, January 9: https://www.bluetracker.gg/wow/topic/us-en/4023884-patch-43-hotfixes/
-
-			*/
-			//apMod := []float64{0.266, 0.3, 0.339}[version]
+			// The AP scaling calculation can use either Melee or
+			// Ranged AP depending on how the proc was triggered, so
+			// keep track of it separately.
+			var apSnapshot float64
 
 			lightningStrike := character.RegisterSpell(core.SpellConfig{
 				ActionID:    actionID,
@@ -910,12 +905,11 @@ func init() {
 				Flags:       core.SpellFlagPassiveSpell,
 
 				DamageMultiplier: 1,
-				CritMultiplier:   character.DefaultMeleeCritMultiplier(),
+				CritMultiplier:   character.DefaultMeleeCritMultiplier(), // even ranged procs use the melee Crit multiplier as of first PTR (1.5x for Hunters)
 				ThreatMultiplier: 1,
 
 				ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-					baseDamage := sim.Roll(minDmg, maxDmg)
-					//+apMod*spell.MeleeAttackPower()
+					baseDamage := sim.Roll(minDmg, maxDmg) + apMod*apSnapshot
 					spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialCritOnly)
 				},
 			})
@@ -930,6 +924,12 @@ func init() {
 				ProcChance: 0.45,
 				ICD:        time.Second * 9,
 				Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					if spell.ProcMask.Matches(core.ProcMaskMelee | core.ProcMaskMeleeProc) {
+						apSnapshot = spell.MeleeAttackPower()
+					} else {
+						apSnapshot = spell.RangedAttackPower(result.Target)
+					}
+
 					lightningStrike.Cast(sim, result.Target)
 				},
 			})

diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results
@@ -2038,24 +2038,24 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-VialofShadows-77207"
  value: {
-  dps: 22511.25277
-  tps: 113457.28617
+  dps: 22977.23712
+  tps: 115995.4492
   hps: 5300.29889
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-VialofShadows-77979"
  value: {
-  dps: 22457.44814
-  tps: 113101.43254
+  dps: 22859.7073
+  tps: 115272.72303
   hps: 5300.29889
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-VialofShadows-77999"
  value: {
-  dps: 22572.89795
-  tps: 113802.40503
+  dps: 23088.00119
+  tps: 116597.59656
   hps: 5300.29889
  }
 }

diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results
@@ -2102,24 +2102,24 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-VialofShadows-77207"
  value: {
-  dps: 39123.82984
-  tps: 36950.59212
+  dps: 39762.4396
+  tps: 37589.20188
   hps: 523.43753
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-VialofShadows-77979"
  value: {
-  dps: 39061.69576
-  tps: 36893.4726
+  dps: 39627.19631
+  tps: 37458.97315
   hps: 523.43753
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-VialofShadows-77999"
  value: {
-  dps: 39249.03958
-  tps: 37066.42465
+  dps: 39950.23787
+  tps: 37767.62294
   hps: 523.43753
  }
 }

diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results
@@ -2038,24 +2038,24 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-VialofShadows-77207"
  value: {
-  dps: 40404.61572
-  tps: 30081.7196
+  dps: 41128.77754
+  tps: 30805.88142
   hps: 646.50919
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-VialofShadows-77979"
  value: {
-  dps: 40204.66684
-  tps: 29919.87992
+  dps: 40857.08762
+  tps: 30572.3007
   hps: 646.50919
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-VialofShadows-77999"
  value: {
-  dps: 40470.38532
-  tps: 30125.39149
+  dps: 41256.41299
+  tps: 30911.41916
   hps: 646.50919
  }
 }

diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
@@ -1854,22 +1854,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-AllItems-VialofShadows-77207"
  value: {
-  dps: 33773.18634
-  tps: 51682.60914
+  dps: 34707.26511
+  tps: 53208.79528
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-VialofShadows-77979"
  value: {
-  dps: 33291.8186
-  tps: 50558.93838
+  dps: 34115.61711
+  tps: 51908.19622
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-VialofShadows-77999"
  value: {
-  dps: 33801.8041
-  tps: 49740.96919
+  dps: 34845.08564
+  tps: 51299.84382
  }
 }
 dps_results: {

diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results
@@ -2118,24 +2118,24 @@ dps_results: {
 dps_results: {
  key: "TestGuardian-AllItems-VialofShadows-77207"
  value: {
-  dps: 10664.29328
-  tps: 53390.5564
+  dps: 11275.66134
+  tps: 56447.39669
   hps: 319.10667
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-VialofShadows-77979"
  value: {
-  dps: 10578.24573
-  tps: 52960.56385
+  dps: 11098.63629
+  tps: 55562.51664
   hps: 319.10667
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-VialofShadows-77999"
  value: {
-  dps: 10808.42224
-  tps: 54111.19764
+  dps: 11478.94928
+  tps: 57463.83285
   hps: 319.10667
  }
 }

diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results
@@ -1934,22 +1934,22 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-VialofShadows-77207"
  value: {
-  dps: 25882.49711
-  tps: 16440.60206
+  dps: 26803.791
+  tps: 17361.89595
  }
 }
 dps_results: {
  key: "TestBM-AllItems-VialofShadows-77979"
  value: {
-  dps: 25698.62854
-  tps: 16310.52449
+  dps: 26506.16221
+  tps: 17118.05817
  }
 }
 dps_results: {
  key: "TestBM-AllItems-VialofShadows-77999"
  value: {
-  dps: 26223.21869
-  tps: 16622.31078
+  dps: 27249.52538
+  tps: 17648.61747
  }
 }
 dps_results: {

diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results
@@ -1934,22 +1934,22 @@ dps_results: {
 dps_results: {
  key: "TestMM-AllItems-VialofShadows-77207"
  value: {
-  dps: 24459.42891
-  tps: 22047.21119
+  dps: 25081.69566
+  tps: 22669.47794
  }
 }
 dps_results: {
  key: "TestMM-AllItems-VialofShadows-77979"
  value: {
-  dps: 24273.31468
-  tps: 21872.39296
+  dps: 24798.44888
+  tps: 22397.52716
  }
 }
 dps_results: {
  key: "TestMM-AllItems-VialofShadows-77999"
  value: {
-  dps: 24693.51133
-  tps: 22246.3968
+  dps: 25390.22997
+  tps: 22943.11544
  }
 }
 dps_results: {

diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results
@@ -1934,22 +1934,22 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-VialofShadows-77207"
  value: {
-  dps: 30564.4296
-  tps: 27663.71075
+  dps: 31357.13181
+  tps: 28456.41296
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VialofShadows-77979"
  value: {
-  dps: 30331.61925
-  tps: 27458.66763
+  dps: 31035.51914
+  tps: 28162.56752
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VialofShadows-77999"
  value: {
-  dps: 30860.46032
-  tps: 27938.22588
+  dps: 31759.66907
+  tps: 28837.43463
  }
 }
 dps_results: {

diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
@@ -1823,22 +1823,22 @@ dps_results: {
 dps_results: {
  key: "TestProtection-AllItems-VialofShadows-77207"
  value: {
-  dps: 11332.70027
-  tps: 56966.32293
+  dps: 11636.58289
+  tps: 58485.73605
  }
 }
 dps_results: {
  key: "TestProtection-AllItems-VialofShadows-77979"
  value: {
-  dps: 11312.59001
-  tps: 56865.77166
+  dps: 11573.5821
+  tps: 58170.73212
  }
 }
 dps_results: {
  key: "TestProtection-AllItems-VialofShadows-77999"
  value: {
-  dps: 11392.76785
-  tps: 57266.66088
+  dps: 11721.69378
+  tps: 58911.29052
  }
 }
 dps_results: {

diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
@@ -1826,22 +1826,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-AllItems-VialofShadows-77207"
  value: {
-  dps: 37690.32454
-  tps: 37690.13796
+  dps: 38398.44335
+  tps: 38398.25676
  }
 }
 dps_results: {
  key: "TestRetribution-AllItems-VialofShadows-77979"
  value: {
-  dps: 37735.019
-  tps: 37731.90526
+  dps: 38347.22595
+  tps: 38344.1122
  }
 }
 dps_results: {
  key: "TestRetribution-AllItems-VialofShadows-77999"
  value: {
-  dps: 37762.02965
-  tps: 37760.24764
+  dps: 38554.47306
+  tps: 38552.69105
  }
 }
 dps_results: {

diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results
@@ -1856,22 +1856,22 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-VialofShadows-77207"
  value: {
-  dps: 29861.85026
-  tps: 21201.91368
+  dps: 30594.34099
+  tps: 21721.98211
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-VialofShadows-77979"
  value: {
-  dps: 29492.84624
-  tps: 20939.92083
+  dps: 30146.27363
+  tps: 21403.85428
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-VialofShadows-77999"
  value: {
-  dps: 30073.60105
-  tps: 21352.25674
+  dps: 30893.60572
+  tps: 21934.46006
  }
 }
 dps_results: {