From eb3316d83194d55d785737920f0be29817753fc6 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 27 Sep 2023 20:42:33 -0400 Subject: [PATCH] better APL (#3765) --- sim/mage/TestFire.results | 32 ++++++++++++++++---------------- sim/mage/mage_test.go | 4 ++-- ui/mage/presets.ts | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index 735b168ba4..b9a0d1d314 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -770,50 +770,50 @@ dps_results: { dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-LongMultiTarget" value: { - dps: 40063.21859 - tps: 37491.36433 + dps: 40033.09338 + tps: 37584.8041 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-LongSingleTarget" value: { - dps: 1837.11212 - tps: 1458.2075 + dps: 1841.08882 + tps: 1510.4052 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 3102.48924 - tps: 2446.7825 + dps: 3043.39464 + tps: 2642.25096 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-LongMultiTarget" value: { - dps: 18989.72266 - tps: 18769.31008 + dps: 18938.75971 + tps: 18798.93923 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-LongSingleTarget" value: { - dps: 789.41494 - tps: 637.71944 + dps: 810.45454 + tps: 676.91192 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 1587.14525 - tps: 1268.80011 + dps: 1591.29296 + tps: 1379.17 } } dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-FullBuffs-LongMultiTarget" value: { - dps: 9506.19613 - tps: 9796.29187 + dps: 25763.80419 + tps: 24849.91926 } } dps_results: { @@ -833,8 +833,8 @@ dps_results: { dps_results: { key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-NoBuffs-LongMultiTarget" value: { - dps: 4404.67065 - tps: 5041.81073 + dps: 10915.48279 + tps: 11493.59376 } } dps_results: { diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index 93c128fba3..aa6eb59554 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -229,7 +229,7 @@ var FireRotation = core.APLRotationFromJsonString(`{ {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":12873},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":42859}}}}, {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":44448}}},"castSpell":{"spellId":{"spellId":42891}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55360}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12s"}}}}]}},"castSpell":{"spellId":{"spellId":55360}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12s"}}}}]}},"multidot":{"spellId":{"spellId":55360},"maxDots":10,"maxOverlap":{"const":{"val":"0ms"}}}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":42859}}}}},"castSpell":{"spellId":{"spellId":42873}}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":42859}}}}, {"action":{"castSpell":{"spellId":{"spellId":42833}}}} @@ -246,7 +246,7 @@ var FireAOERotation = core.APLRotationFromJsonString(`{ {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42925,"tag":8}}}}}]}},"castSpell":{"spellId":{"spellId":42950}}}}, {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42925,"tag":8}}}}}]}},"castSpell":{"spellId":{"spellId":42945}}}}, {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},"castSpell":{"spellId":{"spellId":42926,"tag":9}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},"castSpell":{"spellId":{"spellId":42925,"tag":8}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":8}}}}},"castSpell":{"spellId":{"spellId":42925,"tag":8}}}}, {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":44448}}},"castSpell":{"spellId":{"spellId":42891}}}}, {"action":{"castSpell":{"spellId":{"spellId":42921}}}} ] diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 4f7ce1b38e..29c6eebc36 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -220,7 +220,7 @@ export const FIRE_ROTATION_PRESET_DEFAULT = { {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":12873},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":42859}}}}, {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":44448}}},"castSpell":{"spellId":{"spellId":42891}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":55360}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12s"}}}}]}},"castSpell":{"spellId":{"spellId":55360}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"12s"}}}}]}},"multidot":{"spellId":{"spellId":55360},"maxDots":10,"maxOverlap":{"const":{"val":"0ms"}}}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"spellCastTime":{"spellId":{"spellId":42859}}}}},"castSpell":{"spellId":{"spellId":42873}}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":42859}}}}, {"action":{"castSpell":{"spellId":{"spellId":42833}}}} @@ -304,7 +304,7 @@ export const FIRE_ROTATION_PRESET_AOE = { {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42925,"tag":8}}}}}]}},"castSpell":{"spellId":{"spellId":42950}}}}, {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42925,"tag":8}}}}}]}},"castSpell":{"spellId":{"spellId":42945}}}}, {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},"castSpell":{"spellId":{"spellId":42926,"tag":9}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":9}}}}},"castSpell":{"spellId":{"spellId":42925,"tag":8}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":42926,"tag":8}}}}},"castSpell":{"spellId":{"spellId":42925,"tag":8}}}}, {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":44448}}},"castSpell":{"spellId":{"spellId":42891}}}}, {"action":{"castSpell":{"spellId":{"spellId":42921}}}} ]