From 2feb6a04237ae58878d06bc1ce8410f1d4f12b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Wed, 10 May 2023 07:17:08 +0200 Subject: [PATCH] 10.1 update --- REKeys.lua | 52 +++++++++++++++++++++++++++++----------------------- REKeys.toc | 7 +++++-- RELogo.tga | Bin 0 -> 9537 bytes 3 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 RELogo.tga diff --git a/REKeys.lua b/REKeys.lua index 559751a..326680a 100644 --- a/REKeys.lua +++ b/REKeys.lua @@ -133,27 +133,19 @@ RE.AceConfig = { } } } +-- TODO DF Season 2 RE.AffixSchedule = { - {10, 6, 14}, - {9, 11, 12}, - {10, 8, 3}, - {9, 6, 124}, - {10, 123, 12}, - {9, 8, 13}, - {10, 7, 124}, - {9, 123, 14}, - {10, 11, 13}, - {9, 7, 3} + {9, 124, 6} } RE.DungeonNames = { - [2] = "TJS", - [165] = "SBG", - [200] = "HOV", - [210] = "COS", - [399] = "RLP", - [400] = "NO", - [401] = "AV", - [402] = "AA" + [438] = "VP", + [206] = "NL", + [245] = "FH", + [251] = "UNDR", + [403] = "ULD", + [404] = "NELT", + [405] = "BH", + [406] = "HOI" } RE.RewardColors = { [1] = "FFFF0000", @@ -269,14 +261,14 @@ function RE:OnEvent(self, event, name, ...) text = "|cFF74D06CRE|rKeys", icon = "Interface\\Icons\\INV_Relics_Hourglass", }) - function RE.LDB:OnEnter() + function RE.LDB:OnEnter(frame) if RE.LDB.text == "|cFF74D06CRE|rKeys" or not RE.MPlusDataReceived then return end RE.Tooltip = QTIP:Acquire("REKeysTooltip", 5, "CENTER", "CENTER", "CENTER", "CENTER", "CENTER") if ElvUI then local red, green, blue = unpack(ElvUI[1].media.backdropfadecolor) RE.Tooltip:SetBackdropColor(red, green, blue, ElvUI[1].Tooltip and ElvUI[1].Tooltip.db.colorAlpha or 1) end - RE.Tooltip:SetAutoHideDelay(0.1, self, function() + RE.Tooltip:SetAutoHideDelay(0.1, frame or self, function() if RE.TooltipTimer then RE.TooltipTimer:Cancel() RE.TooltipTimer = nil @@ -287,7 +279,7 @@ function RE:OnEvent(self, event, name, ...) RE.Tooltip:SetHeaderFont(RE.TooltipHeaderFont) RE:LORSearchStart() RE:FillTooltip() - RE.Tooltip:SmartAnchorTo(self) + RE.Tooltip:SmartAnchorTo(frame or self) RE.Tooltip:Show() RE.Tooltip:UpdateScrolling() RE.TooltipTimer = NewTicker(3, RE.RefreshTooltip) @@ -395,6 +387,7 @@ function RE:FillTooltip() local row local groupSeparator = false local pinSeparator = false + local pinExist = false local pinEmpty = next(RE.Settings.PinnedCharacters) == nil RE.Tooltip:Clear() @@ -413,7 +406,10 @@ function RE:FillTooltip() for name, payload in OrderedPairs(RE.DB, OrderedCompare) do if payload.Fresh or RE.Settings.OfflinePlayers or RE.Settings.PinnedCharacters[name] then - if not pinEmpty and not RE.Settings.PinnedCharacters[name] and not pinSeparator then + if not pinEmpty and not pinExist and RE.Settings.PinnedCharacters[name] then + pinExist = true + end + if pinExist and not pinEmpty and not RE.Settings.PinnedCharacters[name] and not pinSeparator then pinSeparator = true RE.Tooltip:AddLine() RE.Tooltip:AddSeparator() @@ -526,8 +522,10 @@ end function RE:GetShortMapName(mapID) if RE.Settings.FullDungeonName then return GetMapUIInfo(mapID) - else + elseif RE.DungeonNames[mapID] then return RE.DungeonNames[mapID] + else + return '???' end end @@ -632,4 +630,12 @@ function RE:ParseChat(msg, channel, respond) SendChatMessage(keyLink, channel) end end +end + +function REKeys_CompartmentOnClick(_, button) + RE.LDB:OnClick(button) +end + +function REKeys_CompartmentOnEnter(_, frame) + RE.LDB:OnEnter(frame) end \ No newline at end of file diff --git a/REKeys.toc b/REKeys.toc index 330d755..7376336 100644 --- a/REKeys.toc +++ b/REKeys.toc @@ -1,10 +1,13 @@ -## Interface: 100007 +## Interface: 100100 ## Title: |cFF74D06CRE|rKeys ## Notes: Collect information about keystones owned by your friends. -## Version: 2.0.4 +## Version: 2.1.0 ## Author: AcidWeb ## SavedVariables: REKeysSettings, REKeysDB2 ## OptionalDeps: RaiderIO +## AddonCompartmentFunc: REKeys_CompartmentOnClick +## AddonCompartmentFuncOnEnter: REKeys_CompartmentOnEnter +## IconTexture: Interface\AddOns\REKeys\RELogo ## X-WoWI-ID: 24510 ## X-Wago-ID: XrNke8Ka diff --git a/RELogo.tga b/RELogo.tga new file mode 100644 index 0000000000000000000000000000000000000000..ed16d915528a00f28a59d4cac79146f2b210958e GIT binary patch literal 9537 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 literal 0 HcmV?d00001