Apply requested changes

ATTWoWAddon · Jul 9, 2024 · af25ec8 · af25ec8
1 parent 3e8f2b0
commit af25ec8
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 20 deletions.
diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Ashenvale.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Ashenvale.lua
@@ -671,7 +671,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["races"] = HORDE_ONLY,
 					["lvl"] = lvlsquish(21, 21, 7),
 					["groups"] = {
-                        -- #if BEFORE CATA
+						-- #if BEFORE CATA
 						objective(1, {	-- 0/12 Thistlefur Avenger slain
 							["provider"] = { "n", 3925 },	-- Thistlefur Avenger
 						}),
@@ -811,11 +811,6 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["coord"] = { 83.7, 63.1, ASHENVALE },
 					["timeline"] = { ADDED_4_0_3 },
 					["races"] = ALLIANCE_ONLY,
-					["groups"] = {
-						objective(1, {	-- 0/10 Demon Gates closed
-							["provider"] = { "n", 33767 },	-- Demon Gate Master Bunny
-						}),
-					},
 				}),
 				q(13958, {	-- Condition Critical!
 					["qg"] = 34359,	-- Captain Goggath
@@ -2399,7 +2394,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["coord"] = { 35.6, 71.4, ASHENVALE },
 					["timeline"] = { ADDED_4_0_3 },
 					["races"] = ALLIANCE_ONLY,
-                    ["groups"] = {
+					["groups"] = {
 						objective(1, {	-- 0/12 Befouled Water Elemental slain
 							["provider"] = { "n", 3917 },	-- Befouled Water Elemental
 						}),

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Azshara.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Azshara.lua
@@ -438,7 +438,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 								{ "i", 49230 },	-- Giant-Sized Laxative
 								{ "o", 196462 },	-- Giant-Sized Laxative
 							},
-                            ["coord"] = { 39.9, 84.7, AZSHARA },
+							["coord"] = { 39.9, 84.7, AZSHARA },
 						}),
 					},
 				}),
@@ -673,7 +673,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 								{ "i", 49367 },	-- Blackmaw Meeting Agenda
 								{ "o", 196835 },	-- Important Documents
 							},
