1.9.2 d

.luacheckrc

@@ -318,6 +318,7 @@ stds.wow = {
 		"HandleModifiedItemClick",
 		"HasOverrideActionBar",
 		"HaveQuestData",
+		"HelpTip",
 		"HideUIPanel",
 		"hooksecurefunc",
 		"HouseEditorFrame",
@@ -1165,6 +1166,7 @@ stds.wow = {
 				"GetSuperTrackedMapPin",
 				"GetSuperTrackedQuestID",
 				"IsSuperTrackingAnything",
+				"SetSuperTrackedMapPin",
 				"SetSuperTrackedQuestID",
 				"SetSuperTrackedUserWaypoint",
 			},
@@ -1221,16 +1223,19 @@ stds.wow = {
 				"CanPurchaseRank",
 				"CommitConfig",
 				"ConfigHasStagedChanges",
+				"GetConfigIDBySystemID",
 				"GetConfigIDByTreeID",
 				"GetConfigInfo",
 				"GetDefinitionInfo",
 				"GetEntryInfo",
 				"GetIncreasedTraitData",
 				"GetNodeCost",
 				"GetNodeInfo",
+				"GetTraitCurrencyInfo",
 				"GetTreeCurrencyInfo",
 				"GetTreeNodes",
 				"PurchaseRank",
+				"RefundRank",
 				"ResetTree",
 				"RollbackConfig",
 				"SetSelection",
@@ -1472,6 +1477,12 @@ stds.wow = {
 					},
 				},
 
+				SuperTrackingMapPinType = {
+					fields = {
+						"QuestOffer",
+					},
+				},
+
 				TooltipDataLineType = {
 					fields = {
 						"AzeriteEssencePower",
@@ -1775,6 +1786,7 @@ stds.wow = {
 		"FILTER",
 		"GAME_VERSION_LABEL",
 		"GARRISON_LANDING_PAGE_TITLE",
+		"GARRISON_MISSION_IN_PROGRESS_TOOLTIP",
 		"GARRISON_TYPE_8_0_LANDING_PAGE_TITLE",
 		"GARRISON_TYPE_9_0_LANDING_PAGE_TITLE",
 		"GOLD_AMOUNT_SYMBOL",
@@ -1822,6 +1834,7 @@ stds.wow = {
 		"NO_TRANSMOG_VISUAL_ID",
 		"OBJECTIVES_STOP_TRACKING",
 		"OBJECTIVES_VIEW_ACHIEVEMENT",
+		"OMNIUM_FOLIO_UNSPENT_POINTS",
 		"ORBIT_CAMERA_MOUSE_MODE_PITCH_ROTATION",
 		"ORDER_HALL_LANDING_PAGE_TITLE",
 		"PARAGON_REPUTATION_TOOLTIP_TEXT",
@@ -1844,6 +1857,7 @@ stds.wow = {
 		"RENOWN_REWARD_ACCOUNT_UNLOCK_LABEL",
 		"REPUTATION_TOOLTIP_ACCOUNT_WIDE_LABEL",
 		"RETRIEVING_DATA",
+		"RUNES_OF_POWER",
 		"SAVE",
 		"SEARCH",
 		"SECONDS_ABBR",
@@ -1857,7 +1871,9 @@ stds.wow = {
 		"SUMMON_RANDOM_PET",
 		"SWITCH",
 		"TALENT_BUTTON_TOOLTIP_NEXT_RANK",
+		"TALENT_BUTTON_TOOLTIP_PURCHASE_INSTRUCTIONS",
 		"TALENT_BUTTON_TOOLTIP_RANK_FORMAT",
+		"TALENT_BUTTON_TOOLTIP_REFUND_INSTRUCTIONS",
 		"TALENT_SPEC_ACTIVATE",
 		"TEMPSCENE",
 		"TIMEMANAGER_TOOLTIP_LOCALTIME",

API.lua

@@ -2918,6 +2918,9 @@ do  -- Quest
 				end
 			end
 		end
+
+		function API.SuperTrackQuestMapPin(questID)
+		end
 	else
 		--Retail
 		function API.GetQuestProgressPercent(questID, asText)
@@ -3074,6 +3077,14 @@ do  -- Quest
 
 			return tbl
 		end
+
+		function API.SuperTrackQuestMapPin(questID)
+			if C_QuestLog.IsOnQuest(questID) then
+				C_SuperTrack.SetSuperTrackedQuestID(questID);
+			else
+				C_SuperTrack.SetSuperTrackedMapPin(Enum.SuperTrackingMapPinType.QuestOffer, questID);
+			end
+		end
 	end
 
 
@@ -3169,6 +3180,7 @@ do  -- Quest
 			for index, spellID in ipairs(spellRewards) do
 				info = C_QuestInfoSystem.GetQuestRewardSpellInfo(questID, spellID);
 				info.id = spellID;
+				info.isSpellReward = true;
 				tinsert(spells, info);
 			end
 

Initialization.lua

@@ -1,5 +1,5 @@
-local VERSION_TEXT = "1.9.2 c";
-local VERSION_DATE = 1779500000;
+local VERSION_TEXT = "1.9.2 d";
+local VERSION_DATE = 1780400000;
 
 
 local addonName, addon = ...
@@ -298,7 +298,7 @@ local DefaultValues = {
 		LootUI_UseCustomColor = false,
 		LootUI_GrowUpwards = false,
 		LootUI_WindowHide = false,
-		LootUI_CombineItems = false,
+		LootUI_CombineItem = true,
 		LootUI_LowFrameStrata = false,
 		LootUI_HideTitle = false,
 		LootUI_ShowReputation = false,

Locales/enUS.lua

@@ -738,6 +738,7 @@ L["Delves Completion Reward Cap"] = "Completion Rewards";
 L["Delves Completion Reward Cap Tooltip"] = "Once you reach this account-wide cap, completing a Bountiful Delve will no longer grant Delver's Journey or Companion EXP.\n\nRewards from Bountiful Coffers and Nemesis Caches will not be affected by this cap.\n\nThe cap will be raised by 28 per week.";
 L["Near Completion Tooltip"] = "This entry is visible to you because you are about to reach the weekly cap.";
 L["Inactive Currencies Tooltip"] = "These currencies are hidden because you have set them as Unused:";
+L["New Quest"] = "New Quest";
 
 
 --ExpansionSummaryMinimapButton

Locales/zhCN.lua

@@ -707,6 +707,7 @@ L["Delves Completion Reward Cap"] = "通关奖励";
 L["Delves Completion Reward Cap Tooltip"] = "当你达到此战团上限后，完成丰裕地下堡将不再奖励旅程进度和伙伴经验。\n\n丰裕宝匣和宿敌宝箱不受此上限影响。\n\n每周上限为28次，可以累计。";
 L["Near Completion Tooltip"] = "你可以看见此条目是因为你即将达到上限。";
 L["Inactive Currencies Tooltip"] = "以下货币因为被你设为“未使用”而隐藏：";
+L["New Quest"] = "新任务";
 
 
 --ExpansionSummaryMinimapButton

Modules/ControlCenter/Changelog/enUS.lua

@@ -9,6 +9,46 @@ local changelogs = addon.ControlCenter.changelogs;
 
 
 changelogs[10902] = {
+	{
+		type = "date",
+		versionText = "1.9.2 d",
+		timestamp = 1780400000,
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Loot Window: Junk items are now combined and displayed as a single entry.",
+	},
+	{
+		type = "p",
+		bullet = 2,
+		text = "Note: This option is not new, but we changed its default state to Enabled.",
+	},
+
+	{
+		type = "p",
+		bullet = true,
+		text = "Expansion Summary, Great Vault: Fixed several issues.",
+	},
+	{
+		type = "p",
+		bullet = 2,
+		text = "Hovering the cursor over a Raid progress will no longer cause error.",
+	},
+	{
+		type = "p",
+		bullet = 2,
+		text = "World Activities should correctly show the increased item level after completing Tier 4 or Tier 5 Ritual Sites.",
+	},
+
+	{
+		type = "br",
+	},
+	{
+		type = "br",
+	},
+
 	{
 		type = "date",
 		versionText = "1.9.2 c",

Modules/ExpansionLandingPage/Basic.lua

@@ -1846,6 +1846,17 @@ do	--PlumberStrikethroughNumberMixin
 end
 
 
+do	--ExpansionFeature
+	function LandingPageUtil.HandleTraitTreeCurrencyChanged(treeID)
+		--Override
+	end
+
+	function LandingPageUtil.HasAnyPurchasableTrait()
+		return false;
+	end
+end
+
+
 function LandingPageUtil.DisplayInactiveCurrencies(owner, currencyIDs)
 	if owner and currencyIDs then
 		local tooltip = GameTooltip;

Modules/ExpansionLandingPage/Currency.lua

@@ -260,10 +260,9 @@ end
 
 local CurrencyListMixin = {};
 do
-	function CurrencyListMixin:Refresh()
+	function CurrencyListMixin:OnLoad()
 		--Called once when frame is created
 		self:OnSizeChanged();
-		self:FullUpdate();
 	end
 
 	function CurrencyListMixin:OnShow()

Modules/ExpansionLandingPage/ExpansionLandingPage.lua

@@ -277,11 +277,16 @@ do
 		if not self:IsUserPlaced() then
 			self:ResetPosition();
 		end
+
+		if LandingPageUtil.HasAnyPurchasableTrait() then
+			self:ShowTraitTab();
+		end
 	end
 
 	function PlumberExpansionLandingPageMixin:OnHide()
 		LandingPageUtil.PlayUISound("LandingPageClose");
 		LandingPageUtil.MainContextMenu:HideMenu();
+		LandingPageUtil.HandleTraitTreeCurrencyChanged(1186);
 	end
 
 	function PlumberExpansionLandingPageMixin:InitTabButtons()
@@ -381,10 +386,15 @@ do
 
 		local categories = {
 			{name = L["Great Vault"], frameGetter = LandingPageUtil.CreateGreatVaultFrame, validate = API.IsGreatVaultFeatureAvailable},
-			{name = L["Item Upgrade"], frameGetter = LandingPageUtil.CreateItemUpgradeFrame},
 			{name = L["Resources"], frameGetter = LandingPageUtil.CreateCurrencyList},
 		};
 
+		if addon.IS_12_0_7 then
+			table.insert(categories, 2, {name = LandingPageUtil.GetTraitSystemName(), frameGetter = LandingPageUtil.CreateTraitFrame});
+		else
+			table.insert(categories, 2, {name = L["Item Upgrade"], frameGetter = LandingPageUtil.CreateItemUpgradeFrame});
+		end
+
 		local numCategories = #categories;
 
 		local offsetY = 16;
@@ -402,12 +412,15 @@ do
 				if v.frameGetter then
 					offsetY = offsetY + lineGap;
 					local frame, height, categoryOnEnterFunc = v.frameGetter(container);
+					frame.listCategoryButton = categoryButton;
 					frame:SetPoint("TOP", relativeTo, "TOP", 0, -offsetY);
 					offsetY = offsetY + height;
 					if k == numCategories then
 						frame:SetPoint("BOTTOM", relativeTo, "BOTTOM", 0, 16);
 					end
-					frame:Refresh();
+					if frame.OnLoad then
+						frame:OnLoad();
+					end
 					if frame.OnShow and frame:IsVisible() then
 						frame:OnShow();
 					end
@@ -421,9 +434,6 @@ do
 	function PlumberExpansionLandingPageMixin:ShowLeftFrame(state)
 		self.LeftSection.DefaultFrame:SetShown(state);
 	end
-	function LandingPageUtil.ShowLeftFrame(state)
-		MainFrame:ShowLeftFrame(state);
-	end
 
 	function PlumberExpansionLandingPageMixin:DimBackground(state)
 		if IS_MOP then
@@ -437,20 +447,11 @@ do
 		--local a = state and 0.5 or 1.0;
 		self.RightSection.NineSlice.Background:SetVertexColor(a, a, a);
 	end
-	function LandingPageUtil.DimBackground(state)
-		MainFrame:DimBackground(state);
-	end
 
 	function PlumberExpansionLandingPageMixin:ToggleUI()
 		self:SetShown(not self:IsShown());
 	end
 
-	function LandingPageUtil.ToggleUI()
-		if MainFrame then
-			MainFrame:ToggleUI();
-		end
-	end
-
 	function PlumberExpansionLandingPageMixin:ResetPosition()
 		self:ClearAllPoints();
 		if IS_MOP then
@@ -517,3 +518,39 @@ do
 		self:EnableMouse(false);
 	end
 end
+
+
+do	--12.0.7 Only
+	function PlumberExpansionLandingPageMixin:ShowTraitTab()
+		if not self:IsShown() then
+			self:Show();
+		end
+		local selectedTab = LandingPageUtil.GetSelectedTabKey();
+		if selectedTab ~= "faction" and selectedTab ~= "activity" then
+			LandingPageUtil.SelectTab("faction");
+			MainFrame:UpdateTabs();
+		end
+		LandingPageUtil.SelectExpansion(12);
+	end
+end
+
+
+do	--Shared
+	function LandingPageUtil.ShowLeftFrame(state)
+		MainFrame:ShowLeftFrame(state);
+	end
+
+	function LandingPageUtil.DimBackground(state)
+		MainFrame:DimBackground(state);
+	end
+
+	function LandingPageUtil.ToggleUI()
+		if MainFrame then
+			MainFrame:ToggleUI();
+		end
+	end
+
+	function LandingPageUtil.GetUIFrameLevel()
+		return MainFrame.LeftSection.DefaultFrame:GetFrameLevel();
+	end
+end

Modules/ExpansionLandingPage/ExpansionLandingPage_Retail.xml

@@ -19,6 +19,7 @@
 	<Script file="Retail/ResourceList.lua"/>
 	<Script file="Retail/TWW_Activity.lua"/>
 	<Script file="Retail/MID_Activity.lua"/>
+	<Script file="Retail/TraitFrame.lua"/>
 
 	<!--Include file="LegionRemix/LegionRemix.xml"/-->
 

Modules/ExpansionLandingPage/FactionTab.lua

@@ -1058,12 +1058,18 @@ do
 		local buttonHeight = 32;
 		local numLevels = #renownLevelsInfo;
 		local top, bottom;
+		local lastUnlockedIndex;
 		local firstLockedIndex;
 
 		if renownLevelsInfo then
 			for k, v in ipairs(renownLevelsInfo) do
 				rewards = C_MajorFactions.GetRenownRewardsForLevel(factionID, v.level)
 				table.sort(rewards, SortFunc_UIOrder);
+
+				if (not v.locked) and (not firstLockedIndex) then
+					lastUnlockedIndex = n;
+				end
+
 				for index, rewardInfo in ipairs(rewards) do
 					n = n + 1;
 					top = offsetY;
@@ -1125,8 +1131,7 @@ do
 		self.RenownItemScrollView:SetContent(content, retainPosition);
 
 		if scrollToFirstLockedReward then
-			firstLockedIndex = firstLockedIndex or n;
-			self.RenownItemScrollView:SnapToContent(firstLockedIndex);
+			self.RenownItemScrollView:SnapToContent(lastUnlockedIndex or n);
 		end
 	end