Now with groups, (ty Darkal)

ATTWoWAddon · Nov 3, 2024 · a97340f · a97340f
1 parent ba18e51
commit a97340f
Show file tree

Hide file tree

Showing 2 changed files with 167 additions and 154 deletions.
diff --git a/.contrib/Parser/DATAS/21 - Holidays/WoW Anniversary.lua b/.contrib/Parser/DATAS/21 - Holidays/WoW Anniversary.lua
@@ -3125,92 +3125,99 @@ root(ROOTS.Holidays, applyevent(EVENTS.WOW_ANNIVERSARY, n(WOW_ANNIVERSARY_ROOT,
 					CAVERNS_OF_TIME,
 				},
 				["g"] = {
-					i(87771),	-- Reins of the Heavenly Onyx Cloud Serpent (MOUNT!)
-					-- Cloak
-					i(227641),	-- Malevolent Gladiator's Cape of Cruelty
-					i(227642),	-- Malevolent Gladiator's Cloak of Alacrity
-					i(227640),	-- Malevolent Gladiator's Drape of Prowess
-					-- Cloth
-					i(227591),	-- Gloves of the Burning Scroll
-					i(227590),	-- Leggings of the Burning Scroll
-					i(227586),	-- Guardian Serpent Gloves
-					i(227587),	-- Guardian Serpent Leggings
-					i(227588),	-- Sha-Skin Gloves
-					i(227589),	-- Sha-Skin Leggings
-					i(227635),	-- Malevolent Gladiator's Cord of Accuracy
-					i(227634),	-- Malevolent Gladiator's Cord of Cruelty
-					i(227636),	-- Malevolent Gladiator's Cord of Meditation
-					i(227637),	-- Malevolent Gladiator's Cuffs of Accuracy
-					i(227639),	-- Malevolent Gladiator's Cuffs of Meditation
-					i(227638),	-- Malevolent Gladiator's Cuffs of Prowess
-					i(227629),	-- Malevolent Gladiator's Felweave Handguards
-					i(227632),	-- Malevolent Gladiator's Felweave Trousers
-					i(227630),	-- Malevolent Gladiator's Mooncloth Gloves
-					i(227633),	-- Malevolent Gladiator's Mooncloth Leggings
-					i(227628),	-- Malevolent Gladiator's Silk Handguards
-					i(227631),	-- Malevolent Gladiator's Silk Trousers
-					i(227626),	-- Malevolent Gladiator's Treads of Alacrity
-					i(227625),	-- Malevolent Gladiator's Treads of Cruelty
-					i(227627),	-- Malevolent Gladiator's Treads of Meditation
-					-- Leather
-					i(227565),	-- Eternal Blossom Grips
-					i(227564),	-- Eternal Blossom Legguards
-					i(227598),	-- Red Crane Grips
-					i(227599),	-- Red Crane Leggings
-					i(227561),	-- Gloves of the Thousandfold Blades
-					i(227560),	-- Legguards of the Thousandfold Blades
-					i(227613),	-- Malevolent Gladiator's Armwraps of Accuracy
-					i(227612),	-- Malevolent Gladiator's Armwraps of Alacrity
-					i(227611),	-- Malevolent Gladiator's Belt of Cruelty
-					i(227614),	-- Malevolent Gladiator's Bindings of Prowess
-					i(227601),	-- Malevolent Gladiator's Boots of Alacrity
-					i(227600),	-- Malevolent Gladiator's Boots of Cruelty
-					i(227602),	-- Malevolent Gladiator's Footguards of Alacrity
-					i(227604),	-- Malevolent Gladiator's Ironskin Gloves
-					i(227607),	-- Malevolent Gladiator's Ironskin Legguards
-					i(227603),	-- Malevolent Gladiator's Leather Gloves
-					i(227606),	-- Malevolent Gladiator's Leather Legguards
-					i(227609),	-- Malevolent Gladiator's Waistband of Cruelty
-					i(227610),	-- Malevolent Gladiator's Waistband of Accuracy
-					i(227605),	-- Malevolent Gladiator's Wyrmhide Gloves
-					i(227608),	-- Malevolent Gladiator's Wyrmhide Legguards
-					-- Mail
-					i(227556),	-- Firebird's Gloves
-					i(227557),	-- Firebird's Kilt
-					i(227559),	-- Yaungol Slayer's Gloves
-					i(227558),	-- Yaungol Slayer's Legguards
-					i(227624),	-- Malevolent Gladiator's Armbands of Prowess
-					i(227617),	-- Malevolent Gladiator's Chain Gauntlets
-					i(227619),	-- Malevolent Gladiator's Chain Leggings
-					i(227616),	-- Malevolent Gladiator's Footguards of Alacrity
-					i(227622),	-- Malevolent Gladiator's Links of Cruelty
-					i(227618),	-- Malevolent Gladiator's Ringmail Gauntlets
-					i(227620),	-- Malevolent Gladiator's Ringmail Leggings
-					i(227615),	-- Malevolent Gladiator's Sabatons of Cruelty
-					i(227621),	-- Malevolent Gladiator's Waistguard of Meditation
-					i(227623),	-- Malevolent Gladiator's Wristguards of Alacrity
-					-- Plate
-					i(227575),	-- Gauntlets of the Lost Catacomb
-					i(227574),	-- Greaves of the Lost Catacomb
-					i(227573),	-- Gauntlets of Resounding Rings
-					i(227572),	-- Legplates of Resounding Rings
-					i(227577),	-- White Tiger Gauntlets
-					i(227576),	-- White Tiger Legplates
-					i(227657),	-- Malevolent Gladiator's Armplates of Alacrity
-					i(227656),	-- Malevolent Gladiator's Armplates of Proficiency
-					i(227655),	-- Malevolent Gladiator's Bracers of Prowess
-					i(227654),	-- Malevolent Gladiator's Clasp of Cruelty
-					i(227647),	-- Malevolent Gladiator's Dreadplate Gauntlets
-					i(227650),	-- Malevolent Gladiator's Dreadplate Legguards
-					i(227652),	-- Malevolent Gladiator's Girdle of Accuracy
-					i(227653),	-- Malevolent Gladiator's Girdle of Prowess
-					i(227644),	-- Malevolent Gladiator's Greaves of Alacrity
-					i(227646),	-- Malevolent Gladiator's Ornamented Gloves
-					i(227649),	-- Malevolent Gladiator's Ornamented Legplates
-					i(227651),	-- Malevolent Gladiator's Plate Legguards
-					i(227648),	-- Malevolent Gladiator's Plate Gauntlets
-					i(227645),	-- Malevolent Gladiator's Warboots of Alacrity
-					i(227643),	-- Malevolent Gladiator's Warboots of Cruelty
+					filter(MOUNTS, {
+						i(87771),	-- Reins of the Heavenly Onyx Cloud Serpent (MOUNT!)
+					}),
+					filter(CLOAKS, {
+						i(227641),	-- Malevolent Gladiator's Cape of Cruelty
+						i(227642),	-- Malevolent Gladiator's Cloak of Alacrity
+						i(227640),	-- Malevolent Gladiator's Drape of Prowess
+					}),
+					filter(CLOTH, {
+						i(227591),	-- Gloves of the Burning Scroll
+						i(227590),	-- Leggings of the Burning Scroll
+						i(227586),	-- Guardian Serpent Gloves
+						i(227587),	-- Guardian Serpent Leggings
+						i(227588),	-- Sha-Skin Gloves
+						i(227589),	-- Sha-Skin Leggings
+						i(227635),	-- Malevolent Gladiator's Cord of Accuracy
+						i(227634),	-- Malevolent Gladiator's Cord of Cruelty
+						i(227636),	-- Malevolent Gladiator's Cord of Meditation
+						i(227637),	-- Malevolent Gladiator's Cuffs of Accuracy
+						i(227639),	-- Malevolent Gladiator's Cuffs of Meditation
+						i(227638),	-- Malevolent Gladiator's Cuffs of Prowess
+						i(227629),	-- Malevolent Gladiator's Felweave Handguards
+						i(227632),	-- Malevolent Gladiator's Felweave Trousers
+						i(227630),	-- Malevolent Gladiator's Mooncloth Gloves
+						i(227633),	-- Malevolent Gladiator's Mooncloth Leggings
+						i(227628),	-- Malevolent Gladiator's Silk Handguards
+						i(227631),	-- Malevolent Gladiator's Silk Trousers
+						i(227626),	-- Malevolent Gladiator's Treads of Alacrity
+						i(227625),	-- Malevolent Gladiator's Treads of Cruelty
+						i(227627),	-- Malevolent Gladiator's Treads of Meditation
+					}),
+					filter(LEATHER, {
+						i(227565),	-- Eternal Blossom Grips
+						i(227564),	-- Eternal Blossom Legguards
+						i(227598),	-- Red Crane Grips
+						i(227599),	-- Red Crane Leggings
+						i(227561),	-- Gloves of the Thousandfold Blades
+						i(227560),	-- Legguards of the Thousandfold Blades
+						i(227613),	-- Malevolent Gladiator's Armwraps of Accuracy
+						i(227612),	-- Malevolent Gladiator's Armwraps of Alacrity
+						i(227611),	-- Malevolent Gladiator's Belt of Cruelty
+						i(227614),	-- Malevolent Gladiator's Bindings of Prowess
+						i(227601),	-- Malevolent Gladiator's Boots of Alacrity
+						i(227600),	-- Malevolent Gladiator's Boots of Cruelty
+						i(227602),	-- Malevolent Gladiator's Footguards of Alacrity
+						i(227604),	-- Malevolent Gladiator's Ironskin Gloves
+						i(227607),	-- Malevolent Gladiator's Ironskin Legguards
+						i(227603),	-- Malevolent Gladiator's Leather Gloves
+						i(227606),	-- Malevolent Gladiator's Leather Legguards
+						i(227609),	-- Malevolent Gladiator's Waistband of Cruelty
+						i(227610),	-- Malevolent Gladiator's Waistband of Accuracy
+						i(227605),	-- Malevolent Gladiator's Wyrmhide Gloves
+						i(227608),	-- Malevolent Gladiator's Wyrmhide Legguards
+					}),
+					filter(MAIL, {
+						i(227556),	-- Firebird's Gloves
+						i(227557),	-- Firebird's Kilt
+						i(227559),	-- Yaungol Slayer's Gloves
+						i(227558),	-- Yaungol Slayer's Legguards
+						i(227624),	-- Malevolent Gladiator's Armbands of Prowess
+						i(227617),	-- Malevolent Gladiator's Chain Gauntlets
+						i(227619),	-- Malevolent Gladiator's Chain Leggings
+						i(227616),	-- Malevolent Gladiator's Footguards of Alacrity
+						i(227622),	-- Malevolent Gladiator's Links of Cruelty
+						i(227618),	-- Malevolent Gladiator's Ringmail Gauntlets
+						i(227620),	-- Malevolent Gladiator's Ringmail Leggings
+						i(227615),	-- Malevolent Gladiator's Sabatons of Cruelty
+						i(227621),	-- Malevolent Gladiator's Waistguard of Meditation
+						i(227623),	-- Malevolent Gladiator's Wristguards of Alacrity
+					}),
+					filter(PLATE, {
+						i(227575),	-- Gauntlets of the Lost Catacomb
+						i(227574),	-- Greaves of the Lost Catacomb
+						i(227573),	-- Gauntlets of Resounding Rings
+						i(227572),	-- Legplates of Resounding Rings
+						i(227577),	-- White Tiger Gauntlets
+						i(227576),	-- White Tiger Legplates
+						i(227657),	-- Malevolent Gladiator's Armplates of Alacrity
+						i(227656),	-- Malevolent Gladiator's Armplates of Proficiency
+						i(227655),	-- Malevolent Gladiator's Bracers of Prowess
+						i(227654),	-- Malevolent Gladiator's Clasp of Cruelty
+						i(227647),	-- Malevolent Gladiator's Dreadplate Gauntlets
+						i(227650),	-- Malevolent Gladiator's Dreadplate Legguards
+						i(227652),	-- Malevolent Gladiator's Girdle of Accuracy
+						i(227653),	-- Malevolent Gladiator's Girdle of Prowess
+						i(227644),	-- Malevolent Gladiator's Greaves of Alacrity
+						i(227646),	-- Malevolent Gladiator's Ornamented Gloves
+						i(227649),	-- Malevolent Gladiator's Ornamented Legplates
+						i(227651),	-- Malevolent Gladiator's Plate Legguards
+						i(227648),	-- Malevolent Gladiator's Plate Gauntlets
+						i(227645),	-- Malevolent Gladiator's Warboots of Alacrity
+						i(227643),	-- Malevolent Gladiator's Warboots of Cruelty
+					}),
 				},
 			}),
 			n(227257, {	-- Archavon the Stone Watcher
@@ -3223,72 +3230,78 @@ root(ROOTS.Holidays, applyevent(EVENTS.WOW_ANNIVERSARY, n(WOW_ANNIVERSARY_ROOT,
 					CAVERNS_OF_TIME,
 				},
 				["g"] = {
-					a(i(43959)),	-- Reins of the Grand Black War Mammoth (A) (MOUNT!)
-					h(i(44083)),	-- Reins of the Grand Black War Mammoth (H) (MOUNT!)
-					-- Cloth
-					i(227244),	-- Heroes' Gloves of Faith
-					i(227254),	-- Heroes' Leggings of Faith
-					i(227264),	-- Heroes' Robe of Faith
-					i(227242),	-- Heroes' Frostfire Gloves
-					i(227252),	-- Heroes' Frostfire Leggings
-					i(227262),	-- Heroes' Frostfire Robe
-					i(227243),	-- Heroes' Plagueheart Gloves
-					i(227253),	-- Heroes' Plagueheart Leggings
-					i(227263),	-- Heroes' Plagueheart Robe
-					i(227231),	-- Hateful Gladiator's Felweave Handguards
-					i(227221),	-- Hateful Gladiator's Felweave Raiment
-					i(227241),	-- Hateful Gladiator's Felweave Trousers
-					i(227229),	-- Hateful Gladiator's Mooncloth Gloves
-					i(227239),	-- Hateful Gladiator's Mooncloth Leggings
-					i(227218),	-- Hateful Gladiator's Mooncloth Robe
-					i(227230),	-- Hateful Gladiator's Silk Handguards
-					i(227220),	-- Hateful Gladiator's Silk Raiment
-					i(227240),	-- Hateful Gladiator's Silk Trousers
-					-- Leather
-					i(227266),	-- Heroes' Bonescythe Breastplate
-					i(227246),	-- Heroes' Bonescythe Gauntlets
-					i(227256),	-- Heroes' Bonescythe Legplates
-					i(227245),	-- Heroes' Dreamwalker Handgrips
-					i(227255),	-- Heroes' Dreamwalker Legguards
-					i(227265),	-- Heroes' Dreamwalker Raiments
-					i(227227),	-- Hateful Gladiator's Kodohide Gloves
-					i(227237),	-- Hateful Gladiator's Kodohide Legguards
-					i(227215),	-- Hateful Gladiator's Kodohide Robes
-					i(227228),	-- Hateful Gladiator's Leather Gloves
-					i(227238),	-- Hateful Gladiator's Leather Legguards
-					i(227214),	-- Hateful Gladiator's Leather Tunic
-					-- Mail
-					i(227247),	-- Heroes' Cryptstalker Handguards
-					i(227257),	-- Heroes' Cryptstalker Legguards
-					i(227267),	-- Heroes' Cryptstalker Tunic
-					i(227248),	-- Heroes' Earthshatter Handguards
-					i(227258),	-- Heroes' Earthshatter Legguards
-					i(227268),	-- Heroes' Earthshatter Tunic
-					i(227213),	-- Hateful Gladiator's Chain Armor
-					i(227226),	-- Hateful Gladiator's Chain Gauntlets
-					i(227236),	-- Hateful Gladiator's Chain Leggings
-					i(227212),	-- Hateful Gladiator's Ringmail Armor
-					i(227225),	-- Hateful Gladiator's Ringmail Gauntlets
-					i(227235),	-- Hateful Gladiator's Ringmail Leggings
-					-- Plate
-					i(227269),	-- Heroes' Dreadnaught Battleplate
-					i(227249),	-- Heroes' Dreadnaught Gauntlets
-					i(227259),	-- Heroes' Dreadnaught Legplates
-					i(227251),	-- Heroes' Redemption Gloves
-					i(227261),	-- Heroes' Redemption Greaves
-					i(227271),	-- Heroes' Redemption Tunic
-					i(227270),	-- Heroes' Scourgeborne Battleplate
-					i(227250),	-- Heroes' Scourgeborne Gauntlets
-					i(227260),	-- Heroes' Scourgeborne Legplates
-					i(227209),	-- Hateful Gladiator's Dreadplate Chestpiece
-					i(227223),	-- Hateful Gladiator's Dreadplate Gauntlets
-					i(227233),	-- Hateful Gladiator's Dreadplate Legguards
-					i(227211),	-- Hateful Gladiator's Ornamented Chestguard
-					i(227224),	-- Hateful Gladiator's Ornamented Gloves
-					i(227234),	-- Hateful Gladiator's Ornamented Legplates
-					i(227210),	-- Hateful Gladiator's Plate Chestpiece
-					i(227222),	-- Hateful Gladiator's Plate Gauntlets
-					i(227232),	-- Hateful Gladiator's Plate Legguards
+					filter(MOUNTS, {
+						a(i(43959)),	-- Reins of the Grand Black War Mammoth (A) (MOUNT!)
+						h(i(44083)),	-- Reins of the Grand Black War Mammoth (H) (MOUNT!)
+					}),
+					filter(CLOTH, {
+						i(227244),	-- Heroes' Gloves of Faith
+						i(227254),	-- Heroes' Leggings of Faith
+						i(227264),	-- Heroes' Robe of Faith
+						i(227242),	-- Heroes' Frostfire Gloves
+						i(227252),	-- Heroes' Frostfire Leggings
+						i(227262),	-- Heroes' Frostfire Robe
+						i(227243),	-- Heroes' Plagueheart Gloves
+						i(227253),	-- Heroes' Plagueheart Leggings
+						i(227263),	-- Heroes' Plagueheart Robe
+						i(227231),	-- Hateful Gladiator's Felweave Handguards
+						i(227221),	-- Hateful Gladiator's Felweave Raiment
+						i(227241),	-- Hateful Gladiator's Felweave Trousers
+						i(227229),	-- Hateful Gladiator's Mooncloth Gloves
+						i(227239),	-- Hateful Gladiator's Mooncloth Leggings
+						i(227218),	-- Hateful Gladiator's Mooncloth Robe
+						i(227230),	-- Hateful Gladiator's Silk Handguards
+						i(227220),	-- Hateful Gladiator's Silk Raiment
+						i(227240),	-- Hateful Gladiator's Silk Trousers
+					}),
+					filter(LEATHER, {
+						i(227266),	-- Heroes' Bonescythe Breastplate
+						i(227246),	-- Heroes' Bonescythe Gauntlets
+						i(227256),	-- Heroes' Bonescythe Legplates
+						i(227245),	-- Heroes' Dreamwalker Handgrips
+						i(227255),	-- Heroes' Dreamwalker Legguards
+						i(227265),	-- Heroes' Dreamwalker Raiments
+						i(227227),	-- Hateful Gladiator's Kodohide Gloves
+						i(227237),	-- Hateful Gladiator's Kodohide Legguards
+						i(227215),	-- Hateful Gladiator's Kodohide Robes
+						i(227228),	-- Hateful Gladiator's Leather Gloves
+						i(227238),	-- Hateful Gladiator's Leather Legguards
+						i(227214),	-- Hateful Gladiator's Leather Tunic
+					}),
+					filter(MAIL, {
+						i(227247),	-- Heroes' Cryptstalker Handguards
+						i(227257),	-- Heroes' Cryptstalker Legguards
+						i(227267),	-- Heroes' Cryptstalker Tunic
+						i(227248),	-- Heroes' Earthshatter Handguards
+						i(227258),	-- Heroes' Earthshatter Legguards
+						i(227268),	-- Heroes' Earthshatter Tunic
+						i(227213),	-- Hateful Gladiator's Chain Armor
+						i(227226),	-- Hateful Gladiator's Chain Gauntlets
+						i(227236),	-- Hateful Gladiator's Chain Leggings
+						i(227212),	-- Hateful Gladiator's Ringmail Armor
+						i(227225),	-- Hateful Gladiator's Ringmail Gauntlets
+						i(227235),	-- Hateful Gladiator's Ringmail Leggings
+					}),
+					filter(PLATE, {
+						i(227269),	-- Heroes' Dreadnaught Battleplate
+						i(227249),	-- Heroes' Dreadnaught Gauntlets
+						i(227259),	-- Heroes' Dreadnaught Legplates
+						i(227251),	-- Heroes' Redemption Gloves
+						i(227261),	-- Heroes' Redemption Greaves
+						i(227271),	-- Heroes' Redemption Tunic
+						i(227270),	-- Heroes' Scourgeborne Battleplate
+						i(227250),	-- Heroes' Scourgeborne Gauntlets
+						i(227260),	-- Heroes' Scourgeborne Legplates
+						i(227209),	-- Hateful Gladiator's Dreadplate Chestpiece
+						i(227223),	-- Hateful Gladiator's Dreadplate Gauntlets
+						i(227233),	-- Hateful Gladiator's Dreadplate Legguards
+						i(227211),	-- Hateful Gladiator's Ornamented Chestguard
+						i(227224),	-- Hateful Gladiator's Ornamented Gloves
+						i(227234),	-- Hateful Gladiator's Ornamented Legplates
+						i(227210),	-- Hateful Gladiator's Plate Chestpiece
+						i(227222),	-- Hateful Gladiator's Plate Gauntlets
+						i(227232),	-- Hateful Gladiator's Plate Legguards
+					}),
 				},
 			}),
 		}),

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