-                            ["coord"] = { 29.8, 38.5, AZSHARA },
+							["coord"] = { 29.8, 38.5, AZSHARA },
 						}),
 						objective(2, {	-- 0/1 Ambassador's Robes
 							["provider"] = { "i", 49366 },	-- Ambassador's Robes
@@ -1228,7 +1228,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 								{ "i", 49700 },	-- SFG
 								{ "o", 201572 },	-- SFG
 							},
-                            ["coord"] = { 27.7, 51.9, AZSHARA },
+							["coord"] = { 27.7, 51.9, AZSHARA },
 						}),
 					},
 				}),

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Darkshore.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Darkshore.lua
@@ -665,6 +665,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["groups"] = {
 						objective(1, {	-- 0/1 Use the Aetherion Ritual Orb
 							["provider"] = { "o", 194145 },	-- Aetherion Ritual Orb
+							["coord"] = { 36.4, 41.0, DARKSHORE },
 						}),
 						objective(2, {	-- 0/1 Aetherion's Essence
 							["provider"] = { "i", 44929 },	-- Aetherion's Essence
@@ -2130,7 +2131,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 								{ "i", 45944 },	-- Narassin's Tome
 								{ "o", 194787 },	-- Charred Book
 							},
-                            ["coord"] = { 58.2, 24.0, DARKSHORE },
+							["coord"] = { 58.2, 24.0, DARKSHORE },
 						}),
 						i(52623, {	-- Wild Bark Boots
 							["timeline"] = { ADDED_4_0_3 },

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Desolace.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Desolace.lua
@@ -1465,7 +1465,11 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["races"] = ALLIANCE_ONLY,
 					["groups"] = {
 						objective(1, {	-- 0/6 Portals Banished
-							["provider"] = { "n", 11937 },	-- Demon Portal Guardian
+							["providers"] = {
+								{ "i",  14547 },	-- Hand of Iruxos
+								{ "o", 177243 },	-- Demon Portal
+							},
+							["cr"] = 11937,	-- Demon Portal Guardian
 						}),
 						i(55937, {	-- Bracer of Portals
 							["timeline"] = { ADDED_4_0_3 },

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Durotar.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Durotar.lua
@@ -2194,7 +2194,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 								3108,	-- Encrusted Surf Crawler
 								39004,	-- Pygmy Surf Crawler
 								3106,	-- Surf Crawler
-                                3228,	-- Corrupted Surf Crawler
+								3228,	-- Corrupted Surf Crawler
 							},
 						}),
 					},
@@ -2654,7 +2654,7 @@ root(ROOTS.Zones, m(KALIMDOR, {
 							["crs"] = {
 								39452,	-- Dreadmaw Toothgnasher
 								3110,	-- Dreadmaw Crocolisk
-                                3231,	-- Corrupted Dreadmaw Crocolisk
+								3231,	-- Corrupted Dreadmaw Crocolisk
 							},
 						}),
 						i(53372, {	-- Hand Woven Vest

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Dustwallow Marsh.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Dustwallow Marsh.lua
@@ -566,7 +566,9 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["timeline"] = { ADDED_4_0_3 },
 					["groups"] = {
 						objective(1, {	-- 0/1 Stonemaul Clan Avenged
-							["provider"] = { "n", 23789 },	-- Smolderwing
+							["provider"] = { "i", 33095 },	-- Stonemaul Banner
+							["coord"] = { 52.0, 75.4, DUSTWALLOW_MARSH },
+							["cr"] = 23789,	-- Smolderwing
 						}),
 						i(33231, {	-- Oversized Stonemaul Hood
 							["timeline"] = { ADDED_2_3_0 },
@@ -682,7 +684,11 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["timeline"] = { ADDED_4_0_3 },
 					["groups"] = {
 						objective(1, {	-- 0/10 Oozes Dissolved
-							["provider"] = { "n", 23797 },	-- Moxie Steelgrille
+							["provider"] = { "i", 33108 },	-- Ooze Buster
+							["crs"] = {
+								4393,	-- Acidic Swamp Ooze
+								4394,	-- Bubbling Swamp Ooze
+							},
 						}),
 						i(33233, {	-- Cobalt-threaded Gloves
 							["timeline"] = { ADDED_2_3_0 },
@@ -1588,8 +1594,9 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["timeline"] = { ADDED_4_0_3 },
 					["races"] = ALLIANCE_ONLY,
 					["groups"] = {
-						objective(1, {	-- 0/1 Fish Paste Tested
-							["provider"] = { "n", 23928 },	-- Lurking Shark
+						objective(1, {	-- Fish Paste Tested
+							["provider"] = { "i", 33166 },	-- Pagle's Fish Paste, Extra Strength
+							["cr"] = 23928, -- Lurking Shark
 						}),
 					},
 				}),
@@ -1738,8 +1745,13 @@ root(ROOTS.Zones, m(KALIMDOR, {
 					["timeline"] = { ADDED_4_0_3 },
 					["races"] = ALLIANCE_ONLY,
 					["groups"] = {
-						objective(1, {	-- 0/1 Wreath Laid at Hyal Monument
-							["provider"] = { "n", 23768 },	-- Lynn Hyal
+						objective(1, {	-- Wreath Laid at Hyal Monument
+							["providers"] = {
+								{ "i",  33082 },	-- Wreath
+								{ "o", 186322 },	-- Hyal Family Monument
+							},
+							["coord"] = { 63.6, 42.8, DUSTWALLOW_MARSH },
+							["cr"] = 23768,	-- Lynn Hyal
 						}),
 						i(33271, {	-- Battlecaster's Edge
 							["timeline"] = { ADDED_2_3_0 },