From 0998889ea8cb3505b09278224e9eeb10e0eb8ae8 Mon Sep 17 00:00:00 2001 From: sanguinerarogue Date: Mon, 23 Dec 2024 10:30:21 -0700 Subject: [PATCH] warrior presets --- .../dps_warrior/TestP1DPSWarrior.results | 124 +++++++++--------- ui/warrior/apls/p1.apl.json | 16 ++- ui/warrior/gear_sets/p0.bis.gear.json | 36 ++--- 3 files changed, 91 insertions(+), 85 deletions(-) diff --git a/sim/warrior/dps_warrior/TestP1DPSWarrior.results b/sim/warrior/dps_warrior/TestP1DPSWarrior.results index e0906b436..16a60d170 100644 --- a/sim/warrior/dps_warrior/TestP1DPSWarrior.results +++ b/sim/warrior/dps_warrior/TestP1DPSWarrior.results @@ -1,11 +1,11 @@ character_stats_results: { key: "TestP1DPSWarrior-Phase1-CharacterStats-Default" value: { - final_stats: 441.6 - final_stats: 305.9 - final_stats: 526.355 - final_stats: 102.35 - final_stats: 177.1 + final_stats: 426.65 + final_stats: 308.2 + final_stats: 461.5525 + final_stats: 118.45 + final_stats: 141.45 final_stats: 0 final_stats: 0 final_stats: 0 @@ -18,29 +18,29 @@ character_stats_results: { final_stats: 21 final_stats: 0 final_stats: 0 - final_stats: 1804.2 + final_stats: 1956.3 + final_stats: 8 + final_stats: 49.41 final_stats: 0 - final_stats: 37.295 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 0 - final_stats: 4817.8 - final_stats: 520 + final_stats: 3229.4 + final_stats: 702 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 15.295 + final_stats: 15.41 final_stats: 5 final_stats: 0 - final_stats: 7072.55 - final_stats: 35 - final_stats: 68 - final_stats: 68 - final_stats: 68 - final_stats: 68 + final_stats: 6424.525 + final_stats: 27 + final_stats: 60 + final_stats: 60 + final_stats: 60 + final_stats: 60 final_stats: 384 final_stats: 0 final_stats: 0 @@ -50,9 +50,8 @@ character_stats_results: { stat_weights_results: { key: "TestP1DPSWarrior-Phase1-StatWeights-Default" value: { - weights: 0.38423 - weights: 0.08848 - weights: 0 + weights: 1.43452 + weights: -0.12121 weights: 0 weights: 0 weights: 0 @@ -67,9 +66,10 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.31173 weights: 0 - weights: 1.91476 + weights: 0.41561 + weights: 12.15272 + weights: 6.26744 weights: 0 weights: 0 weights: 0 @@ -99,140 +99,140 @@ stat_weights_results: { dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofHeroism" value: { - dps: 237.73911 - tps: 231.66781 + dps: 1285.15064 + tps: 1123.9144 } } dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofMight" value: { - dps: 222.95766 - tps: 218.52321 + dps: 1216.81809 + tps: 1065.47758 } } dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-BattlegearofWrath" value: { - dps: 219.245 - tps: 216.30574 + dps: 1179.62314 + tps: 1033.50286 } } dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-Conqueror'sBattlegear" value: { - dps: 244.90003 - tps: 237.86693 + dps: 1355.13247 + tps: 1182.60903 } } dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-Dreadnaught'sBattlegear" value: { - dps: 228.08017 - tps: 223.44701 + dps: 1267.86685 + tps: 1111.46724 } } dps_results: { key: "TestP1DPSWarrior-Phase1-AllItems-Vindicator'sBattlegear" value: { - dps: 236.32283 - tps: 231.13999 + dps: 1367.97332 + tps: 1198.43317 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Average-Default" value: { - dps: 225.0288 - tps: 220.3409 + dps: 1404.28425 + tps: 1228.88557 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 33.71639 - tps: 123.6996 + dps: 35.03441 + tps: 63.28026 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 30.6799 - tps: 36.04798 + dps: 33.57223 + tps: 33.39589 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 78.71826 - tps: 81.12737 + dps: 174.68072 + tps: 160.17099 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 16.31096 - tps: 109.77525 + dps: 21.78236 + tps: 51.18899 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 14.01596 - tps: 22.71683 + dps: 20.7917 + tps: 21.70805 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 38.74616 - tps: 49.14968 + dps: 87.62346 + tps: 86.53623 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 35.24971 - tps: 124.92625 + dps: 31.35459 + tps: 56.25012 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 32.21322 - tps: 37.27463 + dps: 29.89073 + tps: 29.46668 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 81.08886 - tps: 83.02385 + dps: 172.96816 + tps: 158.73119 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 17.31727 - tps: 110.5803 + dps: 19.31392 + tps: 45.38169 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 15.02227 - tps: 23.52187 + dps: 18.50398 + tps: 19.18839 } } dps_results: { key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 41.44703 - tps: 51.31038 + dps: 89.24228 + tps: 87.83899 } } dps_results: { key: "TestP1DPSWarrior-Phase1-SwitchInFrontOfTarget-Default" value: { - dps: 180.2038 - tps: 179.18853 + dps: 1068.2555 + tps: 938.91994 } } diff --git a/ui/warrior/apls/p1.apl.json b/ui/warrior/apls/p1.apl.json index 95453a8f6..9053efc43 100644 --- a/ui/warrior/apls/p1.apl.json +++ b/ui/warrior/apls/p1.apl.json @@ -1,8 +1,14 @@ { "type": "TypeAPL", - "prepullActions": [], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":11605,"rank":4}}}} - ] + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}},"castSpell":{"spellId":{"spellId":12328}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}},"castSpell":{"spellId":{"spellId":1719}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"10"}}}},"castSpell":{"spellId":{"spellId":2687}}}}, + {"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":20662,"rank":5}}}}, + {"action":{"castSpell":{"spellId":{"spellId":23894,"rank":4}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"40"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":23894,"rank":4}}},"rhs":{"const":{"val":"1.5"}}}}]}},"castSpell":{"spellId":{"spellId":1680}}}}, + {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentRage":{}},"rhs":{"const":{"val":"80"}}}},"castSpell":{"spellId":{"spellId":11567,"tag":1,"rank":8}}}} + ] } diff --git a/ui/warrior/gear_sets/p0.bis.gear.json b/ui/warrior/gear_sets/p0.bis.gear.json index c45cbee9a..a6fa16a28 100644 --- a/ui/warrior/gear_sets/p0.bis.gear.json +++ b/ui/warrior/gear_sets/p0.bis.gear.json @@ -1,22 +1,22 @@ { - "items": [ - {"id":16731}, - {}, - {"id":16733}, - {}, - {"id":16730}, - {"id":16735}, - {"id":16737}, - {"id":16736}, - {"id":16732}, - {"id":16734}, - {}, - {}, - {}, - {}, - {}, - {}, - {} + "items": [ + {"id":12640,"enchant":1506}, + {"id":15411}, + {"id":12927}, + {"id":13340,"enchant":849}, + {"id":11726,"enchant":1891}, + {"id":13400,"enchant":1885}, + {"id":15063,"enchant":927}, + {"id":13959}, + {"id":15062,"enchant":1506}, + {"id":14616,"enchant":911}, + {"id":17713}, + {"id":13098}, + {"id":13965}, + {"id":11815}, + {"id":13286,"enchant":1900}, + {"id":18737,"enchant":1900}, + {"id":12653} ] } \ No newline at end of file