From 64f35b619ae8aa616437f8b32b594b2ae3ddb807 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Tue, 14 Jan 2025 00:50:31 -0500 Subject: [PATCH] update ele p1, p2 presets, default APL --- sim/shaman/elemental/TestElemental.results | 676 +++++++++--------- ui/elemental_shaman/apls/default.apl.json | 8 +- .../gear_sets/phase_1.gear.json | 12 +- .../gear_sets/phase_2.gear.json | 38 +- 4 files changed, 370 insertions(+), 364 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index d70a81702..f56f006f8 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -3,19 +3,19 @@ character_stats_results: { value: { final_stats: 219.65 final_stats: 194.35 - final_stats: 457.585 - final_stats: 318.55 - final_stats: 228.85 - final_stats: 507 + final_stats: 432.4575 + final_stats: 328.9 + final_stats: 267.95 + final_stats: 438 final_stats: 0 final_stats: 40 final_stats: 0 final_stats: 0 - final_stats: 61 + final_stats: 153 final_stats: 0 - final_stats: 54.25 - final_stats: 6 - final_stats: 32.6835 + final_stats: 49.25 + final_stats: 3 + final_stats: 33.85841 final_stats: 0 final_stats: 0 final_stats: 1220.3 @@ -24,10 +24,10 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6018.25 + final_stats: 6173.5 final_stats: 0 final_stats: 0 - final_stats: 1975.7 + final_stats: 2359.7 final_stats: 440 final_stats: 0 final_stats: 5 @@ -35,10 +35,10 @@ character_stats_results: { final_stats: 11.57298 final_stats: 5 final_stats: 0 - final_stats: 6118.85 - final_stats: 33 - final_stats: 91 - final_stats: 66 + final_stats: 5867.575 + final_stats: 37 + final_stats: 85 + final_stats: 60 final_stats: 60 final_stats: 60 final_stats: 384 @@ -52,19 +52,19 @@ character_stats_results: { value: { final_stats: 219.65 final_stats: 194.35 - final_stats: 448.3275 - final_stats: 305.9 - final_stats: 236.9 - final_stats: 587 + final_stats: 435.1025 + final_stats: 330.05 + final_stats: 259.9 + final_stats: 525 final_stats: 0 final_stats: 40 final_stats: 0 final_stats: 0 - final_stats: 40 + final_stats: 102 final_stats: 0 final_stats: 50.25 - final_stats: 5 - final_stats: 33.46971 + final_stats: 3 + final_stats: 33.87785 final_stats: 0 final_stats: 0 final_stats: 1220.3 @@ -73,10 +73,10 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 5828.5 + final_stats: 6190.75 final_stats: 0 final_stats: 0 - final_stats: 1716.7 + final_stats: 2097.7 final_stats: 440 final_stats: 0 final_stats: 5 @@ -84,9 +84,9 @@ character_stats_results: { final_stats: 11.57298 final_stats: 5 final_stats: 0 - final_stats: 6026.275 - final_stats: 27 - final_stats: 81 + final_stats: 5894.025 + final_stats: 37 + final_stats: 75 final_stats: 60 final_stats: 60 final_stats: 60 @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.22502 + weights: -0.19635 weights: 0 - weights: 0.62531 + weights: 0.59276 weights: 0 + weights: 0.04471 weights: 0 weights: 0 + weights: 0.54805 weights: 0 - weights: 0.62531 weights: 0 - weights: 0 - weights: 7.67845 - weights: 3.98613 + weights: 7.71105 + weights: 3.6666 weights: 0 weights: 0 weights: 0 @@ -347,18 +347,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.25175 - weights: 0 - weights: 0.6207 + weights: 0.92765 weights: 0 + weights: 0.60594 weights: 0 + weights: 0.04474 weights: 0 weights: 0 - weights: 0.6207 + weights: 0.5612 weights: 0 weights: 0 - weights: 7.9792 - weights: 4.09542 + weights: 8.57597 + weights: 3.53219 weights: 0 weights: 0 weights: 0 @@ -396,18 +396,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.29066 + weights: -0.29547 weights: 0 - weights: 0.66009 + weights: 0.65881 weights: 0 + weights: 0.04887 weights: 0 weights: 0 + weights: 0.60993 weights: 0 - weights: 0.66009 weights: 0 - weights: 0 - weights: 7.73582 - weights: 4.5741 + weights: 9.80246 + weights: 4.2763 weights: 0 weights: 0 weights: 0 @@ -445,18 +445,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.17257 - weights: 0 - weights: 0.68942 + weights: 0.74302 weights: 0 + weights: 0.68854 weights: 0 + weights: 0.0517 weights: 0 weights: 0 - weights: 0.68942 + weights: 0.63684 weights: 0 weights: 0 - weights: 8.15382 - weights: 5.01409 + weights: 7.95787 + weights: 5.00616 weights: 0 weights: 0 weights: 0 @@ -494,18 +494,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.18623 + weights: 0.97918 weights: 0 - weights: 0.70254 + weights: 0.69748 weights: 0 + weights: 0.05216 weights: 0 weights: 0 + weights: 0.64533 weights: 0 - weights: 0.70254 weights: 0 - weights: 0 - weights: 9.86423 - weights: 5.58504 + weights: 10.2349 + weights: 4.99434 weights: 0 weights: 0 weights: 0 @@ -543,18 +543,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.28177 - weights: 0 - weights: 0.71336 + weights: -0.35473 weights: 0 + weights: 0.71195 weights: 0 + weights: 0.05212 weights: 0 weights: 0 - weights: 0.71336 + weights: 0.65983 weights: 0 weights: 0 - weights: 9.55979 - weights: 6.2511 + weights: 9.52768 + weights: 6.05155 weights: 0 weights: 0 weights: 0 @@ -589,966 +589,966 @@ stat_weights_results: { dps_results: { key: "TestElemental-Phase1-AllItems-Champion'sEarthshaker" value: { - dps: 525.79477 - tps: 547.11472 + dps: 523.45769 + tps: 497.85177 } } dps_results: { key: "TestElemental-Phase1-AllItems-Champion'sStormcaller" value: { - dps: 532.00847 - tps: 553.32842 + dps: 532.59506 + tps: 505.41707 } } dps_results: { key: "TestElemental-Phase1-AllItems-GiftoftheGatheringStorm" value: { - dps: 596.31059 - tps: 617.77426 + dps: 581.73083 + tps: 556.51112 } } dps_results: { key: "TestElemental-Phase1-AllItems-Stormcaller'sGarb" value: { - dps: 627.85534 - tps: 649.17347 + dps: 625.46644 + tps: 594.23222 } } dps_results: { key: "TestElemental-Phase1-AllItems-TheEarthfury" value: { - dps: 498.55751 - tps: 519.87259 + dps: 506.2944 + tps: 479.6377 } } dps_results: { key: "TestElemental-Phase1-AllItems-TheEarthshatterer" value: { - dps: 489.53812 - tps: 510.71079 + dps: 493.60303 + tps: 469.65169 } } dps_results: { key: "TestElemental-Phase1-AllItems-TheFiveThunders" value: { - dps: 536.72901 - tps: 558.04595 + dps: 536.27861 + tps: 506.75549 } } dps_results: { key: "TestElemental-Phase1-AllItems-TheTenStorms" value: { - dps: 548.7256 - tps: 570.04193 + dps: 553.04517 + tps: 527.06326 } } dps_results: { key: "TestElemental-Phase1-AllItems-Warlord'sEarthshaker" value: { - dps: 556.79167 - tps: 578.11112 + dps: 558.02722 + tps: 532.13795 } } dps_results: { key: "TestElemental-Phase1-Average-Default" value: { - dps: 616.53667 - tps: 638.15691 + dps: 606.49828 + tps: 579.63764 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 706.73485 - tps: 1128.97377 + dps: 1328.59151 + tps: 1064.76701 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 605.25807 - tps: 626.5421 + dps: 591.30904 + tps: 570.433 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 720.66095 - tps: 752.10652 + dps: 821.08151 + tps: 823.13375 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 387.90617 - tps: 683.78676 + dps: 749.34589 + tps: 650.02842 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 350.35896 - tps: 365.15299 + dps: 334.85867 + tps: 333.16993 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 543.59075 - tps: 568.74299 + dps: 585.76861 + tps: 598.17189 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 695.44163 - tps: 1114.83554 + dps: 1288.43051 + tps: 1022.32571 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 596.68437 - tps: 618.0474 + dps: 579.02742 + tps: 550.63192 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 714.94578 - tps: 746.54052 + dps: 826.21928 + tps: 802.18076 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 384.28045 - tps: 680.16104 + dps: 738.53868 + tps: 634.94371 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 349.18776 - tps: 363.98179 + dps: 322.58874 + tps: 316.48337 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 545.03506 - tps: 570.1873 + dps: 566.36163 + tps: 555.3963 } } dps_results: { key: "TestElemental-Phase1-SwitchInFrontOfTarget-Default" value: { - dps: 611.62365 - tps: 633.09111 + dps: 601.02808 + tps: 576.00574 } } dps_results: { key: "TestElemental-Phase2-AllItems-Champion'sEarthshaker" value: { - dps: 538.73165 - tps: 560.04929 + dps: 552.0718 + tps: 526.12843 } } dps_results: { key: "TestElemental-Phase2-AllItems-Champion'sStormcaller" value: { - dps: 545.05166 - tps: 566.3693 + dps: 555.31866 + tps: 528.66242 } } dps_results: { key: "TestElemental-Phase2-AllItems-GiftoftheGatheringStorm" value: { - dps: 614.86564 - tps: 636.25666 + dps: 606.34918 + tps: 576.93152 } } dps_results: { key: "TestElemental-Phase2-AllItems-Stormcaller'sGarb" value: { - dps: 641.27114 - tps: 662.59089 + dps: 655.98608 + tps: 621.76996 } } dps_results: { key: "TestElemental-Phase2-AllItems-TheEarthfury" value: { - dps: 508.18131 - tps: 529.49831 + dps: 530.903 + tps: 504.90529 } } dps_results: { key: "TestElemental-Phase2-AllItems-TheEarthshatterer" value: { - dps: 502.03381 - tps: 523.20247 + dps: 518.67684 + tps: 494.72644 } } dps_results: { key: "TestElemental-Phase2-AllItems-TheFiveThunders" value: { - dps: 548.75796 - tps: 570.07761 + dps: 562.59338 + tps: 533.79603 } } dps_results: { key: "TestElemental-Phase2-AllItems-TheTenStorms" value: { - dps: 560.94404 - tps: 582.2637 + dps: 578.72026 + tps: 550.71263 } } dps_results: { key: "TestElemental-Phase2-AllItems-Warlord'sEarthshaker" value: { - dps: 569.54274 - tps: 590.8631 + dps: 594.56801 + tps: 565.2454 } } dps_results: { key: "TestElemental-Phase2-Average-Default" value: { - dps: 645.5899 - tps: 667.13954 + dps: 643.31149 + tps: 613.74358 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 731.83709 - tps: 1151.22434 + dps: 1353.09812 + tps: 1087.40849 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 637.06707 - tps: 658.2921 + dps: 608.77719 + tps: 585.93008 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 753.84354 - tps: 785.23994 + dps: 846.50563 + tps: 844.73194 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 406.99328 - tps: 702.87386 + dps: 771.30503 + tps: 657.45252 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 366.47511 - tps: 381.26914 + dps: 345.80828 + tps: 341.27118 } } dps_results: { key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 566.75081 - tps: 591.90305 + dps: 604.35403 + tps: 614.39738 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 730.28736 - tps: 1149.2244 + dps: 1338.11525 + tps: 1054.30294 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 627.78407 - tps: 649.08345 + dps: 604.87468 + tps: 572.3523 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 748.03438 - tps: 779.58129 + dps: 852.41989 + tps: 824.17722 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 396.55 - tps: 692.43059 + dps: 764.56877 + tps: 646.59041 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 364.08355 - tps: 378.87758 + dps: 335.30034 + tps: 327.62742 } } dps_results: { key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 567.91395 - tps: 593.06619 + dps: 584.80047 + tps: 571.12048 } } dps_results: { key: "TestElemental-Phase2-SwitchInFrontOfTarget-Default" value: { - dps: 642.89416 - tps: 664.28826 + dps: 641.14883 + tps: 612.12616 } } dps_results: { key: "TestElemental-Phase3-AllItems-Champion'sEarthshaker" value: { - dps: 587.56462 - tps: 609.24429 + dps: 594.33486 + tps: 560.9374 } } dps_results: { key: "TestElemental-Phase3-AllItems-Champion'sStormcaller" value: { - dps: 593.54466 - tps: 615.22433 + dps: 609.59079 + tps: 575.64472 } } dps_results: { key: "TestElemental-Phase3-AllItems-GiftoftheGatheringStorm" value: { - dps: 638.51651 - tps: 660.19568 + dps: 649.40541 + tps: 615.16035 } } dps_results: { key: "TestElemental-Phase3-AllItems-Stormcaller'sGarb" value: { - dps: 697.5924 - tps: 719.27044 + dps: 708.15499 + tps: 668.88002 } } dps_results: { key: "TestElemental-Phase3-AllItems-TheEarthfury" value: { - dps: 543.44723 - tps: 565.00249 + dps: 552.03989 + tps: 522.02072 } } dps_results: { key: "TestElemental-Phase3-AllItems-TheEarthshatterer" value: { - dps: 538.38587 - tps: 559.79584 + dps: 543.91901 + tps: 514.34413 } } dps_results: { key: "TestElemental-Phase3-AllItems-TheFiveThunders" value: { - dps: 583.98487 - tps: 605.54092 + dps: 597.10776 + tps: 566.07649 } } dps_results: { key: "TestElemental-Phase3-AllItems-TheTenStorms" value: { - dps: 598.11349 - tps: 619.66954 + dps: 610.16205 + tps: 576.09743 } } dps_results: { key: "TestElemental-Phase3-AllItems-Warlord'sEarthshaker" value: { - dps: 621.11567 - tps: 642.79484 + dps: 632.16512 + tps: 596.06291 } } dps_results: { key: "TestElemental-Phase3-Average-Default" value: { - dps: 705.76782 - tps: 727.55095 + dps: 709.89785 + tps: 671.33237 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 805.24442 - tps: 1229.84333 + dps: 1554.2548 + tps: 1167.65828 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 694.00175 - tps: 715.48737 + dps: 696.15759 + tps: 665.54767 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 850.35047 - tps: 882.04188 + dps: 984.18832 + tps: 982.58796 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 455.10669 - tps: 750.98727 + dps: 870.47329 + tps: 717.93791 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 417.10736 - tps: 431.90139 + dps: 386.05539 + tps: 379.38419 } } dps_results: { key: "TestElemental-Phase3-Settings-Orc-phase_3-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 639.83897 - tps: 664.99121 + dps: 697.05587 + tps: 709.16549 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 805.64506 - tps: 1231.92631 + dps: 1506.06755 + tps: 1146.94989 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 684.65351 - tps: 706.21742 + dps: 675.62719 + tps: 634.10893 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 844.96959 - tps: 876.80666 + dps: 994.90147 + tps: 955.91685 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 442.12452 - tps: 738.0051 + dps: 866.41972 + tps: 686.79831 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 416.0468 - tps: 430.84083 + dps: 373.39477 + tps: 362.92325 } } dps_results: { key: "TestElemental-Phase3-Settings-Troll-phase_3-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 643.08006 - tps: 668.2323 + dps: 685.70428 + tps: 664.60013 } } dps_results: { key: "TestElemental-Phase3-SwitchInFrontOfTarget-Default" value: { - dps: 700.93565 - tps: 722.61482 + dps: 708.81649 + tps: 669.71295 } } dps_results: { key: "TestElemental-Phase4-AllItems-Champion'sEarthshaker" value: { - dps: 594.32815 - tps: 616.08158 + dps: 599.11063 + tps: 564.60112 } } dps_results: { key: "TestElemental-Phase4-AllItems-Champion'sStormcaller" value: { - dps: 599.77982 - tps: 621.53324 + dps: 609.40668 + tps: 574.69471 } } dps_results: { key: "TestElemental-Phase4-AllItems-GiftoftheGatheringStorm" value: { - dps: 680.04118 - tps: 702.09452 + dps: 681.75437 + tps: 644.77397 } } dps_results: { key: "TestElemental-Phase4-AllItems-Stormcaller'sGarb" value: { - dps: 705.76852 - tps: 727.57001 + dps: 710.72635 + tps: 672.28277 } } dps_results: { key: "TestElemental-Phase4-AllItems-TheEarthfury" value: { - dps: 552.90469 - tps: 574.58286 + dps: 561.86209 + tps: 531.05851 } } dps_results: { key: "TestElemental-Phase4-AllItems-TheEarthshatterer" value: { - dps: 546.09531 - tps: 567.6282 + dps: 552.30099 + tps: 522.28971 } } dps_results: { key: "TestElemental-Phase4-AllItems-TheFiveThunders" value: { - dps: 594.08152 - tps: 615.76049 + dps: 603.13089 + tps: 569.43445 } } dps_results: { key: "TestElemental-Phase4-AllItems-TheTenStorms" value: { - dps: 607.88592 - tps: 629.56489 + dps: 615.62017 + tps: 581.60666 } } dps_results: { key: "TestElemental-Phase4-AllItems-Warlord'sEarthshaker" value: { - dps: 626.49433 - tps: 648.24725 + dps: 632.76187 + tps: 596.08329 } } dps_results: { key: "TestElemental-Phase4-Average-Default" value: { - dps: 753.96857 - tps: 776.19236 + dps: 760.15386 + tps: 716.86173 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 876.60128 - tps: 1313.19686 + dps: 1681.99696 + tps: 1245.66217 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 743.1484 - tps: 765.1011 + dps: 742.14511 + tps: 706.82505 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 902.10696 - tps: 934.1917 + dps: 1036.1869 + tps: 1030.27743 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 480.73433 - tps: 776.61491 + dps: 923.97448 + tps: 738.78953 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 447.01964 - tps: 461.81367 + dps: 405.9481 + tps: 397.95404 } } dps_results: { key: "TestElemental-Phase4-Settings-Orc-phase_4-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 678.85739 - tps: 704.00963 + dps: 748.80361 + tps: 758.95046 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 863.79622 - tps: 1298.63914 + dps: 1628.48598 + tps: 1208.87922 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 731.55135 - tps: 753.58849 + dps: 732.51612 + tps: 689.72026 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 896.0869 - tps: 928.34805 + dps: 1044.5207 + tps: 1001.01274 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 473.03232 - tps: 768.9129 + dps: 906.64916 + tps: 711.00259 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 446.7735 - tps: 461.56753 + dps: 394.56281 + tps: 379.23993 } } dps_results: { key: "TestElemental-Phase4-Settings-Troll-phase_4-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 683.20066 - tps: 708.3529 + dps: 736.01357 + tps: 711.96529 } } dps_results: { key: "TestElemental-Phase4-SwitchInFrontOfTarget-Default" value: { - dps: 749.02061 - tps: 771.1477 + dps: 751.42015 + tps: 707.30992 } } dps_results: { key: "TestElemental-Phase5-AllItems-Champion'sEarthshaker" value: { - dps: 653.95126 - tps: 675.75435 + dps: 656.5379 + tps: 620.75975 } } dps_results: { key: "TestElemental-Phase5-AllItems-Champion'sStormcaller" value: { - dps: 662.51987 - tps: 684.32296 + dps: 672.7454 + tps: 636.90271 } } dps_results: { key: "TestElemental-Phase5-AllItems-GiftoftheGatheringStorm" value: { - dps: 760.70322 - tps: 782.5948 + dps: 767.90281 + tps: 724.67908 } } dps_results: { key: "TestElemental-Phase5-AllItems-Stormcaller'sGarb" value: { - dps: 789.46798 - tps: 811.35846 + dps: 797.85073 + tps: 751.85001 } } dps_results: { key: "TestElemental-Phase5-AllItems-TheEarthfury" value: { - dps: 608.34709 - tps: 630.09901 + dps: 614.07858 + tps: 580.58618 } } dps_results: { key: "TestElemental-Phase5-AllItems-TheEarthshatterer" value: { - dps: 602.43088 - tps: 623.96377 + dps: 611.72671 + tps: 579.35184 } } dps_results: { key: "TestElemental-Phase5-AllItems-TheFiveThunders" value: { - dps: 650.05036 - tps: 671.80308 + dps: 658.61562 + tps: 623.01376 } } dps_results: { key: "TestElemental-Phase5-AllItems-TheTenStorms" value: { - dps: 666.30778 - tps: 688.0605 + dps: 678.33801 + tps: 640.74121 } } dps_results: { key: "TestElemental-Phase5-AllItems-Warlord'sEarthshaker" value: { - dps: 690.00182 - tps: 711.80441 + dps: 701.07965 + tps: 662.91499 } } dps_results: { key: "TestElemental-Phase5-Average-Default" value: { - dps: 844.28557 - tps: 866.44078 + dps: 844.53213 + tps: 797.34429 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 957.48359 - tps: 1389.2858 + dps: 1803.6175 + tps: 1327.50492 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 828.88883 - tps: 850.75794 + dps: 820.02585 + tps: 780.32629 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 995.12789 - tps: 1027.08972 + dps: 1138.86615 + tps: 1129.75763 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 527.87817 - tps: 823.75875 + dps: 987.1192 + tps: 779.37616 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 500.25152 - tps: 515.04555 + dps: 445.46711 + tps: 434.63077 } } dps_results: { key: "TestElemental-Phase5-Settings-Orc-phase_5-Adaptive-default-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 754.40864 - tps: 779.56088 + dps: 833.77956 + tps: 841.84577 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 957.61323 - tps: 1389.61114 + dps: 1732.53045 + tps: 1290.33375 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 816.49066 - tps: 838.44947 + dps: 800.33673 + tps: 749.0359 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 988.32085 - tps: 1020.46076 + dps: 1148.775 + tps: 1100.83803 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 516.20786 - tps: 812.08844 + dps: 956.01963 + tps: 760.88 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 496.28083 - tps: 511.07486 + dps: 432.01616 + tps: 415.19194 } } dps_results: { key: "TestElemental-Phase5-Settings-Troll-phase_5-Adaptive-default-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 759.47415 - tps: 784.62639 + dps: 818.65078 + tps: 791.47143 } } dps_results: { key: "TestElemental-Phase5-SwitchInFrontOfTarget-Default" value: { - dps: 836.14346 - tps: 858.19729 + dps: 838.4673 + tps: 790.2663 } } dps_results: { key: "TestElemental-Phase6-AllItems-Champion'sEarthshaker" value: { - dps: 691.47254 - tps: 713.15221 + dps: 695.06341 + tps: 656.59865 } } dps_results: { key: "TestElemental-Phase6-AllItems-Champion'sStormcaller" value: { - dps: 699.31045 - tps: 720.99012 + dps: 704.4004 + tps: 665.00633 } } dps_results: { key: "TestElemental-Phase6-AllItems-GiftoftheGatheringStorm" value: { - dps: 789.40722 - tps: 811.21031 + dps: 794.94927 + tps: 749.81265 } } dps_results: { key: "TestElemental-Phase6-AllItems-Stormcaller'sGarb" value: { - dps: 821.25887 - tps: 843.01119 + dps: 830.64663 + tps: 783.75317 } } dps_results: { key: "TestElemental-Phase6-AllItems-TheEarthfury" value: { - dps: 640.85749 - tps: 662.41224 + dps: 651.87501 + tps: 614.96604 } } dps_results: { key: "TestElemental-Phase6-AllItems-TheEarthshatterer" value: { - dps: 624.23721 - tps: 645.55818 + dps: 629.29767 + tps: 593.84079 } } dps_results: { key: "TestElemental-Phase6-AllItems-TheFiveThunders" value: { - dps: 683.21006 - tps: 704.76561 + dps: 697.417 + tps: 659.86786 } } dps_results: { key: "TestElemental-Phase6-AllItems-TheTenStorms" value: { - dps: 701.07545 - tps: 722.631 + dps: 712.78222 + tps: 675.15912 } } dps_results: { key: "TestElemental-Phase6-AllItems-Warlord'sEarthshaker" value: { - dps: 725.21926 - tps: 746.89843 + dps: 740.46211 + tps: 698.43507 } } dps_results: { key: "TestElemental-Phase6-Average-Default" value: { - dps: 897.88204 - tps: 919.9585 + dps: 903.06309 + tps: 850.47991 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1023.6788 - tps: 1455.45605 + dps: 1875.17766 + tps: 1383.56924 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 882.49181 - tps: 904.28226 + dps: 878.50723 + tps: 833.61696 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1047.24296 - tps: 1079.13103 + dps: 1200.91879 + tps: 1187.59632 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 558.00966 - tps: 853.89025 + dps: 1049.0303 + tps: 806.91991 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 532.09927 - tps: 546.8933 + dps: 475.72386 + tps: 463.73386 } } dps_results: { key: "TestElemental-Phase6-Settings-Orc-phase_6-Adaptive-default-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 795.04897 - tps: 820.20121 + dps: 883.82792 + tps: 889.58479 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1013.23816 - tps: 1444.54108 + dps: 1826.0171 + tps: 1341.86054 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 869.03756 - tps: 890.90753 + dps: 861.78206 + tps: 805.82636 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1040.6457 - tps: 1072.71019 + dps: 1217.43565 + tps: 1164.32504 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 551.97699 - tps: 847.85757 + dps: 1018.24857 + tps: 785.33964 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 527.6199 - tps: 542.41393 + dps: 466.18112 + tps: 448.31451 } } dps_results: { key: "TestElemental-Phase6-Settings-Troll-phase_6-Adaptive-default-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 799.98562 - tps: 825.13786 + dps: 871.05191 + tps: 840.84084 } } dps_results: { key: "TestElemental-Phase6-SwitchInFrontOfTarget-Default" value: { - dps: 890.3558 - tps: 912.32556 + dps: 903.4517 + tps: 849.7301 } } diff --git a/ui/elemental_shaman/apls/default.apl.json b/ui/elemental_shaman/apls/default.apl.json index 0768ca467..f07aa60c8 100644 --- a/ui/elemental_shaman/apls/default.apl.json +++ b/ui/elemental_shaman/apls/default.apl.json @@ -1,8 +1,14 @@ { "type": "TypeAPL", + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"spellId":15208,"rank":10}}},"doAtValue":{"const":{"val":"-2s"}}} + ], "priorityList": [ + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10438,"rank":6}}}}}]}},"castSpell":{"spellId":{"spellId":10438,"rank":6}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10587,"rank":4}}}}}]}},"castSpell":{"spellId":{"spellId":10587,"rank":4}}}}, {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}},"castSpell":{"spellId":{"spellId":10605,"rank":4}}}}, + {"action":{"castSpell":{"spellId":{"spellId":10605,"rank":4}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":16166}}},"castSpell":{"spellId":{"spellId":10414,"rank":7}}}}, {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":15208,"rank":10}}}}, {"action":{"castSpell":{"spellId":{"spellId":915,"rank":4}}}}, {"action":{"condition":{"const":{"val":"false"}},"castSpell":{"spellId":{"spellId":20572}}}} diff --git a/ui/elemental_shaman/gear_sets/phase_1.gear.json b/ui/elemental_shaman/gear_sets/phase_1.gear.json index 1b2cba69d..7e22f071f 100644 --- a/ui/elemental_shaman/gear_sets/phase_1.gear.json +++ b/ui/elemental_shaman/gear_sets/phase_1.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":22267,"enchant":1509}, + {"id":15439,"randomSuffix":2017,"enchant":1509}, {"id":18814}, {"id":18829}, - {"id":17078,"enchant":256}, + {"id":10267,"randomSuffix":2003,"enchant":256}, {"id":19145,"enchant":1891}, {"id":11765,"randomSuffix":2003,"enchant":1883}, {"id":13253}, {"id":19136}, - {"id":19165,"enchant":1509}, - {"id":22240,"enchant":911}, + {"id":16946,"enchant":1509}, + {"id":10270,"randomSuffix":2009,"enchant":911}, {"id":19147}, {"id":19147}, {"id":18820}, {"id":12930}, - {"id":17105,"enchant":2504}, - {"id":22329}, + {"id":18842,"enchant":2504}, + {}, {} ] } diff --git a/ui/elemental_shaman/gear_sets/phase_2.gear.json b/ui/elemental_shaman/gear_sets/phase_2.gear.json index db38422a4..042fa1af8 100644 --- a/ui/elemental_shaman/gear_sets/phase_2.gear.json +++ b/ui/elemental_shaman/gear_sets/phase_2.gear.json @@ -1,21 +1,21 @@ { - "items": [ - {"id":22267,"enchant":2544}, - {"id":18814}, - {"id":18829}, - {"id":20697,"enchant":256}, - {"id":19145,"enchant":1891}, - {"id":19595,"enchant":1883}, - {"id":13253}, - {"id":19136}, - {"id":19165,"enchant":2544}, - {"id":19131,"enchant":911}, - {"id":19147}, - {"id":19147}, - {"id":18820}, - {"id":12930}, - {"id":17070,"enchant":2504}, - {"id":22329}, - {} - ] + "items": [ + {"id":15439,"randomSuffix":2017,"enchant":1509}, + {"id":18814}, + {"id":18829}, + {"id":10267,"randomSuffix":2003,"enchant":256}, + {"id":19145,"enchant":1891}, + {"id":19595,"enchant":1883}, + {"id":13253}, + {"id":19136}, + {"id":16946,"enchant":1509}, + {"id":19131,"enchant":911}, + {"id":19147}, + {"id":19147}, + {"id":18820}, + {"id":12930}, + {"id":17070,"enchant":2504}, + {"id":19315}, + {} + ] }