Commit 2b612c25 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-28151patch8.1.0_PTR

parent 1ee90881
......@@ -54,7 +54,6 @@ EncounterJournalDocumentation.lua
EquipmentManagerDocumentation.lua
ExpansionDocumentation.lua
FogOfWarDocumentation.lua
GMTicketInfoDocumentation.lua
GarrisonInfoDocumentation.lua
GlyphInfoDocumentation.lua
GossipInfoDocumentation.lua
......@@ -146,4 +145,6 @@ ZoneAbilityDocumentation.lua
CalendarDocumentation.lua
ClubDocumentation.lua
FriendListDocumentation.lua
GMTicketInfoDocumentation.lua
ReportSystemDocumentation.lua
# End documentation files here
......@@ -6,20 +6,6 @@ local ChatInfo =
Functions =
{
{
Name = "CanReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "canReport", Type = "bool", Nilable = false },
},
},
{
Name = "GetChannelRosterInfo",
Type = "Function",
......@@ -113,17 +99,6 @@ local ChatInfo =
{ Name = "successfulRequest", Type = "bool", Nilable = false },
},
},
{
Name = "ReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "complaintType", Type = "string", Nilable = false },
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = true },
{ Name = "comment", Type = "string", Nilable = true },
},
},
{
Name = "ResetDefaultZoneChannels",
Type = "Function",
......
......@@ -6,29 +6,6 @@ local IncomingSummon =
Functions =
{
{
Name = "ClearSummonInfo",
Type = "Function",
Arguments =
{
{ Name = "unit", Type = "string", Nilable = false },
},
},
{
Name = "GetSummonResponseTime",
Type = "Function",
Arguments =
{
{ Name = "unit", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "reponseTime", Type = "number", Nilable = false },
},
},
{
Name = "HasIncomingSummon",
Type = "Function",
......
......@@ -47,6 +47,7 @@ local Loot =
{ Name = "sex", Type = "number", Nilable = false },
{ Name = "personalLootToast", Type = "bool", Nilable = false },
{ Name = "currencyID", Type = "number", Nilable = true },
{ Name = "isSecondaryResult", Type = "bool", Nilable = false },
},
},
{
......
......@@ -35,7 +35,7 @@ local PartyPoseUI =
{
{ Name = "partyPoseID", Type = "number", Nilable = false },
{ Name = "mapID", Type = "number", Nilable = false },
{ Name = "widgetSetID", Type = "number", Nilable = false },
{ Name = "widgetSetID", Type = "number", Nilable = true },
{ Name = "victoryModelSceneID", Type = "number", Nilable = false },
{ Name = "defeatModelSceneID", Type = "number", Nilable = false },
{ Name = "victorySoundKitID", Type = "number", Nilable = false },
......
......@@ -6,6 +6,33 @@ local QuestChoice =
Functions =
{
{
Name = "GetQuestChoiceOptionInfo",
Type = "Function",
Arguments =
{
{ Name = "optionIndex", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "responseID", Type = "number", Nilable = false },
{ Name = "buttonText", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false },
{ Name = "header", Type = "string", Nilable = false },
{ Name = "choiceArtID", Type = "number", Nilable = false },
{ Name = "confirmation", Type = "string", Nilable = true },
{ Name = "widgetSetID", Type = "number", Nilable = true },
{ Name = "disabledButton", Type = "bool", Nilable = false },
{ Name = "desaturatedArt", Type = "bool", Nilable = false },
{ Name = "groupID", Type = "number", Nilable = true },
{ Name = "headerIconAtlasElement", Type = "string", Nilable = true },
{ Name = "subHeader", Type = "string", Nilable = true },
{ Name = "buttonTooltip", Type = "string", Nilable = true },
{ Name = "rewardQuestID", Type = "number", Nilable = true },
},
},
},
Events =
......
local ReportPlayer =
{
Name = "ReportSystem",
Type = "System",
Namespace = "C_ReportPlayer",
Functions =
{
{
Name = "CanReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "canReport", Type = "bool", Nilable = false },
},
},
{
Name = "ReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "complaintType", Type = "string", Nilable = false },
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = true },
{ Name = "comment", Type = "string", Nilable = true },
},
},
},
Events =
{
},
Tables =
{
},
};
APIDocumentation:AddDocumentationTable(ReportPlayer);
\ No newline at end of file
local ReportSystem =
{
Name = "ReportSystem",
Type = "System",
Namespace = "C_ReportSystem",
Functions =
{
{
Name = "CanReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "canReport", Type = "bool", Nilable = false },
},
},
{
Name = "ReportPlayer",
Type = "Function",
Arguments =
{
{ Name = "complaintType", Type = "string", Nilable = false },
{ Name = "playerLocation", Type = "table", Mixin = "PlayerLocationMixin", Nilable = true },
{ Name = "comment", Type = "string", Nilable = true },
},
},
{
Name = "SetPendingReportPetTarget",
Type = "Function",
Arguments =
{
{ Name = "target", Type = "string", Nilable = true },
},
Returns =
{
{ Name = "set", Type = "bool", Nilable = false },
},
},
{
Name = "SetPendingReportTarget",
Type = "Function",
Arguments =
{
{ Name = "target", Type = "string", Nilable = true },
},
Returns =
{
{ Name = "set", Type = "bool", Nilable = false },
},
},
{
Name = "SetPendingReportTargetByGuid",
Type = "Function",
Arguments =
{
{ Name = "guid", Type = "string", Nilable = true },
},
Returns =
{
{ Name = "set", Type = "bool", Nilable = false },
},
},
},
Events =
{
{
Name = "ReportPlayerResult",
Type = "Event",
LiteralName = "REPORT_PLAYER_RESULT",
Payload =
{
{ Name = "success", Type = "bool", Nilable = false },
},
},
},
Tables =
{
},
};
APIDocumentation:AddDocumentationTable(ReportSystem);
\ No newline at end of file
......@@ -32,7 +32,12 @@ local LAYOUT_TIER_INFO = {
-0.94579392,
math.pi,
};
[4] = DEFAULT_FOUR_POWERS,
[4] = {
0.8787,
-0.8787,
2.2476,
-2.2476,
};
[5] = {
0.94579392,
-0.94579392,
......@@ -40,6 +45,14 @@ local LAYOUT_TIER_INFO = {
-2.22843639,
math.pi,
},
[6] = {
0.8787,
-0.8787,
1.7353,
-1.7353,
2.5478,
-2.5478,
};
},
},
{
......
......@@ -10,6 +10,7 @@ local AZERITE_EMPOWERED_FRAME_EVENTS = {
"AZERITE_ITEM_POWER_LEVEL_CHANGED",
"AZERITE_EMPOWERED_ITEM_SELECTION_UPDATED",
"PLAYER_EQUIPMENT_CHANGED",
"SCRAPPING_MACHINE_SCRAPPING_FINISHED",
};
AZERITE_EMPOWERED_ITEM_MAX_TIERS = 5;
......@@ -37,6 +38,11 @@ function AzeriteEmpoweredItemUIMixin:OnLoad()
rankFrame.RingLights.transformNode = rankFrame.RingBg.transformNode:CreateNodeFromTexture(rankFrame.RingLights);
end
local _, classFilename = UnitClass("player");
if ( classFilename == "DRUID" ) then
self.ClipFrame.BackgroundFrame.RankFrames[1].RingBg:SetAtlas("Azerite-TitanBG-Rank5-1Gear");
end
local function TierReset(framePool, frame)
FramePool_HideAndClearAnchors(framePool, frame);
frame:Reset();
......@@ -100,6 +106,8 @@ function AzeriteEmpoweredItemUIMixin:OnEvent(event, ...)
if self.azeriteItemDataSource:DidEquippedItemChange(equipmentSlot) then
self:Clear();
end
elseif event == "SCRAPPING_MACHINE_SCRAPPING_FINISHED" then
HideUIPanel(self);
end
end
......@@ -326,9 +334,8 @@ function AzeriteEmpoweredItemUIMixin:AdjustSizeForTiers(numTiers)
self.ClipFrame.BackgroundFrame.KeyOverlay.Texture:SetAtlas("Azerite-CenterBG-5Ranks", true);
self.ClipFrame.BackgroundFrame.KeyOverlay.Texture:SetPoint("CENTER", 0, 245);
self.ClipFrame.BackgroundFrame.Bg:SetAtlas("Azerite-Background", false);
-- TODO: Get atlas changed?
self.ClipFrame.BackgroundFrame.Bg:SetSize(1250, 1250);
self:SetSize(756, 772);
self.ClipFrame.BackgroundFrame.Bg:SetSize(1260, 1260);
self:SetSize(754, 764);
end
self.ClipFrame.BackgroundFrame.KeyOverlay.Channel:AdjustSizeForTiers(numTiers);
UpdateUIPanelPositions(self);
......
......@@ -139,8 +139,8 @@
<Layer level="ARTWORK" textureSubLevel="6">
<Texture parentKey="Shadow" atlas="Azerite-TopShadow" useAtlasSize="true" inherits="AzeriteUITexture">
<Anchors>
<Anchor point="TOPLEFT" x="90" y="0" />
<Anchor point="TOPRIGHT" x="0" y="0" />
<Anchor point="TOPLEFT" x="90" y="-20" />
<Anchor point="TOPRIGHT" x="0" y="-20" />
</Anchors>
</Texture>
</Layer>
......@@ -170,7 +170,7 @@
<Texture name="RG" parentKey="RingBgGlow" atlas="Azerite-TitanBG-Glow-Rank5" useAtlasSize="true" inherits="AzeriteRingGlowTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="2">
<Texture parentKey="RingLights" atlas="Azerite-TitanBG-LightsRank4" useAtlasSize="true" inherits="AzeriteRingLightsTexture" />
<Texture parentKey="RingLights" atlas="Azerite-TitanBG-LightsRank5" useAtlasSize="true" inherits="AzeriteRingLightsTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="3">
<Texture parentKey="Ring" atlas="Azerite-GoldRing-Rank5" useAtlasSize="true" inherits="AzeriteRingBorderTexture" />
......
......@@ -4,6 +4,7 @@ function CompactUnitFrameProfiles_OnLoad(self)
self:RegisterEvent("PLAYER_ENTERING_WORLD");
self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED");
self:RegisterEvent("GROUP_JOINED");
self:RegisterEvent("GROUP_ROSTER_UPDATE");
--Get this working with the InterfaceOptions panel.
self.name = COMPACT_UNIT_FRAME_PROFILES_LABEL;
......@@ -31,11 +32,8 @@ function CompactUnitFrameProfiles_OnEvent(self, event, ...)
CompactUnitFrameProfiles_CheckAutoActivation();
elseif ( event == "PLAYER_SPECIALIZATION_CHANGED" ) then --Check for changing specs
CompactUnitFrameProfiles_CheckAutoActivation();
elseif ( event == "GROUP_JOINED" ) then
local partyCategory = ...;
if ( partyCategory == LE_PARTY_CATEGORY_INSTANCE ) then
CompactUnitFrameProfiles_CheckAutoActivation();
end
elseif ( event == "GROUP_JOINED" or event == "GROUP_ROSTER_UPDATE" ) then
CompactUnitFrameProfiles_CheckAutoActivation();
end
end
......@@ -270,10 +268,12 @@ end
local autoActivateGroupSizes = { 2, 3, 5, 10, 15, 25, 40 };
local countMap = {}; --Maps number of players to the category. (For example, so that AQ20 counts as a 25-man.)
for i=1, 10 do countMap[i] = 10 end;
for i=11, 15 do countMap[i] = 15 end;
for i=16, 25 do countMap[i] = 25 end;
for i=26, 40 do countMap[i] = 40 end;
for i, autoActivateGroupSize in ipairs(autoActivateGroupSizes) do
local groupSizeStart = i > 1 and (autoActivateGroupSizes[i - 1] + 1) or 1;
for groupSize = groupSizeStart, autoActivateGroupSize do
countMap[groupSize] = autoActivateGroupSize;
end
end
function CompactUnitFrameProfiles_GetAutoActivationState()
local name, instanceType, difficultyIndex, difficultyName, maxPlayers, dynamicDifficulty, isDynamic = GetInstanceInfo();
......@@ -284,34 +284,26 @@ function CompactUnitFrameProfiles_GetAutoActivationState()
local numPlayers, profileType, enemyType;
if ( instanceType == "party" or instanceType == "raid" ) then
if ( maxPlayers <= 5 ) then
numPlayers = 5; --For 5-man dungeons.
else
numPlayers = countMap[maxPlayers];
end
profileType, enemyType = instanceType, "PvE";
numPlayers = maxPlayers > 0 and countMap[maxPlayers] or 5;
profileType = instanceType;
enemyType = "PvE";
elseif ( instanceType == "arena" ) then
local groupSize = GetNumGroupMembers(LE_PARTY_CATEGORY_HOME);
--TODO - Get the actual arena size, not just the # in party.
if ( groupSize <= 2 ) then
numPlayers, profileType, enemyType = 2, instanceType, "PvP";
elseif ( groupSize <= 3 ) then
numPlayers, profileType, enemyType = 3, instanceType, "PvP";
else
numPlayers, profileType, enemyType = 5, instanceType, "PvP";
end
numPlayers = countMap[GetNumGroupMembers()];
profileType = instanceType;
enemyType = "PvP";
elseif ( instanceType == "pvp" ) then
if ( IsRatedBattleground() ) then
numPlayers, profileType, enemyType = 10, instanceType, "PvP";
numPlayers = 10;
else
numPlayers, profileType, enemyType = countMap[maxPlayers], instanceType, "PvP";
numPlayers = countMap[maxPlayers];
end
profileType = instanceType;
enemyType = "PvP";
else
if ( IsInRaid() ) then
numPlayers, profileType, enemyType = countMap[GetNumGroupMembers()], "world", "PvE";
else
numPlayers, profileType, enemyType = 5, "world", "PvE";
end
numPlayers = countMap[GetNumGroupMembers()];
profileType = "world";
enemyType = "PvE";
end
if ( not numPlayers ) then
......@@ -349,10 +341,6 @@ function CompactUnitFrameProfiles_CheckAutoActivation()
local spec = GetSpecialization(false, false, 1);
local lastActivationType, lastNumPlayers, lastSpec, lastEnemyType = CompactUnitFrameProfiles_GetLastActivationType();
if ( activationType == "world" ) then --We don't adjust due to just the number of players in the raid.
return;
end
if ( lastActivationType == activationType and lastNumPlayers == numPlayers and lastSpec == spec and lastEnemyType == enemyType ) then
--If we last auto-adjusted for this same thing, we don't change. (In case they manually changed the profile.)
return;
......
......@@ -191,4 +191,17 @@ end
do
GetInviteReferralInfo = C_PartyInfo.GetInviteReferralInfo;
end
-- Report system update
do
-- Use C_ReportSystem.SetPendingReportPetTarget instead
SetPendingReportPetTarget = C_ReportSystem.SetPendingReportPetTarget;
-- Use C_ReportSystem.SetPendingReportTarget instead
SetPendingReportTarget = C_ReportSystem.SetPendingReportTarget;
-- Moved to C_ReportSystem
C_ChatInfo.ReportPlayer = C_ReportSystem.ReportPlayer;
C_ChatInfo.CanReportPlayer = C_ReportSystem.CanReportPlayer;
end
\ No newline at end of file
......@@ -125,9 +125,9 @@ function GarrisonMission:ShowMission(missionInfo)
end
missionPage.Stage.MissionEnvIcon.Texture:SetTexture(environmentTexture);
if ( locPrefix ) then
missionPage.Stage.LocBack:SetAtlas("_"..locPrefix.."-Back", true);
missionPage.Stage.LocMid:SetAtlas ("_"..locPrefix.."-Mid", true);
missionPage.Stage.LocFore:SetAtlas("_"..locPrefix.."-Fore", true);
GarrisonMissionStage_SetBack(missionPage.Stage, "_"..locPrefix.."-Back");
GarrisonMissionStage_SetMid(missionPage.Stage, "_"..locPrefix.."-Mid");
GarrisonMissionStage_SetFore(missionPage.Stage, "_"..locPrefix.."-Fore");
end
missionPage.MissionType:SetAtlas(missionInfo.typeAtlas);
......@@ -895,9 +895,9 @@ function GarrisonMission:MissionCompleteInitialize(missionList, index)
end
self:SortEnemies(enemies);
if ( locPrefix ) then
stage.LocBack:SetAtlas("_"..locPrefix.."-Back", true);
stage.LocMid:SetAtlas ("_"..locPrefix.."-Mid", true);
stage.LocFore:SetAtlas("_"..locPrefix.."-Fore", true);
GarrisonMissionStage_SetBack(stage, "_"..locPrefix.."-Back");
GarrisonMissionStage_SetMid(stage, "_"..locPrefix.."-Mid");
GarrisonMissionStage_SetFore(stage, "_"..locPrefix.."-Fore");
end
stage.MissionInfo.MissionType:SetAtlas(mission.typeAtlas, true);
......@@ -2272,34 +2272,32 @@ local rateMid = 0.3;
local rateFore = 0.8;
function GarrisonMissionController_OnStageUpdate(self, elapsed)
local changeBack = rateBack/100 * elapsed;
local changeMid = rateMid/100 * elapsed;
local changeFore = rateFore/100 * elapsed;
local changeBack = (rateBack / 100) * elapsed;
local changeMid = (rateMid / 100) * elapsed;
local changeFore = (rateFore / 100) * elapsed;
local backL, _, _, _, backR = self.LocBack:GetTexCoord();
local midL, _, _, _, midR = self.LocMid:GetTexCoord();
local foreL, _, _, _, foreR = self.LocFore:GetTexCoord();
backL = backL + changeBack;
backR = backR + changeBack;
midL = midL + changeMid;
midR = midR + changeMid;
foreL = foreL + changeFore;
foreR = foreR + changeFore;
if (backL >= 1) then
backL = backL - 1;
backR = backR - 1;
self.backProgress = (self.backProgress or 0) + changeBack;
if self.backProgress >= 1 then
self.backProgress = self.backProgress - 1;
end
if (midL >= 1) then
midL = midL - 1;
midR = midR - 1;
self.midProgress = (self.midProgress or 0) + changeMid;
if self.midProgress >= 1 then
self.midProgress = self.midProgress - 1;
end
if (foreL >= 1) then
foreL = foreL - 1;
foreR = foreR - 1;
self.foreProgress = (self.foreProgress or 0) + changeFore;
if self.foreProgress >= 1 then
self.foreProgress = self.foreProgress - 1;
end
local backL = self.backProgress;
local backR = backL + self.locBackTexCoordRange;
local midL = self.midProgress;
local midR = midL + self.locMidTexCoordRange;
local foreL = self.foreProgress;
local foreR = foreL + self.locForeTexCoordRange;
self.LocBack:SetTexCoord(backL, backR, 0, 1);
self.LocMid:SetTexCoord (midL, midR, 0, 1);
self.LocFore:SetTexCoord(foreL, foreR, 0, 1);
......@@ -2318,17 +2316,64 @@ function GarrisonMissionController_OnClickMissionStartButton(buttonFrame)