110007 achievements

.vscode/settings.json

@@ -553,13 +553,13 @@
         //     "exclude":"**/{.git,.vscode,Changelogs,Descriptions}/**",
         //     "deleteTargetOnDeploy": true
         // },
-        // {
-        //     "source":"E:\\World of Warcraft Addon Development\\Krowi_AchievementFilter",
-        //     "target":"F:\\World of Warcraft\\_xptr_\\Interface\\AddOns\\Krowi_AchievementFilter",
-        //     "include":"**/*.{lua,toc,blp,tga,xml,md}",
-        //     "exclude":"**/{.git,.github,.vscode,Changelogs,Descriptions}/**",
-        //     "deleteTargetOnDeploy": true
-        // },
+        {
+            "source":"E:\\World of Warcraft Addon Development\\Krowi_AchievementFilter",
+            "target":"F:\\World of Warcraft\\_ptr_\\Interface\\AddOns\\Krowi_AchievementFilter",
+            "include":"**/*.{lua,toc,blp,tga,xml,md}",
+            "exclude":"**/{.git,.github,.vscode,Changelogs,Descriptions}/**",
+            "deleteTargetOnDeploy": true
+        },
         // {
         //     "source":"E:\\World of Warcraft Addon Development\\Krowi_AchievementFilter",
         //     "target":"F:\\World of Warcraft\\_xptr_\\Interface\\AddOns\\Krowi_AchievementFilter",

Api/CategoryDataApi.lua

@@ -75,6 +75,10 @@ end
 
 local deferredCategories = {};
 function ParseCategory(category, parent)
+    if category.IsLoaded then
+        return;
+    end
+
     local index = 1;
     local categoryId, categoryName, categoryCanMerge;
     if addon.Util.IsNumber(category[1]) then
@@ -113,9 +117,21 @@ function ParseCategory(category, parent)
         deferredCategories[categoryId] = nil;
         ParseCategory(category);
     end
+
+    if not parent then
+        category.IsLoaded = true;
+    end
 end
 
 function KrowiAF.CreateCategories()
+    -- Fixed order is desired here to make sure achievements are redirected correctly
+    ParseCategory(KrowiAF.CategoryData.Achievements);
+    ParseCategory(KrowiAF.CategoryData.Expansions);
+    ParseCategory(KrowiAF.CategoryData.Events);
+    ParseCategory(KrowiAF.CategoryData.PvP);
+    ParseCategory(KrowiAF.CategoryData.Specials);
+
+    -- Load the rest
     for _, root in next, KrowiAF.CategoryData do
         ParseCategory(root);
     end

DataAddons/Retail/10_Dragonflight/AchievementData.lua

