diff --git a/Database/Database.lua b/Database/Database.lua index 8522507..756dfb0 100644 --- a/Database/Database.lua +++ b/Database/Database.lua @@ -3,9 +3,9 @@ local _, ADDON = ... ADDON.DB = {} ADDON.DB.Recent = { - ["minID"] = 1956, + ["minID"] = 2055, ["blacklist"] = { }, - ["whitelist"] = { 1168, 1638, 1941 }, -- Fiery Hearthsteed, Explorer's Stonehide Packbeast, Heartseeker Mana Ray + ["whitelist"] = { 1733, 1822, 994, 1259, 1825 }, } ADDON.DB.Source = { @@ -641,6 +641,10 @@ ADDON.DB.Source = { [408655] = true, -- Morsel Sniffer - Niffel Renown 18 [423873] = true, -- Suntouched Dreamstag - Emerald Dream Renown vendor [423891] = true, -- Lunar Dreamstag - Emerald Dream Renown vendor + [437162] = true, -- Polly Roger - Keg Leg's Crew + [446902] = true, -- Polly Roger (classic) - Keg Leg's Crew + [254812] = true, -- Royal Seafeather - Keg Leg's Crew + [300154] = true, -- Silver Tidestallion - Keg Leg's Crew ------------------------------ -- Alliance ------------------ @@ -989,16 +993,21 @@ ADDON.DB.Source = { [376912] = { 15833, 15834 }, -- Otterworldly Ottuk Carrier - Thanks for the Carry! [387231] = 16649, -- Hailstorm Armoredon - Dragonflight Keystone Master: Season One [406637] = 17844, -- Inferno Armoredon - Dragonflight Keystone Master: Season Two + [408648] = 17785, -- Calescent Shalewing - Que Zara(lek), Zara(lek) [408649] = 18251, -- Shadowflame Shalewing - Glory of the Aberrus Raider + [408654] = 19079, -- Sandy Shalewing - Master of Troubled Timeways [413409] = 15797, -- Highland Drake - An Azure Ally [417548] = 15794, -- Renewed Proto-Drake - A New Friend [417552] = 15795, -- Windborne Velocidrake - Together in the Skies [417554] = 15796, -- Cliffside Wylderdrake - Cliffside Companion [417556] = 17779, -- Winding Slitherdrake - A Serpentine Discovery [418078] = 18646, -- Pattie - Whodunnit? - [408654] = 19079, -- Sandy Shalewing - Master of Troubled Timeways [422486] = 19011, -- Verdant Armoredon - Dragonflight Keystone Master: Season Three [424474] = 19349, -- Shadow Dusk Dreamsaber - Glory of the Dream Raider + [424607] = 19458, -- Taivan - A World Awoken + [439138] = 19574, -- Voyaging Wilderling - Awakening the Dragonflight Raids + [434462] = 19782, -- Infinite Armoredon - Dragonflight Keystone Master: Season Four + [440444] = 20501, -- Zovaal's Soul Eater - Back from the Beyond ------------------------------ @@ -1209,7 +1218,10 @@ ADDON.DB.Source = { [370346] = true, -- Eternal Gladiator's Soul Eater - Gladiator: Shadowlands Season 4 [377071] = true, -- Crimson Gladiator's Drake - Gladiator: Dragonflight Season 1 [408977] = true, -- Obsidian Gladiator's Slitherdrake - Gladiator: Dragonflight Season 2 + [424539] = true, -- Draconic Gladiator's Drake - Gladiator: Dragonflight Season 4 [425416] = true, -- Verdant Gladiator's Slitherdrake - Gladiator: Dragonflight Season 3 + [434470] = true, -- Vicious Dreamtalon - Dragonflight: Season 4 + [434477] = true, -- Vicious Dreamtalon - Dragonflight: Season 4 -- Prestige Reward [222202] = true, -- Prestigious Bronze Courser @@ -1509,11 +1521,14 @@ ADDON.DB.Source = { ["Trading Post"] = { sourceDescription = C_Garrison and "\124cFFFFD200" .. select(2, C_Garrison.GetBuildingInfo(111)) .. "\124r" or nil, -- "Trading Post" + + [366962] = true, -- Ash'adar }, ["Shop"] = { sourceType = { 10 }, + [366962] = true, -- Ash'adar [400976] = true, -- Gleaming Moonbeast [431360] = true, -- Twilight Sky Prowler }, @@ -1592,6 +1607,8 @@ ADDON.DB.FeatsOfStrength = { [1599] = 15612, -- Eternal Gladiator's Soul Eater [1660] = 16730, -- Crimson Gladiator's Drake [1739] = 17764, -- Obsidian Gladiator's Slitherdrake - Gladiator: Dragonflight Season 2 + [1822] = 19490, -- Draconic Gladiator's Drake - Gladiator: Dragonflight Season 4 + [1831] = 19091, -- Verdant Gladiator's Slitherdrake - Gladiator: Dragonflight Season 3 } ADDON.DB.Expansion = { diff --git a/Database/colors.db.lua b/Database/colors.db.lua index f16fa01..9f95fd8 100644 --- a/Database/colors.db.lua +++ b/Database/colors.db.lua @@ -273,7 +273,7 @@ ADDON.DB.Colors = { [366] = { {25,14,12}, {34,31,42}, {84,81,81}, {163,186,237}, {74,32,22}, }, -- Crimson Deathcharger [367] = { {57,52,62}, {154,107,63}, {92,60,41}, {41,29,26}, {133,135,125}, }, -- Exarch's Elekk [368] = { {98,97,96}, {204,167,115}, {33,31,36}, {58,40,92}, {104,70,33}, }, -- Great Exarch's Elekk -[371] = { {206,107,35}, {76,34,39}, {33,20,25}, {238,196,69}, {132,93,62}, }, -- Blazing Hippogryph +[371] = { {155,108,62}, {78,36,39}, {35,21,26}, {237,193,67}, {220,90,27}, }, -- Blazing Hippogryph [372] = { {84,59,51}, {6,1,0}, {143,132,124}, {26,13,11}, {49,30,26}, }, -- Wooly White Rhino [373] = { {74,70,98}, {46,38,35}, {25,20,33}, {72,68,45}, {152,147,135}, }, -- Vashj'ir Seahorse [375] = { {73,133,152}, {43,52,81}, {37,65,54}, {46,28,38}, {210,181,225}, }, -- Frosty Flying Carpet @@ -327,7 +327,7 @@ ADDON.DB.Colors = { [436] = { {20,15,22}, {163,155,156}, {32,31,39}, {94,94,99}, {55,59,65}, }, -- Swift Mountain Horse [439] = { {81,54,24}, {17,14,14}, {74,80,84}, {192,147,61}, {167,168,160}, }, -- Tyrael's Charger [440] = { {6,6,7}, {29,47,116}, {109,109,111}, {105,130,183}, {194,198,202}, }, -- Spectral Gryphon -[441] = { {5,5,7}, {152,157,167}, {59,80,153}, {207,208,210}, {93,97,100}, }, -- Spectral Wind Rider +[441] = { {6,6,8}, {26,47,110}, {116,139,218}, {110,115,118}, {190,192,194}, }, -- Spectral Wind Rider [442] = { {32,27,26}, {69,50,36}, {123,72,49}, {89,89,74}, {151,142,130}, }, -- Blazing Drake [443] = { {43,33,54}, {127,79,92}, {55,34,43}, {74,67,112}, {13,12,13}, }, -- Twilight Harbinger [444] = { {88,52,57}, {161,124,99}, {52,30,33}, {12,11,12}, {124,54,59}, }, -- Life-Binder's Handmaiden @@ -546,7 +546,7 @@ ADDON.DB.Colors = { [844] = { {21,16,16}, {135,137,132}, {68,39,96}, {57,61,62}, {88,68,39}, }, -- Vicious War Elekk [845] = { {16,13,14}, {104,145,37}, {40,25,52}, {69,55,55}, {128,123,110}, }, -- Mechanized Lumber Extractor [846] = { {34,24,30}, {129,98,58}, {78,36,107}, {229,221,208}, {122,122,125}, }, -- Leyfeather Hippogryph -[847] = { {37,31,35}, {9,9,11}, {96,107,114}, {55,58,63}, {86,55,44}, }, -- Arcadian War Turtle +[847] = { {81,94,104}, {23,19,23}, {59,39,34}, {45,47,53}, {116,78,62}, }, -- Arcadian War Turtle [848] = { {121,91,76}, {6,6,8}, {45,31,37}, {104,197,216}, {69,78,87}, }, -- Vindictive Gladiator's Storm Dragon [849] = { {143,174,191}, {56,76,90}, {52,38,45}, {4,6,8}, {151,117,116}, }, -- Fearless Gladiator's Storm Dragon [850] = { {176,146,101}, {60,82,91}, {89,68,44}, {21,16,26}, {79,142,197}, }, -- Cruel Gladiator's Storm Dragon @@ -639,6 +639,7 @@ ADDON.DB.Colors = { [985] = { {178,141,95}, {45,35,38}, {101,92,98}, {183,183,182}, {67,180,176}, }, -- Avenging Felcrusher [986] = { {82,73,59}, {61,150,31}, {247,244,241}, {36,32,31}, {101,59,99}, }, -- Bleakhoof Ruinstrider [993] = { {124,118,110}, {15,78,49}, {37,145,53}, {48,37,32}, {131,88,29}, }, -- Squawks +[994] = { {44,39,30}, {113,112,106}, {17,62,85}, {99,166,175}, {117,91,34}, }, -- Royal Seafeather [995] = { {81,26,14}, {46,40,32}, {142,23,18}, {124,123,116}, {150,109,32}, }, -- Sharkbait [996] = { {12,9,12}, {177,137,87}, {101,96,94}, {189,189,188}, {55,47,46}, }, -- Seabraid Stallion [997] = { {102,56,13}, {67,81,48}, {165,120,35}, {50,107,127}, {37,29,32}, }, -- Gilded Ravasaur @@ -762,6 +763,7 @@ ADDON.DB.Colors = { [1256] = { {31,24,15}, {84,77,52}, {129,136,129}, {140,115,87}, {58,47,30}, }, -- Snapdragon Kelpstalker [1257] = { {20,15,18}, {140,136,138}, {93,87,94}, {198,34,34}, {44,43,51}, }, -- Silent Glider [1258] = { {108,121,166}, {22,151,128}, {74,69,99}, {243,245,252}, {88,83,133}, }, -- Fabious +[1259] = { {56,75,82}, {163,207,197}, {128,140,147}, {80,132,124}, {72,146,182}, }, -- Silver Tidestallion [1260] = { {72,39,29}, {55,100,103}, {181,137,85}, {92,151,144}, {134,58,45}, }, -- Crimson Tidestallion [1262] = { {52,67,70}, {25,31,34}, {79,139,134}, {67,101,102}, {248,250,249}, }, -- Inkscale Deepseeker [1265] = { {19,18,20}, {27,20,127}, {75,103,127}, {22,12,81}, {9,5,48}, }, -- Uncorrupted Voidwing @@ -1000,7 +1002,7 @@ ADDON.DB.Colors = { [1588] = { {220,179,79}, {85,28,31}, {116,101,95}, {128,77,35}, {180,175,160}, }, -- Winding Slitherdrake [1589] = { {34,28,26}, {54,34,66}, {97,14,41}, {102,70,140}, {109,96,101}, }, -- Renewed Proto-Drake [1590] = { {5,6,5}, {96,66,28}, {65,57,66}, {121,199,31}, {163,163,165}, }, -- Windborne Velocidrake -[1591] = { {214,139,68}, {50,53,43}, {21,25,20}, {60,13,39}, {120,111,90}, }, -- Cliffside Wylderdrake +[1591] = { {117,43,15}, {189,143,69}, {25,29,27}, {60,12,39}, {102,73,41}, }, -- Cliffside Wylderdrake [1594] = { {27,101,168}, {72,80,78}, {180,96,52}, {9,7,7}, {173,192,198}, }, -- Jade, Bright Foreseer [1595] = { {90,76,57}, {211,181,45}, {46,42,36}, {44,53,80}, {116,111,53}, }, -- Cerulean Marsh Hopper [1596] = { {19,15,17}, {226,104,28}, {128,119,119}, {127,60,40}, {58,56,62}, }, -- Amalgam of Rage @@ -1057,6 +1059,7 @@ ADDON.DB.Colors = { [1729] = { {147,186,190}, {193,135,200}, {140,59,159}, {79,59,48}, {70,104,124}, }, -- Big Slick in the City [1730] = { {24,18,21}, {108,55,41}, {213,76,7}, {223,223,222}, {92,79,76}, }, -- Igneous Shalewing [1732] = { {115,91,70}, {76,72,165}, {36,30,39}, {100,134,167}, {223,229,229}, }, -- Cobalt Shalewing +[1733] = { {91,97,111}, {107,83,58}, {22,17,20}, {186,154,36}, {212,209,202}, }, -- Calescent Shalewing [1734] = { {103,77,61}, {214,214,211}, {183,46,11}, {65,58,76}, {14,9,11}, }, -- Shadowflame Shalewing [1735] = { {26,19,20}, {226,222,210}, {198,99,18}, {132,93,50}, {97,86,86}, }, -- Cataloged Shalewing [1736] = { {154,129,108}, {77,76,98}, {89,58,47}, {25,18,17}, {233,234,234}, }, -- Boulder Hauler @@ -1099,6 +1102,7 @@ ADDON.DB.Colors = { [1818] = { {220,136,33}, {17,11,12}, {178,62,33}, {105,54,42}, {206,175,100}, }, -- Anu'relos, Flame's Guidance [1819] = { {119,118,122}, {64,52,63}, {174,114,58}, {230,230,229}, {19,14,18}, }, -- Vicious Moonbeast [1820] = { {171,90,52}, {72,49,46}, {230,229,225}, {21,14,13}, {127,121,117}, }, -- Vicious Moonbeast +[1822] = { {48,36,58}, {168,170,184}, {95,74,161}, {92,108,144}, {79,30,174}, }, -- Draconic Gladiator's Drake [1830] = { {76,52,57}, {254,254,254}, {120,119,120}, {132,119,143}, {57,41,66}, }, -- Flourishing Whimsydrake [1831] = { {156,177,132}, {49,79,54}, {87,132,143}, {49,38,34}, {46,158,95}, }, -- Verdant Gladiator's Slitherdrake [1833] = { {110,68,54}, {79,111,71}, {36,32,30}, {208,185,166}, {103,101,119}, }, -- Springtide Dreamtalon @@ -1124,4 +1128,10 @@ ADDON.DB.Colors = { [2035] = { {7,7,8}, {104,26,104}, {68,137,150}, {27,51,69}, {148,107,55}, }, -- Majestic Azure Peafowl [2038] = { {83,76,55}, {33,29,24}, {137,84,53}, {154,143,121}, {68,32,23}, }, -- Clayscale Hornstrider [2039] = { {234,235,234}, {25,24,27}, {57,62,70}, {115,122,122}, {222,58,20}, }, -- Savage Blue Battle Turtle +[2055] = { {3,4,5}, {76,127,135}, {142,194,200}, {54,79,84}, {37,42,46}, }, -- Infinite Armoredon +[2056] = { {151,156,147}, {141,90,51}, {53,43,52}, {211,182,86}, {93,89,90}, }, -- Vicious Dreamtalon +[2057] = { {27,26,31}, {161,157,133}, {64,51,49}, {102,91,79}, {123,53,30}, }, -- Vicious Dreamtalon +[2090] = { {21,63,85}, {114,64,44}, {189,151,77}, {41,29,26}, {135,151,150}, }, -- Polly Roger +[2091] = { {24,26,57}, {83,233,179}, {79,125,138}, {59,77,168}, {46,34,30}, }, -- Voyaging Wilderling +[2114] = { {90,98,97}, {249,249,249}, {10,12,12}, {36,40,39}, {192,193,193}, }, -- Zovaal's Soul Eater } \ No newline at end of file diff --git a/Database/customization.db.lua b/Database/customization.db.lua index cfb0e91..2c8ed8c 100644 --- a/Database/customization.db.lua +++ b/Database/customization.db.lua @@ -6,7 +6,7 @@ ADDON.DB.Customization = { ["quest"]={55451,55452,55454,55455,55456,55457,55517,}, }, -- X-995 Mechanocat [1563] = { - ["quest"]={69290,69291,69294,69295,69296,69297,69298,69299,69300,69301,69302,69303,69304,69305,69306,69307,69308,69309,69310,69311,69312,69313,69314,69315,69316,69317,69318,69319,69321,69322,69323,69324,69325,69326,69327,69328,69329,69330,69331,69332,69333,69334,69335,69336,69337,69338,69339,69340,69341,69342,69343,69344,69345,69346,69347,69348,69349,69350,69351,69352,69353,69354,69355,69356,69357,72371,75967,77257,77875,78371,}, + ["quest"]={69290,69291,69294,69295,69296,69297,69298,69299,69300,69301,69302,69303,69304,69305,69306,69307,69308,69309,69310,69311,69312,69313,69314,69315,69316,69317,69318,69319,69321,69322,69323,69324,69325,69326,69327,69328,69329,69330,69331,69332,69333,69334,69335,69336,69337,69338,69339,69340,69341,69342,69343,69344,69345,69346,69347,69348,69349,69350,69351,69352,69353,69354,69355,69356,69357,72371,75967,77257,77875,78371,80014,}, }, -- Highland Drake [1588] = { ["quest"]={73787,73788,73791,73792,73794,73795,73796,73797,73798,73799,73800,73801,73802,73803,73804,73805,73806,73807,73808,73809,73810,73811,73812,73813,73815,73816,73817,73818,73820,73821,73822,73824,73825,73826,73827,73829,73830,73831,73832,73833,73834,73835,73836,73837,73838,73839,73840,73841,73842,73843,73844,73845,73846,73849,73850,73851,73852,73853,73854,73855,73856,73857,75743,75941,77259,78216,79112,}, diff --git a/Database/families.db.lua b/Database/families.db.lua index 653ad7e..0a40329 100644 --- a/Database/families.db.lua +++ b/Database/families.db.lua @@ -128,8 +128,11 @@ ADDON.DB.Family = { }, ["Parrots"] = { [993] = true, -- Squawks +[994] = true, -- Royal Seafeather [995] = true, -- Sharkbait [1575] = true, -- Quawks +[2090] = true, -- Polly Roger +[2147] = true, -- Polly Roger }, ["Peafowl"] = { [2035] = true, -- Majestic Azure Peafowl @@ -307,6 +310,7 @@ ADDON.DB.Family = { [1477] = true, -- Undying Darkhound [1597] = true, -- Grimhowl [1781] = true, -- Sulfur Hound +[1825] = true, -- Taivan }, ["Hyenas"] = { [926] = true, -- Alabaster Hyena @@ -342,6 +346,8 @@ ADDON.DB.Family = { [1834] = true, -- Ochre Dreamtalon [1835] = true, -- Snowfluff Dreamtalon [1838] = true, -- Talont +[2056] = true, -- Vicious Dreamtalon +[2057] = true, -- Vicious Dreamtalon }, ["Dreamsaber"] = { [1814] = true, -- Shadow Dusk Dreamsaber @@ -605,6 +611,7 @@ ADDON.DB.Family = { [1795] = true, -- Auspicious Arborwyrm [1798] = true, -- Azure Worldchiller [1806] = true, -- Auspicious Arborwyrm +[1822] = true, -- Draconic Gladiator's Drake [1831] = true, -- Verdant Gladiator's Slitherdrake [1832] = true, -- Nightmarish Emerald Drake }, @@ -680,6 +687,7 @@ ADDON.DB.Family = { [1572] = true, -- Cosmic Gladiator's Soul Eater [1599] = true, -- Eternal Gladiator's Soul Eater [1783] = true, -- Scourgebound Vanquisher +[2114] = true, -- Zovaal's Soul Eater }, ["Wind Drakes"] = { [392] = true, -- Drake of the East Wind @@ -732,6 +740,7 @@ ADDON.DB.Family = { ["Sporebat"] = { [1730] = true, -- Igneous Shalewing [1732] = true, -- Cobalt Shalewing +[1733] = true, -- Calescent Shalewing [1734] = true, -- Shadowflame Shalewing [1735] = true, -- Cataloged Shalewing [1736] = true, -- Boulder Hauler @@ -839,6 +848,7 @@ ADDON.DB.Family = { [420] = true, -- Subdued Seahorse [1208] = true, -- Saltwater Seahorse [1258] = true, -- Fabious +[1259] = true, -- Silver Tidestallion [1260] = true, -- Crimson Tidestallion [1262] = true, -- Inkscale Deepseeker }, @@ -1150,6 +1160,12 @@ ADDON.DB.Family = { [1510] = true, -- Dusklight Razorwing }, ["Reptiles"] = { +["Armoredon"] = { +[1681] = true, -- Hailstorm Armoredon +[1725] = true, -- Inferno Armoredon +[1801] = true, -- Verdant Armoredon +[2055] = true, -- Infinite Armoredon +}, ["Basilisks"] = { [878] = true, -- Brawler's Burly Basilisk [1026] = true, -- Vicious War Basilisk @@ -1197,10 +1213,7 @@ ADDON.DB.Family = { [1622] = true, -- Stormhide Salamanther [1638] = true, -- Explorer's Stonehide Packbeast [1639] = true, -- Lizi, Thunderspine Tramper -[1681] = true, -- Hailstorm Armoredon -[1725] = true, -- Inferno Armoredon [1761] = true, -- Reawakened Phase-Hunter -[1801] = true, -- Verdant Armoredon [1940] = true, -- Salatrancer }, ["Sea Serpents"] = { @@ -1572,6 +1585,7 @@ ADDON.DB.Family = { [1485] = true, -- Autumnal Wilderling [1486] = true, -- Winter Wilderling [1487] = true, -- Summer Wilderling +[2091] = true, -- Voyaging Wilderling }, ["Wolves"] = { [12] = true, -- Black Wolf diff --git a/Locals.lua b/Locals.lua index 255af31..3597840 100644 --- a/Locals.lua +++ b/Locals.lua @@ -62,6 +62,7 @@ L["Amphibian"] = "Amphibian" L["Animite"] = "Animite" L["Aqir Flyers"] = "Aqir Flyers" L["Arachnids"] = "Arachnids" +L["Armoredon"] = "Armoredon" L["Assault Wagons"] = "Assault Wagons" L["Basilisks"] = "Basilisks" L["Bats"] = "Bats"