diff --git a/proto/warlock.proto b/proto/warlock.proto index efde46f93f..9e387cca6c 100644 --- a/proto/warlock.proto +++ b/proto/warlock.proto @@ -211,7 +211,7 @@ message Warlock { Armor armor = 1; Summon summon = 2; WeaponImbue weaponImbue = 3; - bool newDPBehaviour = 4; + bool _oldDPBehaviourOption = 4; } Options options = 3; } diff --git a/sim/warlock/TestAffliction.results b/sim/warlock/TestAffliction.results index aed916e6b9..6ff59c075a 100644 --- a/sim/warlock/TestAffliction.results +++ b/sim/warlock/TestAffliction.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 320.1 final_stats: 322.3 - final_stats: 1705.55 - final_stats: 1566.4 - final_stats: 946 - final_stats: 4123.8 + final_stats: 1993.75 + final_stats: 1852.4 + final_stats: 411.4 + final_stats: 4336.42 final_stats: 109 - final_stats: 359.69598 - final_stats: 1481.01293 - final_stats: 757 + final_stats: 367.69598 + final_stats: 2068.7876 + final_stats: 1303 final_stats: 0 final_stats: 1184.81 - final_stats: 281 - final_stats: 1091.89543 - final_stats: 697 + final_stats: 289 + final_stats: 1600.89543 + final_stats: 1243 final_stats: 0 final_stats: 0 - final_stats: 27072 + final_stats: 31362 final_stats: 0 final_stats: 0 - final_stats: 5678.1 + final_stats: 5811.1 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 24039.5 + final_stats: 26921.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,787 +46,780 @@ character_stats_results: { dps_results: { key: "TestAffliction-AllItems-Althor'sAbacus-50359" value: { - dps: 11589.67197 - tps: 10452.41374 + dps: 14532.12718 + tps: 13402.16189 } } dps_results: { key: "TestAffliction-AllItems-Althor'sAbacus-50366" value: { - dps: 11638.93297 - tps: 10499.40259 + dps: 14587.7418 + tps: 13453.89144 } } dps_results: { key: "TestAffliction-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 11413.87238 - tps: 10287.8283 + dps: 14354.61133 + tps: 13231.66862 } } dps_results: { key: "TestAffliction-AllItems-AustereEarthsiegeDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-Bandit'sInsignia-40371" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-BaubleofTrueBlood-50354" value: { - dps: 11219.32577 - tps: 10104.34087 - hps: 95.37766 + dps: 14102.87006 + tps: 12995.52847 + hps: 101.60403 } } dps_results: { key: "TestAffliction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 11219.32577 - tps: 10104.34087 - hps: 95.37766 + dps: 14102.87006 + tps: 12995.52847 + hps: 101.60403 } } dps_results: { key: "TestAffliction-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 11491.60505 - tps: 10354.42035 + dps: 14745.04414 + tps: 13613.86083 } } dps_results: { key: "TestAffliction-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8955.3686 - tps: 8057.14462 + dps: 10582.43435 + tps: 9649.96641 } } dps_results: { key: "TestAffliction-AllItems-BracingEarthsiegeDiamond" value: { - dps: 11496.2097 - tps: 10154.62872 + dps: 14755.68102 + tps: 13350.78411 } } dps_results: { key: "TestAffliction-AllItems-ChaoticSkyflareDiamond" value: { - dps: 11676.3189 - tps: 10542.71746 + dps: 15089.13707 + tps: 13958.16817 } } dps_results: { key: "TestAffliction-AllItems-CorpseTongueCoin-50349" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-CorpseTongueCoin-50352" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 hps: 64 } } dps_results: { key: "TestAffliction-AllItems-DarkCoven'sRegalia" value: { - dps: 11571.86984 - tps: 10515.76953 + dps: 13593.26697 + tps: 12498.20172 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 11299.16902 - tps: 10176.26635 + dps: 14187.30144 + tps: 13077.05597 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Death-42990" value: { - dps: 11349.99617 - tps: 10230.42741 + dps: 14289.22352 + tps: 13181.52859 } } dps_results: { key: "TestAffliction-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 11336.58355 - tps: 10220.84977 + dps: 14209.88121 + tps: 13089.90289 } } dps_results: { key: "TestAffliction-AllItems-Death'sChoice-47464" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 11258.48252 - tps: 10143.37591 + dps: 14159.31489 + tps: 13050.99243 } } dps_results: { key: "TestAffliction-AllItems-Deathbringer'sWill-50362" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-Deathbringer'sWill-50363" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-DeathbringerGarb" value: { - dps: 9925.25797 - tps: 8937.44783 + dps: 11650.43747 + tps: 10622.86736 } } dps_results: { key: "TestAffliction-AllItems-Defender'sCode-40257" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-DestructiveSkyflareDiamond" value: { - dps: 11468.61093 - tps: 10335.0095 - } -} -dps_results: { - key: "TestAffliction-AllItems-DislodgedForeignObject-50348" - value: { - dps: 11993.48358 - tps: 10846.68163 + dps: 14736.58505 + tps: 13605.61615 } } dps_results: { key: "TestAffliction-AllItems-DislodgedForeignObject-50353" value: { - dps: 11904.79561 - tps: 10766.46936 + dps: 14996.46395 + tps: 13870.79952 } } dps_results: { key: "TestAffliction-AllItems-EffulgentSkyflareDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-EmberSkyflareDiamond" value: { - dps: 11550.40755 - tps: 10409.37533 + dps: 14794.3012 + tps: 13659.96837 } } dps_results: { key: "TestAffliction-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 11466.25966 - tps: 10332.65823 + dps: 14731.4596 + tps: 13600.4907 } } dps_results: { key: "TestAffliction-AllItems-EnigmaticStarflareDiamond" value: { - dps: 11462.64607 - tps: 10329.04463 + dps: 14725.54255 + tps: 13594.57365 } } dps_results: { key: "TestAffliction-AllItems-EphemeralSnowflake-50260" value: { - dps: 11415.58201 - tps: 10301.0259 + dps: 14321.15239 + tps: 13215.63206 } } dps_results: { key: "TestAffliction-AllItems-EssenceofGossamer-37220" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-EternalEarthsiegeDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 11392.38805 - tps: 10279.20572 + dps: 14348.90038 + tps: 13243.95278 } } dps_results: { key: "TestAffliction-AllItems-EyeoftheBroodmother-45308" value: { - dps: 11613.63318 - tps: 10483.35914 + dps: 14564.89863 + tps: 13441.19126 } } dps_results: { key: "TestAffliction-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 11249.81753 - tps: 10132.57025 + dps: 14130.19689 + tps: 13017.96204 } } dps_results: { key: "TestAffliction-AllItems-ForethoughtTalisman-40258" value: { - dps: 11454.81557 - tps: 10326.95014 + dps: 14367.56257 + tps: 13245.62365 } } dps_results: { key: "TestAffliction-AllItems-ForgeEmber-37660" value: { - dps: 11451.50911 - tps: 10328.09448 + dps: 14404.81624 + tps: 13286.19418 } } dps_results: { key: "TestAffliction-AllItems-ForlornSkyflareDiamond" value: { - dps: 11496.2097 - tps: 10359.9915 + dps: 14755.68102 + tps: 13621.27189 } } dps_results: { key: "TestAffliction-AllItems-ForlornStarflareDiamond" value: { - dps: 11483.10081 - tps: 10346.93252 + dps: 14743.43337 + tps: 13609.60132 } } dps_results: { key: "TestAffliction-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-FuturesightRune-38763" value: { - dps: 11396.66909 - tps: 10272.15143 + dps: 14329.20709 + tps: 13211.02531 } } dps_results: { key: "TestAffliction-AllItems-Gladiator'sFelshroud" value: { - dps: 9767.00232 - tps: 8803.57053 + dps: 11344.51693 + tps: 10346.99931 } } dps_results: { key: "TestAffliction-AllItems-GlowingTwilightScale-54573" value: { - dps: 11606.41539 - tps: 10468.57327 + dps: 14560.53034 + tps: 13429.15609 } } dps_results: { key: "TestAffliction-AllItems-GlowingTwilightScale-54589" value: { - dps: 11672.83693 - tps: 10531.51463 + dps: 14632.80567 + tps: 13496.33259 } } dps_results: { key: "TestAffliction-AllItems-GnomishLightningGenerator-41121" value: { - dps: 11328.90434 - tps: 10205.04178 + dps: 14326.63686 + tps: 13223.84466 } } dps_results: { key: "TestAffliction-AllItems-Gul'dan'sRegalia" value: { - dps: 10182.41944 - tps: 9094.66969 + dps: 11950.03274 + tps: 10808.02752 } } dps_results: { key: "TestAffliction-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 11619.6888 - tps: 10481.11354 + dps: 14571.67914 + tps: 13438.74422 } } dps_results: { key: "TestAffliction-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 11466.25966 - tps: 10332.65823 + dps: 14731.4596 + tps: 13600.4907 } } dps_results: { key: "TestAffliction-AllItems-ImpassiveStarflareDiamond" value: { - dps: 11462.64607 - tps: 10329.04463 + dps: 14725.54255 + tps: 13594.57365 } } dps_results: { key: "TestAffliction-AllItems-IncisorFragment-37723" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 11459.5391 - tps: 10323.93 + dps: 14710.22974 + tps: 13577.65363 } } dps_results: { key: "TestAffliction-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-MajesticDragonFigurine-40430" value: { - dps: 11421.23209 - tps: 10295.25432 + dps: 14346.29996 + tps: 13225.54578 } } dps_results: { key: "TestAffliction-AllItems-MaleficRaiment" value: { - dps: 7589.97796 - tps: 6721.58269 + dps: 8772.95422 + tps: 7865.02912 } } dps_results: { key: "TestAffliction-AllItems-MeteoriteWhetstone-37390" value: { - dps: 11315.5337 - tps: 10200.4271 + dps: 14215.7938 + tps: 13107.47134 } } dps_results: { key: "TestAffliction-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 11949.67282 - tps: 10816.94364 + dps: 14752.0621 + tps: 13632.47425 } } dps_results: { key: "TestAffliction-AllItems-OfferingofSacrifice-37638" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-PersistentEarthshatterDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedScarab-21685" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-PlagueheartGarb" value: { - dps: 9359.44073 - tps: 8392.88387 + dps: 11029.70303 + tps: 10032.86984 } } dps_results: { key: "TestAffliction-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-PurifiedShardoftheGods" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-ReignoftheDead-47316" value: { - dps: 11613.06369 - tps: 10482.68486 + dps: 14631.73729 + tps: 13511.15224 } } dps_results: { key: "TestAffliction-AllItems-ReignoftheDead-47477" value: { - dps: 11679.32166 - tps: 10546.02539 + dps: 14683.46848 + tps: 13560.40485 } } dps_results: { key: "TestAffliction-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 11650.07356 - tps: 10516.47212 + dps: 15056.8563 + tps: 13925.8874 } } dps_results: { key: "TestAffliction-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 11448.65453 - tps: 10313.21361 + dps: 14712.40862 + tps: 13580.66806 } } dps_results: { key: "TestAffliction-AllItems-RuneofRepulsion-40372" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-SealofthePantheon-36993" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-ShinyShardoftheGods" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-SliverofPureIce-50339" value: { - dps: 11570.00502 - tps: 10439.46262 + dps: 14512.3744 + tps: 13388.13321 } } dps_results: { key: "TestAffliction-AllItems-SliverofPureIce-50346" value: { - dps: 11589.72415 - tps: 10453.99405 + dps: 14542.70136 + tps: 13415.6071 } } dps_results: { key: "TestAffliction-AllItems-SoulPreserver-37111" value: { - dps: 11373.85802 - tps: 10249.78418 + dps: 14298.97625 + tps: 13180.67101 } } dps_results: { key: "TestAffliction-AllItems-SouloftheDead-40382" value: { - dps: 11360.19477 - tps: 10246.13078 + dps: 14270.61247 + tps: 13164.99685 } } dps_results: { key: "TestAffliction-AllItems-SparkofLife-37657" value: { - dps: 11381.57103 - tps: 10259.64889 + dps: 14321.71735 + tps: 13213.62422 } } dps_results: { key: "TestAffliction-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 11198.49236 - tps: 10072.41303 + dps: 14110.97691 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-SwiftSkyflareDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-SwiftStarflareDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-SwiftWindfireDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 11304.61296 - tps: 10184.06172 + dps: 14213.66854 + tps: 13100.50413 } } dps_results: { key: "TestAffliction-AllItems-TearsoftheVanquished-47215" value: { - dps: 11227.69581 - tps: 10109.72371 + dps: 14150.10635 + tps: 13038.55873 } } dps_results: { key: "TestAffliction-AllItems-TheGeneral'sHeart-45507" value: { - dps: 11219.85195 - tps: 10104.74534 + dps: 14108.64121 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-ThunderingSkyflareDiamond" value: { - dps: 11442.18137 - tps: 10308.57993 + dps: 14701.84421 + tps: 13570.87531 } } dps_results: { key: "TestAffliction-AllItems-TinyAbominationinaJar-50351" value: { - dps: 11200.17331 - tps: 10072.41303 + dps: 14113.23887 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 11200.17331 - tps: 10072.41303 + dps: 14113.23887 + tps: 13000.31875 } } dps_results: { key: "TestAffliction-AllItems-TirelessSkyflareDiamond" value: { - dps: 11496.2097 - tps: 10359.9915 + dps: 14755.68102 + tps: 13621.27189 } } dps_results: { key: "TestAffliction-AllItems-TirelessStarflareDiamond" value: { - dps: 11483.10081 - tps: 10346.93252 + dps: 14743.43337 + tps: 13609.60132 } } dps_results: { key: "TestAffliction-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 11486.28331 - tps: 10362.89506 + dps: 14392.10629 + tps: 13279.24978 } } dps_results: { key: "TestAffliction-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 11483.10081 - tps: 10346.93252 + dps: 14743.43337 + tps: 13609.60132 } } dps_results: { key: "TestAffliction-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 11496.2097 - tps: 10359.9915 + dps: 14755.68102 + tps: 13621.27189 } } dps_results: { key: "TestAffliction-AllItems-WingedTalisman-37844" value: { - dps: 11364.25543 - tps: 10240.43639 + dps: 14285.24711 + tps: 13168.80239 } } dps_results: { key: "TestAffliction-Average-Default" value: { - dps: 11806.03711 - tps: 10670.62344 + dps: 15201.06628 + tps: 14066.48026 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--FullBuffs-LongMultiTarget" value: { - dps: 30582.95058 - tps: 35643.74638 + dps: 37704.28518 + tps: 43368.51946 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--FullBuffs-LongSingleTarget" value: { - dps: 11724.35268 - tps: 10597.71332 + dps: 15075.37053 + tps: 13948.48929 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--FullBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--FullBuffs-ShortSingleTarget" value: { - dps: 12726.32274 - tps: 11558.42963 + dps: 16509.72185 + tps: 15329.92017 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--NoBuffs-LongMultiTarget" value: { - dps: 18393.00186 - tps: 23757.31598 + dps: 23075.07508 + tps: 29011.85942 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--NoBuffs-LongSingleTarget" value: { - dps: 6847.34472 - tps: 6440.97942 + dps: 9069.77767 + tps: 8658.99455 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-AffItemSwap--NoBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-AffItemSwap--NoBuffs-ShortSingleTarget" value: { - dps: 6783.22791 - tps: 6287.07162 + dps: 8679.63662 + tps: 8155.61814 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--FullBuffs-LongMultiTarget" value: { - dps: 33161.27282 - tps: 38262.64229 + dps: 39808.07096 + tps: 45611.29526 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--FullBuffs-LongSingleTarget" value: { - dps: 11676.3189 - tps: 10542.71746 + dps: 15089.13707 + tps: 13958.16817 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--FullBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12803.15133 - tps: 11637.50671 + dps: 16484.65086 + tps: 15302.448 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-LongMultiTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--NoBuffs-LongMultiTarget" value: { - dps: 20117.55745 - tps: 25576.82835 + dps: 24462.22984 + tps: 30517.14225 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-LongSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6839.51257 - tps: 6433.68312 + dps: 9061.67313 + tps: 8650.0198 } } dps_results: { - key: "TestAffliction-Settings-Orc-p3_affliction_alliance-Affliction Warlock--NoBuffs-ShortSingleTarget" + key: "TestAffliction-Settings-Orc-p4_affliction-Affliction Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6779.2589 - tps: 6282.50028 + dps: 8750.39993 + tps: 8230.0116 } } dps_results: { key: "TestAffliction-SwitchInFrontOfTarget-Default" value: { - dps: 11634.95167 - tps: 10542.71746 + dps: 15042.64073 + tps: 13958.16817 } } diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results index da9caf2bb7..e101eaee66 100644 --- a/sim/warlock/TestDemonology.results +++ b/sim/warlock/TestDemonology.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 320.1 final_stats: 322.3 - final_stats: 1901.515 - final_stats: 1565.3 - final_stats: 1400.3 - final_stats: 4293.117 + final_stats: 2193.125 + final_stats: 1852.4 + final_stats: 998.8 + final_stats: 4643.532 final_stats: 109 - final_stats: 347 - final_stats: 1772.76982 - final_stats: 719 + final_stats: 369 + final_stats: 2245.84747 + final_stats: 1177 final_stats: 0 final_stats: 1184.81 - final_stats: 347 - final_stats: 1383.9553 - final_stats: 479 + final_stats: 369 + final_stats: 1777.9553 + final_stats: 937 final_stats: 0 final_stats: 0 - final_stats: 27867.165 + final_stats: 32302.86 final_stats: 0 final_stats: 0 - final_stats: 5678.1 + final_stats: 5811.1 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 26779.1245 + final_stats: 29782.7075 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,787 +46,780 @@ character_stats_results: { dps_results: { key: "TestDemonology-AllItems-Althor'sAbacus-50359" value: { - dps: 10604.30798 - tps: 8885.1363 + dps: 13624.11997 + tps: 11854.08317 } } dps_results: { key: "TestDemonology-AllItems-Althor'sAbacus-50366" value: { - dps: 10640.14789 - tps: 8916.36317 + dps: 13664.4972 + tps: 11890.23544 } } dps_results: { key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 10471.71694 - tps: 8770.33561 + dps: 13495.49957 + tps: 11740.5329 } } dps_results: { key: "TestDemonology-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10662.2963 - tps: 8920.39325 + dps: 13817.62655 + tps: 12029.82944 } } dps_results: { key: "TestDemonology-AllItems-Bandit'sInsignia-40371" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10295.92428 - tps: 8616.2298 - hps: 98.20466 + dps: 13266.49242 + tps: 11532.9444 + hps: 102.24381 } } dps_results: { key: "TestDemonology-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10295.92428 - tps: 8616.2298 - hps: 98.20466 + dps: 13266.49242 + tps: 11532.9444 + hps: 102.24381 } } dps_results: { key: "TestDemonology-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10667.96044 - tps: 8924.92243 + dps: 13822.49123 + tps: 12035.64378 } } dps_results: { key: "TestDemonology-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8341.7356 - tps: 6969.29925 + dps: 10078.59391 + tps: 8607.99461 } } dps_results: { key: "TestDemonology-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10688.14397 - tps: 8765.37118 + dps: 13838.4474 + tps: 11808.17737 } } dps_results: { key: "TestDemonology-AllItems-ChaoticSkyflareDiamond" value: { - dps: 10879.36103 - tps: 9138.29292 + dps: 14192.11049 + tps: 12405.09214 } } dps_results: { key: "TestDemonology-AllItems-CorpseTongueCoin-50349" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-CorpseTongueCoin-50352" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10352.6133 - tps: 8665.46136 + dps: 13329.62624 + tps: 11589.48893 hps: 64 } } dps_results: { key: "TestDemonology-AllItems-DarkCoven'sRegalia" value: { - dps: 10968.26577 - tps: 9379.56995 + dps: 12940.86626 + tps: 11232.9057 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10428.19472 - tps: 8748.06518 + dps: 13425.32394 + tps: 11691.57919 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10464.76723 - tps: 8785.35934 + dps: 13452.65876 + tps: 11718.97961 } } dps_results: { key: "TestDemonology-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10421.66512 - tps: 8734.68072 + dps: 13403.67171 + tps: 11664.03512 } } dps_results: { key: "TestDemonology-AllItems-Death'sChoice-47464" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10334.83643 - tps: 8654.70689 + dps: 13309.98903 + tps: 11576.24428 } } dps_results: { key: "TestDemonology-AllItems-Deathbringer'sWill-50362" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-Deathbringer'sWill-50363" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-DeathbringerGarb" value: { - dps: 9323.55579 - tps: 7853.2179 + dps: 11002.49343 + tps: 9418.62314 } } dps_results: { key: "TestDemonology-AllItems-Defender'sCode-40257" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10677.40562 - tps: 8936.33751 - } -} -dps_results: { - key: "TestDemonology-AllItems-DislodgedForeignObject-50348" - value: { - dps: 11091.65342 - tps: 9354.00944 + dps: 13851.58794 + tps: 12064.56959 } } dps_results: { key: "TestDemonology-AllItems-DislodgedForeignObject-50353" value: { - dps: 11016.19821 - tps: 9287.5221 + dps: 14114.36706 + tps: 12331.23433 } } dps_results: { key: "TestDemonology-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10662.2963 - tps: 8920.39325 + dps: 13817.62655 + tps: 12029.82944 } } dps_results: { key: "TestDemonology-AllItems-EmberSkyflareDiamond" value: { - dps: 10693.85349 - tps: 8945.53008 + dps: 13853.24196 + tps: 12061.6652 } } dps_results: { key: "TestDemonology-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10675.09603 - tps: 8934.02792 + dps: 13844.70562 + tps: 12057.68727 } } dps_results: { key: "TestDemonology-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10671.10698 - tps: 8930.03887 + dps: 13836.96673 + tps: 12049.94838 } } dps_results: { key: "TestDemonology-AllItems-EphemeralSnowflake-50260" value: { - dps: 10508.42814 - tps: 8829.57244 + dps: 13456.88075 + tps: 11724.77127 } } dps_results: { key: "TestDemonology-AllItems-EssenceofGossamer-37220" value: { - dps: 10332.43945 - tps: 8648.95559 + dps: 13300.5819 + tps: 11563.48707 } } dps_results: { key: "TestDemonology-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10447.05207 - tps: 8769.17559 + dps: 13443.62748 + tps: 11709.80348 } } dps_results: { key: "TestDemonology-AllItems-EyeoftheBroodmother-45308" value: { - dps: 10642.46846 - tps: 8935.15369 + dps: 13693.22505 + tps: 11932.73771 } } dps_results: { key: "TestDemonology-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10346.82782 - tps: 8661.34453 + dps: 13298.99725 + tps: 11560.50993 } } dps_results: { key: "TestDemonology-AllItems-ForethoughtTalisman-40258" value: { - dps: 10493.03378 - tps: 8789.11652 + dps: 13501.03875 + tps: 11744.54941 } } dps_results: { key: "TestDemonology-AllItems-ForgeEmber-37660" value: { - dps: 10614.89225 - tps: 8909.05579 + dps: 13640.03525 + tps: 11880.68989 } } dps_results: { key: "TestDemonology-AllItems-ForlornSkyflareDiamond" value: { - dps: 10688.14397 - tps: 8942.10206 + dps: 13838.4474 + tps: 12046.8906 } } dps_results: { key: "TestDemonology-AllItems-ForlornStarflareDiamond" value: { - dps: 10685.36395 - tps: 8940.21624 + dps: 13840.82475 + tps: 12050.30291 } } dps_results: { key: "TestDemonology-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-FuturesightRune-38763" value: { - dps: 10462.51043 - tps: 8762.40805 + dps: 13473.3569 + tps: 11719.65512 } } dps_results: { key: "TestDemonology-AllItems-Gladiator'sFelshroud" value: { - dps: 9175.02132 - tps: 7691.21526 + dps: 10796.59802 + tps: 9208.58986 } } dps_results: { key: "TestDemonology-AllItems-GlowingTwilightScale-54573" value: { - dps: 10622.39824 - tps: 8900.97561 + dps: 13642.61537 + tps: 11870.74004 } } dps_results: { key: "TestDemonology-AllItems-GlowingTwilightScale-54589" value: { - dps: 10667.97335 - tps: 8940.56507 + dps: 13689.80325 + tps: 11913.10056 } } dps_results: { key: "TestDemonology-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10453.80293 - tps: 8775.51739 + dps: 13403.1943 + tps: 11669.62528 } } dps_results: { key: "TestDemonology-AllItems-Gul'dan'sRegalia" value: { - dps: 9615.19692 - tps: 7984.96246 + dps: 11347.09919 + tps: 9591.22904 } } dps_results: { key: "TestDemonology-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 10627.01591 - tps: 8903.85379 + dps: 13653.07416 + tps: 11879.60228 } } dps_results: { key: "TestDemonology-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10675.09603 - tps: 8934.02792 + dps: 13844.70562 + tps: 12057.68727 } } dps_results: { key: "TestDemonology-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10671.10698 - tps: 8930.03887 + dps: 13836.96673 + tps: 12049.94838 } } dps_results: { key: "TestDemonology-AllItems-IncisorFragment-37723" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10668.8285 - tps: 8927.3497 + dps: 13831.21852 + tps: 12044.44003 } } dps_results: { key: "TestDemonology-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10499.11872 - tps: 8794.14199 + dps: 13512.84433 + tps: 11754.56046 } } dps_results: { key: "TestDemonology-AllItems-MaleficRaiment" value: { - dps: 7250.63571 - tps: 5975.51356 + dps: 8643.10423 + tps: 7271.39932 } } dps_results: { key: "TestDemonology-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10394.63379 - tps: 8714.50425 + dps: 13376.74475 + tps: 11643 } } dps_results: { key: "TestDemonology-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10575.95678 - tps: 8872.03951 + dps: 13572.85414 + tps: 11816.36481 } } dps_results: { key: "TestDemonology-AllItems-OfferingofSacrifice-37638" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedScarab-21685" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-PlagueheartGarb" value: { - dps: 8883.42606 - tps: 7445.29568 + dps: 10458.22674 + tps: 8913.12001 } } dps_results: { key: "TestDemonology-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10661.06357 - tps: 8919.31291 + dps: 13816.15504 + tps: 12028.50394 } } dps_results: { key: "TestDemonology-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10662.2963 - tps: 8920.39325 + dps: 13817.62655 + tps: 12029.82944 } } dps_results: { key: "TestDemonology-AllItems-PurifiedShardoftheGods" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-ReignoftheDead-47316" value: { - dps: 10753.47171 - tps: 9040.65571 + dps: 13800.67135 + tps: 12036.30976 } } dps_results: { key: "TestDemonology-AllItems-ReignoftheDead-47477" value: { - dps: 10793.89503 - tps: 9076.93663 + dps: 13882.1557 + tps: 12114.57723 } } dps_results: { key: "TestDemonology-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 10856.99425 - tps: 9115.92614 + dps: 14154.91144 + tps: 12367.89309 } } dps_results: { key: "TestDemonology-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10661.72155 - tps: 8918.29649 + dps: 13798.58573 + tps: 12011.29003 } } dps_results: { key: "TestDemonology-AllItems-RuneofRepulsion-40372" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-SealofthePantheon-36993" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-ShinyShardoftheGods" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10352.6133 - tps: 8665.46136 + dps: 13329.62624 + tps: 11589.48893 } } dps_results: { key: "TestDemonology-AllItems-SliverofPureIce-50339" value: { - dps: 10590.20999 - tps: 8876.56401 + dps: 13597.89716 + tps: 11834.87613 } } dps_results: { key: "TestDemonology-AllItems-SliverofPureIce-50346" value: { - dps: 10619.29681 - tps: 8901.39628 + dps: 13640.89789 + tps: 11873.87326 } } dps_results: { key: "TestDemonology-AllItems-SoulPreserver-37111" value: { - dps: 10419.47552 - tps: 8723.56962 + dps: 13429.10951 + tps: 11680.52207 } } dps_results: { key: "TestDemonology-AllItems-SouloftheDead-40382" value: { - dps: 10434.61444 - tps: 8754.95535 + dps: 13429.158 + tps: 11697.77606 } } dps_results: { key: "TestDemonology-AllItems-SparkofLife-37657" value: { - dps: 10500.17502 - tps: 8812.6417 + dps: 13432.13554 + tps: 11690.7918 } } dps_results: { key: "TestDemonology-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10487.55182 - tps: 8795.65399 + dps: 13284.81019 + tps: 11536.61825 } } dps_results: { key: "TestDemonology-AllItems-SwiftSkyflareDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-SwiftStarflareDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-SwiftWindfireDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10374.21495 - tps: 8683.67864 + dps: 13371.74327 + tps: 11628.34175 } } dps_results: { key: "TestDemonology-AllItems-TearsoftheVanquished-47215" value: { - dps: 10359.05756 - tps: 8670.92251 + dps: 13311.29255 + tps: 11573.40573 } } dps_results: { key: "TestDemonology-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10293.86311 - tps: 8613.73356 + dps: 13266.70698 + tps: 11532.96223 } } dps_results: { key: "TestDemonology-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10654.57604 - tps: 8913.50793 + dps: 13810.57805 + tps: 12023.5597 } } dps_results: { key: "TestDemonology-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10591.1627 - tps: 8889.47961 + dps: 13294.28728 + tps: 11539.5823 } } dps_results: { key: "TestDemonology-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10591.1627 - tps: 8889.47961 + dps: 13294.28728 + tps: 11539.5823 } } dps_results: { key: "TestDemonology-AllItems-TirelessSkyflareDiamond" value: { - dps: 10688.14397 - tps: 8942.10206 + dps: 13838.4474 + tps: 12046.8906 } } dps_results: { key: "TestDemonology-AllItems-TirelessStarflareDiamond" value: { - dps: 10685.36395 - tps: 8940.21624 + dps: 13840.82475 + tps: 12050.30291 } } dps_results: { key: "TestDemonology-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10558.33646 - tps: 8867.6235 + dps: 13519.92246 + tps: 11775.61056 } } dps_results: { key: "TestDemonology-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10685.36395 - tps: 8940.21624 + dps: 13840.82475 + tps: 12050.30291 } } dps_results: { key: "TestDemonology-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10688.14397 - tps: 8942.10206 + dps: 13838.4474 + tps: 12046.8906 } } dps_results: { key: "TestDemonology-AllItems-WingedTalisman-37844" value: { - dps: 10481.29225 - tps: 8780.40047 + dps: 13480.94211 + tps: 11727.11324 } } dps_results: { key: "TestDemonology-Average-Default" value: { - dps: 10984.86614 - tps: 9234.4239 + dps: 14341.97534 + tps: 12535.50277 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--FullBuffs-LongMultiTarget" value: { - dps: 35688.44714 - tps: 39967.79205 + dps: 42911.40339 + tps: 47974.52647 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--FullBuffs-LongSingleTarget" value: { - dps: 10879.36103 - tps: 9138.29292 + dps: 14192.11049 + tps: 12405.09214 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--FullBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12309.38867 - tps: 10349.46003 + dps: 16119.13056 + tps: 14092.12454 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--NoBuffs-LongMultiTarget" value: { - dps: 21731.79307 - tps: 26990.03298 + dps: 26229.94279 + tps: 32236.1327 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6279.91083 - tps: 5676.74983 + dps: 8221.88899 + tps: 7606.40382 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock--NoBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6579.56895 - tps: 5853.46081 + dps: 8658.03734 + tps: 7899.67015 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-LongMultiTarget" value: { - dps: 13982.33268 - tps: 13817.09351 + dps: 17602.95013 + tps: 17496.51052 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-LongSingleTarget" value: { - dps: 10847.35212 - tps: 9104.96012 + dps: 14139.87328 + tps: 12351.16446 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-FullBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-ShortSingleTarget" value: { - dps: 12337.46591 - tps: 10378.28722 + dps: 16034.4906 + tps: 14007.68732 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-LongMultiTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-LongMultiTarget" value: { - dps: 8601.61974 - tps: 10170.95234 + dps: 10755.74703 + tps: 12488.22985 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-LongSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-LongSingleTarget" value: { - dps: 6265.49186 - tps: 5662.95196 + dps: 8178.07001 + tps: 7558.9712 } } dps_results: { - key: "TestDemonology-Settings-Orc-p3_demo_alliance-Demonology Warlock-demo-NoBuffs-ShortSingleTarget" + key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-ShortSingleTarget" value: { - dps: 6618.25619 - tps: 5892.63729 + dps: 8613.0367 + tps: 7852.44505 } } dps_results: { key: "TestDemonology-SwitchInFrontOfTarget-Default" value: { - dps: 10730.78451 - tps: 9136.29049 + dps: 14062.6613 + tps: 12420.35873 } } diff --git a/sim/warlock/TestDestruction.results b/sim/warlock/TestDestruction.results index b4ca7b6134..24127cf53c 100644 --- a/sim/warlock/TestDestruction.results +++ b/sim/warlock/TestDestruction.results @@ -1,27 +1,27 @@ character_stats_results: { key: "TestDestruction-CharacterStats-Default" value: { - final_stats: 320.1 - final_stats: 322.3 - final_stats: 1876.105 - final_stats: 1566.4 - final_stats: 895.4 - final_stats: 4251.206 + final_stats: 331.1 + final_stats: 333.3 + final_stats: 2205.225 + final_stats: 1863.4 + final_stats: 394.9 + final_stats: 4428.011 final_stats: 109 - final_stats: 341 - final_stats: 1667.73089 - final_stats: 705 + final_stats: 369 + final_stats: 2213.53536 + final_stats: 1211 final_stats: 0 - final_stats: 1184.81 - final_stats: 341 - final_stats: 1091.89543 - final_stats: 705 + final_stats: 1196.91 + final_stats: 369 + final_stats: 1555.89543 + final_stats: 1211 final_stats: 0 final_stats: 0 - final_stats: 27884.16 + final_stats: 32472.81 final_stats: 0 final_stats: 0 - final_stats: 5678.1 + final_stats: 5833.1 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 27887.3015 + final_stats: 31277.2375 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,787 +46,780 @@ character_stats_results: { dps_results: { key: "TestDestruction-AllItems-Althor'sAbacus-50359" value: { - dps: 11031.36328 - tps: 9009.50807 + dps: 13375.22942 + tps: 11127.08179 } } dps_results: { key: "TestDestruction-AllItems-Althor'sAbacus-50366" value: { - dps: 11071.38029 - tps: 9043.45951 + dps: 13421.27737 + tps: 11166.50821 } } dps_results: { key: "TestDestruction-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-AustereEarthsiegeDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-Bandit'sInsignia-40371" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-BaubleofTrueBlood-50354" value: { - dps: 10706.95094 - tps: 8734.81675 - hps: 97.07514 + dps: 13003.46841 + tps: 10809.20113 + hps: 101.62631 } } dps_results: { key: "TestDestruction-AllItems-BaubleofTrueBlood-50726" value: { - dps: 10706.95094 - tps: 8734.81675 - hps: 97.07514 + dps: 13003.46841 + tps: 10809.20113 + hps: 101.62631 } } dps_results: { key: "TestDestruction-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 10870.69015 - tps: 8892.23568 + dps: 13370.59632 + tps: 11125.19014 } } dps_results: { key: "TestDestruction-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 8518.95108 - tps: 6930.93864 + dps: 10023.81371 + tps: 8245.19754 } } dps_results: { key: "TestDestruction-AllItems-BracingEarthsiegeDiamond" value: { - dps: 10888.36123 - tps: 8730.41929 + dps: 13390.45819 + tps: 10920.23654 } } dps_results: { key: "TestDestruction-AllItems-ChaoticSkyflareDiamond" value: { - dps: 11183.42437 - tps: 9173.49298 + dps: 13807.95102 + tps: 11518.264 } } dps_results: { key: "TestDestruction-AllItems-CorpseTongueCoin-50349" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-CorpseTongueCoin-50352" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 hps: 64 } } dps_results: { key: "TestDestruction-AllItems-DarkCoven'sRegalia" value: { - dps: 10922.92174 - tps: 9007.64818 + dps: 12417.24973 + tps: 10295.69043 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 10804.54278 - tps: 8822.17361 + dps: 13137.16724 + tps: 10929.26187 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Death-42990" value: { - dps: 10795.83132 - tps: 8820.50533 + dps: 13156.52938 + tps: 10961.85793 } } dps_results: { key: "TestDestruction-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 10791.74971 - tps: 8813.18109 + dps: 13092.65368 + tps: 10891.60833 } } dps_results: { key: "TestDestruction-AllItems-Death'sChoice-47464" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 10738.47043 - tps: 8762.67982 + dps: 13042.34733 + tps: 10843.88212 } } dps_results: { key: "TestDestruction-AllItems-Deathbringer'sWill-50362" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-Deathbringer'sWill-50363" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-DeathbringerGarb" value: { - dps: 9421.48035 - tps: 7695.95518 + dps: 10901.44056 + tps: 8981.31062 } } dps_results: { key: "TestDestruction-AllItems-Defender'sCode-40257" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-DestructiveSkyflareDiamond" value: { - dps: 10878.08478 - tps: 8898.39231 - } -} -dps_results: { - key: "TestDestruction-AllItems-DislodgedForeignObject-50348" - value: { - dps: 11457.71573 - tps: 9380.72633 + dps: 13378.87214 + tps: 11132.09301 } } dps_results: { key: "TestDestruction-AllItems-DislodgedForeignObject-50353" value: { - dps: 11339.77024 - tps: 9285.60449 + dps: 13689.08784 + tps: 11423.0226 } } dps_results: { key: "TestDestruction-AllItems-EffulgentSkyflareDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-EmberSkyflareDiamond" value: { - dps: 10902.96327 - tps: 8919.54233 + dps: 13400.86589 + tps: 11149.27347 } } dps_results: { key: "TestDestruction-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 10870.69015 - tps: 8891.67589 + dps: 13370.59632 + tps: 11124.64477 } } dps_results: { key: "TestDestruction-AllItems-EnigmaticStarflareDiamond" value: { - dps: 10868.95517 - tps: 8890.11441 + dps: 13360.54675 + tps: 11115.60016 } } dps_results: { key: "TestDestruction-AllItems-EphemeralSnowflake-50260" value: { - dps: 10852.78735 - tps: 8867.48761 + dps: 13122.01605 + tps: 10920.5476 } } dps_results: { key: "TestDestruction-AllItems-EssenceofGossamer-37220" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-EternalEarthsiegeDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 10846.15816 - tps: 8864.02947 + dps: 13171.89068 + tps: 10972.79292 } } dps_results: { key: "TestDestruction-AllItems-EyeoftheBroodmother-45308" value: { - dps: 11027.53755 - tps: 9010.65708 + dps: 13392.45106 + tps: 11147.07492 } } dps_results: { key: "TestDestruction-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 10726.62585 - tps: 8751.73196 + dps: 13023.24846 + tps: 10826.4604 } } dps_results: { key: "TestDestruction-AllItems-ForethoughtTalisman-40258" value: { - dps: 10907.67433 - tps: 8904.56664 + dps: 13232.8994 + tps: 11005.21653 } } dps_results: { key: "TestDestruction-AllItems-ForgeEmber-37660" value: { - dps: 10943.99776 - tps: 8938.75161 + dps: 13297.37269 + tps: 11064.75669 } } dps_results: { key: "TestDestruction-AllItems-ForlornSkyflareDiamond" value: { - dps: 10888.36123 - tps: 8906.08864 + dps: 13390.45819 + tps: 11140.24899 } } dps_results: { key: "TestDestruction-AllItems-ForlornStarflareDiamond" value: { - dps: 10879.61108 - tps: 8898.68114 + dps: 13380.10954 + tps: 11131.38956 } } dps_results: { key: "TestDestruction-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-FuturesightRune-38763" value: { - dps: 10865.18097 - tps: 8868.64023 + dps: 13182.68633 + tps: 10962.27856 } } dps_results: { key: "TestDestruction-AllItems-Gladiator'sFelshroud" value: { - dps: 9163.73615 - tps: 7479.35454 + dps: 10520.06042 + tps: 8649.35357 } } dps_results: { key: "TestDestruction-AllItems-GlowingTwilightScale-54573" value: { - dps: 11051.37179 - tps: 9026.48379 + dps: 13398.25339 + tps: 11146.79521 } } dps_results: { key: "TestDestruction-AllItems-GlowingTwilightScale-54589" value: { - dps: 11096.84567 - tps: 9065.06461 + dps: 13450.58061 + tps: 11191.59627 } } dps_results: { key: "TestDestruction-AllItems-GnomishLightningGenerator-41121" value: { - dps: 10813.64237 - tps: 8843.62805 + dps: 13127.68332 + tps: 10941.42482 } } dps_results: { key: "TestDestruction-AllItems-Gul'dan'sRegalia" value: { - dps: 9841.26909 - tps: 7990.64934 + dps: 11177.75413 + tps: 9132.64389 } } dps_results: { key: "TestDestruction-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 11061.91708 - tps: 9035.13662 + dps: 13411.14515 + tps: 11157.57843 } } dps_results: { key: "TestDestruction-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 10870.69015 - tps: 8891.67589 + dps: 13370.59632 + tps: 11124.64477 } } dps_results: { key: "TestDestruction-AllItems-ImpassiveStarflareDiamond" value: { - dps: 10868.95517 - tps: 8890.11441 + dps: 13360.54675 + tps: 11115.60016 } } dps_results: { key: "TestDestruction-AllItems-IncisorFragment-37723" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 10858.01801 - tps: 8885.65653 + dps: 13345.91364 + tps: 11106.27605 } } dps_results: { key: "TestDestruction-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-MajesticDragonFigurine-40430" value: { - dps: 10913.79564 - tps: 8909.58365 + dps: 13240.38552 + tps: 11011.44785 } } dps_results: { key: "TestDestruction-AllItems-MaleficRaiment" value: { - dps: 7391.3015 - tps: 5933.44145 + dps: 8397.57213 + tps: 6792.36333 } } dps_results: { key: "TestDestruction-AllItems-MeteoriteWhetstone-37390" value: { - dps: 10772.58843 - tps: 8793.38602 + dps: 13100.66277 + tps: 10896.38273 } } dps_results: { key: "TestDestruction-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 10946.44288 - tps: 8939.45833 + dps: 13273.21006 + tps: 11041.49613 } } dps_results: { key: "TestDestruction-AllItems-OfferingofSacrifice-37638" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-PersistentEarthshatterDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedScarab-21685" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-PlagueheartGarb" value: { - dps: 8861.16566 - tps: 7199.62916 + dps: 10105.45303 + tps: 8273.19018 } } dps_results: { key: "TestDestruction-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-PurifiedShardoftheGods" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-ReignoftheDead-47316" value: { - dps: 11124.24918 - tps: 9119.25966 + dps: 13545.74716 + tps: 11313.93785 } } dps_results: { key: "TestDestruction-AllItems-ReignoftheDead-47477" value: { - dps: 11183.42437 - tps: 9173.49298 + dps: 13617.77957 + tps: 11380.57218 } } dps_results: { key: "TestDestruction-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 11155.17832 - tps: 9148.92475 + dps: 13773.20034 + tps: 11486.98838 } } dps_results: { key: "TestDestruction-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 10844.61047 - tps: 8868.7328 + dps: 13338.71496 + tps: 11095.55732 } } dps_results: { key: "TestDestruction-AllItems-RuneofRepulsion-40372" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-SealofthePantheon-36993" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-ShinyShardoftheGods" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-SliverofPureIce-50339" value: { - dps: 10993.16522 - tps: 8981.62459 + dps: 13331.27456 + tps: 11092.79314 } } dps_results: { key: "TestDestruction-AllItems-SliverofPureIce-50346" value: { - dps: 11029.54433 - tps: 9012.94435 + dps: 13373.13633 + tps: 11128.97094 } } dps_results: { key: "TestDestruction-AllItems-SoulPreserver-37111" value: { - dps: 10842.19195 - tps: 8849.00517 + dps: 13157.54821 + tps: 10940.69903 } } dps_results: { key: "TestDestruction-AllItems-SouloftheDead-40382" value: { - dps: 10797.86447 - tps: 8821.45725 + dps: 13127.52186 + tps: 10924.5031 } } dps_results: { key: "TestDestruction-AllItems-SparkofLife-37657" value: { - dps: 10788.10693 - tps: 8806.9055 + dps: 13085.94248 + tps: 10885.67211 } } dps_results: { key: "TestDestruction-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 10766.62394 - tps: 8788.20752 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-SwiftSkyflareDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-SwiftStarflareDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-SwiftWindfireDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 10791.94695 - tps: 8806.36945 + dps: 13099.73082 + tps: 10891.17865 } } dps_results: { key: "TestDestruction-AllItems-TearsoftheVanquished-47215" value: { - dps: 10743.72366 - tps: 8767.25903 + dps: 13038.85465 + tps: 10839.53285 } } dps_results: { key: "TestDestruction-AllItems-TheGeneral'sHeart-45507" value: { - dps: 10705.77031 - tps: 8733.24971 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-ThunderingSkyflareDiamond" value: { - dps: 10844.61047 - tps: 8869.05112 + dps: 13338.71496 + tps: 11095.95154 } } dps_results: { key: "TestDestruction-AllItems-TinyAbominationinaJar-50351" value: { - dps: 10766.62394 - tps: 8788.20752 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-TinyAbominationinaJar-50706" value: { - dps: 10766.62394 - tps: 8788.20752 + dps: 13000.56656 + tps: 10806.27943 } } dps_results: { key: "TestDestruction-AllItems-TirelessSkyflareDiamond" value: { - dps: 10888.36123 - tps: 8906.08864 + dps: 13390.45819 + tps: 11140.24899 } } dps_results: { key: "TestDestruction-AllItems-TirelessStarflareDiamond" value: { - dps: 10879.61108 - tps: 8898.68114 + dps: 13380.10954 + tps: 11131.38956 } } dps_results: { key: "TestDestruction-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 10880.17246 - tps: 8889.37588 + dps: 13192.44664 + tps: 10979.31352 } } dps_results: { key: "TestDestruction-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 10879.61108 - tps: 8898.68114 + dps: 13380.10954 + tps: 11131.38956 } } dps_results: { key: "TestDestruction-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 10888.36123 - tps: 8906.08864 + dps: 13390.45819 + tps: 11140.24899 } } dps_results: { key: "TestDestruction-AllItems-WingedTalisman-37844" value: { - dps: 10840.89345 - tps: 8848.27621 + dps: 13152.24225 + tps: 10936.31291 } } dps_results: { key: "TestDestruction-Average-Default" value: { - dps: 11384.65848 - tps: 9340.57407 + dps: 13940.66725 + tps: 11627.70004 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--FullBuffs-LongMultiTarget" value: { - dps: 25634.70124 - tps: 30674.03554 + dps: 30971.48173 + tps: 36793.70589 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--FullBuffs-LongSingleTarget" value: { - dps: 11183.42437 - tps: 9173.49298 + dps: 13807.95102 + tps: 11518.264 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--FullBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--FullBuffs-ShortSingleTarget" value: { - dps: 12482.17162 - tps: 10202.16749 + dps: 15202.7866 + tps: 12629.69341 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--NoBuffs-LongMultiTarget" value: { - dps: 15212.06682 - tps: 20693.36868 + dps: 18693.67032 + tps: 24903.9459 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--NoBuffs-LongSingleTarget" value: { - dps: 6327.26454 - tps: 5373.81634 + dps: 8023.03346 + tps: 6883.06409 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock--NoBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock--NoBuffs-ShortSingleTarget" value: { - dps: 6423.33592 - tps: 5425.4083 + dps: 8285.42147 + tps: 7086.64126 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-LongMultiTarget" value: { - dps: 12234.87188 - tps: 11785.57639 + dps: 14998.65423 + tps: 14400.4639 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-LongSingleTarget" value: { - dps: 11234.85399 - tps: 9069.27969 + dps: 13845.61371 + tps: 11386.22808 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-FullBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-ShortSingleTarget" value: { - dps: 12203.21746 - tps: 9382.85665 + dps: 15633.44212 + tps: 12300.02105 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-LongMultiTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-NoBuffs-LongMultiTarget" value: { - dps: 7033.30474 - tps: 7519.35034 + dps: 8952.3178 + tps: 9227.11703 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-LongSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-NoBuffs-LongSingleTarget" value: { - dps: 6369.96101 - tps: 5330.23953 + dps: 8118.24379 + tps: 6869.56508 } } dps_results: { - key: "TestDestruction-Settings-Orc-p3_destro_alliance-Destruction Warlock-destro-NoBuffs-ShortSingleTarget" + key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-NoBuffs-ShortSingleTarget" value: { - dps: 6453.53747 - tps: 5002.57509 + dps: 8690.19404 + tps: 6913.61161 } } dps_results: { key: "TestDestruction-SwitchInFrontOfTarget-Default" value: { - dps: 11183.42437 - tps: 9173.49298 + dps: 13807.95102 + tps: 11518.264 } } diff --git a/sim/warlock/talents.go b/sim/warlock/talents.go index 3253f5455f..602d9edc03 100644 --- a/sim/warlock/talents.go +++ b/sim/warlock/talents.go @@ -552,7 +552,7 @@ func (warlock *Warlock) setupDemonicPact() { icd := core.Cooldown{ Timer: warlock.NewTimer(), - Duration: core.TernaryDuration(warlock.Options.NewDPBehaviour, 1, 5) * time.Second, + Duration: 1 * time.Second, } var demonicPactAuras [25]*core.Aura @@ -581,23 +581,10 @@ func (warlock *Warlock) setupDemonicPact() { icd.Use(sim) lastBonus := 0.0 - newSPBonus := 0.0 if warlock.DemonicPactAura.IsActive() { lastBonus = warlock.DemonicPactAura.ExclusiveEffects[0].Priority - - if warlock.Options.NewDPBehaviour { - newSPBonus = math.Round(dpMult * (warlock.GetStat(stats.SpellPower) - lastBonus)) - } else { - newSPBonus = math.Floor(lastBonus*dpMult*dpMult+ - (1-dpMult)*dpMult*warlock.GetStat(stats.SpellPower)) + 1 - } - } else { - if warlock.Options.NewDPBehaviour { - newSPBonus = math.Round(dpMult * warlock.GetStat(stats.SpellPower)) - } else { - newSPBonus = math.Floor(warlock.GetStat(stats.SpellPower)*(dpMult+dpMult*dpMult)) + 1 - } } + newSPBonus := math.Round(dpMult * warlock.GetStat(stats.SpellPower)) if warlock.DemonicPactAura.RemainingDuration(sim) < 10*time.Second || newSPBonus >= lastBonus { warlock.updateDPASP(sim) diff --git a/sim/warlock/warlock_test.go b/sim/warlock/warlock_test.go index 666c398491..f84367a26d 100644 --- a/sim/warlock/warlock_test.go +++ b/sim/warlock/warlock_test.go @@ -17,7 +17,7 @@ func TestAffliction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_affliction_alliance"), + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p4_affliction"), Talents: AfflictionTalents, Glyphs: AfflictionGlyphs, Consumes: FullConsumes, @@ -35,7 +35,7 @@ func TestDemonology(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_demo_alliance"), + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p4_demo"), Talents: DemonologyTalents, Glyphs: DemonologyGlyphs, Consumes: FullConsumes, @@ -53,7 +53,7 @@ func TestDestruction(t *testing.T) { Class: proto.Class_ClassWarlock, Race: proto.Race_RaceOrc, - GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p3_destro_alliance"), + GearSet: core.GetGearSet("../../ui/warlock/gear_sets", "p4_destro"), Talents: DestructionTalents, Glyphs: DestructionGlyphs, Consumes: FullConsumes, diff --git a/ui/warlock/gear_sets/p4_affliction.gear.json b/ui/warlock/gear_sets/p4_affliction.gear.json new file mode 100644 index 0000000000..92ff5d088c --- /dev/null +++ b/ui/warlock/gear_sets/p4_affliction.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51231,"enchant":3820,"gems":[41285,40133]}, + {"id":50724,"gems":[40113]}, + {"id":51234,"enchant":3810,"gems":[40155]}, + {"id":50628,"enchant":3722,"gems":[40155]}, + {"id":51233,"enchant":1144,"gems":[40113,40155]}, + {"id":50651,"enchant":2332,"gems":[40155,0]}, + {"id":51230,"enchant":3604,"gems":[40113,0]}, + {"id":50613,"gems":[40133,40113,40113]}, + {"id":50694,"enchant":3872,"gems":[40113,40133,40155]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50398,"gems":[40155]}, + {"id":50664,"gems":[40113]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40155]} +]} diff --git a/ui/warlock/gear_sets/p4_demo.gear.json b/ui/warlock/gear_sets/p4_demo.gear.json new file mode 100644 index 0000000000..313b9d3336 --- /dev/null +++ b/ui/warlock/gear_sets/p4_demo.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51231,"enchant":3820,"gems":[41285,40133]}, + {"id":50658,"gems":[40153]}, + {"id":51234,"enchant":3810,"gems":[40153]}, + {"id":50668,"enchant":3722,"gems":[40133]}, + {"id":50717,"enchant":1144,"gems":[40133,40113,40153]}, + {"id":50686,"enchant":2332,"gems":[40133,0]}, + {"id":51230,"enchant":3604,"gems":[40133,0]}, + {"id":50702,"gems":[40153,40113,40113]}, + {"id":51232,"enchant":3872,"gems":[40113,40113]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50398,"gems":[40153]}, + {"id":50636,"gems":[40153]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50635}, + {"id":50631,"gems":[40153]} +]} diff --git a/ui/warlock/gear_sets/p4_destro.gear.json b/ui/warlock/gear_sets/p4_destro.gear.json new file mode 100644 index 0000000000..b0a50d23b7 --- /dev/null +++ b/ui/warlock/gear_sets/p4_destro.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":51231,"enchant":3820,"gems":[41285,40133]}, + {"id":50658,"gems":[40153]}, + {"id":51234,"enchant":3810,"gems":[40152]}, + {"id":50628,"enchant":3722,"gems":[40152]}, + {"id":51233,"enchant":3832,"gems":[40113,40155]}, + {"id":50651,"enchant":2332,"gems":[40155,0]}, + {"id":51230,"enchant":3604,"gems":[40113,0]}, + {"id":50613,"gems":[40133,40113,40113]}, + {"id":50694,"enchant":3719,"gems":[40113,40113,40113]}, + {"id":50699,"enchant":3606,"gems":[40133,40113]}, + {"id":50664,"gems":[40113]}, + {"id":50398,"gems":[40155]}, + {"id":50365}, + {"id":50348}, + {"id":50732,"enchant":3834,"gems":[40113]}, + {"id":50719}, + {"id":50684,"gems":[40153]} +]} diff --git a/ui/warlock/inputs.ts b/ui/warlock/inputs.ts index 1d708d7770..29f2380eb5 100644 --- a/ui/warlock/inputs.ts +++ b/ui/warlock/inputs.ts @@ -55,12 +55,6 @@ export const PetInput = InputHelpers.makeSpecOptionsEnumIconInput) => player.changeEmitter, }); -export const NewDPBehaviour = InputHelpers.makeSpecOptionsBooleanInput({ - fieldName: 'newDPBehaviour', - label: 'New DP behaviour', - labelTooltip: 'Changes DP to always be 10% of spell power, 1s ICD', -}); - export const PrimarySpellInput = InputHelpers.makeRotationEnumIconInput({ fieldName: 'primarySpell', values: [ diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts index 5eb69f5f6d..0c5006d5c6 100644 --- a/ui/warlock/presets.ts +++ b/ui/warlock/presets.ts @@ -36,13 +36,16 @@ import P1AfflictionGear from './gear_sets/p1_affliction.gear.json'; import P2AfflictionGear from './gear_sets/p2_affliction.gear.json'; import P3AfflictionAllianceGear from './gear_sets/p3_affliction_alliance.gear.json'; import P3AfflictionHordeGear from './gear_sets/p3_affliction_horde.gear.json'; +import P4AfflictionGear from './gear_sets/p4_affliction.gear.json'; import PreraidDemoDestroGear from './gear_sets/preraid_demodestro.gear.json'; import P1DemoDestroGear from './gear_sets/p1_demodestro.gear.json'; import P2DemoDestroGear from './gear_sets/p2_demodestro.gear.json'; import P3DemoAllianceGear from './gear_sets/p3_demo_alliance.gear.json'; import P3DemoHordeGear from './gear_sets/p3_demo_horde.gear.json'; +import P4DemoGear from './gear_sets/p4_demo.gear.json'; import P3DestroAllianceGear from './gear_sets/p3_destro_alliance.gear.json'; import P3DestroHordeGear from './gear_sets/p3_destro_horde.gear.json'; +import P4DestroGear from './gear_sets/p4_destro.gear.json'; import DemoApl from './apls/demo.apl.json'; import DestroApl from './apls/destro.apl.json'; @@ -55,13 +58,16 @@ export const P1_AFFLICTION_PRESET = PresetUtils.makePresetGear('P1 Affliction', export const P2_AFFLICTION_PRESET = PresetUtils.makePresetGear('P2 Affliction', P2AfflictionGear, { tooltip: BIS_TOOLTIP, talentTree: 0 }); export const P3_AFFLICTION_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Affliction [A]', P3AfflictionAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 0, faction: Faction.Alliance }); export const P3_AFFLICTION_HORDE_PRESET = PresetUtils.makePresetGear('P3 Affliction [H]', P3AfflictionHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 0, faction: Faction.Horde }); +export const P4_AFFLICTION_PRESET = PresetUtils.makePresetGear('P4 Affliction', P4AfflictionGear, { tooltip: BIS_TOOLTIP, talentTree: 0 }); export const PRERAID_DEMODESTRO_PRESET = PresetUtils.makePresetGear('Preraid Demo/Destro', PreraidDemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); export const P1_DEMODESTRO_PRESET = PresetUtils.makePresetGear('P1 Demo/Destro', P1DemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); export const P2_DEMODESTRO_PRESET = PresetUtils.makePresetGear('P2 Demo/Destro', P2DemoDestroGear, { tooltip: BIS_TOOLTIP, talentTrees: [1,2] }); export const P3_DEMO_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Demo [A]', P3DemoAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 1, faction: Faction.Alliance }); export const P3_DEMO_HORDE_PRESET = PresetUtils.makePresetGear('P3 Demo [H]', P3DemoHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 1, faction: Faction.Horde }); +export const P4_DEMO_PRESET = PresetUtils.makePresetGear('P4 Demo', P4DemoGear, { tooltip: BIS_TOOLTIP, talentTree: 1 }); export const P3_DESTRO_ALLIANCE_PRESET = PresetUtils.makePresetGear('P3 Destro [A]', P3DestroAllianceGear, { tooltip: BIS_TOOLTIP, talentTree: 2, faction: Faction.Alliance }); export const P3_DESTRO_HORDE_PRESET = PresetUtils.makePresetGear('P3 Destro [H]', P3DestroHordeGear, { tooltip: BIS_TOOLTIP, talentTree: 2, faction: Faction.Horde }); +export const P4_DESTRO_PRESET = PresetUtils.makePresetGear('P4 Destro', P4DestroGear, { tooltip: BIS_TOOLTIP, talentTree: 2 }); export const AfflictionRotation = WarlockRotation.create({ primarySpell: PrimarySpell.ShadowBolt, diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts index 1334314938..5048475d01 100644 --- a/ui/warlock/sim.ts +++ b/ui/warlock/sim.ts @@ -124,7 +124,6 @@ export class WarlockSimUI extends IndividualSimUI { OtherInputs.TankAssignment, OtherInputs.ChannelClipDelay, OtherInputs.nibelungAverageCasts, - WarlockInputs.NewDPBehaviour, ], }, encounterPicker: { @@ -151,17 +150,20 @@ export class WarlockSimUI extends IndividualSimUI { gear: [ Presets.SWP_BIS, Presets.PRERAID_AFFLICTION_PRESET, - Presets.PRERAID_DEMODESTRO_PRESET, Presets.P1_AFFLICTION_PRESET, - Presets.P1_DEMODESTRO_PRESET, Presets.P2_AFFLICTION_PRESET, - Presets.P2_DEMODESTRO_PRESET, Presets.P3_AFFLICTION_ALLIANCE_PRESET, Presets.P3_AFFLICTION_HORDE_PRESET, + Presets.P4_AFFLICTION_PRESET, + Presets.PRERAID_DEMODESTRO_PRESET, + Presets.P1_DEMODESTRO_PRESET, + Presets.P2_DEMODESTRO_PRESET, Presets.P3_DEMO_ALLIANCE_PRESET, Presets.P3_DEMO_HORDE_PRESET, + Presets.P4_DEMO_PRESET, Presets.P3_DESTRO_ALLIANCE_PRESET, Presets.P3_DESTRO_HORDE_PRESET, + Presets.P4_DESTRO_PRESET, ], }, });