Update Warlock P4 WIP sets

wowsims · Jan 31, 2025 · 724b8dd · 724b8dd
1 parent 53d86cf
commit 724b8dd
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 38 deletions.
diff --git a/ui/warlock/demonology/apls/incinerate.apl.json b/ui/warlock/demonology/apls/incinerate.apl.json
@@ -1,21 +1,25 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{"action":{"itemSwap":{"swapSet":"Swap1"}},"doAtValue":{"const":{"val":"-60s"}}},
-		{"action":{"castSpell":{"spellId":{"itemId":70142}}},"doAtValue":{"const":{"val":"-22.5"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"activateAura":{"auraId":{"spellId":74221,"tag":1}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-2.49s"}}},
-		{"action":{"itemSwap":{"swapSet":"Main"}},"doAtValue":{"const":{"val":"-2.49s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.49s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.5s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.5s"}}}
-	],
+        {"action":{"itemSwap":{"swapSet":"Swap1"}},"doAtValue":{"const":{"val":"-120s"}}},
+        {"action":{"castSpell":{"spellId":{"itemId":70142}}},"doAtValue":{"const":{"val":"-22.5"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"activateAura":{"auraId":{"spellId":102662}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":107986}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":109776}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":92320}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":74221,"tag":1}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-2.49s"}}},
+        {"action":{"itemSwap":{"swapSet":"Main"}},"doAtValue":{"const":{"val":"-2.49s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.49s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.5s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.5s"}}}
+      ],
 	"priorityList": [
 		{"action":{"autocastOtherCooldowns":{}}},
 		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":59672}}},{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"70s"}}}}]}},"castSpell":{"spellId":{"spellId":59672}}}},

diff --git a/ui/warlock/demonology/apls/shadow-bolt.apl.json b/ui/warlock/demonology/apls/shadow-bolt.apl.json
@@ -1,17 +1,21 @@
 {
 	"type": "TypeAPL",
 	"prepullActions": [
-		{"action":{"itemSwap":{"swapSet":"Swap1"}},"doAtValue":{"const":{"val":"-60s"}}},
-		{"action":{"castSpell":{"spellId":{"itemId":70142}}},"doAtValue":{"const":{"val":"-22.5"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
-		{"action":{"activateAura":{"auraId":{"spellId":74221,"tag":1}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.51s"}}},
-		{"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-2.49s"}}},
-		{"action":{"itemSwap":{"swapSet":"Main"}},"doAtValue":{"const":{"val":"-2.49s"}}},
+		{"action":{"itemSwap":{"swapSet":"Swap1"}},"doAtValue":{"const":{"val":"-120s"}}},
+        {"action":{"castSpell":{"spellId":{"itemId":70142}}},"doAtValue":{"const":{"val":"-22.5"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":30146}}},"doAtValue":{"const":{"val":"-10s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":77801}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"castSpell":{"spellId":{"spellId":74434}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"castSpell":{"spellId":{"spellId":691}}},"doAtValue":{"const":{"val":"-4.01s"}},"hide":true},
+        {"action":{"activateAura":{"auraId":{"spellId":102662}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":107986}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":109776}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":92320}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"activateAura":{"auraId":{"spellId":74221,"tag":1}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":59672}}},"doAtValue":{"const":{"val":"-2.51s"}}},
+        {"action":{"castSpell":{"spellId":{"spellId":82174}}},"doAtValue":{"const":{"val":"-2.49s"}}},
+        {"action":{"itemSwap":{"swapSet":"Main"}},"doAtValue":{"const":{"val":"-2.49s"}}},
 		{"action":{"castSpell":{"spellId":{"spellId":686}}},"doAtValue":{"const":{"val":"-2.49s"}}},
 		{"action":{"castSpell":{"spellId":{"spellId":33697}}},"doAtValue":{"const":{"val":"-0.5s"}}},
 		{"action":{"castSpell":{"spellId":{"spellId":348}}},"doAtValue":{"const":{"val":"-0.5s"}}}

diff --git a/ui/warlock/demonology/gear_sets/p4.gear.json b/ui/warlock/demonology/gear_sets/p4.gear.json
@@ -1,21 +1,21 @@
 {
 	"items": [
 		{ "id": 78702, "enchant": 4207, "gems": [68780, 71881], "reforging": 144 },
-		{ "id": 71472, "gems": [71881] },
-		{ "id": 78749, "enchant": 4200, "gems": [71881, 71881], "reforging": 167 },
-		{ "id": 77098, "gems": [71881] },
-		{ "id": 78730, "enchant": 4102, "gems": [71881, 71881, 71850], "reforging": 140 },
-		{ "id": 78417, "enchant": 4257, "gems": [71881, 0], "reforging": 165 },
+		{ "id": 71472, "gems": [71881], "reforging": 165 },
+		{ "id": 78749, "enchant": 4200, "gems": [71881, 71881], "reforging": 145 },
+		{ "id": 77098, "enchant": 4115, "gems": [71881], "reforging": 167 },
+		{ "id": 78730, "enchant": 4102, "gems": [71881, 71881, 71850] },
+		{ "id": 78417, "enchant": 4257, "gems": [71881, 0], "reforging": 151 },
 		{ "id": 78461, "enchant": 4107, "gems": [71881, 71881, 0], "reforging": 144 },
 		{ "id": 78391, "gems": [71881, 71881, 71881], "reforging": 144 },
-		{ "id": 78721, "enchant": 4112, "gems": [71881, 71881, 71850] },
-		{ "id": 78449, "gems": [71881, 71881] },
+		{ "id": 78721, "enchant": 4112, "gems": [71881, 71881, 71854], "reforging": 165 },
+		{ "id": 78449, "enchant": 4104, "gems": [71881, 71881], "reforging": 144 },
 		{ "id": 78419, "gems": [71881], "reforging": 165 },
-		{ "id": 78490, "gems": [71881] },
+		{ "id": 78490, "gems": [71881], "reforging": 145 },
 		{ "id": 77995 },
 		{ "id": 78000 },
 		{ "id": 71086, "enchant": 4097, "gems": [71881, 71881, 71881] },
 		{},
-		{ "id": 78392 }
+		{ "id": 78392, "reforging": 165 }
 	]
 }
diff --git a/ui/warlock/demonology/gear_sets/p4_item_swap.gear.json b/ui/warlock/demonology/gear_sets/p4_item_swap.gear.json
@@ -0,0 +1,74 @@
+{
+	"items": [
+		{
+			"id": 77146,
+			"enchant": 4208,
+			"gems": [52289, 71877]
+		},
+		{
+			"id": 71563
+		},
+		{
+			"id": 78749,
+			"enchant": 4204,
+			"gems": [71877, 71877]
+		},
+		{
+			"id": 77098,
+			"enchant": 3722,
+			"gems": [71877]
+		},
+		{
+			"id": 71407,
+			"enchant": 4102,
+			"gems": [71877, 71877]
+		},
+		{
+			"id": 71989,
+			"enchant": 4257,
+			"gems": [71877, 71877, 0]
+		},
+		{
+			"id": 78681,
+			"enchant": 4107,
+			"gems": [71877, 0]
+		},
+		{
+			"id": 77179,
+			"gems": [71877, 71877, 71877]
+		},
+		{
+			"id": 78721,
+			"enchant": 4112,
+			"gems": [71877, 71877, 71877]
+		},
+		{
+			"id": 65116,
+			"enchant": 4094,
+			"gems": [71877]
+		},
+		{
+			"id": 78432,
+			"gems": [71877]
+		},
+		{
+			"id": 78493,
+			"gems": [71877]
+		},
+		{
+			"id": 77990
+		},
+		{
+			"id": 65105
+		},
+		{
+			"id": 78401,
+			"enchant": 4083,
+			"gems": [71877]
+		},
+		{},
+		{
+			"id": 78392
+		}
+	]
+}
diff --git a/ui/warlock/demonology/presets.ts b/ui/warlock/demonology/presets.ts
@@ -29,6 +29,7 @@ import P1Gear from './gear_sets/p1.gear.json';
 import P3Gear from './gear_sets/p3.gear.json';
 import ItemSwapP3 from './gear_sets/p3_item_swap.gear.json';
 import P4Gear from './gear_sets/p4.gear.json';
+import ItemSwapP4 from './gear_sets/p4_item_swap.gear.json';
 import PreraidGear from './gear_sets/preraid.gear.json';
 
 // Preset options for this spec.
@@ -40,8 +41,8 @@ export const P1_PRESET = PresetUtils.makePresetGear('P1 - BIS', P1Gear);
 export const P3_PRESET = PresetUtils.makePresetGear('P3 - BIS', P3Gear);
 export const P4_PRESET = PresetUtils.makePresetGear('P4 - WIP', P4Gear);
 
-export const P3_ITEM_SWAP = PresetUtils.makePresetItemSwapGear('P3 - Item Swap - Mastery', ItemSwapP3);
-export const P4_ITEM_SWAP = PresetUtils.makePresetItemSwapGear('P4 - Item Swap - Mastery', ItemSwapP3);
+export const P3_ITEM_SWAP = PresetUtils.makePresetItemSwapGear('P3 - Mastery', ItemSwapP3);
+export const P4_ITEM_SWAP = PresetUtils.makePresetItemSwapGear('P4 - WIP - Mastery', ItemSwapP4);
 
 export const APL_ShadowBolt = PresetUtils.makePresetAPLRotation('Shadow Bolt', ShadowBoltAPL);
 export const APL_Incinerate = PresetUtils.makePresetAPLRotation('Incinerate', IncinerateAPL);

diff --git a/ui/warlock/demonology/sim.ts b/ui/warlock/demonology/sim.ts
@@ -147,7 +147,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecDemonologyWarlock, {
 
 		// Preset gear configurations that the user can quickly select.
 		gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET, Presets.P4_PRESET],
-		itemSwaps: [Presets.P3_ITEM_SWAP],
+		itemSwaps: [Presets.P3_ITEM_SWAP,Presets.P4_ITEM_SWAP],
 
 		builds: [Presets.PRESET_BUILD_SHADOWBOLT, Presets.PRESET_BUILD_INCINERATE],
 	},