diff --git a/Gladdy.lua b/Gladdy.lua index e3e57c5..6f87120 100644 --- a/Gladdy.lua +++ b/Gladdy.lua @@ -26,11 +26,11 @@ local LibStub = LibStub --------------------------- -local MAJOR, MINOR = "Gladdy", 15 +local MAJOR, MINOR = "Gladdy", 12 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local L Gladdy.version_major_num = 2 -Gladdy.version_minor_num = 0.27 +Gladdy.version_minor_num = 0.24 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_releaseType = RELEASE_TYPES.release Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType diff --git a/Gladdy.toc b/Gladdy.toc index 4e1646a..c9067ad 100644 --- a/Gladdy.toc +++ b/Gladdy.toc @@ -1,5 +1,5 @@ ## Title: Gladdy |cFFFF0000 game client not supported|r -## Version: 2.27-Release +## Version: 2.24-Release ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_BCC.toc b/Gladdy_BCC.toc index ccfc980..af162a9 100644 --- a/Gladdy_BCC.toc +++ b/Gladdy_BCC.toc @@ -1,6 +1,6 @@ ## Interface: 20504 ## Title: Gladdy - TBC -## Version: 2.27-Release +## Version: 2.24-Release ## Notes: The most powerful arena AddOn for WoW 2.5.4 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_Wrath.toc b/Gladdy_Wrath.toc index a68954a..5720984 100644 --- a/Gladdy_Wrath.toc +++ b/Gladdy_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30402 ## Title: Gladdy - WotLK -## Version: 2.27-Release +## Version: 2.24-Release ## Notes: The most powerful arena AddOn for WoW 3.4.2 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index 341bd2c..be11830 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -203,14 +203,16 @@ end function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) local nameplate = C_NamePlate.GetNamePlateForUnit(unitID) self.activeTotemNameplates[unitID] = nil + --self:ToggleAddon(nameplate, true) if nameplate.gladdyTotemFrame then nameplate.gladdyTotemFrame:Hide() nameplate.gladdyTotemFrame:SetParent(nil) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil - end - if (self.addon == "ElvUI") then - self:ToggleAddon(nameplate, true) + --Show ElvUI nameplates when totem frame is removed. + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Show() + end end end @@ -375,25 +377,23 @@ function TotemPlates:ToggleAddon(nameplate, show) local addonFrames = { self:GetAddonFrame(nameplate) } if addonFrames and #addonFrames > 0 then if show then - for _, frame in ipairs(addonFrames) do - if frame.UpdateAllElements then + for _,v in ipairs(addonFrames) do + if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - nameplate.unitFrame:UpdateAllElements") - frame:Show() - frame:UpdateAllElements("NAME_PLATE_UNIT_ADDED") + nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_ADDED") else Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - Show") - frame:Show() + v:Show() end end else - for _, frame in ipairs(addonFrames) do - if frame.UpdateAllElements then + for _,v in ipairs(addonFrames) do + if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - nameplate.unitFrame:UpdateAllElements") - frame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED") - frame:Hide() + nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED") else Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - Hide") - frame:Hide() + v:Hide() end end end @@ -457,8 +457,12 @@ function TotemPlates:OnUnitEvent(unitID) nameplate.gladdyTotemFrame.totemName:SetText(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].customText or "") nameplate.gladdyTotemFrame.parent = nameplate nameplate.gladdyTotemFrame:Show() + --Hide ElvUI nameplates once instead of in OnUpdate + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Hide() + end TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID) - self:ToggleAddon(nameplate, false) + self:ToggleAddon(nameplate) self.activeTotemNameplates[unitID] = nameplate elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then if nameplate.gladdyTotemFrame then @@ -466,8 +470,12 @@ function TotemPlates:OnUnitEvent(unitID) nameplate.gladdyTotemFrame:SetParent(nil) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil + --Show ElvUI nameplates when totem frame is removed. + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Show() + end end - self:ToggleAddon(nameplate, false) + self:ToggleAddon(nameplate) else self:ToggleAddon(nameplate, true) end @@ -793,4 +801,4 @@ function TotemPlates:GetOptions() args = select(2, GetTotemColorDefaultOptions()) }, } -end \ No newline at end of file +end diff --git a/README.md b/README.md index 46bc154..e765400 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ --- -## [v2.27-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.27-Release/Gladdy_Classic_v2.27-Release.zip) +## [v2.24-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.24-Release/Gladdy_Classic_v2.24-Release.zip) ###### Please consider donating if you like my work @@ -61,7 +61,6 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca - [dfherr](https://github.com/dfherr) - [miraage](https://github.com/miraage) - [veiz](https://github.com/veiz) -- [Flamanis](https://github.com/Flamanis) Thank you! @@ -81,15 +80,6 @@ Thank you! ### Changes -### v2.27-Release -- fix TotemPlates interfering with NeatPlates - -### v2.26-Release -- fix TotemPlates interfering with Plater (thanks again [Flamanis](https://github.com/Flamanis)) - -### v2.25-Release -- fix TotemPlates interfering with ElvUI (thanks [Flamanis](https://github.com/Flamanis)) - ### v2.24-Release - fix for WotLK v30402 (update libs) - update DRList