Commit c9c569f2 authored by TOM_RUS's avatar TOM_RUS

WOW-31521patch8.2.5_PTR

parent 91a27271
......@@ -7,7 +7,36 @@ local BattleNet =
Functions =
{
{
Name = "GetAccountInfoByFriendIndex",
Name = "GetAccountInfoByGUID",
Type = "Function",
Arguments =
{
{ Name = "guid", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "accountInfo", Type = "BNetAccountInfo", Nilable = true },
},
},
{
Name = "GetAccountInfoByID",
Type = "Function",
Arguments =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "wowAccountGUID", Type = "string", Nilable = true },
},
Returns =
{
{ Name = "accountInfo", Type = "BNetAccountInfo", Nilable = true },
},
},
{
Name = "GetFriendAccountInfo",
Type = "Function",
Arguments =
......@@ -22,7 +51,36 @@ local BattleNet =
},
},
{
Name = "GetAccountInfoByGUID",
Name = "GetFriendGameAccountInfo",
Type = "Function",
Arguments =
{
{ Name = "friendIndex", Type = "number", Nilable = false },
{ Name = "accountIndex", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "gameAccountInfo", Type = "BNetGameAccountInfo", Nilable = true },
},
},
{
Name = "GetFriendNumGameAccounts",
Type = "Function",
Arguments =
{
{ Name = "friendIndex", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "numGameAccounts", Type = "number", Nilable = false },
},
},
{
Name = "GetGameAccountInfoByGUID",
Type = "Function",
Arguments =
......@@ -32,22 +90,21 @@ local BattleNet =
Returns =
{
{ Name = "accountInfo", Type = "BNetAccountInfo", Nilable = true },
{ Name = "gameAccountInfo", Type = "BNetGameAccountInfo", Nilable = true },
},
},
{
Name = "GetAccountInfoByID",
Name = "GetGameAccountInfoByID",
Type = "Function",
Arguments =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "wowAccountGUID", Type = "string", Nilable = true },
},
Returns =
{
{ Name = "accountInfo", Type = "BNetAccountInfo", Nilable = true },
{ Name = "gameAccountInfo", Type = "BNetGameAccountInfo", Nilable = true },
},
},
},
......@@ -59,24 +116,11 @@ local BattleNet =
Tables =
{
{
Name = "BNetAccountInfo",
Name = "BNetGameAccountInfo",
Type = "Structure",
Fields =
{
{ Name = "bnetAccountID", Type = "number", Nilable = false },
{ Name = "gameAccountID", Type = "number", Nilable = true },
{ Name = "accountName", Type = "string", Nilable = false },
{ Name = "battleTag", Type = "string", Nilable = false },
{ Name = "isFriend", Type = "bool", Nilable = false },
{ Name = "isBattleTagFriend", Type = "bool", Nilable = false },
{ Name = "lastOnlineTime", Type = "number", Nilable = false },
{ Name = "isAFK", Type = "bool", Nilable = false },
{ Name = "isDND", Type = "bool", Nilable = false },
{ Name = "isFavorite", Type = "bool", Nilable = false },
{ Name = "appearOffline", Type = "bool", Nilable = false },
{ Name = "customMessage", Type = "string", Nilable = false },
{ Name = "customMessageTime", Type = "number", Nilable = false },
{ Name = "note", Type = "string", Nilable = false },
{ Name = "clientProgram", Type = "string", Nilable = false },
{ Name = "isOnline", Type = "bool", Nilable = false },
{ Name = "isGameBusy", Type = "bool", Nilable = false },
......@@ -93,8 +137,30 @@ local BattleNet =
{ Name = "richPresence", Type = "string", Nilable = true },
{ Name = "playerGuid", Type = "string", Nilable = true },
{ Name = "isWowMobile", Type = "bool", Nilable = false },
{ Name = "rafLinkType", Type = "RafLinkType", Nilable = false },
{ Name = "canSummon", Type = "bool", Nilable = false },
{ Name = "hasFocus", Type = "bool", Nilable = false },
},
},
{
Name = "BNetAccountInfo",
Type = "Structure",
Fields =
{
{ Name = "bnetAccountID", Type = "number", Nilable = false },
{ Name = "accountName", Type = "string", Nilable = false },
{ Name = "battleTag", Type = "string", Nilable = false },
{ Name = "isFriend", Type = "bool", Nilable = false },
{ Name = "isBattleTagFriend", Type = "bool", Nilable = false },
{ Name = "lastOnlineTime", Type = "number", Nilable = false },
{ Name = "isAFK", Type = "bool", Nilable = false },
{ Name = "isDND", Type = "bool", Nilable = false },
{ Name = "isFavorite", Type = "bool", Nilable = false },
{ Name = "appearOffline", Type = "bool", Nilable = false },
{ Name = "customMessage", Type = "string", Nilable = false },
{ Name = "customMessageTime", Type = "number", Nilable = false },
{ Name = "note", Type = "string", Nilable = false },
{ Name = "rafLinkType", Type = "RafLinkType", Nilable = false },
{ Name = "gameAccountInfo", Type = "BNetGameAccountInfo", Nilable = false },
},
},
},
......
......@@ -129,7 +129,7 @@ local ClubFinder =
Returns =
{
{ Name = "clubInfo", Type = "table", InnerType = "RecruitingClubInfo", Nilable = false },
{ Name = "clubInfo", Type = "RecruitingClubInfo", Nilable = false },
},
},
{
......@@ -143,7 +143,7 @@ local ClubFinder =
Returns =
{
{ Name = "clubInfo", Type = "table", InnerType = "RecruitingClubInfo", Nilable = false },
{ Name = "clubInfo", Type = "RecruitingClubInfo", Nilable = false },
},
},
{
......@@ -229,6 +229,18 @@ local ClubFinder =
{ Name = "succesful", Type = "bool", Nilable = false },
},
},
{
Name = "ReportPosting",
Type = "Function",
Arguments =
{
{ Name = "reportType", Type = "ClubFinderPostingReportType", Nilable = false },
{ Name = "clubFinderGUID", Type = "string", Nilable = false },
{ Name = "playerGUID", Type = "string", Nilable = false },
{ Name = "complaintNote", Type = "string", Nilable = false },
},
},
{
Name = "RequestApplicantList",
Type = "Function",
......@@ -394,6 +406,7 @@ local ClubFinder =
LiteralName = "CLUB_FINDER_APPLICATIONS_UPDATED",
Payload =
{
{ Name = "type", Type = "ClubFinderRequestType", Nilable = false },
{ Name = "clubFinderGUIDs", Type = "table", InnerType = "string", Nilable = false },
},
},
......@@ -506,16 +519,18 @@ local ClubFinder =
},
},
{
Name = "ClubFinderReportType",
Name = "ClubFinderPostingReportType",
Type = "Enumeration",
NumValues = 3,
NumValues = 5,
MinValue = 0,
MaxValue = 2,
MaxValue = 4,
Fields =
{
{ Name = "Any", Type = "ClubFinderReportType", EnumValue = 0 },
{ Name = "InapropriateName", Type = "ClubFinderReportType", EnumValue = 1 },
{ Name = "InapropriateComment", Type = "ClubFinderReportType", EnumValue = 2 },
{ Name = "PostersName", Type = "ClubFinderPostingReportType", EnumValue = 0 },
{ Name = "ClubName", Type = "ClubFinderPostingReportType", EnumValue = 1 },
{ Name = "PostingDescription", Type = "ClubFinderPostingReportType", EnumValue = 2 },
{ Name = "ApplicantsName", Type = "ClubFinderPostingReportType", EnumValue = 3 },
{ Name = "JoinNote", Type = "ClubFinderPostingReportType", EnumValue = 4 },
},
},
{
......@@ -596,6 +611,8 @@ local ClubFinder =
{ Name = "minILvl", Type = "number", Nilable = false },
{ Name = "cached", Type = "number", Nilable = false },
{ Name = "cacheRequested", Type = "number", Nilable = false },
{ Name = "lastPosterGUID", Type = "string", Nilable = false },
{ Name = "clubId", Type = "string", Nilable = false },
},
},
{
......
......@@ -79,6 +79,15 @@ local GuildInfo =
Name = "GuildRoster",
Type = "Function",
},
{
Name = "IsGuildOfficer",
Type = "Function",
Returns =
{
{ Name = "isOfficer", Type = "bool", Nilable = false },
},
},
{
Name = "IsGuildRankAssignmentAllowed",
Type = "Function",
......
......@@ -2,12 +2,26 @@ local QuestSessionConstants =
{
Tables =
{
{
Name = "QuestSessionCommand",
Type = "Enumeration",
NumValues = 4,
MinValue = 0,
MaxValue = 3,
Fields =
{
{ Name = "None", Type = "QuestSessionCommand", EnumValue = 0 },
{ Name = "Start", Type = "QuestSessionCommand", EnumValue = 1 },
{ Name = "Join", Type = "QuestSessionCommand", EnumValue = 2 },
{ Name = "Drop", Type = "QuestSessionCommand", EnumValue = 3 },
},
},
{
Name = "QuestSessionResult",
Type = "Enumeration",
NumValues = 26,
NumValues = 27,
MinValue = 0,
MaxValue = 25,
MaxValue = 26,
Fields =
{
{ Name = "Ok", Type = "QuestSessionResult", EnumValue = 0 },
......@@ -35,7 +49,8 @@ local QuestSessionConstants =
{ Name = "Busy", Type = "QuestSessionResult", EnumValue = 22 },
{ Name = "JoinRejected", Type = "QuestSessionResult", EnumValue = 23 },
{ Name = "Logout", Type = "QuestSessionResult", EnumValue = 24 },
{ Name = "Unknown", Type = "QuestSessionResult", EnumValue = 25 },
{ Name = "Empty", Type = "QuestSessionResult", EnumValue = 25 },
{ Name = "Unknown", Type = "QuestSessionResult", EnumValue = 26 },
},
},
},
......
......@@ -6,6 +6,33 @@ local QuestSession =
Functions =
{
{
Name = "CanDrop",
Type = "Function",
Returns =
{
{ Name = "allowed", Type = "bool", Nilable = false },
},
},
{
Name = "CanJoin",
Type = "Function",
Returns =
{
{ Name = "allowed", Type = "bool", Nilable = false },
},
},
{
Name = "CanStart",
Type = "Function",
Returns =
{
{ Name = "allowed", Type = "bool", Nilable = false },
},
},
{
Name = "Exists",
Type = "Function",
......@@ -15,6 +42,24 @@ local QuestSession =
{ Name = "exists", Type = "bool", Nilable = false },
},
},
{
Name = "GetAvailableSessionCommand",
Type = "Function",
Returns =
{
{ Name = "command", Type = "QuestSessionCommand", Nilable = false },
},
},
{
Name = "GetPendingCommand",
Type = "Function",
Returns =
{
{ Name = "command", Type = "QuestSessionCommand", Nilable = false },
},
},
{
Name = "GetSessionBeginDetails",
Type = "Function",
......@@ -51,6 +96,15 @@ local QuestSession =
{ Name = "hasJoined", Type = "bool", Nilable = false },
},
},
{
Name = "HasPendingCommand",
Type = "Function",
Returns =
{
{ Name = "hasPendingCommand", Type = "bool", Nilable = false },
},
},
{
Name = "RequestSessionDrop",
Type = "Function",
......@@ -106,6 +160,15 @@ local QuestSession =
Type = "Event",
LiteralName = "QUEST_SESSION_DESTROYED",
},
{
Name = "QuestSessionEnabledStateChanged",
Type = "Event",
LiteralName = "QUEST_SESSION_ENABLED_STATE_CHANGED",
Payload =
{
{ Name = "enabled", Type = "bool", Nilable = false },
},
},
{
Name = "QuestSessionJoinRequest",
Type = "Event",
......
......@@ -263,6 +263,7 @@ local RecruitAFriend =
{
{ Name = "recruitmentCode", Type = "string", Nilable = false },
{ Name = "recruitmentURL", Type = "string", Nilable = false },
{ Name = "expireTime", Type = "number", Nilable = false },
{ Name = "remainingTimeSeconds", Type = "number", Nilable = false },
{ Name = "totalUses", Type = "number", Nilable = false },
{ Name = "remainingUses", Type = "number", Nilable = false },
......
......@@ -39,24 +39,6 @@ local System =
{ Name = "errorMessage", Type = "string", Nilable = false },
},
},
{
Name = "GlobalMouseDown",
Type = "Event",
LiteralName = "GLOBAL_MOUSE_DOWN",
Payload =
{
{ Name = "button", Type = "string", Nilable = false },
},
},
{
Name = "GlobalMouseUp",
Type = "Event",
LiteralName = "GLOBAL_MOUSE_UP",
Payload =
{
{ Name = "button", Type = "string", Nilable = false },
},
},
{
Name = "InitialHotfixesApplied",
Type = "Event",
......
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\..\FrameXML\UI.xsd">
<Script file="ClubFinder.lua"/>
<ScrollFrame name="ClubFinderEditBoxScrollFrameTemplate" inherits="InputScrollFrameTemplate" virtual="true">
<Size x="343" y="70"/>
<Anchors>
......@@ -645,7 +645,7 @@
</ScrollFrame>
</Frames>
</Frame>
<Button parentKey="Apply" inherits="UIPanelButtonTemplate" motionScriptsWhileDisabled="true" text="APPLY">
<Button parentKey="Apply" inherits="UIPanelButtonTemplate" motionScriptsWhileDisabled="true" text="CLUB_FINDER_APPLY">
<Size x="120" y="25"/>
<Anchors>
<Anchor point="BOTTOM" relativeKey="$parent.EditBox" relativePoint="BOTTOM" x="-80" y="15"/>
......@@ -812,16 +812,23 @@
</Anchors>
</Texture>
<FontString parentKey="Description" justifyH="CENTER" inherits="GameFontNormal">
<Size x="155" y="110"/>
<Size x="155" y="95"/>
<Anchors>
<Anchor point="BOTTOM" relativeKey="$parent.MemberIcon" relativePoint="BOTTOM" x="-10" y="-110"/>
<Anchor point="BOTTOM" relativeKey="$parent.MemberIcon" relativePoint="BOTTOM" x="-10" y="-95"/>
</Anchors>
</FontString>
<FontString parentKey="RequestStatus" inherits="GameFontNormal">
<Size x="150" y="110"/>
<Anchors>
<Anchor point="BOTTOM" x="0" y="-30"/>
<Anchor point="BOTTOM" x="0" y="-35"/>
</Anchors>
</FontString>
<FontString parentKey="Focus" inherits="GameFontNormalSmall2">
<Size x="150" y="110"/>
<Anchors>
<Anchor point="TOP" relativeKey="$parent.RequestStatus" x="0" y="20"/>
</Anchors>
<Color r="1.0" g="1.0" b="1.0"/>
</FontString>
</Layer>
</Layers>
......@@ -829,7 +836,7 @@
<Button parentKey="RequestJoin" inherits="UIPanelButtonTemplate" text="CLUB_FINDER_REQUEST_TO_JOIN">
<Size x="150" y="25"/>
<Anchors>
<Anchor point="BOTTOM" relativeKey="$parent.Description" relativePoint="BOTTOM" x="0" y="-31"/>
<Anchor point="BOTTOM" relativeKey="$parent.Description" relativePoint="BOTTOM" x="0" y="-46"/>
</Anchors>
<Scripts>
<OnClick>
......@@ -852,7 +859,7 @@
<Size x="100" y="15"/>
<Layers>
<Layer level="ARTWORK">
<FontString parentKey="GuildFocusDropdownLabel" text="CLUB_FINDER_FOCUS" justifyH="LEFT" inherits="GameFontHighlight">
<FontString parentKey="Label" text="CLUB_FINDER_FOCUS" justifyH="LEFT" inherits="GameFontHighlight">
<Size x="100" y="0"/>
<Anchors>
<Anchor point="TOPLEFT" x="20" y="13"/>
......@@ -873,7 +880,7 @@
<DisabledCheckedTexture file="Interface\Buttons\UI-CheckBox-Check-Disabled"/>
</CheckButton>
<Frame name="ClubFinderGuildCardsFrameTemplate" mixin="ClubFinderGuildCardsMixin" virtual ="true">
<Frame name="ClubFinderGuildCardsFrameTemplate" hidden="true" virtual ="true">
<Frames>
<Frame parentKey="FirstCard" parentArray="Cards" inherits="ClubFinderGuildCardTemplate">
<Anchors>
......@@ -940,23 +947,22 @@
</Scripts>
</Frame>
</Frames>
<Scripts>
<OnLoad method="OnLoad"/>
<OnHide method="OnHide"/>
<OnShow method="OnShow"/>
</Scripts>
</Frame>
<Frame name="ClubFinderRoleTemplate" virtual="true">
<Frame name="ClubFinderRoleTemplate" mixin="ClubFinderRoleMixin" virtual="true">
<Size x="34" y="34"/>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Icon"/>
</Layer>
</Layers>
<Scripts>
<OnEnter method="OnEnter"/>
<OnLeave method="OnLeave"/>
</Scripts>
</Frame>
<Frame name="ClubFinderCommunitiesCardTemplate" mixin="ClubFinderCommunitiesCardMixin" virtual="true">
<Button name="ClubFinderCommunitiesCardTemplate" mixin="ClubFinderCommunitiesCardMixin" virtual="true">
<Size x="570" y="71"/>
<Anchors>
<Anchor point="CENTER" x="20" y="-20"/>
......@@ -979,13 +985,13 @@
<FontString parentKey="Name" justifyH="LEFT" maxLines="1" inherits="GameFontHighlightMedium">
<Size x="400" y="0"/>
<Anchors>
<Anchor point="TOP" relativeKey="$parent.Description" relativePoint="TOP" x="-5" y="-7"/>
</Anchors>
<Anchor point="TOP" relativeKey="$parent.Description" relativePoint="TOP" x="-5" y="-7"/>
</Anchors>
</FontString>
<FontString parentKey="Description" maxLines="2" wordwrap="true" justifyH="LEFT" justifyV="TOP" inherits="GameFontNormalLeftGrey">
<Size x="400" y="0"/>
<Anchors>
<Anchor point="CENTER" x="-4"/>
<Anchor point="CENTER" x="-4"/>
</Anchors>
</FontString>
<FontString parentKey="MemberCount" inherits="GameFontNormal">
......@@ -1005,6 +1011,13 @@
<Anchor point="RIGHT" x="0" y="0"/>
</Anchors>
</FontString>
<FontString parentKey="Focus" justifyH="RIGHT" inherits="GameFontNormalSmall2">
<Size x="150" y="25"/>
<Anchors>
<Anchor point="BOTTOMLEFT" relativeKey="$parent.RequestStatus" relativePoint="BOTTOMLEFT" x="-160" y="0"/>
</Anchors>
<Color r="1.0" g="1.0" b="1.0"/>
</FontString>
</Layer>
<Layer level="BORDER">
<Texture parentKey="CommunityLogo" atlas="communities-icon-invitemail">
......@@ -1033,20 +1046,14 @@
<Layers>
<Layer level="ARTWORK">
<FontString parentKey="InvitedString" inherits="GameFontHighlight" hidden="true"/>
<Texture parentKey="Highlight" hidden="true" atlas="communities-icon-addgroupplus" alphaMode="ADD">
<Size x="40" y="40"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnClick>
PlaySound(SOUNDKIT.IG_MAINMENU_OPEN);
self:GetParent():RequestToJoinClub();