@@ -353,10 +353,10 @@ KrowiAF.AchievementData["10_00_00"] = {
     {16517}, -- Toxicity Strike Team
     {16518}, -- Explore Thaldraszus
     {16519}, -- Dragon Isles Safari
-    {16522}, -- A True Explorer
-    {16528}, -- Joining the Khansguard
-    {16529}, -- Joining the Community
-    {16530}, -- Ally of the Flights
+    -- {16522}, -- A True Explorer [Removed in 11.0.7, replaced by 41174]
+    -- {16528}, -- Joining the Khansguard [Removed in 11.0.7, replaced by 41180]
+    -- {16529}, -- Joining the Community [Removed in 11.0.7, replaced by 41181]
+    -- {16530}, -- Ally of the Flights [Removed in 11.0.7, replaced by 41182]
     {16531}, -- A Whole Heap of Lunkers
     {16532}, -- True Friends with Sabellian
     {16533}, -- Lots of Lunkers
@@ -372,7 +372,7 @@ KrowiAF.AchievementData["10_00_00"] = {
     {16546}, -- What's Down There?
     {16547}, -- Pulled!
     {16548}, -- It Takes a Tuskarr Buddy
-    {16549}, -- Popular Around the Isles
+    -- {16549}, -- Popular Around the Isles [Removed in 11.0.7, replaced by 41179]
     {16550}, -- Giving Back to Nature
     {16551}, -- Giving More Back to Nature
     {16552}, -- Giving Even More Back to Nature
@@ -662,10 +662,10 @@ KrowiAF.AchievementData["10_00_02"] = {
         },
     },
     {16808}, -- Friend of the Dragon Isles
-    {16884}, -- Friends in the Field
-    {16944}, -- Friend of the Family
-    {16994}, -- Friends in the Accord
-    {17064}, -- Friends in the Plains
+    -- {16884}, -- Friends in the Field [Removed in 11.0.7, replaced by 41172]
+    -- {16944}, -- Friend of the Family [Removed in 11.0.7, replaced by 41173]
+    -- {16994}, -- Friends in the Accord [Removed in 11.0.7, replaced by 41171]
+    -- {17064}, -- Friends in the Plains [Removed in 11.0.7, replaced by 41170]
     { -- Ahead of the Curve: Raszageth the Storm-Eater
         17107,
         {
@@ -900,8 +900,8 @@ KrowiAF.AchievementData["10_01_00"] = {
         },
     },
     {17741}, -- Slow and Steady Wins the Race
-    {17756}, -- Friends in Loamm Places
-    {17763}, -- There's No Place Like Loamm
+    -- {17756}, -- Friends in Loamm Places [Removed in 11.0.7, replaced by 41175]
+    -- {17763}, -- There's No Place Like Loamm [Removed in 11.0.7, replaced by 41183]
     { -- Obsidian Gladiator: Dragonflight Season 2
         17764,
         {
@@ -1870,8 +1870,8 @@ KrowiAF.AchievementData["10_02_00"] = {
     {19194}, -- The Emerald Bounty
     {19196}, -- Sowing the Seeds
     {19198}, -- The Seeds I Sow
-    {19230}, -- Friends in the Dream
-    {19235}, -- Warden of the Dream
+    -- {19230}, -- Friends in the Dream [Removed in 11.0.7, replaced by 41176]
+    -- {19235}, -- Warden of the Dream [Removed in 11.0.7, replaced by 41177]
     { -- Verdant Vogue
         19276,
         {
@@ -1904,7 +1904,7 @@ KrowiAF.AchievementData["10_02_00"] = {
     },
     {19306}, -- Emerald Dream Glyph Hunter
     {19307}, -- Dragon Isles Pathfinder
-    {19308}, -- Freshscales Fifteen
+    -- {19308}, -- Freshscales Fifteen [Removed in 11.0.7, replaced by 41184]
     {19309}, -- Explore the Emerald Dream
     {19310}, -- Fruit of the Bloom
     {19312}, -- Super Duper Bloom
@@ -2365,8 +2365,18 @@ KrowiAF.AchievementData["10_02_06"] = {
     },
     {20481}, -- Dragonflight Season 4 Master
     {20501}, -- Back from the Beyond
-    {20508}, -- Plunder Wonder
-    {20509}, -- Plunderkind
+    { -- Plunder Wonder
+        20508,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- Plunderkind
+        20509,
+        {
+            {"Event", 1601},
+        },
+    },
 };
 
 KrowiAF.AchievementData["10_02_07"] = {

DataAddons/Retail/11_TheWarWithin/AchievementData.lua

@@ -508,7 +508,7 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40542}, -- Smelling History
     {40585}, -- Super Size Snuffling
     {40590}, -- Priory of the Sacred Flame
-    {40591}, -- Khaz Algar Diplomat
+    -- {40591}, -- Khaz Algar Diplomat [Removed in 11.0.7, replaced by 41169]
     {40592}, -- Heroic: Priory of the Sacred Flame
     {40596}, -- Mythic: Priory of the Sacred Flame
     {40599}, -- The Dawnbreaker
@@ -608,16 +608,16 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40832}, -- Leave it to Weaver
     {40833}, -- The General's Salute
     {40835}, -- Vizier than Ever
-    {40836}, -- Assembly of the Deeps
+    -- {40836}, -- Assembly of the Deeps [Removed in 11.0.7, replaced by 41165]
     {40837}, -- Adventurer of The Ringing Deeps
-    {40838}, -- The Severed Threads
+    -- {40838}, -- The Severed Threads [Removed in 11.0.7, replaced by 41149]
     {40840}, -- Adventurer of Azj-Kahet
     {40843}, -- Mine Poppin'
     {40844}, -- Sojourner of Hallowfall
-    {40845}, -- Hallowfall Arathi
+    -- {40845}, -- Hallowfall Arathi [Removed in 11.0.7, replaced by 41167]
     {40848}, -- Treasures of Hallowfall
     {40851}, -- Adventurer of Hallowfall
-    {40856}, -- Council of Dornogal
+    -- {40856}, -- Council of Dornogal [Removed in 11.0.7, replaced by 41161]
     {40859}, -- We're Here All Night
     {40860}, -- A Star of Dorn
 };
@@ -638,10 +638,10 @@ KrowiAF.AchievementData["11_00_02"] = {
     {40876}, -- Vox Arachni
     {40882}, -- Copious Coffers
     {40885}, -- The Key to Madness
-    {40904}, -- Cornerstone of Dornogal
-    {40905}, -- "From Many, One"
-    {40906}, -- The Flame Burns Within
-    {40907}, -- We Rise Anew
+    -- {40904}, -- Cornerstone of Dornogal [Removed in 11.0.7, replaced by 41162]
+    -- {40905}, -- "From Many, One" [Removed in 11.0.7, replaced by 41166]
+    -- {40906}, -- The Flame Burns Within [Removed in 11.0.7, replaced by 41168]
+    -- {40907}, -- We Rise Anew [Removed in 11.0.7, replaced by 41164]
     {40939}, -- Harbinger of the Gilded
 };
 
@@ -788,4 +788,117 @@ KrowiAF.AchievementData["11_00_05"] = {
             {"Event", 1592},
         },
     },
+};
+
+KrowiAF.AchievementData["11_00_07"] = {
+    {KrowiAF.SetAchievementPatch, 11, 0, 7},
+    {40762}, -- Khaz Algar Lore Hunter
+    {40791}, -- Fate of the Kirin Tor
+    {40953}, -- A Farewell to Arms
+    {40955}, -- War Stories
+    {40956}, -- I'm On Island Time
+    {40957}, -- Maximum Effort
+    {40958}, -- Full Heart, Can't Lose
+    {40959}, -- Black Empire State of Mind
+    {40960}, -- Uldir
+    {40961}, -- Battle of Dazar'alor
+    {40962}, -- The Eternal Palace
+    {40963}, -- Ny'alotha, the Waking City
+    {41042}, -- Siren-ity Now!
+    {41043}, -- Excavation Projects
+    {41045}, -- A Song of Secrets
+    {41046}, -- Clean Up on Isle Siren
+    {41050}, -- A Choir of Citrines
+    { -- Master of the Turbulent Timeways II
+        41056,
+        {
+            {"Event", 1425},
+        },
+    },
+    { -- Elders of Khaz Algar
+        41130,
+        {
+            {"Event", 327},
+        },
+    },
+    {41131}, -- Treasures of the Storm
+    {41133}, -- Isle Remember You
+    {41149}, -- The Severed Threads
+    { -- Lub and Plunder
+        41152,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- Swabbie Swag
+        41153,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- Decked Out
+        41154,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- Buckled Up
+        41156,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- Plunder Siege
+        41157,
+        {
+            {"Event", 1601},
+        },
+    },
+    { -- It's a Plunderful Life
+        41160,
+        {
+            {"Event", 1601},
+        },
+    },
+    {41161}, -- Council of Dornogal
+    {41162}, -- Cornerstone of Dornogal
+    { -- Lord of the Bling
+        41163,
+        {
+            {"Event", 1601},
+        },
+    },
+    {41164}, -- We Rise Anew
+    {41165}, -- Assembly of the Deeps
+    {41166}, -- From Many, One
+    {41167}, -- Hallowfall Arathi
+    {41168}, -- The Flame Burns Within
+    {41169}, -- Khaz Algar Diplomat
+    {41170}, -- Friends in the Plains
+    {41171}, -- Friends in the Accord
+    {41172}, -- Friends in the Field
+    {41173}, -- Friend of the Family
+    {41174}, -- A True Explorer
+    {41175}, -- Friends in Loamm Places
+    {41176}, -- Friends in the Dream
+    {41177}, -- Warden of the Dream
+    {41179}, -- Popular Around the Isles
+    {41180}, -- Joining the Khansguard
+    {41181}, -- Joining the Community
+    {41182}, -- Ally of the Flights
+    {41183}, -- There's No Place Like Loamm
+    {41184}, -- Freshscales Fifteen
+    {41185}, -- Siren's Squall
+    {41186}, -- Slate of the Union
+    {41187}, -- Rage Aside the Machine
+    {41188}, -- Crystal Chronicled
+    {41189}, -- Azj the World Turns
+    {41201}, -- You Xal Not Pass
+    {41202}, -- Hot Tropic
+    {41203}, -- Bwon Voyage
+    {41204}, -- Dune Squad
+    {41205}, -- Sound Off
+    {41206}, -- Songs of Storms
+    {41207}, -- When the Drust Settles
+    {41209}, -- Dressed to Kill: Battle for Azeroth
 };

DataAddons/Retail/11_TheWarWithin/EventData.lua

@@ -19,6 +19,14 @@ KrowiAF.EventData.TheWarWithin = {
     --     addon.L["Other"],
     --     2
     -- },
+	{ -- Plunderstorm
+		1601, type.Calendar,
+		1680,
+		4203076,
+		addon.L["Plunderstorm"],
+		addon.L["Other"],
+		2
+	},
 	{ -- Theater Troupe: The Wanderer: Next
 		7943, type.World,
 		1676,

DataAddons/Retail/CategoryData_Events.lua

@@ -29,6 +29,7 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
                 1396, -- Elders of Northrend
                 6006, -- Elders of Cataclysm
                 17321, -- Elders of the Dragon Isles
+                41130, -- Elders of Khaz Algar
                 910, -- Elders of the Dungeons
                 913, -- To Honor One's Elders
             },
@@ -837,6 +838,21 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
             40223, -- Timerunner
         },
     },
