1.9.3

.luacheckrc

@@ -36,6 +36,7 @@ globals = {
 	"PlumberLandingPageMinimapButtonMixin",
 	"PlumberLootUIFont",
 	"PlumberOutfitSelectOutfitEntryMixin",
+	"PlumberReloadHelperMixin",
 	"PlumberStorage",
 	"PlumberSuperTrackingMixin",
 	"PlumberWorldMapPinMixin",
@@ -90,6 +91,7 @@ stds.wow = {
 		"GossipFrame",
 		"SlashCmdList",
 		"StaticPopupDialogs",
+		"UnitPopupViewHousesButtonMixin",
 		"WardrobeItemModelMixin",
 		"WardrobeItemsCollectionSlotButtonMixin",
 
@@ -780,6 +782,7 @@ stds.wow = {
 				"GetCurrentHouseLevelFavor",
 				"GetCurrentNeighborhoodGUID",
 				"GetHouseLevelFavorForLevel",
+				"GetOthersOwnedHouses",
 				"GetPlayerOwnedHouses",
 				"GetUIMapIDForNeighborhood",
 				"GetVisitCooldownInfo",
@@ -1318,6 +1321,12 @@ stds.wow = {
 			},
 		},
 
+		C_UI = {
+			fields = {
+				"Reload",
+			},
+		},
+
 		C_UIWidgetManager = {
 			fields = {
 				"GetAllWidgetsBySetID",
@@ -1704,6 +1713,8 @@ stds.wow = {
 
 		UnitPopupSharedUtil = {
 			fields = {
+				"GetFullPlayerName",
+				"GetGUID",
 				"HasLFGRestrictions",
 			},
 		},
@@ -1776,6 +1787,7 @@ stds.wow = {
 		"EQUIPMENTFLYOUT_FIRST_SPECIAL_LOCATION",
 		"ERR_ACHIEVEMENT_WATCH_COMPLETED",
 		"ERR_COSMETIC_KNOWN",
+		"ERR_HOUSING_RESULT_LOCKED_BY_COMBAT",
 		"ERR_ITEM_NOT_FOUND",
 		"ERR_LFG_PROPOSAL_FAILED",
 		"EXPANSION_NAME10",
@@ -1891,6 +1903,7 @@ stds.wow = {
 		"UNIT_SKINNABLE_HERB",
 		"UNIT_YOU",
 		"UNUSED",
+		"VIEW_HOUSES_TITLE",
 		"WEEKLY_REWARDS_CLICK_TO_PREVIEW_INSTRUCTIONS",
 		"WEEKLY_REWARDS_COMPLETE_WORLD",
 		"WEEKLY_REWARDS_CURRENT_REWARD",

API.lua

@@ -2514,7 +2514,7 @@ do  -- System
 	end
 
 
-	function API.TriggerExpansionMinimapButtonAlert(text)
+	function API.TriggerExpansionMinimapButtonAlert(text) -- unused
 		if ExpansionLandingPageMinimapButton then
 			ExpansionLandingPageMinimapButton:TriggerAlert(text);
 		end
@@ -4039,6 +4039,11 @@ do  -- Custom Hyperlink ItemRef
 			local args = {...};
 			local link = "|Haddon:plumber:"..typeName;
 
+			if #args == 0 then
+				-- There must be at least 1 arg
+				args = {0};
+			end
+
 			for i, v in ipairs(args) do
 				link = link..":"..v;
 			end
@@ -4048,6 +4053,8 @@ do  -- Custom Hyperlink ItemRef
 			return link
 		end
 	end
+
+	API.AddCustomLinkType("ReloadUI", C_UI.Reload);
 end
 
 do  -- 11.0 Menu Formatter

Initialization.lua

@@ -1,5 +1,5 @@
-local VERSION_TEXT = "1.9.2 f";
-local VERSION_DATE = 1781900000;
+local VERSION_TEXT = "1.9.3";
+local VERSION_DATE = 1782600000;
 
 
 local addonName, addon = ...
@@ -379,6 +379,7 @@ local DefaultValues = {
 	TooltipDyeDeez = true,                  --Show dyes on pigment tooltip
 	Housing_CatalogSearch = false,
 	Housing_ItemAcquiredAlert = true,       --Click AlertFrame to view decor model
+	Housing_HouseList = true,
 
 
 	--Namaplte: Quest Indicator

Locales/enUS.lua

@@ -47,6 +47,9 @@ L["Return To Module List"] = "Return to List";
 L["Generic Addon Conflict"] = "This module might be incompatible with addons of similar functionalities:";
 L["Work In Progress Tag"] = "[WIP]";
 L["Colon With Space"] = ": ";
+L["Disabled Module Requires Reload Format"] = "You must %s to apply the changes.";	--We'll replace %s with a clickable "reload the UI"
+L["Reload The UI"] = "reload the UI";
+L["Click To Reload UI"] = "Click to reload the UI.";
 
 
 --Settings Category
@@ -918,6 +921,11 @@ L["ModuleName BlizzFixActionBarArt"] = "Blitz Fix: Action Bar Art";
 L["ModuleDescription BlizzFixActionBarArt"] = "Fixed an issue where Action Bar Art (gryphons and wyverns) reappears unexpectedly after Hiding/Showing UI or exiting House Editor.";
 
 
+--HouseList
+L["ModuleName Housing_HouseList"] = "House List";
+L["ModuleDescription Housing_HouseList"] = "Improve the House List UI:\n\n- Indicate the house's faction with an image on the right.\n\n- Show both Visit House buttons if the player has two houses.";
+
+
 --Generic
 L["Total Colon"] = FROM_TOTAL or "Total:";
 L["Reposition Button Horizontal"] = "Move Horizontally";   --Move the window horizontally

Locales/zhCN.lua

@@ -47,6 +47,9 @@ L["Return To Module List"] = "返回模块列表";
 L["LootUI Addon Conflict"] = "此模块可能与以下功能类似的插件不兼容：";
 L["Work In Progress Tag"] = "[施工中]";
 L["Colon With Space"] = "：";
+L["Disabled Module Requires Reload Format"] = "你必须%s才能使改变生效。";	--We'll replace %s with a clickable "reload the UI"
+L["Reload The UI"] = "重载界面";
+L["Click To Reload UI"] = "左键单击以重载界面。";
 
 
 --Settings Category
@@ -886,6 +889,11 @@ L["ModuleName BlizzFixActionBarArt"] = "动作条装饰修复";
 L["ModuleDescription BlizzFixActionBarArt"] = "修复被你隐藏的动作条装饰在隐藏/显示游戏界面或退出住宅编辑器后重现的问题。";
 
 
+--HouseList
+L["ModuleName Housing_HouseList"] = "房屋列表";
+L["ModuleDescription Housing_HouseList"] = "改进房屋列表界面：\n\n- 用图片展示房屋所属的阵营。\n\n- 如果玩家有两栋房子，直接显示两个“访问住宅”按钮。";
+
+
 --Generic
 L["Total Colon"] = "总计：";
 L["Reposition Button Horizontal"] = "水平方向移动";   --Move the window horizontally

Modules/ControlCenter/Changelog/enUS.lua

@@ -7,6 +7,71 @@ local _, addon = ...
 local L = addon.L;
 local changelogs = addon.ControlCenter.changelogs;
 
+changelogs[10903] = {
+	{
+		type = "date",
+		versionText = "1.9.3",
+		timestamp = 1782600000,
+	},
+
+	{
+		type = "h1",
+		text = L["ModuleName Housing_HouseList"],
+		dbKey = "Housing_HouseList",
+	},
+
+	{
+		type = "Checkbox",
+		dbKey = "Housing_HouseList",
+	},
+
+	{
+		type = "p",
+		text = "Improve the House List UI.",
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Indicate the house's faction with an image on the right.",
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Show both Visit House buttons if the player has two houses.",
+	},
+
+	{
+		type = "img",
+		fileName = "Changelog_Housing_HouseList",
+		canvasWidth = 512,
+		canvasHeight = 256,
+		imageRight = 394,
+	},
+
+	{
+		type = "br",
+	},
+
+	{
+		type = "h1",
+		text = MISCELLANEOUS,
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Expansion Summary UI: If you have enabled the minimap button, it will display a notification when you have unclaimed Paragon reward chests.",
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Expansion Summary UI: Added Field Accolade to the Resources List and Sporefall to the Raids Tab.",
+	},
+};
+
 
 changelogs[10902] = {
 	{

Modules/ControlCenter/SettingsPanelNew.lua

@@ -1794,6 +1794,8 @@ do  --ChangelogTab
 			elseif info.type == "img" then
 				if info.dbKey or info.fileName then
 					local file;
+					local l, r, t, b;
+
 					if info.dbKey then
 						file = "Interface/AddOns/Plumber/Art/ControlCenter/Preview_"..info.dbKey;
 					else
@@ -1809,6 +1811,16 @@ do  --ChangelogTab
 						height = Def.ChangelogImageSize;
 					end
 
+					if info.canvasWidth and info.canvasHeight and info.imageRight then
+						l = 0;
+						r = info.imageRight / info.canvasWidth;
+						t = 0;
+						b = (info.imageBottom and info.imageBottom / info.canvasHeight) or 1;
+						width = height / info.canvasHeight * info.imageRight;
+					else
+						l, r, t, b = 0, 1, 0, 1;
+					end
+
 					n = n + 1;
 					bottom = top + height + Def.ChangelogParagraphSpacing;
 					content[n] = {
@@ -1821,7 +1833,7 @@ do  --ChangelogTab
 						offsetX = leftOffset,
 						setupFunc = function(obj)
 							obj:SetSize(width, height);
-							obj:SetTexCoord(0, 1, 0, 1);
+							obj:SetTexCoord(l, r, t, b);
 							obj:SetVertexColor(1, 1, 1);
 							obj:SetTexture(file);
 						end;

Modules/ExpansionLandingPage/Basic.lua

@@ -1737,6 +1737,16 @@ do  --Expansion Select
 		ExpansionData[expansionID][field] = data;
 	end
 
+	function LandingPageUtil.GetExpansionData(expansionID, field)
+		if ExpansionData[expansionID] then
+			if field then
+				return ExpansionData[expansionID][field];
+			else
+				return ExpansionData[expansionID];
+			end
+		end
+	end
+
 	function LandingPageUtil.GetCurrentExpansionInfo()
 		if CurrentExpansionID then
 			local name = ExpansionData[CurrentExpansionID].name or "Unknown Expansion";

Modules/ExpansionLandingPage/EncounterData.lua

@@ -18,6 +18,8 @@ local EncounterData = {
 	--https://wago.tools/db2/JournalEncounter?page=1
 	--/dump GetMouseFoci()[1].icon:GetTexture()
 
+	[2711] = {icon = 7448202, achv = {63237, 63240, 63241}},      --Rotmire
+
 	[2795] = {icon = 7448202, achv = {61487, 61488, 61489, 61454}},      --Chimaerus
 
 	[2733] = {icon = 7448209, achv = {61372, 62106}},      --Imperator Averzian
@@ -271,6 +273,7 @@ do
 
 	local MID_EncounterTabInfo = {
 		JournalInstanceIDs = {
+			1305,	--Sporefall
 			1314,   --The Dreamrift
 			1307,   --The Voidspire
 			1308,   --March on Quel'Danas

Modules/ExpansionLandingPage/ExpansionLandingPage.lua

@@ -522,8 +522,9 @@ do
 end
 
 
-do	--12.0.7 Only
+do	--Open to Tab
 	function PlumberExpansionLandingPageMixin:ShowTraitTab()
+		-- 12.0.7 Only?
 		if not self:IsShown() then
 			self:Show();
 		end
@@ -534,6 +535,21 @@ do	--12.0.7 Only
 		end
 		LandingPageUtil.SelectExpansion(12);
 	end
+
+	function PlumberExpansionLandingPageMixin:ShowFactionTabWithPendingReward()
+		if not self:IsShown() then
+			self:Show();
+		end
+		local selectedTab = LandingPageUtil.GetSelectedTabKey();
+		if selectedTab ~= "faction" then
+			LandingPageUtil.SelectTab("faction");
+			MainFrame:UpdateTabs();
+		end
+		local expansionID = addon.FactionUtil:GetBestExpansionIDWithRewardPending();
+		if expansionID then
+			LandingPageUtil.SelectExpansion(expansionID);
+		end
+	end
 end
 
 

Modules/ExpansionLandingPage/FactionUtil.lua

@@ -293,10 +293,46 @@ function FactionUtil:GetFactionsWithRewardPending(viewedExpansionOnly)
 	return tbl
 end
 
+function FactionUtil:GetBestExpansionIDWithRewardPending()
+	local IsOnQuest = C_QuestLog.IsOnQuest;
+	local expansionIDs = {12, 11}; -- newer expansion first
+
+	for _, expansionID in ipairs(expansionIDs) do
+		local factionLayout = LandingPageUtil.GetExpansionData(expansionID, "factionLayout");
+		if factionLayout then
+			local questID;
+			for row, rowInfo in ipairs(factionLayout) do
+				for _, factionInfo in ipairs(rowInfo) do
+					if OverrideFactionInfo[factionInfo.factionID] then
+						questID = OverrideFactionInfo[factionInfo.factionID].rewardQuestID;
+						if questID and IsOnQuest(questID) then
+							return expansionID;
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
 function FactionUtil:IsAnyParagonRewardPending(viewedExpansionOnly)
 	return self:GetFactionsWithRewardPending(viewedExpansionOnly) ~= nil
 end
 
+function FactionUtil:GetRewardPendingFactioName()
+	local factions = self:GetFactionsWithRewardPending();
+	if factions then
+		local firstFactionName = self:GetFactionName(factions[1]);
+		if firstFactionName then
+			if #factions == 1 then
+				return firstFactionName;
+			else
+				return firstFactionName.." ...";
+			end
+		end
+	end
+end
+
 function FactionUtil:GetParagonRewardQuestFaction(questID)
 	return questID and RewardQuestXFaction[questID] or nil
 end