From b65ea38fb148632f2358a8d8e44ca2d3404445b0 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Fri, 14 Aug 2026 21:08:27 +0800 Subject: [PATCH 1/9] Remove an API overwrite on PTR --- Modules/DevTool.lua | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Modules/DevTool.lua b/Modules/DevTool.lua index 71d898b..bbbce65 100644 --- a/Modules/DevTool.lua +++ b/Modules/DevTool.lua @@ -430,13 +430,3 @@ do end end end - -do --Enable ExpansionLandingButton on PTR - if IsTestBuild() then - function C_PlayerInfo.IsExpansionLandingPageUnlockedForPlayer(index) - if index == LE_EXPANSION_MIDNIGHT then - return true - end - end - end -end From e14dce54d051117fe05e971424a0209b10cc78f7 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Fri, 14 Aug 2026 21:30:36 +0800 Subject: [PATCH 2/9] Landing Page: Add Captain Tokka to Factions --- Modules/ExpansionLandingPage/FactionTab.lua | 6 ++- Modules/ExpansionLandingPage/FactionUtil.lua | 44 ++++++++++---------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Modules/ExpansionLandingPage/FactionTab.lua b/Modules/ExpansionLandingPage/FactionTab.lua index a21d5a1..9f59c80 100644 --- a/Modules/ExpansionLandingPage/FactionTab.lua +++ b/Modules/ExpansionLandingPage/FactionTab.lua @@ -1222,9 +1222,13 @@ do for _, factionInfo in ipairs(rowInfo) do index = index + 1; local f = self.factionButtonPool:Acquire(); + f:ClearAllPoints(); local majorFactionID = factionInfo.factionID; - f:ClearAllPoints(); + if factionInfo.preSpacer then + offsetX = offsetX + 2.5 * FACTION_BUTTON_GAP_H; + end + if factionInfo.shownAsSubfaction then f:SetMinimized(true); local childOffsetY = offsetY - 0.5 * (FACTION_BUTTON_SIZE - SUBFACTION_BUTTON_SIZE); diff --git a/Modules/ExpansionLandingPage/FactionUtil.lua b/Modules/ExpansionLandingPage/FactionUtil.lua index 66e2f3c..69584de 100644 --- a/Modules/ExpansionLandingPage/FactionUtil.lua +++ b/Modules/ExpansionLandingPage/FactionUtil.lua @@ -157,15 +157,17 @@ local OverrideFactionInfo = { }; local Seasonal = { - Delves = 2742, - Prey = 2764, + Delves = 2796, + Prey = 2808, }; +--[[ if addon.IS_12_1_0 then - -- MID Season 2 + -- Reserved for MID Season 3 Seasonal.Delves = 2796; Seasonal.Prey = 2808; end +--]] for k, factionID in pairs(Seasonal) do if not OverrideFactionInfo[factionID] then @@ -182,15 +184,28 @@ do --Layout MID {factionID = 2744, creatureDisplayID = 26365, playerCompanionID = 2}, --Valeera Sanguinar. Get playerCompanionID from C_MajorFactions.GetMajorFactionData(C_DelvesUI.GetDelvesFactionForSeason()) }, }, - RitualSites = {factionID = 2792}, --Ritual Sites + RitualSites = {factionID = 2792, preSpacer = true}, --Ritual Sites OpenWorldPVP = {factionID = 2770, shownAsSubfaction = true, iconFileID = 7448209}, --Slayer's Duellum - Zuljarra = {factionID = 2772}, --Zul'jarra's Forces + Zuljarra = {factionID = 2772, --Zul'jarra's Forces + subFactions = { + {factionID = 2773, creatureDisplayID = 145432}, -- Tokka + }, + }, }; local MajorFactionLayout = { - [1] = {}, + [1] = { + MajorFactionEntry.Prey, + MajorFactionEntry.Delves, + }, [2] = { + MajorFactionEntry.Zuljarra, + MajorFactionEntry.RitualSites, + MajorFactionEntry.OpenWorldPVP, + }, + + [3] = { {factionID = 2696}, --Amani Tribe {factionID = 2699}, --The Singularity {factionID = 2704}, --Hara'ti @@ -207,23 +222,6 @@ do --Layout MID LandingPageUtil.AddExpansionData(12, "factionLayout", MajorFactionLayout); - if addon.IS_12_1_0 then --For PTR - MajorFactionLayout[1] = { - MajorFactionEntry.Zuljarra, - MajorFactionEntry.Prey, - MajorFactionEntry.Delves, - MajorFactionEntry.RitualSites, - MajorFactionEntry.OpenWorldPVP, - }; - else - MajorFactionLayout[1] = { - MajorFactionEntry.RitualSites, - MajorFactionEntry.Prey, - MajorFactionEntry.Delves, - MajorFactionEntry.OpenWorldPVP, - }; - end - FactionUtil.ActiveFactionLayout = MajorFactionLayout; end From 1feb794a1411789e18d5d0292008220e7882a313 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Sun, 16 Aug 2026 11:56:23 +0800 Subject: [PATCH 3/9] Fix HousingDashboard being empty due to cache - Clear the cache once. - Due to a loading sequence change to `Blizzard_HousingDashboard`, the `houseInfoList` has a chance to not get passed down to the callbacks if the data is received before the callback is registered. --- Modules/Housing/Housing_Macro.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/Housing/Housing_Macro.lua b/Modules/Housing/Housing_Macro.lua index 0da9e3e..26b32ff 100644 --- a/Modules/Housing/Housing_Macro.lua +++ b/Modules/Housing/Housing_Macro.lua @@ -234,6 +234,11 @@ local function Blizzard_HousingDashboard_OnLoaded() if not Flags.TeleportToHouseButton then Flags.TeleportToHouseButton = true; + local blizzardDropdown = API.GetGlobalObject("HousingDashboardFrame.HouseDropdown"); + if blizzardDropdown then + blizzardDropdown.playerHouseList = nil; + end + local TeleportButton = API.GetGlobalObject("HousingDashboardFrame.HouseInfoContent.ContentFrame.HouseUpgradeFrame.TeleportToHouseButton"); if TeleportButton then TeleportButton:RegisterForDrag("LeftButton"); From ce3ebe0fda2ec5702fba8008a32c1a16832f1d11 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Sun, 16 Aug 2026 15:47:01 +0800 Subject: [PATCH 4/9] Resource List: Add Community Coupon and reorder --- Modules/ExpansionLandingPage/Retail/ResourceList.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/ExpansionLandingPage/Retail/ResourceList.lua b/Modules/ExpansionLandingPage/Retail/ResourceList.lua index 840d833..c15a83a 100644 --- a/Modules/ExpansionLandingPage/Retail/ResourceList.lua +++ b/Modules/ExpansionLandingPage/Retail/ResourceList.lua @@ -53,21 +53,21 @@ do --MID {currencyID = 3028}, --Restored Coffer Key {currencyID = 3310, hasWeeklyCap = true}, --Coffer Key Shard {currencyID = 3316}, --Voidlight Marl - {currencyID = 3405}, --Field Accolade + {currencyID = 3363, shownIfOwned = true}, --Community Coupons + {currencyID = 3405, shownIfOwned = true}, --Field Accolade {itemID = 242241, uiMapID = 2395}, --Latent Arcana {itemID = 246951, uiMapID = 2405}, --Stormarion Core + {currencyID = 3392}, --Remnant of Anguish + {currencyID = 2803}, --Undercoin + {currencyID = 3379, shownIfOwned = true}, --Brimming Arcana - {currencyID = 3392}, --Remnant of Anguish {currencyID = 3376, hasWeeklyCap = true}, --Shard of Dundun {currencyID = 3377, shownIfOwned = true}, --Unalloyed Abundance {currencyID = 1602, shownIfOwned = true}, --Conquest {currencyID = 1792, shownIfOwned = true}, --Honor - - {currencyID = 2803}, --Undercoin - {currencyID = 2123, shownIfOwned = true}, --Bloody Tokens {currencyID = 2797, shownIfOwned = true}, --Trophy of Strife }; From 6257f9351103a986e08e0fa97401a2fefceedd25 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Sun, 16 Aug 2026 16:08:20 +0800 Subject: [PATCH 5/9] Resource List: Add Coiled Filament - Conditionally shown when on Coiled Isles zones. --- Modules/ExpansionLandingPage/Currency.lua | 21 ++++++++++++++----- .../Retail/ResourceList.lua | 5 +++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Modules/ExpansionLandingPage/Currency.lua b/Modules/ExpansionLandingPage/Currency.lua index ea7f8e8..1e53018 100644 --- a/Modules/ExpansionLandingPage/Currency.lua +++ b/Modules/ExpansionLandingPage/Currency.lua @@ -334,15 +334,26 @@ do elseif v.conditionFunc then valid = v.conditionFunc(); elseif v.uiMapID then + valid = false; + if not uiMapID then uiMapID = C_Map.GetBestMapForUnit("player"); end - if uiMapID and uiMapID == v.uiMapID then - valid = true; - else - valid = false; + + if uiMapID then + if type(v.uiMapID) == "table" then + for _, id in ipairs(v.uiMapID) do + if uiMapID == id then + valid = true; + end + end + else + valid = uiMapID == v.uiMapID; + end end - elseif v.shownIfOwned then + end + + if valid and v.shownIfOwned then valid = GetResourcesQuantity(v) > 0; end diff --git a/Modules/ExpansionLandingPage/Retail/ResourceList.lua b/Modules/ExpansionLandingPage/Retail/ResourceList.lua index c15a83a..9cd0437 100644 --- a/Modules/ExpansionLandingPage/Retail/ResourceList.lua +++ b/Modules/ExpansionLandingPage/Retail/ResourceList.lua @@ -56,8 +56,9 @@ do --MID {currencyID = 3363, shownIfOwned = true}, --Community Coupons {currencyID = 3405, shownIfOwned = true}, --Field Accolade - {itemID = 242241, uiMapID = 2395}, --Latent Arcana - {itemID = 246951, uiMapID = 2405}, --Stormarion Core + {itemID = 242241, uiMapID = 2395}, --Latent Arcana + {itemID = 246951, uiMapID = 2405}, --Stormarion Core + {currencyID = 3546, uiMapID = {2509, 2512}, shownIfOwned = true}, --Coiled Filament {currencyID = 3392}, --Remnant of Anguish {currencyID = 2803}, --Undercoin From 3672a93d49b5f932c6e4cb291bacc5cc4428d79c Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Sun, 16 Aug 2026 19:37:55 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Fix=20D=C3=A9cor=20Customization=20Dye=20Pa?= =?UTF-8?q?ne=20Error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Frame changed in 12.1 --- Modules/Housing/HouseEditor_CustomizeMode.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Housing/HouseEditor_CustomizeMode.lua b/Modules/Housing/HouseEditor_CustomizeMode.lua index 354f257..b2384fc 100644 --- a/Modules/Housing/HouseEditor_CustomizeMode.lua +++ b/Modules/Housing/HouseEditor_CustomizeMode.lua @@ -241,7 +241,7 @@ do local CustomizeModeFrame = HouseEditorFrame.CustomizeModeFrame; self.parentFrame = CustomizeModeFrame; - self.DyePane = self.parentFrame.DecorCustomizationsPane; + self.DyePane = CustomizeModeFrame.DecorCustomizationsPane.CustomizeComponentContainer.DyePane; self.DyePopout = DyeSelectionPopout; From df79b31cc097d4ebed66bec97a9f0d485db944a5 Mon Sep 17 00:00:00 2001 From: Peter Yu <49627468+Peterodox@users.noreply.github.com> Date: Sun, 16 Aug 2026 20:46:06 +0800 Subject: [PATCH 7/9] Retire two dye pigment modules - Crafting Housing Dye no longer requires pigments. --- Modules/GameTooltipExtension.xml | 2 +- Plumber.toc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/GameTooltipExtension.xml b/Modules/GameTooltipExtension.xml index 01b3132..0f1914d 100644 --- a/Modules/GameTooltipExtension.xml +++ b/Modules/GameTooltipExtension.xml @@ -10,11 +10,11 @@