+    { -- Plunderstorm
+        1680,
+        addon.L["Plunderstorm"],
+        {
+            20508, -- Plunder Wonder
+            41152, -- Lub and Plunder
+            41153, -- Swabbie Swag
+            41154, -- Decked Out
+            41156, -- Buckled Up
+            41157, -- Plunder Siege
+            41163, -- Lord of the Blingtron
+            41160, -- It's a Plunderful Life
+            20509, -- Plunderkind
+        }
+    },
     { -- Timewalking
         951,
         addon.GetCategoryInfoTitle(15454),
@@ -854,6 +870,7 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
             addon.L["Turbulent Timeways"],
             {
                 19079, -- Master of the Turbulent Timeways
+                41056, -- Master of the Turbulent Timeways II
             },
         },
         {
@@ -978,6 +995,7 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
                     14159, -- Combating the Corruption
                     14158, -- It's Not A Tumor!
                     14156, -- The Rajani
+                    40959, -- Black Empire State of Mind
                 },
             },
             { -- Uldum
@@ -990,6 +1008,7 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
                     14159, -- Combating the Corruption
                     14158, -- It's Not A Tumor!
                     14155, -- Uldum Accord
+                    40959, -- Black Empire State of Mind
                 },
             },
         },
@@ -1258,8 +1277,6 @@ KrowiAF.CategoryData.Events = { -- TAB - Events
             1637, -- Spirit of Competition
             2079, -- Tabard of the Protector
             2116, -- Tabard of the Argent Dawn
-            20508, -- Plunder Wonder
-            20509, -- Plunderkind
         },
     },
 };