- cleaned up some formatting (mostly timewalking)

- added a missing revendreth zone drop
ATTWoWAddon · Feb 8, 2021 · f51bec8 · f51bec8
1 parent eb76e24
commit f51bec8
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 174 deletions.
diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/09 Argus/Vindicaar.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/09 Argus/Vindicaar.lua
@@ -490,7 +490,6 @@ _.Zones =
 						i(152725),	-- Technique: Mass Mill Astral Glory
 					}),
 					n(121589, {	-- Thaumaturge Vashreen <Purveyor of Exquisite Furnishings>
-						["currencyID"] = 1508,	-- Veil Argunite
 						["modID"]  = 43,	-- Relinquished
 						["g"] = {
 							i(153211, {	-- Relinquished Hood

diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/13 Shadowlands/Revendreth/Zone Drops.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/13 Shadowlands/Revendreth/Zone Drops.lua
@@ -132,6 +132,7 @@ _.Zones =
 				i(177785),	-- Savage Bonemauler Shoulderguards
 				i(177781),	-- Savage Bonemauler Striders
 				i(177801),	-- Sky Legion Halbard
+				i(179332),	-- Stone Sentinel Poleaxe
 				i(180865),	-- Stonebane Cudgel
 				i(177799),	-- Stoneborn Shield
 				i(177810),	-- Stonebreaker Mace

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/01 Common Boss Drops.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/01 Common Boss Drops.lua
@@ -6,15 +6,13 @@ local InfiniteTimereaver =
 {
 	d(24, {  -- Timewalking
 		["u"] = 42,	--  Timewalking
-		["lvl"] = 65,
-		["groups"] = {
+		["g"] = {
 			n(COMMON_BOSS_DROPS, {
 				["maps"] = TIMEWALKING_DUNGEON_MAP_IDS,
-				["groups"] = {
-					{
-						["itemID"] = 133543,	-- Reins of the Infinite Timereaver
+				["g"] = {
+					i(133543, {	-- Reins of the Infinite Timereaver
 						["crs"] = TIMEWALKING_DUNGEON_CREATURE_IDS,
-					},
+					}),
 				},
 			}),
 		},

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/02 Burning Crusade.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/02 Burning Crusade.lua
@@ -8,10 +8,7 @@ _.WorldEvents =
 		["u"] = 42,	--  Timewalking
 		["g"] = {
 			tier(2, { 	-- Burning Crusade
-				["maps"] = {
-					111	-- Shattrath City
-				},
-				["lvl"] = 70,
+				["maps"] = { 111 },	-- Shattrath City
 				["g"] = {
 					q(47523, {	-- Disturbance Detected: Black Temple
 						["provider"] = { "n", 123252 },	-- Vormu

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/03 Wrath of the Lich King.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/03 Wrath of the Lich King.lua
@@ -17,10 +17,7 @@ _.WorldEvents =
 					["isWeekly"] = true,
 				}),
 				n(98690, { 	-- Auzin <Timewalking Vendor>
-					["maps"] = {
-						125,	--  Dalaran: Northrend
-					},
-					["lvl"] = 80,
+					["maps"] = { 125 },	--  Dalaran: Northrend
 					["g"] = {
 						-- Mounts / Pets / Toys
 						i(129922, {	-- Bridle of the Ironbound Wraithcharger (MOUNT!)

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/04 Cataclysm.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/04 Cataclysm.lua
@@ -7,91 +7,48 @@ _.WorldEvents =
 {
 	d(24, {  -- Timewalking
 		["u"] = 42,	--  Timewalking
-		["groups"] = {
+		["g"] = {
 			tier(4, { 	-- Catacylsm
-				{	-- Smoldering Timewarped Ember [Alliance]
-					["itemID"] = 133378,	-- Smoldering Timewarped Ember [Alliance]
-					["questID"] = 40786,	-- The Smoldering Ember
-					["provider"] = { "n", 101759 },	-- Kiatke
+				q(40786, {	-- The Smoldering Ember (A)
+					["provider"] = { "i", 133378 },	-- Smoldering Timewarped Ember
 					["isWeekly"] = true,
 					["races"] = ALLIANCE_ONLY,
-				},
-				{	-- Smoldering Timewarped Ember [Horde]
-					["itemID"] = 133377, 	-- Smoldering Timewarped Ember [Horde]
-					["questID"] = 40787, 	-- The Smoldering Ember
-					["provider"] = { "n", 101759 },	-- Kiatke
+				}),
+				q(40787, { 	-- The Smoldering Ember (H)
+					["provider"] = { "i", 133377 },	-- Smoldering Timewarped Ember
 					["isWeekly"] = true,
 					["races"] = HORDE_ONLY,
-				},
-				{	-- Kiatke <Timewalking Vendor>
-					["npcID"] = 101759, 	-- Kiatke <Timewalking Vendor>
-					["currencyID"] = 1166,  -- Timewarped Badge
-					["lvl"] = 85,
+				}),
+				n(101759, {	-- Kiatke <Timewalking Vendor>
 					["maps"] = {
 						84,	-- Stormwind City
 						85,	-- Orgrimmar
 					},
 					["g"] = {
 					-- Commendations!!
-						{	-- Commendation of the Dragonmaw Clan
-							["itemID"] = 133150,	-- Commendation of the Dragonmaw Clan
-							["icon"] = "Interface\\Icons\\inv_misc_head_dragon_red",
+						i(133150, {	-- Commendation of the Dragonmaw Clan
 							["races"] = HORDE_ONLY,
-						},
-						{	-- Commendation of the Earthen Ring
-							["itemID"] = 133159,	-- Commendation of the Earthen Ring
-							["icon"] = "Interface\\Icons\\ability_earthenfury_giftofearth",
-						},
-						{	-- Commendation of the Guardians of Hyjal
-							["itemID"] = 133152,	-- Commendation of the Guardians of Hyjal
-							["icon"] = "Interface\\Icons\\inv_misc_markoftheworldtree",
-						},
-						{	-- Commendation of the Ramkahen
-							["itemID"] = 133154,	-- Commendation of the Ramkahen
-							["icon"] = "Interface\\Icons\\inv_jewelry_amulet_03",
-						},
-						{	-- Commendation of the Wildhammer Clan
-							["itemID"] = 133151,	-- Commendation of the Wildhammer Clan
-							["icon"] = "Interface\\Icons\\inv_misc_tabard_wildhammerclan",
+						}),
+						i(133159),	-- Commendation of the Earthen Ring
+						i(133152),	-- Commendation of the Guardians of Hyjal
+						i(133154),	-- Commendation of the Ramkahen
+						i(133151, {	-- Commendation of the Wildhammer Clan
 							["races"] = ALLIANCE_ONLY,
-						},
-						{	-- Commendation of Therazanae
-							["itemID"] = 133160,	-- Commendation of Therazanae
-							["icon"] = "Interface\\Icons\\inv_datacrystal09",
-						},
+						}),
+						i(133160),	-- Commendation of Therazanae
 					-- Toy!!
-						{	-- Gurboggle's Gleaming Bauble
-							["itemID"] = 133511,	-- Gurboggle's Gleaming Bauble
-						},
-						{	-- Tosselwrench's Mega-Accurate Simulation Viewfinder
-							["itemID"] = 133542,	-- Tosselwrench's Mega-Accurate Simulation Viewfinder
-						},
+						i(133511),	-- Gurboggle's Gleaming Bauble
+						i(133542),	-- Tosselwrench's Mega-Accurate Simulation Viewfinder
 					-- Rings!!
-						{	-- Band of Reconstruction
-							["itemID"] = 133521,	-- Band of Reconstruction
-						},
-						{	-- Emergency Descent Loop
-							["itemID"] = 133523,	-- Emergency Descent Loop
-						},
-						{	-- Seal of the Grand Architect
-							["itemID"] = 133520,	-- Seal of the Grand Architect
-						},
-						{	-- Signet of the Resolute
-							["itemID"] = 133524,	-- Signet of the Resolute
-						},
+						i(133521),	-- Band of Reconstruction
+						i(133523),	-- Emergency Descent Loop
+						i(133520),	-- Seal of the Grand Architect
+						i(133524),	-- Signet of the Resolute
 					-- Trinkets!!
-						{	-- Bottled Wishes
-							["itemID"] = 133538,	-- Bottled Wishes
-						},
-						{	-- Fire of the Deep
-							["itemID"] = 133541,	-- Fire of the Deep
-						},
-						{	-- Kiroptric Sigil
-							["itemID"] = 133537,	-- Kiroptric Sigil
-						},
-						{	-- Reflection of the Light
-							["itemID"] = 133539,	-- Reflection of the Light
-						},
+						i(133538),	-- Bottled Wishes
+						i(133541),	-- Fire of the Deep
+						i(133537),	-- Kiroptric Sigil
+						i(133539),	-- Reflection of the Light
 					-- Heirlooms!!
 						i(122340, {	-- Timeworn Heirloom Armor Casing
 							["cost"] = {
@@ -140,62 +97,27 @@ _.WorldEvents =
 							},
 						}),
 					-- Gear!!
-						{	-- Bones of the Damned
-							["itemID"] = 133525,	-- Bones of the Damned
-						},
-						{	-- Lightwarper Vestments
-							["itemID"] = 133526,	-- Lightwarper Vestments
-						},
-						{	-- Ghostworld Chestguard
-							["itemID"] = 133527,	-- Ghostworld Chestguard
-						},
-						{	-- Decaying Herbalist's Robes
-							["itemID"] = 133528,	-- Decaying Herbalist's Robes
-						},
-						{	-- Belt of Hidden Keys
-							["itemID"] = 133529,	-- Belt of Hidden Keys
-						},
-						{	-- Cord of Dragon Sinew
-							["itemID"] = 133530,	-- Cord of Dragon Sinew
-						},
-						{	-- Blinding Girdle of Truth
-							["itemID"] = 133531,	-- Blinding Girdle of Truth
-						},
-						{	-- Vestal's Irrepressible Girdle
-							["itemID"] = 133532,	-- Vestal's Irrepressible Girdle
-						},
-						{	-- Flashing Bracers of Warmth
-							["itemID"] = 133533,	-- Flashing Bracers of Warmth
-						},
-						{	-- Dragonbelly Bracers
-							["itemID"] = 133534,	-- Dragonbelly Bracers
-						},
-						{	-- Bracers of Manifold Pockets
-							["itemID"] = 133535,	-- Bracers of Manifold Pockets
-						},
-						{	-- Bracers of the Black Dream
-							["itemID"] = 133536,	-- Bracers of the Black Dream
-						},
+						i(133525),	-- Bones of the Damned
+						i(133526),	-- Lightwarper Vestments
+						i(133527),	-- Ghostworld Chestguard
+						i(133528),	-- Decaying Herbalist's Robes
+						i(133529),	-- Belt of Hidden Keys
+						i(133530),	-- Cord of Dragon Sinew
+						i(133531),	-- Blinding Girdle of Truth
+						i(133532),	-- Vestal's Irrepressible Girdle
+						i(133533),	-- Flashing Bracers of Warmth
+						i(133534),	-- Dragonbelly Bracers
+						i(133535),	-- Bracers of Manifold Pockets
+						i(133536),	-- Bracers of the Black Dream
 					-- Miscellaneous!!
-						{	-- Bag of Shiny Things
-							["itemID"] = 67414,	-- Bag of Shiny Things
-							["g"] = {
-								{	-- Strand Crawler Pet
-									["itemID"] = 44983,	-- Strand Crawler Pet
-								},
-								{	-- Weather-Beaten Fishing Hat
-									["itemID"] = 33820,	-- Weather-Beaten Fishing Hat
-								},
-								{	-- Bone Fishing Pole
-									["itemID"] = 45991,	-- Bone Fishing Pole
-								},
-								{	-- Jeweled Fishing Pole
-									["itemID"] = 45992,	-- Jeweled Fishing Pole
-								},
-							},
-						},
+						i(67414, {	-- Bag of Shiny Things
+							i(44983),	-- Strand Crawler Pet
+							i(33820),	-- Weather-Beaten Fishing Hat
+							i(45991),	-- Bone Fishing Pole
+							i(45992),	-- Jeweled Fishing Pole
+						}),
 					},
-				},
+				}),
 			}),
 		},
 	}),

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/05 Mists of Pandaria.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/05 Mists of Pandaria.lua
@@ -6,21 +6,15 @@ _.WorldEvents =
 {
 	d(24, {  -- Timewalking
 		["u"] = 42,	--  Timewalking
-		["groups"] = {
+		["g"] = {
 			tier(5, { 	-- Mists of Pandaria
-				{	--  Shrouded Timewarped Coin
-					["itemID"] = 143776,	-- Shrouded Timewarped Coin
-					["questID"] = 45563,	-- The Shrouded Coin
-					["provider"] = { "n", 118828 },	-- Mistweaver Xia
+				q(45563, {	-- The Shrouded Coin
+					["provider"] = { "i", 143776 },	-- Shrouded Timewarped Coin
 					["isWeekly"] = true,
-				},
+				}),
 				n(118828, {	-- Mistweaver Xia <Timewalking Vendor>
-					["currencyID"] = 1166,	-- Timewarped Badge
-					["lvl"] = 90,
-					["maps"] = {
-						554	-- Timeless Isle
-					},
-					["groups"] = {
+					["maps"] = { 554 },	-- Timeless Isle
+					["g"] = {
 						-- Mounts / Pets / Toys
 						i(87775),	-- Yu'lei, Daughter of Jade [Mount]
 						i(143953),	-- Infinite Hatchling [Pet]

diff --git a/.contrib/Parser/DATAS/07 - Events/Timewalking/06 Warlords of Draenor.lua b/.contrib/Parser/DATAS/07 - Events/Timewalking/06 Warlords of Draenor.lua
@@ -9,28 +9,20 @@ _.WorldEvents =
 		["u"] = 42,	--  Timewalking
 		["g"] = {
 			tier(6, { 	-- Warlords of Draenor
-				{	-- Shimmering Timewarped Crystal
-					["itemID"] = 167921,	-- Shimmering Timewarped Crystal
-					["questID"] = 55498,	-- The Shimmering Crystal
-					["provider"] = { "n", 151955 },		-- Tempra
+				q(55498, {	-- The Shimmering Crystal
+					["provider"] = { "i", 167921 },		-- Shimmering Timewarped Crystal
 					["isWeekly"] = true,
 					["races"] = ALLIANCE_ONLY,
-					["coord"] = { 36.9, 72.5, 622 },	-- Stormshield
-				},
-				{	-- Shimmering Timewarped Crystal
-					["itemID"] = 167922,	-- Shimmering Timewarped Crystal
-					["questID"] = 55499,	-- The Shimmering Crystal
-					["provider"] = { "n", 151987 },		-- Kronnus
+				}),
+				q(55499, {	-- The Shimmering Crystal
+					["provider"] = { "i", 167922 },		-- Shimmering Timewarped Crystal
 					["isWeekly"] = true,
 					["races"] = HORDE_ONLY,
-					["coord"] = { 42.8, 54.5, 624 },	-- Warspear
-				},
+				}),
 				n(151987, {	-- Kronnus <Timewalking Vendor> [Horde Side]
-					["currencyID"] = 1166,	-- Timewarped Badge
-					["maps"] = { 624 },	-- Warspear
 					["races"] = HORDE_ONLY,
-					["lvl"] = 100,
 					["coord"] = { 42.8, 54.5, 624 },	-- Warspear
+					["maps"] = { 624 },	-- Warspear
 					["g"] = {
 						i(167894),	-- Beastlord's Irontusk -
 						i(167895),	-- Beastlord's Warwolf
@@ -138,11 +130,9 @@ _.WorldEvents =
 					},
 				}),
 				n(151955, {	-- Tempra <Timewalking Vendor> [Alliance Side]
-					["currencyID"] = 1166,	-- Timewarped Badge
-					["maps"] = { 622 },	-- Stormshield
-					["lvl"] = 100,
 					["races"] = ALLIANCE_ONLY,
 					["coord"] = { 36.9, 72.5, 622 },	-- Stormshield
+					["maps"] = { 622 },	-- Stormshield
 					["g"] = {
 						i(167894),	-- Beastlord's Irontusk
 						i(167895),	-- Beastlord's Warwolf

diff --git a/db/Categories.lua b/db/Categories.lua