From 5f0148d5f750464b0a3864d1351b88532f5e2cc1 Mon Sep 17 00:00:00 2001 From: Josh DM Date: Tue, 10 Oct 2023 22:25:51 -0400 Subject: [PATCH 1/3] fix nevermelting ice crystal proc --- sim/common/wotlk/other_effects.go | 2 +- sim/paladin/protection/TestProtection.results | 4 ++-- sim/paladin/retribution/TestRetribution.results | 4 ++-- sim/priest/shadow/TestShadow.results | 4 ++-- sim/rogue/TestAssassination.results | 2 +- sim/rogue/TestCombat.results | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sim/common/wotlk/other_effects.go b/sim/common/wotlk/other_effects.go index 7f98c4fa04..be7b1084bd 100644 --- a/sim/common/wotlk/other_effects.go +++ b/sim/common/wotlk/other_effects.go @@ -360,7 +360,7 @@ func init() { core.ApplyProcTriggerCallback(&character.Unit, activeAura, core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellDamage, + ProcMask: core.ProcMaskSpellOrProc, Outcome: core.OutcomeCrit, Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) { activeAura.RemoveStack(sim) diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 98844641de..c55d85ac87 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -547,8 +547,8 @@ dps_results: { dps_results: { key: "TestProtection-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 3230.88163 - tps: 7752.35562 + dps: 3201.46897 + tps: 7684.70377 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 840dad9412..098d231510 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -634,8 +634,8 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6555.96091 - tps: 6641.44533 + dps: 6478.3902 + tps: 6563.87462 dtps: 10.29273 } } diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index c63f3aab30..8f9a9ae0a6 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -476,8 +476,8 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7384.06723 - tps: 7120.60249 + dps: 7232.80061 + tps: 6969.44196 } } dps_results: { diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index a4b5c5bf91..69b0985cbc 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5504.84 - final_stats: 469.94994 + final_stats: 469.94995 final_stats: 2072.9756 final_stats: 221 final_stats: 94 diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 79cd548b53..16ed4982db 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -13,7 +13,7 @@ character_stats_results: { final_stats: 221 final_stats: 0 final_stats: 5725.0336 - final_stats: 469.94994 + final_stats: 469.94995 final_stats: 2164.78757 final_stats: 221 final_stats: 94 From 0419459e76dd47a9b58187a3181b5b5dea14a379 Mon Sep 17 00:00:00 2001 From: Josh DM Date: Tue, 10 Oct 2023 22:44:35 -0400 Subject: [PATCH 2/3] improved DP can only proc fetish, not much else --- sim/priest/devouring_plague.go | 2 +- sim/priest/shadow/TestShadow.results | 660 +++++++++++++-------------- 2 files changed, 331 insertions(+), 331 deletions(-) diff --git a/sim/priest/devouring_plague.go b/sim/priest/devouring_plague.go index 6dfb265745..86c597130d 100644 --- a/sim/priest/devouring_plague.go +++ b/sim/priest/devouring_plague.go @@ -19,7 +19,7 @@ func (priest *Priest) registerDevouringPlagueSpell() { impDevouringPlague = priest.RegisterSpell(core.SpellConfig{ ActionID: core.ActionID{SpellID: 63675}, SpellSchool: core.SpellSchoolShadow, - ProcMask: core.ProcMaskProc, // this can proc things like Talisman of Volatile Power + ProcMask: core.ProcMaskSuppressedProc, // this can proc things like Talisman of Volatile Power Flags: core.SpellFlagDisease, BonusHitRating: float64(priest.Talents.ShadowFocus) * 1 * core.SpellHitRatingPerHitChance, diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index 8f9a9ae0a6..62b1b2cf69 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -46,1158 +46,1158 @@ character_stats_results: { dps_results: { key: "TestShadow-AllItems-AbsolutionRegalia" value: { - dps: 5218.88966 - tps: 5004.30031 + dps: 5214.22231 + tps: 5000.84239 } } dps_results: { key: "TestShadow-AllItems-Althor'sAbacus-50359" value: { - dps: 7246.76443 - tps: 6979.28596 + dps: 7245.92497 + tps: 6979.81421 } } dps_results: { key: "TestShadow-AllItems-Althor'sAbacus-50366" value: { - dps: 7283.85386 - tps: 7014.85195 + dps: 7283.0144 + tps: 7015.3802 } } dps_results: { key: "TestShadow-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-Bandit'sInsignia-40371" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6946.44223 - tps: 6691.07748 + dps: 6945.60277 + tps: 6691.60572 hps: 88.41863 } } dps_results: { key: "TestShadow-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6946.44223 - tps: 6691.07748 + dps: 6945.60277 + tps: 6691.60572 hps: 88.41863 } } dps_results: { key: "TestShadow-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7131.6282 - tps: 6865.67313 + dps: 7130.78728 + tps: 6866.215 } } dps_results: { key: "TestShadow-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5978.35208 - tps: 5745.14969 + dps: 5975.98218 + tps: 5743.92402 } } dps_results: { key: "TestShadow-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7145.46476 - tps: 6741.088 + dps: 7144.42559 + tps: 6741.41477 } } dps_results: { key: "TestShadow-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-CorpseTongueCoin-50349" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-CorpseTongueCoin-50352" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 hps: 64 } } dps_results: { key: "TestShadow-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 6848.64114 - tps: 6575.70758 + dps: 6847.16319 + tps: 6575.10611 } } dps_results: { key: "TestShadow-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 7967.9465 - tps: 7718.16905 + dps: 7969.16809 + tps: 7720.50568 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7065.81677 - tps: 6810.68239 + dps: 7064.82533 + tps: 6811.05168 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7126.03883 - tps: 6871.58845 + dps: 7127.29803 + tps: 6874.09626 } } dps_results: { key: "TestShadow-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7030.60584 - tps: 6784.05938 + dps: 7039.46466 + tps: 6795.19462 } } dps_results: { key: "TestShadow-AllItems-Death'sChoice-47464" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6980.70188 - tps: 6725.66245 + dps: 6979.65467 + tps: 6725.96617 } } dps_results: { key: "TestShadow-AllItems-Deathbringer'sWill-50362" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-Deathbringer'sWill-50363" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-Defender'sCode-40257" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7136.16317 - tps: 6870.41757 + dps: 7135.28479 + tps: 6870.90689 } } dps_results: { key: "TestShadow-AllItems-DislodgedForeignObject-50348" value: { - dps: 7691.37761 - tps: 7424.42888 + dps: 7678.60076 + tps: 7412.72278 } } dps_results: { key: "TestShadow-AllItems-DislodgedForeignObject-50353" value: { - dps: 7603.64128 - tps: 7338.97398 + dps: 7597.40309 + tps: 7334.29637 } } dps_results: { key: "TestShadow-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-EmberSkyflareDiamond" value: { - dps: 7150.66509 - tps: 6882.80968 + dps: 7149.67105 + tps: 6883.20009 } } dps_results: { key: "TestShadow-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7131.6282 - tps: 6865.8826 + dps: 7130.78728 + tps: 6866.40939 } } dps_results: { key: "TestShadow-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7127.18411 - tps: 6861.40891 + dps: 7126.3432 + tps: 6861.9357 } } dps_results: { key: "TestShadow-AllItems-EphemeralSnowflake-50260" value: { - dps: 7101.4836 - tps: 6849.85083 + dps: 7108.05773 + tps: 6856.48386 } } dps_results: { key: "TestShadow-AllItems-EssenceofGossamer-37220" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7130.48441 - tps: 6876.91093 + dps: 7129.65878 + tps: 6877.41457 } } dps_results: { key: "TestShadow-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7279.04403 - tps: 7015.34604 + dps: 7278.00721 + tps: 7015.65618 } } dps_results: { key: "TestShadow-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6961.91506 - tps: 6706.2071 + dps: 6960.86784 + tps: 6706.54007 } } dps_results: { key: "TestShadow-AllItems-ForethoughtTalisman-40258" value: { - dps: 7132.12439 - tps: 6869.35472 + dps: 7131.28493 + tps: 6869.88296 } } dps_results: { key: "TestShadow-AllItems-ForgeEmber-37660" value: { - dps: 7039.31937 - tps: 6784.16329 + dps: 7038.27039 + tps: 6784.45723 } } dps_results: { key: "TestShadow-AllItems-ForlornSkyflareDiamond" value: { - dps: 7145.46476 - tps: 6877.91538 + dps: 7144.42559 + tps: 6878.24392 } } dps_results: { key: "TestShadow-AllItems-ForlornStarflareDiamond" value: { - dps: 7137.22551 - tps: 6870.02237 + dps: 7136.18634 + tps: 6870.35091 } } dps_results: { key: "TestShadow-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-FuturesightRune-38763" value: { - dps: 7066.55622 - tps: 6803.45785 + dps: 7066.00644 + tps: 6804.34938 } } dps_results: { key: "TestShadow-AllItems-GarbofFaith" value: { - dps: 6353.19424 - tps: 6103.36912 + dps: 6353.4121 + tps: 6104.59674 } } dps_results: { key: "TestShadow-AllItems-Gladiator'sInvestiture" value: { - dps: 6795.91724 - tps: 6501.24723 + dps: 6789.4264 + tps: 6495.78071 } } dps_results: { key: "TestShadow-AllItems-Gladiator'sRaiment" value: { - dps: 6930.99967 - tps: 6660.30721 + dps: 6928.09177 + tps: 6658.56317 } } dps_results: { key: "TestShadow-AllItems-GlowingTwilightScale-54573" value: { - dps: 7265.30914 - tps: 6997.06896 + dps: 7264.46968 + tps: 6997.5972 } } dps_results: { key: "TestShadow-AllItems-GlowingTwilightScale-54589" value: { - dps: 7307.45622 - tps: 7037.48486 + dps: 7306.61676 + tps: 7038.0131 } } dps_results: { key: "TestShadow-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7091.05208 - tps: 6837.05685 + dps: 7090.9152 + tps: 6838.1521 } } dps_results: { key: "TestShadow-AllItems-Heartpierce-49982" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-Heartpierce-50641" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7131.6282 - tps: 6865.8826 + dps: 7130.78728 + tps: 6866.40939 } } dps_results: { key: "TestShadow-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7127.18411 - tps: 6861.40891 + dps: 7126.3432 + tps: 6861.9357 } } dps_results: { key: "TestShadow-AllItems-IncisorFragment-37723" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7111.77255 - tps: 6849.34749 + dps: 7112.75012 + tps: 6852.40509 } } dps_results: { key: "TestShadow-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-LastWord-50179" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-LastWord-50708" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7014.13537 - tps: 6752.5071 + dps: 7014.89793 + tps: 6754.5963 } } dps_results: { key: "TestShadow-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7041.19364 - tps: 6786.03756 + dps: 7040.09928 + tps: 6786.28612 } } dps_results: { key: "TestShadow-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7232.80061 - tps: 6969.44196 + dps: 7248.60632 + tps: 6986.5685 } } dps_results: { key: "TestShadow-AllItems-Nibelung-49992" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-Nibelung-50648" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-AllItems-OfferingofSacrifice-37638" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-PetrifiedScarab-21685" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-PurifiedShardoftheGods" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-RegaliaofFaith" value: { - dps: 6155.69092 - tps: 5901.89587 + dps: 6151.18793 + tps: 5898.40433 } } dps_results: { key: "TestShadow-AllItems-ReignoftheDead-47316" value: { - dps: 7362.24941 - tps: 7098.65064 + dps: 7362.00333 + tps: 7099.693 } } dps_results: { key: "TestShadow-AllItems-ReignoftheDead-47477" value: { - dps: 7412.92382 - tps: 7148.08793 + dps: 7412.67773 + tps: 7149.1303 } } dps_results: { key: "TestShadow-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7239.65394 - tps: 6973.83574 + dps: 7238.59839 + tps: 6974.14789 } } dps_results: { key: "TestShadow-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7104.26851 - tps: 6837.87007 + dps: 7103.22935 + tps: 6838.21591 } } dps_results: { key: "TestShadow-AllItems-RuneofRepulsion-40372" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-SanctificationGarb" value: { - dps: 6922.19184 - tps: 6664.11758 + dps: 6913.81851 + tps: 6656.78783 } } dps_results: { key: "TestShadow-AllItems-SanctificationRegalia" value: { - dps: 6598.81976 - tps: 6337.02944 + dps: 6594.95489 + tps: 6334.20157 } } dps_results: { key: "TestShadow-AllItems-SealofthePantheon-36993" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-ShinyShardoftheGods" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-SliverofPureIce-50339" value: { - dps: 7211.36089 - tps: 6948.10495 + dps: 7210.52143 + tps: 6948.6808 } } dps_results: { key: "TestShadow-AllItems-SliverofPureIce-50346" value: { - dps: 7245.07855 - tps: 6980.87945 + dps: 7244.23909 + tps: 6981.42962 } } dps_results: { key: "TestShadow-AllItems-SoulPreserver-37111" value: { - dps: 7071.4326 - tps: 6811.15582 + dps: 7070.59314 + tps: 6811.68407 } } dps_results: { key: "TestShadow-AllItems-SouloftheDead-40382" value: { - dps: 7063.51314 - tps: 6808.3254 + dps: 7062.47632 + tps: 6808.63554 } } dps_results: { key: "TestShadow-AllItems-SparkofLife-37657" value: { - dps: 7082.99923 - tps: 6824.832 + dps: 7080.17673 + tps: 6823.21858 } } dps_results: { key: "TestShadow-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6954.36659 - tps: 6699.81495 + dps: 6954.62509 + tps: 6701.3567 } } dps_results: { key: "TestShadow-AllItems-SwiftSkyflareDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-SwiftStarflareDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-SwiftWindfireDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7009.25486 - tps: 6750.17068 + dps: 7008.41541 + tps: 6750.70919 } } dps_results: { key: "TestShadow-AllItems-TearsoftheVanquished-47215" value: { - dps: 6973.67183 - tps: 6717.38611 + dps: 6972.62461 + tps: 6717.71034 } } dps_results: { key: "TestShadow-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6944.99138 - tps: 6689.90813 + dps: 6944.15192 + tps: 6690.43637 } } dps_results: { key: "TestShadow-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7104.26851 - tps: 6838.45031 + dps: 7103.22935 + tps: 6838.77885 } } dps_results: { key: "TestShadow-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6954.36659 - tps: 6699.81495 + dps: 6954.62509 + tps: 6701.3567 } } dps_results: { key: "TestShadow-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6954.36659 - tps: 6699.81495 + dps: 6954.62509 + tps: 6701.3567 } } dps_results: { key: "TestShadow-AllItems-TirelessSkyflareDiamond" value: { - dps: 7145.46476 - tps: 6877.91538 + dps: 7144.42559 + tps: 6878.24392 } } dps_results: { key: "TestShadow-AllItems-TirelessStarflareDiamond" value: { - dps: 7137.22551 - tps: 6870.02237 + dps: 7136.18634 + tps: 6870.35091 } } dps_results: { key: "TestShadow-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7164.02707 - tps: 6906.65804 + dps: 7164.19966 + tps: 6907.73415 } } dps_results: { key: "TestShadow-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7137.22551 - tps: 6870.02237 + dps: 7136.18634 + tps: 6870.35091 } } dps_results: { key: "TestShadow-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7145.46476 - tps: 6877.91538 + dps: 7144.42559 + tps: 6878.24392 } } dps_results: { key: "TestShadow-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7565.29608 - tps: 7294.47092 + dps: 7563.18368 + tps: 7293.62973 } } dps_results: { key: "TestShadow-AllItems-VestmentsofAbsolution" value: { - dps: 5089.05279 - tps: 4873.13116 + dps: 5085.19221 + tps: 4870.37597 } } dps_results: { key: "TestShadow-AllItems-WingedTalisman-37844" value: { - dps: 7080.81478 - tps: 6813.01997 + dps: 7079.97532 + tps: 6813.54821 } } dps_results: { key: "TestShadow-AllItems-Zabra'sRaiment" value: { - dps: 6504.43066 - tps: 6245.16449 + dps: 6503.15317 + tps: 6245.36556 } } dps_results: { key: "TestShadow-AllItems-Zabra'sRegalia" value: { - dps: 6860.96701 - tps: 6598.813 + dps: 6855.75179 + tps: 6594.55807 } } dps_results: { key: "TestShadow-Average-Default" value: { - dps: 7339.65613 - tps: 7071.31065 + dps: 7337.4216 + tps: 7069.82229 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-LongMultiTarget" value: { - dps: 7276.94163 - tps: 7701.97014 + dps: 7277.15928 + tps: 7708.27991 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-LongSingleTarget" value: { - dps: 7276.94163 - tps: 7011.89306 + dps: 7277.15928 + tps: 7013.39392 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.42941 - tps: 7831.83563 + dps: 8646.76774 + tps: 7833.77716 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-LongMultiTarget" value: { - dps: 3800.38092 - tps: 4557.37 + dps: 3798.09214 + tps: 4555.31416 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-LongSingleTarget" value: { - dps: 3800.38092 - tps: 3711.54789 + dps: 3798.09214 + tps: 3709.49205 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Basic-default-NoBuffs-ShortSingleTarget" value: { - dps: 3981.46899 - tps: 3665.49007 + dps: 3970.78593 + tps: 3655.21147 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-LongMultiTarget" value: { - dps: 7276.94163 - tps: 7701.97014 + dps: 7277.15928 + tps: 7708.27991 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-LongSingleTarget" value: { - dps: 7276.94163 - tps: 7011.89306 + dps: 7277.15928 + tps: 7013.39392 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.42941 - tps: 7831.83563 + dps: 8646.76774 + tps: 7833.77716 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-LongMultiTarget" value: { - dps: 3800.38092 - tps: 4557.37 + dps: 3798.09214 + tps: 4555.31416 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-LongSingleTarget" value: { - dps: 3800.38092 - tps: 3711.54789 + dps: 3798.09214 + tps: 3709.49205 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Clipping-default-NoBuffs-ShortSingleTarget" value: { - dps: 3981.46899 - tps: 3665.49007 + dps: 3970.78593 + tps: 3655.21147 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-LongMultiTarget" value: { - dps: 7276.94163 - tps: 7701.97014 + dps: 7277.15928 + tps: 7708.27991 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-LongSingleTarget" value: { - dps: 7276.94163 - tps: 7011.89306 + dps: 7277.15928 + tps: 7013.39392 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.42941 - tps: 7831.83563 + dps: 8646.76774 + tps: 7833.77716 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-LongMultiTarget" value: { - dps: 3800.38092 - tps: 4557.37 + dps: 3798.09214 + tps: 4555.31416 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-LongSingleTarget" value: { - dps: 3800.38092 - tps: 3711.54789 + dps: 3798.09214 + tps: 3709.49205 } } dps_results: { key: "TestShadow-Settings-Draenei-P1-Ideal-default-NoBuffs-ShortSingleTarget" value: { - dps: 3981.46899 - tps: 3665.49007 + dps: 3970.78593 + tps: 3655.21147 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-LongMultiTarget" value: { - dps: 7265.31853 - tps: 7697.20033 + dps: 7264.43823 + tps: 7702.23949 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-LongSingleTarget" value: { - dps: 7265.31853 - tps: 6999.81777 + dps: 7264.43823 + tps: 7000.30451 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-FullBuffs-ShortSingleTarget" value: { - dps: 8645.49211 - tps: 7827.10931 + dps: 8641.41316 + tps: 7828.69774 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-LongMultiTarget" value: { - dps: 3787.79957 - tps: 4544.76748 + dps: 3784.35832 + tps: 4541.55917 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-LongSingleTarget" value: { - dps: 3787.79957 - tps: 3698.61644 + dps: 3784.35832 + tps: 3695.40813 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Basic-default-NoBuffs-ShortSingleTarget" value: { - dps: 3975.77889 - tps: 3659.88269 + dps: 3965.09584 + tps: 3649.60409 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-LongMultiTarget" value: { - dps: 7265.31853 - tps: 7697.20033 + dps: 7264.43823 + tps: 7702.23949 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-LongSingleTarget" value: { - dps: 7265.31853 - tps: 6999.81777 + dps: 7264.43823 + tps: 7000.30451 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-FullBuffs-ShortSingleTarget" value: { - dps: 8645.49211 - tps: 7827.10931 + dps: 8641.41316 + tps: 7828.69774 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-LongMultiTarget" value: { - dps: 3787.79957 - tps: 4544.76748 + dps: 3784.35832 + tps: 4541.55917 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-LongSingleTarget" value: { - dps: 3787.79957 - tps: 3698.61644 + dps: 3784.35832 + tps: 3695.40813 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Clipping-default-NoBuffs-ShortSingleTarget" value: { - dps: 3975.77889 - tps: 3659.88269 + dps: 3965.09584 + tps: 3649.60409 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-LongMultiTarget" value: { - dps: 7265.31853 - tps: 7697.20033 + dps: 7264.43823 + tps: 7702.23949 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-LongSingleTarget" value: { - dps: 7265.31853 - tps: 6999.81777 + dps: 7264.43823 + tps: 7000.30451 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-FullBuffs-ShortSingleTarget" value: { - dps: 8645.49211 - tps: 7827.10931 + dps: 8641.41316 + tps: 7828.69774 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-LongMultiTarget" value: { - dps: 3787.79957 - tps: 4544.76748 + dps: 3784.35832 + tps: 4541.55917 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-LongSingleTarget" value: { - dps: 3787.79957 - tps: 3698.61644 + dps: 3784.35832 + tps: 3695.40813 } } dps_results: { key: "TestShadow-Settings-NightElf-P1-Ideal-default-NoBuffs-ShortSingleTarget" value: { - dps: 3975.77889 - tps: 3659.88269 + dps: 3965.09584 + tps: 3649.60409 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-LongMultiTarget" value: { - dps: 7269.43248 - tps: 7699.70087 + dps: 7268.59302 + tps: 7704.794 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-LongSingleTarget" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.52266 - tps: 7831.63135 + dps: 8646.44371 + tps: 7833.22013 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-LongMultiTarget" value: { - dps: 3796.49082 - tps: 4551.85263 + dps: 3793.63564 + tps: 4549.23039 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-LongSingleTarget" value: { - dps: 3796.49082 - tps: 3706.95356 + dps: 3793.63564 + tps: 3704.33132 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Basic-default-NoBuffs-ShortSingleTarget" value: { - dps: 3978.02595 - tps: 3661.94227 + dps: 3967.34289 + tps: 3651.66367 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-LongMultiTarget" value: { - dps: 7269.43248 - tps: 7699.70087 + dps: 7268.59302 + tps: 7704.794 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-LongSingleTarget" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.52266 - tps: 7831.63135 + dps: 8646.44371 + tps: 7833.22013 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-LongMultiTarget" value: { - dps: 3796.49082 - tps: 4551.85263 + dps: 3793.63564 + tps: 4549.23039 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-LongSingleTarget" value: { - dps: 3796.49082 - tps: 3706.95356 + dps: 3793.63564 + tps: 3704.33132 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Clipping-default-NoBuffs-ShortSingleTarget" value: { - dps: 3978.02595 - tps: 3661.94227 + dps: 3967.34289 + tps: 3651.66367 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-LongMultiTarget" value: { - dps: 7269.43248 - tps: 7699.70087 + dps: 7268.59302 + tps: 7704.794 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-LongSingleTarget" value: { - dps: 7269.43248 - tps: 7003.68687 + dps: 7268.59302 + tps: 7004.21512 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-FullBuffs-ShortSingleTarget" value: { - dps: 8650.52266 - tps: 7831.63135 + dps: 8646.44371 + tps: 7833.22013 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-LongMultiTarget" value: { - dps: 3796.49082 - tps: 4551.85263 + dps: 3793.63564 + tps: 4549.23039 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-LongSingleTarget" value: { - dps: 3796.49082 - tps: 3706.95356 + dps: 3793.63564 + tps: 3704.33132 } } dps_results: { key: "TestShadow-Settings-Undead-P1-Ideal-default-NoBuffs-ShortSingleTarget" value: { - dps: 3978.02595 - tps: 3661.94227 + dps: 3967.34289 + tps: 3651.66367 } } dps_results: { key: "TestShadow-SwitchInFrontOfTarget-Default" value: { - dps: 7226.17607 - tps: 7003.68687 + dps: 7225.39339 + tps: 7004.21512 } } From 0e9b422c7e90bf1b0f205f6feda3581f5031f370 Mon Sep 17 00:00:00 2001 From: Josh DM Date: Tue, 10 Oct 2023 23:05:22 -0400 Subject: [PATCH 3/3] seems like stacks should decrease on most procs (tentative) --- sim/common/wotlk/other_effects.go | 2 +- sim/priest/shadow/TestShadow.results | 4 ++-- sim/rogue/TestAssassination.results | 4 ++-- sim/rogue/TestCombat.results | 4 ++-- sim/rogue/TestSubtlety.results | 4 ++-- sim/shaman/enhancement/TestEnhancement.results | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sim/common/wotlk/other_effects.go b/sim/common/wotlk/other_effects.go index be7b1084bd..b2bbbaaaa4 100644 --- a/sim/common/wotlk/other_effects.go +++ b/sim/common/wotlk/other_effects.go @@ -360,7 +360,7 @@ func init() { core.ApplyProcTriggerCallback(&character.Unit, activeAura, core.ProcTrigger{ Callback: core.CallbackOnSpellHitDealt, - ProcMask: core.ProcMaskSpellOrProc, + ProcMask: core.ProcMaskSpellOrProc | core.ProcMaskWeaponProc | core.ProcMaskSuppressedProc, Outcome: core.OutcomeCrit, Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) { activeAura.RemoveStack(sim) diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index 62b1b2cf69..229a1540f4 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -476,8 +476,8 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7248.60632 - tps: 6986.5685 + dps: 7231.56154 + tps: 6969.54916 } } dps_results: { diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 69b0985cbc..ef70d97018 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -463,8 +463,8 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6727.7319 - tps: 4776.68965 + dps: 6583.88452 + tps: 4674.55801 } } dps_results: { diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 16ed4982db..d668b5ef6e 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -491,8 +491,8 @@ dps_results: { dps_results: { key: "TestCombat-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6130.09429 - tps: 4352.36695 + dps: 6014.37701 + tps: 4270.20768 } } dps_results: { diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results index 0d702271e1..4b74ba0e0c 100644 --- a/sim/rogue/TestSubtlety.results +++ b/sim/rogue/TestSubtlety.results @@ -463,8 +463,8 @@ dps_results: { dps_results: { key: "TestSubtlety-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 8017.0266 - tps: 5691.33135 + dps: 7930.30075 + tps: 5626.91318 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 0309f71513..ad07c8c830 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -547,8 +547,8 @@ dps_results: { dps_results: { key: "TestEnhancement-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7503.64293 - tps: 4138.56917 + dps: 7454.42569 + tps: 4109.93071 } } dps_results: {