From 85f5ada638310b4ef1d9ae45208906217e3f1fb1 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Sat, 23 Sep 2023 06:38:48 -0700 Subject: [PATCH] Move rogue to Beta APL --- sim/rogue/TestAssassination.results | 728 ++++----- sim/rogue/TestCombat.results | 1434 ++++++++++++----- sim/rogue/TestSubtlety.results | 508 +++--- sim/rogue/rogue_test.go | 478 ++---- .../individual_sim_ui/apl_actions.ts | 9 +- ui/core/launched_sims.ts | 2 +- ui/rogue/presets.ts | 282 +++- ui/rogue/sim.ts | 31 +- 8 files changed, 2133 insertions(+), 1339 deletions(-) diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 2f303ceb72..c07e98863d 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -12,17 +12,17 @@ character_stats_results: { final_stats: 891.52994 final_stats: 221 final_stats: 0 - final_stats: 5636.84 + final_stats: 5504.84 final_stats: 469.94994 final_stats: 2072.9756 final_stats: 221 final_stats: 94 - final_stats: 215 + final_stats: 221 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 9358.7 - final_stats: 3396.8 + final_stats: 3264.8 final_stats: 0 final_stats: 0 final_stats: 0 @@ -46,1089 +46,1089 @@ character_stats_results: { dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50359" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-Althor'sAbacus-50366" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 7440.18796 - tps: 5282.53345 + dps: 6580.95744 + tps: 4672.47978 } } dps_results: { key: "TestAssassination-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-Bandit'sInsignia-40371" value: { - dps: 7648.78225 - tps: 5430.6354 + dps: 6762.75421 + tps: 4801.55549 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7421.58552 - tps: 5269.32572 - hps: 60.32296 + dps: 6556.21069 + tps: 4654.90959 + hps: 88.32485 } } dps_results: { key: "TestAssassination-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7421.58552 - tps: 5269.32572 - hps: 60.32296 + dps: 6556.21069 + tps: 4654.90959 + hps: 88.32485 } } dps_results: { key: "TestAssassination-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7614.37467 - tps: 5406.20602 + dps: 6781.39858 + tps: 4814.79299 } } dps_results: { key: "TestAssassination-AllItems-BlackBruise-50035" value: { - dps: 4932.31509 - tps: 3501.94371 + dps: 6564.85473 + tps: 4661.04686 } } dps_results: { key: "TestAssassination-AllItems-BlackBruise-50692" value: { - dps: 5002.87981 - tps: 3552.04466 + dps: 6620.0939 + tps: 4700.26667 } } dps_results: { key: "TestAssassination-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5791.74451 - tps: 4112.1386 + dps: 5017.35757 + tps: 3562.32387 } } dps_results: { key: "TestAssassination-AllItems-BonescytheBattlegear" value: { - dps: 6957.99742 - tps: 4940.17817 + dps: 6171.60391 + tps: 4381.83878 } } dps_results: { key: "TestAssassination-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5282.5496 + dps: 6742.58205 + tps: 4691.48859 } } dps_results: { key: "TestAssassination-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7736.04431 - tps: 5492.59146 + dps: 6890.9945 + tps: 4892.6061 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50349" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-CorpseTongueCoin-50352" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7421.3193 - tps: 5269.13671 - hps: 42.66667 + dps: 6555.99746 + tps: 4654.75819 + hps: 64 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7560.3582 - tps: 5367.85432 + dps: 6693.33497 + tps: 4752.26783 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7605.91062 - tps: 5400.19654 + dps: 6733.1874 + tps: 4780.56306 } } dps_results: { key: "TestAssassination-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7615.61818 - tps: 5407.08891 + dps: 6707.11673 + tps: 4762.05288 } } dps_results: { key: "TestAssassination-AllItems-Death'sChoice-47464" value: { - dps: 7989.75634 - tps: 5672.727 + dps: 7078.84194 + tps: 5025.97777 } } dps_results: { key: "TestAssassination-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7522.33165 - tps: 5340.85547 + dps: 6635.60587 + tps: 4711.28017 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50362" value: { - dps: 7856.52676 - tps: 5578.134 + dps: 6962.64002 + tps: 4943.47441 } } dps_results: { key: "TestAssassination-AllItems-Deathbringer'sWill-50363" value: { - dps: 7917.03602 - tps: 5621.09557 + dps: 7032.12354 + tps: 4992.80771 } } dps_results: { key: "TestAssassination-AllItems-Defender'sCode-40257" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7615.19412 - tps: 5406.78783 + dps: 6771.22256 + tps: 4807.56802 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50348" value: { - dps: 7636.80461 - tps: 5422.13127 + dps: 6766.54454 + tps: 4804.24663 } } dps_results: { key: "TestAssassination-AllItems-DislodgedForeignObject-50353" value: { - dps: 7618.0581 - tps: 5408.82125 + dps: 6710.87833 + tps: 4764.72362 } } dps_results: { key: "TestAssassination-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-EmberSkyflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7614.37467 - tps: 5406.20602 + dps: 6781.39858 + tps: 4814.79299 } } dps_results: { key: "TestAssassination-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7601.16482 - tps: 5396.82702 + dps: 6787.47959 + tps: 4819.11051 } } dps_results: { key: "TestAssassination-AllItems-EphemeralSnowflake-50260" value: { - dps: 7493.33497 - tps: 5320.26783 + dps: 6696.73617 + tps: 4754.68268 } } dps_results: { key: "TestAssassination-AllItems-EssenceofGossamer-37220" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7584.28521 - tps: 5384.8425 + dps: 6716.47395 + tps: 4768.6965 } } dps_results: { key: "TestAssassination-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7545.58635 - tps: 5357.36631 + dps: 6673.6112 + tps: 4738.26395 } } dps_results: { key: "TestAssassination-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7420.03817 - tps: 5268.2271 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-ForethoughtTalisman-40258" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-ForgeEmber-37660" value: { - dps: 7526.02872 - tps: 5343.48039 + dps: 6667.04099 + tps: 4733.5991 } } dps_results: { key: "TestAssassination-AllItems-ForlornSkyflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-ForlornStarflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7701.55147 - tps: 5468.10154 + dps: 6802.61484 + tps: 4829.85654 } } dps_results: { key: "TestAssassination-AllItems-FuturesightRune-38763" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-Gladiator'sVestments" value: { - dps: 7467.74361 - tps: 5302.09796 + dps: 6625.40493 + tps: 4704.0375 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54573" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-GlowingTwilightScale-54589" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7556.16482 - tps: 5364.87702 + dps: 6717.19953 + tps: 4769.21167 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-49982" value: { - dps: 7732.86395 - tps: 5490.3334 + dps: 6881.52109 + tps: 4885.87998 } } dps_results: { key: "TestAssassination-AllItems-Heartpierce-50641" value: { - dps: 7732.86395 - tps: 5490.3334 + dps: 6881.52109 + tps: 4885.87998 } } dps_results: { key: "TestAssassination-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7614.37467 - tps: 5406.20602 + dps: 6781.39858 + tps: 4814.79299 } } dps_results: { key: "TestAssassination-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7601.16482 - tps: 5396.82702 + dps: 6787.47959 + tps: 4819.11051 } } dps_results: { key: "TestAssassination-AllItems-IncisorFragment-37723" value: { - dps: 7591.61194 - tps: 5390.04448 + dps: 6724.15775 + tps: 4774.152 } } dps_results: { key: "TestAssassination-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7632.14744 - tps: 5418.82469 + dps: 6771.59546 + tps: 4807.83278 hps: 11.11293 } } dps_results: { key: "TestAssassination-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7634.73193 - tps: 5420.65967 + dps: 6784.64401 + tps: 4817.09725 } } dps_results: { key: "TestAssassination-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7625.70234 - tps: 5414.24866 + dps: 6785.43915 + tps: 4817.6618 } } dps_results: { key: "TestAssassination-AllItems-OfferingofSacrifice-37638" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7622.12209 - tps: 5411.70668 + dps: 6769.13889 + tps: 4806.08861 } } dps_results: { key: "TestAssassination-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7629.19747 - tps: 5416.7302 + dps: 6775.38755 + tps: 4810.52516 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedScarab-21685" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-PurifiedShardoftheGods" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47316" value: { - dps: 7616.42601 - tps: 5407.66246 + dps: 6734.44479 + tps: 4781.4558 } } dps_results: { key: "TestAssassination-AllItems-ReignoftheDead-47477" value: { - dps: 7641.15124 - tps: 5425.21738 + dps: 6756.86436 + tps: 4797.37369 } } dps_results: { key: "TestAssassination-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7732.86395 - tps: 5490.3334 + dps: 6881.52109 + tps: 4885.87998 } } dps_results: { key: "TestAssassination-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-RuneofRepulsion-40372" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-SealofthePantheon-36993" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-Shadowblade'sBattlegear" value: { - dps: 7748.13768 - tps: 5501.17775 + dps: 7366.01802 + tps: 5229.87279 } } dps_results: { key: "TestAssassination-AllItems-ShinyShardoftheGods" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-Slayer'sArmor" value: { - dps: 5703.19939 - tps: 4049.27157 + dps: 4930.43023 + tps: 3500.60547 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50339" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-SliverofPureIce-50346" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-SoulPreserver-37111" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-SouloftheDead-40382" value: { - dps: 7550.31665 - tps: 5360.72482 + dps: 6671.85022 + tps: 4737.01365 } } dps_results: { key: "TestAssassination-AllItems-SparkofLife-37657" value: { - dps: 7502.30888 - tps: 5326.6393 + dps: 6646.64041 + tps: 4719.11469 } } dps_results: { key: "TestAssassination-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7573.44392 - tps: 5377.14519 + dps: 6691.35437 + tps: 4750.8616 } } dps_results: { key: "TestAssassination-AllItems-StormshroudArmor" value: { - dps: 6065.49357 - tps: 4306.50044 + dps: 5401.69002 + tps: 3835.19991 } } dps_results: { key: "TestAssassination-AllItems-SwiftSkyflareDiamond" value: { - dps: 7629.19747 - tps: 5416.7302 + dps: 6775.38755 + tps: 4810.52516 } } dps_results: { key: "TestAssassination-AllItems-SwiftStarflareDiamond" value: { - dps: 7622.12209 - tps: 5411.70668 + dps: 6769.13889 + tps: 4806.08861 } } dps_results: { key: "TestAssassination-AllItems-SwiftWindfireDiamond" value: { - dps: 7609.74018 - tps: 5402.91553 + dps: 6758.20372 + tps: 4798.32464 } } dps_results: { key: "TestAssassination-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-TearsoftheVanquished-47215" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-TerrorbladeBattlegear" value: { - dps: 7381.6079 - tps: 5240.94161 + dps: 6618.87148 + tps: 4699.39875 } } dps_results: { key: "TestAssassination-AllItems-TheFistsofFury" value: { - dps: 4241.44782 - tps: 3011.42795 + dps: 5759.06495 + tps: 4088.93611 } } dps_results: { key: "TestAssassination-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7664.12691 - tps: 5441.53011 + dps: 6808.65207 + tps: 4834.14297 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7844.44191 - tps: 5569.55375 + dps: 6914.46606 + tps: 4909.2709 } } dps_results: { key: "TestAssassination-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7906.24216 - tps: 5613.43193 + dps: 7037.26261 + tps: 4996.45645 } } dps_results: { key: "TestAssassination-AllItems-TirelessSkyflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-TirelessStarflareDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7441.65634 - tps: 5283.576 + dps: 6632.82688 + tps: 4709.30708 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7592.05174 - tps: 5390.35674 + dps: 6742.58205 + tps: 4787.23325 } } dps_results: { key: "TestAssassination-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6145.83677 - tps: 4363.54411 + dps: 5332.8872 + tps: 3786.34991 } } dps_results: { key: "TestAssassination-AllItems-VanCleef'sBattlegear" value: { - dps: 7152.1567 - tps: 5078.03125 + dps: 6380.57261 + tps: 4530.20655 } } dps_results: { key: "TestAssassination-AllItems-WingedTalisman-37844" value: { - dps: 7421.3193 - tps: 5269.13671 + dps: 6555.99746 + tps: 4654.75819 } } dps_results: { key: "TestAssassination-Average-Default" value: { - dps: 7750.68879 - tps: 5502.98904 + dps: 6870.63311 + tps: 4878.14951 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 28778.61466 - tps: 20432.81641 + dps: 6881.52109 + tps: 4885.87998 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 7732.86395 - tps: 5490.3334 + dps: 6881.52109 + tps: 4885.87998 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 8917.3396 - tps: 6331.31112 + dps: 8163.19938 + tps: 5795.87156 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 15564.44775 - tps: 11050.7579 + dps: 3519.31915 + tps: 2498.7166 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3737.8211 - tps: 2653.85298 + dps: 3519.31915 + tps: 2498.7166 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-Assassination--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3839.77283 - tps: 2726.23871 + dps: 3753.45735 + tps: 2664.95472 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 21691.9043 - tps: 15401.25205 + dps: 4642.01915 + tps: 3295.8336 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 5058.12764 - tps: 3591.27063 + dps: 4642.01915 + tps: 3295.8336 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5843.17906 - tps: 4148.65714 + dps: 5492.35461 + tps: 3899.57177 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 13004.76316 - tps: 9233.38185 + dps: 2417.92916 + tps: 1716.7297 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2463.90521 - tps: 1749.3727 + dps: 2417.92916 + tps: 1716.7297 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2619.30743 - tps: 1859.70827 + dps: 2632.47856 + tps: 1869.05978 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 27506.12301 - tps: 19529.34734 + dps: 6519.7203 + tps: 4629.00141 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 7318.27839 - tps: 5195.97766 + dps: 6519.7203 + tps: 4629.00141 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 8390.25145 - tps: 5957.07853 + dps: 7704.73798 + tps: 5470.36396 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 14897.82475 - tps: 10577.45557 + dps: 3339.88441 + tps: 2371.31793 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3536.67552 - tps: 2511.03962 + dps: 3339.88441 + tps: 2371.31793 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3609.05962 - tps: 2562.43233 + dps: 3536.26176 + tps: 2510.74585 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 18213.19017 - tps: 12931.36502 + dps: 5081.10525 + tps: 3607.58473 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 3594.58701 - tps: 2552.15677 + dps: 5081.10525 + tps: 3607.58473 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 4162.15748 - tps: 2955.13181 + dps: 5847.33392 + tps: 4151.60708 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 9414.05702 - tps: 6683.98048 + dps: 2555.01882 + tps: 1814.06336 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 1614.25428 - tps: 1146.12054 + dps: 2555.01882 + tps: 1814.06336 } } dps_results: { - key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 1664.685 - tps: 1181.92635 + dps: 2711.91782 + tps: 1925.46165 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 28861.15663 - tps: 20491.4212 + dps: 6920.96973 + tps: 4913.88851 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 7769.45231 - tps: 5516.31114 + dps: 6920.96973 + tps: 4913.88851 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 9019.92146 - tps: 6404.14423 + dps: 8246.18822 + tps: 5854.79363 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 15639.3021 - tps: 11103.90449 + dps: 3551.74143 + tps: 2521.73642 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3756.79367 - tps: 2667.3235 + dps: 3551.74143 + tps: 2521.73642 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3877.42627 - tps: 2752.97265 + dps: 3795.70474 + tps: 2694.95037 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 21807.45117 - tps: 15483.29033 + dps: 4669.16398 + tps: 3315.10643 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 5083.32394 - tps: 3609.16 + dps: 4669.16398 + tps: 3315.10643 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 5913.90201 - tps: 4198.87043 + dps: 5545.66292 + tps: 3937.42067 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 13069.57959 - tps: 9279.40151 + dps: 2439.77407 + tps: 1732.23959 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 2475.66715 - tps: 1757.72367 + dps: 2439.77407 + tps: 1732.23959 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 2644.34717 - tps: 1877.48649 + dps: 2666.21298 + tps: 1893.01122 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 27612.6165 - tps: 19604.95772 + dps: 6559.37346 + tps: 4657.15515 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 7352.72164 - tps: 5220.43237 + dps: 6559.37346 + tps: 4657.15515 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 8489.04518 - tps: 6027.22208 + dps: 7774.64689 + tps: 5519.99929 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 15063.4387 - tps: 10695.04148 + dps: 3365.69631 + tps: 2389.64438 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 3555.07343 - tps: 2524.10214 + dps: 3365.69631 + tps: 2389.64438 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 3643.21911 - tps: 2586.68557 + dps: 3570.15603 + tps: 2534.81078 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--FullBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongMultiTarget" value: { - dps: 18317.07454 - tps: 13005.12292 + dps: 5112.58936 + tps: 3629.93844 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--FullBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-LongSingleTarget" value: { - dps: 3605.59186 - tps: 2559.97022 + dps: 5112.58936 + tps: 3629.93844 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--FullBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-FullBuffs-ShortSingleTarget" value: { - dps: 4200.7192 - tps: 2982.51063 + dps: 5908.17085 + tps: 4194.8013 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--NoBuffs-LongMultiTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongMultiTarget" value: { - dps: 9445.74928 - tps: 6706.48199 + dps: 2573.94761 + tps: 1827.5028 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--NoBuffs-LongSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-LongSingleTarget" value: { - dps: 1619.95457 - tps: 1150.16774 + dps: 2573.94761 + tps: 1827.5028 } } dps_results: { - key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant--NoBuffs-ShortSingleTarget" + key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-Mutilate-NoBuffs-ShortSingleTarget" value: { - dps: 1682.04808 - tps: 1194.25414 + dps: 2743.01479 + tps: 1947.5405 } } dps_results: { key: "TestAssassination-SwitchInFrontOfTarget-Default" value: { - dps: 7281.36207 - tps: 5169.76707 + dps: 6471.0495 + tps: 4594.44514 } } diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 1b134d2c9f..e0d35e90be 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -12,17 +12,17 @@ character_stats_results: { final_stats: 891.52994 final_stats: 221 final_stats: 0 - final_stats: 5862.3136 + final_stats: 5725.0336 final_stats: 469.94994 final_stats: 2164.78757 final_stats: 221 final_stats: 94 - final_stats: 296.97496 + final_stats: 302.97496 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 9358.7 - final_stats: 3396.8 + final_stats: 3264.8 final_stats: 0 final_stats: 0 final_stats: 0 @@ -46,1152 +46,1824 @@ character_stats_results: { dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50359" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-Althor'sAbacus-50366" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 6394.4205 - tps: 4540.03856 + dps: 5892.68414 + tps: 4183.80574 } } dps_results: { key: "TestCombat-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-Bandit'sInsignia-40371" value: { - dps: 6576.63792 - tps: 4669.41292 + dps: 6065.86651 + tps: 4306.76522 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50354" value: { - dps: 6376.26245 - tps: 4527.14634 - hps: 88.67739 + dps: 5875.51939 + tps: 4171.61877 + hps: 87.65983 } } dps_results: { key: "TestCombat-AllItems-BaubleofTrueBlood-50726" value: { - dps: 6376.26245 - tps: 4527.14634 - hps: 88.67739 + dps: 5875.51939 + tps: 4171.61877 + hps: 87.65983 } } dps_results: { key: "TestCombat-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6547.50364 - tps: 4648.72758 + dps: 6029.94776 + tps: 4281.26291 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50035" value: { - dps: 6896.34961 - tps: 4896.40822 + dps: 6338.44772 + tps: 4500.29788 } } dps_results: { key: "TestCombat-AllItems-BlackBruise-50692" value: { - dps: 7001.59861 - tps: 4971.13501 + dps: 6446.09685 + tps: 4576.72876 } } dps_results: { key: "TestCombat-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5079.7041 - tps: 3606.58991 + dps: 4693.25718 + tps: 3332.2126 } } dps_results: { key: "TestCombat-AllItems-BonescytheBattlegear" value: { - dps: 6038.17677 - tps: 4287.10551 + dps: 5612.80191 + tps: 3985.08935 } } dps_results: { key: "TestCombat-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4536.27758 + dps: 6005.76864 + tps: 4178.81382 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50415" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-Bryntroll,theBoneArbiter-50709" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6663.90323 - tps: 4731.37129 + dps: 6135.75143 + tps: 4356.38352 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50349" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-CorpseTongueCoin-50352" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 hps: 64 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6510.47476 - tps: 4622.43708 + dps: 5993.73374 + tps: 4255.55095 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6541.77775 - tps: 4644.6622 + dps: 6029.87132 + tps: 4281.20864 } } dps_results: { key: "TestCombat-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 6533.09933 - tps: 4638.50052 + dps: 6017.90963 + tps: 4272.71584 } } dps_results: { key: "TestCombat-AllItems-Death'sChoice-47464" value: { - dps: 6865.24851 - tps: 4874.32644 + dps: 6330.44671 + tps: 4494.61717 } } dps_results: { key: "TestCombat-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6486.62737 - tps: 4605.50543 + dps: 5973.19949 + tps: 4240.97164 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50362" value: { - dps: 6806.86912 - tps: 4832.87708 + dps: 6288.08479 + tps: 4464.5402 } } dps_results: { key: "TestCombat-AllItems-Deathbringer'sWill-50363" value: { - dps: 6861.03126 - tps: 4871.33219 + dps: 6331.45818 + tps: 4495.33531 } } dps_results: { key: "TestCombat-AllItems-Defender'sCode-40257" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6550.55305 - tps: 4650.89267 + dps: 6033.47193 + tps: 4283.76507 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50348" value: { - dps: 6614.30025 - tps: 4696.15318 + dps: 6105.21706 + tps: 4334.70411 } } dps_results: { key: "TestCombat-AllItems-DislodgedForeignObject-50353" value: { - dps: 6587.729 - tps: 4677.28759 + dps: 6073.38478 + tps: 4312.1032 } } dps_results: { key: "TestCombat-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-EmberSkyflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6547.50364 - tps: 4648.72758 + dps: 6029.94776 + tps: 4281.26291 } } dps_results: { key: "TestCombat-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6542.76349 - tps: 4645.36208 + dps: 6025.96141 + tps: 4278.4326 } } dps_results: { key: "TestCombat-AllItems-EphemeralSnowflake-50260" value: { - dps: 6514.56313 - tps: 4625.33982 + dps: 6021.10738 + tps: 4274.98624 } } dps_results: { key: "TestCombat-AllItems-EssenceofGossamer-37220" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6541.79422 - tps: 4644.6739 + dps: 6019.75994 + tps: 4274.02956 } } dps_results: { key: "TestCombat-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6493.18503 - tps: 4610.16137 + dps: 5978.92332 + tps: 4245.03556 } } dps_results: { key: "TestCombat-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 6378.93345 - tps: 4529.04275 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-ForethoughtTalisman-40258" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-ForgeEmber-37660" value: { - dps: 6469.77201 - tps: 4593.53813 + dps: 5957.62119 + tps: 4229.91105 } } dps_results: { key: "TestCombat-AllItems-ForlornSkyflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-ForlornStarflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6621.05918 - tps: 4700.95202 + dps: 6104.52203 + tps: 4334.21064 } } dps_results: { key: "TestCombat-AllItems-FuturesightRune-38763" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-Gladiator'sVestments" value: { - dps: 6463.35355 - tps: 4588.98102 + dps: 5983.92044 + tps: 4248.58351 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54573" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-GlowingTwilightScale-54589" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-GnomishLightningGenerator-41121" value: { - dps: 6515.68196 - tps: 4626.13419 + dps: 6009.40182 + tps: 4266.67529 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-49982" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-Heartpierce-50641" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6547.50364 - tps: 4648.72758 + dps: 6029.94776 + tps: 4281.26291 } } dps_results: { key: "TestCombat-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6542.76349 - tps: 4645.36208 + dps: 6025.96141 + tps: 4278.4326 } } dps_results: { key: "TestCombat-AllItems-IncisorFragment-37723" value: { - dps: 6557.58933 - tps: 4655.88842 + dps: 6047.15909 + tps: 4293.48295 } } dps_results: { key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6550.96771 - tps: 4651.18707 + dps: 6035.69902 + tps: 4285.3463 hps: 11.11293 } } dps_results: { key: "TestCombat-AllItems-LastWord-50179" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-LastWord-50708" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6627.72658 - tps: 4705.68587 + dps: 6090.65086 + tps: 4324.36211 } } dps_results: { key: "TestCombat-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 6569.64354 - tps: 4664.44691 + dps: 6032.31656 + tps: 4282.94476 } } dps_results: { key: "TestCombat-AllItems-Nibelung-49992" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-Nibelung-50648" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-OfferingofSacrifice-37638" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6545.44266 - tps: 4647.26429 + dps: 6030.34674 + tps: 4281.54618 } } dps_results: { key: "TestCombat-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6551.54361 - tps: 4651.59596 + dps: 6036.12982 + tps: 4285.65217 } } dps_results: { key: "TestCombat-AllItems-PetrifiedScarab-21685" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-PurifiedShardoftheGods" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47316" value: { - dps: 6516.38271 - tps: 4626.63172 + dps: 6015.35996 + tps: 4270.90557 } } dps_results: { key: "TestCombat-AllItems-ReignoftheDead-47477" value: { - dps: 6533.99972 - tps: 4639.1398 + dps: 6033.05957 + tps: 4283.47229 } } dps_results: { key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-RuneofRepulsion-40372" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-SealofthePantheon-36993" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-Shadowblade'sBattlegear" value: { - dps: 6700.99905 - tps: 4757.70932 + dps: 6359.27517 + tps: 4515.08537 } } dps_results: { key: "TestCombat-AllItems-Shadowmourne-49623" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { key: "TestCombat-AllItems-ShinyShardoftheGods" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-Slayer'sArmor" value: { - dps: 4998.08767 - tps: 3548.64224 + dps: 4633.77158 + tps: 3289.97782 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50339" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-SliverofPureIce-50346" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-SoulPreserver-37111" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-SouloftheDead-40382" value: { - dps: 6498.32666 - tps: 4613.81193 + dps: 5983.38315 + tps: 4248.20204 } } dps_results: { key: "TestCombat-AllItems-SparkofLife-37657" value: { - dps: 6465.98002 - tps: 4590.84581 + dps: 5976.11925 + tps: 4243.04467 } } dps_results: { key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6575.91452 - tps: 4668.89931 + dps: 6046.36633 + tps: 4292.9201 } } dps_results: { key: "TestCombat-AllItems-StormshroudArmor" value: { - dps: 5121.68507 - tps: 3636.3964 + dps: 4811.97007 + tps: 3416.49875 } } dps_results: { key: "TestCombat-AllItems-SwiftSkyflareDiamond" value: { - dps: 6551.54361 - tps: 4651.59596 + dps: 6036.12982 + tps: 4285.65217 } } dps_results: { key: "TestCombat-AllItems-SwiftStarflareDiamond" value: { - dps: 6545.44266 - tps: 4647.26429 + dps: 6030.34674 + tps: 4281.54618 } } dps_results: { key: "TestCombat-AllItems-SwiftWindfireDiamond" value: { - dps: 6534.76599 - tps: 4639.68386 + dps: 6020.22635 + tps: 4274.36071 } } dps_results: { key: "TestCombat-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-TearsoftheVanquished-47215" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-TerrorbladeBattlegear" value: { - dps: 6459.93616 - tps: 4586.55467 + dps: 5981.24451 + tps: 4246.6836 } } dps_results: { key: "TestCombat-AllItems-TheFistsofFury" value: { - dps: 5878.19499 - tps: 4173.51844 + dps: 5356.68377 + tps: 3803.24548 } } dps_results: { key: "TestCombat-AllItems-TheGeneral'sHeart-45507" value: { - dps: 6378.62343 - tps: 4528.82264 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5975.77088 - tps: 4242.79733 + dps: 5481.13306 + tps: 3891.60448 } } dps_results: { key: "TestCombat-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6589.73005 - tps: 4678.70834 + dps: 6089.59321 + tps: 4323.61118 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6693.71723 - tps: 4752.53923 + dps: 6192.52172 + tps: 4396.69042 } } dps_results: { key: "TestCombat-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6733.97412 - tps: 4781.12163 + dps: 6213.72984 + tps: 4411.74818 } } dps_results: { key: "TestCombat-AllItems-TirelessSkyflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-TirelessStarflareDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 6457.26984 - tps: 4584.66159 + dps: 5967.59286 + tps: 4236.99093 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6519.51362 - tps: 4628.85467 + dps: 6005.76864 + tps: 4264.09574 } } dps_results: { key: "TestCombat-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5396.6848 - tps: 3831.64621 + dps: 4990.56233 + tps: 3543.29925 } } dps_results: { key: "TestCombat-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6281.86771 - tps: 4460.12607 + dps: 5767.56688 + tps: 4094.97249 } } dps_results: { key: "TestCombat-AllItems-VanCleef'sBattlegear" value: { - dps: 6205.47805 - tps: 4405.88942 + dps: 5788.52159 + tps: 4109.85033 } } dps_results: { key: "TestCombat-AllItems-WingedTalisman-37844" value: { - dps: 6375.75482 - tps: 4526.78593 + dps: 5874.7981 + tps: 4171.10665 } } dps_results: { key: "TestCombat-Average-Default" value: { - dps: 6651.18177 - tps: 4722.33906 + dps: 6123.22826 + tps: 4347.49206 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-FullBuffs-LongMultiTarget" value: { - dps: 19462.63663 - tps: 13818.47201 + dps: 20023.48946 + tps: 14216.67751 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-FullBuffs-LongSingleTarget" value: { - dps: 4967.59321 - tps: 3526.99118 + dps: 3311.29596 + tps: 2351.02014 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 5841.60294 - tps: 4147.53809 + dps: 3988.93449 + tps: 2832.14349 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-NoBuffs-LongMultiTarget" value: { - dps: 11809.88442 - tps: 8385.01794 + dps: 12269.40945 + tps: 8711.28071 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-NoBuffs-LongSingleTarget" value: { - dps: 2470.87925 - tps: 1754.32427 + dps: 1653.4486 + tps: 1173.94851 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 2612.81807 - tps: 1855.10083 + dps: 1770.86816 + tps: 1257.3164 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 21401.02134 - tps: 15194.72515 + dps: 11092.18164 + tps: 7875.44897 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 6667.83187 - tps: 4734.16063 + dps: 3842.72122 + tps: 2728.33207 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 7842.08238 - tps: 5567.87849 + dps: 4659.77048 + tps: 3308.43704 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-LongMultiTarget" value: { - dps: 12466.96457 - tps: 8851.54484 + dps: 5958.01542 + tps: 4230.19095 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-LongSingleTarget" value: { - dps: 3305.96503 - tps: 2347.23517 + dps: 1981.1688 + tps: 1406.62985 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-ShortSingleTarget" value: { - dps: 3444.89848 - tps: 2445.87792 + dps: 2096.95514 + tps: 1488.83815 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongMultiTarget" value: { - dps: 20510.69545 - tps: 14562.59377 + dps: 5200.93845 + tps: 3692.6663 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongSingleTarget" value: { - dps: 6356.61766 - tps: 4513.19854 + dps: 4448.56224 + tps: 3158.47919 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 7441.87327 - tps: 5283.73002 + dps: 5301.95789 + tps: 3764.3901 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-NoBuffs-LongMultiTarget" value: { - dps: 11941.13929 - tps: 8478.2089 + dps: 2648.17433 + tps: 1880.20377 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-NoBuffs-LongSingleTarget" value: { - dps: 3148.14294 - tps: 2235.18149 + dps: 2305.92912 + tps: 1637.20968 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-Combat-NoBuffs-ShortSingleTarget" value: { - dps: 3250.6818 - tps: 2307.98408 + dps: 2416.40481 + tps: 1715.64742 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-FullBuffs-LongMultiTarget" value: { - dps: 15664.74617 - tps: 11121.96978 + dps: 22130.42742 + tps: 15712.60347 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-FullBuffs-LongSingleTarget" value: { - dps: 5717.49047 - tps: 4059.41824 + dps: 4692.58015 + tps: 3331.73191 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 6881.94132 - tps: 4886.17834 + dps: 5609.15241 + tps: 3982.49821 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-NoBuffs-LongMultiTarget" value: { - dps: 8909.27231 - tps: 6325.58334 + dps: 13062.09418 + tps: 9274.08687 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-NoBuffs-LongSingleTarget" value: { - dps: 2674.88752 - tps: 1899.17014 + dps: 2346.38591 + tps: 1665.934 } } dps_results: { - key: "TestCombat-Settings-Human-P1-MH Instant OH Instant--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 2868.08313 - tps: 2036.33902 + dps: 2455.88884 + tps: 1743.68107 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 19611.55658 - tps: 13924.20517 + dps: 11885.77014 + tps: 8438.8968 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 4998.85192 - tps: 3549.18486 + dps: 5551.07296 + tps: 3941.26181 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 5918.9583 - tps: 4202.4604 + dps: 6678.83741 + tps: 4741.97456 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-LongMultiTarget" value: { - dps: 11910.00803 - tps: 8456.1057 + dps: 6215.6053 + tps: 4413.07976 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-LongSingleTarget" value: { - dps: 2490.06821 - tps: 1767.94843 + dps: 2814.84666 + tps: 1998.54113 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-ShortSingleTarget" value: { - dps: 2654.47579 - tps: 1884.67781 + dps: 2927.18353 + tps: 2078.3003 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-LongMultiTarget" value: { - dps: 21558.42464 - tps: 15306.48149 + dps: 6809.89924 + tps: 4835.02846 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-LongSingleTarget" value: { - dps: 6709.55461 - tps: 4763.78377 + dps: 6140.87137 + tps: 4360.01867 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-FullBuffs-ShortSingleTarget" value: { - dps: 7944.48498 - tps: 5640.58433 + dps: 7292.76713 + tps: 5177.86466 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-NoBuffs-LongMultiTarget" value: { - dps: 12571.64447 - tps: 8925.86757 + dps: 3410.19804 + tps: 2421.24061 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-NoBuffs-LongSingleTarget" value: { - dps: 3331.2406 - tps: 2365.18083 + dps: 3126.67599 + tps: 2219.93995 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-Combat-NoBuffs-ShortSingleTarget" value: { - dps: 3498.7281 - tps: 2484.09695 + dps: 3227.11596 + tps: 2291.25233 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-FullBuffs-LongMultiTarget" value: { - dps: 20670.3676 - tps: 14675.961 + dps: 21279.34642 + tps: 15108.33596 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-FullBuffs-LongSingleTarget" value: { - dps: 6396.67388 - tps: 4541.63845 + dps: 4511.14058 + tps: 3202.90981 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 7538.21821 - tps: 5352.13493 + dps: 5374.78153 + tps: 3816.09489 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-NoBuffs-LongMultiTarget" value: { - dps: 12041.10105 - tps: 8549.18175 + dps: 12560.2658 + tps: 8917.78872 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3171.78121 - tps: 2251.96466 + dps: 2252.5829 + tps: 1599.33386 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 3300.58906 - tps: 2343.41823 + dps: 2355.81564 + tps: 1672.62911 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--FullBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" value: { - dps: 15798.04053 - tps: 11216.60877 + dps: 11329.56118 + tps: 8043.98844 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--FullBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" value: { - dps: 5752.16643 - tps: 4084.03816 + dps: 5270.46936 + tps: 3742.03324 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--FullBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" value: { - dps: 6974.42938 - tps: 4951.84486 + dps: 6295.37965 + tps: 4469.71955 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--NoBuffs-LongMultiTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-LongMultiTarget" value: { - dps: 8991.47344 - tps: 6383.94614 + dps: 5892.68085 + tps: 4183.8034 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--NoBuffs-LongSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-LongSingleTarget" value: { - dps: 2695.64019 - tps: 1913.90454 + dps: 2672.65558 + tps: 1897.58546 } } dps_results: { - key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant--NoBuffs-ShortSingleTarget" + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-ShortSingleTarget" value: { - dps: 2913.80859 - tps: 2068.8041 + dps: 2777.45352 + tps: 1971.992 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 6507.63726 + tps: 4620.42245 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 5834.95109 + tps: 4142.81527 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 6900.73177 + tps: 4899.51956 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 3257.49658 + tps: 2312.82257 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 2973.06187 + tps: 2110.87393 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 3050.60241 + tps: 2165.92771 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 16166.19865 + tps: 11478.00104 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 3872.04985 + tps: 2749.1554 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 4816.58036 + tps: 3419.77206 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 9297.6474 + tps: 6601.32965 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 1821.90344 + tps: 1293.55144 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 1977.03924 + tps: 1403.69786 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongMultiTarget" + value: { + dps: 10007.14849 + tps: 7105.07543 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongSingleTarget" + value: { + dps: 4619.02643 + tps: 3279.50876 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" + value: { + dps: 5726.04095 + tps: 4065.48907 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-NoBuffs-LongMultiTarget" + value: { + dps: 5066.10435 + tps: 3596.93409 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-NoBuffs-LongSingleTarget" + value: { + dps: 2218.15435 + tps: 1574.88959 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-CleaveSND-NoBuffs-ShortSingleTarget" + value: { + dps: 2381.5184 + tps: 1690.87807 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 5873.67315 + tps: 4170.30794 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 5194.74379 + tps: 3688.26809 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 6347.72723 + tps: 4506.88634 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 2779.86708 + tps: 1973.70563 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 2502.40605 + tps: 1776.70829 + } +} +dps_results: { + key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 2668.80635 + tps: 1894.85251 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 20179.94697 + tps: 14327.76235 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 3336.19505 + tps: 2368.69849 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 4048.3415 + tps: 2874.32246 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 12380.22874 + tps: 8789.9624 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 1668.198 + tps: 1184.42058 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 1803.71716 + tps: 1280.63918 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" + value: { + dps: 11179.24397 + tps: 7937.26322 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" + value: { + dps: 3870.40533 + tps: 2747.98778 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" + value: { + dps: 4724.85137 + tps: 3354.64447 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-LongMultiTarget" + value: { + dps: 6005.03566 + tps: 4263.57532 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-LongSingleTarget" + value: { + dps: 1996.91178 + tps: 1417.80736 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-CleaveSND-NoBuffs-ShortSingleTarget" + value: { + dps: 2131.0135 + tps: 1513.01959 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 5249.6736 + tps: 3727.26826 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 4477.41413 + tps: 3178.96403 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 5366.81996 + tps: 3810.44217 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 2675.76177 + tps: 1899.79086 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 2322.82379 + tps: 1649.20489 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 2451.24188 + tps: 1740.38174 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 22300.84128 + tps: 15833.59731 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 4726.43343 + tps: 3355.76774 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 5688.59118 + tps: 4038.89973 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 13177.70907 + tps: 9356.17344 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 2365.77374 + tps: 1679.69936 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 2497.40021 + tps: 1773.15415 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongMultiTarget" + value: { + dps: 11981.00483 + tps: 8506.51343 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-LongSingleTarget" + value: { + dps: 5589.84446 + tps: 3968.78957 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" + value: { + dps: 6766.74762 + tps: 4804.39081 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-LongMultiTarget" + value: { + dps: 6265.90732 + tps: 4448.79419 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-LongSingleTarget" + value: { + dps: 2835.86927 + tps: 2013.46718 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-CleaveSND-NoBuffs-ShortSingleTarget" + value: { + dps: 2971.06066 + tps: 2109.45307 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 6868.16467 + tps: 4876.39691 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 6180.13271 + tps: 4387.89422 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 7380.18383 + tps: 5239.93052 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 3442.36378 + tps: 2444.07829 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 3148.84616 + tps: 2235.68077 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 3271.23333 + tps: 2322.57566 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 21443.94106 + tps: 15225.19815 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 4544.11626 + tps: 3226.32254 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 5450.65815 + tps: 3869.96728 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 12671.92334 + tps: 8997.06557 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 2271.72422 + tps: 1612.9242 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 2396.29409 + tps: 1701.3688 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongMultiTarget" + value: { + dps: 11420.83197 + tps: 8108.7907 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-LongSingleTarget" + value: { + dps: 5307.10023 + tps: 3768.04116 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-FullBuffs-ShortSingleTarget" + value: { + dps: 6378.34363 + tps: 4528.62398 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-LongMultiTarget" + value: { + dps: 5941.34063 + tps: 4218.35184 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-LongSingleTarget" + value: { + dps: 2692.83498 + tps: 1911.91283 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-CleaveSND-NoBuffs-ShortSingleTarget" + value: { + dps: 2818.40565 + tps: 2001.06801 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 6564.13954 + tps: 4660.53907 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 5872.2614 + tps: 4169.30559 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 6982.45693 + tps: 4957.54442 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 3288.43475 + tps: 2334.78867 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 2993.93655 + tps: 2125.69495 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 3091.86055 + tps: 2195.22099 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-FullBuffs-LongMultiTarget" + value: { + dps: 16307.99693 + tps: 11578.67782 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-FullBuffs-LongSingleTarget" + value: { + dps: 3901.46098 + tps: 2770.0373 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-FullBuffs-ShortSingleTarget" + value: { + dps: 4888.5034 + tps: 3470.83741 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-NoBuffs-LongMultiTarget" + value: { + dps: 9390.87132 + tps: 6667.51864 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-NoBuffs-LongSingleTarget" + value: { + dps: 1838.10713 + tps: 1305.05606 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-AOE-NoBuffs-ShortSingleTarget" + value: { + dps: 2014.00894 + tps: 1429.94635 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongMultiTarget" + value: { + dps: 10093.1547 + tps: 7166.13984 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-LongSingleTarget" + value: { + dps: 4652.20331 + tps: 3303.06435 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-FullBuffs-ShortSingleTarget" + value: { + dps: 5805.90033 + tps: 4122.18924 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-NoBuffs-LongMultiTarget" + value: { + dps: 5110.56652 + tps: 3628.50223 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-NoBuffs-LongSingleTarget" + value: { + dps: 2235.76099 + tps: 1587.3903 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-CleaveSND-NoBuffs-ShortSingleTarget" + value: { + dps: 2420.09069 + tps: 1718.26439 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-LongMultiTarget" + value: { + dps: 5926.87301 + tps: 4208.07984 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-LongSingleTarget" + value: { + dps: 5228.81664 + tps: 3712.45981 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-FullBuffs-ShortSingleTarget" + value: { + dps: 6426.79049 + tps: 4563.02125 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-NoBuffs-LongMultiTarget" + value: { + dps: 2807.54849 + tps: 1993.35943 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-NoBuffs-LongSingleTarget" + value: { + dps: 2520.68444 + tps: 1789.68595 + } +} +dps_results: { + key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-Combat-NoBuffs-ShortSingleTarget" + value: { + dps: 2707.63349 + tps: 1922.41977 } } dps_results: { key: "TestCombat-SwitchInFrontOfTarget-Default" value: { - dps: 6418.78721 - tps: 4557.33892 + dps: 5892.27434 + tps: 4183.51478 } } diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results index d9cf7062bb..0d702271e1 100644 --- a/sim/rogue/TestSubtlety.results +++ b/sim/rogue/TestSubtlety.results @@ -2,34 +2,34 @@ character_stats_results: { key: "TestSubtlety-CharacterStats-Default" value: { final_stats: 394.9 - final_stats: 2528.735 - final_stats: 1650.55 + final_stats: 2569.215 + final_stats: 1764.95 final_stats: 194.7 final_stats: 237.6 final_stats: 500 final_stats: 109 - final_stats: 384 - final_stats: 1009.52994 - final_stats: 288 + final_stats: 382 + final_stats: 977.52994 + final_stats: 385 final_stats: 0 - final_stats: 7547.53835 - final_stats: 384 - final_stats: 2618.52652 - final_stats: 288 + final_stats: 7581.99915 + final_stats: 382 + final_stats: 2608.82581 + final_stats: 385 final_stats: 304.91 - final_stats: 214 + final_stats: 219 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 11629.97 - final_stats: 3491.4 + final_stats: 11771.93 + final_stats: 3478.2 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 23929.5 + final_stats: 25073.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -46,837 +46,837 @@ character_stats_results: { dps_results: { key: "TestSubtlety-AllItems-Althor'sAbacus-50359" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-Althor'sAbacus-50366" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-AshtongueTalismanofLethality-32492" value: { - dps: 7920.49509 - tps: 5620.76379 + dps: 7870.75181 + tps: 5586.63694 } } dps_results: { key: "TestSubtlety-AllItems-AustereEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-Bandit'sInsignia-40371" value: { - dps: 8139.19965 - tps: 5774.36552 + dps: 8101.05398 + tps: 5750.98033 } } dps_results: { key: "TestSubtlety-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7895.34823 - tps: 5604.0637 - hps: 88.03911 + dps: 7846.70617 + tps: 5568.76463 + hps: 88.34387 } } dps_results: { key: "TestSubtlety-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7895.34823 - tps: 5604.0637 - hps: 88.03911 + dps: 7846.70617 + tps: 5568.76463 + hps: 88.34387 } } dps_results: { key: "TestSubtlety-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 8229.54937 - tps: 5840.61892 + dps: 8137.71518 + tps: 5774.37344 } } dps_results: { key: "TestSubtlety-AllItems-BlackBruise-50035" value: { - dps: 8154.09554 - tps: 5786.62827 + dps: 8116.06959 + tps: 5759.69286 } } dps_results: { key: "TestSubtlety-AllItems-BlackBruise-50692" value: { - dps: 8251.69598 - tps: 5855.92978 + dps: 8210.95587 + tps: 5827.06718 } } dps_results: { key: "TestSubtlety-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5844.09064 - tps: 4148.49247 + dps: 5814.3254 + tps: 4124.52663 } } dps_results: { key: "TestSubtlety-AllItems-BonescytheBattlegear" value: { - dps: 6933.71939 - tps: 4920.03935 + dps: 6919.96335 + tps: 4908.36641 } } dps_results: { key: "TestSubtlety-AllItems-BracingEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5674.45653 + dps: 8107.55168 + tps: 5637.03737 } } dps_results: { key: "TestSubtlety-AllItems-ChaoticSkyflareDiamond" value: { - dps: 8379.74809 - tps: 5947.20344 + dps: 8286.06039 + tps: 5879.61104 } } dps_results: { key: "TestSubtlety-AllItems-CorpseTongueCoin-50349" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-CorpseTongueCoin-50352" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 hps: 64 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 8070.74536 - tps: 5727.86822 + dps: 8025.85541 + tps: 5696.35424 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Death-42990" value: { - dps: 8111.02091 - tps: 5756.11412 + dps: 8061.76717 + tps: 5722.24535 } } dps_results: { key: "TestSubtlety-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 8108.49848 - tps: 5755.83382 + dps: 8060.16247 + tps: 5719.8474 } } dps_results: { key: "TestSubtlety-AllItems-Death'sChoice-47464" value: { - dps: 8514.00234 - tps: 6044.94166 + dps: 8427.24584 + tps: 5979.1919 } } dps_results: { key: "TestSubtlety-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 8067.0093 - tps: 5725.65384 + dps: 8006.82684 + tps: 5681.29002 } } dps_results: { key: "TestSubtlety-AllItems-Deathbringer'sWill-50362" value: { - dps: 8381.40884 - tps: 5944.53243 + dps: 8296.08218 + tps: 5887.32209 } } dps_results: { key: "TestSubtlety-AllItems-Deathbringer'sWill-50363" value: { - dps: 8456.89617 - tps: 6002.72072 + dps: 8396.04927 + tps: 5958.22868 } } dps_results: { key: "TestSubtlety-AllItems-Defender'sCode-40257" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-DestructiveSkyflareDiamond" value: { - dps: 8227.43514 - tps: 5839.11782 + dps: 8147.10839 + tps: 5780.55806 } } dps_results: { key: "TestSubtlety-AllItems-DislodgedForeignObject-50348" value: { - dps: 8142.22498 - tps: 5779.8228 + dps: 8083.64816 + tps: 5735.86808 } } dps_results: { key: "TestSubtlety-AllItems-DislodgedForeignObject-50353" value: { - dps: 8124.1318 - tps: 5766.19777 + dps: 8065.77232 + tps: 5724.73239 } } dps_results: { key: "TestSubtlety-AllItems-EffulgentSkyflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-EmberSkyflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 8229.54937 - tps: 5840.61892 + dps: 8137.71518 + tps: 5774.37344 } } dps_results: { key: "TestSubtlety-AllItems-EnigmaticStarflareDiamond" value: { - dps: 8211.31048 - tps: 5827.66166 + dps: 8143.38886 + tps: 5779.37719 } } dps_results: { key: "TestSubtlety-AllItems-EphemeralSnowflake-50260" value: { - dps: 8061.54923 - tps: 5722.09261 + dps: 7974.95818 + tps: 5660.21719 } } dps_results: { key: "TestSubtlety-AllItems-EssenceofGossamer-37220" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-EternalEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 8094.7026 - tps: 5743.70854 + dps: 8067.91576 + tps: 5725.81572 } } dps_results: { key: "TestSubtlety-AllItems-EyeoftheBroodmother-45308" value: { - dps: 8045.32802 - tps: 5708.61661 + dps: 8022.47109 + tps: 5693.97007 } } dps_results: { key: "TestSubtlety-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-ForethoughtTalisman-40258" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-ForgeEmber-37660" value: { - dps: 8022.64239 - tps: 5694.46659 + dps: 7982.51409 + tps: 5664.82165 } } dps_results: { key: "TestSubtlety-AllItems-ForlornSkyflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-ForlornStarflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 8152.57349 - tps: 5786.64992 + dps: 8100.93439 + tps: 5749.20077 } } dps_results: { key: "TestSubtlety-AllItems-FuturesightRune-38763" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-Gladiator'sVestments" value: { - dps: 7335.32718 - tps: 5202.80306 + dps: 7293.01793 + tps: 5175.63133 } } dps_results: { key: "TestSubtlety-AllItems-GlowingTwilightScale-54573" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-GlowingTwilightScale-54589" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-GnomishLightningGenerator-41121" value: { - dps: 8075.35809 - tps: 5732.3037 + dps: 8019.98429 + tps: 5691.00488 } } dps_results: { key: "TestSubtlety-AllItems-Heartpierce-49982" value: { - dps: 8327.08937 - tps: 5911.04447 + dps: 8302.87853 + tps: 5893.03954 } } dps_results: { key: "TestSubtlety-AllItems-Heartpierce-50641" value: { - dps: 8327.08937 - tps: 5911.04447 + dps: 8302.87853 + tps: 5893.03954 } } dps_results: { key: "TestSubtlety-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 8229.54937 - tps: 5840.61892 + dps: 8137.71518 + tps: 5774.37344 } } dps_results: { key: "TestSubtlety-AllItems-ImpassiveStarflareDiamond" value: { - dps: 8211.31048 - tps: 5827.66166 + dps: 8143.38886 + tps: 5779.37719 } } dps_results: { key: "TestSubtlety-AllItems-IncisorFragment-37723" value: { - dps: 8092.43095 - tps: 5743.97222 + dps: 8042.29617 + tps: 5707.60306 } } dps_results: { key: "TestSubtlety-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 8195.6864 - tps: 5815.50798 - hps: 12.24393 + dps: 8142.79817 + tps: 5777.08854 + hps: 12.78749 } } dps_results: { key: "TestSubtlety-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-MeteoriteWhetstone-37390" value: { - dps: 8136.2379 - tps: 5775.06651 + dps: 8089.67818 + tps: 5741.23124 } } dps_results: { key: "TestSubtlety-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 8054.31109 - tps: 5717.35164 + dps: 8017.0266 + tps: 5691.33135 } } dps_results: { key: "TestSubtlety-AllItems-OfferingofSacrifice-37638" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-PersistentEarthshatterDiamond" value: { - dps: 8188.91013 - tps: 5810.69917 + dps: 8136.08455 + tps: 5772.32481 } } dps_results: { key: "TestSubtlety-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 8195.6864 - tps: 5815.50798 + dps: 8142.79817 + tps: 5777.08854 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedScarab-21685" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-PurifiedShardoftheGods" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-ReignoftheDead-47316" value: { - dps: 8044.37867 - tps: 5707.91166 + dps: 8022.30122 + tps: 5692.24203 } } dps_results: { key: "TestSubtlety-AllItems-ReignoftheDead-47477" value: { - dps: 8062.9122 - tps: 5721.07047 + dps: 8040.85868 + tps: 5705.41783 } } dps_results: { key: "TestSubtlety-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 8327.08937 - tps: 5911.04447 + dps: 8302.87853 + tps: 5893.03954 } } dps_results: { key: "TestSubtlety-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-RuneofRepulsion-40372" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-SealofthePantheon-36993" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-Shadowblade'sBattlegear" value: { - dps: 7770.29075 - tps: 5513.02521 + dps: 7727.98781 + tps: 5486.07844 } } dps_results: { key: "TestSubtlety-AllItems-ShinyShardoftheGods" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-Slayer'sArmor" value: { - dps: 5401.06339 - tps: 3833.62154 + dps: 5351.53092 + tps: 3794.54267 } } dps_results: { key: "TestSubtlety-AllItems-SliverofPureIce-50339" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-SliverofPureIce-50346" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-SoulPreserver-37111" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-SouloftheDead-40382" value: { - dps: 8062.99157 - tps: 5720.80094 + dps: 8024.91215 + tps: 5695.70322 } } dps_results: { key: "TestSubtlety-AllItems-SparkofLife-37657" value: { - dps: 7982.64087 - tps: 5662.51989 + dps: 7963.11381 + tps: 5651.4162 } } dps_results: { key: "TestSubtlety-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 8131.4197 - tps: 5769.70522 + dps: 8070.50825 + tps: 5726.81938 } } dps_results: { key: "TestSubtlety-AllItems-StormshroudArmor" value: { - dps: 6042.63241 - tps: 4288.88079 + dps: 6053.00399 + tps: 4295.95996 } } dps_results: { key: "TestSubtlety-AllItems-SwiftSkyflareDiamond" value: { - dps: 8195.6864 - tps: 5815.50798 + dps: 8142.79817 + tps: 5777.08854 } } dps_results: { key: "TestSubtlety-AllItems-SwiftStarflareDiamond" value: { - dps: 8188.91013 - tps: 5810.69917 + dps: 8136.08455 + tps: 5772.32481 } } dps_results: { key: "TestSubtlety-AllItems-SwiftWindfireDiamond" value: { - dps: 8177.05167 - tps: 5802.28377 + dps: 8124.33572 + tps: 5763.98828 } } dps_results: { key: "TestSubtlety-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-TearsoftheVanquished-47215" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-TerrorbladeBattlegear" value: { - dps: 7478.95969 - tps: 5308.87686 + dps: 7445.2008 + tps: 5283.43392 } } dps_results: { key: "TestSubtlety-AllItems-TheFistsofFury" value: { - dps: 7022.6121 - tps: 4981.7534 + dps: 6971.40475 + tps: 4944.34363 } } dps_results: { key: "TestSubtlety-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-AllItems-ThunderingSkyflareDiamond" value: { - dps: 8215.56811 - tps: 5827.61908 + dps: 8175.74959 + tps: 5801.48507 } } dps_results: { key: "TestSubtlety-AllItems-TinyAbominationinaJar-50351" value: { - dps: 8364.12332 - tps: 5936.56203 + dps: 8276.52256 + tps: 5875.49069 } } dps_results: { key: "TestSubtlety-AllItems-TinyAbominationinaJar-50706" value: { - dps: 8357.95919 - tps: 5932.14117 + dps: 8396.48964 + tps: 5960.30902 } } dps_results: { key: "TestSubtlety-AllItems-TirelessSkyflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-TirelessStarflareDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7945.60657 - tps: 5638.13631 + dps: 7963.97091 + tps: 5651.24602 } } dps_results: { key: "TestSubtlety-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 8160.111 - tps: 5790.26176 + dps: 8107.55168 + tps: 5752.07895 } } dps_results: { key: "TestSubtlety-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6223.0158 - tps: 4415.93701 + dps: 6148.50878 + tps: 4363.33848 } } dps_results: { key: "TestSubtlety-AllItems-VanCleef'sBattlegear" value: { - dps: 7214.36952 - tps: 5117.4369 + dps: 7177.88832 + tps: 5094.26897 } } dps_results: { key: "TestSubtlety-AllItems-WingedTalisman-37844" value: { - dps: 7894.94846 - tps: 5603.77987 + dps: 7846.33221 + tps: 5568.49912 } } dps_results: { key: "TestSubtlety-Average-Default" value: { - dps: 8364.03484 - tps: 5935.83635 + dps: 8311.57873 + tps: 5898.44268 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-LongMultiTarget" value: { - dps: 30965.12027 - tps: 21985.2354 + dps: 31063.54723 + tps: 22055.11853 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-LongSingleTarget" value: { - dps: 8327.08937 - tps: 5911.04447 + dps: 8302.87853 + tps: 5893.03954 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--FullBuffs-ShortSingleTarget" value: { - dps: 9470.00074 - tps: 6693.77629 + dps: 9202.82134 + tps: 6497.37367 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-LongMultiTarget" value: { - dps: 19215.00221 - tps: 13642.65157 + dps: 19249.68587 + tps: 13667.27697 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-LongSingleTarget" value: { - dps: 4126.48444 - tps: 2928.35135 + dps: 4091.27574 + tps: 2903.22932 } } dps_results: { key: "TestSubtlety-Settings-BloodElf-P2 Subtlety-Subtlety--NoBuffs-ShortSingleTarget" value: { - dps: 4129.63209 - tps: 2912.64778 + dps: 3990.28275 + tps: 2821.77203 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-LongMultiTarget" value: { - dps: 30680.17119 - tps: 21782.92154 + dps: 30736.39303 + tps: 21822.83905 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-LongSingleTarget" value: { - dps: 8339.22713 - tps: 5916.69307 + dps: 8260.81378 + tps: 5863.79055 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--FullBuffs-ShortSingleTarget" value: { - dps: 9434.95873 - tps: 6665.19171 + dps: 9119.98395 + tps: 6461.14512 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-LongMultiTarget" value: { - dps: 19078.54596 - tps: 13545.76763 + dps: 19003.30323 + tps: 13492.34529 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-LongSingleTarget" value: { - dps: 4113.7071 - tps: 2919.85129 + dps: 4064.43692 + tps: 2883.14709 } } dps_results: { key: "TestSubtlety-Settings-Orc-P2 Subtlety-Subtlety--NoBuffs-ShortSingleTarget" value: { - dps: 4162.37154 - tps: 2944.60061 + dps: 3954.08906 + tps: 2798.18684 } } dps_results: { key: "TestSubtlety-SwitchInFrontOfTarget-Default" value: { - dps: 7578.45125 - tps: 5378.57626 + dps: 7555.35686 + tps: 5363.04174 } } diff --git a/sim/rogue/rogue_test.go b/sim/rogue/rogue_test.go index c1b8654f1a..b87ca9234d 100644 --- a/sim/rogue/rogue_test.go +++ b/sim/rogue/rogue_test.go @@ -27,6 +27,11 @@ func TestCombat(t *testing.T) { {Label: "MH Instant OH Instant", SpecOptions: PlayerOptionsCombatII}, {Label: "MH Deadly OH Deadly", SpecOptions: PlayerOptionsCombatDD}, }, + Rotation: core.RotationCombo{Label: "Combat", Rotation: CombatExposeRotation}, + OtherRotations: []core.RotationCombo{ + {Label: "CleaveSND", Rotation: CleaveSNDRotation}, + {Label: "AOE", Rotation: AOERotation}, + }, ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, RangedWeaponTypes: []proto.RangedWeaponType{ @@ -53,6 +58,8 @@ func TestAssassination(t *testing.T) { {Label: "MH Instant OH Instant", SpecOptions: PlayerOptionsAssassinationII}, {Label: "MH Deadly OH Deadly", SpecOptions: PlayerOptionsAssassinationDD}, }, + Rotation: core.RotationCombo{Label: "Mutilate", Rotation: MutilateRuptureExposeRotation}, + ItemFilter: core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, RangedWeaponTypes: []proto.RangedWeaponType{ @@ -223,103 +230,81 @@ var SubtletyGlyphs = &proto.Glyphs{ var PlayerOptionsCombatDI = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsCombatDD = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyDeadly, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsCombatID = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: InstantDeadly, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsCombatII = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: InstantInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsNoLethality = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsNoPotW = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsNoLethalityNoPotW = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsAssassinationDI = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsAssassinationDD = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: DeadlyDeadly, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsAssassinationID = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: InstantDeadly, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsAssassinationII = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: InstantInstant, - Rotation: basicRotation, + Rotation: &proto.Rogue_Rotation{}, }, } var PlayerOptionsSubtletyID = &proto.Player_Rogue{ Rogue: &proto.Rogue{ Options: InstantDeadly, - Rotation: subtletyRotation, + Rotation: &proto.Rogue_Rotation{}, }, } -var basicRotation = &proto.Rogue_Rotation{ - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Maintain, - AssassinationFinisherPriority: proto.Rogue_Rotation_EnvenomRupture, - CombatFinisherPriority: proto.Rogue_Rotation_RuptureEviscerate, - MinimumComboPointsExposeArmor: 4, - MinimumComboPointsPrimaryFinisher: 3, - MinimumComboPointsSecondaryFinisher: 2, - MultiTargetSliceFrequency: proto.Rogue_Rotation_Once, - MinimumComboPointsMultiTargetSlice: 4, -} - -var subtletyRotation = &proto.Rogue_Rotation{ - ExposeArmorFrequency: proto.Rogue_Rotation_Never, - TricksOfTheTradeFrequency: proto.Rogue_Rotation_Never, - SubtletyFinisherPriority: proto.Rogue_Rotation_SubtletyEviscerate, - MinimumComboPointsPrimaryFinisher: 5, - MinimumComboPointsSecondaryFinisher: 5, - OpenWithGarrote: true, - OpenWithPremeditation: true, -} - var DeadlyInstant = &proto.Rogue_Options{ MhImbue: proto.Rogue_Options_DeadlyPoison, OhImbue: proto.Rogue_Options_InstantPoison, @@ -343,96 +328,122 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredRogueThistleTea, } +var MutilateRuptureExposeRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51662}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":51662}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58426}}}}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":57993}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57993}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":48666}}}} + ] +}`) + +var CombatExposeRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":48672}}},"rhs":{"const":{"val":"2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"dotIsActive":{"spellId":{"spellId":48672}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}}}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":13750}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48638}}}} + ] +}`) + +var CleaveSNDRotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":48638}}}}, + {"action":{"castSpell":{"spellId":{"spellId":51723}}}} + ] +}`) + +var AOERotation = core.APLRotationFromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"not":{"val":{"spellIsReady":{"spellId":{"spellId":57934}}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"65"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":58426}}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16551}}}}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"castSpell":{"spellId":{"spellId":51723}}}} + ] +}`) + var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40499, - "enchant": 3817, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 44664, - "gems": [ - 42154 - ] - }, - { - "id": 40502, - "enchant": 3808, - "gems": [ - 36766 - ] - }, - { - "id": 40403, - "enchant": 3605 - }, - { - "id": 40539, - "enchant": 3832, - "gems": [ - 36766 - ] - }, - { - "id": 39765, - "enchant": 3845, - "gems": [ - 40003, - 0 - ] - }, - { - "id": 40496, - "enchant": 3604, - "gems": [ - 40058, - 0 - ] - }, - { - "id": 40260, - "gems": [ - 39999 - ] - }, - { - "id": 40500, - "enchant": 3823, - "gems": [ - 40003, - 40003 - ] - }, - { - "id": 39701, - "enchant": 3606 - }, - { - "id": 40074 - }, - { - "id": 40474 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 39714, - "enchant": 3789 - }, - { - "id": 40386, - "enchant": 3789 - }, - { - "id": 40385 - } + {"id":40499,"enchant":3817,"gems":[41398,42702]}, + {"id":44664,"gems":[40003]}, + {"id":40502,"enchant":3808,"gems":[40003]}, + {"id":40403,"enchant":3605}, + {"id":40539,"enchant":3832,"gems":[40003]}, + {"id":39765,"enchant":3845,"gems":[40003,0]}, + {"id":40496,"enchant":3604,"gems":[40053,0]}, + {"id":40260,"gems":[39999]}, + {"id":40500,"enchant":3823,"gems":[40003,40003]}, + {"id":39701,"enchant":3606}, + {"id":40074}, + {"id":40474}, + {"id":40684}, + {"id":44253}, + {"id":39714,"enchant":3789}, + {"id":40386,"enchant":3789}, + {"id":40385} ]}`) var GearWithoutRED = core.EquipmentSpecFromJsonString(`{"items": [ { @@ -608,209 +619,22 @@ var GearWithRED = core.EquipmentSpecFromJsonString(`{"items": [ "id": 37191 } ]}`) -var MutilateP1Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 29044, - "enchant": 3003, - "gems": [ - 32409, - 24061 - ] - }, - { - "id": 29381 - }, - { - "id": 27797, - "enchant": 2986, - "gems": [ - 24061, - 24055 - ] - }, - { - "id": 28672, - "enchant": 368 - }, - { - "id": 29045, - "enchant": 2661, - "gems": [ - 24061, - 24051, - 24055 - ] - }, - { - "id": 29246, - "enchant": 1593 - }, - { - "id": 27531, - "gems": [ - 24061, - 24061 - ] - }, - { - "id": 29247 - }, - { - "id": 28741, - "enchant": 3012, - "gems": [ - 24051, - 24051, - 24051 - ] - }, - { - "id": 28545, - "enchant": 2939, - "gems": [ - 24061, - 24051 - ] - }, - { - "id": 28757 - }, - { - "id": 28649 - }, - { - "id": 29383 - }, - { - "id": 28830 - }, - { - "id": 28768, - "enchant": 2673 - }, - { - "id": 29182, - "enchant": 2673 - }, - { - "id": 28772 - } -]}`) var SubtletyP2Gear = core.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 46125, - "enchant": 3817, - "gems": [ - 41398, - 42143 - ] - }, - { - "id": 45517, - "gems": [ - 49110 - ] - }, - { - "id": 46127, - "enchant": 3808, - "gems": [ - 39997 - ] - }, - { - "id": 45461, - "enchant": 3605, - "gems": [ - 40044 - ] - }, - { - "id": 46123, - "enchant": 3832, - "gems": [ - 39997, - 40044 - ] - }, - { - "id": 45611, - "enchant": 3845, - "gems": [ - 40044, - 0 - ] - }, - { - "id": 46124, - "enchant": 3604, - "gems": [ - 39997, - 0 - ] - }, - { - "id": 46095, - "enchant": 3599, - "gems": [ - 42143, - 42143, - 39997 - ] - }, - { - "id": 45536, - "enchant": 3823, - "gems": [ - 40044, - 39997, - 40023 - ] - }, - { - "id": 45564, - "enchant": 3606, - "gems": [ - 40023, - 40003 - ] - }, - { - "id": 45608, - "gems": [ - 39997 - ] - }, - { - "id": 46048, - "gems": [ - 39997 - ] - }, - { - "id": 45609 - }, - { - "id": 45931 - }, - { - "id": 45132, - "enchant": 3789, - "gems": [ - 40044 - ] - }, - { - "id": 45484, - "enchant": 3789, - "gems": [ - 39997 - ] - }, - { - "id": 45296, - "gems": [ - 39997 - ] - } + {"id":46125,"enchant":3817,"gems":[41398,42143]}, + {"id":45517,"gems":[49110]}, + {"id":45245,"enchant":3808,"gems":[40023,40003]}, + {"id":45461,"enchant":3605,"gems":[40044]}, + {"id":45473,"enchant":3832,"gems":[40044,40023,40003]}, + {"id":45611,"enchant":3845,"gems":[40044,0]}, + {"id":46124,"enchant":3604,"gems":[39997,0]}, + {"id":46095,"enchant":3599,"gems":[42143,42143,39997]}, + {"id":45536,"enchant":3823,"gems":[40044,39997,40023]}, + {"id":45564,"enchant":3606,"gems":[40023,40003]}, + {"id":45608,"gems":[39997]}, + {"id":46048,"gems":[39997]}, + {"id":45609}, + {"id":45931}, + {"id":45132,"enchant":3789,"gems":[40044]}, + {"id":45484,"enchant":3789,"gems":[39997]}, + {"id":45296,"gems":[39997]} ]}`) diff --git a/ui/core/components/individual_sim_ui/apl_actions.ts b/ui/core/components/individual_sim_ui/apl_actions.ts index 68bfb790e9..45a320aa7b 100644 --- a/ui/core/components/individual_sim_ui/apl_actions.ts +++ b/ui/core/components/individual_sim_ui/apl_actions.ts @@ -100,7 +100,7 @@ export class APLActionPicker extends Input, APLAction> { getValue: (player: Player) => this.getSourceValue()?.action.oneofKind, setValue: (eventID: EventID, player: Player, newKind: APLActionKind) => { const sourceValue = this.getSourceValue(); - const oldKind = sourceValue.action.oneofKind; + const oldKind = sourceValue?.action.oneofKind; if (oldKind == newKind) { return; } @@ -216,9 +216,12 @@ export class APLActionPicker extends Input, APLAction> { const factory = actionKindFactories[newActionKind]; this.actionPicker = factory.factory(this.actionDiv, this.modObject, { changedEvent: (player: Player) => player.rotationChangeEmitter, - getValue: () => (this.getSourceValue().action as any)[newActionKind] || factory.newValue(), + getValue: () => (this.getSourceValue()?.action as any)?.[newActionKind] || factory.newValue(), setValue: (eventID: EventID, player: Player, newValue: any) => { - (this.getSourceValue().action as any)[newActionKind] = newValue; + const sourceValue = this.getSourceValue(); + if (sourceValue) { + (sourceValue?.action as any)[newActionKind] = newValue; + } player.rotationChangeEmitter.emit(eventID); }, }); diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 946529c813..a558d272ce 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -49,7 +49,7 @@ export const aplLaunchStatuses: Record = { [Spec.SpecRestorationShaman]: LaunchStatus.Beta, [Spec.SpecHunter]: LaunchStatus.Launched, [Spec.SpecMage]: LaunchStatus.Beta, - [Spec.SpecRogue]: LaunchStatus.Alpha, + [Spec.SpecRogue]: LaunchStatus.Beta, [Spec.SpecHolyPaladin]: LaunchStatus.Beta, [Spec.SpecProtectionPaladin]: LaunchStatus.Beta, [Spec.SpecRetributionPaladin]: LaunchStatus.Beta, diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index 401eea099d..599da51714 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -104,6 +104,280 @@ export const HemoSubtletyTalents = { }), } +export const ROTATION_PRESET_MUTILATE = { + name: 'Mutilate', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51662}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":51662}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58426}}}}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":57993}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57993}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":48666}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_RUPTURE_MUTILATE = { + name: 'Rupture Mutilate', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51662}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":51662}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58426}}}}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":57993}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57993}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":48666}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_MUTILATE_EXPOSE = { + name: 'Mutilate w/ Expose', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51662}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":51662}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58426}}}}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":57993}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57993}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":48666}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_RUPTURE_MUTILATE_EXPOSE = { + name: 'Rupture Mutilate w/ Expose', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48666}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":51662}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":51662}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":58426}}}}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":57993}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}}]}},"castSpell":{"spellId":{"spellId":57993}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":48666}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_COMBAT = { + name: 'Combat', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":48672}}},"rhs":{"const":{"val":"2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"dotIsActive":{"spellId":{"spellId":48672}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}}}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":13750}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48638}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_COMBAT_EXPOSE = { + name: 'Combat w/ Expose', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":48672}}},"rhs":{"const":{"val":"2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"dotIsActive":{"spellId":{"spellId":48672}}},{"not":{"val":{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}},"rhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}}}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"2s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48672}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}}]}},"castSpell":{"spellId":{"spellId":48672}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":13750}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48672}}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":48668}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"castSpell":{"spellId":{"spellId":48638}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_COMBAT_CLEAVE_SND = { + name: 'Combat Cleave SND', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":48638}}}}, + {"action":{"castSpell":{"spellId":{"spellId":51723}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_COMBAT_CLEAVE_SND_EXPOSE = { + name: 'Combat Cleave SND w/ Expose', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":8647}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":6774}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":8647}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}]}},"sequence":{"actions":[{"castSpell":{"spellId":{"spellId":48638}}},{"castSpell":{"spellId":{"spellId":6774}}}]}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774}}},"castSpell":{"spellId":{"spellId":13877}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"8s"}}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":13877}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"57s"}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}}, + {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":13877}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTimeToReady":{"spellId":{"spellId":13877}}},"rhs":{"const":{"val":"10s"}}}}}}]}},"castSpell":{"spellId":{"itemId":40211}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"196s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":51690}}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774}}},"rhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8647}}},"rhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":48638}}}}, + {"action":{"castSpell":{"spellId":{"spellId":51723}}}} + ] + }`), + }), +}; + +export const ROTATION_PRESET_AOE = { + name: 'Fan AOE', + rotation: SavedRotation.create({ + specRotationOptionsJson: RogueRotation.toJsonString(RogueRotation.create()), + rotation: APLRotation.fromJsonString(`{ + "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":58426}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"not":{"val":{"spellIsReady":{"spellId":{"spellId":57934}}}}},"castSpell":{"spellId":{"spellId":57934}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}},"castSpell":{"spellId":{"spellId":13750}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"65"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":58426}}},"rhs":{"const":{"val":"1s"}}}}]}},"castSpell":{"spellId":{"spellId":26889}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"itemId":7676}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},"castSpell":{"spellId":{"spellId":51690}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16551}}}}},"castSpell":{"spellId":{"spellId":14177}}}}, + {"action":{"castSpell":{"spellId":{"spellId":51723}}}} + ] + }`), + }), +}; + export const DefaultRotation = RogueRotation.create({ exposeArmorFrequency: Rogue_Rotation_Frequency.Never, minimumComboPointsExposeArmor: 2, @@ -134,14 +408,6 @@ export const DefaultConsumes = Consumes.create({ food: Food.FoodMegaMammothMeal, }); -export const ROTATION_APL_PRESET = { - name: 'Basic APL', - rotation: SavedRotation.create({ - specRotationOptionsJson: RogueRotation.toJsonString(DefaultRotation), - rotation: APLRotation.fromJsonString('{ "type": 3, "priorityList": [] }') - }), -}; - export const P2_PRESET_ASSASSINATION = { name: 'P2 Assassination', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts index 7a5e084df1..f7510a8339 100644 --- a/ui/rogue/sim.ts +++ b/ui/rogue/sim.ts @@ -10,6 +10,11 @@ import { TristateEffect, WeaponType } from '../core/proto/common.js'; +import { + APLAction, + APLListItem, + APLRotation, +} from '../core/proto/apl.js'; import { Player } from '../core/player.js'; import { Stats } from '../core/proto_utils/stats.js'; import { IndividualSimUI } from '../core/individual_sim_ui.js'; @@ -367,8 +372,17 @@ export class RogueSimUI extends IndividualSimUI { Presets.SubtletyTalents, Presets.HemoSubtletyTalents, ], + // Preset rotations that the user can quickly select. rotations: [ - Presets.ROTATION_APL_PRESET, + Presets.ROTATION_PRESET_MUTILATE, + Presets.ROTATION_PRESET_MUTILATE_EXPOSE, + Presets.ROTATION_PRESET_RUPTURE_MUTILATE, + Presets.ROTATION_PRESET_RUPTURE_MUTILATE_EXPOSE, + Presets.ROTATION_PRESET_COMBAT, + Presets.ROTATION_PRESET_COMBAT_EXPOSE, + Presets.ROTATION_PRESET_COMBAT_CLEAVE_SND, + Presets.ROTATION_PRESET_COMBAT_CLEAVE_SND_EXPOSE, + Presets.ROTATION_PRESET_AOE, ], // Preset gear configurations that the user can quickly select. gear: [ @@ -386,6 +400,21 @@ export class RogueSimUI extends IndividualSimUI { Presets.P3_PRESET_DANCE_SUB, ], }, + + autoRotation: (player: Player): APLRotation => { + const talentTree = player.getTalentTree(); + const numTargets = player.sim.encounter.targets.length; + if (numTargets >= 5) { + return Presets.ROTATION_PRESET_AOE.rotation.rotation!; + } else if (talentTree == 0) { + return Presets.ROTATION_PRESET_MUTILATE_EXPOSE.rotation.rotation!; + } else if (talentTree == 1) { + return Presets.ROTATION_PRESET_COMBAT_EXPOSE.rotation.rotation!; + } else { + // TODO: Need a sub rotation here + return Presets.ROTATION_PRESET_MUTILATE_EXPOSE.rotation.rotation!; + } + }, }) this.player.changeEmitter.on((c) => { const rotation = this.player.getRotation()