Commit 48c46ad8 authored by TOM_RUS's avatar TOM_RUS

WOW-35755patch9.0.1_Beta

parent cef2e750
......@@ -90,15 +90,16 @@ local AnimaDiversionUI =
{
Name = "AnimaDiversionNodeState",
Type = "Enumeration",
NumValues = 4,
NumValues = 5,
MinValue = 0,
MaxValue = 3,
MaxValue = 4,
Fields =
{
{ Name = "Unavailable", Type = "AnimaDiversionNodeState", EnumValue = 0 },
{ Name = "Available", Type = "AnimaDiversionNodeState", EnumValue = 1 },
{ Name = "SelectedTemporary", Type = "AnimaDiversionNodeState", EnumValue = 2 },
{ Name = "SelectedPermanent", Type = "AnimaDiversionNodeState", EnumValue = 3 },
{ Name = "Cooldown", Type = "AnimaDiversionNodeState", EnumValue = 4 },
},
},
{
......
......@@ -17,9 +17,9 @@ local AuctionHouseEnums =
{
Name = "AuctionHouseFilter",
Type = "Enumeration",
NumValues = 11,
NumValues = 12,
MinValue = 0,
MaxValue = 10,
MaxValue = 11,
Fields =
{
{ Name = "UncollectedOnly", Type = "AuctionHouseFilter", EnumValue = 0 },
......@@ -33,6 +33,7 @@ local AuctionHouseEnums =
{ Name = "EpicQuality", Type = "AuctionHouseFilter", EnumValue = 8 },
{ Name = "LegendaryQuality", Type = "AuctionHouseFilter", EnumValue = 9 },
{ Name = "ArtifactQuality", Type = "AuctionHouseFilter", EnumValue = 10 },
{ Name = "LegendaryCraftedItemOnly", Type = "AuctionHouseFilter", EnumValue = 11 },
},
},
{
......
......@@ -126,6 +126,15 @@ local ChatInfo =
{ Name = "isPartyChannelType", Type = "bool", Nilable = false },
},
},
{
Name = "IsRegionalServiceAvailable",
Type = "Function",
Returns =
{
{ Name = "available", Type = "bool", Nilable = false },
},
},
{
Name = "IsValidChatLine",
Type = "Function",
......@@ -1948,6 +1957,20 @@ local ChatInfo =
{ Name = "supressRaidIcons", Type = "bool", Nilable = false },
},
},
{
Name = "ChatRegionalSendFailed",
Type = "Event",
LiteralName = "CHAT_REGIONAL_SEND_FAILED",
},
{
Name = "ChatRegionalStatusChanged",
Type = "Event",
LiteralName = "CHAT_REGIONAL_STATUS_CHANGED",
Payload =
{
{ Name = "isServiceAvailable", Type = "bool", Nilable = false },
},
},
{
Name = "ChatServerDisconnected",
Type = "Event",
......
......@@ -779,6 +779,16 @@ local GarrisonInfo =
{ Name = "doAlert", Type = "bool", Nilable = false },
},
},
{
Name = "GarrisonTalentEventUpdate",
Type = "Event",
LiteralName = "GARRISON_TALENT_EVENT_UPDATE",
Payload =
{
{ Name = "eventType", Type = "number", Nilable = false },
{ Name = "eventID", Type = "number", Nilable = false },
},
},
{
Name = "GarrisonTalentNpcClosed",
Type = "Event",
......@@ -949,6 +959,7 @@ local GarrisonInfo =
{ Name = "boardIndex", Type = "number", Nilable = false },
{ Name = "oldHealth", Type = "number", Nilable = false },
{ Name = "newHealth", Type = "number", Nilable = false },
{ Name = "maxHealth", Type = "number", Nilable = false },
{ Name = "points", Type = "number", Nilable = true },
},
},
......
......@@ -342,6 +342,20 @@ local Item =
{ Name = "isCached", Type = "bool", Nilable = false },
},
},
{
Name = "IsItemKeystoneByID",
Type = "Function",
Arguments =
{
{ Name = "itemInfo", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isKeystone", Type = "bool", Nilable = false },
},
},
{
Name = "IsLocked",
Type = "Function",
......
......@@ -165,6 +165,21 @@ local LegendaryCrafting =
{ Name = "runeforgePowerIDs", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "GetRuneforgePowersByClassAndSpec",
Type = "Function",
Arguments =
{
{ Name = "classID", Type = "number", Nilable = true },
{ Name = "specID", Type = "number", Nilable = true },
},
Returns =
{
{ Name = "runeforgePowerIDs", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "IsRuneforgeLegendary",
Type = "Function",
......@@ -238,6 +253,15 @@ local LegendaryCrafting =
Events =
{
{
Name = "NewRuneforgePowerAdded",
Type = "Event",
LiteralName = "NEW_RUNEFORGE_POWER_ADDED",
Payload =
{
{ Name = "powerID", Type = "number", Nilable = false },
},
},
{
Name = "RuneforgeLegendaryCraftingClosed",
Type = "Event",
......
......@@ -525,17 +525,43 @@ local Map =
{ Name = "TopRight", Type = "MapCanvasPosition", EnumValue = 4 },
},
},
{
Name = "UIMapFlag",
Type = "Enumeration",
NumValues = 15,
MinValue = 1,
MaxValue = 16384,
Fields =
{
{ Name = "NoHighlight", Type = "UIMapFlag", EnumValue = 1 },
{ Name = "ShowOverlays", Type = "UIMapFlag", EnumValue = 2 },
{ Name = "ShowTaxiNodes", Type = "UIMapFlag", EnumValue = 4 },
{ Name = "GarrisonMap", Type = "UIMapFlag", EnumValue = 8 },
{ Name = "FallbackToParentMap", Type = "UIMapFlag", EnumValue = 16 },
{ Name = "NoHighlightTexture", Type = "UIMapFlag", EnumValue = 32 },
{ Name = "ShowTaskObjectives", Type = "UIMapFlag", EnumValue = 64 },
{ Name = "NoWorldPositions", Type = "UIMapFlag", EnumValue = 128 },
{ Name = "HideArchaeologyDigs", Type = "UIMapFlag", EnumValue = 256 },
{ Name = "Deprecated", Type = "UIMapFlag", EnumValue = 512 },
{ Name = "HideIcons", Type = "UIMapFlag", EnumValue = 1024 },
{ Name = "HideVignettes", Type = "UIMapFlag", EnumValue = 2048 },
{ Name = "ForceAllOverlayExplored", Type = "UIMapFlag", EnumValue = 4096 },
{ Name = "FlightMapShowZoomOut", Type = "UIMapFlag", EnumValue = 8192 },
{ Name = "FlightMapAutoZoom", Type = "UIMapFlag", EnumValue = 16384 },
},
},
{
Name = "UIMapSystem",
Type = "Enumeration",
NumValues = 3,
NumValues = 4,
MinValue = 0,
MaxValue = 2,
MaxValue = 3,
Fields =
{
{ Name = "World", Type = "UIMapSystem", EnumValue = 0 },
{ Name = "Taxi", Type = "UIMapSystem", EnumValue = 1 },
{ Name = "Adventure", Type = "UIMapSystem", EnumValue = 2 },
{ Name = "Minimap", Type = "UIMapSystem", EnumValue = 3 },
},
},
{
......@@ -587,6 +613,7 @@ local Map =
{ Name = "name", Type = "string", Nilable = false },
{ Name = "mapType", Type = "UIMapType", Nilable = false },
{ Name = "parentMapID", Type = "number", Nilable = false },
{ Name = "flags", Type = "number", Nilable = false },
},
},
{
......
......@@ -20,6 +20,20 @@ local ReportSystem =
{ Name = "canReport", Type = "bool", Nilable = false },
},
},
{
Name = "CanReportPlayerForLanguage",
Type = "Function",
Arguments =
{
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "canReport", Type = "bool", Nilable = false },
},
},
{
Name = "InitiateReportPlayer",
Type = "Function",
......
......@@ -74,8 +74,13 @@ local Soulbinds =
Type = "Function",
},
{
Name = "CommitPendingConduits",
Name = "CommitPendingConduitsInSoulbind",
Type = "Function",
Arguments =
{
{ Name = "soulbindID", Type = "number", Nilable = false },
},
},
{
Name = "GetActiveSoulbindID",
......@@ -292,6 +297,20 @@ local Soulbinds =
{ Name = "result", Type = "bool", Nilable = false },
},
},
{
Name = "HasPendingConduitsInSoulbind",
Type = "Function",
Arguments =
{
{ Name = "soulbindID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "result", Type = "bool", Nilable = false },
},
},
{
Name = "IsConduitInstalled",
Type = "Function",
......
......@@ -197,8 +197,9 @@ local TradeSkillUI =
LiteralName = "NEW_RECIPE_LEARNED",
Payload =
{
{ Name = "spellID", Type = "number", Nilable = false },
{ Name = "recipeID", Type = "number", Nilable = false },
{ Name = "recipeLevel", Type = "number", Nilable = true },
{ Name = "baseRecipeID", Type = "number", Nilable = true },
},
},
{
......@@ -285,6 +286,7 @@ local TradeSkillUI =
Type = "Structure",
Fields =
{
{ Name = "requiredSkillRank", Type = "number", Nilable = false },
{ Name = "slotText", Type = "string", Nilable = true },
{ Name = "options", Type = "table", InnerType = "number", Nilable = false },
},
......
......@@ -166,6 +166,20 @@ local VoiceChat =
{ Name = "volume", Type = "number", Nilable = true },
},
},
{
Name = "GetJoinClubVoiceChannelError",
Type = "Function",
Arguments =
{
{ Name = "clubId", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "errorReason", Type = "VoiceChannelErrorReason", Nilable = true },
},
},
{
Name = "GetLocalPlayerActiveChannelMemberInfo",
Type = "Function",
......@@ -1017,6 +1031,18 @@ local VoiceChat =
{ Name = "OpenMic", Type = "CommunicationMode", EnumValue = 1 },
},
},
{
Name = "VoiceChannelErrorReason",
Type = "Enumeration",
NumValues = 2,
MinValue = 0,
MaxValue = 1,
Fields =
{
{ Name = "Unknown", Type = "VoiceChannelErrorReason", EnumValue = 0 },
{ Name = "IsBattleNetChannel", Type = "VoiceChannelErrorReason", EnumValue = 1 },
},
},
{
Name = "VoiceChatStatusCode",
Type = "Enumeration",
......
......@@ -81,17 +81,22 @@ local WeeklyRewards =
},
},
{
Name = "HasRewards",
Name = "HasAvailableRewards",
Type = "Function",
Returns =
{
{ Name = "hasRewards", Type = "bool", Nilable = false },
{ Name = "hasAvailableRewards", Type = "bool", Nilable = false },
},
},
{
Name = "RequestRewards",
Name = "HasGeneratedRewards",
Type = "Function",
Returns =
{
{ Name = "hasGeneratedRewards", Type = "bool", Nilable = false },
},
},
},
......
......@@ -3,13 +3,14 @@
<Script file="AnimaDiversionDataProvider.lua"/>
<Frame name="AnimaDiversionPinTemplate" mixin="AnimaDiversionPinMixin" enableMouse="true" virtual="true">
<Layers>
<Layer level="BACKGROUND" textureSubLevel="0">
<Layer level="BACKGROUND">
<Texture parentKey="Icon"/>
</Layer>
<Layer level="BORDER">
<Texture parentKey="IconSelect"/>
<Texture parentKey="IconReady"/>
<Texture parentKey="IconReinforce"/>
<Texture parentKey="IconBorder"/>
</Layer>
<Layer level="OVERLAY">
<Texture parentKey="IconDisabledOverlay" hidden="true"/>
</Layer>
</Layers>
</Frame>
......@@ -25,20 +26,70 @@
</ModelScene>
</Frames>
</Frame>
<Frame name="AnimaDiversionConnectionTemplate" virtual="true">
<Frame name="AnimaDiversionConnectionTemplate" mixin="AnimaDiversionConnectionMixin" ignoreParentScale="true" virtual="true">
<Size x="64" y="64"/>
<Layers>
<Layer level="BACKGROUND" textureSubLevel="-2">
<Line parentKey="Fill" atlas="_AnimaChannel-Channel-Line-horizontal" alpha="1" />
<Layer level="BACKGROUND">
<Line parentKey="Line" />
</Layer>
<Layer level="OVERLAY">
<Texture parentKey="AnimaLink1" alphaMode="ADD">
<Anchors>
<Anchor point="TOP" />
<Anchor point="BOTTOM" />
</Anchors>
</Texture>
<Texture parentKey="AnimaLink2" alphaMode="ADD">
<Anchors>
<Anchor point="TOP" />
<Anchor point="BOTTOM" />
</Anchors>
</Texture>
<Texture parentKey="AnimaLinkBlack" atlas="animachannel-link-anima-black" useAtlasSize="true" hidden="true">
<Anchors>
<Anchor point="TOP" />
<Anchor point="BOTTOM" />
</Anchors>
</Texture>
<MaskTexture parentKey="Mask" atlas="AnimaChannel-Line-Mask" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE">
<Anchors>
<Anchor point="TOP" />
<Anchor point="BOTTOM" />
</Anchors>
<MaskedTextures>
<MaskedTexture childKey="AnimaLink1" />
<MaskedTexture childKey="AnimaLink2" />
<MaskedTexture childKey="AnimaLinkBlack" />
</MaskedTextures>
</MaskTexture>
</Layer>
</Layers>
<Animations>
<AnimationGroup parentKey="RevealAnim" setToFinalAlpha="true">
<Alpha parentKey="Alpha" childKey="Fill" duration=".15" fromAlpha="0" toAlpha=".85" order="1"/>
<LineScale parentKey="Scale" childKey="Fill" smoothing="IN" duration=".15" order="1" fromScaleX="0.001" fromScaleY="1" toScaleX="1" toScaleY="1">
<Origin point="LEFT">
<Offset x="1" y="0"/>
</Origin>
</LineScale>
<AnimationGroup parentKey="AlphaAnim" parentArray="animationGroups" looping="REPEAT">
<Alpha childkey="AnimaLink1" duration="2.2" order="1" smoothing="in_out" fromalpha="1" toalpha=".8" />
<Alpha childKey="AnimaLink1" duration="2.0" order="2" smoothing="in_out" fromAlpha=".8" toAlpha="1" />
</AnimationGroup>
<AnimationGroup parentKey="TranslateAnim1" parentArray="animationGroups" looping="REPEAT">
<TextureCoordTranslation childKey="AnimaLink1" duration="4" order="1" offsetU="0" offsetV="1" />
</AnimationGroup>
<AnimationGroup parentKey="TranslateAnim2" parentArray="animationGroups" looping="REPEAT">
<TextureCoordTranslation childKey="AnimaLink2" duration="2" order="1" offsetU="0" offsetV="1" />
</AnimationGroup>
<AnimationGroup parentKey="TranslateAnim3" parentArray="animationGroups" looping="REPEAT">
<TextureCoordTranslation childKey="AnimaLinkBlack" duration="3" order="1" offsetU="0" offsetV="1" />
</AnimationGroup>
<AnimationGroup parentKey="RotateAnim1" parentArray="animationGroups" looping="REPEAT">
<Rotation childKey="AnimaLink1" duration="32" order="1" degrees="2" />
<Rotation childKey="AnimaLink1" duration="32" order="2" degrees="-2" />
</AnimationGroup>
<AnimationGroup parentKey="RotateAnim2" parentArray="animationGroups" looping="REPEAT">
<Rotation childKey="AnimaLink2" duration="16" order="1" degrees="-2" />
<Rotation childKey="AnimaLink2" duration="16" order="2" degrees="2" />
</AnimationGroup>
<AnimationGroup parentKey="RotateAnim3" parentArray="animationGroups" looping="REPEAT">
<Rotation childKey="AnimaLinkBlack" duration="24" order="1" degrees="2" />
<Rotation childKey="AnimaLinkBlack" duration="24" order="2" degrees="-2" />
</AnimationGroup>
</Animations>
</Frame>
......
......@@ -78,9 +78,11 @@ function AuctionCategoryMixin:GetDetailColumnStringUnsafe()
return nil;
end
function AuctionCategoryMixin:CreateSubCategory(classID, subClassID, inventoryType)
function AuctionCategoryMixin:CreateSubCategory(classID, subClassID, inventoryType, implicitFilter)
local name = "";
if inventoryType then
if implicitFilter then
name = AUCTION_HOUSE_FILTER_STRINGS[implicitFilter];
elseif inventoryType then
name = GetItemInventorySlotInfo(inventoryType);
elseif classID and subClassID then
name = GetItemSubClassInfo(classID, subClassID);
......@@ -103,36 +105,41 @@ function AuctionCategoryMixin:CreateNamedSubCategory(name)
return subCategory;
end
function AuctionCategoryMixin:CreateNamedSubCategoryAndFilter(name, classID, subClassID, inventoryType)
function AuctionCategoryMixin:CreateNamedSubCategoryAndFilter(name, classID, subClassID, inventoryType, implicitFilter)
local category = self:CreateNamedSubCategory(name);
category:AddFilter(classID, subClassID, inventoryType);
category:AddFilter(classID, subClassID, inventoryType, implicitFilter);
return category;
end
function AuctionCategoryMixin:CreateSubCategoryAndFilter(classID, subClassID, inventoryType)
local category = self:CreateSubCategory(classID, subClassID, inventoryType);
category:AddFilter(classID, subClassID, inventoryType);
function AuctionCategoryMixin:CreateSubCategoryAndFilter(classID, subClassID, inventoryType, implicitFilter)
local category = self:CreateSubCategory(classID, subClassID, inventoryType, implicitFilter);
category:AddFilter(classID, subClassID, inventoryType, implicitFilter);
return category;
end
function AuctionCategoryMixin:AddBulkInventoryTypeCategories(classID, subClassID, inventoryTypes)
local inventoryType = nil;
self:CreateSubCategoryAndFilter(classID, subClassID, inventoryType, Enum.AuctionHouseFilter.LegendaryCraftedItemOnly);
for i, inventoryType in ipairs(inventoryTypes) do
self:CreateSubCategoryAndFilter(classID, subClassID, inventoryType);
self:CreateSubCategoryAndFilter(classID, subClassID, inventoryType, implicitFilter);
end
end
function AuctionCategoryMixin:AddFilter(classID, subClassID, inventoryType)
if not classID and not subClassID and not inventoryType then
function AuctionCategoryMixin:AddFilter(classID, subClassID, inventoryType, implicitFilter)
if not classID and not subClassID and not inventoryType and not implicitFilter then
return;
end
self.filters = self.filters or {};
self.filters[#self.filters + 1] = { classID = classID, subClassID = subClassID, inventoryType = inventoryType, };
self.implicitFilter = implicitFilter;
if self.parent then
self.parent:AddFilter(classID, subClassID, inventoryType);