Isle of Thunder zone achievements (and a correction to the original f…

…ile!)
ATTWoWAddon · Apr 14, 2024 · f50e98e · f50e98e
1 parent 00d95c5
commit f50e98e
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 16 deletions.
diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/05 Pandaria/Isle of Thunder.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/05 Pandaria/Isle of Thunder.lua
@@ -502,6 +502,8 @@ root(ROOTS.Zones, {
 								}),
 								q(32277, {	-- To the Skies! (H)
 								}),
+								q(32278, {	-- Decisive Action
+							}),
 							})),
 							-- Weekly
 							n(QUESTS, sharedData({
@@ -545,8 +547,6 @@ root(ROOTS.Zones, {
 									["coord"] = { 46.8, 66.9, ISLE_OF_THUNDER },
 									["provider"] = { "n", 67660 },	-- Archmage Aethas Sunreaver
 								}),
-								q(32278, {	-- Decisive Action
-								}),
 								q(32302, {	-- Deconstruction (H)
 								}),
 								q(32298, {	-- Dino Might (H)

diff --git a/.contrib/Parser/DATAS/07 - Events/Remix Mists of Pandaria/Outdoor Zones/Dread Wastes.lua b/.contrib/Parser/DATAS/07 - Events/Remix Mists of Pandaria/Outdoor Zones/Dread Wastes.lua
@@ -27,14 +27,7 @@ root(ROOTS.WorldEvents, applyevent(EVENTS.REMIX_MOP, n(REMIX_MOP, bubbleDown({ [
 					},
 				}),
 				ach(19998, {		-- Elusive Foes: Dread Wastes
-					crit(65623),	-- Ik-Ik the Nimble
-					crit(65624),	-- Nalash Verdantis
-					crit(65625),	-- Gar'lok
-					crit(65626),	-- Karr the Darkener
-					crit(65627),	-- Krol the Blade
-					crit(65628),	-- Ai-Li Skymirror
-					crit(65629),	-- Omnis Grinlok
-					crit(65630),	-- Dak the Breaker
+					["sym"] = {{ "achievement_criteria" }},
 				}),
 				ach(20031, bubbleDown({ ["_noautomation"] = true, }, {	-- Explore Dread Wastes
 					crit(65995),	-- Heart of Fear

diff --git a/.contrib/Parser/DATAS/07 - Events/Remix Mists of Pandaria/Outdoor Zones/Isle of Thunder.lua b/.contrib/Parser/DATAS/07 - Events/Remix Mists of Pandaria/Outdoor Zones/Isle of Thunder.lua
@@ -6,8 +6,47 @@ root(ROOTS.WorldEvents, applyevent(EVENTS.REMIX_MOP, n(REMIX_MOP, bubbleDown({ [
 		["icon"] = "Interface\\Icons\\spell_nature_callstorm",
 		["g"] = {
 			n(ACHIEVEMENTS, {
-				ach(19892),		-- Campaign: Isle of Thunder
-				ach(20000),		-- Elusive Foes: Isle of Thunder
+				ach(19892, bubbleDown({ ["_noautomation"] = true, }, {	-- Campaign: Isle of Thunder
+					crit(67270, {	-- Assault the Shipyard
+						["_quests"] = { 32655 },
+					}),
+					crit(67271, {	-- Assault the Shipyard
+						["_quests"] = { 32278 },
+					}),
+					crit(67273, {	-- The Fall of Shan Bu
+						["_quests"] = { 32656 },
+					}),
+					crit(67274, {	-- The Fall of Shan Bu
+						["_quests"] = { 32279 },
+					}),
+					crit(67276, {	-- Build a Base
+						["_quests"] = { 32644 },
+					}),
+					crit(67277, {	-- Build a Base
+						["_quests"] = { 32212 },
+					}),
+					crit(67281, {	-- First Landing
+						["_quests"] = { 32681 },
+					}),
+					crit(67282, {	-- First Landing
+						["_quests"] = { 32680 },
+					}),
+					crit(67283, {	-- Break Down the Wall
+						["_quests"] = { 32654 },
+					}),
+					crit(67284, {	-- Break Down the Wall
+						["_quests"] = { 32276 },
+					}),
+					crit(67286, {	-- Take the Forge
+						["_quests"] = { 32652 },
+					}),
+					crit(67287, {	-- Take the Forge
+						["_quests"] = { 32277 },
+					}),
+				})),
+				ach(20000, {		-- Elusive Foes: Isle of Thunder
+					["sym"] = {{ "achievement_criteria" }},
+				}),
 				ach(19880, {	-- Isle of Thunder
 					-- Meta Achievement
 					["sym"] = {{"meta_achievement",
@@ -148,7 +187,13 @@ root(ROOTS.WorldEvents, applyevent(EVENTS.REMIX_MOP, n(REMIX_MOP, bubbleDown({ [
 						}),
 					},
 				}),
-				ach(20015),		-- Looking For Group: Isle of Thunder
+				ach(20015, {		-- Looking For Group: Isle of Thunder
+					["sym"] = {{"meta_achievement",
+						20020,	-- Oondasta
+						19955,	-- Raid Finder: Throne of Thunder
+						20019,	-- Nalak, the Storm Lord
+					}},
+				}),
 			}),
 			n(REWARDS, {
 				filter(LEATHER, {

diff --git a/ptr_db/Dragonflight/Categories.lua b/ptr_db/Dragonflight/Categories.lua