11.0.2 (56819)

Gethe · Oct 1, 2024 · 5076663 · 5076663
1 parent 2e827a6
commit 5076663
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/Interface/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.lua b/Interface/AddOns/Blizzard_ChallengesUI/Blizzard_ChallengesUI.lua
@@ -891,10 +891,7 @@ function ChallengeModeCompleteBannerMixin:PlayBanner(data)
  PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE);
  local chatPrintText;
 
- if (data.isAffixRecord) then
- local affixName = C_ChallengeMode.GetAffixInfo(data.primaryAffix);
- chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_CHAT_LINK_AFFIX_RECORD:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true), affixName)
- elseif (data.isMapRecord) then
+ if (data.isMapRecord) then
  chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_CHAT_LINK_RECORD:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true))
  else
  chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_CHAT_LINK:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true))
@@ -907,10 +904,7 @@ function ChallengeModeCompleteBannerMixin:PlayBanner(data)
  PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE);
 
  local chatPrintText;
- if (data.isAffixRecord) then
- local affixName = C_ChallengeMode.GetAffixInfo(data.primaryAffix);
- chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_CHAT_LINK_OVERTIME_AFFIX_RECORD:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true), affixName)
- elseif (data.isMapRecord) then
+ if (data.isMapRecord) then
  chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_CHAT_LINK_OVERTIME_RECORD:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true))
  else
  chatPrintText = CHALLENGE_MODE_TIMED_DUNGEON_OVERTIME_CHAT_LINK:format(name, data.level, timeText, timeFormatter:Format(timeRemaining, false, true))

diff --git a/Interface/AddOns/Blizzard_FrameXMLUtil/DifficultyUtil.lua b/Interface/AddOns/Blizzard_FrameXMLUtil/DifficultyUtil.lua
@@ -39,6 +39,7 @@ local DIFFICULTY_NAMES =
  [DifficultyUtil.ID.DungeonTimewalker] = PLAYER_DIFFICULTY_TIMEWALKER,
  [DifficultyUtil.ID.RaidTimewalker] = PLAYER_DIFFICULTY_TIMEWALKER,
  [DifficultyUtil.ID.Raid40] = PLAYER_DIFFICULTY1,
+ [DifficultyUtil.ID.RaidStory] = QUEST_CLASSIFICATION_QUESTLINE,
 }
 
 local PRIMARY_RAIDS = { DifficultyUtil.ID.PrimaryRaidLFR, DifficultyUtil.ID.PrimaryRaidNormal, DifficultyUtil.ID.PrimaryRaidHeroic, DifficultyUtil.ID.PrimaryRaidMythic };

diff --git a/Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.lua b/Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.lua
@@ -54,8 +54,7 @@ end
 function WeeklyRewardsMixin:OnLoad()
  self:SetUpActivity(self.RaidFrame, RAIDS, "evergreen-weeklyrewards-category-raids", Enum.WeeklyRewardChestThresholdType.Raid);
  self:SetUpActivity(self.MythicFrame, DUNGEONS, "evergreen-weeklyrewards-category-dungeons", Enum.WeeklyRewardChestThresholdType.Activities);
-
- self:SetUpConditionalActivities();
+ self:SetUpActivity(self.WorldFrame, WORLD, "evergreen-weeklyrewards-category-world", Enum.WeeklyRewardChestThresholdType.World);
 
  local attributes =
  {

diff --git a/Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.xml b/Interface/AddOns/Blizzard_WeeklyRewards/Blizzard_WeeklyRewards.xml
@@ -607,7 +607,7 @@
  <Anchor point="TOPLEFT" x="68" y="-470"/>
  </Anchors>
  </Frame>
- <Frame parentKey="WorldFrame" inherits="WeeklyRewardActivityTypeTemplate" hidden="true">
+ <Frame parentKey="WorldFrame" inherits="WeeklyRewardActivityTypeTemplate">
  <Anchors>
  <Anchor point="TOPLEFT" x="68" y="-470"/>
  </Anchors>