From 378fec876768b4cb7e724ec120c35a06770b3b60 Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 16:06:54 -0700 Subject: [PATCH 1/6] Fix imp base stats and stamina scaling --- sim/warlock/dps/TestAffliction.results | 102 +++++++++++++++++++++ sim/warlock/dps/TestDestruction.results | 100 +++++++++++++++++++++ sim/warlock/pet.go | 14 +-- sim/warlock/tank/TestDestruction.results | 110 +++++++++++++++++++++++ 4 files changed, 319 insertions(+), 7 deletions(-) diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 2a5d3a5c4b..6c546790ff 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -102,18 +102,29 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 0.3498 weights: 0 weights: 0.85175 +======= + weights: 0.33433 weights: 0 + weights: 1.14914 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 0 +<<<<<<< HEAD weights: 4.33415 weights: 1.63252 +======= + weights: 3.6844 + weights: 1.72181 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -151,9 +162,15 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 0.10795 weights: 0 weights: -0.37008 +======= + weights: 1.57318 + weights: 0 + weights: 1.52472 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -161,8 +178,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 10.8692 weights: 7.49935 +======= + weights: 11.50014 + weights: 7.74406 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -197,112 +219,192 @@ stat_weights_results: { dps_results: { key: "TestAffliction-Lvl40-Average-Default" value: { +<<<<<<< HEAD dps: 598.73464 tps: 567.32935 +======= + dps: 589.7335 + tps: 558.99314 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 591.15328 tps: 1196.1784 +======= + dps: 586.14869 + tps: 1187.06506 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 591.15328 tps: 559.66614 +======= + dps: 586.14869 + tps: 555.35323 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 585.39964 tps: 542.89609 +======= + dps: 576.63077 + tps: 534.52574 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 373.63797 tps: 998.20618 +======= + dps: 369.10544 + tps: 997.3032 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 373.63797 tps: 360.47239 +======= + dps: 369.10544 + tps: 356.11261 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 379.52923 tps: 353.1449 +======= + dps: 375.98542 + tps: 349.74382 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 601.89986 tps: 570.08021 +======= + dps: 591.38767 + tps: 559.89636 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Average-Default" value: { +<<<<<<< HEAD dps: 1354.36862 tps: 1153.9304 +======= + dps: 1348.75704 + tps: 1144.79965 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 1952.20599 tps: 2701.44989 +======= + dps: 1953.77428 + tps: 2704.98061 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 1343.22973 tps: 1144.42781 +======= + dps: 1345.46103 + tps: 1143.46075 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 1374.34558 tps: 1206.44251 +======= + dps: 1407.89852 + tps: 1218.97962 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 1198.98377 tps: 2082.05249 +======= + dps: 1197.75979 + tps: 2075.21042 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 753.85192 tps: 633.82532 +======= + dps: 754.00531 + tps: 629.17208 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 716.68652 tps: 639.37389 +======= + dps: 748.67521 + tps: 657.61708 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 1350.88053 tps: 1150.95943 +======= + dps: 1352.18224 + tps: 1148.54549 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index ef34b5d7f1..02b922dff7 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -200,7 +200,11 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 0.02916 +======= + weights: 0.02789 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0.13619 weights: 0 @@ -210,8 +214,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 3.12032 weights: 0.17147 +======= + weights: 3.0746 + weights: 0.16813 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -249,18 +258,29 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: -2.79953 weights: 0 weights: 2.88604 +======= + weights: -1.44202 weights: 0 + weights: 1.81676 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 0 +<<<<<<< HEAD weights: 8.96163 weights: 5.41451 +======= + weights: 2.55315 + weights: 7.46154 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -351,112 +371,192 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { +<<<<<<< HEAD dps: 147.85594 tps: 79.59037 +======= + dps: 145.88362 + tps: 78.5602 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 144.92268 tps: 1045.56735 +======= + dps: 143.06771 + tps: 1041.4637 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 144.92268 tps: 74.88232 +======= + dps: 143.06771 + tps: 74.27992 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 243.52858 tps: 163.02771 +======= + dps: 239.97289 + tps: 160.13069 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 104.87286 tps: 1017.4809 +======= + dps: 103.79064 + tps: 1017.94113 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 104.87286 tps: 65.5411 +======= + dps: 103.79064 + tps: 65.5804 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 167.8639 tps: 113.91043 +======= + dps: 166.18089 + tps: 112.4566 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 145.19356 tps: 75.24074 +======= + dps: 143.33342 + tps: 74.63173 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { +<<<<<<< HEAD dps: 1287.74693 tps: 1134.08907 +======= + dps: 1279.64056 + tps: 1124.37828 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 2034.51456 tps: 2541.93019 +======= + dps: 2023.03682 + tps: 2526.57451 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 1275.03876 tps: 1121.36481 +======= + dps: 1279.89626 + tps: 1126.77888 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 1376.22675 tps: 1241.83769 +======= + dps: 1400.19427 + tps: 1252.13572 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 1258.55476 tps: 1886.49774 +======= + dps: 1250.33491 + tps: 1871.63283 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 704.70424 tps: 625.35902 +======= + dps: 707.12608 + tps: 622.85398 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 745.0004 tps: 688.1706 +======= + dps: 753.10698 + tps: 680.0301 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 1289.46603 tps: 1135.95401 +======= + dps: 1265.86558 + tps: 1110.17806 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } diff --git a/sim/warlock/pet.go b/sim/warlock/pet.go index ba28d4c913..1742cde782 100644 --- a/sim/warlock/pet.go +++ b/sim/warlock/pet.go @@ -63,12 +63,12 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { } case 50: cfg.Stats = stats.Stats{ - stats.Strength: 70, - stats.Agility: 29, - stats.Stamina: 67, - stats.Intellect: 163, - stats.Spirit: 163, - stats.Mana: 318, + stats.Strength: 101, + stats.Agility: 32, + stats.Stamina: 72, + stats.Intellect: 212, + stats.Spirit: 211, + stats.Mana: 476, stats.MP5: 0, stats.MeleeCrit: 3.454 * core.CritRatingPerCritChance, stats.SpellCrit: 0.9075 * core.CritRatingPerCritChance, @@ -556,7 +556,7 @@ func (warlock *Warlock) makeStatInheritance() core.PetStatInheritance { highestSchoolPower := ownerStats[stats.SpellPower] + ownerStats[stats.SpellDamage] + max(ownerStats[stats.FirePower], ownerStats[stats.ShadowPower]) return stats.Stats{ - stats.Stamina: ownerStats[stats.Stamina] * core.Ternary(warlock.Options.Summon == proto.WarlockOptions_Imp, 0.66, 0.75), + stats.Stamina: ownerStats[stats.Stamina] * 0.75, stats.Intellect: ownerStats[stats.Intellect] * 0.3, stats.Armor: ownerStats[stats.Armor] * 0.35, stats.AttackPower: highestSchoolPower * 0.57, diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index b1b9efd3e5..9da14ac499 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -200,18 +200,29 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 0.35158 weights: 0 weights: 0.66799 +======= + weights: 0.35384 weights: 0 + weights: 0.6606 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 + weights: 0 +<<<<<<< HEAD weights: 6.02367 weights: 3.14437 +======= + weights: 6.17043 + weights: 3.075 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -249,9 +260,15 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: -1.3246 weights: 0 weights: 1.63974 +======= + weights: 4.65261 + weights: 0 + weights: 2.7333 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -259,8 +276,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 +<<<<<<< HEAD weights: 4.25444 weights: 6.2618 +======= + weights: 1.82841 + weights: 5.20197 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -351,120 +373,208 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { +<<<<<<< HEAD dps: 501.59249 tps: 1120.94831 +======= + dps: 492.09076 + tps: 1097.47155 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 847.33327 tps: 1844.06872 +======= + dps: 830.20472 + tps: 1810.90658 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 464.76164 tps: 1051.35759 +======= + dps: 457.89014 + tps: 1034.99179 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 471.12595 tps: 1024.26014 +======= + dps: 462.12157 + tps: 1002.41711 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 594.16616 tps: 1367.80567 +======= + dps: 589.19527 + tps: 1356.56892 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 306.7561 tps: 665.27677 +======= + dps: 300.11888 + tps: 648.05459 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 308.30462 tps: 650.14512 +======= + dps: 304.01599 + tps: 639.82598 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 494.53293 tps: 1108.80093 +======= + dps: 484.94757 + tps: 1085.30414 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { +<<<<<<< HEAD dps: 1301.56578 tps: 2159.22546 hps: 19.2738 +======= + dps: 1303.04733 + tps: 2143.55807 + hps: 19.32065 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 1872.49134 tps: 3955.07317 hps: 15.19136 +======= + dps: 1849.43339 + tps: 3913.73558 + hps: 15.29428 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 1250.69869 tps: 2055.66475 hps: 15.35508 +======= + dps: 1241.90915 + tps: 2042.32171 + hps: 15.32229 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 1154.1029 tps: 1968.20354 hps: 14.95714 +======= + dps: 1188.88109 + tps: 1999.75077 + hps: 15.51045 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { +<<<<<<< HEAD dps: 1158.43785 tps: 2859.14027 hps: 10.27667 +======= + dps: 1172.34779 + tps: 2857.70841 + hps: 10.25167 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { +<<<<<<< HEAD dps: 703.36383 tps: 1139.8556 hps: 10.20167 +======= + dps: 715.59031 + tps: 1139.90073 + hps: 10.21333 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { +<<<<<<< HEAD dps: 662.61416 tps: 1102.67544 hps: 10.525 +======= + dps: 669.15792 + tps: 1098.91913 + hps: 10.36667 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { +<<<<<<< HEAD dps: 1267.37011 tps: 2097.51103 hps: 19.53577 +======= + dps: 1285.98691 + tps: 2118.11926 + hps: 19.63687 +>>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } From 959e600d9e7bccf665d7979aab94264cf32b5037 Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 16:16:17 -0700 Subject: [PATCH 2/6] Fix tests --- sim/warlock/dps/TestAffliction.results | 102 --------------------- sim/warlock/dps/TestDemonology.results | 40 ++++----- sim/warlock/dps/TestDestruction.results | 100 --------------------- sim/warlock/tank/TestDemonology.results | 40 ++++----- sim/warlock/tank/TestDestruction.results | 110 ----------------------- 5 files changed, 40 insertions(+), 352 deletions(-) diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 6c546790ff..0613d995f6 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -102,15 +102,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 0.3498 - weights: 0 - weights: 0.85175 -======= weights: 0.33433 weights: 0 weights: 1.14914 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -118,13 +112,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 4.33415 - weights: 1.63252 -======= weights: 3.6844 weights: 1.72181 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -162,15 +151,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 0.10795 - weights: 0 - weights: -0.37008 -======= weights: 1.57318 weights: 0 weights: 1.52472 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -178,13 +161,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 10.8692 - weights: 7.49935 -======= weights: 11.50014 weights: 7.74406 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -219,192 +197,112 @@ stat_weights_results: { dps_results: { key: "TestAffliction-Lvl40-Average-Default" value: { -<<<<<<< HEAD - dps: 598.73464 - tps: 567.32935 -======= dps: 589.7335 tps: 558.99314 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 591.15328 - tps: 1196.1784 -======= dps: 586.14869 tps: 1187.06506 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 591.15328 - tps: 559.66614 -======= dps: 586.14869 tps: 555.35323 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 585.39964 - tps: 542.89609 -======= dps: 576.63077 tps: 534.52574 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 373.63797 - tps: 998.20618 -======= dps: 369.10544 tps: 997.3032 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 373.63797 - tps: 360.47239 -======= dps: 369.10544 tps: 356.11261 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 379.52923 - tps: 353.1449 -======= dps: 375.98542 tps: 349.74382 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 601.89986 - tps: 570.08021 -======= dps: 591.38767 tps: 559.89636 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Average-Default" value: { -<<<<<<< HEAD - dps: 1354.36862 - tps: 1153.9304 -======= dps: 1348.75704 tps: 1144.79965 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 1952.20599 - tps: 2701.44989 -======= dps: 1953.77428 tps: 2704.98061 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 1343.22973 - tps: 1144.42781 -======= dps: 1345.46103 tps: 1143.46075 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 1374.34558 - tps: 1206.44251 -======= dps: 1407.89852 tps: 1218.97962 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 1198.98377 - tps: 2082.05249 -======= dps: 1197.75979 tps: 2075.21042 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 753.85192 - tps: 633.82532 -======= dps: 754.00531 tps: 629.17208 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 716.68652 - tps: 639.37389 -======= dps: 748.67521 tps: 657.61708 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 1350.88053 - tps: 1150.95943 -======= dps: 1352.18224 tps: 1148.54549 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results index 7fe5292a31..6a7c83c54c 100644 --- a/sim/warlock/dps/TestDemonology.results +++ b/sim/warlock/dps/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.15074 + weights: -0.01331 weights: 0 - weights: 0.9444 + weights: 0.53679 weights: 0 weights: 0 weights: 0 @@ -63,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 5.16824 - weights: 2.10439 + weights: 5.40535 + weights: 2.12408 weights: 0 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 655.4921 - tps: 545.9111 + dps: 644.30134 + tps: 535.48342 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 656.18105 - tps: 869.51358 + dps: 644.9294 + tps: 854.2803 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 656.18105 - tps: 548.00703 + dps: 644.9294 + tps: 537.44821 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 699.63125 - tps: 587.86449 + dps: 688.36389 + tps: 577.16233 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 377.74705 - tps: 680.05906 + dps: 374.56765 + tps: 675.01942 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 377.74705 - tps: 336.38272 + dps: 374.56765 + tps: 333.51743 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 431.0382 - tps: 373.24835 + dps: 427.48813 + tps: 369.96447 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 659.77487 - tps: 552.11402 + dps: 647.42559 + tps: 540.37038 } } diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 02b922dff7..4ddb013eb1 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -200,11 +200,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 0.02916 -======= weights: 0.02789 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0.13619 weights: 0 @@ -214,13 +210,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 3.12032 - weights: 0.17147 -======= weights: 3.0746 weights: 0.16813 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -258,15 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: -2.79953 - weights: 0 - weights: 2.88604 -======= weights: -1.44202 weights: 0 weights: 1.81676 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -274,13 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 8.96163 - weights: 5.41451 -======= weights: 2.55315 weights: 7.46154 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -371,192 +351,112 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { -<<<<<<< HEAD - dps: 147.85594 - tps: 79.59037 -======= dps: 145.88362 tps: 78.5602 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 144.92268 - tps: 1045.56735 -======= dps: 143.06771 tps: 1041.4637 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 144.92268 - tps: 74.88232 -======= dps: 143.06771 tps: 74.27992 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 243.52858 - tps: 163.02771 -======= dps: 239.97289 tps: 160.13069 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 104.87286 - tps: 1017.4809 -======= dps: 103.79064 tps: 1017.94113 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 104.87286 - tps: 65.5411 -======= dps: 103.79064 tps: 65.5804 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 167.8639 - tps: 113.91043 -======= dps: 166.18089 tps: 112.4566 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 145.19356 - tps: 75.24074 -======= dps: 143.33342 tps: 74.63173 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { -<<<<<<< HEAD - dps: 1287.74693 - tps: 1134.08907 -======= dps: 1279.64056 tps: 1124.37828 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 2034.51456 - tps: 2541.93019 -======= dps: 2023.03682 tps: 2526.57451 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 1275.03876 - tps: 1121.36481 -======= dps: 1279.89626 tps: 1126.77888 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 1376.22675 - tps: 1241.83769 -======= dps: 1400.19427 tps: 1252.13572 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 1258.55476 - tps: 1886.49774 -======= dps: 1250.33491 tps: 1871.63283 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 704.70424 - tps: 625.35902 -======= dps: 707.12608 tps: 622.85398 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 745.0004 - tps: 688.1706 -======= dps: 753.10698 tps: 680.0301 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 1289.46603 - tps: 1135.95401 -======= dps: 1265.86558 tps: 1110.17806 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results index 267abac21a..b9c39977cd 100644 --- a/sim/warlock/tank/TestDemonology.results +++ b/sim/warlock/tank/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.11029 + weights: 0.53787 weights: 0 - weights: 0.40845 + weights: 0.96167 weights: 0 weights: 0 weights: 0 @@ -63,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 6.4248 - weights: 1.49799 + weights: 6.33785 + weights: 1.43985 weights: 0 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 595.65356 - tps: 1142.61143 + dps: 584.14614 + tps: 1116.55471 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 559.95417 - tps: 1599.42562 + dps: 547.58615 + tps: 1566.83604 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 559.95417 - tps: 1083.55832 + dps: 547.58615 + tps: 1054.63536 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 585.79062 - tps: 1131.21821 + dps: 574.45826 + tps: 1105.46708 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 328.98486 - tps: 1246.16221 + dps: 324.88775 + tps: 1244.32824 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 328.98486 - tps: 690.61761 + dps: 324.88775 + tps: 680.77795 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 352.74924 - tps: 730.55989 + dps: 348.78087 + tps: 721.48947 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 594.40653 - tps: 1139.19022 + dps: 580.66325 + tps: 1110.11424 } } diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index 9da14ac499..5c8642f1c0 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -200,15 +200,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 0.35158 - weights: 0 - weights: 0.66799 -======= weights: 0.35384 weights: 0 weights: 0.6606 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -216,13 +210,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 6.02367 - weights: 3.14437 -======= weights: 6.17043 weights: 3.075 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -260,15 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: -1.3246 - weights: 0 - weights: 1.63974 -======= weights: 4.65261 weights: 0 weights: 2.7333 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -276,13 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 -<<<<<<< HEAD - weights: 4.25444 - weights: 6.2618 -======= weights: 1.82841 weights: 5.20197 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) weights: 0 weights: 0 weights: 0 @@ -373,208 +351,120 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { -<<<<<<< HEAD - dps: 501.59249 - tps: 1120.94831 -======= dps: 492.09076 tps: 1097.47155 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 847.33327 - tps: 1844.06872 -======= dps: 830.20472 tps: 1810.90658 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 464.76164 - tps: 1051.35759 -======= dps: 457.89014 tps: 1034.99179 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 471.12595 - tps: 1024.26014 -======= dps: 462.12157 tps: 1002.41711 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 594.16616 - tps: 1367.80567 -======= dps: 589.19527 tps: 1356.56892 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 306.7561 - tps: 665.27677 -======= dps: 300.11888 tps: 648.05459 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 308.30462 - tps: 650.14512 -======= dps: 304.01599 tps: 639.82598 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 494.53293 - tps: 1108.80093 -======= dps: 484.94757 tps: 1085.30414 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { -<<<<<<< HEAD - dps: 1301.56578 - tps: 2159.22546 - hps: 19.2738 -======= dps: 1303.04733 tps: 2143.55807 hps: 19.32065 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 1872.49134 - tps: 3955.07317 - hps: 15.19136 -======= dps: 1849.43339 tps: 3913.73558 hps: 15.29428 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 1250.69869 - tps: 2055.66475 - hps: 15.35508 -======= dps: 1241.90915 tps: 2042.32171 hps: 15.32229 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 1154.1029 - tps: 1968.20354 - hps: 14.95714 -======= dps: 1188.88109 tps: 1999.75077 hps: 15.51045 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { -<<<<<<< HEAD - dps: 1158.43785 - tps: 2859.14027 - hps: 10.27667 -======= dps: 1172.34779 tps: 2857.70841 hps: 10.25167 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { -<<<<<<< HEAD - dps: 703.36383 - tps: 1139.8556 - hps: 10.20167 -======= dps: 715.59031 tps: 1139.90073 hps: 10.21333 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { -<<<<<<< HEAD - dps: 662.61416 - tps: 1102.67544 - hps: 10.525 -======= dps: 669.15792 tps: 1098.91913 hps: 10.36667 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { -<<<<<<< HEAD - dps: 1267.37011 - tps: 2097.51103 - hps: 19.53577 -======= dps: 1285.98691 tps: 2118.11926 hps: 19.63687 ->>>>>>> 8670393ed (Fix imp base stats and stamina scaling) } } From 305c789992668997e2a676500b8b264d48070901 Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 16:31:10 -0700 Subject: [PATCH 3/6] Update tests --- sim/warlock/dps/TestAffliction.results | 80 ++++++++++---------- sim/warlock/dps/TestDemonology.results | 40 +++++----- sim/warlock/dps/TestDestruction.results | 78 ++++++++++---------- sim/warlock/tank/TestDemonology.results | 40 +++++----- sim/warlock/tank/TestDestruction.results | 94 ++++++++++++------------ 5 files changed, 166 insertions(+), 166 deletions(-) diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 0613d995f6..6df08d1c0f 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -102,9 +102,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.33433 + weights: 0.37929 weights: 0 - weights: 1.14914 + weights: 1.04786 weights: 0 weights: 0 weights: 0 @@ -112,8 +112,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.6844 - weights: 1.72181 + weights: 4.06085 + weights: 1.72728 weights: 0 weights: 0 weights: 0 @@ -151,9 +151,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.57318 + weights: 0.98861 weights: 0 - weights: 1.52472 + weights: 0.86998 weights: 0 weights: 0 weights: 0 @@ -161,8 +161,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 11.50014 - weights: 7.74406 + weights: 8.53032 + weights: 7.3886 weights: 0 weights: 0 weights: 0 @@ -197,112 +197,112 @@ stat_weights_results: { dps_results: { key: "TestAffliction-Lvl40-Average-Default" value: { - dps: 589.7335 - tps: 558.99314 + dps: 600.83402 + tps: 569.22966 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 586.14869 - tps: 1187.06506 + dps: 597.40233 + tps: 1199.80946 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 586.14869 - tps: 555.35323 + dps: 597.40233 + tps: 565.79399 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 576.63077 - tps: 534.52574 + dps: 587.57903 + tps: 544.97873 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 369.10544 - tps: 997.3032 + dps: 377.07321 + tps: 1003.31266 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 369.10544 - tps: 356.11261 + dps: 377.07321 + tps: 363.68931 } } dps_results: { key: "TestAffliction-Lvl40-Settings-Orc-shadow-Affliction Warlock-affliction-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 375.98542 - tps: 349.74382 + dps: 380.10121 + tps: 353.70065 } } dps_results: { key: "TestAffliction-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 591.38767 - tps: 559.89636 + dps: 601.46916 + tps: 569.55922 } } dps_results: { key: "TestAffliction-Lvl50-Average-Default" value: { - dps: 1348.75704 - tps: 1144.79965 + dps: 1380.3489 + tps: 1172.11001 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1953.77428 - tps: 2704.98061 + dps: 1972.7389 + tps: 2718.99462 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1345.46103 - tps: 1143.46075 + dps: 1360.93407 + tps: 1152.18178 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1407.89852 - tps: 1218.97962 + dps: 1438.71508 + tps: 1246.14256 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1197.75979 - tps: 2075.21042 + dps: 1221.10196 + tps: 2098.31568 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 754.00531 - tps: 629.17208 + dps: 765.22689 + tps: 639.05056 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 748.67521 - tps: 657.61708 + dps: 752.69464 + tps: 657.02463 } } dps_results: { key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1352.18224 - tps: 1148.54549 + dps: 1388.72601 + tps: 1182.33053 } } diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results index 6a7c83c54c..7fe5292a31 100644 --- a/sim/warlock/dps/TestDemonology.results +++ b/sim/warlock/dps/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.01331 + weights: 0.15074 weights: 0 - weights: 0.53679 + weights: 0.9444 weights: 0 weights: 0 weights: 0 @@ -63,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 5.40535 - weights: 2.12408 + weights: 5.16824 + weights: 2.10439 weights: 0 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 644.30134 - tps: 535.48342 + dps: 655.4921 + tps: 545.9111 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 644.9294 - tps: 854.2803 + dps: 656.18105 + tps: 869.51358 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 644.9294 - tps: 537.44821 + dps: 656.18105 + tps: 548.00703 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 688.36389 - tps: 577.16233 + dps: 699.63125 + tps: 587.86449 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 374.56765 - tps: 675.01942 + dps: 377.74705 + tps: 680.05906 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 374.56765 - tps: 333.51743 + dps: 377.74705 + tps: 336.38272 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 427.48813 - tps: 369.96447 + dps: 431.0382 + tps: 373.24835 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 647.42559 - tps: 540.37038 + dps: 659.77487 + tps: 552.11402 } } diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index 4ddb013eb1..fcc1248ea3 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -200,7 +200,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.02789 + weights: 0.02921 weights: 0 weights: 0.13619 weights: 0 @@ -210,8 +210,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.0746 - weights: 0.16813 + weights: 3.12991 + weights: 0.17217 weights: 0 weights: 0 weights: 0 @@ -249,9 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -1.44202 + weights: 4.14701 weights: 0 - weights: 1.81676 + weights: -1.93254 weights: 0 weights: 0 weights: 0 @@ -259,8 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.55315 - weights: 7.46154 + weights: 15.16937 + weights: 7.04899 weights: 0 weights: 0 weights: 0 @@ -351,112 +351,112 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { - dps: 145.88362 - tps: 78.5602 + dps: 148.23564 + tps: 79.75196 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 143.06771 - tps: 1041.4637 + dps: 145.31144 + tps: 1049.74922 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 143.06771 - tps: 74.27992 + dps: 145.31144 + tps: 75.17466 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 239.97289 - tps: 160.13069 + dps: 244.27378 + tps: 163.63486 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 103.79064 - tps: 1017.94113 + dps: 104.98601 + tps: 1019.18379 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 103.79064 - tps: 65.5804 + dps: 104.98601 + tps: 65.64862 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-fire.imp-Destruction Warlock-fire.imp-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 166.18089 - tps: 112.4566 + dps: 168.07056 + tps: 114.08895 } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 143.33342 - tps: 74.63173 + dps: 145.5834 + tps: 75.53446 } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { - dps: 1279.64056 - tps: 1124.37828 + dps: 1307.94659 + tps: 1150.19087 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 2023.03682 - tps: 2526.57451 + dps: 2055.23046 + tps: 2564.04352 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1279.89626 - tps: 1126.77888 + dps: 1304.89164 + tps: 1149.87445 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1400.19427 - tps: 1252.13572 + dps: 1428.78065 + tps: 1278.84982 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1250.33491 - tps: 1871.63283 + dps: 1272.46907 + tps: 1894.5028 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 707.12608 - tps: 622.85398 + dps: 721.84525 + tps: 636.10559 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 753.10698 - tps: 680.0301 + dps: 762.59077 + tps: 688.99744 } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1265.86558 - tps: 1110.17806 + dps: 1298.07401 + tps: 1139.62091 } } diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results index b9c39977cd..267abac21a 100644 --- a/sim/warlock/tank/TestDemonology.results +++ b/sim/warlock/tank/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.53787 + weights: 0.11029 weights: 0 - weights: 0.96167 + weights: 0.40845 weights: 0 weights: 0 weights: 0 @@ -63,8 +63,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 6.33785 - weights: 1.43985 + weights: 6.4248 + weights: 1.49799 weights: 0 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 584.14614 - tps: 1116.55471 + dps: 595.65356 + tps: 1142.61143 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 547.58615 - tps: 1566.83604 + dps: 559.95417 + tps: 1599.42562 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 547.58615 - tps: 1054.63536 + dps: 559.95417 + tps: 1083.55832 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 574.45826 - tps: 1105.46708 + dps: 585.79062 + tps: 1131.21821 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 324.88775 - tps: 1244.32824 + dps: 328.98486 + tps: 1246.16221 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 324.88775 - tps: 680.77795 + dps: 328.98486 + tps: 690.61761 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 348.78087 - tps: 721.48947 + dps: 352.74924 + tps: 730.55989 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 580.66325 - tps: 1110.11424 + dps: 594.40653 + tps: 1139.19022 } } diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index 5c8642f1c0..cfb555af0a 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -200,9 +200,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.35384 + weights: 0.09994 weights: 0 - weights: 0.6606 + weights: 0.68129 weights: 0 weights: 0 weights: 0 @@ -210,8 +210,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 6.17043 - weights: 3.075 + weights: 6.06527 + weights: 3.1656 weights: 0 weights: 0 weights: 0 @@ -249,9 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 4.65261 + weights: -1.24421 weights: 0 - weights: 2.7333 + weights: 2.32713 weights: 0 weights: 0 weights: 0 @@ -259,8 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.82841 - weights: 5.20197 + weights: 6.21137 + weights: 5.08448 weights: 0 weights: 0 weights: 0 @@ -351,120 +351,120 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl40-Average-Default" value: { - dps: 492.09076 - tps: 1097.47155 + dps: 504.46959 + tps: 1128.04285 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 830.20472 - tps: 1810.90658 + dps: 851.89758 + tps: 1855.46543 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 457.89014 - tps: 1034.99179 + dps: 469.0978 + tps: 1062.70984 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 462.12157 - tps: 1002.41711 + dps: 473.88253 + tps: 1030.94712 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 589.19527 - tps: 1356.56892 + dps: 596.87175 + tps: 1371.83336 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 300.11888 - tps: 648.05459 + dps: 307.21401 + tps: 665.16201 } } dps_results: { key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 304.01599 - tps: 639.82598 + dps: 309.33175 + tps: 652.61655 } } dps_results: { key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 484.94757 - tps: 1085.30414 + dps: 497.66867 + tps: 1116.67967 } } dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { - dps: 1303.04733 - tps: 2143.55807 - hps: 19.32065 + dps: 1331.15289 + tps: 2194.26414 + hps: 19.32666 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1849.43339 - tps: 3913.73558 - hps: 15.29428 + dps: 1889.81144 + tps: 3984.79875 + hps: 15.16084 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1241.90915 - tps: 2042.32171 - hps: 15.32229 + dps: 1267.18345 + tps: 2079.68913 + hps: 15.31683 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1188.88109 - tps: 1999.75077 + dps: 1214.23011 + tps: 2045.49683 hps: 15.51045 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1172.34779 - tps: 2857.70841 - hps: 10.25167 + dps: 1186.57167 + tps: 2893.84073 + hps: 10.29667 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 715.59031 - tps: 1139.90073 - hps: 10.21333 + dps: 729.05897 + tps: 1163.96076 + hps: 10.16333 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 669.15792 - tps: 1098.91913 - hps: 10.36667 + dps: 678.93937 + tps: 1114.26487 + hps: 10.34167 } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1285.98691 - tps: 2118.11926 - hps: 19.63687 + dps: 1302.9345 + tps: 2144.57101 + hps: 19.64051 } } From 70f6b1327e89fd9501acbac947d5edefa4b614cd Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 18:04:55 -0700 Subject: [PATCH 4/6] Fix the rest of the pet stats --- sim/warlock/dps/TestDemonology.results | 22 +++++++------- sim/warlock/pet.go | 40 ++++++++++++------------- sim/warlock/tank/TestDemonology.results | 22 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results index 7fe5292a31..7c3f2f7f88 100644 --- a/sim/warlock/dps/TestDemonology.results +++ b/sim/warlock/dps/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.15074 + weights: 0.15094 weights: 0 - weights: 0.9444 + weights: 0.94405 weights: 0 weights: 0 weights: 0 @@ -63,7 +63,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 5.16824 + weights: 5.16606 weights: 2.10439 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 655.4921 + dps: 655.28542 tps: 545.9111 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 656.18105 + dps: 655.975 tps: 869.51358 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 656.18105 + dps: 655.975 tps: 548.00703 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 699.63125 + dps: 699.41532 tps: 587.86449 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 377.74705 + dps: 377.6193 tps: 680.05906 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 377.74705 + dps: 377.6193 tps: 336.38272 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-fire.succubus-Demonology Warlock-demonology-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 431.0382 + dps: 430.90288 tps: 373.24835 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 659.77487 + dps: 659.56968 tps: 552.11402 } } diff --git a/sim/warlock/pet.go b/sim/warlock/pet.go index 1742cde782..31a9c7910e 100644 --- a/sim/warlock/pet.go +++ b/sim/warlock/pet.go @@ -132,12 +132,12 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { } case 50: cfg.Stats = stats.Stats{ - stats.Strength: 74, - stats.Agility: 58, - stats.Stamina: 148, - stats.Intellect: 49, - stats.Spirit: 97, - stats.Mana: 521, + stats.Strength: 107, + stats.Agility: 71, + stats.Stamina: 190, + stats.Intellect: 59, + stats.Spirit: 123, + stats.Mana: 912, stats.MP5: 0, stats.MeleeCrit: 3.2685 * core.CritRatingPerCritChance, stats.SpellCrit: 3.3355 * core.CritRatingPerCritChance, @@ -217,12 +217,12 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { } case 50: cfg.Stats = stats.Stats{ - stats.Strength: 74, - stats.Agility: 58, - stats.Stamina: 148, - stats.Intellect: 49, - stats.Spirit: 97, - stats.Mana: 637, + stats.Strength: 107, + stats.Agility: 71, + stats.Stamina: 190, + stats.Intellect: 59, + stats.Spirit: 123, + stats.Mana: 1028, stats.MP5: 0, stats.MeleeCrit: 3.2685 * core.CritRatingPerCritChance, stats.SpellCrit: 3.3355 * core.CritRatingPerCritChance, @@ -302,12 +302,12 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { } case 50: cfg.Stats = stats.Stats{ - stats.Strength: 74, - stats.Agility: 58, - stats.Stamina: 148, - stats.Intellect: 49, - stats.Spirit: 97, - stats.Mana: 653, + stats.Strength: 107, + stats.Agility: 71, + stats.Stamina: 190, + stats.Intellect: 59, + stats.Spirit: 123, + stats.Mana: 912, stats.MP5: 0, stats.MeleeCrit: 3.2685 * core.CritRatingPerCritChance, stats.SpellCrit: 3.3355 * core.CritRatingPerCritChance, @@ -392,7 +392,7 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { stats.Stamina: 190, stats.Intellect: 59, stats.Spirit: 123, - stats.Mana: 717, + stats.Mana: 912, stats.MP5: 0, stats.MeleeCrit: 3.2685 * core.CritRatingPerCritChance, stats.SpellCrit: 3.3355 * core.CritRatingPerCritChance, @@ -559,7 +559,7 @@ func (warlock *Warlock) makeStatInheritance() core.PetStatInheritance { stats.Stamina: ownerStats[stats.Stamina] * 0.75, stats.Intellect: ownerStats[stats.Intellect] * 0.3, stats.Armor: ownerStats[stats.Armor] * 0.35, - stats.AttackPower: highestSchoolPower * 0.57, + stats.AttackPower: highestSchoolPower * 0.565, stats.MP5: ownerStats[stats.MP5] * 0.3, stats.SpellPower: ownerStats[stats.SpellPower] * 0.15, stats.SpellDamage: ownerStats[stats.SpellDamage] * 0.15, diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results index 267abac21a..0f4df18a32 100644 --- a/sim/warlock/tank/TestDemonology.results +++ b/sim/warlock/tank/TestDemonology.results @@ -53,9 +53,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.11029 + weights: 0.11041 weights: 0 - weights: 0.40845 + weights: 0.40799 weights: 0 weights: 0 weights: 0 @@ -63,7 +63,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 6.4248 + weights: 6.42199 weights: 1.49799 weights: 0 weights: 0 @@ -99,56 +99,56 @@ stat_weights_results: { dps_results: { key: "TestDemonology-Lvl40-Average-Default" value: { - dps: 595.65356 + dps: 595.44815 tps: 1142.61143 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 559.95417 + dps: 559.75431 tps: 1599.42562 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 559.95417 + dps: 559.75431 tps: 1083.55832 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 585.79062 + dps: 585.58191 tps: 1131.21821 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget" value: { - dps: 328.98486 + dps: 328.86938 tps: 1246.16221 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget" value: { - dps: 328.98486 + dps: 328.86938 tps: 690.61761 } } dps_results: { key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget" value: { - dps: 352.74924 + dps: 352.62937 tps: 730.55989 } } dps_results: { key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 594.40653 + dps: 594.2001 tps: 1139.19022 } } From 804f0044a27390e23b22fd8cf85412ca39866e9d Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 18:16:42 -0700 Subject: [PATCH 5/6] Include blood pact fix --- sim/core/buffs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/core/buffs.go b/sim/core/buffs.go index 9f3dac798d..eca9bd0731 100644 --- a/sim/core/buffs.go +++ b/sim/core/buffs.go @@ -167,7 +167,7 @@ var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{ stats.Stamina: 30, }, 50: stats.Stats{ - stats.Stamina: 42, + stats.Stamina: 38, }, 60: stats.Stats{ stats.Stamina: 42, From b95c4b62eb04fb8ffff5e8da01940dcb25e76736 Mon Sep 17 00:00:00 2001 From: nathro Date: Wed, 17 Apr 2024 18:20:40 -0700 Subject: [PATCH 6/6] Small tweak to imp stam with blood pact change and fixed tests --- sim/druid/balance/TestBalance.results | 4 +- sim/druid/feral/TestFeral.results | 4 +- sim/mage/TestFire.results | 4 +- sim/mage/TestFrost.results | 4 +- sim/mage/TestFrostFire.results | 4 +- sim/priest/shadow/TestShadow.results | 4 +- sim/shaman/elemental/TestElemental.results | 8 +-- .../enhancement/TestEnhancement.results | 4 +- sim/warlock/dps/TestAffliction.results | 44 +++++++-------- sim/warlock/dps/TestDestruction.results | 44 +++++++-------- sim/warlock/pet.go | 2 +- sim/warlock/tank/TestDestruction.results | 56 +++++++++---------- sim/warrior/dps/TestArms.results | 4 +- 13 files changed, 93 insertions(+), 93 deletions(-) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index b38870ec19..99b4b1da8a 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 163.8252 final_stats: 150.8166 - final_stats: 428.868 + final_stats: 422.6904 final_stats: 329.67 final_stats: 232.254 final_stats: 259 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 9.30629 final_stats: 0 final_stats: 0 - final_stats: 5404.014 + final_stats: 5339.1492 final_stats: 25.25 final_stats: 35.25 final_stats: 85.25 diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 09a77bec16..1b68816c7b 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 400.2372 final_stats: 391.9806 - final_stats: 458.568 + final_stats: 452.3904 final_stats: 155.034 final_stats: 189.486 final_stats: 0 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 27.63143 final_stats: 0 final_stats: 0 - final_stats: 5715.864 + final_stats: 5650.9992 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25 diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 4a0e8695b8..4be8295c82 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 121.0572 final_stats: 136.5606 - final_stats: 376.596 + final_stats: 370.4184 final_stats: 304.722 final_stats: 234.63 final_stats: 222 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 3.2 final_stats: 0 final_stats: 0 - final_stats: 4540.96 + final_stats: 4479.184 final_stats: 20.25 final_stats: 45.25 final_stats: 80.25 diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index 81f7f01422..0f4344399d 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -3,7 +3,7 @@ character_stats_results: { value: { final_stats: 121.0572 final_stats: 136.5606 - final_stats: 376.596 + final_stats: 370.4184 final_stats: 304.722 final_stats: 234.63 final_stats: 222 @@ -35,7 +35,7 @@ character_stats_results: { final_stats: 3.2 final_stats: 0 final_stats: 0 - final_stats: 4540.96 + final_stats: 4479.184 final_stats: 20.25 final_stats: 45.25 final_stats: 80.25 diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results index 2d9ced4970..651e5e5718 100644 --- a/sim/mage/TestFrostFire.results +++ b/sim/mage/TestFrostFire.results @@ -52,7 +52,7 @@ character_stats_results: { value: { final_stats: 121.0572 final_stats: 136.5606 - final_stats: 376.596 + final_stats: 370.4184 final_stats: 304.722 final_stats: 234.63 final_stats: 222 @@ -84,7 +84,7 @@ character_stats_results: { final_stats: 3.2 final_stats: 0 final_stats: 0 - final_stats: 4540.96 + final_stats: 4479.184 final_stats: 20.25 final_stats: 45.25 final_stats: 80.25 diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index 0fb13c769b..f74ba0985c 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 125.8092 final_stats: 140.1246 - final_stats: 401.544 + final_stats: 395.3664 final_stats: 271.458 final_stats: 220.374 final_stats: 196 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 3 final_stats: 0 final_stats: 0 - final_stats: 4807.44 + final_stats: 4745.664 final_stats: 23.25 final_stats: 23.25 final_stats: 83.25 diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 46b418a18b..fc89c1a4bb 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 242.2332 final_stats: 154.3806 - final_stats: 459.756 + final_stats: 453.5784 final_stats: 309.474 final_stats: 200.178 final_stats: 254 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 1.7 final_stats: 0 final_stats: 0 - final_stats: 5364.56 + final_stats: 5302.784 final_stats: 23.25 final_stats: 33.25 final_stats: 83.25 @@ -491,8 +491,8 @@ dps_results: { dps_results: { key: "TestElemental-Lvl50-Average-Default" value: { - dps: 1427.08483 - tps: 1207.0795 + dps: 1427.1341 + tps: 1207.13275 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 8031220ce2..8ca43635d9 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 368.1612 final_stats: 266.0526 - final_stats: 487.08 + final_stats: 480.9024 final_stats: 239.382 final_stats: 182.358 final_stats: 0 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 1.7 final_stats: 0 final_stats: 0 - final_stats: 5637.8 + final_stats: 5576.024 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25 diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results index 6df08d1c0f..6f3ad8641e 100644 --- a/sim/warlock/dps/TestAffliction.results +++ b/sim/warlock/dps/TestAffliction.results @@ -52,7 +52,7 @@ character_stats_results: { value: { final_stats: 136.5012 final_stats: 143.6886 - final_stats: 420.552 + final_stats: 414.3744 final_stats: 376.002 final_stats: 250.074 final_stats: 268 @@ -84,7 +84,7 @@ character_stats_results: { final_stats: 2 final_stats: 0 final_stats: 0 - final_stats: 5004.52 + final_stats: 4942.744 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25 @@ -151,9 +151,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.98861 + weights: 1.53967 weights: 0 - weights: 0.86998 + weights: 2.9153 weights: 0 weights: 0 weights: 0 @@ -161,8 +161,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 8.53032 - weights: 7.3886 + weights: 11.56966 + weights: 7.72247 weights: 0 weights: 0 weights: 0 @@ -253,56 +253,56 @@ dps_results: { dps_results: { key: "TestAffliction-Lvl50-Average-Default" value: { - dps: 1380.3489 - tps: 1172.11001 + dps: 1378.67731 + tps: 1170.64156 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1972.7389 - tps: 2718.99462 + dps: 1978.54276 + tps: 2723.3656 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1360.93407 - tps: 1152.18178 + dps: 1366.80085 + tps: 1158.25072 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1438.71508 - tps: 1246.14256 + dps: 1436.89055 + tps: 1244.52811 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1221.10196 - tps: 2098.31568 + dps: 1215.3206 + tps: 2094.72172 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 765.22689 - tps: 639.05056 + dps: 760.7607 + tps: 635.72938 } } dps_results: { key: "TestAffliction-Lvl50-Settings-Orc-nf.ruin-Destruction Warlock-nf.ruin-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 752.69464 - tps: 657.02463 + dps: 751.33584 + tps: 655.71664 } } dps_results: { key: "TestAffliction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1388.72601 - tps: 1182.33053 + dps: 1389.08921 + tps: 1183.92177 } } diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results index fcc1248ea3..5f46da7466 100644 --- a/sim/warlock/dps/TestDestruction.results +++ b/sim/warlock/dps/TestDestruction.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 136.5012 final_stats: 143.6886 - final_stats: 445.78512 + final_stats: 439.23686 final_stats: 370.062 final_stats: 245.07252 final_stats: 259 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 2 final_stats: 0 final_stats: 0 - final_stats: 5256.8512 + final_stats: 5191.36864 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25 @@ -249,9 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 4.14701 + weights: 4.74309 weights: 0 - weights: -1.93254 + weights: 0.92235 weights: 0 weights: 0 weights: 0 @@ -259,8 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 15.16937 - weights: 7.04899 + weights: 14.9734 + weights: 7.72797 weights: 0 weights: 0 weights: 0 @@ -407,56 +407,56 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { - dps: 1307.94659 - tps: 1150.19087 + dps: 1306.47495 + tps: 1148.86545 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 2055.23046 - tps: 2564.04352 + dps: 2053.0088 + tps: 2560.13324 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1304.89164 - tps: 1149.87445 + dps: 1304.22093 + tps: 1149.25913 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1428.78065 - tps: 1278.84982 + dps: 1427.01417 + tps: 1277.19905 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1272.46907 - tps: 1894.5028 + dps: 1271.43318 + tps: 1891.32739 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 721.84525 - tps: 636.10559 + dps: 722.91023 + tps: 637.31062 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-backdraft-Destruction Warlock-backdraft-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 762.59077 - tps: 688.99744 + dps: 761.69938 + tps: 688.15459 } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1298.07401 - tps: 1139.62091 + dps: 1293.71058 + tps: 1135.27633 } } diff --git a/sim/warlock/pet.go b/sim/warlock/pet.go index 31a9c7910e..520addc70a 100644 --- a/sim/warlock/pet.go +++ b/sim/warlock/pet.go @@ -65,7 +65,7 @@ func (warlock *Warlock) NewWarlockPet() *WarlockPet { cfg.Stats = stats.Stats{ stats.Strength: 101, stats.Agility: 32, - stats.Stamina: 72, + stats.Stamina: 71, stats.Intellect: 212, stats.Spirit: 211, stats.Mana: 476, diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results index cfb555af0a..d522ed5a79 100644 --- a/sim/warlock/tank/TestDestruction.results +++ b/sim/warlock/tank/TestDestruction.results @@ -101,7 +101,7 @@ character_stats_results: { value: { final_stats: 136.5012 final_stats: 143.6886 - final_stats: 484.704 + final_stats: 478.5264 final_stats: 284.526 final_stats: 241.758 final_stats: 262 @@ -133,7 +133,7 @@ character_stats_results: { final_stats: 2 final_stats: 0 final_stats: 0 - final_stats: 5646.04 + final_stats: 5584.264 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25 @@ -249,9 +249,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -1.24421 + weights: -9.40684 weights: 0 - weights: 2.32713 + weights: -5.68032 weights: 0 weights: 0 weights: 0 @@ -259,8 +259,8 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 6.21137 - weights: 5.08448 + weights: 8.52021 + weights: 5.3481 weights: 0 weights: 0 weights: 0 @@ -407,64 +407,64 @@ dps_results: { dps_results: { key: "TestDestruction-Lvl50-Average-Default" value: { - dps: 1331.15289 - tps: 2194.26414 - hps: 19.32666 + dps: 1329.56022 + tps: 2191.24494 + hps: 19.3252 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1889.81144 - tps: 3984.79875 - hps: 15.16084 + dps: 1884.4434 + tps: 3974.59046 + hps: 15.20046 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 1267.18345 - tps: 2079.68913 - hps: 15.31683 + dps: 1269.10764 + tps: 2085.30524 + hps: 15.35873 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 1214.23011 - tps: 2045.49683 + dps: 1212.87989 + tps: 2042.93608 hps: 15.51045 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget" value: { - dps: 1186.57167 - tps: 2893.84073 - hps: 10.29667 + dps: 1186.0415 + tps: 2894.00446 + hps: 10.225 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget" value: { - dps: 729.05897 - tps: 1163.96076 - hps: 10.16333 + dps: 721.92322 + tps: 1148.56177 + hps: 10.135 } } dps_results: { key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget" value: { - dps: 678.93937 - tps: 1114.26487 + dps: 678.21943 + tps: 1112.91319 hps: 10.34167 } } dps_results: { key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1302.9345 - tps: 2144.57101 - hps: 19.64051 + dps: 1310.22295 + tps: 2157.65433 + hps: 19.89144 } } diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results index b46e39da96..dfe35a7c24 100644 --- a/sim/warrior/dps/TestArms.results +++ b/sim/warrior/dps/TestArms.results @@ -3,7 +3,7 @@ character_stats_results: { value: { final_stats: 375.2892 final_stats: 317.1366 - final_stats: 534.6 + final_stats: 528.4224 final_stats: 93.258 final_stats: 126.522 final_stats: 0 @@ -35,7 +35,7 @@ character_stats_results: { final_stats: 18.77824 final_stats: 0 final_stats: 0 - final_stats: 6245 + final_stats: 6183.224 final_stats: 20.25 final_stats: 20.25 final_stats: 80.25