Commit 806267ac authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-27791patch8.0.1_PTR

parent 6a901e8b
local NUM_REWARDS_PER_MEDAL = 2;
local MAXIMUM_REWARDS_LEVEL = 15;
local MAXIMUM_REWARDS_LEVEL = 10;
local MAX_PER_ROW = 9;
local function CreateFrames(self, array, num, template)
......@@ -188,9 +188,10 @@ function ChallengesFrame_Update(self)
weeklyChest.ownedKeystoneLevel, weeklyChest.level, weeklyChest.rewardLevel, weeklyChest.nextRewardLevel = 0;
weeklyChest.name = C_ChallengeMode.GetMapUIInfo(weeklySortedMaps[1].id);
weeklyChest.ownedKeystoneLevel = C_MythicPlus.GetOwnedKeystoneLevel();
weeklyChest.level, weeklyChest.rewardLevel, weeklyChest.nextRewardLevel = C_MythicPlus.GetWeeklyChestRewardLevel();
if (weeklyChest.ownedKeystoneLevel and weeklyChest.name ~= nil) then
weeklyChest.level, weeklyChest.rewardLevel, weeklyChest.nextRewardLevel = C_MythicPlus.GetWeeklyChestRewardLevel();
--Need to check if a player has any season best data, if not then we want to show them keystone intro screen.
if (sortedMaps[1].level > 0 or weeklyChest.ownedKeystoneLevel and weeklyChest.name ~= nil) then
if (C_MythicPlus.IsWeeklyRewardAvailable()) then
self.WeeklyInfo:HideAffixes();
self.WeeklyInfo.Child.Label:Hide();
......
......@@ -526,6 +526,8 @@ function CommentatorUnitFrameMixin:UpdateCrowdControlAurasText()
end
end
BLIZZARD_COMMENTATOR_MAX_NUM_OFFENSIVE_COOLDOWNS = BLIZZARD_COMMENTATOR_MAX_NUM_OFFENSIVE_COOLDOWNS or 5;
BLIZZARD_COMMENTATOR_MAX_NUM_DEFENSIVE_COOLDOWNS = BLIZZARD_COMMENTATOR_MAX_NUM_DEFENSIVE_COOLDOWNS or 5;
function CommentatorUnitFrameMixin:FullCooldownRefresh()
local PADDING = 11;
self.needsCooldownData = false;
......@@ -533,6 +535,10 @@ function CommentatorUnitFrameMixin:FullCooldownRefresh()
local offensiveCooldowns = C_Commentator.GetTrackedOffensiveCooldowns(self.teamIndex, self.playerIndex);
if offensiveCooldowns then
while #offensiveCooldowns > BLIZZARD_COMMENTATOR_MAX_NUM_OFFENSIVE_COOLDOWNS do
offensiveCooldowns[#offensiveCooldowns] = nil;
end
self.offensiveCooldownPool:SetCooldowns(offensiveCooldowns, self.OffensiveCooldownContainer, "LEFT", PADDING);
else
self.needsCooldownData = true;
......@@ -540,6 +546,10 @@ function CommentatorUnitFrameMixin:FullCooldownRefresh()
local defensiveCooldowns = C_Commentator.GetTrackedDefensiveCooldowns(self.teamIndex, self.playerIndex);
if defensiveCooldowns then
while #defensiveCooldowns > BLIZZARD_COMMENTATOR_MAX_NUM_DEFENSIVE_COOLDOWNS do
defensiveCooldowns[#defensiveCooldowns] = nil;
end
self.defensiveCooldownPool:SetCooldowns(defensiveCooldowns, self.DefensiveCooldownContainer, "LEFT", PADDING);
else
self.needsCooldownData = true;
......
......@@ -992,6 +992,14 @@
</FontString>
</Layer>
<Layer level="ARTWORK" textureSubLevel="1">
<Texture parentKey="IconOverlay" hidden="true">
<Size x="60" y="60"/>
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Icon"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK" textureSubLevel="2">
<Texture parentKey="SpecIcon">
<Size x="24" y="24"/>
<Anchors>
......@@ -999,7 +1007,7 @@
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK" textureSubLevel="2">
<Layer level="ARTWORK" textureSubLevel="3">
<Texture parentKey="SpecRing" file="Interface/Minimap/MiniMap-TrackingBorder">
<Anchors>
<Anchor point="TOPLEFT" x="0" y="0"/>
......@@ -1073,14 +1081,6 @@
<TexCoords left="0.56347656" right="0.73046875" top="0.57421875" bottom="0.86718750"/>
</Texture>
</Layer>
<Layer level="OVERLAY" textureSubLevel="1">
<Texture parentKey="IconOverlay" hidden="true">
<Size x="60" y="60"/>
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Icon"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnLoad inherit="prepend">
......
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