Merge pull request #3396 from wowsims/apl

Update all apl presets to use new doAtValue field
wowsims · Jul 30, 2023 · b0f3093 · b0f3093
2 parents 2f2a1ff + bf49f9b
commit b0f3093
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 55 deletions.
diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts
@@ -280,8 +280,8 @@ rotation: SavedRotation.create({
 	rotation: APLRotation.fromJsonString(`{
       "enabled": true,
       "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1.5s"},
-        {"action":{"castSpell":{"spellId":{"spellId":48461}}},"doAt":"-1.5s"}
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":48461}}},"doAtValue":{"const":{"val":"-1.5s"}}}
       ],
       "priorityList": [
         {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"tag":-1,"spellId":2825}}}},

diff --git a/ui/deathknight/presets.ts b/ui/deathknight/presets.ts
@@ -265,13 +265,13 @@ export const BLOOD_PESTI_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAt":"-20s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAt":"-6s"},
-			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAt":"-1s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":49016}}},"doAt":"0s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":54758}}},"doAt":"0s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":26297}}},"doAt":"0s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-6s"}}},
+			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":49016}}},"doAtValue":{"const":{"val":"0s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":54758}}},"doAtValue":{"const":{"val":"0s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":26297}}},"doAtValue":{"const":{"val":"0s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -302,10 +302,10 @@ export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAt":"-20s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAt":"-6s"},
-			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-6s"}}},
+			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -336,10 +336,10 @@ export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAt":"-20s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAt":"-6s"},
-			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-20s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":50689}}},"doAtValue":{"const":{"val":"-6s"}}},
+			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -370,9 +370,9 @@ export const UNHOLY_DW_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":63560}}},"doAt":"-8s"},
-			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48265}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":63560}}},"doAtValue":{"const":{"val":"-8s"}}},
+			  {"action":{"castSpell":{"spellId":{"itemId":40211}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},

diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts
@@ -211,11 +211,12 @@ export const ROTATION_PRESET_BASIC_APL = {
     rotation: APLRotation.fromJsonString(`{
       "enabled": true,
       "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAt":"-2s"},
-        {"action":{"castSpell":{"spellId":{"spellId":57722}}},"doAt":"-3s"},
-        {"action":{"castSpell":{"spellId":{"spellId":58774}}},"doAt":"-4s"},
-        {"action":{"castSpell":{"spellId":{"spellId":58643}}},"doAt":"-5s"},
-        {"action":{"castSpell":{"spellId":{"spellId":3738}}},"doAt":"-6s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":3738}}},"doAtValue":{"const":{"val":"-6s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":58643}}},"doAtValue":{"const":{"val":"-5s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":58774}}},"doAtValue":{"const":{"val":"-4s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":57722}}},"doAtValue":{"const":{"val":"-3s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAtValue":{"const":{"val":"-2s"}}},
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
       ],
       "priorityList": [
         {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},{"spellIsReady":{"spellId":{"tag":-1,"spellId":2825}}}]}},"castSpell":{"spellId":{"tag":-1,"spellId":2825}}}},

diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts
@@ -113,7 +113,7 @@ export const ROTATION_PRESET_BM = {
 		rotation: APLRotation.fromJsonString(`{
       		"enabled": true,
       		"prepullActions": [
-      		  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
       		],
       		"priorityList": [
       		  {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}},
@@ -139,7 +139,7 @@ export const ROTATION_PRESET_MM = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-				{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+				{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 				{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}},
@@ -167,7 +167,7 @@ export const ROTATION_PRESET_SV = {
 		rotation: APLRotation.fromJsonString(`{
       		"enabled": true,
       		"prepullActions": [
-      		  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
       		],
       		"priorityList": [
       		  {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}},
@@ -195,7 +195,7 @@ export const ROTATION_PRESET_AOE = {
 		rotation: APLRotation.fromJsonString(`{
       		"enabled": true,
       		"prepullActions": [
-      		  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
       		],
       		"priorityList": [
       		  {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},"autocastOtherCooldowns":{}}},

diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts
@@ -4,7 +4,6 @@ import { EquipmentSpec } from '../core/proto/common.js';
 import { Flask } from '../core/proto/common.js';
 import { Food } from '../core/proto/common.js';
 import { Glyphs } from '../core/proto/common.js';
-import { ItemSpec } from '../core/proto/common.js';
 import { Potions } from '../core/proto/common.js';
 import { Spec } from '../core/proto/common.js';
 import { Faction } from '../core/proto/common.js';
@@ -13,12 +12,9 @@ import { SavedRotation, SavedTalents } from '../core/proto/ui.js';
 import { Player } from '../core/player.js';
 
 import {
-	Mage,
-	MageTalents as MageTalents,
 	Mage_Rotation as MageRotation,
 	Mage_Rotation_Type as RotationType,
 	Mage_Rotation_PrimaryFireSpell as PrimaryFireSpell,
-	Mage_Rotation_AoeRotation as AoeRotationSpells,
 	Mage_Options as MageOptions,
 	Mage_Options_ArmorType as ArmorType,
 	MageMajorGlyph,
@@ -193,7 +189,7 @@ export const ARCANE_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -217,7 +213,7 @@ export const FIRE_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -238,7 +234,7 @@ export const FROSTFIRE_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -259,7 +255,7 @@ export const FROST_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},

diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts
@@ -4,10 +4,8 @@ import { EquipmentSpec } from '../core/proto/common.js';
 import { Flask } from '../core/proto/common.js';
 import { Food } from '../core/proto/common.js';
 import { Glyphs } from '../core/proto/common.js';
-import { ItemSpec } from '../core/proto/common.js';
 import { Potions } from '../core/proto/common.js';
 import { Spec } from '../core/proto/common.js';
-import { Faction } from '../core/proto/common.js';
 import { SavedRotation, SavedTalents } from '../core/proto/ui.js';
 import { Player } from '../core/player.js';
 import { APLRotation } from '../core/proto/apl.js';
@@ -23,7 +21,6 @@ import {
 	PaladinMinorGlyph,
 } from '../core/proto/paladin.js';
 
-import * as Gems from '../core/proto_utils/gems.js';
 import * as Tooltips from '../core/constants/tooltips.js';
 
 // Preset options for this spec.
@@ -274,7 +271,7 @@ export const ROTATION_PRESET_BASIC_APL = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAt":"-1s"}
+			  {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},

diff --git a/ui/tank_deathknight/presets.ts b/ui/tank_deathknight/presets.ts
@@ -130,8 +130,8 @@ export const BLOOD_IT_SPAM_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48263}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAt":"-6s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48263}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-6s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},
@@ -163,8 +163,8 @@ export const BLOOD_AGGRO_ROTATION_PRESET_DEFAULT = {
 		rotation: APLRotation.fromJsonString(`{
 			"enabled": true,
 			"prepullActions": [
-			  {"action":{"castSpell":{"spellId":{"spellId":48263}}},"doAt":"-10s"},
-			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAt":"-6s"}
+			  {"action":{"castSpell":{"spellId":{"spellId":48263}}},"doAtValue":{"const":{"val":"-10s"}}},
+			  {"action":{"castSpell":{"spellId":{"spellId":42650}}},"doAtValue":{"const":{"val":"-6s"}}}
 			],
 			"priorityList": [
 			  {"action":{"autocastOtherCooldowns":{}}},

diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts
@@ -525,13 +525,12 @@ export const APL_Demo_Default = {
 	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getTalentTree() == 1,
 	rotation: SavedRotation.create({
 		specRotationOptionsJson: WarlockRotation.toJsonString(DemonologyRotation),
-		rotation: APLRotation.fromJsonString(`
-{
+		rotation: APLRotation.fromJsonString(`{
     "enabled": true,
     "prepullActions": [
-        { "action": { "castSpell": { "spellId": { "spellId": 57946 } } }, "doAt": "-4s" },
-        { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAt": "-2.5s" },
-        { "action": { "castSpell": { "spellId": { "spellId": 47809 } } }, "doAt": "-2.5s" }
+	  {"action":{"castSpell":{"spellId":{"spellId":57946}}},"doAtValue":{"const":{"val":"-4s"}}},
+      {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+      {"action":{"castSpell":{"spellId":{"spellId":47809}}},"doAtValue":{"const":{"val":"-2.5s"}}}
     ],
     "priorityList": [
         { "action": { "autocastOtherCooldowns": {} } },
@@ -582,13 +581,12 @@ export const APL_Destro_Default = {
 	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getTalentTree() == 2,
 	rotation: SavedRotation.create({
 		specRotationOptionsJson: WarlockRotation.toJsonString(DestructionRotation),
-		rotation: APLRotation.fromJsonString(`
-{
+		rotation: APLRotation.fromJsonString(`{
     "enabled": true,
     "prepullActions": [
-      { "action": { "castSpell": { "spellId": { "spellId": 57946 } } }, "doAt": "-5s" },
-      { "action": { "castSpell": { "spellId": { "otherId": "OtherActionPotion" } } }, "doAt": "-3.5s" },
-      { "action": { "castSpell": { "spellId": { "spellId": 47825 } } }, "doAt": "-3.5s" }
+	  {"action":{"castSpell":{"spellId":{"spellId":57946}}},"doAtValue":{"const":{"val":"-5s"}}},
+      {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-3.5s"}}},
+      {"action":{"castSpell":{"spellId":{"spellId":47825}}},"doAtValue":{"const":{"val":"-3.5s"}}}
     ],
     "priorityList": [
       { "action": { "autocastOtherCooldowns": {} } },