Commit 64878158 authored by TOM_RUS's avatar TOM_RUS

WOW-35432patch9.0.1_Beta

parent 2e8e8e40
......@@ -104,10 +104,33 @@ local AzeriteItem =
{ Name = "isAzeriteItem", Type = "bool", Nilable = false },
},
},
{
Name = "IsAzeriteItemEnabled",
Type = "Function",
Arguments =
{
{ Name = "azeriteItemLocation", Type = "table", Mixin = "ItemLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "isEnabled", Type = "bool", Nilable = false },
},
},
},
Events =
{
{
Name = "AzeriteItemEnabledStateChanged",
Type = "Event",
LiteralName = "AZERITE_ITEM_ENABLED_STATE_CHANGED",
Payload =
{
{ Name = "enabled", Type = "bool", Nilable = false },
},
},
{
Name = "AzeriteItemExperienceChanged",
Type = "Event",
......
......@@ -91,6 +91,7 @@ LFGListInfoDocumentation.lua
LFGuildInfoDocumentation.lua
LegendaryCraftingDocumentation.lua
LevelLinkDocumentation.lua
LevelSquishDocumentation.lua
LoadingScreenDocumentation.lua
LootDocumentation.lua
LoreTextDocumentation.lua
......
......@@ -6,6 +6,15 @@ local CovenantCallings =
Functions =
{
{
Name = "AreCallingsUnlocked",
Type = "Function",
Returns =
{
{ Name = "unlocked", Type = "bool", Nilable = false },
},
},
{
Name = "RequestCallings",
Type = "Function",
......
......@@ -33,6 +33,38 @@ local CovenantSanctum =
{ Name = "features", Type = "table", InnerType = "CovenantSanctumFeatureInfo", Nilable = false },
},
},
{
Name = "GetRenownLevel",
Type = "Function",
Returns =
{
{ Name = "level", Type = "number", Nilable = false },
},
},
{
Name = "GetRenownMilestones",
Type = "Function",
Returns =
{
{ Name = "milestones", Type = "table", InnerType = "CovenantSanctumRenownMilestoneInfo", Nilable = false },
},
},
{
Name = "GetRenownRewardsForLevel",
Type = "Function",
Arguments =
{
{ Name = "level", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "rewards", Type = "table", InnerType = "CovenantSanctumRenownRewardInfo", Nilable = false },
},
},
{
Name = "GetSanctumType",
Type = "Function",
......@@ -79,6 +111,35 @@ local CovenantSanctum =
{ Name = "uiOrder", Type = "number", Nilable = false },
},
},
{
Name = "CovenantSanctumRenownMilestoneInfo",
Type = "Structure",
Fields =
{
{ Name = "level", Type = "number", Nilable = false },
{ Name = "locked", Type = "bool", Nilable = false },
{ Name = "isCapstone", Type = "bool", Nilable = false },
},
},
{
Name = "CovenantSanctumRenownRewardInfo",
Type = "Structure",
Fields =
{
{ Name = "uiOrder", Type = "number", Nilable = false },
{ Name = "itemID", Type = "number", Nilable = true },
{ Name = "spellID", Type = "number", Nilable = true },
{ Name = "mountID", Type = "number", Nilable = true },
{ Name = "transmogID", Type = "number", Nilable = true },
{ Name = "transmogSetID", Type = "number", Nilable = true },
{ Name = "titleID", Type = "number", Nilable = true },
{ Name = "garrFollowerID", Type = "number", Nilable = true },
{ Name = "transmogIllusionSourceID", Type = "number", Nilable = true },
{ Name = "icon", Type = "number", Nilable = true },
{ Name = "name", Type = "string", Nilable = true },
{ Name = "description", Type = "string", Nilable = true },
},
},
},
};
......
......@@ -26,7 +26,7 @@ local Covenants =
Returns =
{
{ Name = "data", Type = "CovenantData", Nilable = false },
{ Name = "data", Type = "CovenantData", Nilable = true },
},
},
{
......@@ -42,6 +42,15 @@ local Covenants =
Events =
{
{
Name = "CovenantChosen",
Type = "Event",
LiteralName = "COVENANT_CHOSEN",
Payload =
{
{ Name = "covenantID", Type = "number", Nilable = false },
},
},
},
Tables =
......
......@@ -469,6 +469,16 @@ local Item =
{ Name = "success", Type = "bool", Nilable = false },
},
},
{
Name = "ItemChanged",
Type = "Event",
LiteralName = "ITEM_CHANGED",
Payload =
{
{ Name = "previousHyperlink", Type = "string", Nilable = false },
{ Name = "newHyperlink", Type = "string", Nilable = false },
},
},
{
Name = "ItemDataLoadResult",
Type = "Event",
......
local LevelSquish =
{
Name = "LevelSquish",
Type = "System",
Namespace = "C_LevelSquish",
Functions =
{
{
Name = "ConvertFollowerLevel",
Type = "Function",
Arguments =
{
{ Name = "level", Type = "number", Nilable = false },
{ Name = "maxFollowerLevel", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "squishedLevel", Type = "number", Nilable = false },
},
},
{
Name = "ConvertPlayerLevel",
Type = "Function",
Arguments =
{
{ Name = "level", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "squishedLevel", Type = "number", Nilable = false },
},
},
},
Events =
{
},
Tables =
{
},
};
APIDocumentation:AddDocumentationTable(LevelSquish);
\ No newline at end of file
......@@ -113,6 +113,7 @@ local PlayerChoice =
{ Name = "widgetSetID", Type = "number", Nilable = true },
{ Name = "disabledButton", Type = "bool", Nilable = false },
{ Name = "desaturatedArt", Type = "bool", Nilable = false },
{ Name = "disabledOption", Type = "bool", Nilable = false },
{ Name = "groupID", Type = "number", Nilable = true },
{ Name = "headerIconAtlasElement", Type = "string", Nilable = true },
{ Name = "subHeader", Type = "string", Nilable = true },
......
......@@ -47,6 +47,20 @@ local Soulbinds =
{ Name = "soulbindID", Type = "number", Nilable = false },
},
},
{
Name = "GetConduitCollection",
Type = "Function",
Arguments =
{
{ Name = "conduitType", Type = "SoulbindConduitType", Nilable = false },
},
Returns =
{
{ Name = "collectionData", Type = "table", InnerType = "ConduitCollectionData", Nilable = false },
},
},
{
Name = "GetConduitHyperlink",
Type = "Function",
......@@ -62,6 +76,20 @@ local Soulbinds =
{ Name = "link", Type = "string", Nilable = false },
},
},
{
Name = "GetConduitID",
Type = "Function",
Arguments =
{
{ Name = "itemID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "conduitID", Type = "number", Nilable = true },
},
},
{
Name = "GetConduitSpellID",
Type = "Function",
......@@ -91,6 +119,20 @@ local Soulbinds =
{ Name = "type", Type = "SoulbindConduitType", Nilable = true },
},
},
{
Name = "GetItemConduitTypeByItemID",
Type = "Function",
Arguments =
{
{ Name = "itemID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "type", Type = "SoulbindConduitType", Nilable = true },
},
},
{
Name = "GetSoulbindData",
Type = "Function",
......@@ -154,7 +196,7 @@ local Soulbinds =
Arguments =
{
{ Name = "nodeID", Type = "number", Nilable = false },
{ Name = "itemLocation", Type = "table", Mixin = "ItemLocationMixin", Nilable = false },
{ Name = "conduitID", Type = "number", Nilable = false },
},
Returns =
......@@ -200,21 +242,21 @@ local Soulbinds =
},
},
{
Name = "LearnNode",
Name = "ResetSoulbind",
Type = "Function",
Arguments =
{
{ Name = "nodeID", Type = "number", Nilable = false },
{ Name = "soulbindID", Type = "number", Nilable = false },
},
},
{
Name = "ResetSoulbind",
Name = "SelectNode",
Type = "Function",
Arguments =
{
{ Name = "soulbindID", Type = "number", Nilable = false },
{ Name = "nodeID", Type = "number", Nilable = false },
},
},
{
......@@ -244,6 +286,24 @@ local Soulbinds =
{ Name = "soulbindID", Type = "number", Nilable = false },
},
},
{
Name = "SoulbindConduitCollectionRemoved",
Type = "Event",
LiteralName = "SOULBIND_CONDUIT_COLLECTION_REMOVED",
Payload =
{
{ Name = "conduitID", Type = "number", Nilable = false },
},
},
{
Name = "SoulbindConduitCollectionUpdated",
Type = "Event",
LiteralName = "SOULBIND_CONDUIT_COLLECTION_UPDATED",
Payload =
{
{ Name = "collectionData", Type = "ConduitCollectionData", Nilable = false },
},
},
{
Name = "SoulbindConduitInstalled",
Type = "Event",
......@@ -300,10 +360,29 @@ local Soulbinds =
{ Name = "nodeID", Type = "number", Nilable = false },
},
},
{
Name = "SoulbindPathChanged",
Type = "Event",
LiteralName = "SOULBIND_PATH_CHANGED",
},
},
Tables =
{
{
Name = "ConduitCollectionData",
Type = "Structure",
Fields =
{
{ Name = "conduitID", Type = "number", Nilable = false },
{ Name = "conduitRank", Type = "number", Nilable = false },
{ Name = "conduitType", Type = "SoulbindConduitType", Nilable = false },
{ Name = "conduitSpecID", Type = "number", Nilable = false },
{ Name = "conduitSpecName", Type = "string", Nilable = true },
{ Name = "covenantID", Type = "number", Nilable = true },
{ Name = "conduitItemID", Type = "number", Nilable = false },
},
},
{
Name = "SoulbindConduitData",
Type = "Structure",
......
......@@ -198,6 +198,7 @@ local TradeSkillUI =
Payload =
{
{ Name = "spellID", Type = "number", Nilable = false },
{ Name = "recipeLevel", Type = "number", Nilable = true },
},
},
{
......
......@@ -48,6 +48,20 @@ local Transmog =
{ Name = "creatureDisplayID", Type = "number", Nilable = true },
},
},
{
Name = "GetItemIDForSource",
Type = "Function",
Arguments =
{
{ Name = "itemModifiedAppearanceID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "itemID", Type = "number", Nilable = true },
},
},
{
Name = "GetSlotForInventoryType",
Type = "Function",
......
......@@ -20,6 +20,23 @@ local TransmogItems =
{ Name = "sources", Type = "table", InnerType = "AppearanceSourceInfo", Nilable = false },
},
},
{
Name = "GetIllusionSourceInfo",
Type = "Function",
Arguments =
{
{ Name = "sourceID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "visualID", Type = "number", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "hyperlink", Type = "string", Nilable = false },
{ Name = "icon", Type = "number", Nilable = false },
},
},
{
Name = "GetSourceIcon",
Type = "Function",
......
......@@ -147,6 +147,7 @@ local WeeklyRewards =
{ Name = "maxProgress", Type = "number", Nilable = false },
{ Name = "displayType", Type = "ConquestProgressBarDisplayType", Nilable = false },
{ Name = "unlocksCompleted", Type = "number", Nilable = false },
{ Name = "maxUnlocks", Type = "number", Nilable = false },
{ Name = "sampleItemHyperlink", Type = "string", Nilable = false },
},
},
......
......@@ -27,7 +27,7 @@ end
AuctionHouseAuctionsSummaryLineMixin = {};
function AuctionHouseAuctionsSummaryLineMixin:InitLine(auctionsFrame)
function AuctionHouseAuctionsSummaryLineMixin:InitElement(auctionsFrame)
self.auctionsFrame = auctionsFrame;
end
......@@ -206,7 +206,7 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
if event == "OWNED_AUCTIONS_UPDATED" then
self.AllAuctionsList:SetSelectedEntry(nil);
self.AllAuctionsList:Reset();
self.SummaryList:RefreshScrollFrame();
self.SummaryList:RefreshListDisplay();
self:ValidateDisplayMode();
elseif event == "ITEM_SEARCH_RESULTS_UPDATED" then
self.ItemList:DirtyScrollFrame();
......@@ -216,7 +216,7 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
self.BidsList:DirtyScrollFrame();
if self:IsDisplayingBids() then
self.SummaryList:RefreshScrollFrame();
self.SummaryList:RefreshListDisplay();
self:ValidateDisplayMode();
end
......@@ -224,7 +224,7 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
self.BidsList:DirtyScrollFrame();
if self:IsDisplayingBids() then
self.SummaryList:RefreshScrollFrame();
self.SummaryList:RefreshListDisplay();
end
elseif event == "AUCTION_CANCELED" then
self:RefreshSeachResults();
......@@ -241,7 +241,7 @@ function AuctionHouseAuctionsFrameMixin:InitializeSummaryList()
end
self.SummaryList:SetSelectionCallback(OnSummaryLineSelectedCallback);
self.SummaryList:SetLineTemplate("AuctionHouseAuctionsSummaryLineTemplate", self);
self.SummaryList:SetElementTemplate("AuctionHouseAuctionsSummaryLineTemplate", self);
end
function AuctionHouseAuctionsFrameMixin:InitializeAllAuctionsList()
......
......@@ -323,7 +323,7 @@ function KeyBindingFrameMixin:AttemptKeybind(keyOrButton, selectedAction, bindin
local keyPressed = GetConvertedKeyOrButton(keyOrButton);
if not IsKeyPressIgnoredForBinding(keyPressed) then
keyPressed = CreateKeyChordString(keyPressed);
keyPressed = CreateKeyChordStringUsingMetaKeyState(keyPressed);
-- Unbind the current action
local key1, key2 = GetBindingKey(selectedAction, bindingMode);
......
......@@ -13,9 +13,11 @@ function CovenantCallingQuestMixin:Update()
end
function CovenantCallingQuestMixin:UpdateIcon()
local icon = self.calling:GetIcon(self.covenantData);
self.Icon:SetTexture(icon);
self.Highlight:SetTexture(icon);
if self.covenantData then
local icon = self.calling:GetIcon(self.covenantData);
self.Icon:SetTexture(icon);
self.Highlight:SetTexture(icon);
end
end
function CovenantCallingQuestMixin:UpdateBang()
......@@ -187,24 +189,31 @@ function CovenantCallingsMixin:Update()
end
function CovenantCallingsMixin:UpdateBackground()
local decor = ("shadowlands-landingpage-callingsdecor-%s"):format(self.covenantData.textureKit);
self.Decor:SetAtlas(decor, true);
if self.covenantData then
local decor = ("shadowlands-landingpage-callingsdecor-%s"):format(self.covenantData.textureKit);
self.Decor:SetAtlas(decor, true);
end
end
function CovenantCallingsMixin:OnCovenantCallingsUpdated(callings)
self:ProcessCallings(callings);
self.pool:ReleaseAll();
local frames = {};
for index, calling in ipairs(self.callings) do
local callingFrame = self.pool:Acquire();
callingFrame:Set(calling, self.covenantData);
table.insert(frames, callingFrame);
end
local unlocked = C_CovenantCallings.AreCallingsUnlocked();
self:SetShown(unlocked);
if unlocked and self.covenantData then
self:ProcessCallings(callings);
AnchorUtil.GridLayout(frames, AnchorUtil.CreateAnchor("LEFT", self.Decor, "LEFT", -42, 0), self.layout);
self:Layout();
local frames = {};
for index, calling in ipairs(self.callings) do
local callingFrame = self.pool:Acquire();
callingFrame:Set(calling, self.covenantData);
table.insert(frames, callingFrame);
end
AnchorUtil.GridLayout(frames, AnchorUtil.CreateAnchor("LEFT", self.Decor, "LEFT", -42, 0), self.layout);
self:Layout();
end
end
-- TODO: Not sure how we want the sort to behave yet...maybe using time remaining similar to emissary quests?
......
......@@ -95,6 +95,10 @@ function CovenantPreviewFrameMixin:SetupFramesWithTextureKit()
self.Background:SetShown(not self.showingFromPlayerChoice);
end
local function CovenantPreviewSortFunction(firstValue, secondValue)