From d6131eca5cbce2f0cb76dc519b12a156505148bb Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Thu, 21 Nov 2024 20:09:40 -0700 Subject: [PATCH] Rogue tests and presets set to PreBiS --- sim/rogue/dps_rogue/TestAssassination.results | 160 --------- sim/rogue/dps_rogue/TestCombat.results | 154 +++++---- sim/rogue/dps_rogue/TestDaggers.results | 210 ++++++++++++ sim/rogue/dps_rogue/TestSwords.results | 210 ++++++++++++ sim/rogue/dps_rogue/dps_rogue_test.go | 67 ++-- ui/rogue/apls/Mutilate_60.apl.json | 25 -- ui/rogue/apls/Mutilate_DPS_50.apl.json | 28 -- ui/rogue/apls/Mutilate_IEA_50.apl.json | 32 -- .../apls/P5_Assassination_Backstab.apl.json | 26 -- ui/rogue/apls/P5_Combat_Backstab.apl.json | 26 -- ui/rogue/apls/P5_Mutilate.apl.json | 22 -- ui/rogue/apls/P5_Mutilate_IEA.apl.json | 24 -- ui/rogue/apls/P5_Saber.apl.json | 24 -- ui/rogue/apls/P5_Saber_IEA.apl.json | 25 -- ui/rogue/apls/Saber_DPS_50.apl.json | 28 -- ui/rogue/apls/Saber_DPS_60.apl.json | 28 -- ui/rogue/apls/Saber_IEA_50.apl.json | 32 -- ui/rogue/apls/Slaughter_Cutthroat_60.apl.json | 24 -- ui/rogue/apls/basic_strike_25.apl.json | 7 - ui/rogue/apls/basic_strike_40.apl.json | 7 - ui/rogue/apls/combat_backstab.apl.json | 10 + ui/rogue/apls/combat_sinister_strike.apl.json | 10 + ui/rogue/apls/mutilate.apl.json | 15 - ui/rogue/apls/mutilate_IEA.apl.json | 17 - .../combat_backstab_prebis.gear.json | 20 ++ .../combat_sinister_strike_prebis.gear.json | 20 ++ ui/rogue/presets.ts | 306 +++--------------- ui/rogue/sim.ts | 31 +- 28 files changed, 661 insertions(+), 927 deletions(-) delete mode 100644 sim/rogue/dps_rogue/TestAssassination.results create mode 100644 sim/rogue/dps_rogue/TestDaggers.results create mode 100644 sim/rogue/dps_rogue/TestSwords.results delete mode 100644 ui/rogue/apls/Mutilate_60.apl.json delete mode 100644 ui/rogue/apls/Mutilate_DPS_50.apl.json delete mode 100644 ui/rogue/apls/Mutilate_IEA_50.apl.json delete mode 100644 ui/rogue/apls/P5_Assassination_Backstab.apl.json delete mode 100644 ui/rogue/apls/P5_Combat_Backstab.apl.json delete mode 100644 ui/rogue/apls/P5_Mutilate.apl.json delete mode 100644 ui/rogue/apls/P5_Mutilate_IEA.apl.json delete mode 100644 ui/rogue/apls/P5_Saber.apl.json delete mode 100644 ui/rogue/apls/P5_Saber_IEA.apl.json delete mode 100644 ui/rogue/apls/Saber_DPS_50.apl.json delete mode 100644 ui/rogue/apls/Saber_DPS_60.apl.json delete mode 100644 ui/rogue/apls/Saber_IEA_50.apl.json delete mode 100644 ui/rogue/apls/Slaughter_Cutthroat_60.apl.json delete mode 100644 ui/rogue/apls/basic_strike_25.apl.json delete mode 100644 ui/rogue/apls/basic_strike_40.apl.json create mode 100644 ui/rogue/apls/combat_backstab.apl.json create mode 100644 ui/rogue/apls/combat_sinister_strike.apl.json delete mode 100644 ui/rogue/apls/mutilate.apl.json delete mode 100644 ui/rogue/apls/mutilate_IEA.apl.json create mode 100644 ui/rogue/gear_sets/combat_backstab_prebis.gear.json create mode 100644 ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results deleted file mode 100644 index 20e0b4a76..000000000 --- a/sim/rogue/dps_rogue/TestAssassination.results +++ /dev/null @@ -1,160 +0,0 @@ -character_stats_results: { - key: "TestAssassination-Phase2-Lvl40-CharacterStats-Default" - value: { - final_stats: 111.32 - final_stats: 156.86 - final_stats: 228.39575 - final_stats: 87.285 - final_stats: 112.90125 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 34 - final_stats: 0 - final_stats: 21 - final_stats: 0 - final_stats: 0 - final_stats: 886.18 - final_stats: 0 - final_stats: 26.72142 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 576.72 - final_stats: 596.86 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 17.44283 - final_stats: 5 - final_stats: 0 - final_stats: 3106.9575 - final_stats: 13 - final_stats: 30 - final_stats: 30 - final_stats: 30 - final_stats: 30 - final_stats: 263 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestAssassination-Phase2-Lvl40-StatWeights-Default" - value: { - weights: 0.12364 - weights: 0.18085 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.09774 - weights: 0.41048 - weights: 0.82634 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Average-Default" - value: { - dps: 89.26122 - tps: 63.37547 - } -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: {} -} -dps_results: { - key: "TestAssassination-Phase2-Lvl40-SwitchInFrontOfTarget-Default" - value: { - dps: 83.64203 - tps: 59.38584 - } -} diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results index 4766a6389..ea517709d 100644 --- a/sim/rogue/dps_rogue/TestCombat.results +++ b/sim/rogue/dps_rogue/TestCombat.results @@ -1,11 +1,11 @@ character_stats_results: { - key: "TestCombat-Phase2-Lvl40-CharacterStats-Default" + key: "TestCombat-Phase5-Lvl60-CharacterStats-Default" value: { - final_stats: 111.32 - final_stats: 156.86 - final_stats: 228.39575 - final_stats: 87.285 - final_stats: 112.90125 + final_stats: 264.385 + final_stats: 471.845 + final_stats: 453.882 + final_stats: 127.765 + final_stats: 197.90925 final_stats: 0 final_stats: 0 final_stats: 0 @@ -13,45 +13,45 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 34 + final_stats: 49.6 final_stats: 0 final_stats: 21 final_stats: 0 final_stats: 0 - final_stats: 886.18 - final_stats: 5 - final_stats: 21.72142 + final_stats: 1914.23 + final_stats: 9 + final_stats: 41.27865 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 576.72 - final_stats: 596.86 + final_stats: 2448.69 + final_stats: 1237.845 + final_stats: 7 + final_stats: 5.28 final_stats: 0 - final_stats: 5 + final_stats: 36.83731 + final_stats: 5.28 final_stats: 0 - final_stats: 22.44283 - final_stats: 5 - final_stats: 0 - final_stats: 3106.9575 - final_stats: 13 - final_stats: 30 - final_stats: 30 - final_stats: 30 - final_stats: 30 - final_stats: 263 + final_stats: 6181.82 + final_stats: 27 + final_stats: 60 + final_stats: 60 + final_stats: 60 + final_stats: 60 + final_stats: 484 final_stats: 0 final_stats: 0 final_stats: 0 } } stat_weights_results: { - key: "TestCombat-Phase2-Lvl40-StatWeights-Default" + key: "TestCombat-Phase5-Lvl60-StatWeights-Default" value: { - weights: 0.1259 - weights: 0.18396 + weights: 0.44874 + weights: 0.82626 weights: 0 weights: 0 weights: 0 @@ -67,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.09953 - weights: 0.8715 - weights: 0.8414 + weights: 0.35474 + weights: 8.21255 + weights: 8.09257 weights: 0 weights: 0 weights: 0 @@ -97,64 +97,100 @@ stat_weights_results: { } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Average-Default" + key: "TestCombat-Phase5-Lvl60-Average-Default" value: { - dps: 91.03793 - tps: 64.63693 + dps: 997.22622 + tps: 708.03062 } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 323.23963 + tps: 229.50013 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 268.18556 + tps: 190.41175 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 334.11111 + tps: 237.21889 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 141.94131 + tps: 100.77833 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 119.24857 + tps: 84.66648 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Human-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 149.4038 + tps: 106.0767 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 327.41112 + tps: 232.46189 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 267.00814 + tps: 189.57578 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 338.27197 + tps: 240.1731 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 143.8311 + tps: 102.12008 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 118.96115 + tps: 84.46241 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-Settings-Orc-blank-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget" - value: {} + key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 152.81415 + tps: 108.49805 + } } dps_results: { - key: "TestCombat-Phase2-Lvl40-SwitchInFrontOfTarget-Default" + key: "TestCombat-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 85.51688 - tps: 60.71699 + dps: 777.6791 + tps: 552.15216 } } diff --git a/sim/rogue/dps_rogue/TestDaggers.results b/sim/rogue/dps_rogue/TestDaggers.results new file mode 100644 index 000000000..3617db17f --- /dev/null +++ b/sim/rogue/dps_rogue/TestDaggers.results @@ -0,0 +1,210 @@ +character_stats_results: { + key: "TestDaggers-Phase5-Lvl60-CharacterStats-Default" + value: { + final_stats: 223.3 + final_stats: 465.3 + final_stats: 343.2 + final_stats: 94.6 + final_stats: 80.85 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 39.6 + final_stats: 4 + final_stats: 2 + final_stats: 0 + final_stats: 0 + final_stats: 1644.6 + final_stats: 11 + final_stats: 28.05285 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2337.6 + final_stats: 809.3 + final_stats: 7 + final_stats: 5.28 + final_stats: 0 + final_stats: 37.3857 + final_stats: 5.28 + final_stats: 0 + final_stats: 4775 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 384 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestDaggers-Phase5-Lvl60-StatWeights-Default" + value: { + weights: 0.30367 + weights: 0.51983 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.27607 + weights: 4.92834 + weights: 6.98928 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-AllItems-BloodCorruptedLeathers" + value: { + dps: 701.28929 + tps: 497.91539 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-AllItems-DarkmantleArmor" + value: { + dps: 744.06019 + tps: 528.28273 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Average-Default" + value: { + dps: 701.70545 + tps: 498.21087 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 240.64916 + tps: 170.86091 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 204.22951 + tps: 145.00295 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 262.0931 + tps: 186.0861 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 128.37565 + tps: 91.14671 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 111.07043 + tps: 78.86001 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 141.91119 + tps: 100.75694 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 236.86317 + tps: 168.17285 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 196.97329 + tps: 139.85103 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 251.5496 + tps: 178.60021 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 131.51355 + tps: 93.37462 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 111.6404 + tps: 79.26468 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 140.43962 + tps: 99.71213 + } +} +dps_results: { + key: "TestDaggers-Phase5-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 610.21842 + tps: 433.25508 + } +} diff --git a/sim/rogue/dps_rogue/TestSwords.results b/sim/rogue/dps_rogue/TestSwords.results new file mode 100644 index 000000000..2e4803784 --- /dev/null +++ b/sim/rogue/dps_rogue/TestSwords.results @@ -0,0 +1,210 @@ +character_stats_results: { + key: "TestSwords-Phase5-Lvl60-CharacterStats-Default" + value: { + final_stats: 223.3 + final_stats: 465.3 + final_stats: 343.2 + final_stats: 94.6 + final_stats: 80.85 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 39.6 + final_stats: 4 + final_stats: 2 + final_stats: 0 + final_stats: 0 + final_stats: 1644.6 + final_stats: 11 + final_stats: 28.05285 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 2337.6 + final_stats: 809.3 + final_stats: 7 + final_stats: 5.28 + final_stats: 0 + final_stats: 35.3857 + final_stats: 7.28 + final_stats: 0 + final_stats: 4775 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 27 + final_stats: 384 + final_stats: 0 + final_stats: 0 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestSwords-Phase5-Lvl60-StatWeights-Default" + value: { + weights: 0.31972 + weights: 0.55706 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.29065 + weights: 6.14493 + weights: 7.28395 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-AllItems-BloodCorruptedLeathers" + value: { + dps: 741.76681 + tps: 526.65444 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-AllItems-DarkmantleArmor" + value: { + dps: 782.42826 + tps: 555.52406 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Average-Default" + value: { + dps: 739.83692 + tps: 525.28422 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 255.03671 + tps: 181.07606 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 216.44009 + tps: 153.67247 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 277.76124 + tps: 197.21048 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 136.07819 + tps: 96.61552 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 117.73466 + tps: 83.59161 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 150.42586 + tps: 106.80236 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 251.02319 + tps: 178.22647 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 208.74866 + tps: 148.21155 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 266.58632 + tps: 189.27629 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget" + value: { + dps: 139.40437 + tps: 98.9771 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget" + value: { + dps: 118.33882 + tps: 84.02056 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget" + value: { + dps: 148.86599 + tps: 105.69486 + } +} +dps_results: { + key: "TestSwords-Phase5-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 635.5103 + tps: 451.21232 + } +} diff --git a/sim/rogue/dps_rogue/dps_rogue_test.go b/sim/rogue/dps_rogue/dps_rogue_test.go index c1ce952ff..392ac90f0 100644 --- a/sim/rogue/dps_rogue/dps_rogue_test.go +++ b/sim/rogue/dps_rogue/dps_rogue_test.go @@ -11,20 +11,21 @@ func init() { RegisterDpsRogue() } -func TestCombat(t *testing.T) { +func CombatSinisterStrike(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassRogue, - Level: 40, + Level: 60, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - Talents: CombatDagger40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), + Talents: CombatSwordsTalents, + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "combat_sinister_strike_prebis"), + Rotation: core.GetAplRotation("../../../ui/rogue/apls", "combat_sinister_strike"), Buffs: core.FullBuffs, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultCombatRogue}, + Consumes: Phase1Consumes, + Phase: 5, + SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultRogue}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -33,20 +34,21 @@ func TestCombat(t *testing.T) { })) } -func TestAssassination(t *testing.T) { +func CombatDaggers(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassRogue, - Level: 40, + Level: 60, Race: proto.Race_RaceHuman, OtherRaces: []proto.Race{proto.Race_RaceOrc}, - Talents: Assassination40Talents, - GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/rogue/apls", "mutilate"), + Talents: CombatDaggersTalents, + GearSet: core.GetGearSet("../../../ui/rogue/gear_sets", "combat_backstab_prebis"), + Rotation: core.GetAplRotation("../../../ui/rogue/apls", "combat_backstab"), Buffs: core.FullBuffs, - Consumes: Phase2Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultAssassinationRogue}, + Consumes: Phase1Consumes, + Phase: 5, + SpecOptions: core.SpecOptionsCombo{Label: "No Poisons", SpecOptions: DefaultRogue}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -55,10 +57,14 @@ func TestAssassination(t *testing.T) { })) } -var CombatDagger25Talents = "-025305000001" -var CombatDagger40Talents = "-0053052020550100201" -var Assassination25Talents = "0053021--05" -var Assassination40Talents = "005303103551--05" +var CombatSwordsTalents = "005323105-0240052020050150231" +var CombatDaggersTalents = "005023104-0233050020550100221-05" + +var DefaultRogue = &proto.Player_Rogue{ + Rogue: &proto.Rogue{ + Options: &proto.RogueOptions{}, + }, +} var ItemFilters = core.ItemFilter{ ArmorType: proto.ArmorType_ArmorTypeLeather, @@ -83,26 +89,13 @@ var Stats = []proto.Stat{ proto.Stat_StatMeleeCrit, } -var DefaultAssassinationRogue = &proto.Player_Rogue{ - Rogue: &proto.Rogue{ - Options: DefaultDeadlyBrewOptions, - }, -} - -var DefaultCombatRogue = &proto.Player_Rogue{ - Rogue: &proto.Rogue{ - Options: DefaultDeadlyBrewOptions, - }, -} - -var DefaultDeadlyBrewOptions = &proto.RogueOptions{} - -var Phase2Consumes = core.ConsumesCombo{ - Label: "P2-Consumes", +var Phase1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ - AgilityElixir: proto.AgilityElixir_ElixirOfAgility, + AgilityElixir: proto.AgilityElixir_ElixirOfTheMongoose, MainHandImbue: proto.WeaponImbue_Windfury, - OffHandImbue: proto.WeaponImbue_SolidSharpeningStone, - StrengthBuff: proto.StrengthBuff_ElixirOfOgresStrength, + OffHandImbue: proto.WeaponImbue_InstantPoison, + StrengthBuff: proto.StrengthBuff_JujuPower, + AttackPowerBuff: proto.AttackPowerBuff_JujuMight, }, } diff --git a/ui/rogue/apls/Mutilate_60.apl.json b/ui/rogue/apls/Mutilate_60.apl.json deleted file mode 100644 index f255efc92..000000000 --- a/ui/rogue/apls/Mutilate_60.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}}]}},"castSpell":{"spellId":{"spellId":11275,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}},{"auraIsActive":{"auraId":{"spellId":16551}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Mutilate_DPS_50.apl.json b/ui/rogue/apls/Mutilate_DPS_50.apl.json deleted file mode 100644 index 212c27442..000000000 --- a/ui/rogue/apls/Mutilate_DPS_50.apl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"hide":true,"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}}]}},"castSpell":{"spellId":{"spellId":11273}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11355,"tag":100}}},"rhs":{"const":{"val":"5"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"-40"}}}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Mutilate_IEA_50.apl.json b/ui/rogue/apls/Mutilate_IEA_50.apl.json deleted file mode 100644 index d20de5da8..000000000 --- a/ui/rogue/apls/Mutilate_IEA_50.apl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":11197,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"4s"}}}},"waitUntil":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"energyThreshold":{"threshold":-20}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}}}}}, - {"hide":true,"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":11273}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"auraIsKnown":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11355,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}}]}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}}]}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Assassination_Backstab.apl.json b/ui/rogue/apls/P5_Assassination_Backstab.apl.json deleted file mode 100644 index f065c2b14..000000000 --- a/ui/rogue/apls/P5_Assassination_Backstab.apl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":467735}}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"1"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}}]}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"auraIsActive":{"auraId":{"spellId":467735}}}]}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"16"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"16"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11275,"rank":6}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":462707}}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},{"castSpell":{"spellId":{"spellId":11269,"rank":6}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"2"}}}},{"spellCanCast":{"spellId":{"spellId":14177}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"2"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":11269,"rank":6}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Combat_Backstab.apl.json b/ui/rogue/apls/P5_Combat_Backstab.apl.json deleted file mode 100644 index eef66d180..000000000 --- a/ui/rogue/apls/P5_Combat_Backstab.apl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}},"castSpell":{"spellId":{"spellId":13750}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":467735}}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"60"}}}},{"auraIsActive":{"auraId":{"spellId":467735}}}]}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"16"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"16"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11275,"rank":6}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":462707}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":1856,"rank":1}}},{"castSpell":{"spellId":{"spellId":11269,"rank":6}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"8"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"8"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11269,"rank":6}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"8"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Mutilate.apl.json b/ui/rogue/apls/P5_Mutilate.apl.json deleted file mode 100644 index cbe54c097..000000000 --- a/ui/rogue/apls/P5_Mutilate.apl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}}]}},"castSpell":{"spellId":{"itemId":231287}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"auraId":{"spellId":399963}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856,"rank":1}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"itemId":230250}}},{"castSpell":{"spellId":{"spellId":399963}}},{"castSpell":{"spellId":{"spellId":437349}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"55"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Mutilate_IEA.apl.json b/ui/rogue/apls/P5_Mutilate_IEA.apl.json deleted file mode 100644 index 3d1f6bbcb..000000000 --- a/ui/rogue/apls/P5_Mutilate_IEA.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}}]}}]}},"castSpell":{"spellId":{"itemId":231287}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":11198,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":1856,"rank":1}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"itemId":230250}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Saber.apl.json b/ui/rogue/apls/P5_Saber.apl.json deleted file mode 100644 index c9bb0c109..000000000 --- a/ui/rogue/apls/P5_Saber.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"2"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856,"rank":1}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}},{"cmp":{"op":"OpEq","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11294,"rank":8}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/P5_Saber_IEA.apl.json b/ui/rogue/apls/P5_Saber_IEA.apl.json deleted file mode 100644 index 5dc075d41..000000000 --- a/ui/rogue/apls/P5_Saber_IEA.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":228078}}},"doAtValue":{"const":{"val":"-1.6s"}}}, - {"action":{"castSpell":{"spellId":{"itemId":215162}}},"doAtValue":{"const":{"val":"-0.1s"}}} - ], - "priorityList": [ - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"2"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"math":{"op":"OpAdd","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2"}}}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}}]}}]}},"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":11198,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":1856,"rank":1}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"70"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11198,"rank":5}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}},{"cmp":{"op":"OpEq","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11294,"rank":8}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}}]}},"castSpell":{"spellId":{"itemId":18641}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Saber_DPS_50.apl.json b/ui/rogue/apls/Saber_DPS_50.apl.json deleted file mode 100644 index 262023a90..000000000 --- a/ui/rogue/apls/Saber_DPS_50.apl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}}]}},"castSpell":{"spellId":{"spellId":11273}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11355,"tag":100}}},"rhs":{"const":{"val":"5"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Saber_DPS_60.apl.json b/ui/rogue/apls/Saber_DPS_60.apl.json deleted file mode 100644 index fd7436766..000000000 --- a/ui/rogue/apls/Saber_DPS_60.apl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11355,"tag":100}}},"rhs":{"const":{"val":"5"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"75"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"castSpell":{"spellId":{"spellId":13877}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Saber_IEA_50.apl.json b/ui/rogue/apls/Saber_IEA_50.apl.json deleted file mode 100644 index 39aa8d786..000000000 --- a/ui/rogue/apls/Saber_IEA_50.apl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":11197,"rank":4}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"4s"}}}},"waitUntil":{"condition":{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"energyThreshold":{"threshold":-20}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197,"rank":4}}},"rhs":{"const":{"val":"2s"}}}}]}}}}}, - {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":424785}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"energyThreshold":{"threshold":20}}}}]}},{"not":{"val":{"energyThreshold":{"threshold":10}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11273}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":11273}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}},{"auraIsKnown":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11355,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}}]}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}}]}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11197}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"8s"}}}}]}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"6s"}}}}]}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}},{"runeIsEquipped":{"runeId":{"spellId":424785}}}]}},"castSpell":{"spellId":{"spellId":11293}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"and":{"vals":[{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":13750}}},{"auraIsActive":{"auraId":{"spellId":13750}}},{"energyThreshold":{"threshold":-40}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":425096}}},{"auraIsActive":{"auraId":{"spellId":425096}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":424785,"tag":100}}},"rhs":{"const":{"val":"1s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":424785}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":424785}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/Slaughter_Cutthroat_60.apl.json b/ui/rogue/apls/Slaughter_Cutthroat_60.apl.json deleted file mode 100644 index 7233e40ca..000000000 --- a/ui/rogue/apls/Slaughter_Cutthroat_60.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":20572}}},"doAtValue":{"const":{"val":"-1.5s"}}}, - {"action":{"addComboPoints":{"numPoints":"5"}},"doAtValue":{"const":{"val":"-.5s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"castSpell":{"spellId":{"itemId":10646}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":1787,"rank":4}}}}},{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432276}}}}},{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"itemId":215168}}},{"castSpell":{"spellId":{"itemId":18641}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432276}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":432276}}}}},{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}},"rhs":{"const":{"val":"1s"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11275,"rank":6}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11289}}},"rhs":{"const":{"val":"1.5s"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":424785}}}}}]}},"castSpell":{"spellId":{"spellId":11275,"rank":6}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432271}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432271}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"20"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":425096}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":425096}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":425096}}}}}]}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11356,"tag":100,"rank":4}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}}]}},"castSpell":{"spellId":{"spellId":425012}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":432264}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"energyThreshold":{"threshold":-20}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":399963}}}}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":432264}}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"energyThreshold":{"threshold":-20}}]}},{"cmp":{"op":"OpLe","lhs":{"spellTimeToReady":{"spellId":{"spellId":425012}}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":11269,"rank":6}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":11281,"rank":8}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/basic_strike_25.apl.json b/ui/rogue/apls/basic_strike_25.apl.json deleted file mode 100644 index 8724de8d8..000000000 --- a/ui/rogue/apls/basic_strike_25.apl.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "TypeAPL", - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"0"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":5171,"rank":1}}}}}]}},"castSpell":{"spellId":{"spellId":5171,"rank":1}}}}, - {"action":{"castSpell":{"spellId":{"spellId":1759,"rank":4}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/basic_strike_40.apl.json b/ui/rogue/apls/basic_strike_40.apl.json deleted file mode 100644 index 792be7a0c..000000000 --- a/ui/rogue/apls/basic_strike_40.apl.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "TypeAPL", - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"0"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":5171,"rank":1}}}}}]}},"castSpell":{"spellId":{"spellId":5171,"rank":1}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8621,"rank":6}}}} - ] -} \ No newline at end of file diff --git a/ui/rogue/apls/combat_backstab.apl.json b/ui/rogue/apls/combat_backstab.apl.json new file mode 100644 index 000000000..c0eb6ed2e --- /dev/null +++ b/ui/rogue/apls/combat_backstab.apl.json @@ -0,0 +1,10 @@ +{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":" 15"}}}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"castSpell":{"spellId":{"spellId":25300,"rank":9}}}} + ] +} \ No newline at end of file diff --git a/ui/rogue/apls/combat_sinister_strike.apl.json b/ui/rogue/apls/combat_sinister_strike.apl.json new file mode 100644 index 000000000..71880a878 --- /dev/null +++ b/ui/rogue/apls/combat_sinister_strike.apl.json @@ -0,0 +1,10 @@ +{ + "type": "TypeAPL", + "priorityList": [ + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}},"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":6774,"rank":2}}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":6774,"rank":2}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGt","lhs":{"auraRemainingTime":{"auraId":{"spellId":6774,"rank":2}}},"rhs":{"const":{"val":" 15"}}}}]}},"castSpell":{"spellId":{"spellId":31016}}}}, + {"action":{"castSpell":{"spellId":{"spellId":11294,"rank":8}}}} + ] +} \ No newline at end of file diff --git a/ui/rogue/apls/mutilate.apl.json b/ui/rogue/apls/mutilate.apl.json deleted file mode 100644 index 16d744676..000000000 --- a/ui/rogue/apls/mutilate.apl.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}},{"spellCanCast":{"spellId":{"spellId":1856}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":14177}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":5171}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}}]}},"castSpell":{"spellId":{"spellId":5171}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"castSpell":{"spellId":{"spellId":399956}}}} - ] -} diff --git a/ui/rogue/apls/mutilate_IEA.apl.json b/ui/rogue/apls/mutilate_IEA.apl.json deleted file mode 100644 index a66d75ac8..000000000 --- a/ui/rogue/apls/mutilate_IEA.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":1787}}},"doAtValue":{"const":{"val":"0s"}}} - ], - "priorityList": [ - {"action":{"condition":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"15"}}}}]}},"castSpell":{"spellId":{"itemId":7676}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}}}},"rhs":{"const":{"val":"16"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"rhs":{"remainingTime":{}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}}}},{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}}]}},"castSpell":{"spellId":{"spellId":8650}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425096}}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"castSpell":{"spellId":{"spellId":1856}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"spellCanCast":{"spellId":{"spellId":14177}}},{"spellCanCast":{"spellId":{"spellId":399963}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14177}}},{"castSpell":{"spellId":{"spellId":399963}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"10"}}}}}},"rhs":{"const":{"val":"16"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"rhs":{"remainingTime":{}}}}]}},"castSpell":{"spellId":{"spellId":399956}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}},{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":8650}}},"rhs":{"remainingTime":{}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8"}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":2824}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":399963}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":399956}}}} - ] -} diff --git a/ui/rogue/gear_sets/combat_backstab_prebis.gear.json b/ui/rogue/gear_sets/combat_backstab_prebis.gear.json new file mode 100644 index 000000000..35ca9fc81 --- /dev/null +++ b/ui/rogue/gear_sets/combat_backstab_prebis.gear.json @@ -0,0 +1,20 @@ +{"items": [ + {"id":16707,"enchant":1508}, + {"id":15411}, + {"id":12927}, + {"id":13340,"enchant":849}, + {"id":14637,"enchant":1891}, + {"id":16710,"enchant":1885}, + {"id":16712,"enchant":1887}, + {"id":16713}, + {"id":16709,"enchant":1508}, + {"id":16711,"enchant":1887}, + {"id":13098}, + {"id":17713}, + {"id":13965}, + {"id":11815}, + {"id":12783,"enchant":1900}, + {"id":13368,"enchant":2564}, + {"id":12651} + ] +} \ No newline at end of file diff --git a/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json b/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json new file mode 100644 index 000000000..a4d7a6b83 --- /dev/null +++ b/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json @@ -0,0 +1,20 @@ +{"items": [ + {"id":16707,"enchant":1508}, + {"id":15411}, + {"id":12927}, + {"id":13340,"enchant":849}, + {"id":14637,"enchant":1891}, + {"id":16710,"enchant":1885}, + {"id":16712,"enchant":1887}, + {"id":16713}, + {"id":16709,"enchant":1508}, + {"id":16711,"enchant":1887}, + {"id":13098}, + {"id":17713}, + {"id":13965}, + {"id":11815}, + {"id":12940,"enchant":1900}, + {"id":12939,"enchant":2564}, + {"id":12651} + ] +} \ No newline at end of file diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index a4e4679a3..32c64a1b9 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -20,23 +20,11 @@ import { } from '../core/proto/common.js'; import { RogueOptions, RogueRune } from '../core/proto/rogue.js'; import { SavedTalents } from '../core/proto/ui.js'; -import SinisterApl25 from './apls/basic_strike_25.apl.json'; -import MutilateApl40 from './apls/mutilate.apl.json'; -import MutilateDPSAPL60 from './apls/Mutilate_60.apl.json'; -import MutilateDPSApl50 from './apls/Mutilate_DPS_50.apl.json'; -import MutilateIEAApl40 from './apls/mutilate_IEA.apl.json'; -import MutilateIEAApl50 from './apls/Mutilate_IEA_50.apl.json'; -import P5AssassinationBackstabAPL from './apls/P5_Assassination_Backstab.apl.json'; -import P5CombatBackstabAPL from './apls/P5_Combat_Backstab.apl.json'; -import P5MutilateAPL from './apls/P5_Mutilate.apl.json'; -import P5MutilateIEAAPL from './apls/P5_Mutilate_IEA.apl.json'; -import P5SaberAPL from './apls/P5_Saber.apl.json'; -import P5SaberIEAAPL from './apls/P5_Saber_IEA.apl.json'; -import SaberDPSApl50 from './apls/Saber_DPS_50.apl.json'; -import SaberDPSAPL60 from './apls/Saber_DPS_60.apl.json'; -import SaberIEAApl50 from './apls/Saber_IEA_50.apl.json'; -import SlaughterCutthroatDPSAPL60 from './apls/Slaughter_Cutthroat_60.apl.json'; +import BackstabAPL from './apls/combat_backstab.apl.json'; +import SinisterStrikeAPL from './apls/combat_sinister_strike.apl.json'; import BlankGear from './gear_sets/blank.gear.json'; +import BackstabGearPreBiS from './gear_sets/combat_backstab_prebis.gear.json'; +import SinisterStrikeGearPreBiS from './gear_sets/combat_sinister_strike_prebis.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -47,98 +35,40 @@ import BlankGear from './gear_sets/blank.gear.json'; /////////////////////////////////////////////////////////////////////////// export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearDaggersPreBiS = PresetUtils.makePresetGear('Backstab PreBiS', BackstabGearPreBiS); +export const GearSwordsPreBiS = PresetUtils.makePresetGear('Swords PreBiS', SinisterStrikeGearPreBiS); + +export const GearPresets = { + [Phase.Phase1]: [GearDaggersPreBiS, GearSwordsPreBiS], + [Phase.Phase2]: [GearDaggersPreBiS, GearSwordsPreBiS], + [Phase.Phase3]: [GearDaggersPreBiS, GearSwordsPreBiS], + [Phase.Phase4]: [GearDaggersPreBiS, GearSwordsPreBiS], + [Phase.Phase5]: [GearDaggersPreBiS, GearSwordsPreBiS], +}; -export const GearPresets = {}; - -export const DefaultGear = GearBlank; +export const DefaultGear = GearSwordsPreBiS; /////////////////////////////////////////////////////////////////////////// // APL Presets[] /////////////////////////////////////////////////////////////////////////// -export const ROTATION_PRESET_SINISTER_25 = PresetUtils.makePresetAPLRotation('P1 Sinister', SinisterApl25, { - customCondition: player => player.getLevel() === 25, -}); -export const ROTATION_PRESET_MUTILATE = PresetUtils.makePresetAPLRotation('P2 Mutilate', MutilateApl40, { - customCondition: player => player.getLevel() === 40, -}); -export const ROTATION_PRESET_MUTILATE_IEA = PresetUtils.makePresetAPLRotation('P2 Mutilate IEA', MutilateIEAApl40, { - customCondition: player => player.getLevel() === 40, -}); -export const ROTATION_PRESET_MUTILATE_DPS_50 = PresetUtils.makePresetAPLRotation('P3 Mutilate DPS', MutilateDPSApl50, { - customCondition: player => player.getLevel() === 50, -}); -export const ROTATION_PRESET_MUTILATE_IEA_50 = PresetUtils.makePresetAPLRotation('P3 Mutilate IEA', MutilateIEAApl50, { - customCondition: player => player.getLevel() === 50, -}); -export const ROTATION_PRESET_SABER_SLASH_DPS_50 = PresetUtils.makePresetAPLRotation('P3 Saber Slash DPS', SaberDPSApl50, { - customCondition: player => player.getLevel() === 50, -}); -export const ROTATION_PRESET_SABER_SLASH_IEA_50 = PresetUtils.makePresetAPLRotation('P3 Saber Slash IEA', SaberIEAApl50, { - customCondition: player => player.getLevel() === 50, -}); -export const ROTATION_PRESET_SABER_SLASH_DPS_60 = PresetUtils.makePresetAPLRotation('P4 Saber Slash', SaberDPSAPL60, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_MUTILATE_DPS_60 = PresetUtils.makePresetAPLRotation('P4 Mutilate', MutilateDPSAPL60, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_SLAUGHTER_CUTTHROAT_DPS_60 = PresetUtils.makePresetAPLRotation('P4 Backstab', SlaughterCutthroatDPSAPL60, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_ASSASSINATION_BACKSTAB_DPS_P5 = PresetUtils.makePresetAPLRotation('P5 Assassination Backstab', P5AssassinationBackstabAPL, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_COMBAT_BACKSTAB_DPS_P5 = PresetUtils.makePresetAPLRotation('P5 Combat Backstab', P5CombatBackstabAPL, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_MUTILATE_DPS_P5 = PresetUtils.makePresetAPLRotation('P5 Mutilate', P5MutilateAPL, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_SABER_DPS_P5 = PresetUtils.makePresetAPLRotation('P5 Saber Slash', P5SaberAPL, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_MUTILATE_IEA_P5 = PresetUtils.makePresetAPLRotation('P5 Mutilate IEA', P5MutilateIEAAPL, { - customCondition: player => player.getLevel() === 60, -}); -export const ROTATION_PRESET_SABER_IEA_P5 = PresetUtils.makePresetAPLRotation('P5 Saber Slash IEA', P5SaberIEAAPL, { - customCondition: player => player.getLevel() === 60, -}); +export const ROTATION_PRESET_BACKSTAB = PresetUtils.makePresetAPLRotation('Backstab', BackstabAPL, {}); +export const ROTATION_PRESET_SINISTER_STRIKE = PresetUtils.makePresetAPLRotation('SinisterStrike', SinisterStrikeAPL, {}); export const APLPresets = { - [Phase.Phase1]: [ROTATION_PRESET_MUTILATE, ROTATION_PRESET_SINISTER_25], - [Phase.Phase2]: [ROTATION_PRESET_MUTILATE, ROTATION_PRESET_MUTILATE_IEA], - [Phase.Phase3]: [ROTATION_PRESET_MUTILATE_DPS_50, ROTATION_PRESET_SABER_SLASH_DPS_50, ROTATION_PRESET_MUTILATE_IEA_50, ROTATION_PRESET_SABER_SLASH_IEA_50], - [Phase.Phase4]: [ROTATION_PRESET_MUTILATE_DPS_60, ROTATION_PRESET_SLAUGHTER_CUTTHROAT_DPS_60, ROTATION_PRESET_SABER_SLASH_DPS_60], - [Phase.Phase5]: [ - ROTATION_PRESET_ASSASSINATION_BACKSTAB_DPS_P5, - ROTATION_PRESET_COMBAT_BACKSTAB_DPS_P5, - ROTATION_PRESET_MUTILATE_DPS_P5, - ROTATION_PRESET_SABER_DPS_P5, - ROTATION_PRESET_MUTILATE_IEA_P5, - ROTATION_PRESET_SABER_IEA_P5, - ], + [Phase.Phase1]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE], + [Phase.Phase2]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE], + [Phase.Phase3]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE], + [Phase.Phase4]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE], + [Phase.Phase5]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE], }; export const DefaultAPLs: Record> = { - 25: {}, - 40: { - [RogueRune.RuneMutilate]: ROTATION_PRESET_MUTILATE, - }, - 50: { - [RogueRune.RuneMutilate]: ROTATION_PRESET_MUTILATE_DPS_50, - [RogueRune.RuneSaberSlash]: ROTATION_PRESET_SABER_SLASH_DPS_50, - }, - 60: { - [RogueRune.RuneMutilate]: ROTATION_PRESET_MUTILATE_DPS_P5, - [RogueRune.RuneSaberSlash]: ROTATION_PRESET_SABER_DPS_P5, - [RogueRune.RuneCutthroat]: ROTATION_PRESET_ASSASSINATION_BACKSTAB_DPS_P5, - }, + 60: {}, }; export const DefaultAPLBackstab = APLPresets[Phase.Phase5][0]; -export const DefaultAPLMutilate = APLPresets[Phase.Phase5][2]; -export const DefaultAPLSaber = APLPresets[Phase.Phase5][3]; +export const DefaultAPLSinisterStrike = APLPresets[Phase.Phase5][1]; /////////////////////////////////////////////////////////////////////////// // Talent Presets @@ -147,104 +77,26 @@ export const DefaultAPLSaber = APLPresets[Phase.Phase5][3]; // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/classic/talent-calc and copy the numbers in the url. -// Preset name must be unique. Ex: 'Mutilate DPS' cannot be used as a name more than once -export const CombatDagger25Talents = PresetUtils.makePresetTalents('P1 Combat Dagger', SavedTalents.create({ talentsString: '-023305002001' }), { - customCondition: player => player.getLevel() === 25, -}); - -export const ColdBloodMutilate40Talents = PresetUtils.makePresetTalents('P2 CB Mutilate', SavedTalents.create({ talentsString: '005303103551--05' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const IEAMutilate40Talents = PresetUtils.makePresetTalents('P2 CB/IEA Mutilate', SavedTalents.create({ talentsString: '005303121551--05' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const CombatMutilate40Talents = PresetUtils.makePresetTalents('P2 AR/BF Mutilate', SavedTalents.create({ talentsString: '-0053052020550100201' }), { - customCondition: player => player.getLevel() === 40, -}); - -export const P3TalentsMuti = PresetUtils.makePresetTalents('P3 Mutilate', SavedTalents.create({ talentsString: '00532010555101-3203-05' }), { - customCondition: player => player.getLevel() === 50, -}); - -export const P3TalentsMutiHat = PresetUtils.makePresetTalents('P3 Mutilate (HaT)', SavedTalents.create({ talentsString: '005323101551051-3203-01' }), { - customCondition: player => player.getLevel() === 50, -}); - -export const P3TalentsSaber = PresetUtils.makePresetTalents('P3 Saber', SavedTalents.create({ talentsString: '005323101551051-320004' }), { - customCondition: player => player.getLevel() === 50, -}); - -export const P4TalentsMutiSaber = PresetUtils.makePresetTalents('P4 Mutilate/Saber', SavedTalents.create({ talentsString: '00532310155104-02330520000501' }), { - customCondition: player => player.getLevel() === 60, -}); - -export const P4TalentsSlaughter = PresetUtils.makePresetTalents('P4 Backstab', SavedTalents.create({ talentsString: '005323105521051-023305-05' }), { - customCondition: player => player.getLevel() === 60, -}); - -export const P5TalentBackstabAssassination = PresetUtils.makePresetTalents( - 'P5 Backstab Assassination', - SavedTalents.create({ talentsString: '005323105551051-023302-05' }), - { - customCondition: player => player.getLevel() === 60, - }, -); +// Preset name must be unique. Ex: 'Backstab DPS' cannot be used as a name more than once -export const P5TalentBackstabCombat = PresetUtils.makePresetTalents( - 'P5 Backstab Combat', +export const CombatBackstabTalents = PresetUtils.makePresetTalents( + 'Combat Backstab', SavedTalents.create({ talentsString: '005023104-0233050020550100221-05' }), { customCondition: player => player.getLevel() === 60, }, ); -export const P5TalentMutilateSaberslashCarnage = PresetUtils.makePresetTalents( - 'P5 Mutilate/Saber Carnage', - SavedTalents.create({ talentsString: '00532310155104-02330520000501' }), - { - customCondition: player => player.getLevel() === 60, - }, -); - -export const P5TalentMutilateSaberslashCTTC = PresetUtils.makePresetTalents( - 'P5 Mutilate/Saber CTTC', - SavedTalents.create({ talentsString: '00532012255104-02330520000501' }), - { - customCondition: player => player.getLevel() === 60, - }, -); - -export const P5TalentBackstabAssassinationIEA = PresetUtils.makePresetTalents( - 'P5 Backstab IEA', - SavedTalents.create({ talentsString: '005323125501051-023305-05' }), - { - customCondition: player => player.getLevel() === 60, - }, -); - -export const P5TalentMutilateSaberslashCTTCIEA = PresetUtils.makePresetTalents( - 'P5 Mutilate/Saber CTTC IEA', - SavedTalents.create({ talentsString: '00532012255104-02530500000501' }), - { - customCondition: player => player.getLevel() === 60, - }, -); +export const CombatSwordsTalents = PresetUtils.makePresetTalents('Combat Swords', SavedTalents.create({ talentsString: '005323105-0240052020050150231' }), { + customCondition: player => player.getLevel() === 60, +}); export const TalentPresets = { - [Phase.Phase1]: [CombatDagger25Talents], - [Phase.Phase2]: [ColdBloodMutilate40Talents, IEAMutilate40Talents, CombatMutilate40Talents], - [Phase.Phase3]: [P3TalentsMuti, P3TalentsMutiHat, P3TalentsSaber], - // [Phase.Phase4]: [P4TalentsMutiSaber, P4TalentsSlaughter], - [Phase.Phase5]: [ - P5TalentBackstabAssassination, - P5TalentBackstabCombat, - P5TalentMutilateSaberslashCarnage, - P5TalentMutilateSaberslashCTTC, - P5TalentBackstabAssassinationIEA, - P5TalentMutilateSaberslashCTTCIEA, - ], + [Phase.Phase1]: [CombatSwordsTalents, CombatBackstabTalents], + [Phase.Phase2]: [CombatSwordsTalents, CombatBackstabTalents], + [Phase.Phase3]: [CombatSwordsTalents, CombatBackstabTalents], + [Phase.Phase4]: [CombatSwordsTalents, CombatBackstabTalents], + [Phase.Phase5]: [CombatSwordsTalents, CombatBackstabTalents], }; export const DefaultTalentsAssassin = TalentPresets[Phase.Phase5][0]; @@ -252,8 +104,7 @@ export const DefaultTalentsCombat = TalentPresets[Phase.Phase5][0]; export const DefaultTalentsSubtlety = TalentPresets[Phase.Phase5][0]; export const DefaultTalentsBackstab = TalentPresets[Phase.Phase5][0]; -export const DefaultTalentsMutilate = TalentPresets[Phase.Phase5][3]; -export const DefaultTalentsSaber = TalentPresets[Phase.Phase5][2]; +export const DefaultTalentsSinisterStrike = TalentPresets[Phase.Phase5][1]; export const DefaultTalents = DefaultTalentsAssassin; @@ -261,41 +112,11 @@ export const DefaultTalents = DefaultTalentsAssassin; // Encounters /////////////////////////////////////////////////////////////////////////// export const PresetBuildBackstab = PresetUtils.makePresetBuild('Backstab', { - gear: DefaultGear, - talents: P5TalentBackstabAssassination, + gear: GearDaggersPreBiS, + talents: DefaultTalentsBackstab, rotation: DefaultAPLBackstab, }); -export const PresetBuildBackstabIEA = PresetUtils.makePresetBuild('Backstab IEA', { - gear: DefaultGear, - talents: P5TalentBackstabAssassinationIEA, - rotation: DefaultAPLBackstab, -}); - -export const PresetBuildMutilate = PresetUtils.makePresetBuild('Mutilate', { - gear: DefaultGear, - talents: DefaultTalentsMutilate, - rotation: DefaultAPLMutilate, -}); - -export const PresetBuildMutilateIEA = PresetUtils.makePresetBuild('Mutilate IEA', { - gear: DefaultGear, - talents: P5TalentMutilateSaberslashCTTCIEA, - rotation: ROTATION_PRESET_MUTILATE_IEA_P5, -}); - -export const PresetBuildSaberSlash = PresetUtils.makePresetBuild('Saber Slash', { - gear: DefaultGear, - talents: DefaultTalentsSaber, - rotation: DefaultAPLSaber, -}); - -export const PresetBuildSaberSlashIEA = PresetUtils.makePresetBuild('Saber Slash IEA', { - gear: DefaultGear, - talents: P5TalentMutilateSaberslashCTTCIEA, - rotation: ROTATION_PRESET_SABER_IEA_P5, -}); - /////////////////////////////////////////////////////////////////////////// // Options /////////////////////////////////////////////////////////////////////////// @@ -308,47 +129,6 @@ export const DefaultOptions = RogueOptions.create({ // Consumes/Buffs/Debuffs /////////////////////////////////////////////////////////////////////////// -export const P1Consumes = Consumes.create({ - agilityElixir: AgilityElixir.ElixirOfLesserAgility, - dragonBreathChili: false, - strengthBuff: StrengthBuff.ElixirOfOgresStrength, - mainHandImbue: WeaponImbue.Windfury, - //offHandImbue: WeaponImbue.BlackfathomSharpeningStone, -}); - -export const P2Consumes = Consumes.create({ - agilityElixir: AgilityElixir.ElixirOfAgility, - dragonBreathChili: false, - strengthBuff: StrengthBuff.ElixirOfOgresStrength, - mainHandImbue: WeaponImbue.Windfury, - offHandImbue: WeaponImbue.ShadowOil, -}); - -export const P3Consumes = Consumes.create({ - agilityElixir: AgilityElixir.ElixirOfGreaterAgility, - dragonBreathChili: false, - strengthBuff: StrengthBuff.ElixirOfOgresStrength, - mainHandImbue: WeaponImbue.Windfury, - offHandImbue: WeaponImbue.ShadowOil, -}); - -export const P4Consumes = Consumes.create({ - agilityElixir: AgilityElixir.ElixirOfTheMongoose, - attackPowerBuff: AttackPowerBuff.JujuMight, - defaultConjured: Conjured.ConjuredRogueThistleTea, - dragonBreathChili: true, - flask: Flask.FlaskOfSupremePower, - food: Food.FoodGrilledSquid, - mainHandImbue: WeaponImbue.Windfury, - miscConsumes: { - jujuEmber: true, - }, - offHandImbue: WeaponImbue.ElementalSharpeningStone, - spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir, - strengthBuff: StrengthBuff.JujuPower, - zanzaBuff: ZanzaBuff.GroundScorpokAssay, -}); - export const P5Consumes = Consumes.create({ agilityElixir: AgilityElixir.ElixirOfTheMongoose, attackPowerBuff: AttackPowerBuff.JujuMight, @@ -357,17 +137,17 @@ export const P5Consumes = Consumes.create({ flask: Flask.FlaskOfSupremePower, food: Food.FoodGrilledSquid, mainHandImbue: WeaponImbue.Windfury, - offHandImbue: WeaponImbue.ElementalSharpeningStone, + offHandImbue: WeaponImbue.InstantPoison, spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir, strengthBuff: StrengthBuff.JujuPower, zanzaBuff: ZanzaBuff.GroundScorpokAssay, }); export const DefaultConsumes = { - [Phase.Phase1]: P1Consumes, - [Phase.Phase2]: P2Consumes, - [Phase.Phase3]: P3Consumes, - [Phase.Phase4]: P4Consumes, + [Phase.Phase1]: P5Consumes, + [Phase.Phase2]: P5Consumes, + [Phase.Phase3]: P5Consumes, + [Phase.Phase4]: P5Consumes, [Phase.Phase5]: P5Consumes, }; diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts index acf153246..17e4e525e 100644 --- a/ui/rogue/sim.ts +++ b/ui/rogue/sim.ts @@ -65,11 +65,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, { Stat.StatSpellHit, Stat.StatSpellCrit, ], - epPseudoStats: [ - PseudoStat.PseudoStatMainHandDps, - PseudoStat.PseudoStatOffHandDps, - PseudoStat.PseudoStatMeleeSpeedMultiplier - ], + epPseudoStats: [PseudoStat.PseudoStatMainHandDps, PseudoStat.PseudoStatOffHandDps, PseudoStat.PseudoStatMeleeSpeedMultiplier], // Reference stat against which to calculate EP. epReferenceStat: Stat.StatAttackPower, // Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar. @@ -154,29 +150,28 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, { talents: [ ...Presets.TalentPresets[Phase.Phase5], //...Presets.TalentPresets[Phase.Phase4], Removed due to duplication with P5 - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], - ...Presets.TalentPresets[Phase.Phase1], + //...Presets.TalentPresets[Phase.Phase3], + //...Presets.TalentPresets[Phase.Phase2], + //...Presets.TalentPresets[Phase.Phase1], ], // Preset rotations that the user can quickly select. rotations: [ ...Presets.APLPresets[Phase.Phase5], //...Presets.APLPresets[Phase.Phase4], Removed due to duplication with P5 - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], - ...Presets.APLPresets[Phase.Phase1], + //...Presets.APLPresets[Phase.Phase3], + //...Presets.APLPresets[Phase.Phase2], + //...Presets.APLPresets[Phase.Phase1], ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase5], + //...Presets.GearPresets[Phase.Phase4], + //...Presets.GearPresets[Phase.Phase3], + //...Presets.GearPresets[Phase.Phase2], + //...Presets.GearPresets[Phase.Phase1], ], builds: [ - Presets.PresetBuildBackstab, - Presets.PresetBuildBackstabIEA, - Presets.PresetBuildMutilate, - Presets.PresetBuildMutilateIEA, - Presets.PresetBuildSaberSlash, - Presets.PresetBuildSaberSlashIEA, + // Presets.PresetBuildBackstab, ], },