Commit 63fae122 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-36086patch9.0.2_Beta

parent 16879fb8
......@@ -306,15 +306,16 @@ local CalendarConstants =
{
Name = "HolidayFlags",
Type = "Enumeration",
NumValues = 4,
NumValues = 5,
MinValue = 1,
MaxValue = 8,
MaxValue = 16,
Fields =
{
{ Name = "IsRegionwide", Type = "HolidayFlags", EnumValue = 1 },
{ Name = "DontShowInCalendar", Type = "HolidayFlags", EnumValue = 2 },
{ Name = "DontDisplayEnd", Type = "HolidayFlags", EnumValue = 4 },
{ Name = "DontDisplayBanner", Type = "HolidayFlags", EnumValue = 8 },
{ Name = "NotAvailableClientSide", Type = "HolidayFlags", EnumValue = 16 },
},
},
},
......
......@@ -94,6 +94,24 @@ local ChatInfo =
{ Name = "ids", Type = "table", InnerType = "string", Nilable = false },
},
},
{
Name = "GetGeneralChannelID",
Type = "Function",
Returns =
{
{ Name = "channelID", Type = "number", Nilable = false },
},
},
{
Name = "GetGeneralChannelLocalID",
Type = "Function",
Returns =
{
{ Name = "localID", Type = "number", Nilable = true },
},
},
{
Name = "GetMentorChannelID",
Type = "Function",
......
......@@ -49,13 +49,14 @@ local CovenantPreview =
{
Name = "CovenantAbilityType",
Type = "Enumeration",
NumValues = 2,
NumValues = 3,
MinValue = 0,
MaxValue = 1,
MaxValue = 2,
Fields =
{
{ Name = "Class", Type = "CovenantAbilityType", EnumValue = 0 },
{ Name = "Signature", Type = "CovenantAbilityType", EnumValue = 1 },
{ Name = "Soulbind", Type = "CovenantAbilityType", EnumValue = 2 },
},
},
{
......@@ -67,6 +68,16 @@ local CovenantPreview =
{ Name = "type", Type = "CovenantAbilityType", Nilable = false },
},
},
{
Name = "CovenantFeatureInfo",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false },
{ Name = "texture", Type = "number", Nilable = false },
},
},
{
Name = "CovenantPreviewInfo",
Type = "Structure",
......@@ -81,6 +92,19 @@ local CovenantPreview =
{ Name = "covenantCrest", Type = "string", Nilable = false },
{ Name = "covenantAbilities", Type = "table", InnerType = "CovenantAbilityInfo", Nilable = false },
{ Name = "fromPlayerChoice", Type = "bool", Nilable = false },
{ Name = "covenantSoulbinds", Type = "table", InnerType = "CovenantSoulbindInfo", Nilable = false },
{ Name = "featureInfo", Type = "CovenantFeatureInfo", Nilable = false },
},
},
{
Name = "CovenantSoulbindInfo",
Type = "Structure",
Fields =
{
{ Name = "spellID", Type = "number", Nilable = false },
{ Name = "uiTextureKit", Type = "string", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false },
},
},
},
......
......@@ -6,6 +6,15 @@ local CovenantSanctum =
Functions =
{
{
Name = "CanAccessReservoir",
Type = "Function",
Returns =
{
{ Name = "canAccess", Type = "bool", Nilable = false },
},
},
{
Name = "CanDepositAnima",
Type = "Function",
......@@ -158,7 +167,7 @@ local CovenantSanctum =
{ 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 = "titleMaskID", Type = "number", Nilable = true },
{ Name = "garrFollowerID", Type = "number", Nilable = true },
{ Name = "transmogIllusionSourceID", Type = "number", Nilable = true },
{ Name = "icon", Type = "number", Nilable = true },
......
......@@ -74,6 +74,15 @@ local DateAndTime =
{ Name = "date", Type = "CalendarTime", Nilable = false },
},
},
{
Name = "GetSecondsUntilDailyReset",
Type = "Function",
Returns =
{
{ Name = "seconds", Type = "number", Nilable = false },
},
},
{
Name = "GetSecondsUntilWeeklyReset",
Type = "Function",
......
......@@ -232,13 +232,14 @@ local Expansion =
{
Name = "SubscriptionInterstitialResponseType",
Type = "Enumeration",
NumValues = 2,
NumValues = 3,
MinValue = 0,
MaxValue = 1,
MaxValue = 2,
Fields =
{
{ Name = "Clicked", Type = "SubscriptionInterstitialResponseType", EnumValue = 0 },
{ Name = "Closed", Type = "SubscriptionInterstitialResponseType", EnumValue = 1 },
{ Name = "WebRedirect", Type = "SubscriptionInterstitialResponseType", EnumValue = 2 },
},
},
{
......
......@@ -45,6 +45,20 @@ local GarrisonInfo =
{ Name = "targetInfo", Type = "table", InnerType = "AutoMissionTargetingInfo", Nilable = false },
},
},
{
Name = "GetAutoMissionEnvironmentEffect",
Type = "Function",
Arguments =
{
{ Name = "missionID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "autoMissionEnvEffect", Type = "AutoMissionEnvironmentEffect", Nilable = true },
},
},
{
Name = "GetAutoMissionTargetingInfo",
Type = "Function",
......@@ -371,6 +385,15 @@ local GarrisonInfo =
{ Name = "missionID", Type = "number", Nilable = false },
},
},
{
Name = "RushHealAllFollowers",
Type = "Function",
Arguments =
{
{ Name = "followerType", Type = "number", Nilable = false },
},
},
{
Name = "RushHealFollower",
Type = "Function",
......@@ -974,6 +997,15 @@ local GarrisonInfo =
{ Name = "points", Type = "number", Nilable = true },
},
},
{
Name = "AutoMissionEnvironmentEffect",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "autoCombatSpellInfo", Type = "AutoCombatSpellInfo", Nilable = false },
},
},
{
Name = "AutoMissionEvent",
Type = "Structure",
......@@ -1013,7 +1045,6 @@ local GarrisonInfo =
{ Name = "currentHealth", Type = "number", Nilable = false },
{ Name = "maxHealth", Type = "number", Nilable = false },
{ Name = "attack", Type = "number", Nilable = false },
{ Name = "estimatedPowerLevel", Type = "number", Nilable = false },
{ Name = "healingTimestamp", Type = "number", Nilable = false },
},
},
......@@ -1105,7 +1136,6 @@ local GarrisonInfo =
{ Name = "health", Type = "number", Nilable = false },
{ Name = "maxHealth", Type = "number", Nilable = false },
{ Name = "attack", Type = "number", Nilable = false },
{ Name = "estimatedPowerLevel", Type = "number", Nilable = false },
{ Name = "boardIndex", Type = "number", Nilable = false },
},
},
......
......@@ -111,6 +111,10 @@ local GossipInfo =
{ Name = "gossipText", Type = "string", Nilable = false },
},
},
{
Name = "RefreshOptions",
Type = "Function",
},
{
Name = "SelectActiveQuest",
Type = "Function",
......@@ -179,6 +183,11 @@ local GossipInfo =
{ Name = "gossipIndex", Type = "number", Nilable = false },
},
},
{
Name = "GossipOptionsRefreshed",
Type = "Event",
LiteralName = "GOSSIP_OPTIONS_REFRESHED",
},
{
Name = "GossipShow",
Type = "Event",
......@@ -237,6 +246,7 @@ local GossipInfo =
{ Name = "type", Type = "string", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "GossipOptionRewardInfo", Nilable = false },
{ Name = "status", Type = "GossipOptionStatus", Nilable = false },
{ Name = "spellID", Type = "number", Nilable = true },
},
},
{
......
......@@ -174,6 +174,15 @@ local PartyInfo =
{ Name = "isFull", Type = "bool", Nilable = false },
},
},
{
Name = "IsPartyInJailersTower",
Type = "Function",
Returns =
{
{ Name = "isPartyInJailersTower", Type = "bool", Nilable = false },
},
},
{
Name = "LeaveParty",
Type = "Function",
......
......@@ -352,7 +352,7 @@ local RecruitAFriend =
Type = "Structure",
Fields =
{
{ Name = "titleID", Type = "number", Nilable = false },
{ Name = "titleMaskID", Type = "number", Nilable = false },
},
},
},
......
......@@ -173,6 +173,20 @@ local Soulbinds =
{ Name = "quality", Type = "number", Nilable = false },
},
},
{
Name = "GetConduitRankFromCollection",
Type = "Function",
Arguments =
{
{ Name = "conduitID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "conduitRank", Type = "number", Nilable = false },
},
},
{
Name = "GetConduitSpellID",
Type = "Function",
......@@ -368,20 +382,6 @@ local Soulbinds =
{ Name = "result", Type = "bool", Nilable = false },
},
},
{
Name = "MatchesCurrentSpecSet",
Type = "Function",
Arguments =
{
{ Name = "specSetID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "matches", Type = "bool", Nilable = false },
},
},
{
Name = "RemovePendingConduit",
Type = "Function",
......@@ -534,8 +534,10 @@ local Soulbinds =
{
{ Name = "conduitID", Type = "number", Nilable = false },
{ Name = "conduitRank", Type = "number", Nilable = false },
{ Name = "conduitItemLevel", Type = "number", Nilable = false },
{ Name = "conduitType", Type = "SoulbindConduitType", Nilable = false },
{ Name = "conduitSpecSetID", Type = "number", Nilable = false },
{ Name = "conduitSpecIDs", Type = "table", InnerType = "number", Nilable = false },
{ Name = "conduitSpecName", Type = "string", Nilable = true },
{ Name = "covenantID", Type = "number", Nilable = true },
{ Name = "conduitItemID", Type = "number", Nilable = false },
......
......@@ -112,6 +112,20 @@ local SpecializationInfo =
{ Name = "requiredLevel", Type = "number", Nilable = true },
},
},
{
Name = "GetSpecIDs",
Type = "Function",
Arguments =
{
{ Name = "specSetID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "specIDs", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "GetSpellsDisplay",
Type = "Function",
......@@ -149,6 +163,20 @@ local SpecializationInfo =
{ Name = "locked", Type = "bool", Nilable = false },
},
},
{
Name = "MatchesCurrentSpecSet",
Type = "Function",
Arguments =
{
{ Name = "specSetID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "matches", Type = "bool", Nilable = false },
},
},
{
Name = "SetPvpTalentLocked",
Type = "Function",
......
local TransmogItems =
{
Name = "Transmogrify",
Name = "TransmogrifyCollection",
Type = "System",
Namespace = "C_TransmogCollection",
......
local TransmogSets =
{
Name = "Transmogrify",
Name = "TransmogrifySets",
Type = "System",
Namespace = "C_TransmogSets",
......
......@@ -6,10 +6,23 @@ local Tutorial =
Functions =
{
{
Name = "AbandonTutorialArea",
Type = "Function",
},
{
Name = "ReturnToTutorialArea",
Type = "Function",
},
},
Events =
{
{
Name = "LeavingTutorialArea",
Type = "Event",
LiteralName = "LEAVING_TUTORIAL_AREA",
},
{
Name = "NpeTutorialUpdate",
Type = "Event",
......
......@@ -668,6 +668,7 @@ local Unit =
{
{ Name = "oldLevel", Type = "number", Nilable = false },
{ Name = "newLevel", Type = "number", Nilable = false },
{ Name = "real", Type = "bool", Nilable = false },
},
},
{
......
......@@ -214,7 +214,7 @@ function AchievementFrame_ToggleView()
if ( emblemFilename ) then
AchievementFrameGuildEmblemLeft:SetTexture(emblemFilename);
AchievementFrameGuildEmblemRight:SetTexture(emblemFilename);
local r, g, b = ACHIEVEMENT_YELLOW_COLOR:GetRGB();
local r, g, b = ACHIEVEMENT_YELLOW_BORDER_COLOR:GetRGB();
AchievementFrameGuildEmblemLeft:SetVertexColor(r, g, b, 0.5);
AchievementFrameGuildEmblemRight:SetVertexColor(r, g, b, 0.5);
end
......
......@@ -35,7 +35,7 @@ StaticPopupDialogs["ANIMA_DIVERSION_CONFIRM_CHANNEL"] = {
button1 = YES,
button2 = CANCEL,
OnAccept = function(self, selectedNode)
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CONFIRM_CHANNEL);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CONFIRM_CHANNEL, nil, SOUNDKIT_ALLOW_DUPLICATES);
C_AnimaDiversion.SelectAnimaNode(selectedNode.nodeData.talentID, true);
HelpTip:Acknowledge(AnimaDiversionFrame, ANIMA_DIVERSION_TUTORIAL_SELECT_LOCATION);
HelpTip:Acknowledge(AnimaDiversionFrame.ReinforceProgressFrame, ANIMA_DIVERSION_TUTORIAL_FILL_BAR);
......@@ -55,7 +55,7 @@ StaticPopupDialogs["ANIMA_DIVERSION_CONFIRM_REINFORCE"] = {
button1 = YES,
button2 = CANCEL,
OnAccept = function(self, selectedNode)
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CONFIRM_REINFORCE);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CONFIRM_REINFORCE, nil, SOUNDKIT_ALLOW_DUPLICATES);
C_AnimaDiversion.SelectAnimaNode(selectedNode.nodeData.talentID, false);
HelpTip:Acknowledge(AnimaDiversionFrame, ANIMA_DIVERSION_TUTORIAL_SELECT_LOCATION_PERMANENT);
end,
......@@ -88,7 +88,7 @@ function AnimaDiversionFrameMixin:OnShow()
MapCanvasMixin.OnShow(self);
self:ResetZoom();
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_OPEN);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_OPEN, nil, SOUNDKIT_ALLOW_DUPLICATES);
FrameUtil.RegisterFrameForEvents(self, ANIMA_DIVERSION_FRAME_EVENTS);
end
......@@ -98,7 +98,7 @@ function AnimaDiversionFrameMixin:OnHide()
self.SelectPinInfoFrame:Hide();
self.ReinforceInfoFrame:Hide();
self:StopGemsFullSound();
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLOSE);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLOSE, nil, SOUNDKIT_ALLOW_DUPLICATES);
end
function AnimaDiversionFrameMixin:OnEvent(event, ...)
......@@ -249,7 +249,7 @@ function AnimaDiversionFrameMixin:SetupBolsterProgressBar()
self:AddBolsterEffectToGem(self.lastGem, newGemEffectID, true);
if not isReinforceReady then
PlaySound(self.covenantData.animaNewGemSoundKit);
PlaySound(self.covenantData.animaNewGemSoundKit, nil, SOUNDKIT_ALLOW_DUPLICATES);
end
end
......@@ -390,7 +390,7 @@ function AnimaDiversionSelectionInfoMixin:SetupAndShow(node)
self:Layout();
self:Show();
PlaySound(AnimaDiversionFrame.covenantData.animaChannelSelectSoundKit);
PlaySound(AnimaDiversionFrame.covenantData.animaChannelSelectSoundKit, nil, SOUNDKIT_ALLOW_DUPLICATES);
end
function AnimaDiversionSelectionInfoMixin:GetSelectedNode()
......@@ -438,7 +438,7 @@ AnimaDiversionSelectButtonMixin = { };
function AnimaDiversionSelectButtonMixin:OnClick()
local selectedNode = self:GetParent():GetSelectedNode();
if selectedNode then
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLICK_CHANNEL_BUTTON);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLICK_CHANNEL_BUTTON, nil, SOUNDKIT_ALLOW_DUPLICATES);
StaticPopup_Show("ANIMA_DIVERSION_CONFIRM_CHANNEL", selectedNode.nodeData.name, nil, selectedNode);
self:GetParent():Hide();
end
......@@ -523,14 +523,14 @@ function ReinforceInfoFrameMixin:SelectNodeToReinforce(node)
node:SetSelectedState(true);
self.Title:SetText(self.selectedNode.nodeData.name);
self.AnimaNodeReinforceButton:Enable();
PlaySound(AnimaDiversionFrame.covenantData.animaReinforceSelectSoundKit);
PlaySound(AnimaDiversionFrame.covenantData.animaReinforceSelectSoundKit, nil, SOUNDKIT_ALLOW_DUPLICATES);
end
AnimaNodeReinforceButtonMixin = { };
function AnimaNodeReinforceButtonMixin:OnClick()
local selectedNode = self:GetParent():GetSelectedNode();
if selectedNode then
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLICK_REINFORCE_BUTTON);
PlaySound(SOUNDKIT.UI_COVENANT_ANIMA_DIVERSION_CLICK_REINFORCE_BUTTON, nil, SOUNDKIT_ALLOW_DUPLICATES);
StaticPopup_Show("ANIMA_DIVERSION_CONFIRM_REINFORCE", selectedNode.nodeData.name, nil, selectedNode);
end
end
......
......@@ -124,6 +124,7 @@ function AuctionCategoryMixin:CreateSubCategoryAndFilter(classID, subClassID, in
if useParentFilters then
self.filters = self.filters or {};
category:SetFilters(self.filters);
category.implicitFilter = implicitFilter;
else
category:AddFilter(classID, subClassID, inventoryType, implicitFilter);
end
......
......@@ -318,10 +318,14 @@ function AuctionHouseSellFrameMixin:OnShow()
self.fixedWidth = self:GetWidth();
self.fixedHeight = self:GetHeight();
self:Layout();
OpenAllBags(self:GetAuctionHouseFrame());
end
function AuctionHouseSellFrameMixin:OnHide()
FrameUtil.UnregisterFrameForEvents(self, AUCTION_HOUSE_SELL_FRAME_EVENTS);
CloseAllBags(self:GetAuctionHouseFrame());
end
function AuctionHouseSellFrameMixin:OnEvent(event, ...)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment