From 64a471ff2482accd089c28908c5c13f3a93c83e4 Mon Sep 17 00:00:00 2001 From: jarves Date: Wed, 6 Sep 2023 04:12:01 -0500 Subject: [PATCH 1/2] feral: fix rake dpe calculation - also swapped over to using more 'built-in' calcs Signed-off-by: jarves --- sim/druid/feral/TestFeral.results | 36 ++-- ...eralDoubleArmorPenTrinketsNoDesync.results | 168 +++++++++--------- ...alDoubleArmorPenTrinketsWithDesync.results | 168 +++++++++--------- sim/druid/rake.go | 17 +- sim/druid/shred.go | 8 +- 5 files changed, 197 insertions(+), 200 deletions(-) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index d0f2714c68..fb7a1e44af 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -526,8 +526,8 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-LasherweaveBattlegear" value: { - dps: 8273.59873 - tps: 5935.58017 + dps: 8288.74944 + tps: 5946.1876 } } dps_results: { @@ -1093,15 +1093,15 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-FullBuffs-LongMultiTarget" value: { - dps: 10060.83211 - tps: 7207.05861 + dps: 10060.18091 + tps: 7206.59626 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-FullBuffs-LongSingleTarget" value: { - dps: 10060.83211 - tps: 7207.05861 + dps: 10060.18091 + tps: 7206.59626 } } dps_results: { @@ -1114,43 +1114,43 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-LongMultiTarget" value: { - dps: 6269.23273 - tps: 4513.82647 + dps: 6309.44618 + tps: 4542.37801 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-LongSingleTarget" value: { - dps: 6269.23273 - tps: 4513.82647 + dps: 6309.44618 + tps: 4542.37801 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBleed-NoBuffs-ShortSingleTarget" value: { - dps: 6889.90957 - tps: 4946.05613 + dps: 6862.20267 + tps: 4926.38423 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-LongMultiTarget" value: { - dps: 6262.6567 - tps: 4509.53142 + dps: 6291.79567 + tps: 4529.62179 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-LongSingleTarget" value: { - dps: 6262.6567 - tps: 4509.53142 + dps: 6291.79567 + tps: 4529.62179 } } dps_results: { key: "TestFeral-Settings-Tauren-P2-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6860.04227 - tps: 4925.59821 + dps: 6835.21915 + tps: 4907.59986 } } dps_results: { diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results index 777252d01e..33eb72e670 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results @@ -104,8 +104,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7571.46168 - tps: 5441.25091 + dps: 7568.66206 + tps: 5438.96404 } } dps_results: { @@ -118,8 +118,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -154,8 +154,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 9802.31832 - tps: 7023.66339 + dps: 9805.39357 + tps: 7025.32331 } } dps_results: { @@ -168,43 +168,43 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 9845.1149 - tps: 7053.60024 + dps: 9869.99169 + tps: 7071.18798 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Death'sChoice-47464" value: { - dps: 10189.55873 - tps: 7298.23015 + dps: 10246.96068 + tps: 7338.98554 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 9794.67709 - tps: 7018.01376 + dps: 9780.17898 + tps: 7007.34617 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Deathbringer'sWill-50362" value: { - dps: 10184.47917 - tps: 7294.84802 + dps: 10225.61094 + tps: 7324.20115 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Deathbringer'sWill-50363" value: { - dps: 10297.68185 - tps: 7375.29671 + dps: 10314.50617 + tps: 7387.31677 } } dps_results: { @@ -238,15 +238,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DreamwalkerBattlegear" value: { - dps: 8478.8562 - tps: 6086.02453 + dps: 8433.29364 + tps: 6053.30118 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-DreamwalkerGarb" value: { - dps: 7223.97117 - tps: 5196.32753 + dps: 7211.95196 + tps: 5187.79389 } } dps_results: { @@ -350,8 +350,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -371,15 +371,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Gladiator'sSanctuary" value: { - dps: 9096.15861 - tps: 6523.56138 + dps: 9076.10643 + tps: 6509.17475 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Gladiator'sWildhide" value: { - dps: 7339.47088 - tps: 5276.2383 + dps: 7338.67804 + tps: 5275.45102 } } dps_results: { @@ -406,8 +406,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -427,57 +427,57 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdolofLunarFury-47670" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdolofMutilation-47668" value: { - dps: 10013.24542 - tps: 7175.8896 + dps: 9965.56716 + tps: 7141.73888 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheCorruptor-45509" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 9954.12278 - tps: 7133.98731 + dps: 9954.48511 + tps: 7133.94541 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 9691.76332 - tps: 6947.03901 + dps: 9672.73214 + tps: 6933.75123 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -504,8 +504,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IncisorFragment-37723" value: { - dps: 9835.66883 - tps: 7046.96832 + dps: 9845.54877 + tps: 7053.98308 } } dps_results: { @@ -526,15 +526,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-LasherweaveBattlegear" value: { - dps: 9826.217 - tps: 7041.15496 + dps: 9920.71632 + tps: 7108.02512 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-LasherweaveRegalia" value: { - dps: 7506.87607 - tps: 5398.08745 + dps: 7492.81528 + tps: 5388.10429 } } dps_results: { @@ -561,8 +561,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Malfurion'sRegalia" value: { - dps: 7173.09878 - tps: 5160.80643 + dps: 7159.44612 + tps: 5151.03826 } } dps_results: { @@ -575,8 +575,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 9884.19489 - tps: 7080.89832 + dps: 9877.82049 + tps: 7076.44728 } } dps_results: { @@ -596,15 +596,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NightsongBattlegear" value: { - dps: 8810.70284 - tps: 6322.38351 + dps: 8798.30789 + tps: 6313.28395 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-NightsongGarb" value: { - dps: 7090.35739 - tps: 5102.58355 + dps: 7082.02006 + tps: 5096.51447 } } dps_results: { @@ -694,8 +694,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -715,8 +715,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -785,8 +785,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-StormshroudArmor" value: { - dps: 7718.35933 - tps: 5543.60379 + dps: 7722.40428 + tps: 5547.14879 } } dps_results: { @@ -834,15 +834,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ThunderheartHarness" value: { - dps: 6995.63198 - tps: 5030.24301 + dps: 7004.85137 + tps: 5036.86357 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-ThunderheartRegalia" value: { - dps: 6146.83094 - tps: 4428.64129 + dps: 6109.2917 + tps: 4401.98843 } } dps_results: { @@ -904,22 +904,22 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 7898.39575 - tps: 5673.22453 + dps: 7864.31044 + tps: 5649.02396 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7436.02725 - tps: 5345.84033 + dps: 7455.85902 + tps: 5359.69653 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -932,8 +932,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 9632.23982 - tps: 6904.77732 + dps: 9608.84326 + tps: 6888.31534 } } dps_results: { @@ -967,22 +967,22 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongMultiTarget" value: { - dps: 6111.35024 - tps: 4403.44999 + dps: 6135.36228 + tps: 4420.7229 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongSingleTarget" value: { - dps: 6111.35024 - tps: 4403.44999 + dps: 6135.36228 + tps: 4420.7229 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6633.18983 - tps: 4767.15051 + dps: 6703.07781 + tps: 4814.90131 } } dps_results: { diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results index 2db8d5db9d..d16666d05c 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results @@ -104,8 +104,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 7594.33406 - tps: 5457.56509 + dps: 7578.5812 + tps: 5445.78226 } } dps_results: { @@ -118,8 +118,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -154,8 +154,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 9802.30088 - tps: 7023.50144 + dps: 9796.14022 + tps: 7018.75343 } } dps_results: { @@ -168,43 +168,43 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 9845.26593 - tps: 7053.93184 + dps: 9856.91782 + tps: 7061.83075 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Death'sChoice-47464" value: { - dps: 10184.14362 - tps: 7294.46021 + dps: 10215.29863 + tps: 7316.65505 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 9794.67709 - tps: 7018.01376 + dps: 9780.17898 + tps: 7007.34617 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Deathbringer'sWill-50362" value: { - dps: 10212.55822 - tps: 7314.63457 + dps: 10195.11297 + tps: 7302.24845 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Deathbringer'sWill-50363" value: { - dps: 10212.77289 - tps: 7314.78699 + dps: 10282.09212 + tps: 7363.85407 } } dps_results: { @@ -238,15 +238,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DreamwalkerBattlegear" value: { - dps: 8485.97484 - tps: 6090.70483 + dps: 8504.69518 + tps: 6103.47276 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-DreamwalkerGarb" value: { - dps: 7228.44466 - tps: 5199.42892 + dps: 7218.17819 + tps: 5192.2893 } } dps_results: { @@ -350,8 +350,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -371,15 +371,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Gladiator'sSanctuary" value: { - dps: 9101.8802 - tps: 6527.6237 + dps: 9053.94321 + tps: 6493.58844 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Gladiator'sWildhide" value: { - dps: 7352.26133 - tps: 5285.24473 + dps: 7368.25893 + tps: 5296.37867 } } dps_results: { @@ -406,8 +406,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -427,57 +427,57 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdolofLunarFury-47670" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdolofMutilation-47668" value: { - dps: 10071.29436 - tps: 7216.65562 + dps: 10079.27463 + tps: 7222.3964 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheCorruptor-45509" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 10010.75878 - tps: 7173.75015 + dps: 10056.23303 + tps: 7206.11165 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 9739.54342 - tps: 6981.11246 + dps: 9774.12894 + tps: 7005.66817 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -504,8 +504,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IncisorFragment-37723" value: { - dps: 9835.66883 - tps: 7046.96832 + dps: 9845.54877 + tps: 7053.98308 } } dps_results: { @@ -526,15 +526,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-LasherweaveBattlegear" value: { - dps: 9914.54083 - tps: 7104.16403 + dps: 10024.9841 + tps: 7182.05525 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-LasherweaveRegalia" value: { - dps: 7496.09141 - tps: 5390.20598 + dps: 7547.28268 + tps: 5426.32743 } } dps_results: { @@ -561,8 +561,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Malfurion'sRegalia" value: { - dps: 7191.43016 - tps: 5174.12085 + dps: 7154.34959 + tps: 5148.01801 } } dps_results: { @@ -575,8 +575,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 9884.19489 - tps: 7080.89832 + dps: 9877.82049 + tps: 7076.44728 } } dps_results: { @@ -596,15 +596,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NightsongBattlegear" value: { - dps: 8846.10211 - tps: 6346.46998 + dps: 8842.72629 + tps: 6344.74623 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-NightsongGarb" value: { - dps: 7110.75147 - tps: 5116.61463 + dps: 7105.57602 + tps: 5112.94005 } } dps_results: { @@ -694,8 +694,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -715,8 +715,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -785,8 +785,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-StormshroudArmor" value: { - dps: 7754.63019 - tps: 5569.80482 + dps: 7763.76803 + tps: 5575.99354 } } dps_results: { @@ -834,15 +834,15 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ThunderheartHarness" value: { - dps: 6977.09888 - tps: 5017.1593 + dps: 6989.0541 + tps: 5025.57272 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-ThunderheartRegalia" value: { - dps: 6097.59985 - tps: 4393.68721 + dps: 6091.85454 + tps: 4389.75761 } } dps_results: { @@ -904,22 +904,22 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 7943.752 - tps: 5705.57704 + dps: 7915.43449 + tps: 5685.02289 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 7533.05943 - tps: 5414.13489 + dps: 7507.69189 + tps: 5397.02137 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -932,8 +932,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 9671.5797 - tps: 6932.85822 + dps: 9709.33449 + tps: 6959.7389 } } dps_results: { @@ -967,22 +967,22 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongMultiTarget" value: { - dps: 6159.26614 - tps: 4437.76943 + dps: 6170.22357 + tps: 4445.47442 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-LongSingleTarget" value: { - dps: 6159.26614 - tps: 4437.76943 + dps: 6170.22357 + tps: 4445.47442 } } dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-Settings-Tauren-P2DoubleArmorPenTrinkets-Default-NoBuffs-ShortSingleTarget" value: { - dps: 6693.51492 - tps: 4809.60739 + dps: 6748.82612 + tps: 4847.38261 } } dps_results: { diff --git a/sim/druid/rake.go b/sim/druid/rake.go index 92beb7a3d7..aa8a63d8a3 100644 --- a/sim/druid/rake.go +++ b/sim/druid/rake.go @@ -4,7 +4,6 @@ import ( "time" "github.com/wowsims/wotlk/sim/core" - "github.com/wowsims/wotlk/sim/core/stats" ) func (druid *Druid) registerRakeSpell() { @@ -74,23 +73,19 @@ func (druid *Druid) registerRakeSpell() { baseDamage := 176 + 0.01*spell.MeleeAttackPower() potentialTicks := core.MinInt32(numTicks, int32(sim.GetRemainingDuration()/time.Second*3)) tickBase := (358 + 0.06*spell.MeleeAttackPower()) * float64(potentialTicks) - if druid.BleedCategories.Get(target).AnyActive() { - baseDamage *= 1.3 - tickBase *= 1.3 - } - initial := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeExpectedMagicAlwaysHit) - ticks := spell.CalcDamage(sim, target, tickBase, spell.OutcomeExpectedMagicAlwaysHit) + initial := spell.CalcPeriodicDamage(sim, target, baseDamage, spell.OutcomeExpectedMagicAlwaysHit) + ticks := spell.CalcPeriodicDamage(sim, target, tickBase, spell.OutcomeExpectedMagicAlwaysHit) - critRating := druid.GetStat(stats.MeleeCrit) + spell.BonusCritRating - critChance := critRating / (core.CritRatingPerCritChance * 100) + attackTable := spell.Unit.AttackTables[target.UnitIndex] + critChance := spell.PhysicalCritChance(attackTable) critMod := (critChance * (spell.CritMultiplier - 1)) if dotCanCrit { - ticks.Damage *= critChance * (1 + critMod) + ticks.Damage *= 1 + critMod } - ticks.Damage += initial.Damage * (critChance * (1 + critMod)) + ticks.Damage += initial.Damage * (1 + critMod) return ticks }, }) diff --git a/sim/druid/shred.go b/sim/druid/shred.go index b6fd965492..74505b81cd 100644 --- a/sim/druid/shred.go +++ b/sim/druid/shred.go @@ -5,7 +5,6 @@ import ( "github.com/wowsims/wotlk/sim/core" "github.com/wowsims/wotlk/sim/core/proto" - "github.com/wowsims/wotlk/sim/core/stats" ) func (druid *Druid) registerShredSpell() { @@ -32,6 +31,9 @@ func (druid *Druid) registerShredSpell() { }, IgnoreHaste: true, }, + ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool { + return !druid.PseudoStats.InFrontOfTarget + }, DamageMultiplier: 2.25, CritMultiplier: druid.MeleeCritMultiplier(Cat), @@ -82,8 +84,8 @@ func (druid *Druid) registerShredSpell() { baseDamage *= modifier baseres := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeExpectedMagicAlwaysHit) - critRating := druid.GetStat(stats.MeleeCrit) + spell.BonusCritRating - critChance := critRating / (core.CritRatingPerCritChance * 100) + attackTable := spell.Unit.AttackTables[target.UnitIndex] + critChance := spell.PhysicalCritChance(attackTable) critMod := (critChance * (spell.CritMultiplier - 1)) baseres.Damage *= (1 + critMod) From 3cc6fa4a17d5ef196cd47ed9ffdc3df93844b51e Mon Sep 17 00:00:00 2001 From: jarves Date: Wed, 6 Sep 2023 04:12:48 -0500 Subject: [PATCH 2/2] feral: ignore dpe calc when using rake idol Signed-off-by: jarves --- .../feral/TestFeralDoubleArmorPenTrinketsNoDesync.results | 4 ++-- .../feral/TestFeralDoubleArmorPenTrinketsWithDesync.results | 4 ++-- sim/druid/feral/rotation.go | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results index 33eb72e670..e915cc5038 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsNoDesync.results @@ -448,8 +448,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsNoDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 9954.48511 - tps: 7133.94541 + dps: 9913.0062 + tps: 7104.19624 } } dps_results: { diff --git a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results index d16666d05c..67e53d2379 100644 --- a/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results +++ b/sim/druid/feral/TestFeralDoubleArmorPenTrinketsWithDesync.results @@ -448,8 +448,8 @@ dps_results: { dps_results: { key: "TestFeralDoubleArmorPenTrinketsWithDesync-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 10056.23303 - tps: 7206.11165 + dps: 10023.92346 + tps: 7182.9475 } } dps_results: { diff --git a/sim/druid/feral/rotation.go b/sim/druid/feral/rotation.go index c8d66b02a3..113924d1fb 100644 --- a/sim/druid/feral/rotation.go +++ b/sim/druid/feral/rotation.go @@ -377,7 +377,7 @@ func (cat *FeralDruid) doRotation(sim *core.Simulation) (bool, time.Duration) { // Additionally, don't Rake if the current Shred DPE is higher due to // trinket procs etc. - if rakeNow { + if rotation.RakeDpeCheck && rakeNow { rakeDpe, shredDpe := cat.calcBuilderDpe(sim) rakeNow = (rakeDpe > shredDpe) } @@ -747,6 +747,7 @@ type FeralDruidRotation struct { LacerateTime time.Duration SnekWeave bool FlowerWeave bool + RakeDpeCheck bool AoeMangleBuilder bool } @@ -781,6 +782,7 @@ func (cat *FeralDruid) setupRotation(rotation *proto.FeralDruid_Rotation) { FlowerWeave: core.Ternary(rotation.RotationType == proto.FeralDruid_Rotation_Aoe, rotation.FlowerWeave, false), // Use mangle if idol of corruptor or mutilation equipped AoeMangleBuilder: equipedIdol == 45509 || equipedIdol == 47668, + RakeDpeCheck: equipedIdol != 50456, } // Use automatic values unless specified