Commit 1ee90881 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-28048patch8.1.0_PTR

parent 9e53857e
......@@ -29,6 +29,24 @@ local PartyInfo =
{ Name = "invalidQueues", Type = "table", InnerType = "QueueSpecificInfo", Nilable = false },
},
},
{
Name = "GetInviteReferralInfo",
Type = "Function",
Arguments =
{
{ Name = "inviteGUID", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "outReferredByGuid", Type = "string", Nilable = false },
{ Name = "outReferredByName", Type = "string", Nilable = false },
{ Name = "outRelationType", Type = "PartyRequestJoinRelation", Nilable = false },
{ Name = "outIsQuickJoin", Type = "bool", Nilable = false },
{ Name = "outClubId", Type = "string", Nilable = false },
},
},
},
Events =
......@@ -225,6 +243,21 @@ local PartyInfo =
Tables =
{
{
Name = "PartyRequestJoinRelation",
Type = "Enumeration",
NumValues = 5,
MinValue = 0,
MaxValue = 4,
Fields =
{
{ Name = "None", Type = "PartyRequestJoinRelation", EnumValue = 0 },
{ Name = "Friend", Type = "PartyRequestJoinRelation", EnumValue = 1 },
{ Name = "Guild", Type = "PartyRequestJoinRelation", EnumValue = 2 },
{ Name = "Club", Type = "PartyRequestJoinRelation", EnumValue = 3 },
{ Name = "NumPartyRequestJoinRelations", Type = "PartyRequestJoinRelation", EnumValue = 4 },
},
},
},
};
......
......@@ -320,6 +320,19 @@ local UIWidgetManager =
{ Name = "ShownWithDynamicIconNotFlashing", Type = "IconAndTextWidgetState", EnumValue = 3 },
},
},
{
Name = "SpellDisplayIconSizeType",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "Small", Type = "SpellDisplayIconSizeType", EnumValue = 0 },
{ Name = "Medium", Type = "SpellDisplayIconSizeType", EnumValue = 1 },
{ Name = "Large", Type = "SpellDisplayIconSizeType", EnumValue = 2 },
},
},
{
Name = "StatusBarValueTextType",
Type = "Enumeration",
......@@ -510,6 +523,7 @@ local UIWidgetManager =
{ Name = "shownState", Type = "WidgetShownState", Nilable = false },
{ Name = "enabledState", Type = "WidgetEnabledState", Nilable = false },
{ Name = "spellInfo", Type = "UIWidgetSpellInfo", Nilable = false },
{ Name = "iconSizeType", Type = "SpellDisplayIconSizeType", Nilable = false },
{ Name = "widgetWidth", Type = "number", Nilable = false },
{ Name = "hasTimer", Type = "bool", Nilable = false },
{ Name = "orderIndex", Type = "number", Nilable = false },
......
......@@ -2,17 +2,25 @@ AzeriteEmpoweredItemChannelMixin = {};
local REVEAL_SIZE_BY_TIER = {
[3] = {
195,
288,
580,
278,
368,
591,
},
[4] = {
104,
193,
288,
580,
188,
278,
368,
591,
},
[5] = {
96,
188,
278,
368,
591,
},
}
function AzeriteEmpoweredItemChannelMixin:Reset()
......@@ -57,6 +65,7 @@ function AzeriteEmpoweredItemChannelMixin:UpdateTierAnimationProgress(tierIndex,
self.targetHeight = Lerp(fromHeight, toHeight, EasingUtil.InCubic(progress));
else
self.targetHeight = self:GetHeightForTierIndex(self.tierIndex);
self.isTierAnimating = false;
end
end
......
......@@ -3,9 +3,9 @@
<Frame name="AzeriteEmpoweredItemChannelTemplate" mixin="AzeriteEmpoweredItemChannelMixin" virtual="true">
<Layers>
<Layer level="OVERLAY" textureSubLevel="5">
<Texture parentKey="Fill" atlas="Azerite-CenterBG-ChannelGlowBar-Filling" useAtlasSize="true" inherits="AzeriteUITexture">
<Texture parentKey="Fill" atlas="Azerite-CenterBG-ChannelGlowBar-Filling-Rank5" useAtlasSize="true" inherits="AzeriteUITexture">
<Anchors>
<Anchor point="CENTER" x="0" y="217" />
<Anchor point="CENTER" x="0" y="275" />
</Anchors>
</Texture>
</Layer>
......@@ -39,7 +39,7 @@
<Anchor point="TOP" relativeKey="$parent.Fill" />
</Anchors>
</Texture>
<MaskTexture parentKey="FillMask" atlas="Azerite-CenterBG-ChannelGlowBar-Mask" useAtlasSize="true" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE" inherits="AzeriteUITexture">
<MaskTexture parentKey="FillMask" atlas="Azerite-CenterBG-ChannelGlowBar-MaskRank5" useAtlasSize="true" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE" inherits="AzeriteUITexture">
<Anchors>
<Anchor point="TOP" relativeKey="$parent.Fill" />
</Anchors>
......@@ -55,7 +55,7 @@
</MaskTexture>
</Layer>
<Layer level="OVERLAY" textureSubLevel="4">
<Texture parentKey="FillShine" atlas="Azerite-CenterBG-ChannelGlowBar-Shinny" useAtlasSize="true" inherits="AzeriteUITexture">
<Texture parentKey="FillShine" atlas="Azerite-CenterBG-ChannelGlowBar-Shinny-Rank5" useAtlasSize="true" inherits="AzeriteUITexture">
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Fill" x="0" y="-4" />
</Anchors>
......
......@@ -20,6 +20,28 @@ local DEFAULT_TWO_POWERS = {
local LAYOUT_TIER_INFO = {
-- Outer most to inner most ring
{
radius = 324,
startRadians =
{
default = math.pi / 4,
[2] = DEFAULT_TWO_POWERS,
[3] = {
0.94579392,
-0.94579392,
math.pi,
};
[4] = DEFAULT_FOUR_POWERS,
[5] = {
0.94579392,
-0.94579392,
2.22843639,
-2.22843639,
math.pi,
},
},
},
{
radius = 251,
startRadians =
......
......@@ -12,12 +12,12 @@ local AZERITE_EMPOWERED_FRAME_EVENTS = {
"PLAYER_EQUIPMENT_CHANGED",
};
AZERITE_EMPOWERED_ITEM_MAX_TIERS = 4;
AZERITE_EMPOWERED_ITEM_MAX_TIERS = 5;
function AzeriteEmpoweredItemUIMixin:OnLoad()
CallbackRegistryBaseMixin.OnLoad(self);
UIPanelWindows[self:GetName()] = { area = "left", pushable = 1, xoffset = 35, yoffset = -9, bottomClampOverride = 100, showFailedFunc = function() self:OnShowFailed(); end, };
UIPanelWindows[self:GetName()] = { area = "left", pushable = 1, xoffset = 35, yoffset = -9, bottomClampOverride = 100, checkFit = 1, showFailedFunc = function() self:OnShowFailed(); end, };
self.BorderFrame.Bg:SetParent(self);
self.BorderFrame.TopTileStreaks:Hide();
......@@ -280,7 +280,7 @@ end
function AzeriteEmpoweredItemUIMixin:UpdateTiers()
local azeriteItemLocation = C_AzeriteItem.FindActiveAzeriteItem();
local azeriteItemPowerLevel = azeriteItemLocation and C_AzeriteItem.GetPowerLevel(azeriteItemLocation) or 0;
local azeriteItemPowerLevel = azeriteItemLocation and not AzeriteUtil.IsAzeriteItemLocationBankBag(azeriteItemLocation) and C_AzeriteItem.GetPowerLevel(azeriteItemLocation) or 0;
for tierIndex, tierFrame in ipairs(self.tiersByIndex) do
tierFrame:Update(azeriteItemPowerLevel);
......@@ -317,11 +317,18 @@ function AzeriteEmpoweredItemUIMixin:AdjustSizeForTiers(numTiers)
self.ClipFrame.BackgroundFrame.Bg:SetAtlas("Azerite-Background-3Ranks", true);
self:SetSize(474, 484);
else
elseif numTiers == 4 then
self.ClipFrame.BackgroundFrame.KeyOverlay.Texture:SetAtlas("Azerite-CenterBG-4Ranks", true);
self.ClipFrame.BackgroundFrame.KeyOverlay.Texture:SetPoint("CENTER", 0, 187);
self.ClipFrame.BackgroundFrame.Bg:SetAtlas("Azerite-Background", true);
self:SetSize(615, 628);
elseif numTiers == 5 then
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);
end
self.ClipFrame.BackgroundFrame.KeyOverlay.Channel:AdjustSizeForTiers(numTiers);
UpdateUIPanelPositions(self);
......
......@@ -131,9 +131,10 @@
</Texture>
</Layer>
<Layer level="ARTWORK" textureSubLevel="-1">
<Texture parentKey="Rank4Plug" atlas="Azerite-Center-TraitPlug-Rune1" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank3Plug" atlas="Azerite-Center-TraitPlug-Rune2" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank2Plug" atlas="Azerite-Center-TraitPlug-Rune3" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank5Plug" atlas="Azerite-Center-TraitPlug-Rune1" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank4Plug" atlas="Azerite-Center-TraitPlug-Rune2" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank3Plug" atlas="Azerite-Center-TraitPlug-Rune3" useAtlasSize="true" inherits="AzeritePlugTexture" />
<Texture parentKey="Rank2Plug" atlas="Azerite-Center-TraitPlug-Rune4" useAtlasSize="true" inherits="AzeritePlugTexture" />
</Layer>
<Layer level="ARTWORK" textureSubLevel="6">
<Texture parentKey="Shadow" atlas="Azerite-TopShadow" useAtlasSize="true" inherits="AzeriteUITexture">
......@@ -146,6 +147,7 @@
</Layers>
<Frames>
<Frame parentKey="Channel" inherits="AzeriteEmpoweredItemChannelTemplate" setAllPoints="true" />
<Frame parentKey="Rank5Slot" inherits="AzeriteEmpoweredItemSlotTemplate" />
<Frame parentKey="Rank4Slot" inherits="AzeriteEmpoweredItemSlotTemplate" />
<Frame parentKey="Rank3Slot" inherits="AzeriteEmpoweredItemSlotTemplate" />
<Frame parentKey="Rank2Slot" inherits="AzeriteEmpoweredItemSlotTemplate" />
......@@ -153,6 +155,31 @@
</Frames>
</Frame>
<Frame inherits="AzeriteRankFrameTemplate">
<Layers>
<Layer level="BORDER" textureSubLevel="-1">
<Texture parentKey="GearBg" atlas="Azerite-TitanBG-GearRank5" useAtlasSize="true" inherits="AzeriteGearBackgroundTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="0">
<Texture parentKey="Gear" atlas="Azerite-TitanBG-GearRank5-Front" useAtlasSize="true" inherits="AzeriteGearTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="1">
<Texture parentKey="RingBg" atlas="Azerite-TitanBG-Rank5" useAtlasSize="true" inherits="AzeriteRingBackgroundTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="2">
<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" />
</Layer>
<Layer level="BORDER" textureSubLevel="3">
<Texture parentKey="Ring" atlas="Azerite-GoldRing-Rank5" useAtlasSize="true" inherits="AzeriteRingBorderTexture" />
</Layer>
<Layer level="BORDER" textureSubLevel="4">
<Texture parentKey="PlugBg" atlas="Azerite-Center-TraitBG" useAtlasSize="true" inherits="AzeritePlugBackgroundTexture" />
</Layer>
</Layers>
</Frame>
<Frame inherits="AzeriteRankFrameTemplate">
<Layers>
<Layer level="BORDER" textureSubLevel="-1">
......
......@@ -224,6 +224,11 @@ function ChallengesFrame_Update(self)
weeklyChest.rewardLevel = C_MythicPlus.GetRewardLevelFromKeystoneLevel(weeklyChest.ownedKeystoneLevel);
weeklyChest:SetupChest(weeklyChest.MissingKeystoneChest);
else
self.WeeklyInfo.Child.Label:Show();
self.WeeklyInfo.Child.RunStatus:ClearAllPoints();
self.WeeklyInfo.Child.RunStatus:SetPoint("CENTER", self, "CENTER", 0, 0);
self.WeeklyInfo.Child.RunStatus:SetText(MYTHIC_PLUS_MISSING_KEYSTONE_MESSAGE);
end
weeklyChest:Show();
else
......
......@@ -33,4 +33,17 @@ function CommunitiesHyperlink.OnClickLink(ticketId)
pendingTicketIds[ticketId] = true;
C_Club.RequestTicket(ticketId);
end
end
\ No newline at end of file
end
function CommunitiesHyperlink.OnClickReference(clubId)
local clubInfo = C_Club.GetClubInfo(clubId);
if clubInfo then
Communities_LoadUI();
if not CommunitiesFrame:IsShown() then
ShowUIPanel(CommunitiesFrame);
end
CommunitiesFrame:SelectClub(clubId);
end
end
......@@ -77,12 +77,18 @@ do
end
if info then
local chatFlag = "";
if info.dnd then
chatFlag = CHAT_FLAG_DND;
elseif info.afk then
chatFlag = CHAT_FLAG_AFK;
end
return info.name,
info.level,
info.className,
info.area,
info.connected,
info.dnd ? CHAT_FLAG_DND : info.afk ? CHAT_FLAG_AFK : "",
chatFlag,
info.notes,
info.referAFriend,
info.guid;
......@@ -180,3 +186,9 @@ do
-- Use C_FriendList.SortWho instead
SortWho = C_FriendList.SortWho;
end
-- Quick join / request to join update
do
GetInviteReferralInfo = C_PartyInfo.GetInviteReferralInfo;
end
\ No newline at end of file
......@@ -3,6 +3,7 @@ NamePlateCommentatorDisplayInfoMixin = {};
function NamePlateCommentatorDisplayInfoMixin:OnUpdate()
local parent = self:GetParent();
local unitFrame = parent:GetParent();
local CCIndicator = self.CCIndicator;
local spellID, expirationTime, duration = C_Commentator.GetPlayerCrowdControlInfoByUnit(parent.unit);
local iconTexture = select(3, GetSpellInfo(spellID));
......@@ -19,6 +20,19 @@ function NamePlateCommentatorDisplayInfoMixin:OnUpdate()
CooldownFrame_Clear(CCIndicator.Cooldown);
end
-- This BASE_MODEL_FRAME_SCALE adjustment is needed because the model frame needs to be sized
-- with the appropriate ratio between width and height and also needs to have sufficient height
-- to avoid the model being cut off even at the larger selected size.
-- 1.35 was experimentally discovered to make the models and model frame size we have look good.
local BASE_MODEL_FRAME_SCALE = 1.0 / 1.35;
-- Normalize the scale changes for the model frame.
local normalizedScale = (0.9 + unitFrame:GetScale()) / 2.0;
local modelScale = normalizedScale * BASE_MODEL_FRAME_SCALE;
self.OffensiveCooldownModel:SetScale(modelScale);
self.DefensiveCooldownModel:SetScale(modelScale);
local offensiveActive, defensiveActive = C_Commentator.HasTrackedAuras(parent.unit);
self.OffensiveCooldownModel:SetShown(offensiveActive);
self.DefensiveCooldownModel:SetShown(defensiveActive);
......
......@@ -4,8 +4,9 @@
<Frame name="NamePlateCommentatorDisplayInfoTemplate" parentKey="CommentatorDisplayInfo" setAllPoints="true" mixin="NamePlateCommentatorDisplayInfoMixin" virtual="true">
<Frames>
<Model parentKey="OffensiveCooldownModel" frameStrata="BACKGROUND" drawLayer="OVERLAY" hidden="true" alpha="0.55">
<Size x="1800" y="24" />
<!-- These models have ignoreParentScale set and are then scaled manually in the update function. -->
<Model parentKey="OffensiveCooldownModel" frameStrata="BACKGROUND" drawLayer="OVERLAY" hidden="true" alpha="0.55" ignoreParentScale="true">
<Size x="3600" y="48" />
<Anchors>
<Anchor point="TOP" relativeKey="$parent.$parent.healthBar" relativePoint="BOTTOM" y="0"/>
</Anchors>
......@@ -24,10 +25,12 @@
</OnModelLoaded>
</Scripts>
</Model>
<Model parentKey="DefensiveCooldownModel" frameStrata="BACKGROUND" drawLayer="BACKGROUND" hidden="true" alpha="0.7">
<Size x="356" y="356" />
<!-- These models have ignoreParentScale set and are then scaled manually in the update function. -->
<Model parentKey="DefensiveCooldownModel" frameStrata="BACKGROUND" drawLayer="BACKGROUND" hidden="true" alpha="0.7" ignoreParentScale="true">
<Size x="712" y="712" />
<Anchors>
<Anchor point="CENTER" y="165"/>
<Anchor point="CENTER" y="330"/>
</Anchors>
<Scripts>
<OnShow>
......
......@@ -146,7 +146,9 @@ function QuestObjectiveFindGroup_OnLeave(self)
end
function QuestObjectiveFindGroup_OnClick(self)
LFGListUtil_FindQuestGroup(self.questID);
local isFromGreenEyeButton = true;
--We only want green eye button groups to display the create a group button if there are already groups there.
LFGListUtil_FindQuestGroup(self.questID, isFromGreenEyeButton);
end
local defaultInitialAnchorOffsets = { 0, 0 };
......
......@@ -829,6 +829,7 @@ function ScenarioStage_CustomizeBlock(stageBlock, scenarioType, widgetSetID, tex
stageBlock.CompleteLabel:SetPoint("LEFT", stageBlock, "LEFT", 15, 17);
stageBlock.Stage:SetPoint("TOPLEFT", stageBlock, "TOPLEFT", 15, -8);
stageBlock.Stage:SetTextColor(1, 0.914, 0.682);
stageBlock.Stage:SetHeight(34);
stageBlock.NormalBG:Hide();
else
ScenarioStageBlock.CompleteLabel:SetPoint("LEFT", stageBlock, "LEFT", 15, 3);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment