From 699f7e837935490de5dd468957149c9397ee5537 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Fri, 27 Dec 2024 11:18:27 -0500 Subject: [PATCH] fix ZG 3pc bonus --- sim/rogue/dps_rogue/TestAssassination.results | 72 +++--- sim/rogue/item_sets_phase_5.go | 4 - .../enhancement/TestEnhancement.results | 218 +++++++++--------- 3 files changed, 145 insertions(+), 149 deletions(-) diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results index 598d4acb84..142481eac7 100644 --- a/sim/rogue/dps_rogue/TestAssassination.results +++ b/sim/rogue/dps_rogue/TestAssassination.results @@ -118,7 +118,7 @@ character_stats_results: { final_stats: 0 final_stats: 2351.92 final_stats: 15 - final_stats: 52.65801 + final_stats: 57.65801 final_stats: 0 final_stats: 0 final_stats: 0 @@ -246,8 +246,8 @@ stat_weights_results: { stat_weights_results: { key: "TestAssassination-Phase5-Lvl60-StatWeights-Default" value: { - weights: 0.34406 - weights: 0.39066 + weights: 0.34691 + weights: 0.55775 weights: 0 weights: 0 weights: 0 @@ -263,9 +263,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.27198 - weights: 12.30185 - weights: 1.60969 + weights: 0.27424 + weights: 13.16868 + weights: 2.57765 weights: 0 weights: 0 weights: 0 @@ -505,8 +505,8 @@ dps_results: { dps_results: { key: "TestAssassination-Phase5-Lvl60-AllItems-BloodCorruptedLeathers" value: { - dps: 830.97534 - tps: 589.99249 + dps: 853.94128 + tps: 606.29831 } } dps_results: { @@ -519,98 +519,98 @@ dps_results: { dps_results: { key: "TestAssassination-Phase5-Lvl60-Average-Default" value: { - dps: 903.72625 - tps: 641.64564 + dps: 911.93624 + tps: 647.47473 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 185.24918 - tps: 131.52692 + dps: 192.30395 + tps: 136.53581 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 168.88781 - tps: 119.91034 + dps: 175.94258 + tps: 124.91923 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 354.13845 - tps: 251.4383 + dps: 373.67409 + tps: 265.30861 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 82.30631 - tps: 58.43748 + dps: 87.13977 + tps: 61.86924 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 73.02381 - tps: 51.8469 + dps: 77.85727 + tps: 55.27866 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 159.08049 - tps: 112.94715 + dps: 165.84464 + tps: 117.7497 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 189.98786 - tps: 134.89138 + dps: 197.34631 + tps: 140.11588 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 173.62649 - tps: 123.27481 + dps: 180.98494 + tps: 128.4993 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 373.69569 - tps: 265.32394 + dps: 394.31 + tps: 279.9601 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 84.17099 - tps: 59.7614 + dps: 89.10867 + tps: 63.26716 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 74.88849 - tps: 53.17083 + dps: 79.82617 + tps: 56.67658 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 166.67849 - tps: 118.34173 + dps: 173.7295 + tps: 123.34795 } } dps_results: { key: "TestAssassination-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 704.51994 - tps: 500.20916 + dps: 714.46481 + tps: 507.27001 } } diff --git a/sim/rogue/item_sets_phase_5.go b/sim/rogue/item_sets_phase_5.go index e1a496711d..d666d7492e 100644 --- a/sim/rogue/item_sets_phase_5.go +++ b/sim/rogue/item_sets_phase_5.go @@ -217,10 +217,6 @@ var ItemSetMadCapsOutfit = core.NewItemSet(core.ItemSet{ // Increases your chance to get a critical strike with Daggers by 5%. func (rogue *Rogue) applyZGDagger3PBonus() { - if !rogue.Talents.AdrenalineRush { - return - } - label := "S03 - Item - ZG - Rogue - Dagger 3P Bonus" if rogue.HasAura(label) { return diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index cd4d857937..3e8db3da0f 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -540,8 +540,8 @@ stat_weights_results: { stat_weights_results: { key: "TestEnhancement-Phase6-Lvl60-StatWeights-Default" value: { - weights: 3.09611 - weights: 2.37385 + weights: 3.10329 + weights: 2.38384 weights: 0 weights: 0 weights: 0 @@ -557,9 +557,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.22376 - weights: 32.24739 - weights: 29.88401 + weights: 1.2266 + weights: 32.2852 + weights: 30.00647 weights: 0 weights: 0 weights: 0 @@ -2003,15 +2003,15 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-OstracizedBerserker'sBattlemail" value: { - dps: 3534.51751 - tps: 3554.79142 + dps: 3538.08908 + tps: 3558.36299 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-AllItems-ShunnedDevotee'sChainmail" value: { - dps: 3469.64959 - tps: 3492.94677 + dps: 3473.07793 + tps: 3496.37511 } } dps_results: { @@ -2024,350 +2024,350 @@ dps_results: { dps_results: { key: "TestEnhancement-Phase6-Lvl60-Average-Default" value: { - dps: 5860.73997 - tps: 4120.48743 + dps: 5872.94559 + tps: 4129.03136 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3473.89399 - tps: 2938.52175 + dps: 3498.3147 + tps: 2955.61625 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2553.3962 - tps: 1805.52313 + dps: 2577.68316 + tps: 1822.524 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2636.70508 - tps: 1812.35235 + dps: 2660.49482 + tps: 1829.00517 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1349.92756 - tps: 1460.96746 + dps: 1358.53748 + tps: 1466.9944 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 989.50366 - tps: 720.84567 + dps: 998.07897 + tps: 726.84838 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1130.68747 - tps: 790.9719 + dps: 1140.00888 + tps: 797.49689 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3473.89399 - tps: 2938.52175 + dps: 3498.3147 + tps: 2955.61625 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2553.3962 - tps: 1805.52313 + dps: 2577.68316 + tps: 1822.524 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2636.70508 - tps: 1812.35235 + dps: 2660.49482 + tps: 1829.00517 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1349.92756 - tps: 1460.96746 + dps: 1358.53748 + tps: 1466.9944 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 989.50366 - tps: 720.84567 + dps: 998.07897 + tps: 726.84838 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1130.68747 - tps: 790.9719 + dps: 1140.00888 + tps: 797.49689 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5093.89181 - tps: 4087.88652 + dps: 5105.94431 + tps: 4096.32327 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3406.37658 - tps: 2404.68711 + dps: 3418.0269 + tps: 2412.84233 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3538.84748 - tps: 2443.07882 + dps: 3550.71145 + tps: 2451.38359 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1876.66871 - tps: 1846.63542 + dps: 1880.85432 + tps: 1849.56535 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1189.78407 - tps: 862.26828 + dps: 1193.80555 + tps: 865.08332 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1377.40935 - tps: 963.24044 + dps: 1381.92141 + tps: 966.39888 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5093.89181 - tps: 4087.88652 + dps: 5105.94431 + tps: 4096.32327 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3406.37658 - tps: 2404.68711 + dps: 3418.0269 + tps: 2412.84233 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3538.84748 - tps: 2443.07882 + dps: 3550.71145 + tps: 2451.38359 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1876.66871 - tps: 1846.63542 + dps: 1880.85432 + tps: 1849.56535 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1189.78407 - tps: 862.26828 + dps: 1193.80555 + tps: 865.08332 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1377.40935 - tps: 963.24044 + dps: 1381.92141 + tps: 966.39888 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3316.56208 - tps: 2829.94046 + dps: 3339.85788 + tps: 2846.24752 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2475.50145 - tps: 1756.99778 + dps: 2498.80309 + tps: 1773.30893 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2563.74364 - tps: 1766.70693 + dps: 2586.90227 + tps: 1782.91797 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1266.88523 - tps: 1394.19652 + dps: 1275.02332 + tps: 1399.89318 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 951.68727 - tps: 695.34127 + dps: 959.8702 + tps: 701.06932 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1089.01473 - tps: 762.93841 + dps: 1097.97558 + tps: 769.21101 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 3316.56208 - tps: 2829.94046 + dps: 3339.85788 + tps: 2846.24752 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 2475.50145 - tps: 1756.99778 + dps: 2498.80309 + tps: 1773.30893 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 2563.74364 - tps: 1766.70693 + dps: 2586.90227 + tps: 1782.91797 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1266.88523 - tps: 1394.19652 + dps: 1275.02332 + tps: 1399.89318 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 951.68727 - tps: 695.34127 + dps: 959.8702 + tps: 701.06932 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1089.01473 - tps: 762.93841 + dps: 1097.97558 + tps: 769.21101 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5034.10349 - tps: 4068.59624 + dps: 5045.81692 + tps: 4076.79564 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3333.34239 - tps: 2356.20555 + dps: 3344.68515 + tps: 2364.14548 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3461.57423 - tps: 2394.43914 + dps: 3473.45633 + tps: 2402.75661 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1851.89694 - tps: 1830.26936 + dps: 1855.90539 + tps: 1833.07527 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1174.18894 - tps: 851.46746 + dps: 1178.10172 + tps: 854.20641 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1344.44772 - tps: 941.48773 + dps: 1348.84356 + tps: 944.56482 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 5034.10349 - tps: 4068.59624 + dps: 5045.81692 + tps: 4076.79564 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 3333.34239 - tps: 2356.20555 + dps: 3344.68515 + tps: 2364.14548 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 3461.57423 - tps: 2394.43914 + dps: 3473.45633 + tps: 2402.75661 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget" value: { - dps: 1851.89694 - tps: 1830.26936 + dps: 1855.90539 + tps: 1833.07527 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget" value: { - dps: 1174.18894 - tps: 851.46746 + dps: 1178.10172 + tps: 854.20641 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget" value: { - dps: 1344.44772 - tps: 941.48773 + dps: 1348.84356 + tps: 944.56482 } } dps_results: { key: "TestEnhancement-Phase6-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4977.04325 - tps: 3498.7233 + dps: 4987.56864 + tps: 3506.09108 } }