Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ local _cachedIType, _cachedDiffID, _cachedMapID
local _dungeonPrePull = true

local function CacheInstanceInfo()
local _, iType, diffID = GetInstanceInfo()
local _, iType, diffID, _, _, _, _, _, _, _, hasWorldTier = GetInstanceInfo()
_cachedIType = iType
_cachedDiffID = tonumber(diffID) or 0
EABR._cachedWorldTier = hasWorldTier and true or false
local mapID = C_Map and C_Map.GetBestMapForUnit and C_Map.GetBestMapForUnit("player") or nil
if mapID ~= _cachedMapID then
_dungeonPrePull = true
Expand Down Expand Up @@ -279,6 +280,9 @@ end
-- (Heroic / Normal / Follower), timewalking, delve. Returns nil for unmapped
-- instanced content (e.g. PvP) so reminders never silently vanish there.
function EABR.CurrentWhereBucket(inInstance)
-- CurrentDifficultyCat's allowlist predates Lairs, so without this early
-- return they'd hit the unmapped case and always show.
if EABR._cachedWorldTier then return "lair" end
local cat = EABR.CurrentDifficultyCat()
if cat == "d_mplus" or cat == "d_mythic" then return "dungeon_mythic" end
if cat == "d_heroic" or cat == "d_normal" or cat == "d_follower" then return "dungeon_nonmythic" end
Expand Down
7 changes: 5 additions & 2 deletions EllesmereUIMythicTimer/EUI_MythicTimer_TargetedSpellBars.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ local function CurrentWhereBucket()
if C_ChallengeMode and C_ChallengeMode.IsChallengeModeActive and C_ChallengeMode.IsChallengeModeActive() then
return "dungeon_mythic"
end
local _, iType, diffID = GetInstanceInfo()
local _, iType, diffID, _, _, _, _, _, _, _, hasWorldTier = GetInstanceInfo()
diffID = tonumber(diffID) or 0
-- The diffID branches below predate Lairs, so without this early return
-- they'd hit the unmapped case and always show.
if hasWorldTier then return "lair" end
if iType == "party" then
if diffID == 23 or diffID == 8 then return "dungeon_mythic" end
if diffID == 2 or diffID == 1 or diffID == 205 then return "dungeon_nonmythic" end
Expand All @@ -111,7 +114,7 @@ end
-- (PvP, arena) never hides.
local LOCATION_KEYS = {
"open_world", "raid_mythic", "raid_heroic", "raid_normal_lfr",
"dungeon_mythic", "dungeon_nonmythic", "timewalking", "delve",
"dungeon_mythic", "dungeon_nonmythic", "timewalking", "delve", "lair",
}

-- Combat state is TRACKED from PLAYER_REGEN_DISABLED / _ENABLED instead of
Expand Down
1 change: 1 addition & 0 deletions EllesmereUIOptions/EUI_AuraBuffReminders_Options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,7 @@ initFrame:SetScript("OnEvent", function(self)
{ key="dungeon_nonmythic", label="Non-Mythic Dungeons" },
{ key="timewalking", label="Timewalking" },
{ key="delve", label="Delve" },
{ key="lair", label="Lair" },
-- Orthogonal state gate (not a location): unchecking hides this
-- section while in combat.
{ key="in_combat", label="In Combat" },
Expand Down
1 change: 1 addition & 0 deletions EllesmereUIOptions/EUI_MythicTimer_Options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ initFrame:SetScript("OnEvent", function(self)
{ key="dungeon_nonmythic", label="Non-Mythic Dungeons" },
{ key="timewalking", label="Timewalking" },
{ key="delve", label="Delve" },
{ key="lair", label="Lair" },
{ key="in_combat", label="In Combat" },
{ key="out_of_combat", label="Out of Combat" },
}
Expand Down