Commit 86c6efda authored by TOM_RUS's avatar TOM_RUS

WOW-31599patch8.2.5_PTR

parent c9c569f2
......@@ -292,6 +292,20 @@ local ClubFinder =
{ Name = "pageSize", Type = "number", Nilable = false },
},
},
{
Name = "RequestPostingInformationFromClubId",
Type = "Function",
Arguments =
{
{ Name = "clubId", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "success", Type = "bool", Nilable = false },
},
},
{
Name = "RequestSubscribedClubPostingIDs",
Type = "Function",
......@@ -458,6 +472,16 @@ local ClubFinder =
Type = "Event",
LiteralName = "CLUB_FINDER_RECRUIT_LIST_CHANGED",
},
{
Name = "ClubFinderRecruitmentPostReturned",
Type = "Event",
LiteralName = "CLUB_FINDER_RECRUITMENT_POST_RETURNED",
Documentation = { "Signals when our recruitment post we just requested is returned back to us" },
Payload =
{
{ Name = "type", Type = "ClubFinderRequestType", Nilable = false },
},
},
{
Name = "ClubFinderRecruitsUpdated",
Type = "Event",
......@@ -578,6 +602,7 @@ local ClubFinder =
{ Name = "ilvl", Type = "number", Nilable = false },
{ Name = "specIds", Type = "table", InnerType = "number", Nilable = false },
{ Name = "requestStatus", Type = "PlayerClubRequestStatus", Nilable = false },
{ Name = "lookupSuccess", Type = "bool", Nilable = false },
},
},
{
......@@ -613,6 +638,7 @@ local ClubFinder =
{ Name = "cacheRequested", Type = "number", Nilable = false },
{ Name = "lastPosterGUID", Type = "string", Nilable = false },
{ Name = "clubId", Type = "string", Nilable = false },
{ Name = "lastUpdatedTime", Type = "number", Nilable = false },
},
},
{
......
......@@ -92,10 +92,12 @@ local Expansion =
{
Name = "GetMaxLevelForExpansionLevel",
Type = "Function",
Documentation = { "Maps an expansion level to a maximum character level for that expansion, optionally takes a useModernLevelMapping instead of legacy level mapping. Legacy treats the maxes as the original caps for those expansions." },
Arguments =
{
{ Name = "expansionLevel", Type = "number", Nilable = false },
{ Name = "useModernLevelMapping", Type = "bool", Nilable = false, Default = false },
},
Returns =
......
......@@ -6,6 +6,39 @@ local PartyInfo =
Functions =
{
{
Name = "AllowedToDoPartyConversion",
Type = "Function",
Arguments =
{
{ Name = "toRaid", Type = "bool", Nilable = false },
},
Returns =
{
{ Name = "allowed", Type = "bool", Nilable = false },
},
},
{
Name = "ConfirmConvertToRaid",
Type = "Function",
Documentation = { "Immediately convert to raid with no regard for potentially destructive actions" },
},
{
Name = "ConfirmLeaveParty",
Type = "Function",
Documentation = { "Immediately leave the party with no regard for potentially destructive actions" },
},
{
Name = "ConvertToParty",
Type = "Function",
},
{
Name = "ConvertToRaid",
Type = "Function",
Documentation = { "Usually this will convert to raid immediately. In some cases (e.g. PartySync) the user will be prompted to confirm converting to raid, because it's potentially destructive" },
},
{
Name = "GetActiveCategories",
Type = "Function",
......@@ -47,10 +80,20 @@ local PartyInfo =
{ Name = "outClubId", Type = "string", Nilable = false },
},
},
{
Name = "LeaveParty",
Type = "Function",
Documentation = { "Usually this will leave the party immediately. In some cases (e.g. PartySync) the user will be prompted to confirm leaving the party, because it's potentially destructive" },
},
},
Events =
{
{
Name = "ConvertToRaidConfirmation",
Type = "Event",
LiteralName = "CONVERT_TO_RAID_CONFIRMATION",
},
{
Name = "EnteredDifferentInstanceFromParty",
Type = "Event",
......@@ -111,6 +154,11 @@ local PartyInfo =
Type = "Event",
LiteralName = "INSTANCE_GROUP_SIZE_CHANGED",
},
{
Name = "LeavePartyConfirmation",
Type = "Event",
LiteralName = "LEAVE_PARTY_CONFIRMATION",
},
{
Name = "PartyInviteCancel",
Type = "Event",
......
......@@ -415,6 +415,24 @@ local PvpInfo =
{ Name = "battlemasterListInfo", Type = "BattlemasterListInfo", Nilable = false },
},
},
{
Name = "GetSpecialEventDetails",
Type = "Function",
Returns =
{
{ Name = "info", Type = "SpecialEventDetails", Nilable = true },
},
},
{
Name = "GetSpecialEventInfo",
Type = "Function",
Returns =
{
{ Name = "info", Type = "RandomBGInfo", Nilable = false },
},
},
{
Name = "GetTeamInfo",
Type = "Function",
......@@ -1059,6 +1077,17 @@ local PvpInfo =
{ Name = "stats", Type = "table", InnerType = "PVPStatInfo", Nilable = false },
},
},
{
Name = "SpecialEventDetails",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false },
{ Name = "achievementID", Type = "number", Nilable = false },
{ Name = "isActive", Type = "bool", Nilable = false },
},
},
{
Name = "PVPTeamInfo",
Type = "Structure",
......
......@@ -373,6 +373,7 @@ local QuestLog =
Payload =
{
{ Name = "questID", Type = "number", Nilable = false },
{ Name = "wasReplayQuest", Type = "bool", Nilable = false },
},
},
{
......
......@@ -12,16 +12,16 @@ local QuestSessionConstants =
{
{ 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 = "Stop", Type = "QuestSessionCommand", EnumValue = 2 },
{ Name = "SessionActiveNoCommand", Type = "QuestSessionCommand", EnumValue = 3 },
},
},
{
Name = "QuestSessionResult",
Type = "Enumeration",
NumValues = 27,
NumValues = 28,
MinValue = 0,
MaxValue = 26,
MaxValue = 27,
Fields =
{
{ Name = "Ok", Type = "QuestSessionResult", EnumValue = 0 },
......@@ -50,7 +50,8 @@ local QuestSessionConstants =
{ Name = "JoinRejected", Type = "QuestSessionResult", EnumValue = 23 },
{ Name = "Logout", Type = "QuestSessionResult", EnumValue = 24 },
{ Name = "Empty", Type = "QuestSessionResult", EnumValue = 25 },
{ Name = "Unknown", Type = "QuestSessionResult", EnumValue = 26 },
{ Name = "QuestNotCompleted", Type = "QuestSessionResult", EnumValue = 26 },
{ Name = "Unknown", Type = "QuestSessionResult", EnumValue = 27 },
},
},
},
......
......@@ -7,16 +7,7 @@ local QuestSession =
Functions =
{
{
Name = "CanDrop",
Type = "Function",
Returns =
{
{ Name = "allowed", Type = "bool", Nilable = false },
},
},
{
Name = "CanJoin",
Name = "CanStart",
Type = "Function",
Returns =
......@@ -25,7 +16,7 @@ local QuestSession =
},
},
{
Name = "CanStart",
Name = "CanStop",
Type = "Function",
Returns =
......@@ -69,15 +60,6 @@ local QuestSession =
{ Name = "details", Type = "QuestSessionPlayerDetails", Nilable = true },
},
},
{
Name = "GetSessionJoinRequestDetails",
Type = "Function",
Returns =
{
{ Name = "details", Type = "QuestSessionJoinRequestDetails", Nilable = true },
},
},
{
Name = "GetSuperTrackedQuest",
Type = "Function",
......@@ -106,15 +88,11 @@ local QuestSession =
},
},
{
Name = "RequestSessionDrop",
Type = "Function",
},
{
Name = "RequestSessionJoin",
Name = "RequestSessionStart",
Type = "Function",
},
{
Name = "RequestSessionStart",
Name = "RequestSessionStop",
Type = "Function",
},
{
......@@ -126,16 +104,6 @@ local QuestSession =
{ Name = "beginSession", Type = "bool", Nilable = false },
},
},
{
Name = "SendSessionJoinRequestResponse",
Type = "Function",
Arguments =
{
{ Name = "requesterGUID", Type = "string", Nilable = false },
{ Name = "accept", Type = "bool", Nilable = false },
},
},
{
Name = "SetQuestIsSuperTracked",
Type = "Function",
......@@ -169,11 +137,6 @@ local QuestSession =
{ Name = "enabled", Type = "bool", Nilable = false },
},
},
{
Name = "QuestSessionJoinRequest",
Type = "Event",
LiteralName = "QUEST_SESSION_JOIN_REQUEST",
},
{
Name = "QuestSessionJoined",
Type = "Event",
......@@ -189,16 +152,6 @@ local QuestSession =
Type = "Event",
LiteralName = "QUEST_SESSION_MEMBER_CONFIRM",
},
{
Name = "QuestSessionMemberJoinResponse",
Type = "Event",
LiteralName = "QUEST_SESSION_MEMBER_JOIN_RESPONSE",
Payload =
{
{ Name = "guid", Type = "string", Nilable = false },
{ Name = "response", Type = "bool", Nilable = false },
},
},
{
Name = "QuestSessionMemberStartResponse",
Type = "Event",
......@@ -232,15 +185,6 @@ local QuestSession =
{ Name = "guid", Type = "string", Nilable = false },
},
},
{
Name = "QuestSessionJoinRequestDetails",
Type = "Structure",
Fields =
{
{ Name = "requesterDetails", Type = "QuestSessionPlayerDetails", Nilable = false },
{ Name = "joinedMembers", Type = "table", InnerType = "string", Nilable = false },
},
},
},
};
......
......@@ -42,6 +42,21 @@ local RecruitAFriend =
{ Name = "systemInfo", Type = "RafSystemInfo", Nilable = false },
},
},
{
Name = "GetRecruitActivityRequirementsText",
Type = "Function",
Arguments =
{
{ Name = "activityID", Type = "number", Nilable = false },
{ Name = "acceptanceID", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "requirementsText", Type = "table", InnerType = "string", Nilable = false },
},
},
{
Name = "GetRecruitInfo",
Type = "Function",
......@@ -177,6 +192,19 @@ local RecruitAFriend =
{ Name = "Inactive", Type = "RafRecruitSubStatus", EnumValue = 2 },
},
},
{
Name = "RafRecruitActivityState",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "Incomplete", Type = "RafRecruitActivityState", EnumValue = 0 },
{ Name = "Complete", Type = "RafRecruitActivityState", EnumValue = 1 },
{ Name = "RewardClaimed", Type = "RafRecruitActivityState", EnumValue = 2 },
},
},
{
Name = "RafPetInfo",
Type = "Structure",
......@@ -268,7 +296,17 @@ local RecruitAFriend =
{ Name = "totalUses", Type = "number", Nilable = false },
{ Name = "remainingUses", Type = "number", Nilable = false },
{ Name = "sourceRealm", Type = "string", Nilable = false },
{ Name = "sourceFaction", Type = "number", Nilable = false },
{ Name = "sourceFaction", Type = "string", Nilable = false },
},
},
{
Name = "RafRecruitActivity",
Type = "Structure",
Fields =
{
{ Name = "activityID", Type = "number", Nilable = false },
{ Name = "rewardQuestID", Type = "number", Nilable = false },
{ Name = "state", Type = "RafRecruitActivityState", Nilable = false },
},
},
{
......@@ -281,6 +319,8 @@ local RecruitAFriend =
{ Name = "battleTag", Type = "string", Nilable = false },
{ Name = "monthsRemaining", Type = "number", Nilable = false },
{ Name = "subStatus", Type = "RafRecruitSubStatus", Nilable = false },
{ Name = "acceptanceID", Type = "string", Nilable = false },
{ Name = "activities", Type = "table", InnerType = "RafRecruitActivity", Nilable = false },
},
},
{
......
......@@ -4536,7 +4536,7 @@ function CalendarCreateEventRaidInviteButton_OnEvent(self, event, ...)
if ( IsInGroup(LE_PARTY_CATEGORY_HOME) and not IsInRaid(LE_PARTY_CATEGORY_HOME) and self.inviteLostMembers ) then
-- in case we weren't able to convert to a raid when the player clicked the raid invite button
-- (which means the player was not in a party), we want to convert to a raid now since he has a party
ConvertToRaid();
C_PartyInfo.ConvertToRaid();
end
end
end
......@@ -4552,7 +4552,7 @@ function CalendarCreateEventRaidInviteButton_OnClick(self)
self.inviteLostMembers = true;
if ( realNumGroupMembers > 0 ) then
--...and I'm already in a party, then I need to form a raid first to fit everyone
ConvertToRaid();
C_PartyInfo.ConvertToRaid();
return;
end
end
......@@ -5421,7 +5421,7 @@ function CalendarClassTotalsButton_OnEvent(self, event, ...)
if ( CalendarEventGetNumInvites() > MAX_PARTY_MEMBERS + 1 and GetRealNumPartyMembers() >= 1 and GetRealNumRaidMembers() == 0 ) then
-- we don't have a good way of knowing in advance whether or not we need a raid to accomodate all our invites
-- so we're going to create a raid as soon as possible
ConvertToRaid();
C_PartyInfo.ConvertToRaid();
end
CalendarClassTotalsButton_Update();
end
......
......@@ -38,26 +38,18 @@ function SuppressedMountEquipmentButtonMixin:OnLeave()
GameTooltip:Hide();
end
AlertMountEquipmentFeatureMixin = {};
AlertMountEquipmentFeatureMixin = CreateFromMixins(NewFeatureLabelMixin);
function AlertMountEquipmentFeatureMixin:ClearAlert()
NewFeatureLabelMixin.ClearAlert(self);
SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_MOUNT_EQUIPMENT_SLOT_FRAME, true);
CollectionsMicroButton_SetAlertShown(false);
self:SetShown(false);
end
function AlertMountEquipmentFeatureMixin:ValidateIsShown()
self:SetShown(not GetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_MOUNT_EQUIPMENT_SLOT_FRAME));
end
function AlertMountEquipmentFeatureMixin:OnShow()
self.Fade:Play();
end
function AlertMountEquipmentFeatureMixin:OnHide()
self.Fade:Stop();
end
MountEquipmentButtonMixin = {};
function MountEquipmentButtonMixin:Initialize(item)
self.ItemIcon:SetTexture(item and item:GetItemIcon() or nil);
......
......@@ -2,7 +2,7 @@
..\FrameXML\UI.xsd">
<Script file="Blizzard_MountCollection.lua"/>
<Frame name="AlertMountEquipmentFeatureTemplate" mixin="AlertMountEquipmentFeatureMixin" virtual="true">
<Frame name="AlertMountEquipmentFeatureTemplate" inherits="NewFeatureLabelTemplate" mixin="AlertMountEquipmentFeatureMixin" virtual="true">
<Size x="1" y="1"/>
<Layers>
<Layer level="OVERLAY" textureSubLevel="1">
......
......@@ -350,11 +350,11 @@ function CommentatorUnitFrameMixin:SetFlagInfo(hasFlag)
UIFrameFlash(self.FlagIconHighlight, 0.5, 0.5, -1);
if self.teamIndex == 1 then
self.FlagIcon:SetAtlas("tournamentarena-flag-large-blue");
self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-blue-flash");
self.FlagIcon:SetAtlas("tournamentarena-flag-large-blue", true);
self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-blue-flash", true);
else
self.FlagIcon:SetAtlas("tournamentarena-flag-large-red");
self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-red-flash");
self.FlagIcon:SetAtlas("tournamentarena-flag-large-red", true);
self.FlagIconHighlight:SetAtlas("tournamentarena-flag-large-red-flash", true);
end
else
UIFrameFlashStop(self.FlagIconHighlight);
......
......@@ -678,6 +678,7 @@
</Button>
</Frames>
<Scripts>
<OnShow method="OnShow"/>
<OnHide method="OnHide"/>
</Scripts>
</Frame>
......@@ -962,7 +963,7 @@
</Scripts>
</Frame>
<Button name="ClubFinderCommunitiesCardTemplate" mixin="ClubFinderCommunitiesCardMixin" virtual="true">
<Button name="ClubFinderCommunitiesCardTemplate" motionScriptsWhileDisabled="true" mixin="ClubFinderCommunitiesCardMixin" virtual="true">
<Size x="570" y="71"/>
<Anchors>
<Anchor point="CENTER" x="20" y="-20"/>
......@@ -1038,7 +1039,7 @@
</Layer>
</Layers>
<Frames>
<Button parentKey="RequestJoin">
<Frame parentKey="RequestJoin">
<Size x="60" y="60"/>
<Anchors>
<Anchor point="RIGHT"/>
......@@ -1053,14 +1054,16 @@
</Anchors>
</Texture>
</Layer>
<Layer level="BORDER">
<Texture parentKey="AddTexture" atlas="communities-icon-addgroupplus">
<Size x="40" y="40"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<NormalTexture parentKey="AddTexture" atlas="communities-icon-addgroupplus">
<Size x="40" y="40"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</NormalTexture>
</Button>
</Frame>
<Frame parentKey="RightClickDropdown" inherits="UIDropDownMenuTemplate" hidden="true"/>
</Frames>
<Scripts>
......@@ -1098,6 +1101,17 @@
<Frame name="ClubFinderOptionsTemplate" mixin="ClubFinderOptionsMixin" virtual="true">
<Frames>
<Frame parentKey="PendingTextFrame" hidden="true">
<Size x="300" y="80"/>
<Anchors>
<Anchor point="TOPLEFT" x="15" y="40"/>
</Anchors>
<Layers>
<Layer level="ARTWORK">
<FontString parentKey="Text" justifyH="LEFT" inherits="GameFontNormalLarge" text="CLUB_FINDER_PENDING_CLUBS_LIST"/>
</Layer>
</Layers>
</Frame>
<Frame parentKey="ClubFocusDropdown" hidden="true" name="ClubFinderFocusDropdown" inherits="ClubFinderFocusDropdownTemplate">
<Anchors>
<Anchor point="TOPLEFT" x="-1" y="18"/>
......@@ -1233,6 +1247,7 @@
</Frames>
<Scripts>
<OnLoad method="OnLoad"