Commit cef2e750 authored by TOM_RUS's avatar TOM_RUS

WOW-35679patch9.0.1_Beta

parent 3f2c6da5
......@@ -204,6 +204,15 @@ local ActionBarFrame =
{ Name = "isOnBarOrSpecialBar", Type = "bool", Nilable = false },
},
},
{
Name = "PutActionInSlot",
Type = "Function",
Arguments =
{
{ Name = "slotID", Type = "number", Nilable = false },
},
},
{
Name = "ShouldOverrideBarShowHealthBar",
Type = "Function",
......
......@@ -193,6 +193,15 @@ local Expansion =
{ Name = "isVeteranTrialAccount", Type = "bool", Nilable = false },
},
},
{
Name = "SendSubscriptionInterstitialResponse",
Type = "Function",
Arguments =
{
{ Name = "response", Type = "SubscriptionInterstitialResponseType", Nilable = false },
},
},
},
Events =
......@@ -220,6 +229,18 @@ local Expansion =
Tables =
{
{
Name = "SubscriptionInterstitialResponseType",
Type = "Enumeration",
NumValues = 2,
MinValue = 0,
MaxValue = 1,
Fields =
{
{ Name = "Clicked", Type = "SubscriptionInterstitialResponseType", EnumValue = 0 },
{ Name = "Closed", Type = "SubscriptionInterstitialResponseType", EnumValue = 1 },
},
},
{
Name = "SubscriptionInterstitialType",
Type = "Enumeration",
......
......@@ -131,7 +131,7 @@ local GamePad =
Arguments =
{
{ Name = "deviceID", Type = "number", Nilable = false },
{ Name = "deviceID", Type = "number", Nilable = true },
},
Returns =
......@@ -231,6 +231,7 @@ local GamePad =
{ Name = "comment", Type = "string", Nilable = true },
{ Name = "name", Type = "string", Nilable = true },
{ Name = "configID", Type = "GamePadConfigID", Nilable = false },
{ Name = "labelStyle", Type = "string", Nilable = true },
{ Name = "rawButtonMappings", Type = "table", InnerType = "GamePadRawButtonMapping", Nilable = false },
{ Name = "rawAxisMappings", Type = "table", InnerType = "GamePadRawAxisMapping", Nilable = false },
{ Name = "axisConfigs", Type = "table", InnerType = "GamePadAxisConfig", Nilable = false },
......@@ -252,6 +253,7 @@ local GamePad =
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "labelStyle", Type = "string", Nilable = false },
{ Name = "buttonCount", Type = "number", Nilable = false },
{ Name = "axisCount", Type = "number", Nilable = false },
{ Name = "stickCount", Type = "number", Nilable = false },
......
......@@ -61,6 +61,20 @@ local GarrisonInfo =
{ Name = "targetInfo", Type = "table", InnerType = "AutoMissionTargetingInfo", Nilable = false },
},
},
{
Name = "GetAutoTroops",
Type = "Function",
Arguments =
{
{ Name = "followerType", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "autoTroopInfo", Type = "table", InnerType = "AutoCombatTroopInfo", Nilable = false },
},
},
{
Name = "GetCombatLogSpellInfo",
Type = "Function",
......@@ -892,6 +906,41 @@ local GarrisonInfo =
{ Name = "icon", Type = "number", Nilable = false },
},
},
{
Name = "AutoCombatTroopInfo",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "followerID", Type = "string", Nilable = false },
{ Name = "garrFollowerID", Type = "string", Nilable = false },
{ Name = "followerTypeID", Type = "number", Nilable = false },
{ Name = "displayIDs", Type = "table", InnerType = "FollowerDisplayID", Nilable = false },
{ Name = "level", Type = "number", Nilable = false },
{ Name = "quality", Type = "number", Nilable = false },
{ Name = "levelXP", Type = "number", Nilable = false },
{ Name = "maxXP", Type = "number", Nilable = false },
{ Name = "height", Type = "number", Nilable = false },
{ Name = "scale", Type = "number", Nilable = false },
{ Name = "displayScale", Type = "number", Nilable = true },
{ Name = "displayHeight", Type = "number", Nilable = true },
{ Name = "classSpec", Type = "number", Nilable = true },
{ Name = "className", Type = "string", Nilable = true },
{ Name = "flavorText", Type = "string", Nilable = true },
{ Name = "classAtlas", Type = "string", Nilable = false },
{ Name = "portraitIconID", Type = "number", Nilable = false },
{ Name = "textureKit", Type = "string", Nilable = false },
{ Name = "isTroop", Type = "bool", Nilable = false },
{ Name = "raceID", Type = "number", Nilable = false },
{ Name = "health", Type = "number", Nilable = false },
{ Name = "maxHealth", Type = "number", Nilable = false },
{ Name = "role", Type = "number", Nilable = false },
{ Name = "isAutoTroop", Type = "bool", Nilable = false },
{ Name = "isCollected", Type = "bool", Nilable = false },
{ Name = "autoCombatStats", Type = "FollowerAutoCombatStatsInfo", Nilable = false },
{ Name = "autoCombatSpells", Type = "table", InnerType = "AutoCombatSpellInfo", Nilable = false },
},
},
{
Name = "AutoMissionCombatEventInfo",
Type = "Structure",
......@@ -932,8 +981,6 @@ local GarrisonInfo =
{
{ Name = "targetIndex", Type = "number", Nilable = false },
{ Name = "previewType", Type = "number", Nilable = false },
{ Name = "spellID", Type = "number", Nilable = false },
{ Name = "effectIndex", Type = "number", Nilable = false },
},
},
{
......
......@@ -57,14 +57,8 @@ local LFGInfo =
},
},
{
Name = "CanPlayerUseScenarioFinder",
Name = "ConfirmLfgExpandSearch",
Type = "Function",
Returns =
{
{ Name = "canUse", Type = "bool", Nilable = false },
{ Name = "failureReason", Type = "string", Nilable = false },
},
},
{
Name = "GetAllEntriesForCategory",
......@@ -80,6 +74,15 @@ local LFGInfo =
{ Name = "lfgDungeonIDs", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "GetLFDLockStates",
Type = "Function",
Returns =
{
{ Name = "lockInfo", Type = "table", InnerType = "LFGLockInfo", Nilable = false },
},
},
{
Name = "GetRoleCheckDifficultyDetails",
Type = "Function",
......@@ -282,6 +285,11 @@ local LFGInfo =
Type = "Event",
LiteralName = "LFG_UPDATE_RANDOM_INFO",
},
{
Name = "ShowLfgExpandSearchPrompt",
Type = "Event",
LiteralName = "SHOW_LFG_EXPAND_SEARCH_PROMPT",
},
{
Name = "UpdateLfgList",
Type = "Event",
......@@ -301,6 +309,16 @@ local LFGInfo =
Tables =
{
{
Name = "LFGLockInfo",
Type = "Structure",
Fields =
{
{ Name = "lfgID", Type = "number", Nilable = false },
{ Name = "reason", Type = "number", Nilable = false },
{ Name = "hideEntry", Type = "bool", Nilable = false },
},
},
},
};
......
......@@ -19,6 +19,22 @@ local LegendaryCrafting =
{ Name = "description", Type = "RuneforgeLegendaryCraftDescription", Nilable = false },
},
},
{
Name = "GetRuneforgeItemPreviewInfo",
Type = "Function",
Arguments =
{
{ Name = "baseItem", Type = "table", Mixin = "ItemLocationMixin", Nilable = false },
{ Name = "runeforgePowerID", Type = "number", Nilable = true },
{ Name = "modifiers", Type = "table", InnerType = "number", Nilable = true },
},
Returns =
{
{ Name = "info", Type = "RuneforgeItemPreviewInfo", Nilable = true },
},
},
{
Name = "GetRuneforgeLegendaryComponentInfo",
Type = "Function",
......
......@@ -25,7 +25,6 @@ local Transmog =
Arguments =
{
{ Name = "slotID", Type = "number", Nilable = false },
{ Name = "transmogID", Type = "number", Nilable = false },
},
......@@ -127,8 +126,10 @@ local Transmog =
{ Name = "baseVisualID", Type = "number", Nilable = false },
{ Name = "appliedSourceID", Type = "number", Nilable = false },
{ Name = "appliedVisualID", Type = "number", Nilable = false },
{ Name = "appliedCategoryID", Type = "number", Nilable = false },
{ Name = "pendingSourceID", Type = "number", Nilable = false },
{ Name = "pendingVisualID", Type = "number", Nilable = false },
{ Name = "pendingCategoryID", Type = "number", Nilable = false },
{ Name = "hasUndo", Type = "bool", Nilable = false },
{ Name = "isHideVisual", Type = "bool", Nilable = false },
{ Name = "itemSubclass", Type = "number", Nilable = false },
......@@ -142,6 +143,7 @@ local Transmog =
{
{ Name = "transmogLocation", Type = "table", Mixin = "TransmogLocationMixin", Nilable = false },
{ Name = "transmogID", Type = "number", Nilable = false },
{ Name = "categoryID", Type = "number", Nilable = true },
},
},
},
......@@ -251,6 +253,45 @@ local Transmog =
Tables =
{
{
Name = "TransmogCollectionType",
Type = "Enumeration",
NumValues = 29,
MinValue = 0,
MaxValue = 28,
Fields =
{
{ Name = "Head", Type = "TransmogCollectionType", EnumValue = 0 },
{ Name = "Shoulder", Type = "TransmogCollectionType", EnumValue = 1 },
{ Name = "Back", Type = "TransmogCollectionType", EnumValue = 2 },
{ Name = "Chest", Type = "TransmogCollectionType", EnumValue = 3 },
{ Name = "Shirt", Type = "TransmogCollectionType", EnumValue = 4 },
{ Name = "Tabard", Type = "TransmogCollectionType", EnumValue = 5 },
{ Name = "Wrist", Type = "TransmogCollectionType", EnumValue = 6 },
{ Name = "Hands", Type = "TransmogCollectionType", EnumValue = 7 },
{ Name = "Waist", Type = "TransmogCollectionType", EnumValue = 8 },
{ Name = "Legs", Type = "TransmogCollectionType", EnumValue = 9 },
{ Name = "Feet", Type = "TransmogCollectionType", EnumValue = 10 },
{ Name = "Wand", Type = "TransmogCollectionType", EnumValue = 11 },
{ Name = "OneHAxe", Type = "TransmogCollectionType", EnumValue = 12 },
{ Name = "OneHSword", Type = "TransmogCollectionType", EnumValue = 13 },
{ Name = "OneHMace", Type = "TransmogCollectionType", EnumValue = 14 },
{ Name = "Dagger", Type = "TransmogCollectionType", EnumValue = 15 },
{ Name = "Fist", Type = "TransmogCollectionType", EnumValue = 16 },
{ Name = "Shield", Type = "TransmogCollectionType", EnumValue = 17 },
{ Name = "Holdable", Type = "TransmogCollectionType", EnumValue = 18 },
{ Name = "TwoHAxe", Type = "TransmogCollectionType", EnumValue = 19 },
{ Name = "TwoHSword", Type = "TransmogCollectionType", EnumValue = 20 },
{ Name = "TwoHMace", Type = "TransmogCollectionType", EnumValue = 21 },
{ Name = "Staff", Type = "TransmogCollectionType", EnumValue = 22 },
{ Name = "Polearm", Type = "TransmogCollectionType", EnumValue = 23 },
{ Name = "Bow", Type = "TransmogCollectionType", EnumValue = 24 },
{ Name = "Gun", Type = "TransmogCollectionType", EnumValue = 25 },
{ Name = "Crossbow", Type = "TransmogCollectionType", EnumValue = 26 },
{ Name = "Warglaives", Type = "TransmogCollectionType", EnumValue = 27 },
{ Name = "Paired", Type = "TransmogCollectionType", EnumValue = 28 },
},
},
{
Name = "TransmogModification",
Type = "Enumeration",
......
......@@ -563,6 +563,19 @@ local UIWidgetManager =
{ Name = "UniversalWidget", Type = "UIWidgetFlag", EnumValue = 1 },
},
},
{
Name = "UIWidgetFontType",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "Normal", Type = "UIWidgetFontType", EnumValue = 0 },
{ Name = "Shadow", Type = "UIWidgetFontType", EnumValue = 1 },
{ Name = "Outline", Type = "UIWidgetFontType", EnumValue = 2 },
},
},
{
Name = "UIWidgetTextSizeType",
Type = "Enumeration",
......@@ -1070,6 +1083,8 @@ local UIWidgetManager =
{ Name = "text", Type = "string", Nilable = false },
{ Name = "tooltip", Type = "string", Nilable = false },
{ Name = "textSizeType", Type = "UIWidgetTextSizeType", Nilable = false },
{ Name = "fontType", Type = "UIWidgetFontType", Nilable = false },
{ Name = "bottomPadding", Type = "number", Nilable = false },
{ Name = "widgetSizeSetting", Type = "number", Nilable = false },
{ Name = "textureKit", Type = "string", Nilable = false },
{ Name = "frameTextureKit", Type = "string", Nilable = false },
......
......@@ -29,6 +29,20 @@ local WarCampaign =
{ Name = "campaignChapterInfo", Type = "CampaignChapterInfo", Nilable = true },
},
},
{
Name = "GetCampaignID",
Type = "Function",
Arguments =
{
{ Name = "questID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "campaignID", Type = "number", Nilable = false },
},
},
{
Name = "GetCampaignInfo",
Type = "Function",
......
......@@ -292,9 +292,6 @@ end
function AzeriteEssenceUIMixin:TryShow()
if C_AzeriteEssence.CanOpenUI() then
ShowUIPanel(AzeriteEssenceUI);
if not C_AzeriteEssence.IsAtForge() then
AzeriteEssenceUtil.TryAcknowledgeEssenceSwapTutorial();
end
return true;
end
return false;
......
BarberShopMixin = CreateFromMixins(CharCustomizeParentFrameBaseMixin);
function BarberShopMixin:OnLoad()
DefaultScaleFrameMixin.OnLoad(self);
self:RegisterEvent("BARBER_SHOP_RESULT");
self:RegisterEvent("BARBER_SHOP_COST_UPDATE");
self:RegisterEvent("BARBER_SHOP_FORCE_CUSTOMIZATIONS_UPDATE");
......@@ -15,20 +13,17 @@ function BarberShopMixin:OnLoad()
end
function BarberShopMixin:OnEvent(event, ...)
DefaultScaleFrameMixin.OnEvent(self, event, ...);
if event == "BARBER_SHOP_RESULT" then
local success = ...;
if success then
PlaySound(SOUNDKIT.BARBERSHOP_HAIRCUT);
end
self:UpdateCharCustomizationFrame();
elseif event == "BARBER_SHOP_COST_UPDATE" then
self:UpdatePrice();
elseif event == "BARBER_SHOP_FORCE_CUSTOMIZATIONS_UPDATE" then
self:UpdateCharCustomizationFrame();
elseif event == "BARBER_SHOP_APPEARANCE_APPLIED" then
C_BarberShop.Cancel();
self:Cancel();
end
end
......@@ -81,6 +76,11 @@ function BarberShopMixin:OnKeyDown(key)
end
end
function BarberShopMixin:Cancel()
HideUIPanel(self);
C_BarberShop.Cancel();
end
function BarberShopMixin:Reset()
C_BarberShop.ResetCustomizationChoices();
local currentCharacterData = C_BarberShop.GetCurrentCharacterData();
......
......@@ -7,7 +7,7 @@
</Scripts>
</Button>
<Frame name="BarberShopFrame" mixin="DefaultScaleFrameMixin, BarberShopMixin" toplevel="true" setAllPoints="true" ignoreParentScale="true" enableKeyboard="true" hidden="true">
<Frame name="BarberShopFrame" inherits="DefaultScaleFrame" mixin="BarberShopMixin" toplevel="true" setAllPoints="true" ignoreParentScale="true" enableKeyboard="true" hidden="true">
<KeyValues>
<KeyValue key="maxScale" value="CHAR_CUSTOMIZE_MAX_SCALE" type="global"/>
</KeyValues>
......@@ -51,7 +51,7 @@
<Anchor point="BOTTOMLEFT" x="30" y="15"/>
</Anchors>
<KeyValues>
<KeyValue key="barberShopFunction" value="Cancel" type="string"/>
<KeyValue key="barberShopOnClickMethod" value="Cancel" type="string"/>
</KeyValues>
</Button>
......@@ -85,8 +85,8 @@
</Frame>
</Frames>
<Scripts>
<OnLoad method="OnLoad" />
<OnEvent method="OnEvent" />
<OnLoad method="OnLoad" inherit="prepend" />
<OnEvent method="OnEvent" inherit="prepend" />
<OnShow method="OnShow" />
<OnHide method="OnHide" />
<OnKeyDown method="OnKeyDown"/>
......
......@@ -71,6 +71,35 @@
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button name="KeybindsCancelButtonTemplate" inherits="UIPanelButtonTemplate" text="CANCEL" virtual="true" mixin="KeybindingsCancelButtonMixin">
<Size x="96" y="22"/>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<CheckButton name="KeybindsCharacterSpecificButtonTemplate" inherits="UICheckButtonTemplate" virtual="true" mixin="KeybindingsCharacterSpecificButtonMixin">
<Size x="20" y="20"/>
<HitRectInsets left="0" right="-100" top="0" bottom="0"/>
<Scripts>
<OnLoad method="OnLoad"/>
<OnClick method="OnClick"/>
<OnEnter method="OnEnter"/>
<OnLeave method="OnHide"/>
</Scripts>
</CheckButton>
<Button name="KeybindingsOkayButtonTemplate" inherits="UIPanelButtonTemplate" text="OKAY" virtual="true" mixin="KeybindingsOkayButtonMixin">
<Size x="96" y="22"/>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button name="KeybindingsDefaultsButtonTemplate" inherits="UIPanelButtonTemplate" text="RESET_TO_DEFAULT" virtual="true" mixin="KeybindingsDefaultsButtonMixin">
<Size x="130" y="22"/>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button name="KeybindingsPhantomFrameTemplate" inherits="QuickKeybindButtonTemplate" registerForClicks="AnyUp" virtual="true"/>
<Button name="KeyBindingFrame" parent="UIParent" toplevel="true" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true" mixin="KeyBindingFrameMixin">
<Size x="858" y="660"/>
......@@ -122,20 +151,10 @@
<KeyValue key="textString" value="KEY_BINDINGS" type="global"/>
</KeyValues>
</Frame>
<CheckButton parentKey="characterSpecificButton" inherits="UICheckButtonTemplate" mixin="KeybindingsCharacterSpecificButtonMixin">
<Size x="20" y="20"/>
<CheckButton parentKey="characterSpecificButton" inherits="KeybindsCharacterSpecificButtonTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPRIGHT" x="-245" y="-20"/>
</Anchors>
<HitRectInsets>
<AbsInset left="0" right="-100" top="0" bottom="0"/>
</HitRectInsets>
<Scripts>
<OnLoad method="OnLoad"/>
<OnClick method="OnClick"/>
<OnEnter method="OnEnter"/>
<OnLeave method="OnHide"/>
</Scripts>
</CheckButton>
<Button parentKey="unbindButton" inherits="UIPanelButtonTemplate" text="UNBIND" mixin="KeybindingsUnbindButtonMixin">
<Size x="130" y="22"/>
......@@ -146,32 +165,29 @@
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button parentKey="okayButton" inherits="UIPanelButtonTemplate" text="OKAY" mixin="KeybindingsOkayButtonMixin">
<Size x="96" y="22"/>
<Button parentKey="okayButton" inherits="KeybindingsOkayButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeKey="$parent.unbindButton" relativePoint="BOTTOMRIGHT"/>
</Anchors>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button parentKey="cancelButton" inherits="UIPanelButtonTemplate" text="CANCEL" mixin="KeybindingsCancelButtonMixin">
<Size x="96" y="22"/>
<Button parentKey="cancelButton" inherits="KeybindsCancelButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeKey="$parent.okayButton" relativePoint="BOTTOMRIGHT"/>
</Anchors>
</Button>
<Button parentKey="quickKeybindButton" inherits="UIPanelButtonTemplate" text="QUICK_KEYBIND_MODE_BUTTON" mixin="QuickKeybindButtonMixin">
<Size x="160" y="22"/>
<Anchors>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.unbindButton" relativePoint="BOTTOMLEFT"/>
</Anchors>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Button parentKey="defaultsButton" inherits="UIPanelButtonTemplate" text="RESET_TO_DEFAULT" mixin="KeybindingsDefaultsButtonMixin">
<Size x="130" y="22"/>
<Button parentKey="defaultsButton" inherits="KeybindingsDefaultsButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" x="16" y="16"/>
</Anchors>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
</Button>
<Frame name="$parentCategoryList" parentKey="categoryList" inherits="OptionsFrameListTemplate">
<Size x="175" y="569"/>
......@@ -249,4 +265,99 @@
<OnMouseWheel method="OnMouseWheel"/>
</Scripts>
</Button>
<Button name="QuickKeybindFrame" parent="UIParent" toplevel="true" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true" mixin="QuickKeybindFrameMixin">
<Size x="450" y="250"/>
<Anchors>