Merge branch 'release/v2.00' into main

- reset timer when shadowsight buff is active
- add a second timer
- show one or two timers option added

.gitignore

@@ -6,3 +6,4 @@ BuffLib
 Ace-Libs
 Images_Raw
 Gladdy_old
+Gladdy_TW

Bindings.xml

@@ -1,38 +1,31 @@
 <Bindings>
-    <Binding name="GLADDYBUTTON1_LEFT" header="GLADDY" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON2_LEFT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON3_LEFT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON4_LEFT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON5_LEFT" category="ADDONS"/>
+    <Binding name="GLADDYBUTTON1_LEFT" header="GLADDY" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON2_LEFT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON3_LEFT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON4_LEFT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON5_LEFT" Category="Gladdy"/>
 
-    <Binding name="GLADDYBUTTON1_RIGHT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON2_RIGHT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON3_RIGHT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON4_RIGHT" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON5_RIGHT" category="ADDONS"/>
+    <Binding name="GLADDYBUTTON1_RIGHT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON2_RIGHT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON3_RIGHT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON4_RIGHT" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON5_RIGHT" Category="Gladdy"/>
 
-    <Binding name="GLADDYBUTTON1_MIDDLE" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON2_MIDDLE" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON3_MIDDLE" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON4_MIDDLE" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON5_MIDDLE" category="ADDONS"/>
+    <Binding name="GLADDYBUTTON1_MIDDLE" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON2_MIDDLE" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON3_MIDDLE" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON4_MIDDLE" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON5_MIDDLE" Category="Gladdy"/>
 
-    <Binding name="GLADDYBUTTON1_BUTTON4" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON2_BUTTON4" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON3_BUTTON4" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON4_BUTTON4" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON5_BUTTON4" category="ADDONS"/>
+    <Binding name="GLADDYBUTTON1_BUTTON4" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON2_BUTTON4" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON3_BUTTON4" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON4_BUTTON4" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON5_BUTTON4" Category="Gladdy"/>
 
-    <Binding name="GLADDYBUTTON1_BUTTON5" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON2_BUTTON5" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON3_BUTTON5" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON4_BUTTON5" category="ADDONS"/>
-    <Binding name="GLADDYBUTTON5_BUTTON5" category="ADDONS"/>
-
-
-	<Binding header="GLADDYTRINKET" name="GLADDYTRINKET1" category="ADDONS"/>
-	<Binding name="GLADDYTRINKET2"  category="ADDONS"/>
-	<Binding name="GLADDYTRINKET3"  category="ADDONS"/>
-	<Binding name="GLADDYTRINKET4"  category="ADDONS"/>
-	<Binding name="GLADDYTRINKET5"  category="ADDONS"/>
+    <Binding name="GLADDYBUTTON1_BUTTON5" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON2_BUTTON5" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON3_BUTTON5" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON4_BUTTON5" Category="Gladdy"/>
+    <Binding name="GLADDYBUTTON5_BUTTON5" Category="Gladdy"/>
 </Bindings>

EventListener.lua

@@ -1,14 +1,14 @@
-local select, string_gsub, tostring = select, string.gsub, tostring
+local select, string_gsub, tostring, pairs = select, string.gsub, tostring, pairs
 
 local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
-local RAID_CLASS_COLORS = RAID_CLASS_COLORS
 local AURA_TYPE_DEBUFF = AURA_TYPE_DEBUFF
 local AURA_TYPE_BUFF = AURA_TYPE_BUFF
 
-local UnitName, UnitAura, UnitRace, UnitClass, UnitGUID, UnitIsUnit = UnitName, UnitAura, UnitRace, UnitClass, UnitGUID, UnitIsUnit
+local UnitName, UnitAura, UnitRace, UnitClass, UnitGUID, UnitIsUnit, UnitExists = UnitName, UnitAura, UnitRace, UnitClass, UnitGUID, UnitIsUnit, UnitExists
 local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
 local GetSpellInfo = GetSpellInfo
 local FindAuraByName = AuraUtil.FindAuraByName
+local GetTime = GetTime
 
 local Gladdy = LibStub("Gladdy")
 local Cooldowns = Gladdy.modules["Cooldowns"]
@@ -34,7 +34,16 @@ function EventListener:JOINED_ARENA()
     self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
     self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
     self:SetScript("OnEvent", EventListener.OnEvent)
-    Gladdy:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "RAID", UnitName("player"))
+
+    -- in case arena has started already we check for units
+    for i=1,Gladdy.curBracket do
+        if UnitExists("arena" .. i) then
+            Gladdy:SpotEnemy("arena" .. i, true)
+        end
+        if UnitExists("arenapet" .. i) then
+            Gladdy:SendMessage("PET_SPOTTED", "arenapet" .. i)
+        end
+    end
 end
 
 function EventListener:Reset()
@@ -42,14 +51,17 @@ function EventListener:Reset()
     self:SetScript("OnEvent", nil)
 end
 
-function Gladdy:DetectSpec(unit, specSpell)
-    if specSpell then
-        self.modules["Cooldowns"]:DetectSpec(unit, specSpell)
+function Gladdy:DetectSpec(unit, spec)
+    if spec then
+        self.modules["Cooldowns"]:DetectSpec(unit, spec)
     end
 end
 
 function Gladdy:SpotEnemy(unit, auraScan)
     local button = self.buttons[unit]
+    if not unit or not button then
+        return
+    end
     button.raceLoc = UnitRace(unit)
     button.race = select(2, UnitRace(unit))
     button.classLoc = select(1, UnitClass(unit))
@@ -57,14 +69,24 @@ function Gladdy:SpotEnemy(unit, auraScan)
     button.name = UnitName(unit)
     button.stealthed = false
     Gladdy.guids[UnitGUID(unit)] = unit
-    Gladdy:SendMessage("ENEMY_SPOTTED", unit)
+    if button.class and button.race then
+        Gladdy:SendMessage("ENEMY_SPOTTED", unit)
+    end
     if auraScan and not button.spec then
         for n = 1, 30 do
-            local spellName,_,_,_,_,_,unitCaster = UnitAura(unit, n, "HELPFUL")
+            local spellName,_,_,_,_,expirationTime,unitCaster = UnitAura(unit, n, "HELPFUL")
             if ( not spellName ) then
                 break
             end
-            if Gladdy.specBuffs[spellName] then
+            if Gladdy.cooldownBuffs[spellName] then -- Check for auras that detect used CDs (like Fear Ward)
+                for arenaUnit,v in pairs(self.buttons) do
+                    if (UnitIsUnit(arenaUnit, unitCaster)) then
+                        Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, expirationTime - GetTime())
+                        -- /run LibStub("Gladdy").modules["Cooldowns"]:CooldownUsed("arena5", "PRIEST", 6346, 10)
+                    end
+                end
+            end
+            if Gladdy.specBuffs[spellName] then -- Check for auras that detect a spec
                 local unitPet = string_gsub(unit, "%d$", "pet%1")
                 if UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster) then
                     Gladdy:DetectSpec(unit, Gladdy.specBuffs[spellName])
@@ -76,57 +98,59 @@ end
 
 function EventListener:COMBAT_LOG_EVENT_UNFILTERED()
     -- timestamp,eventType,hideCaster,sourceGUID,sourceName,sourceFlags,sourceRaidFlags,destGUID,destName,destFlags,destRaidFlags,spellId,spellName,spellSchool
-    local _,eventType,_,sourceGUID,_,_,_,destGUID,_,_,_,spellID,spellName = CombatLogGetCurrentEventInfo()
-    local srcUnit = Gladdy.guids[sourceGUID]
-    local destUnit = Gladdy.guids[destGUID]
-
-    if Gladdy.specSpells[spellName] and srcUnit then
-        --Gladdy:Print(eventType, spellName, Gladdy.specSpells[spellName], srcUnit)
-    end
-    if (eventType == "UNIT_DIED" or eventType == "PARTY_KILL" or eventType == "SPELL_INSTAKILL") then
-        if destUnit then
-            --Gladdy:Print(eventType, "destUnit", destUnit)
-        elseif srcUnit then
-            --Gladdy:Print(eventType, "srcUnit", srcUnit)
-        end
+    local _,eventType,_,sourceGUID,_,_,_,destGUID,_,_,_,spellID,spellName,spellSchool,extraSpellId,extraSpellName,extraSpellSchool = CombatLogGetCurrentEventInfo()
+    local srcUnit = Gladdy.guids[sourceGUID] -- can be a PET
+    local destUnit = Gladdy.guids[destGUID] -- can be a PET
+    if (Gladdy.db.shadowsightTimerEnabled and eventType == "SPELL_AURA_APPLIED" and spellID == 34709) then
+        Gladdy.modules["Shadowsight Timer"]:AURA_GAIN(nil, nil, 34709)
     end
 
     if destUnit then
         -- diminish tracker
-        if (Gladdy.db.drEnabled and (eventType == "SPELL_AURA_REMOVED" or eventType == "SPELL_AURA_REFRESH")) then
+        if Gladdy.buttons[destUnit] and (Gladdy.db.drEnabled and (eventType == "SPELL_AURA_REMOVED" or eventType == "SPELL_AURA_REFRESH")) then
             Diminishings:AuraFade(destUnit, spellID)
         end
         -- death detection
-        if (eventType == "UNIT_DIED" or eventType == "PARTY_KILL" or eventType == "SPELL_INSTAKILL") then
+        if (Gladdy.buttons[destUnit] and eventType == "UNIT_DIED" or eventType == "PARTY_KILL" or eventType == "SPELL_INSTAKILL") then
             Gladdy:SendMessage("UNIT_DEATH", destUnit)
         end
         -- spec detection
-        if not Gladdy.buttons[destUnit].class then
+        if Gladdy.buttons[destUnit] and (not Gladdy.buttons[destUnit].class or not Gladdy.buttons[destUnit].race) then
             Gladdy:SpotEnemy(destUnit, true)
         end
+        --interrupt detection
+        if Gladdy.buttons[destUnit] and eventType == "SPELL_INTERRUPT" then
+            Gladdy:SendMessage("SPELL_INTERRUPT", destUnit,spellID,spellName,spellSchool,extraSpellId,extraSpellName,extraSpellSchool)
+        end
     end
     if srcUnit then
-        local unitRace = Gladdy.buttons[srcUnit].race
-        -- cooldown tracker
-        if Gladdy.db.cooldown and Cooldowns.cooldownSpellIds[spellName] then
-            local unitClass
-            local spellId = Cooldowns.cooldownSpellIds[spellName] -- don't use spellId from combatlog, in case of different spellrank
-            if Gladdy.db.cooldownCooldowns[tostring(spellId)] then
-                if (Gladdy:GetCooldownList()[Gladdy.buttons[srcUnit].class][spellId]) then
-                    unitClass = Gladdy.buttons[srcUnit].class
-                else
-                    unitClass = Gladdy.buttons[srcUnit].race
+        srcUnit = string_gsub(srcUnit, "pet", "")
+        if (not UnitExists(srcUnit)) then
+            return
+        end
+        if (eventType == "SPELL_CAST_SUCCESS" or eventType == "SPELL_AURA_APPLIED") then
+            local unitRace = Gladdy.buttons[srcUnit].race
+            -- cooldown tracker
+            if Gladdy.db.cooldown and Cooldowns.cooldownSpellIds[spellName] then
+                local unitClass
+                local spellId = Cooldowns.cooldownSpellIds[spellName] -- don't use spellId from combatlog, in case of different spellrank
+                if Gladdy.db.cooldownCooldowns[tostring(spellId)] then
+                    if (Gladdy:GetCooldownList()[Gladdy.buttons[srcUnit].class][spellId]) then
+                        unitClass = Gladdy.buttons[srcUnit].class
+                    else
+                        unitClass = Gladdy.buttons[srcUnit].race
+                    end
+                    Cooldowns:CooldownUsed(srcUnit, unitClass, spellId)
+                    Gladdy:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
                 end
-                Cooldowns:CooldownUsed(srcUnit, unitClass, spellId, spellName)
-                Gladdy:DetectSpec(srcUnit, Gladdy.specSpells[spellName])
+            end
+
+            if Gladdy.db.racialEnabled and Gladdy:Racials()[unitRace].spellName == spellName and Gladdy:Racials()[unitRace][spellID] then
+                Gladdy:SendMessage("RACIAL_USED", srcUnit)
             end
         end
 
-        if Gladdy.db.racialEnabled and Gladdy:Racials()[unitRace].spellName == spellName and Gladdy:Racials()[unitRace][spellID] then
-            Gladdy:SendMessage("RACIAL_USED", srcUnit)
-        end
-
-        if not Gladdy.buttons[srcUnit].class then
+        if not Gladdy.buttons[srcUnit].class or not Gladdy.buttons[srcUnit].race then
             Gladdy:SpotEnemy(srcUnit, true)
         end
         if not Gladdy.buttons[srcUnit].spec then
@@ -143,12 +167,11 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason)
     if button or pet then
         if updateReason == "seen" then
             -- ENEMY_SPOTTED
-            if button and not button.class then
-                Gladdy:SpotEnemy(unit, true)
-            end
-            if button and button.stealthed then
-                local class = Gladdy.buttons[unit].class
-                button.healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[class].r, RAID_CLASS_COLORS[class].g, RAID_CLASS_COLORS[class].b, 1)
+            if button then
+                Gladdy:SendMessage("ENEMY_STEALTH", unit, false)
+                if not button.class or not button.race then
+                    Gladdy:SpotEnemy(unit, true)
+                end
             end
             if pet then
                 Gladdy:SendMessage("PET_SPOTTED", unit)
@@ -156,9 +179,7 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason)
         elseif updateReason == "unseen" then
             -- STEALTH
             if button then
-                Gladdy:SendMessage("ENEMY_STEALTH", unit)
-                button.healthBar.hp:SetStatusBarColor(0.66, 0.66, 0.66, 1)
-                button.stealthed = true
+                Gladdy:SendMessage("ENEMY_STEALTH", unit, true)
             end
             if pet then
                 Gladdy:SendMessage("PET_STEALTH", unit)
@@ -177,7 +198,7 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason)
     end
 end
 
-local exceptionNames = {
+Gladdy.exceptionNames = { -- TODO MOVE ME TO CLASSBUFFS LIB
     [31117] = GetSpellInfo(30405) .. " Silence", -- Unstable Affliction Silence
     [43523] = GetSpellInfo(30405) .. " Silence",
     [24131] = select(1, GetSpellInfo(19386)) .. " Dot", -- Wyvern Sting Dot
@@ -193,13 +214,17 @@ local exceptionNames = {
     [27010] = select(1, GetSpellInfo(27010)) .. " " .. select(1, GetSpellInfo(16689)),
 }
 
+Gladdy.cooldownBuffs = {
+    [GetSpellInfo(6346)] = { cd = 180, spellId = 6346 }, -- Fear Ward
+}
+
 function EventListener:UNIT_AURA(unit)
     local button = Gladdy.buttons[unit]
     if not button then
         return
     end
     for i = 1, 2 do
-        if not Gladdy.buttons[unit].class then
+        if not Gladdy.buttons[unit].class or not Gladdy.buttons[unit].race then
             Gladdy:SpotEnemy(unit, false)
         end
         local filter = (i == 1 and "HELPFUL" or "HARMFUL")
@@ -211,14 +236,21 @@ function EventListener:UNIT_AURA(unit)
                 Gladdy:SendMessage("AURA_GAIN_LIMIT", unit, auraType, n - 1)
                 break
             end
+            if Gladdy.cooldownBuffs[spellName] then -- Check for auras that hint used CDs (like Fear Ward)
+                for arenaUnit,v in pairs(Gladdy.buttons) do
+                    if (UnitIsUnit(arenaUnit, unitCaster)) then
+                        Cooldowns:CooldownUsed(arenaUnit, v.class, Gladdy.cooldownBuffs[spellName].spellId, expirationTime - GetTime())
+                    end
+                end
+            end
             if not button.spec and Gladdy.specBuffs[spellName] then
                 local unitPet = string_gsub(unit, "%d$", "pet%1")
-                if UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster) then
+                if unitCaster and (UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster)) then
                     Gladdy:DetectSpec(unit, Gladdy.specBuffs[spellName])
                 end
             end
-            if exceptionNames[spellID] then
-                spellName = exceptionNames[spellID]
+            if Gladdy.exceptionNames[spellID] then
+                spellName = Gladdy.exceptionNames[spellID]
             end
             Gladdy:SendMessage("AURA_GAIN", unit, auraType, spellID, spellName, texture, duration, expirationTime, count, debuffType, i)
             Gladdy:Call("Announcements", "CheckDrink", unit, spellName)
@@ -252,7 +284,3 @@ function EventListener:UNIT_SPELLCAST_SUCCEEDED(unit)
         end
     end
 end
-
-function EventListener:GetOptions()
-    return nil
-end

Frame.lua

@@ -1,6 +1,9 @@
 local CreateFrame = CreateFrame
 local UIParent = UIParent
 local InCombatLockdown = InCombatLockdown
+local math_abs = math.abs
+local pairs = pairs
+local LibStub = LibStub
 
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
@@ -26,15 +29,26 @@ Gladdy.BUTTON_DEFAULTS = {
     damaged = 0,
     click = false,
     stealthed = false,
+    classColors = {},
+    lastState = 0,
 }
 
 function Gladdy:CreateFrame()
     self.frame = CreateFrame("Frame", "GladdyFrame", UIParent)
 
+    self.frame.background = CreateFrame("Frame", nil, self.frame, BackdropTemplateMixin and "BackdropTemplate")
+    self.frame.background:SetBackdrop({bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", tile = false, tileSize = 16})
+    self.frame.background:SetFrameStrata("BACKGROUND")
+    self.frame.background:SetBackdropColor(Gladdy:SetColor(self.db.backgroundColor))
+    self.frame.background:SetAllPoints(self.frame)
+    --self.frame.texture = self.frame:CreateTexture(nil, "OVERLAY")
+    --self.frame.texture:SetAllPoints(self.frame)
+    --self.frame.texture:SetTexture("Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp")
+
     self.frame:SetClampedToScreen(true)
-    self.frame:EnableMouse(true)
+    self.frame:EnableMouse(false)
     self.frame:SetMovable(true)
-    self.frame:RegisterForDrag("LeftButton")
+    --self.frame:RegisterForDrag("LeftButton")
 
     self.frame:SetScript("OnDragStart", function(f)
         if (not InCombatLockdown() and not self.db.locked) then
@@ -47,7 +61,7 @@ function Gladdy:CreateFrame()
 
             local scale = f:GetEffectiveScale()
             self.db.x = f:GetLeft() * scale
-            self.db.y = (self.db.growUp and f:GetBottom() or f:GetTop()) * scale
+            self.db.y = (self.db.growDirection == "TOP" and f:GetBottom() or f:GetTop()) * scale
         end
     end)
 
@@ -71,7 +85,7 @@ function Gladdy:CreateFrame()
 
             local scale = self.frame:GetEffectiveScale()
             self.db.x = self.frame:GetLeft() * scale
-            self.db.y = (self.db.growUp and self.frame:GetBottom() or self.frame:GetTop()) * scale
+            self.db.y = (self.db.growDirection == "TOP" and self.frame:GetBottom() or self.frame:GetTop()) * scale
         end
     end)
     self.anchor:SetScript("OnClick", function()
@@ -104,133 +118,170 @@ end
 
 function Gladdy:UpdateFrame()
 
+    if (InCombatLockdown()) then
+        return
+    end
+
     if (not self.frame) then
         self:CreateFrame()
     end
     local teamSize = self.curBracket or 0
 
-    local iconSize = self.db.healthBarHeight
-    local margin = 0
-    local width = self.db.barWidth + self.db.padding * 2 + 5
-    local height = self.db.healthBarHeight * teamSize + margin * (teamSize - 1) + self.db.padding * 2 + 5
-    local extraBarWidth = 0
-    local extraBarHeight = 0
+    local highlightBorderSize = (self.db.highlightInset and 0 or self.db.highlightBorderSize * 2)
+    local powerBarHeight = self.db.powerBarEnabled and (self.db.powerBarHeight + 1) or 0
 
-    -- Powerbar
-    iconSize = iconSize + self.db.powerBarHeight
-    margin = margin + self.db.powerBarHeight
-    height = height + self.db.powerBarHeight * teamSize
-    extraBarHeight = extraBarHeight + self.db.powerBarHeight
+    local margin = powerBarHeight
+    local height = (self.db.healthBarHeight + powerBarHeight) * teamSize
+            + (self.db.highlightInset and 0 or self.db.highlightBorderSize * 2 * teamSize)
+            + self.db.bottomMargin * (teamSize - 1)
 
-    -- Cooldown
-    margin = margin + 1 + self.db.highlightBorderSize * 2 + 1 -- + 1 space between health and power bar
-    height = height + self.db.highlightBorderSize * teamSize
+    -- Highlight
+    margin = margin + highlightBorderSize
+    margin, height = Gladdy:LegacyPositioning(margin, height, teamSize)
 
-    if (self.db.cooldownYPos == "TOP" or self.db.cooldownYPos == "BOTTOM") and self.db.cooldown then
-        margin = margin + self.db.cooldownSize
-        height = height + self.db.cooldownSize * teamSize
+    -- GrowDirection
+    if (self.db.growDirection == "LEFT" or self.db.growDirection == "RIGHT") then
+        height = self.db.healthBarHeight + powerBarHeight
     end
-    if (self.db.buffsCooldownPos == "TOP" or self.db.buffsCooldownPos == "BOTTOM") and self.db.buffsEnabled then
-        margin = margin + self.db.buffsIconSize
-        height = height + self.db.buffsIconSize * teamSize
-    end
-    if (self.db.buffsBuffsCooldownPos == "TOP" or self.db.buffsBuffsCooldownPos == "BOTTOM") and self.db.buffsEnabled then
-        margin = margin + self.db.buffsBuffsIconSize
-        height = height + self.db.buffsBuffsIconSize * teamSize
-    end
-    if self.db.buffsCooldownPos == "TOP" and self.db.cooldownYPos == "TOP" and self.db.cooldown and self.db.buffsEnabled then
-        margin = margin + 1
-    end
-    if self.db.buffsCooldownPos == "BOTTOM" and self.db.cooldownYPos == "BOTTOM" and self.db.cooldown and self.db.buffsEnabled then
-        margin = margin + 1
-    end
-
-    -- Classicon
-    width = width + iconSize
-    extraBarWidth = extraBarWidth + iconSize
-
-    -- Trinket
-    width = width + iconSize
 
     self.frame:SetScale(self.db.frameScale)
-    self.frame:SetWidth(width)
+    self:PixelPerfectScale(false)
+    self.frame:SetWidth(self.db.barWidth + highlightBorderSize)
     self.frame:SetHeight(height)
-    --self.frame:SetBackdropColor(self.db.frameColor.r, self.db.frameColor.g, self.db.frameColor.b, self.db.frameColor.a)
+    self.frame:ClearAllPoints()
+    self.frame.background:SetBackdropColor(Gladdy:SetColor(self.db.backgroundColor))
     self.frame:ClearAllPoints()
     if (self.db.x == 0 and self.db.y == 0) then
         self.frame:SetPoint("CENTER")
     else
         local scale = self.frame:GetEffectiveScale()
-        if (self.db.growUp) then
+        if (self.db.growDirection == "TOP") then
             self.frame:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, self.db.y / scale)
         else
             self.frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", self.db.x / scale, self.db.y / scale)
         end
     end
 
-    self.anchor:SetWidth(width)
+    --Anchor
+    self.anchor:SetWidth(self.db.barWidth * 2 + highlightBorderSize)
     self.anchor:ClearAllPoints()
-    if (self.db.growUp) then
-        self.anchor:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
+    if (self.db.growDirection == "TOP") then
+        self.anchor:SetPoint("TOP", self.frame, "BOTTOM")
+    elseif self.growDirection == "BOTTOM" or self.growDirection == "RIGHT" then
+        self.anchor:SetPoint("BOTTOM", self.frame, "TOP")
     else
-        self.anchor:SetPoint("BOTTOMLEFT", self.frame, "TOPLEFT")
+        self.anchor:SetPoint("BOTTOM", self.frame, "TOP")
     end
 
     if (self.db.locked) then
         self.anchor:Hide()
-        self.anchor:Hide()
     else
         self.anchor:Show()
     end
 
     for i = 1, teamSize do
         local button = self.buttons["arena" .. i]
-        button:SetWidth(self.db.barWidth + extraBarWidth)
+        button:SetWidth(self.db.barWidth)
         button:SetHeight(self.db.healthBarHeight)
-        button.secure:SetWidth(self.db.barWidth + extraBarWidth)
-        button.secure:SetHeight(self.db.healthBarHeight + extraBarHeight)
+        button.secure:SetWidth(self.db.barWidth)
+        button.secure:SetHeight(self.db.healthBarHeight + powerBarHeight)
 
         button:ClearAllPoints()
         button.secure:ClearAllPoints()
-        if (self.db.growUp) then
+        if (self.db.growDirection == "TOP") then
             if (i == 1) then
-                button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMLEFT", self.db.padding + 2, 0)
-                button.secure:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMLEFT", self.db.padding + 2, 0)
+                button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMLEFT", 0, powerBarHeight)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             else
                 button:SetPoint("BOTTOMLEFT", self.buttons["arena" .. (i - 1)], "TOPLEFT", 0, margin + self.db.bottomMargin)
-                button.secure:SetPoint("BOTTOMLEFT", self.buttons["arena" .. (i - 1)], "TOPLEFT", 0, margin + self.db.bottomMargin)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             end
-        else
+        elseif (self.db.growDirection == "BOTTOM") then
             if (i == 1) then
-                button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", self.db.padding + 2, 0)
-                button.secure:SetPoint("TOPLEFT", self.frame, "TOPLEFT", self.db.padding + 2, 0)
+                button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, 0)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             else
                 button:SetPoint("TOPLEFT", self.buttons["arena" .. (i - 1)], "BOTTOMLEFT", 0, -margin - self.db.bottomMargin)
-                button.secure:SetPoint("TOPLEFT", self.buttons["arena" .. (i - 1)], "BOTTOMLEFT", 0, -margin - self.db.bottomMargin)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+            end
+        elseif (self.db.growDirection == "LEFT") then
+            if (i == 1) then
+                button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", -0, 0)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+            else
+                button:SetPoint("TOPRIGHT", self.buttons["arena" .. (i - 1)], "TOPLEFT", - self.db.bottomMargin, 0)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+            end
+        elseif (self.db.growDirection == "RIGHT") then
+            if (i == 1) then
+                button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, 0)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+            else
+                button:SetPoint("TOPLEFT", self.buttons["arena" .. (i - 1)], "TOPRIGHT", self.db.bottomMargin, 0)
+                button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
             end
         end
 
 
-        for k, v in self:IterModules() do
-            self:Call(v, "UpdateFrame", button.unit)
+        for _, v in self:IterModules() do
+            self:Call(v, "UpdateFrame", "arena" .. i)
         end
     end
-    for k, v in self:IterModules() do
+    for _, v in self:IterModules() do
         self:Call(v, "UpdateFrameOnce")
     end
+    if Gladdy.db.hideBlizzard == "always" then
+        Gladdy:BlizzArenaSetAlpha(0)
+    elseif Gladdy.db.hideBlizzard == "arena" then
+        if Gladdy.curBracket then
+            Gladdy:BlizzArenaSetAlpha(0)
+        else
+            Gladdy:BlizzArenaSetAlpha(1)
+        end
+    elseif Gladdy.db.hideBlizzard == "never" then
+        Gladdy:BlizzArenaSetAlpha(1)
+    end
+    if (not Gladdy.db.newLayout) then
+        Gladdy.db.newLayout = true
+        --get margin
+        local arena1Bottom
+        local arena2Top
+        if (self.db.growDirection == "BOTTOM") then
+            arena1Bottom = self.buttons["arena1"].secure:GetBottom()
+            arena2Top = self.buttons["arena2"].secure:GetTop()
+        elseif (self.db.growDirection == "TOP") then
+            arena1Bottom = self.buttons["arena1"].secure:GetTop()
+            arena2Top = self.buttons["arena2"].secure:GetBottom()
+        elseif (self.db.growDirection == "LEFT") then
+            arena1Bottom = self.buttons["arena1"].secure:GetLeft()
+            arena2Top = self.buttons["arena2"].secure:GetRight()
+        elseif (self.db.growDirection == "RIGHT") then
+            arena1Bottom = self.buttons["arena1"].secure:GetRight()
+            arena2Top = self.buttons["arena2"].secure:GetLeft()
+        end
+        Gladdy.db.bottomMargin = math_abs(arena1Bottom - arena2Top)
+        Gladdy:UpdateFrame()
+    end
 end
 
 function Gladdy:HideFrame()
     if (self.frame) then
-        self.frame:Hide()
+        if InCombatLockdown() then
+            self.startTest = nil
+            self.hideFrame = true
+        else
+            self:Reset()
+            self.frame:Hide()
+        end
+
         self.frame.testing = nil
     end
 end
 
 function Gladdy:ToggleFrame(i)
     self:Reset()
-
     if (self.frame and self.frame:IsShown() and i == self.curBracket) then
+        self.frame.testing = nil
         self:HideFrame()
     else
         self.curBracket = i
@@ -238,6 +289,7 @@ function Gladdy:ToggleFrame(i)
         if (not self.frame) then
             self:CreateFrame()
         end
+        self.frame.testing = true
 
         for o = 1, self.curBracket do
             local unit = "arena" .. o
@@ -245,9 +297,17 @@ function Gladdy:ToggleFrame(i)
                 self:CreateButton(o)
             end
         end
+        self:Reset()
+        self.curBracket = i
         self:UpdateFrame()
-        self:Test()
-        self.frame:Show()
+        if InCombatLockdown() then
+            Gladdy:Print("Gladdy frames show as soon as you leave combat")
+            self.showFrame = true
+            self.startTest = true
+        else
+            self:Test()
+            self.frame:Show()
+        end
     end
 end
 
@@ -257,32 +317,221 @@ function Gladdy:CreateButton(i)
     end
 
     local button = CreateFrame("Frame", "GladdyButtonFrame" .. i, self.frame)
-    button:SetAlpha(0)
+    button:EnableMouse(false)
+    --button:SetAlpha(0)
+    --button.texture = button:CreateTexture(nil, "OVERLAY")
+    --button.texture:SetAllPoints(button)
+    --button.texture:SetTexture("Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp")
 
-    local secure = CreateFrame("Button", "GladdyButton" .. i, button, "SecureActionButtonTemplate")
+    local secure = CreateFrame("Button", "GladdyButton" .. i, button, "SecureActionButtonTemplate, SecureHandlerEnterLeaveTemplate")
     secure:RegisterForClicks("AnyUp")
-    secure:RegisterForClicks("AnyUp")
-    secure:SetAttribute("*type1", "target")
-    secure:SetAttribute("*type2", "focus")
+    secure:RegisterForClicks("AnyDown")
+
+    secure:SetAttribute("target", "arena" .. i)
+    secure:SetAttribute("focus", "arena" .. i)
     secure:SetAttribute("unit", "arena" .. i)
 
-    button:RegisterEvent("UNIT_NAME_UPDATE")
-    button:RegisterEvent("ARENA_OPPONENT_UPDATE")
-    button:RegisterEvent("ARENA_COOLDOWNS_UPDATE")
-    button:RegisterEvent("ARENA_CROWD_CONTROL_SPELL_UPDATE")
-    button:RegisterUnitEvent("UNIT_CONNECTION", "arena" .. i)
+    --[[
+    secure:SetAttribute("target", i == 1 and "player" or "focus")
+    secure:SetAttribute("focus", i == 1 and "player" or "focus")
+    secure:SetAttribute("unit", i == 1 and "player" or "focus")
+    --]]
+
+    --secure.texture = secure:CreateTexture(nil, "OVERLAY")
+    --secure.texture:SetAllPoints(secure)
+    --secure.texture:SetTexture("Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp")
 
     button.id = i
+    --button.unit = i == 1 and "player" or "focus"
     button.unit = "arena" .. i
     button.secure = secure
 
 
-    self:ResetButton(button.unit)
+    self:ResetButton("arena" .. i)
 
-    self.buttons[button.unit] = button
+    self.buttons["arena" .. i] = button
 
-    for k, v in self:IterModules() do
-        self:Call(v, "CreateFrame", button.unit)
+    for _, v in self:IterModules() do
+        self:Call(v, "CreateFrame", "arena" .. i)
+    end
+    self:ResetButton("arena" .. i)
+end
+
+
+
+function Gladdy:SetPosition(frame, unit, xOffsetDB, yOffsetDB, newLayout, module)
+    local button = self.buttons[unit]
+    if not button or not frame or not xOffsetDB or not yOffsetDB then
+        return
+    end
+
+    if (not newLayout) then
+        --Gladdy:Debug("INFO", name, "old X/Y:", frame:GetCenter())
+        local xOffset, yOffset = frame:GetLeft(), frame:GetTop()
+        local x,y = button.healthBar:GetLeft(), button.healthBar:GetTop()
+        local newXOffset = math_abs(x - xOffset) * (x > xOffset and -1 or 1)
+        local newYOffset = math_abs(y - yOffset) * (y > yOffset and -1 or 1)
+        frame:ClearAllPoints()
+        frame:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT", newXOffset, newYOffset)
+        --Gladdy:Debug("INFO", name, "new X/Y:", frame:GetCenter())
+        if unit == "arena1" then
+            Gladdy.db[xOffsetDB] = newXOffset
+            Gladdy.db[yOffsetDB] = newYOffset
+            LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
+        end
+    else
+        frame:ClearAllPoints()
+        frame:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT", Gladdy.db[xOffsetDB], Gladdy.db[yOffsetDB])
+    end
+    if (self.newDefaults[module.name]) then
+        for k,v in pairs(self.newDefaults[module.name]) do
+            module.defaults[k] = v
+        end
+    end
+end
+
+function Gladdy:CreateMover(frame, xConfig, yConfig, name, points, width, height, xOffset, yOffset, activated)
+    if not frame.mover then
+        frame:EnableMouse(false)
+        frame:SetMovable(true)
+        frame.mover = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate")
+        frame.mover:SetFrameStrata("TOOLTIP")
+        frame.mover:SetPoint(points[1], frame, points[2], xOffset or 0, yOffset or 0)
+        frame.mover:SetHeight(height or frame:GetHeight())
+        frame.mover:SetWidth(width or frame:GetWidth())
+
+        local backdrop = {
+            bgFile = "Interface/Tooltips/UI-Tooltip-Background",
+            edgeFile = "",
+            tile = true, tileSize = 16, edgeSize = 10,
+            insets = {left = 0, right = 0, top = 0, bottom = 0}
+        }
+        frame.mover:SetBackdrop(backdrop)
+        frame.mover:SetBackdropColor(0,1,0,0.5)
+        frame.mover.border = CreateFrame("Frame", nil, frame.mover, BackdropTemplateMixin and "BackdropTemplate")
+        frame.mover.border:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = 2 })
+        frame.mover.border:SetAllPoints(frame.mover)
+        frame.mover.border:SetBackdropBorderColor(0,1,0,1)
+        frame.mover.border:SetFrameStrata("TOOLTIP")
+
+        frame.mover.text = frame.mover.border:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
+        frame.mover.text:SetText(name)
+        frame.mover.text:SetPoint("CENTER")
+
+        frame.mover:SetMovable(true)
+        frame.mover:EnableMouse(true)
+
+        frame.mover:SetScript("OnMouseDown", function(self)
+            self.point = { frame:GetPoint() }
+            self.start = { frame:GetCenter() }
+            frame:StartMoving()
+            self:StartMoving()
+        end)
+        frame.mover:SetScript("OnMouseUp", function(self)
+            frame:StopMovingOrSizing()
+            self:StopMovingOrSizing()
+            self.stop = { frame:GetCenter() }
+            local diffX = math_abs(self.start[1] - self.stop[1])
+            diffX = self.start[1] > self.stop[1] and -diffX or diffX
+            local diffY = math_abs(self.start[2] - self.stop[2])
+            diffY = self.start[2] > self.stop[2] and -diffY or diffY
+            frame:ClearAllPoints()
+            frame:SetPoint(self.point[1], self.point[2], self.point[3], self.point[4] + diffX, self.point[5] + diffY)
+            Gladdy.db[xConfig] = self.point[4] + diffX
+            Gladdy.db[yConfig] = self.point[5] + diffY
+            LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
+            Gladdy:UpdateFrame()
+        end)
+    else
+        frame.mover:ClearAllPoints()
+        frame.mover:SetPoint(points[1], frame, points[2], xOffset or 0, yOffset or 0)
+        frame.mover:SetHeight(height or frame:GetHeight())
+        frame.mover:SetWidth(width or frame:GetWidth())
+    end
+    if self.frame and self.frame.testing and self.db.showMover then
+        if (activated ~= nil and not Gladdy.db[activated]) then
+            frame.mover:Hide()
+        else
+            frame.mover:Show()
+        end
+    else
+        frame.mover:Hide()
+    end
+end
+
+---------------------------
+
+-- LAGACY SUPPORT
+
+---------------------------
+
+function Gladdy:LegacyPositioning(margin, height, teamSize)
+    if not Gladdy.db.newLayout then
+        for k,v in pairs(Gladdy.legacy) do
+            if Gladdy.db[k] == nil then
+                Gladdy:Debug("INFO", "Gladdy:LegacyPositioning write", k,v)
+                Gladdy.db[k] = v
+            else
+                Gladdy:Debug("INFO", "Gladdy:LegacyPositioning found", k,v)
+            end
+        end
+        if (self.db.cooldownYPos == "TOP" or self.db.cooldownYPos == "BOTTOM") and self.db.cooldown then
+            margin = margin + self.db.cooldownSize
+            height = height + self.db.cooldownSize * (teamSize - 1)
+        end
+        if (self.db.buffsCooldownPos == "TOP" or self.db.buffsCooldownPos == "BOTTOM") and self.db.buffsEnabled then
+            margin = margin + self.db.buffsIconSize
+            height = height + self.db.buffsIconSize * (teamSize - 1)
+        end
+        if (self.db.buffsBuffsCooldownPos == "TOP" or self.db.buffsBuffsCooldownPos == "BOTTOM") and self.db.buffsEnabled then
+            margin = margin + self.db.buffsBuffsIconSize
+            height = height + self.db.buffsBuffsIconSize * (teamSize - 1)
+        end
+        if self.db.buffsCooldownPos == "TOP" and self.db.cooldownYPos == "TOP" and self.db.cooldown and self.db.buffsEnabled then
+            margin = margin + 1
+            height = height + (teamSize - 1)
+        end
+        if self.db.buffsCooldownPos == "BOTTOM" and self.db.cooldownYPos == "BOTTOM" and self.db.cooldown and self.db.buffsEnabled then
+            margin = margin + 1
+            height = height + (teamSize - 1)
+        end
+    end
+    return margin, height
+end
+
+function Gladdy:PositionButton(button, i, leftSize, rightSize, powerBarHeight, margin)
+    if (self.db.growDirection == "TOP") then
+        if (i == 1) then
+            button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMLEFT", leftSize, powerBarHeight)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        else
+            button:SetPoint("BOTTOMLEFT", self.buttons["arena" .. (i - 1)], "TOPLEFT", 0, margin + self.db.bottomMargin)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        end
+    elseif (self.db.growDirection == "BOTTOM") then
+        if (i == 1) then
+            button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", leftSize, 0)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        else
+            button:SetPoint("TOPLEFT", self.buttons["arena" .. (i - 1)], "BOTTOMLEFT", 0, -margin - self.db.bottomMargin)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        end
+    elseif (self.db.growDirection == "LEFT") then
+        if (i == 1) then
+            button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", -rightSize, 0)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        else
+            button:SetPoint("TOPRIGHT", self.buttons["arena" .. (i - 1)], "TOPLEFT", -rightSize - leftSize - self.db.bottomMargin, 0)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        end
+    elseif (self.db.growDirection == "RIGHT") then
+        if (i == 1) then
+            button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", leftSize, 0)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        else
+            button:SetPoint("TOPLEFT", self.buttons["arena" .. (i - 1)], "TOPRIGHT", leftSize + rightSize + self.db.bottomMargin, 0)
+            button.secure:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT")
+        end
     end
 end
 

Gladdy.lua

@@ -5,15 +5,21 @@ local select = select
 local pairs = pairs
 local tinsert = table.insert
 local tsort = table.sort
+local str_lower = string.lower
+local GetTime = GetTime
+local GetPhysicalScreenSize = GetPhysicalScreenSize
+local InCombatLockdown = InCombatLockdown
 local CreateFrame = CreateFrame
 local DEFAULT_CHAT_FRAME = DEFAULT_CHAT_FRAME
 local IsAddOnLoaded = IsAddOnLoaded
-local IsInInstance = IsInInstance
 local GetBattlefieldStatus = GetBattlefieldStatus
 local IsActiveBattlefieldArena = IsActiveBattlefieldArena
+local IsInInstance = IsInInstance
+local GetNumArenaOpponents = GetNumArenaOpponents
 local RELEASE_TYPES = { alpha = "Alpha", beta = "Beta", release = "Release"}
 local PREFIX = "TBC-Classic_v"
 local VERSION_REGEX = PREFIX .. "(%d+%.%d+)%-(%a)"
+local LibStub = LibStub
 
 ---------------------------
 
@@ -21,16 +27,18 @@ local VERSION_REGEX = PREFIX .. "(%d+%.%d+)%-(%a)"
 
 ---------------------------
 
-local MAJOR, MINOR = "Gladdy", 4
+local MAJOR, MINOR = "Gladdy", 5
 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
 local L
-Gladdy.version_major_num = 1
-Gladdy.version_minor_num = 0.06
+Gladdy.version_major_num = 2
+Gladdy.version_minor_num = 0.00
 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
-Gladdy.version_releaseType = RELEASE_TYPES.beta
+Gladdy.version_releaseType = RELEASE_TYPES.release
 Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType
 Gladdy.VERSION_REGEX = VERSION_REGEX
 
+Gladdy.debug = false
+
 LibStub("AceTimer-3.0"):Embed(Gladdy)
 LibStub("AceComm-3.0"):Embed(Gladdy)
 Gladdy.modules = {}
@@ -52,6 +60,17 @@ function Gladdy:Print(...)
 end
 
 function Gladdy:Warn(...)
+    local text = "|cfff29f05Gladdy|r:"
+    local val
+    for i = 1, select("#", ...) do
+        val = select(i, ...)
+        if (type(val) == 'boolean') then val = val and "true" or false end
+        text = text .. " " .. tostring(val)
+    end
+    DEFAULT_CHAT_FRAME:AddMessage(text)
+end
+
+function Gladdy:Error(...)
     local text = "|cfffc0303Gladdy|r:"
     local val
     for i = 1, select("#", ...) do
@@ -62,13 +81,38 @@ function Gladdy:Warn(...)
     DEFAULT_CHAT_FRAME:AddMessage(text)
 end
 
+function Gladdy:Debug(lvl, ...)
+    if Gladdy.debug then
+        if lvl == "INFO" then
+            Gladdy:Print(...)
+        elseif lvl == "WARN" then
+            Gladdy:Warn(...)
+        elseif lvl == "ERROR" then
+            Gladdy:Error(...)
+        end
+    end
+end
+
 Gladdy.events = CreateFrame("Frame")
 Gladdy.events.registered = {}
 Gladdy.events:RegisterEvent("PLAYER_LOGIN")
+Gladdy.events:RegisterEvent("PLAYER_LOGOUT")
+Gladdy.events:RegisterEvent("CVAR_UPDATE")
+hooksecurefunc("VideoOptionsFrameOkay_OnClick", function(self, button, down, apply)
+    if (self:GetName() == "VideoOptionsFrameApply") then
+        Gladdy:PixelPerfectScale(true)
+    end
+end)
 Gladdy.events:SetScript("OnEvent", function(self, event, ...)
     if (event == "PLAYER_LOGIN") then
         Gladdy:OnInitialize()
         Gladdy:OnEnable()
+    elseif (event == "CVAR_UPDATE") then
+        if (str_lower(select(1, ...)) == "uiscale") then
+            Gladdy:PixelPerfectScale(true)
+        end
+    elseif (event == "PLAYER_LOGOUT") then
+        Gladdy:DeleteUnknownOptions(Gladdy.db, Gladdy.defaults.profile)
     else
         local func = self.registered[event]
 
@@ -131,8 +175,8 @@ function Gladdy:Call(module, func, ...)
     end
 end
 function Gladdy:SendMessage(message, ...)
-    for k, v in self:IterModules() do
-        self:Call(v, v.messages[message], ...)
+    for _, module in self:IterModules() do
+        self:Call(module, module.messages[message], ...)
     end
 end
 
@@ -147,6 +191,16 @@ function Gladdy:NewModule(name, priority, defaults)
         self.messages[message] = func or message
     end
 
+    module.UnregisterMessage = function(self, message)
+        self.messages[message] = nil
+    end
+
+    module.UnregisterAllMessages = function(self)
+        for msg,_ in pairs(self.messages) do
+            self.messages[msg] = nil
+        end
+    end
+
     module.GetOptions = function()
         return nil
     end
@@ -172,11 +226,11 @@ function Gladdy:DeleteUnknownOptions(tbl, refTbl, str)
     end
     for k,v in pairs(tbl) do
         if refTbl[k] == nil then
-            --Gladdy:Print("SavedVariable deleted:", str .. "." .. k, "not found!")
+            Gladdy:Debug("INFO", "SavedVariable deleted:", str .. "." .. k, "not found!")
             tbl[k] = nil
         else
             if type(v) ~= type(refTbl[k]) then
-                --Gladdy:Print("SavedVariable deleted:", str .. "." .. k, "type error!", "Expected", type(refTbl[k]), "but found", type(v))
+                Gladdy:Debug("INFO", "SavedVariable deleted:", str .. "." .. k, "type error!", "Expected", type(refTbl[k]), "but found", type(v))
                 tbl[k] = nil
             elseif type(v) == "table" then
                 Gladdy:DeleteUnknownOptions(v, refTbl[k], str .. "." .. k)
@@ -185,11 +239,28 @@ function Gladdy:DeleteUnknownOptions(tbl, refTbl, str)
     end
 end
 
+function Gladdy:PixelPerfectScale(update)
+    local physicalWidth, physicalHeight = GetPhysicalScreenSize()
+    local perfectUIScale = 768.0/physicalHeight--768/select(2, strsplit("x",({ GetScreenResolutions()})[GetCurrentResolution()]))
+    if self.db and self.db.pixelPerfect and self.frame then
+        self.frame:SetIgnoreParentScale(true)
+        self.frame:SetScale(perfectUIScale)
+        --local adaptiveScale = (GetCVar("useUiScale") == "1" and 1.0 + perfectUIScale - GetCVar("UIScale") or perfectUIScale)
+        --self.frame:SetScale(adaptiveScale)
+        if update then
+            self:UpdateFrame()
+        end
+    elseif self.frame then
+        self.frame:SetScale(self.db.frameScale)
+        self.frame:SetIgnoreParentScale(false)
+    end
+end
+
 function Gladdy:OnInitialize()
     self.dbi = LibStub("AceDB-3.0"):New("GladdyXZ", self.defaults)
     self.dbi.RegisterCallback(self, "OnProfileChanged", "OnProfileChanged")
     self.dbi.RegisterCallback(self, "OnProfileCopied", "OnProfileChanged")
-    self.dbi.RegisterCallback(self, "OnProfileReset", "OnProfileChanged")
+    self.dbi.RegisterCallback(self, "OnProfileReset", "OnProfileReset")
     self.db = self.dbi.profile
 
     self.LSM = LibStub("LibSharedMedia-3.0")
@@ -200,11 +271,12 @@ function Gladdy:OnInitialize()
     self.LSM:Register("border", "Gladdy Tooltip round", "Interface\\AddOns\\Gladdy\\Images\\UI-Tooltip-Border_round_selfmade")
     self.LSM:Register("border", "Gladdy Tooltip squared", "Interface\\AddOns\\Gladdy\\Images\\UI-Tooltip-Border_square_selfmade")
     self.LSM:Register("font", "DorisPP", "Interface\\AddOns\\Gladdy\\Images\\DorisPP.TTF")
+    self.LSM:Register("border", "Square Full White", "Interface\\AddOns\\Gladdy\\Images\\Square_FullWhite.tga")
 
     L = self.L
 
     self.testData = {
-        ["arena1"] = { name = "Swift", raceLoc = L["Tauren"], classLoc = L["Warrior"], class = "WARRIOR", health = 9635, healthMax = 14207, power = 76, powerMax = 100, powerType = 1, testSpec = L["Arms"], race = "Tauren" },
+        ["arena1"] = { name = "Swift", raceLoc = L["NightElf"], classLoc = L["Warrior"], class = "WARRIOR", health = 9635, healthMax = 14207, power = 76, powerMax = 100, powerType = 1, testSpec = L["Arms"], race = "NightElf" },
         ["arena2"] = { name = "Vilden", raceLoc = L["Undead"], classLoc = L["Mage"], class = "MAGE", health = 10969, healthMax = 11023, power = 7833, powerMax = 10460, powerType = 0, testSpec = L["Frost"], race = "Scourge" },
         ["arena3"] = { name = "Krymu", raceLoc = L["Human"], classLoc = L["Rogue"], class = "ROGUE", health = 1592, healthMax = 11740, power = 45, powerMax = 110, powerType = 3, testSpec = L["Subtlety"], race = "Human" },
         ["arena4"] = { name = "Talmon", raceLoc = L["Human"], classLoc = L["Warlock"], class = "WARLOCK", health = 10221, healthMax = 14960, power = 9855, powerMax = 9855, powerType = 0, testSpec = L["Demonology"], race = "Human" },
@@ -219,27 +291,44 @@ function Gladdy:OnInitialize()
     self.guids = {}
     self.curBracket = nil
     self.curUnit = 1
-    self.lastInstance = nil
 
     self:SetupOptions()
 
-    for k, v in self:IterModules() do
-        self:Call(v, "Initialize") -- B.E > A.E :D
+    for _, module in self:IterModules() do
+        self:Call(module, "Initialize") -- B.E > A.E :D
     end
-    self:DeleteUnknownOptions(self.db, self.defaults.profile)
+    if Gladdy.db.hideBlizzard == "always" then
+        Gladdy:BlizzArenaSetAlpha(0)
+    end
+    if not self.db.newLayout then
+        self:ToggleFrame(3)
+        self:HideFrame()
+    end
+end
+
+function Gladdy:OnProfileReset()
+    self.db = self.dbi.profile
+    Gladdy:Debug("INFO", "OnProfileReset")
+    self:HideFrame()
+    self:ToggleFrame(3)
+    Gladdy.options.args.lock.name = Gladdy.db.locked and L["Unlock frame"] or L["Lock frame"]
+    Gladdy.options.args.showMover.name = Gladdy.db.showMover and L["Hide Mover"] or L["Show Mover"]
+    LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
 end
 
 function Gladdy:OnProfileChanged()
     self.db = self.dbi.profile
-    self:DeleteUnknownOptions(self.db, self.defaults.profile)
-
     self:HideFrame()
     self:ToggleFrame(3)
+    Gladdy.options.args.lock.name = Gladdy.db.locked and L["Unlock frame"] or L["Lock frame"]
+    Gladdy.options.args.showMover.name = Gladdy.db.showMover and L["Hide Mover"] or L["Show Mover"]
+    LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
 end
 
 function Gladdy:OnEnable()
     self:RegisterEvent("UPDATE_BATTLEFIELD_STATUS")
     self:RegisterEvent("PLAYER_ENTERING_WORLD")
+    self:RegisterEvent("PLAYER_REGEN_ENABLED")
 
     if (IsAddOnLoaded("Clique")) then
         for i = 1, 5 do
@@ -266,6 +355,7 @@ function Gladdy:OnEnable()
 
         self:HideFrame()
         self:ToggleFrame(3)
+        self.showConfig = true
     end
 end
 
@@ -285,23 +375,25 @@ end
 ---------------------------
 
 function Gladdy:Test()
-    Gladdy.frame.testing = true
-    for i = 1, self.curBracket do
-        local unit = "arena" .. i
-        if (not self.buttons[unit]) then
-            self:CreateButton(i)
-        end
-        local button = self.buttons[unit]
+    self.frame.testing = true
+    if self.curBracket then
+        for i = 1, self.curBracket do
+            local unit = "arena" .. i
+            if (not self.buttons[unit]) then
+                self:CreateButton(i)
+            end
+            local button = self.buttons[unit]
 
-        for k, v in pairs(self.testData[unit]) do
-            button[k] = v
-        end
+            for k, v in pairs(self.testData[unit]) do
+                button[k] = v
+            end
 
-        for k, v in self:IterModules() do
-            self:Call(v, "Test", unit)
-        end
+            for _, module in self:IterModules() do
+                self:Call(module, "Test", unit)
+            end
 
-        button:SetAlpha(1)
+            button:SetAlpha(1)
+        end
     end
 end
 
@@ -312,26 +404,44 @@ end
 ---------------------------
 
 function Gladdy:PLAYER_ENTERING_WORLD()
-    local instance = select(2, IsInInstance())
-    if (instance ~= "arena" and self.frame and self.frame:IsVisible() and not self.frame.testing) then
+    if self.showConfig then
+        LibStub("AceConfigDialog-3.0"):Open("Gladdy", nil, LibStub("AceConfigDialog-3.0"):SelectGroup("Gladdy", "XiconProfiles"))
+        self.showConfig = nil
+    end
+    if (self.frame and self.frame:IsVisible()) then
         self:Reset()
         self:HideFrame()
     end
-    if (instance == "arena") then
-        self:Reset()
-        self:HideFrame()
-    end
-    self.lastInstance = instance
 end
 
 function Gladdy:UPDATE_BATTLEFIELD_STATUS(_, index)
     local status, mapName, instanceID, levelRangeMin, levelRangeMax, teamSize, isRankedArena, suspendedQueue, bool, queueType = GetBattlefieldStatus(index)
-    if (status == "active" and teamSize > 0 and IsActiveBattlefieldArena()) then
+    local instanceType = select(2, IsInInstance())
+    Gladdy:Debug("INFO", "UPDATE_BATTLEFIELD_STATUS", instanceType, status, teamSize)
+    if ((instanceType == "arena" or GetNumArenaOpponents() > 0) and status == "active" and teamSize > 0) then
         self.curBracket = teamSize
         self:JoinedArena()
     end
 end
 
+function Gladdy:PLAYER_REGEN_ENABLED()
+    if self.showFrame then
+        self:UpdateFrame()
+        if self.startTest then
+            self:Test()
+            self.startTest = nil
+        end
+        self.frame:Show()
+        self:SendMessage("JOINED_ARENA")
+        self.showFrame = nil
+    end
+    if self.hideFrame then
+        self:Reset()
+        self.frame:Hide()
+        self.hideFrame = nil
+    end
+end
+
 ---------------------------
 
 -- RESET FUNCTIONS (ARENA LEAVE)
@@ -340,7 +450,7 @@ end
 
 function Gladdy:Reset()
     if type(self.guids) == "table" then
-        for k, v in pairs(self.guids) do
+        for k,_ in pairs(self.guids) do
             self.guids[k] = nil
         end
     end
@@ -348,13 +458,16 @@ function Gladdy:Reset()
     self.curBracket = nil
     self.curUnit = 1
 
-    for k1, v1 in self:IterModules() do
-        self:Call(v1, "Reset")
+    for _, module in self:IterModules() do
+        self:Call(module, "Reset")
     end
 
     for unit in pairs(self.buttons) do
         self:ResetUnit(unit)
     end
+    if Gladdy.db.hideBlizzard == "never" or Gladdy.db.hideBlizzard == "arena" then
+        Gladdy:BlizzArenaSetAlpha(1)
+    end
 end
 
 function Gladdy:ResetUnit(unit)
@@ -366,8 +479,8 @@ function Gladdy:ResetUnit(unit)
     button:SetAlpha(0)
     self:ResetButton(unit)
 
-    for k2, v2 in self:IterModules() do
-        self:Call(v2, "ResetUnit", unit)
+    for _, module in self:IterModules() do
+        self:Call(module, "ResetUnit", unit)
     end
 end
 
@@ -381,7 +494,7 @@ function Gladdy:ResetButton(unit)
             button[k1] = nil
         elseif (type(v1) == "number") then
             button[k1] = 0
-        elseif (type(v1) == "array") then
+        elseif (type(v1) == "table") then
             button[k1] = {}
         elseif (type(v1) == "boolean") then
             button[k1] = false
@@ -406,10 +519,83 @@ function Gladdy:JoinedArena()
         end
     end
 
-    self:SendMessage("JOINED_ARENA")
-    self:UpdateFrame()
-    self.frame:Show()
+    if InCombatLockdown() then
+        Gladdy:Print("Gladdy frames show as soon as you leave combat")
+        self.showFrame = true
+    else
+        self:UpdateFrame()
+        self.frame:Show()
+        self:SendMessage("JOINED_ARENA")
+    end
     for i=1, self.curBracket do
         self.buttons["arena" .. i]:SetAlpha(1)
     end
+    if Gladdy.db.hideBlizzard == "arena" or Gladdy.db.hideBlizzard == "always" then
+        Gladdy:BlizzArenaSetAlpha(0)
+    end
+end
+
+---------------------------
+
+-- BLIZZARD FRAMES
+
+---------------------------
+
+function Gladdy:BlizzArenaSetAlpha(alpha)
+    if IsAddOnLoaded("Blizzard_ArenaUI") then
+        if (ArenaEnemyFrames) then
+            ArenaEnemyFrames:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame1 then
+            ArenaEnemyFrame1:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame1PetFrame then
+            ArenaEnemyFrame1PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame2 then
+            ArenaEnemyFrame2:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame2PetFrame then
+            ArenaEnemyFrame2PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame3 then
+            ArenaEnemyFrame3:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame3PetFrame then
+            ArenaEnemyFrame3PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame4 then
+            ArenaEnemyFrame4:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame4PetFrame then
+            ArenaEnemyFrame4PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame5 then
+            ArenaEnemyFrame5:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame5PetFrame then
+            ArenaEnemyFrame5PetFrame:SetAlpha(alpha)
+        end
+    end
+end
+
+---------------------------
+
+-- FONT/STATUSBAR/BORDER
+
+---------------------------
+
+local defaults = {["statusbar"] = "Smooth", ["border"] = "Gladdy Tooltip round", ["font"] = "DorisPP"}
+
+local lastWarning = {}
+function Gladdy:SMFetch(lsmType, key)
+    local smMediaType = self.LSM:Fetch(lsmType, Gladdy.db[key])
+    if (smMediaType == nil and Gladdy.db[key] ~= "None") then
+        if not lastWarning[key] or GetTime() - lastWarning[key] > 120 then
+            lastWarning[key] = GetTime()
+            Gladdy:Warn("Could not find", "\"" .. lsmType .. "\" \"", Gladdy.db[key], " \" for", "\"" .. key .. "\"", "- setting it to", "\"" .. defaults[lsmType] .. "\"")
+        end
+        return self.LSM:Fetch(lsmType, defaults[lsmType])
+    end
+    return smMediaType
 end

Gladdy.toc

@@ -1,7 +1,7 @@
-## Interface: 20501
+## Interface: 20503
 ## Title: Gladdy - TBC
-## Version: 1.06-Beta
-## Notes: The most powerful arena AddOn for WoW 2.5.1
+## Version: 2.00-Release
+## Notes: The most powerful arena AddOn for WoW 2.5.3
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751
 ## SavedVariables: GladdyXZ
@@ -22,6 +22,7 @@ Modules\Powerbar.lua
 Modules\Auras.lua
 Modules\Castbar.lua
 Modules\Classicon.lua
+Modules\Clicks.lua
 Modules\Diminishings.lua
 Modules\Highlight.lua
 Modules\TotemPlates.lua
@@ -34,4 +35,7 @@ Modules\VersionCheck.lua
 Modules\XiconProfiles.lua
 Modules\Pets.lua
 Modules\ExportImport.lua
+Modules\CombatIndicator.lua
+Modules\RangeCheck.lua
+Modules\ShadowsightTimer.lua
 EventListener.lua

Libs/DRData-1.0/DRData-1.0.lua

@@ -1,4 +1,4 @@
-local major = "DRData-1.0"
+local major = "DRData-1.0-BCC"
 local minor = tonumber(string.match("$Revision: 793$", "(%d+)") or 1)
 
 assert(LibStub, string.format("%s requires LibStub.", major))
@@ -6,8 +6,6 @@ assert(LibStub, string.format("%s requires LibStub.", major))
 local Data = LibStub:NewLibrary(major, minor)
 if( not Data ) then return end
 
-if( IS_WRATH_BUILD == nil ) then IS_WRATH_BUILD = (select(4, GetBuildInfo()) >= 30000) end
-
 -- How long before DR resets
 Data.RESET_TIME = 18
 
@@ -142,6 +140,9 @@ Data.spells = {
 	-- Revenge Stun
 	[12798] = "rndstun",
 
+	-- Pyroclasm
+	[18093] = "rndstun",
+	
 	--[[ CYCLONE ]]--
 	-- Blind
 	[2094] = "cyclone",
@@ -169,6 +170,15 @@ Data.spells = {
 	[9853] = "root",
 	[26989] = "root",
 
+	-- Nature's Grasp
+	[19975] = "root",
+	[19974] = "root",
+	[19973] = "root",
+	[19972] = "root",
+	[19971] = "root",
+	[19970] = "root",
+	[27010] = "root",
+
 	--[[ RANDOM ROOTS ]]--
 	-- Improved Hamstring
 	[23694] = "rndroot",
@@ -178,45 +188,45 @@ Data.spells = {
 
 	--[[ SLEEPS ]]--
 	-- Hibernate
-	[2637] = "sleep",
-	[18657] = "sleep",
-	[18658] = "sleep",
+	[2637] = "disorient",
+	[18657] = "disorient",
+	[18658] = "disorient",
 	
 	-- Wyvern Sting
-	[19386] = "sleep",
-	[24132] = "sleep",
-	[24133] = "sleep",
-	[27068] = "sleep",
+	[19386] = "disorient",
+	[24132] = "disorient",
+	[24133] = "disorient",
+	[27068] = "disorient",
 	
 	--[[ MISC ]]--
-	-- Chastise (Maybe this shares DR with Imp HS?)
-	[44041] = "root",
-	[44043] = "root",
-	[44044] = "root",
-	[44045] = "root",
-	[44046] = "root",
-	[44047] = "root",
+	-- Chastise
+	[44041] = "chastise",
+	[44043] = "chastise",
+	[44044] = "chastise",
+	[44045] = "chastise",
+	[44046] = "chastise",
+	[44047] = "chastise",
 
 	-- Dragon's Breath
-	[31661] = "dragonsbreath", -- Dragon's Breath
-	[33041] = "dragonsbreath", -- Dragon's Breath
-	[33042] = "dragonsbreath", -- Dragon's Breath
-	[33043] = "dragonsbreath", -- Dragon's Breath
+	[31661] = "scatters", -- Dragon's Breath
+	[33041] = "scatters", -- Dragon's Breath
+	[33042] = "scatters", -- Dragon's Breath
+	[33043] = "scatters", -- Dragon's Breath
 	-- Repentance
-	[20066] = "repentance",
+	[20066] = "disorient",
 
 	-- Scatter Shot
 	[19503] = "scatters",
 	
 	-- Freezing Trap
-	[3355] = "freezetrap",
-	[14308] = "freezetrap",
-	[14309] = "freezetrap",
+	[3355] = "disorient",
+	[14308] = "disorient",
+	[14309] = "disorient",
 	
 	-- Improved Conc Shot
-	[19410] = "impconc",
-	[22915] = "impconc",
-	[28445] = "impconc",
+	[19410] = "rndstun",
+	[22915] = "rndstun",
+	[28445] = "rndstun",
 	
 	-- Death Coil
 	[6789] = "dc",
@@ -232,44 +242,11 @@ Data.spells = {
 	[605] = "charm",
 	[10911] = "charm",
 	[10912] = "charm",
+
+	-- Counterattack
+	[19306] = "counterattack"
 }
 
--- Add WoTLK spells
-if( IS_WRATH_BUILD ) then
-	-- Death Coil
-	Data.spells[47859] = "dc"
-	Data.spells[47860] = "dc"
-	
-	-- Wyvern Sting
-	Data.spells[49011] = "sleep"
-	Data.spells[49012] = "sleep"
-	
-	-- Entangling Roots
-	Data.spells[53308] = "root"
-	
-	-- Frost Nova
-	Data.spells[42917] = "root"
-	
-	-- Intercept (Remove all except this one come WoTLK)
-	Data.spells[20252] = "ctrlstun"
-	
-	-- Pounce
-	Data.spells[49803] = "ctrlstun"
-	
-	-- Polymorph
-	Data.spells[61305] = "disorient"
-	Data.spells[61025] = "disorient"
-	
-	-- Sap
-	Data.spells[51724] = "disorient"
-	
-	-- Maim
-	Data.spells[49802] = "disorient"
-	
-	-- Hex (Guessing)
-	Data.spells[51514] = "disorient"
-end
-
 -- DR Category names
 Data.typeNames = {
 	["disorient"] = "Disorients",
@@ -290,6 +267,7 @@ Data.typeNames = {
 	["repentance"] = "Repentance",
 	["dragonsbreath"] = "Dragon's Breath",
 	["ua"] = "Unstable Affliction Silence",
+	["counterattack"] = "Counterattack Immobilize"
 }
 
 -- Categories that have DR in PvE as well as PvP

Libs/LibClassAuras-1.0/ClassBuffs.lua

@@ -59,41 +59,108 @@ Buff({ 33891 }, { buffType = "form"}, "DRUID") -- Tree of Life
 Buff({ 16864 }, { buffType = "magic"}, "DRUID") -- Omen of Clarity
 Buff({ 16689, 16810, 16811, 16812, 16813, 17329, 27009 }, { buffType = "magic"}, "DRUID") -- Nature's Grasp
 Buff({ 45281, 45282, 45283 }, { buffType = "magic"}, "DRUID") -- Natural Perfection
-Buff({ 16188 }, { buffType = "magic"}, "DRUID") -- Nature's Swiftness
+Buff({ 17116 }, { buffType = "magic"}, "DRUID") -- Nature's Swiftness
 Buff({ 17007 }, { buffType = "aura"}, "DRUID") -- Leader of the Pack
 
 -------------
--- WARRIOR
+-- WARRIOR -- TODO
 -------------
---Buff({ 29703 }, { buffType = "physical"}, "WARRIOR") -- Dazed
+Buff({ 29838 }, { buffType = "physical"}, "WARRIOR") -- Second Wind
+Buff({ 12292 }, { buffType = "physical"}, "WARRIOR") -- Death Wish
+Buff({ 6673 }, { buffType = "physical"}, "WARRIOR") -- Battle Shout
+Buff({ 469 }, { buffType = "physical"}, "WARRIOR") -- Commanding Shout
+Buff({ 12328 }, { buffType = "physical"}, "WARRIOR") -- Sweeping Strikes
+Buff({ 30032 }, { buffType = "physical"}, "WARRIOR") -- Rampage
+Buff({ 2687 }, { buffType = "physical"}, "WARRIOR") -- Blood Rage
+Buff({ 20230 }, { buffType = "physical"}, "WARRIOR") -- Retaliation
+Buff({ 871 }, { buffType = "physical"}, "WARRIOR") -- Shield Wall
+Buff({ 18499 }, { buffType = "physical"}, "WARRIOR") -- Berserker Rage
+Buff({ 23885 }, { buffType = "physical"}, "WARRIOR") -- Bloodthirst
+Buff({ 3411 }, { buffType = "physical"}, "WARRIOR") -- Intervene
 
 
 --------------
--- ROGUE
+-- ROGUE -- TODO
 --------------
 
 Buff({ 2983 }, { buffType = "physical" }, "ROGUE") -- Sprint
 Buff({ 5277 }, { buffType = "physical" }, "ROGUE") -- Evasion
+Buff({ 31224 }, { buffType = "physical" }, "ROGUE") -- Cloak of Shadows
+Buff({ 14278 }, { buffType = "physical" }, "ROGUE") -- Ghostly Strike
 
 
 ------------
--- WARLOCK
+-- WARLOCK --TODO
 ------------
-Buff({ 19028 }, { buffType = "immune"}, "WARLOCK") -- Soul Link
-Buff({ 23759 }, { buffType = "immune"}, "WARLOCK") -- Master Demonologist
+Buff({ 19028 }, { buffType = "aura"}, "WARLOCK") -- Soul Link
+Buff({ 696 }, { buffType = "aura"}, "WARLOCK") -- Demon Skin
+Buff({ 706 }, { buffType = "aura"}, "WARLOCK") -- Demon Armor
+Buff({ 28176 }, { buffType = "aura"}, "WARLOCK") -- Fel Armor
+Buff({ 23759 }, { buffType = "aura"}, "WARLOCK") -- Master Demonologist
+Buff({ 34936 }, { buffType = "magic"}, "WARLOCK") -- Backlash
+Buff({ 5697 }, { buffType = "magic"}, "WARLOCK") -- Unending Breath
+Buff({ 132 }, { buffType = "magic"}, "WARLOCK") -- Detect Invisibility
+Buff({ 1949 }, { buffType = "aura"}, "WARLOCK") -- Hellfire
+Buff({ 6229 }, { buffType = "magic"}, "WARLOCK") -- Shadow Ward
+Buff({ 19480 }, { buffType = "magic"}, "WARLOCK") -- Paranoia
+Buff({ 7812 }, { buffType = "magic"}, "WARLOCK") -- Sacrifice
+Buff({ 2947 }, { buffType = "magic"}, "WARLOCK") -- Fire Shield
+
 
 ---------------
 -- SHAMAN
 ---------------
 
 Buff({ 8178 } ,{ buffType = "magic" }, "SHAMAN") -- Grounding Totem Effect
-
+Buff({ 30823 } ,{ buffType = "magic" }, "SHAMAN") -- Shamanistic Rage
+Buff({ 32182 } ,{ buffType = "magic" }, "SHAMAN") -- Heroism
+Buff({ 2825 } ,{ buffType = "magic" }, "SHAMAN") -- Bloodlust
+Buff({ 974 } ,{ buffType = "magic" }, "SHAMAN") -- Earth Shield
+Buff({ 24398 } ,{ buffType = "magic" }, "SHAMAN") -- Water Shield
+Buff({ 324 } ,{ buffType = "magic" }, "SHAMAN") -- Lightning Shield
+Buff({ 16188 } ,{ buffType = "magic" }, "SHAMAN") -- Nature's Swiftness
+Buff({ 16166 } ,{ buffType = "magic" }, "SHAMAN") -- Elemental Mastery
 
 --------------
--- PALADIN
+-- PALADIN --TODO
 --------------
-
---Buff( { 25771 }, { buffType = "immune"}, "PALADIN") -- Forbearance
+--Blessings
+Buff( { 1022, 5599, 10278 }, { buffType = "magic"}, "PALADIN") -- Blessing of Protection
+Buff( { 6940 }, { buffType = "magic"}, "PALADIN") -- Blessing of Sacrifice
+Buff( { 1044 }, { buffType = "magic"}, "PALADIN") -- Blessing of Freedom
+Buff( { 19740, 19834, 19835, 19836, 19837, 19838, 25291, 27140 }, { buffType = "magic"}, "PALADIN") -- Blessing of Might
+Buff( { 19742 }, { buffType = "magic"}, "PALADIN") -- Blessing of Wisdom
+Buff( { 20217 }, { buffType = "magic"}, "PALADIN") -- Blessing of Kings
+Buff( { 19977 }, { buffType = "magic"}, "PALADIN") -- Blessing of Light
+Buff( { 1038 }, { buffType = "magic"}, "PALADIN") -- Blessing of Salvation
+Buff( { 20911 }, { buffType = "magic"}, "PALADIN") -- Blessing of Sanctuary
+Buff( { 25898 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Kings
+Buff( { 25890 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Light
+Buff( { 25782 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Might
+Buff( { 25895 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Salvation
+Buff( { 25899 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Sanctuary
+Buff( { 25894 }, { buffType = "magic"}, "PALADIN") -- Greater Blessing of Wisdom
+Buff( { 642 }, { buffType = "immune"}, "PALADIN") -- Divine Shield
+Buff( { 31884 }, { buffType = "magic"}, "PALADIN") -- Avenging Wrath
+--Auras
+Buff( { 465, 10290, 643, 10291, 1032, 10292, 10293, 27149 }, { buffType = "aura"}, "PALADIN") -- Devotion Aura
+Buff( { 7294 }, { buffType = "aura"}, "PALADIN") -- Retribution Aura
+Buff( { 19746 }, { buffType = "aura"}, "PALADIN") -- Concentration Aura
+Buff( { 19876 }, { buffType = "aura"}, "PALADIN") -- Shadow Resistance Aura
+Buff( { 20218 }, { buffType = "aura"}, "PALADIN") -- Sanctity Aura
+Buff( { 19888 }, { buffType = "aura"}, "PALADIN") -- Frost Resistance Aura
+Buff( { 19891 }, { buffType = "aura"}, "PALADIN") -- Fire Resistance Aura
+Buff( { 32223 }, { buffType = "aura"}, "PALADIN") -- Crusader Aura
+--Seals
+Buff( { 20154, 20287, 20288, 20289, 20290, 20291, 20292, 20293, 27155 }, { buffType = "magic"}, "PALADIN") -- Seal of Righteousness
+Buff( { 31892 }, { buffType = "magic"}, "PALADIN") -- Seal of Blood
+Buff( { 20375 }, { buffType = "magic"}, "PALADIN") -- Seal of Command
+Buff( { 20164 }, { buffType = "magic"}, "PALADIN") -- Seal of Justice
+Buff( { 20165 }, { buffType = "magic"}, "PALADIN") -- Seal of Light
+Buff( { 15277 }, { buffType = "magic"}, "PALADIN") -- Seal of Reckoning
+Buff( { 31801 }, { buffType = "magic"}, "PALADIN") -- Seal of Vengeance
+Buff( { 20166 }, { buffType = "magic"}, "PALADIN") -- Seal of Wisdom
+Buff( { 21082 }, { buffType = "magic"}, "PALADIN") -- Seal of the Crusade
 
 
 -------------
@@ -101,6 +168,8 @@ Buff({ 8178 } ,{ buffType = "magic" }, "SHAMAN") -- Grounding Totem Effect
 -------------
 
 Buff( { 5384 }, { buffType = "physical"}, "HUNTER") -- Feign Death
+Buff( { 19263 }, { buffType = "physical"}, "HUNTER") -- Deterrence
+Buff( { 3045 }, { buffType = "physical"}, "HUNTER") -- Rapid Fire
 --local FEIGN_DEATH = GetSpellInfo(5384) -- Localized name for Feign Death
 
 

Libs/LibClassAuras-1.0/ClassDebuffs.lua

@@ -20,7 +20,8 @@ Debuff({ 15286 } ,{ buffType = "magic" }, "PRIEST") -- Vampiric Embrace
 Debuff({ 15407, 17311, 17312, 17313, 17314, 18807, 25387 }, { buffType = "magic" }, "PRIEST") -- Mind Flay
 Debuff({ 605, 10911, 10912 }, { buffType = "magic" }, "PRIEST") -- Mind Control
 Debuff({ 8122, 8124, 10888, 10890 }, { buffType = "magic", }, "PRIEST") -- Psychic Scream
-Debuff({ 15269 }, { buffType = "magic"}, "PRIEST")
+Debuff({ 15269 }, { buffType = "magic"}, "PRIEST") -- Blackout
+Debuff({ 44041, 44043, 44044, 44045, 44046, 44047 }, { buffType = "magic"}, "PRIEST") -- Chastise
 
 ---------------
 -- DRUID
@@ -44,6 +45,8 @@ Debuff({ 1822, 1823, 1824, 9904, 27003 }, { stacking = true, buffType = "physica
 Debuff({ 1079, 9492, 9493, 9752, 9894, 9896, 27008 }, { stacking = true, buffType = "physical", preEvent = "SPELL_CAST_SUCCESS" }, "DRUID") -- Rip
 Debuff({ 5570, 24974, 24975, 24976, 24977, 27013 }, { stacking = true, buffType = "magic", preEvent = "SPELL_CAST_SUCCESS" }, "DRUID") -- Insect Swarm
 Debuff({ 33745 }, { stacking = true, buffType = "physical", preEvent = "SPELL_CAST_SUCCESS" }, "DRUID") -- Lacerate
+Debuff({ 33878, 33986, 33987 }, { buffType = "physical" }, "DRUID") -- Mangle (Bear)
+Debuff({ 33876, 33982, 33983 }, { buffType = "physical" }, "DRUID") -- Mangle (Cat)
 
 -------------
 -- WARRIOR

Libs/LibClassAuras-1.0/LibClassAuras-1.0.lua

@@ -7,6 +7,7 @@ LibClassAuras.debuffs = {}
 LibClassAuras.debuffToId = {}
 LibClassAuras.buffs = {}
 LibClassAuras.buffToId = {}
+LibClassAuras.altNames = {}
 
 local function Spell(id, opts, class, spellTable, idTable)
     if not opts or not class then
@@ -26,9 +27,20 @@ local function Spell(id, opts, class, spellTable, idTable)
         return
     end
     if opts.altName then
-        idTable[opts.altName] = {id = id , class = class}
+        for _,v in ipairs(id) do
+            LibClassAuras.altNames[v] = opts.altName
+        end
+        if idTable[opts.altName] then
+            tinsert(idTable[opts.altName], {id = id , class = class})
+        else
+            idTable[opts.altName] = {[1] = {id = id , class = class}}
+        end
     else
-        idTable[spellName] = {id = id , class = class}
+        if idTable[spellName] then
+            tinsert(idTable[spellName], {id = id , class = class})
+        else
+            idTable[spellName] = {[1] = {id = id , class = class}}
+        end
     end
 
     if type(id) == "table" then
@@ -54,9 +66,11 @@ LibClassAuras.Buff = Buff
 
 local function getClassDebuffs(class)
     local classSpells = {}
-    for k,v in pairs(LibClassAuras.debuffToId) do
-        if v.class == class then
-            tinsert(classSpells, {name = k, id = v.id})
+    for name, spells in pairs(LibClassAuras.debuffToId) do
+        for _, spellInfo in ipairs(spells) do
+            if spellInfo.class == class then
+                tinsert(classSpells, {name = name, id = spellInfo.id})
+            end
         end
     end
     return classSpells
@@ -65,9 +79,11 @@ LibClassAuras.GetClassDebuffs = getClassDebuffs
 
 local function getClassBuffs(class)
     local classSpells = {}
-    for k,v in pairs(LibClassAuras.buffToId) do
-        if v.class == class then
-            tinsert(classSpells, {name = k, id = v.id})
+    for name, spells in pairs(LibClassAuras.buffToId) do
+        for _, spellInfo in ipairs(spells) do
+            if spellInfo.class == class then
+                tinsert(classSpells, {name = name, id = spellInfo.id})
+            end
         end
     end
     return classSpells
@@ -83,3 +99,8 @@ local function getSpellNameToId(auraType)
 end
 
 LibClassAuras.GetSpellNameToId = getSpellNameToId
+
+local function getAltName(spellID)
+    return LibClassAuras.altNames[spellID]
+end
+LibClassAuras.GetAltName = getAltName

Libs/LibSpellRange-1.0/LibSpellRange-1.0.lua

@@ -0,0 +1,232 @@
+--- = Background =
+-- Blizzard's IsSpellInRange API has always been very limited - you either must have the name of the spell, or its spell book ID. Checking directly by spellID is simply not possible.
+-- Now, in Mists of Pandaria, Blizzard changed the way that many talents and specialization spells work - instead of giving you a new spell when leaned, they replace existing spells. These replacement spells do not work with Blizzard's IsSpellInRange function whatsoever; this limitation is what prompted the creation of this lib.
+-- = Usage = 
+-- **LibSpellRange-1.0** exposes an enhanced version of IsSpellInRange that:
+-- * Allows ranged checking based on both spell name and spellID.
+-- * Works correctly with replacement spells that will not work using Blizzard's IsSpellInRange method alone.
+--
+-- @class file
+-- @name LibSpellRange-1.0.lua
+
+local major = "SpellRange-1.0"
+local minor = 15
+
+assert(LibStub, format("%s requires LibStub.", major))
+
+local Lib = LibStub:NewLibrary(major, minor)
+if not Lib then return end
+
+local tonumber = _G.tonumber
+local strlower = _G.strlower
+local wipe = _G.wipe
+local type = _G.type
+
+local GetSpellTabInfo = _G.GetSpellTabInfo
+local GetNumSpellTabs = _G.GetNumSpellTabs
+local GetSpellBookItemInfo = _G.GetSpellBookItemInfo
+local GetSpellBookItemName = _G.GetSpellBookItemName
+local GetSpellLink = _G.GetSpellLink
+local GetSpellInfo = _G.GetSpellInfo
+
+local IsSpellInRange = _G.IsSpellInRange
+local SpellHasRange = _G.SpellHasRange
+
+-- isNumber is basically a tonumber cache for maximum efficiency
+Lib.isNumber = Lib.isNumber or setmetatable({}, {
+	__mode = "kv",
+	__index = function(t, i)
+		local o = tonumber(i) or false
+		t[i] = o
+		return o
+end})
+local isNumber = Lib.isNumber
+
+-- strlower cache for maximum efficiency
+Lib.strlowerCache = Lib.strlowerCache or setmetatable(
+{}, {
+	__index = function(t, i)
+		if not i then return end
+		local o
+		if type(i) == "number" then
+			o = i
+		else
+			o = strlower(i)
+		end
+		t[i] = o
+		return o
+	end,
+}) local strlowerCache = Lib.strlowerCache
+
+-- Matches lowercase player spell names to their spellBookID
+Lib.spellsByName_spell = Lib.spellsByName_spell or {}
+local spellsByName_spell = Lib.spellsByName_spell
+
+-- Matches player spellIDs to their spellBookID
+Lib.spellsByID_spell = Lib.spellsByID_spell or {}
+local spellsByID_spell = Lib.spellsByID_spell
+
+-- Matches lowercase pet spell names to their spellBookID
+Lib.spellsByName_pet = Lib.spellsByName_pet or {}
+local spellsByName_pet = Lib.spellsByName_pet
+
+-- Matches pet spellIDs to their spellBookID
+Lib.spellsByID_pet = Lib.spellsByID_pet or {}
+local spellsByID_pet = Lib.spellsByID_pet
+
+-- Updates spellsByName and spellsByID
+local function UpdateBook(bookType)
+	local max = 0
+	for i = 1, GetNumSpellTabs() do
+		local _, _, offs, numspells, _, specId = GetSpellTabInfo(i)
+		if specId == 0 then
+			max = offs + numspells
+		end
+	end
+
+	local spellsByName = Lib["spellsByName_" .. bookType]
+	local spellsByID = Lib["spellsByID_" .. bookType]
+	
+	wipe(spellsByName)
+	wipe(spellsByID)
+	
+	for spellBookID = 1, max do
+		local type, baseSpellID = GetSpellBookItemInfo(spellBookID, bookType)
+		
+		if type == "SPELL" or type == "PETACTION" then
+			local currentSpellName = GetSpellBookItemName(spellBookID, bookType)
+			local link = GetSpellLink(currentSpellName)
+			local currentSpellID = tonumber(link and link:gsub("|", "||"):match("spell:(%d+)"))
+
+			-- For each entry we add to a table,
+			-- only add it if there isn't anything there already.
+			-- This prevents weird passives from overwriting real, legit spells.
+			-- For example, in WoW 7.3.5 the ret paladin mastery 
+			-- was coming back with a base spell named "Judgement",
+			-- which was overwriting the real "Judgement".
+			-- Passives usually come last in the spellbook,
+			-- so this should work just fine as a workaround.
+			-- This issue with "Judgement" is gone in BFA because the mastery changed.
+			
+			if currentSpellName and not spellsByName[strlower(currentSpellName)] then
+				spellsByName[strlower(currentSpellName)] = spellBookID
+			end
+			if currentSpellID and not spellsByID[currentSpellID] then
+				spellsByID[currentSpellID] = spellBookID
+			end
+			
+			if type == "SPELL" then
+				-- PETACTION (pet abilities) don't return a spellID for baseSpellID,
+				-- so base spells only work for proper player spells.
+				local baseSpellName = GetSpellInfo(baseSpellID)
+				if baseSpellName and not spellsByName[strlower(baseSpellName)] then
+					spellsByName[strlower(baseSpellName)] = spellBookID
+				end
+				if baseSpellID and not spellsByID[baseSpellID] then
+					spellsByID[baseSpellID] = spellBookID
+				end
+			end
+		end
+	end
+end
+
+-- Handles updating spellsByName and spellsByID
+if not Lib.updaterFrame then
+	Lib.updaterFrame = CreateFrame("Frame")
+end
+Lib.updaterFrame:UnregisterAllEvents()
+Lib.updaterFrame:RegisterEvent("SPELLS_CHANGED")
+
+local function UpdateSpells()
+	UpdateBook("spell")
+	UpdateBook("pet")
+end
+
+Lib.updaterFrame:SetScript("OnEvent", UpdateSpells)
+UpdateSpells()
+
+--- Improved spell range checking function.
+-- @name SpellRange.IsSpellInRange
+-- @paramsig spell, unit
+-- @param spell Name or spellID of a spell that you wish to check the range of. The spell must be a spell that you have in your spellbook or your pet's spellbook.
+-- @param unit UnitID of the spell that you wish to check the range on.
+-- @return Exact same returns as http://wowprogramming.com/docs/api/IsSpellInRange
+-- @usage
+-- -- Check spell range by spell name on unit "target"
+-- local SpellRange = LibStub("SpellRange-1.0")
+-- local inRange = SpellRange.IsSpellInRange("Stormstrike", "target")
+--
+-- -- Check spell range by spellID on unit "mouseover"
+-- local SpellRange = LibStub("SpellRange-1.0")
+-- local inRange = SpellRange.IsSpellInRange(17364, "mouseover")
+function Lib.IsSpellInRange(spellInput, unit)
+	if isNumber[spellInput] then
+		local spell = spellsByID_spell[spellInput]
+		if spell then
+			return IsSpellInRange(spell, "spell", unit)
+		else
+			local spell = spellsByID_pet[spellInput]
+			if spell then
+				return IsSpellInRange(spell, "pet", unit)
+			end
+		end
+	else
+		local spellInput = strlowerCache[spellInput]
+		
+		local spell = spellsByName_spell[spellInput]
+		if spell then
+			return IsSpellInRange(spell, "spell", unit)
+		else
+			local spell = spellsByName_pet[spellInput]
+			if spell then
+				return IsSpellInRange(spell, "pet", unit)
+			end
+		end
+		
+		return IsSpellInRange(spellInput, unit)
+	end
+	
+end
+
+
+--- Improved SpellHasRange.
+-- @name SpellRange.SpellHasRange
+-- @paramsig spell
+-- @param spell Name or spellID of a spell that you wish to check for a range. The spell must be a spell that you have in your spellbook or your pet's spellbook.
+-- @return Exact same returns as http://wowprogramming.com/docs/api/SpellHasRange
+-- @usage
+-- -- Check if a spell has a range by spell name
+-- local SpellRange = LibStub("SpellRange-1.0")
+-- local hasRange = SpellRange.SpellHasRange("Stormstrike")
+--
+-- -- Check if a spell has a range by spellID
+-- local SpellRange = LibStub("SpellRange-1.0")
+-- local hasRange = SpellRange.SpellHasRange(17364)
+function Lib.SpellHasRange(spellInput)
+	if isNumber[spellInput] then
+		local spell = spellsByID_spell[spellInput]
+		if spell then
+			return SpellHasRange(spell, "spell")
+		else
+			local spell = spellsByID_pet[spellInput]
+			if spell then
+				return SpellHasRange(spell, "pet")
+			end
+		end
+	else
+		local spellInput = strlowerCache[spellInput]
+		
+		local spell = spellsByName_spell[spellInput]
+		if spell then
+			return SpellHasRange(spell, "spell")
+		else
+			local spell = spellsByName_pet[spellInput]
+			if spell then
+				return SpellHasRange(spell, "pet")
+			end
+		end
+		
+		return SpellHasRange(spellInput)
+	end
+	
+end

Libs/LibSpellRange-1.0/README.md

@@ -0,0 +1,61 @@
+# LibSpellRange-1.0
+
+## Background
+
+Blizzard's `IsSpellInRange` API has always been very limited - you either must have the name of the spell, 
+or its spell book ID. Checking directly by spellID is simply not possible. 
+Now, since Mists of Pandaria, Blizzard changed the way that many talents and specialization spells work - 
+instead of giving you a new spell when leaned, they replace existing spells. These replacement spells do 
+not work with Blizzard's IsSpellInRange function whatsoever; this limitation is what prompted the creation of this lib.
+
+## Usage
+
+**LibSpellRange-1.0** exposes an enhanced version of IsSpellInRange that:
+
+*   Allows ranged checking based on both spell name and spellID.
+*   Works correctly with replacement spells that will not work using Blizzard's IsSpellInRange method alone.
+
+### `SpellRange.IsSpellInRange(spell, unit)` - Improved `IsSpellInRange`
+
+#### Parameters
+
+- `spell` - Name or spellID of a spell that you wish to check the range of. The spell must be a spell that you have in your spellbook or your pet's spellbook.
+- `unit` - UnitID of the spell that you wish to check the range on.
+
+#### Return value
+
+Exact same returns as [the built-in `IsSpellInRange`](http://wowprogramming.com/docs/api/IsSpellInRange.html)
+
+#### Usage
+
+``` lua
+-- Check spell range by spell name on unit "target"
+local SpellRange = LibStub("SpellRange-1.0")
+local inRange = SpellRange.IsSpellInRange("Stormstrike", "target")
+
+-- Check spell range by spellID on unit "mouseover"
+local SpellRange = LibStub("SpellRange-1.0")
+local inRange = SpellRange.IsSpellInRange(17364, "mouseover")
+```
+
+### `SpellRange.SpellHasRange(spell)` - Improved `SpellHasRange`
+
+#### Parameters
+
+- `spell` - Name or spellID of a spell that you wish to check for a range. The spell must be a spell that you have in your spellbook or your pet's spellbook.
+
+#### Return value
+
+Exact same returns as [the built-in `SpellHasRange`](http://wowprogramming.com/docs/api/SpellHasRange.html)
+
+#### Usage
+
+``` lua
+-- Check if a spell has a range by spell name
+local SpellRange = LibStub("SpellRange-1.0")
+local hasRange = SpellRange.SpellHasRange("Stormstrike")
+
+-- Check if a spell has a range by spellID
+local SpellRange = LibStub("SpellRange-1.0")
+local hasRange = SpellRange.SpellHasRange(17364)
+```

Libs/LibSpellRange-1.0/lib.xml

@@ -0,0 +1,3 @@
+<Ui>
+	<Script file="LibSpellRange-1.0.lua"/>
+</Ui>

Modules/Announcements.lua

@@ -21,12 +21,13 @@ local Announcements = Gladdy:NewModule("Announcements", nil, {
         drinks = true,
         resurrections = true,
         enemy = false,
-        spec = false,
+        spec = true,
         health = false,
         healthThreshold = 20,
         trinketUsed = true,
         trinketReady = false,
-        dest = "self",
+        spellInterrupt = true,
+        dest = "party",
     },
 })
 
@@ -47,9 +48,12 @@ function Announcements:Initialize()
     self:RegisterMessage("UNIT_HEALTH")
     self:RegisterMessage("TRINKET_USED")
     self:RegisterMessage("TRINKET_READY")
+    self:RegisterMessage("SHADOWSIGHT")
+    self:RegisterMessage("SPELL_INTERRUPT")
 end
 
 function Announcements:Reset()
+    self:UnregisterAllMessages()
     self.enemy = {}
     self.throttled = {}
 end
@@ -137,6 +141,14 @@ function Announcements:TRINKET_READY(unit)
     self:Send(L["TRINKET READY: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class])
 end
 
+function Announcements:SPELL_INTERRUPT(destUnit,spellID,spellName,spellSchool,extraSpellId,extraSpellName,extraSpellSchool)
+    local button = Gladdy.buttons[destUnit]
+    if (not button or not Gladdy.db.announcements.spellInterrupt) then
+        return
+    end
+    self:Send(L["INTERRUPTED: %s (%s)"]:format(extraSpellName, button.name or ""), nil, RAID_CLASS_COLORS[button.class])
+end
+
 function Announcements:CheckDrink(unit, aura)
     local button = Gladdy.buttons[unit]
     if (not button or not Gladdy.db.announcements.drinks) then
@@ -148,13 +160,20 @@ function Announcements:CheckDrink(unit, aura)
     end
 end
 
+function Announcements:SHADOWSIGHT(msg)
+    self:Send(msg, 2)
+end
+
 function Announcements:Send(msg, throttle, color)
     if (throttle and throttle > 0) then
         if (not self.throttled[msg]) then
             self.throttled[msg] = GetTime() + throttle
+            Gladdy:Debug("INFO", msg, "- NOT THROTTLED -", self.throttled[msg])
         elseif (self.throttled[msg] < GetTime()) then
-            self.throttled[msg] = nil
+            Gladdy:Debug("INFO", msg, "- THROTTLED OVER -", self.throttled[msg])
+            self.throttled[msg] = GetTime() + throttle
         else
+            Gladdy:Debug("INFO", msg, "- THROTTLED -", self.throttled[msg])
             return
         end
     end
@@ -172,9 +191,9 @@ function Announcements:Send(msg, throttle, color)
         RaidNotice_AddMessage(RaidBossEmoteFrame, msg, color)
     elseif (dest == "fct" and IsAddOnLoaded("Blizzard_CombatText")) then
         CombatText_AddMessage(msg, nil, color.r, color.g, color.b, "crit", 1)
-    --[[elseif (dest == "msbt" and IsAddOnLoaded("MikScrollingBattleText")) then
-        MikSBT.DisplayMessage(msg, MikSBT.DISPLAYTYPE_NOTIFICATION, true, color.r * 255, color.g * 255, color.b * 255)
-    elseif (dest == "sct" and IsAddOnLoaded("sct")) then
+    elseif (dest == "msbt" and IsAddOnLoaded("MikScrollingBattleText")) then
+        MikSBT.Animations.DisplayMessage(msg, MikSBT.DISPLAYTYPE_NOTIFICATION, true, color.r * 255, color.g * 255, color.b * 255)
+    --[[elseif (dest == "sct" and IsAddOnLoaded("sct")) then
         SCT:DisplayText(msg, color, true, "event", 1)
     elseif (dest == "parrot" and IsAddOnLoaded("parrot")) then
         Parrot:ShowMessage(msg, "Notification", true, color.r, color.g, color.b)--]]
@@ -205,12 +224,15 @@ function Announcements:GetOptions()
         ["self"] = L["Self"],
         ["party"] = L["Party"],
         ["rw"] = L["Raid Warning"],
-        ["fct"] = L["Blizzard's Floating Combat Text"],
-        --["msbt"] = L["MikScrollingBattleText"],
-        --["sct"] = L["Scrolling Combat Text"],
-        --["parrot"] = L["Parrot"],
     }
 
+    if IsAddOnLoaded("Blizzard_CombatText") then
+        destValues["fct"] = L["Blizzard's Floating Combat Text"]
+    end
+    if IsAddOnLoaded("MikScrollingBattleText") then
+        destValues["msbt"] = L["MikScrollingBattleText"]
+    end
+
     return {
         headerAnnouncements = {
             type = "header",
@@ -229,41 +251,47 @@ function Announcements:GetOptions()
             desc = L["Announce when an enemy's trinket is ready again"],
             order = 4,
         }),
+        spellInterrupt = option({
+            type = "toggle",
+            name = L["Interrupts"],
+            desc = L["Announces when enemies' spells are interrupted"],
+            order = 5,
+        }),
         drinks = option({
             type = "toggle",
             name = L["Drinking"],
             desc = L["Announces when enemies sit down to drink"],
-            order = 5,
+            order = 6,
         }),
         resurrections = option({
             type = "toggle",
             name = L["Resurrection"],
             desc = L["Announces when an enemy tries to resurrect a teammate"],
-            order = 6,
+            order = 7,
         }),
         enemy = option({
             type = "toggle",
             name = L["New enemies"],
             desc = L["Announces when new enemies are discovered"],
-            order = 7,
+            order = 8,
         }),
         spec = option({
             type = "toggle",
             name = L["Spec Detection"],
             desc = L["Announces when the spec of an enemy was detected"],
-            order = 8,
+            order = 9,
         }),
         health = option({
             type = "toggle",
             name = L["Low health"],
             desc = L["Announces when an enemy drops below a certain health threshold"],
-            order = 9,
+            order = 10,
         }),
         healthThreshold = option({
             type = "range",
             name = L["Low health threshold"],
             desc = L["Choose how low an enemy must be before low health is announced"],
-            order = 10,
+            order = 11,
             min = 1,
             max = 100,
             step = 1,
@@ -275,7 +303,7 @@ function Announcements:GetOptions()
             type = "select",
             name = L["Destination"],
             desc = L["Choose how your announcements are displayed"],
-            order = 11,
+            order = 12,
             values = destValues,
         }),
     }

Modules/ArenaCountDown.lua

@@ -1,157 +1,169 @@
-local select, floor, str_len, tostring, str_sub, str_find = select, math.floor, string.len, tostring, string.sub, string.find
-local IsInInstance = IsInInstance
+local floor, str_len, tostring, str_sub, str_find, pairs = math.floor, string.len, tostring, string.sub, string.find, pairs
+local CreateFrame = CreateFrame
+local GetTime = GetTime
 
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
-local ACDFrame = Gladdy:NewModule("Countdown", nil, {
+local ACDFrame = Gladdy:NewModule("Arena Countdown", nil, {
     countdown = true,
-    arenaCountdownSize = 256
+    arenaCountdownSize = 256,
+    arenaCountdownFrameStrata = "HIGH",
+    arenaCountdownFrameLevel = 50,
 })
 
+function ACDFrame:OnEvent(event, ...)
+    self[event](self, ...)
+end
+
 function ACDFrame:Initialize()
+    self.locale = Gladdy:GetArenaTimer()
     self.hidden = false
     self.countdown = -1
     self.texturePath = "Interface\\AddOns\\Gladdy\\Images\\Countdown\\";
-    ACDFrame:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
-    ACDFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
+
+    local ACDNumFrame = CreateFrame("Frame", "ACDNumFrame", UIParent)
+    ACDNumFrame:EnableMouse(false)
+    ACDNumFrame:SetHeight(512)
+    ACDNumFrame:SetWidth(512)
+    ACDNumFrame:SetPoint("CENTER", 0, 256)
+    ACDNumFrame:Show()
+    self.ACDNumFrame = ACDNumFrame
+
+    local ACDNumTens = ACDNumFrame:CreateTexture("ACDNumTens", "HIGH")
+    ACDNumTens:SetWidth(256)
+    ACDNumTens:SetHeight(256)
+    ACDNumTens:SetPoint("CENTER", ACDNumFrame, "CENTER", -50, 0)
+    self.ACDNumTens = ACDNumTens
+
+    local ACDNumOnes = ACDNumFrame:CreateTexture("ACDNumOnes", "HIGH")
+    ACDNumOnes:SetWidth(256)
+    ACDNumOnes:SetHeight(256)
+    ACDNumOnes:SetPoint("CENTER", ACDNumFrame, "CENTER", 50, 0)
+    self.ACDNumOnes = ACDNumOnes
+
+    local ACDNumOne = ACDNumFrame:CreateTexture("ACDNumOne", "HIGH")
+    ACDNumOne:SetWidth(256)
+    ACDNumOne:SetHeight(256)
+    ACDNumOne:SetPoint("CENTER", ACDNumFrame, "CENTER", 0, 0)
+    self.ACDNumOne = ACDNumOne
+
+    self:RegisterMessage("JOINED_ARENA")
+    self:RegisterMessage("ENEMY_SPOTTED")
+    self:RegisterMessage("UNIT_SPEC")
+    self.faction = UnitFactionGroup("player")
 end
 
-function ACDFrame:OnEvent(event, ...)
-    -- functions created in "object:method"-style have an implicit first parameter of "self", which points to object
-    self[event](self, ...) -- route event parameters to LoseControl:event methods
+function ACDFrame:UpdateFrameOnce()
+    self.ACDNumFrame:SetFrameStrata(Gladdy.db.arenaCountdownFrameStrata)
+    self.ACDNumFrame:SetFrameLevel(Gladdy.db.arenaCountdownFrameLevel)
 end
-ACDFrame:SetScript("OnEvent", ACDFrame.OnEvent)
 
+function ACDFrame.OnUpdate(self, elapse)
+    if (self.countdown > 0 and Gladdy.db.countdown) then
+        self.hidden = false;
 
-local ACDNumFrame = CreateFrame("Frame", "ACDNumFrame", UIParent)
-ACDNumFrame:SetHeight(256)
-ACDNumFrame:SetWidth(256)
-ACDNumFrame:SetPoint("CENTER", 0, 128)
-ACDNumFrame:Show()
+        if ((floor(self.countdown) ~= floor(self.countdown - elapse)) and (floor(self.countdown - elapse) >= 0)) then
+            local str = tostring(floor(self.countdown - elapse));
 
-local ACDNumTens = ACDNumFrame:CreateTexture("ACDNumTens", "HIGH")
-ACDNumTens:SetWidth(256)
-ACDNumTens:SetHeight(128)
-ACDNumTens:SetPoint("CENTER", ACDNumFrame, "CENTER", -48, 0)
+            if (str_len(str) == 2) then
+                -- Display has 2 digits
+                self.ACDNumOne:Hide();
+                self.ACDNumTens:Show();
+                self.ACDNumOnes:Show();
 
-local ACDNumOnes = ACDNumFrame:CreateTexture("ACDNumOnes", "HIGH")
-ACDNumOnes:SetWidth(256)
-ACDNumOnes:SetHeight(128)
-ACDNumOnes:SetPoint("CENTER", ACDNumFrame, "CENTER", 48, 0)
-
-local ACDNumOne = ACDNumFrame:CreateTexture("ACDNumOne", "HIGH")
-ACDNumOne:SetWidth(256)
-ACDNumOne:SetHeight(128)
-ACDNumOne:SetPoint("CENTER", ACDNumFrame, "CENTER", 0, 0)
-
-function ACDFrame:PLAYER_ENTERING_WORLD()
-
-    local instanceType = select(2, IsInInstance())
-    if (( instanceType == "arena" )) then
-        ACDFrame:SetScript("OnUpdate", function(self, elapse)
-            if (self.countdown > 0 and Gladdy.db.countdown) then
-                self.hidden = false;
-
-                if ((floor(self.countdown) ~= floor(self.countdown - elapse)) and (floor(self.countdown - elapse) >= 0)) then
-                    local str = tostring(floor(self.countdown - elapse));
-
-                    if (floor(self.countdown - elapse) == 0) then
-                        ACDNumTens:Hide();
-                        ACDNumOnes:Hide();
-                        ACDNumOne:Hide();
-                    elseif (str_len(str) == 2) then
-                        -- Display has 2 digits
-                        ACDNumOne:Hide();
-                        ACDNumTens:Show();
-                        ACDNumOnes:Show();
-
-                        ACDNumTens:SetTexture(self.texturePath .. str_sub(str, 0, 1));
-                        ACDNumOnes:SetTexture(self.texturePath .. str_sub(str, 2, 2));
-                        ACDNumFrame:SetScale(0.7)
-                    elseif (str_len(str) == 1) then
-                        -- Display has 1 digit
-                        ACDNumOne:Show();
-                        ACDNumOne:SetTexture(self.texturePath .. str_sub(str, 0, 1));
-                        ACDNumOnes:Hide();
-                        ACDNumTens:Hide();
-                        ACDNumFrame:SetScale(1.0)
-                    end
-                end
-                self.countdown = self.countdown - elapse;
-            else
-                self.hidden = true;
-                ACDNumTens:Hide();
-                ACDNumOnes:Hide();
-                ACDNumOne:Hide();
+                self.ACDNumTens:SetTexture(self.texturePath .. str_sub(str, 0, 1));
+                self.ACDNumOnes:SetTexture(self.texturePath .. str_sub(str, 2, 2));
+                self.ACDNumFrame:SetScale(0.7)
+            elseif (str_len(str) == 1) then
+                -- Display has 1 digit
+                local numStr = str_sub(str, 0, 1)
+                local path = numStr == "0" and self.faction or numStr
+                self.ACDNumOne:Show();
+                self.ACDNumOne:SetTexture(self.texturePath .. path);
+                self.ACDNumOnes:Hide();
+                self.ACDNumTens:Hide();
+                self.ACDNumFrame:SetScale(1.0)
             end
+        end
+        self.countdown = self.countdown - elapse;
+    else
+        self.hidden = true;
+        self.ACDNumTens:Hide();
+        self.ACDNumOnes:Hide();
+        self.ACDNumOne:Hide();
+    end
+    if (GetTime() > self.endTime) then
+        self:SetScript("OnUpdate", nil)
+    end
+end
 
-        end)
+function ACDFrame:JOINED_ARENA()
+    if Gladdy.db.countdown then
+        self.ACDNumFrame:Show()
+        self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
+        self:SetScript("OnEvent", ACDFrame.OnEvent)
+        self.endTime = GetTime() + 70
+        self:SetScript("OnUpdate", ACDFrame.OnUpdate)
+    end
+end
+
+function ACDFrame:ENEMY_SPOTTED()
+    if not Gladdy.frame.testing then
+        ACDFrame:Reset()
+    end
+end
+
+function ACDFrame:UNIT_SPEC()
+    if not Gladdy.frame.testing then
+        ACDFrame:Reset()
     end
 end
 
 function ACDFrame:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg)
-    if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 60 secondes !")) then
-        self.countdown = 61
-        return
-    end
-    if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 30 secondes !")) then
-        self.countdown = 31
-        return
-    end
-    if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 15 secondes !")) then
-        self.countdown = 16
-        return
-    end
-    if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 10 secondes !")) then
-        self.countdown = 11
-        return
-    end
-    if (str_find(msg, "One minute until the Arena battle begins!")) then
-        self.countdown = 61
-        return
-    end
-    if (str_find(msg, "Thirty seconds until the Arena battle begins!")) then
-        self.countdown = 31
-        return
-    end
-    if (str_find(msg, "Fifteen seconds until the Arena battle begins!")) then
-        self.countdown = 16
-        return
-    end
-    if (str_find(msg, "Ten seconds until the Arena battle begins!")) then
-        self.countdown = 10
-        return
-    end
-    if (str_find(msg, "The Arena battle has begun!")) then
-        ACDFrame:SetScript("OnUpdate", nil)
-        return
+    for k,v in pairs(self.locale) do
+        if str_find(msg, v) then
+            if k == 0 then
+                ACDFrame:Reset()
+            else
+                self.countdown = k
+            end
+        end
     end
 end
 
 function ACDFrame:UpdateFrame()
-    ACDNumFrame:SetHeight(Gladdy.db.arenaCountdownSize)
-    ACDNumFrame:SetWidth(Gladdy.db.arenaCountdownSize)
-    ACDNumFrame:SetPoint("CENTER", 0, 128)
+    self.ACDNumFrame:SetHeight(Gladdy.db.arenaCountdownSize)
+    self.ACDNumFrame:SetWidth(Gladdy.db.arenaCountdownSize)
+    self.ACDNumFrame:SetPoint("CENTER", 0, 128)
 
-    ACDNumTens:SetWidth(Gladdy.db.arenaCountdownSize)
-    ACDNumTens:SetHeight(Gladdy.db.arenaCountdownSize/2)
-    ACDNumTens:SetPoint("CENTER", ACDNumFrame, "CENTER", -(Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
+    self.ACDNumTens:SetWidth(Gladdy.db.arenaCountdownSize)
+    self.ACDNumTens:SetHeight(Gladdy.db.arenaCountdownSize)
+    self.ACDNumTens:SetPoint("CENTER", self.ACDNumFrame, "CENTER", -(Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
 
-    ACDNumOnes:SetWidth(Gladdy.db.arenaCountdownSize)
-    ACDNumOnes:SetHeight(Gladdy.db.arenaCountdownSize/2)
-    ACDNumOnes:SetPoint("CENTER", ACDNumFrame, "CENTER", (Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
+    self.ACDNumOnes:SetWidth(Gladdy.db.arenaCountdownSize)
+    self.ACDNumOnes:SetHeight(Gladdy.db.arenaCountdownSize)
+    self.ACDNumOnes:SetPoint("CENTER", self.ACDNumFrame, "CENTER", (Gladdy.db.arenaCountdownSize/8 + Gladdy.db.arenaCountdownSize/8/2), 0)
 
-    ACDNumOne:SetWidth(Gladdy.db.arenaCountdownSize)
-    ACDNumOne:SetHeight(Gladdy.db.arenaCountdownSize/2)
-    ACDNumOne:SetPoint("CENTER", ACDNumFrame, "CENTER", 0, 0)
+    self.ACDNumOne:SetWidth(Gladdy.db.arenaCountdownSize)
+    self.ACDNumOne:SetHeight(Gladdy.db.arenaCountdownSize)
+    self.ACDNumOne:SetPoint("CENTER", self.ACDNumFrame, "CENTER", 0, 0)
 end
 
 function ACDFrame:Test()
     self.countdown = 30
+    self:JOINED_ARENA()
 end
 
 function ACDFrame:Reset()
+    self.endTime = 0
     self.countdown = 0
+    self:UnregisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
+    self:SetScript("OnUpdate", nil)
+    self.hidden = true;
+    self.ACDNumFrame:Hide()
+    self.ACDNumTens:Hide();
+    self.ACDNumOnes:Hide();
+    self.ACDNumOne:Hide();
 end
 
 function ACDFrame:GetOptions()
@@ -163,7 +175,7 @@ function ACDFrame:GetOptions()
         },
         countdown = Gladdy:option({
             type = "toggle",
-            name = L["Turn on/off"],
+            name = L["Enabled"],
             desc = L["Turns countdown before the start of an arena match on/off."],
             order = 3,
             width = "full",
@@ -175,6 +187,28 @@ function ACDFrame:GetOptions()
             min = 64,
             max = 512,
             step = 16,
+            width = "full",
+        }),
+        headerAuraLevel = {
+            type = "header",
+            name = L["Frame Strata and Level"],
+            order = 5,
+        },
+        arenaCountdownFrameStrata = Gladdy:option({
+            type = "select",
+            name = L["Frame Strata"],
+            order = 6,
+            values = Gladdy.frameStrata,
+            sorting = Gladdy.frameStrataSorting,
+        }),
+        arenaCountdownFrameLevel = Gladdy:option({
+            type = "range",
+            name = L["Frame Level"],
+            min = 0,
+            max = 500,
+            step = 1,
+            order = 7,
+            width = "full",
         }),
     }
 end

Modules/BuffsDebuffs.lua

@@ -1,21 +1,10 @@
 local GetSpellInfo = GetSpellInfo
 local CreateFrame = CreateFrame
 local GetTime = GetTime
-local select, lower, ceil, tremove, tinsert, pairs, ipairs, tostring = select, string.lower, ceil, tremove, tinsert, pairs, ipairs, tostring
-local auraTypeColor = { }
+local select, lower, ceil, tremove, tinsert, pairs, ipairs, tostring, random = select, string.lower, ceil, tremove, tinsert, pairs, ipairs, tostring, math.random
 local AURA_TYPE_DEBUFF, AURA_TYPE_BUFF = AURA_TYPE_DEBUFF, AURA_TYPE_BUFF
 local auraTypes = {AURA_TYPE_BUFF, AURA_TYPE_DEBUFF}
 
-auraTypeColor["none"]     = { r = 0.80, g = 0, b = 0 , a = 1}
-auraTypeColor["magic"]    = { r = 0.20, g = 0.60, b = 1.00, a = 1}
-auraTypeColor["curse"]    = { r = 0.60, g = 0.00, b = 1.00, a = 1 }
-auraTypeColor["disease"]  = { r = 0.60, g = 0.40, b = 0, a = 1 }
-auraTypeColor["poison"]   = { r = 0.00, g = 0.60, b = 0, a = 1 }
-auraTypeColor["immune"]   = { r = 1.00, g = 0.02, b = 0.99, a = 1 }
-auraTypeColor["form"]     = auraTypeColor["none"]
-auraTypeColor["aura"]     = auraTypeColor["none"]
-auraTypeColor[""]         = auraTypeColor["none"]
-
 ---------------------------
 -- Module init
 ---------------------------
@@ -25,7 +14,7 @@ local LibClassAuras = LibStub("LibClassAuras-1.0")
 local L = Gladdy.L
 local defaultTrackedDebuffs = select(2, Gladdy:GetAuras(AURA_TYPE_DEBUFF))
 local defaultTrackedBuffs = select(2, Gladdy:GetAuras(AURA_TYPE_BUFF))
-local BuffsDebuffs = Gladdy:NewModule("BuffsDebuffs", nil, {
+local BuffsDebuffs = Gladdy:NewModule("Buffs and Debuffs", nil, {
     buffsEnabled = true,
     buffsShowAuraDebuffs = false,
     buffsAlpha = 1,
@@ -42,11 +31,9 @@ local BuffsDebuffs = Gladdy:NewModule("BuffsDebuffs", nil, {
     buffsFontScale = 1,
     buffsFontColor = {r = 1, g = 1, b = 0, a = 1},
     buffsDynamicColor = true,
-    buffsCooldownPos = "TOP",
     buffsCooldownGrowDirection = "RIGHT",
     buffsXOffset = 0,
     buffsYOffset = 0,
-    buffsBuffsCooldownPos = "BOTTOM",
     buffsBuffsCooldownGrowDirection = "RIGHT",
     buffsBuffsXOffset = 0,
     buffsBuffsYOffset = 0,
@@ -55,14 +42,16 @@ local BuffsDebuffs = Gladdy:NewModule("BuffsDebuffs", nil, {
     buffsBorderColorsEnabled = true,
     trackedDebuffs = defaultTrackedDebuffs,
     trackedBuffs = defaultTrackedBuffs,
-    buffsBorderColorCurse = auraTypeColor["curse"],
-    buffsBorderColorMagic = auraTypeColor["magic"],
-    buffsBorderColorPoison = auraTypeColor["poison"],
-    buffsBorderColorPhysical = auraTypeColor["none"],
-    buffsBorderColorImmune = auraTypeColor["immune"],
-    buffsBorderColorDisease = auraTypeColor["disease"],
-    buffsBorderColorForm = auraTypeColor["form"],
-    buffsBorderColorAura = auraTypeColor["aura"]
+    buffsBorderColorCurse = Gladdy:GetAuraTypeColor()["curse"],
+    buffsBorderColorMagic = Gladdy:GetAuraTypeColor()["magic"],
+    buffsBorderColorPoison = Gladdy:GetAuraTypeColor()["poison"],
+    buffsBorderColorPhysical = Gladdy:GetAuraTypeColor()["none"],
+    buffsBorderColorImmune = Gladdy:GetAuraTypeColor()["immune"],
+    buffsBorderColorDisease = Gladdy:GetAuraTypeColor()["disease"],
+    buffsBorderColorForm = Gladdy:GetAuraTypeColor()["form"],
+    buffsBorderColorAura = Gladdy:GetAuraTypeColor()["aura"],
+    buffFrameStrata = "MEDIUM",
+    buffsFrameLevel = 9,
 })
 
 local spellSchoolToOptionValueTable
@@ -73,7 +62,7 @@ local function spellSchoolToOptionValue(spellSchool)
         spellSchoolToOptionValueTable[spellSchool].b,
         spellSchoolToOptionValueTable[spellSchool].a
     else
-        return Gladdy.db.buffsBorderColor.r,Gladdy.db.buffsBorderColor.g,Gladdy.db.buffsBorderColor.b,Gladdy.db.buffsBorderColor.a
+        return Gladdy:SetColor(Gladdy.db.buffsBorderColor)
     end
 end
 
@@ -145,24 +134,31 @@ end
 
 function BuffsDebuffs:Test(unit)
     if Gladdy.db.buffsEnabled then
-        if unit == "arena1" or unit == "arena3" then
-            BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_DEBUFF)
-            BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_BUFF)
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 1943, select(1, GetSpellInfo(1943)), select(3, GetSpellInfo(1943)), 10, GetTime() + 10, 1, "physical")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 18647, select(1, GetSpellInfo(18647)), select(3, GetSpellInfo(18647)), 10, GetTime() + 10, 1, "immune")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 27218, select(1, GetSpellInfo(27218)), select(3, GetSpellInfo(27218)), 24, GetTime() + 20, 1, "curse")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 27216, select(1, GetSpellInfo(27216)), select(3, GetSpellInfo(27216)), 18, GetTime() + 18, 1, "magic")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 27189, select(1, GetSpellInfo(27189)), select(3, GetSpellInfo(27189)), 12, GetTime() + 12, 5, "poison")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_BUFF, 33076, select(1, GetSpellInfo(33076)), select(3, GetSpellInfo(33076)), 20, GetTime() + 20, 1, "magic")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_BUFF, 26980, select(1, GetSpellInfo(26980)), select(3, GetSpellInfo(26980)), 20, GetTime() + 20, 5, "magic")
-        elseif unit == "arena2" then
-            BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_DEBUFF)
-            BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_BUFF)
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 1943, select(1, GetSpellInfo(1943)), select(3, GetSpellInfo(1943)), 10, GetTime() + 10, 1, "physical")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 1, select(1, GetSpellInfo(1)), select(3, GetSpellInfo(1)), 20, GetTime() + 20, 5, "poison")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_BUFF, 27009, select(1, GetSpellInfo(27009)), select(3, GetSpellInfo(27009)), 20, GetTime() + 15, 1, "magic")
-            BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_BUFF, 11426, select(1, GetSpellInfo(11426)), select(3, GetSpellInfo(11426)), 10, GetTime() + 10, 1, "magic")
+        local spellSchools = { "physical", "magic", "curse", "poison", "disease", "immune" }
 
+        BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_DEBUFF)
+        BuffsDebuffs:AURA_FADE(unit, AURA_TYPE_BUFF)
+        --BuffsDebuffs:AURA_GAIN(unit, AURA_TYPE_BUFF, 1243, select(1, GetSpellInfo(1243)), select(3, GetSpellInfo(1243)), 10, GetTime() + 10, 1, "physical")
+        --self:AURA_GAIN(unit, AURA_TYPE_DEBUFF, 31117, select(1, GetSpellInfo(31117)), select(3, GetSpellInfo(31117)), 10, GetTime() + 10, 1, "physical")
+        local i = 1
+        for spellID, enabled in pairs(Gladdy.db.trackedDebuffs) do
+            if i > 4 then
+                break
+            end
+            if enabled then
+                BuffsDebuffs:AddOrRefreshAura(unit, spellID, AURA_TYPE_DEBUFF, 15, 15, random(1,5), spellSchools[random(1,6)], select(3, GetSpellInfo(spellID)), i)
+                i = i + 1
+            end
+        end
+        i = 1
+        for spellID, enabled in pairs(Gladdy.db.trackedBuffs) do
+            if i > 4 then
+                break
+            end
+            if enabled then
+                BuffsDebuffs:AddOrRefreshAura(unit, spellID, AURA_TYPE_BUFF, 15, 15, random(1,5), spellSchools[random(1,6)], select(3, GetSpellInfo(spellID)), i)
+                i = i + 1
+            end
         end
     end
 end
@@ -202,13 +198,24 @@ function BuffsDebuffs:AURA_GAIN(unit, auraType, spellID, spellName, texture, dur
         return
     end
     local auraFrame = self.frames[unit]
+    spellName = LibClassAuras.GetAltName(spellID) or spellName
     local aura = Gladdy:GetImportantAuras()[spellName] and Gladdy.db.auraListDefault[tostring(Gladdy:GetImportantAuras()[spellName].spellID)].enabled
     if aura and Gladdy.db.buffsShowAuraDebuffs then
         aura = false
     end
     local auraNames = LibClassAuras.GetSpellNameToId(auraType)
-    local spellId = auraNames[spellName] and auraNames[spellName].id[1]
-    if not aura and spellID and spellId and expirationTime and (Gladdy.db.trackedBuffs[tostring(spellId)] or Gladdy.db.trackedDebuffs[tostring(spellId)]) then
+    local spellId
+    local isTracked = false
+    if auraNames[spellName] then
+        for _, spellInfo in ipairs(auraNames[spellName]) do
+            spellId = spellInfo.id[1]
+            if (Gladdy.db.trackedBuffs[tostring(spellId)] or Gladdy.db.trackedDebuffs[tostring(spellId)]) then
+                isTracked = true
+                break
+            end
+        end
+    end
+    if not aura and spellID and expirationTime and isTracked then
         local index
         if auraType == AURA_TYPE_DEBUFF then
             auraFrame.numDebuffs = auraFrame.numDebuffs + 1
@@ -227,14 +234,18 @@ end
 
 function BuffsDebuffs:CreateFrame(unit)
     local debuffFrame = CreateFrame("Frame", "GladdyDebuffs" .. unit, Gladdy.buttons[unit])
+    debuffFrame:SetFrameStrata(Gladdy.db.buffFrameStrata)
+    debuffFrame:SetFrameLevel(Gladdy.db.buffsFrameLevel)
+    debuffFrame:SetMovable(true)
     debuffFrame:SetHeight(Gladdy.db.buffsIconSize)
     debuffFrame:SetWidth(1)
-    debuffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPLEFT", 0, Gladdy.db.highlightBorderSize + Gladdy.db.padding)
     debuffFrame.unit = unit
     local buffFrame = CreateFrame("Frame", "GladdyBuffs" .. unit, Gladdy.buttons[unit])
+    buffFrame:SetFrameStrata(Gladdy.db.buffFrameStrata)
+    buffFrame:SetFrameLevel(Gladdy.db.buffsFrameLevel)
+    buffFrame:SetMovable(true)
     buffFrame:SetHeight(Gladdy.db.buffsIconSize)
     buffFrame:SetWidth(1)
-    buffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPLEFT", 0, Gladdy.db.highlightBorderSize + Gladdy.db.padding)
     buffFrame.unit = unit
     self.frames[unit] = {}
     self.frames[unit].buffFrame = buffFrame
@@ -266,150 +277,40 @@ local function styleIcon(aura, auraType)
         aura.cooldowncircle:SetAlpha(Gladdy.db.buffsCooldownAlpha)
     end
 
+    aura:SetFrameStrata(Gladdy.db.buffFrameStrata)
+    aura:SetFrameLevel(Gladdy.db.buffsFrameLevel)
+    aura.cooldowncircle:SetFrameLevel(Gladdy.db.buffsFrameLevel + 1)
+    aura.overlay:SetFrameLevel(Gladdy.db.buffsFrameLevel + 2)
+
     aura.border:SetTexture(Gladdy.db.buffsBorderStyle)
     aura.border:SetVertexColor(spellSchoolToOptionValue(aura.spellSchool))
-    aura.cooldown:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.buffsFont), (Gladdy.db.buffsIconSize/2 - 1) * Gladdy.db.buffsFontScale, "OUTLINE")
+    aura.cooldown:SetFont(Gladdy:SMFetch("font", "buffsFont"), (Gladdy.db.buffsIconSize/2 - 1) * Gladdy.db.buffsFontScale, "OUTLINE")
     aura.cooldown:SetTextColor(Gladdy.db.buffsFontColor.r, Gladdy.db.buffsFontColor.g, Gladdy.db.buffsFontColor.b, Gladdy.db.buffsFontColor.a)
-    aura.stacks:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.buffsFont), (Gladdy.db.buffsIconSize/3 - 1) * Gladdy.db.buffsFontScale, "OUTLINE")
-    aura.stacks:SetTextColor(Gladdy.db.buffsFontColor.r, Gladdy.db.buffsFontColor.g, Gladdy.db.buffsFontColor.b, Gladdy.db.buffsFontColor.a)
+    aura.stacks:SetFont(Gladdy:SMFetch("font", "buffsFont"), (Gladdy.db.buffsIconSize/3 - 1) * Gladdy.db.buffsFontScale, "OUTLINE")
+    aura.stacks:SetTextColor(Gladdy.db.buffsFontColor.r, Gladdy.db.buffsFontColor.g, Gladdy.db.buffsFontColor.b, 1)
 end
 
 function BuffsDebuffs:UpdateFrame(unit)
+    --DEBUFFS
     self.frames[unit].debuffFrame:SetHeight(Gladdy.db.buffsIconSize)
-    self.frames[unit].debuffFrame:ClearAllPoints()
-    local horizontalMargin = Gladdy.db.highlightBorderSize
-    local verticalMargin = -(Gladdy.db.powerBarHeight)/2
-    if Gladdy.db.buffsCooldownPos == "TOP" then
-        verticalMargin = horizontalMargin + 1
-        if Gladdy.db.cooldownYPos == "TOP" and Gladdy.db.cooldown then
-            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
-        end
-        if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
-            self.frames[unit].debuffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset + verticalMargin)
-        else
-            self.frames[unit].debuffFrame:SetPoint("BOTTOMRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset + verticalMargin)
-        end
-    elseif Gladdy.db.buffsCooldownPos == "BOTTOM" then
-        verticalMargin = horizontalMargin + 1
-        if Gladdy.db.cooldownYPos == "BOTTOM" and Gladdy.db.cooldown then
-            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
-        end
-        if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
-            self.frames[unit].debuffFrame:SetPoint("TOPLEFT", Gladdy.buttons[unit].powerBar, "BOTTOMRIGHT", Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset -verticalMargin)
-        else
-            self.frames[unit].debuffFrame:SetPoint("TOPRIGHT", Gladdy.buttons[unit].powerBar, "BOTTOMLEFT", Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset -verticalMargin)
-        end
-    elseif Gladdy.db.buffsCooldownPos == "LEFT" then
-        horizontalMargin = Gladdy.db.highlightBorderSize - 1 + Gladdy.db.padding
-        local anchor = Gladdy:GetAnchor(unit, "LEFT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            self.frames[unit].debuffFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset)
-        else
-            self.frames[unit].debuffFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset)
-        end
-
-    elseif Gladdy.db.buffsCooldownPos == "RIGHT" then
-        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
-        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            self.frames[unit].debuffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset)
-        else
-            self.frames[unit].debuffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsXOffset, Gladdy.db.buffsYOffset)
-        end
+    Gladdy:SetPosition(self.frames[unit].debuffFrame, unit, "buffsXOffset", "buffsYOffset", BuffsDebuffs:LegacySetPositionDebuffs(unit), BuffsDebuffs)
+    if (unit == "arena1") then
+        Gladdy:CreateMover(self.frames[unit].debuffFrame, "buffsXOffset", "buffsYOffset", L["Debuffs"],
+                {"TOPRIGHT", "TOPRIGHT"},
+                Gladdy.db.buffsIconSize * Gladdy.db.buffsWidthFactor, Gladdy.db.buffsIconSize,
+                0, 0, "buffsEnabled")
     end
 
+    --BUFFS
     self.frames[unit].buffFrame:SetHeight(Gladdy.db.buffsBuffsIconSize)
-    self.frames[unit].buffFrame:ClearAllPoints()
-    horizontalMargin = Gladdy.db.highlightBorderSize
-    verticalMargin = -(Gladdy.db.powerBarHeight)/2
-    if Gladdy.db.buffsBuffsCooldownPos == "TOP" then
-        verticalMargin = horizontalMargin + 1
-        if Gladdy.db.cooldownYPos == "TOP" and Gladdy.db.cooldown then
-            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
-        end
-        if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
-            self.frames[unit].buffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", Gladdy.db.buffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
-        else
-            self.frames[unit].buffFrame:SetPoint("BOTTOMRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", Gladdy.db.buffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
-        end
-    elseif Gladdy.db.buffsBuffsCooldownPos == "BOTTOM" then
-        verticalMargin = horizontalMargin + 1
-        if Gladdy.db.cooldownYPos == "BOTTOM" and Gladdy.db.cooldown then
-            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
-        end
-        if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
-            self.frames[unit].buffFrame:SetPoint("TOPLEFT", Gladdy.buttons[unit].powerBar, "BOTTOMRIGHT", Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset -verticalMargin)
-        else
-            self.frames[unit].buffFrame:SetPoint("TOPRIGHT", Gladdy.buttons[unit].powerBar, "BOTTOMLEFT", Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset -verticalMargin)
-        end
-    elseif Gladdy.db.buffsBuffsCooldownPos == "LEFT" then
-        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
-        if (Gladdy.db.trinketPos == "LEFT" and Gladdy.db.trinketEnabled) then
-            horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
-            if (Gladdy.db.classIconPos == "LEFT") then
-                horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
-            end
-        elseif (Gladdy.db.classIconPos == "LEFT") then
-            horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
-            if (Gladdy.db.trinketPos == "LEFT" and Gladdy.db.trinketEnabled) then
-                horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
-            end
-        end
-        if (Gladdy.db.drCooldownPos == "LEFT" and Gladdy.db.drEnabled) then
-            verticalMargin = verticalMargin + Gladdy.db.drIconSize/2 + Gladdy.db.padding/2
-        end
-        if (Gladdy.db.castBarPos == "LEFT") then
-            verticalMargin = verticalMargin -
-                    (((Gladdy.db.castBarHeight < Gladdy.db.castBarIconSize) and Gladdy.db.castBarIconSize
-                            or Gladdy.db.castBarHeight)/2 + Gladdy.db.padding/2)
-        end
-        if (Gladdy.db.cooldownYPos == "LEFT" and Gladdy.db.cooldown) then
-            verticalMargin = verticalMargin + (Gladdy.db.buffsBuffsIconSize/2 + Gladdy.db.padding/2)
-        end
-        --self.frames[unit].buffFrame:SetPoint("RIGHT", Gladdy.buttons[unit].healthBar, "LEFT", -horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
-
-        local anchor = Gladdy:GetAnchor(unit, "LEFT")
-        horizontalMargin = Gladdy.db.highlightBorderSize - 1 + Gladdy.db.padding
-        if anchor == Gladdy.buttons[unit].healthBar then
-            self.frames[unit].buffFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset)
-        else
-            self.frames[unit].buffFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset)
-        end
-
-    elseif Gladdy.db.buffsBuffsCooldownPos == "RIGHT" then
-        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
-        if (Gladdy.db.trinketPos == "RIGHT" and Gladdy.db.trinketEnabled) then
-            horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
-            if (Gladdy.db.classIconPos == "RIGHT") then
-                horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
-            end
-        elseif (Gladdy.db.classIconPos == "RIGHT") then
-            horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
-            if (Gladdy.db.trinketPos == "RIGHT" and Gladdy.db.trinketEnabled) then
-                horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
-            end
-        end
-        if (Gladdy.db.drCooldownPos == "RIGHT" and Gladdy.db.drEnabled) then
-            verticalMargin = verticalMargin + Gladdy.db.drIconSize/2 + Gladdy.db.padding/2
-        end
-        if (Gladdy.db.castBarPos == "RIGHT") then
-            verticalMargin = verticalMargin -
-                    (((Gladdy.db.castBarHeight < Gladdy.db.castBarIconSize) and Gladdy.db.castBarIconSize
-                            or Gladdy.db.castBarHeight)/2 + Gladdy.db.padding/2)
-        end
-        if (Gladdy.db.cooldownYPos == "RIGHT" and Gladdy.db.cooldown) then
-            verticalMargin = verticalMargin + (Gladdy.db.buffsBuffsIconSize/2 + Gladdy.db.padding/2)
-        end
-        --self.frames[unit].buffFrame:SetPoint("LEFT", Gladdy.buttons[unit].healthBar, "RIGHT", horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
-
-        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
-        horizontalMargin = Gladdy.db.highlightBorderSize - 1 + Gladdy.db.padding
-        if anchor == Gladdy.buttons[unit].healthBar then
-            self.frames[unit].buffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset)
-        else
-            self.frames[unit].buffFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset)
-        end
+    Gladdy:SetPosition(self.frames[unit].buffFrame, unit, "buffsBuffsXOffset", "buffsBuffsYOffset", BuffsDebuffs:LegacySetPositionBuffs(unit), BuffsDebuffs)
+    if (unit == "arena1") then
+        Gladdy:CreateMover(self.frames[unit].buffFrame, "buffsBuffsXOffset", "buffsBuffsYOffset", L["Buffs"],
+                {"TOPRIGHT", "TOPRIGHT"},
+                Gladdy.db.buffsBuffsIconSize * Gladdy.db.buffsBuffsWidthFactor, Gladdy.db.buffsBuffsIconSize,
+                0, 0, "buffsEnabled")
     end
+
     for i=1, #self.frames[unit].auras[AURA_TYPE_BUFF] do
         styleIcon(self.frames[unit].auras[AURA_TYPE_BUFF][i], AURA_TYPE_BUFF)
     end
@@ -429,13 +330,8 @@ end
 function BuffsDebuffs:UpdateAurasOnUnit(unit)
     for i=1, #self.frames[unit].auras[AURA_TYPE_BUFF] do
         if i == 1 then
-            if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
-                self.frames[unit].auras[AURA_TYPE_BUFF][i]:ClearAllPoints()
-                self.frames[unit].auras[AURA_TYPE_BUFF][i]:SetPoint("RIGHT", self.frames[unit].buffFrame, "LEFT")
-            else
-                self.frames[unit].auras[AURA_TYPE_BUFF][i]:ClearAllPoints()
-                self.frames[unit].auras[AURA_TYPE_BUFF][i]:SetPoint("LEFT", self.frames[unit].buffFrame, "RIGHT")
-            end
+            self.frames[unit].auras[AURA_TYPE_BUFF][i]:ClearAllPoints()
+            self.frames[unit].auras[AURA_TYPE_BUFF][i]:SetPoint("RIGHT", self.frames[unit].buffFrame, "LEFT")
         else
             if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
                 self.frames[unit].auras[AURA_TYPE_BUFF][i]:ClearAllPoints()
@@ -448,13 +344,8 @@ function BuffsDebuffs:UpdateAurasOnUnit(unit)
     end
     for i=1, #self.frames[unit].auras[AURA_TYPE_DEBUFF] do
         if i == 1 then
-            if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
-                self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:ClearAllPoints()
-                self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:SetPoint("RIGHT", self.frames[unit].debuffFrame, "LEFT")
-            else
-                self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:ClearAllPoints()
-                self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:SetPoint("LEFT", self.frames[unit].debuffFrame, "RIGHT")
-            end
+            self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:ClearAllPoints()
+            self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:SetPoint("RIGHT", self.frames[unit].debuffFrame, "LEFT")
         else
             if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
                 self.frames[unit].auras[AURA_TYPE_DEBUFF][i]:ClearAllPoints()
@@ -472,28 +363,23 @@ local function iconTimer(auraFrame, elapsed)
         local timeLeftMilliSec = auraFrame.endtime - GetTime()
         local timeLeftSec = ceil(timeLeftMilliSec)
         auraFrame.timeLeft = timeLeftMilliSec
-        --auraFrame.cooldowncircle:SetCooldown(auraFrame.startTime, auraFrame.endtime)
-        if timeLeftSec >= 60 then
-            if Gladdy.db.buffsDynamicColor then auraFrame.cooldown:SetTextColor(0.7, 1, 0) end
-            auraFrame.cooldown:SetFormattedText("%dm", ceil(timeLeftSec / 60))
-        elseif timeLeftSec < 60 and timeLeftSec >= 11 then
-            --if it's less than 60s
-            if Gladdy.db.buffsDynamicColor then auraFrame.cooldown:SetTextColor(0.7, 1, 0) end
-            auraFrame.cooldown:SetFormattedText("%d", timeLeftSec)
-        elseif timeLeftSec <= 10 and timeLeftSec >= 5 then
-            if Gladdy.db.buffsDynamicColor then auraFrame.cooldown:SetTextColor(1, 0.7, 0) end
-            auraFrame.cooldown:SetFormattedText("%d", timeLeftSec)
-        elseif timeLeftSec <= 4 and timeLeftSec >= 3 then
-            if Gladdy.db.buffsDynamicColor then auraFrame.cooldown:SetTextColor(1, 0, 0) end
-            auraFrame.cooldown:SetFormattedText("%d", timeLeftSec)
-        elseif timeLeftMilliSec <= 3 and timeLeftMilliSec > 0 then
-            if Gladdy.db.buffsDynamicColor then auraFrame.cooldown:SetTextColor(1, 0, 0) end
-            auraFrame.cooldown:SetFormattedText("%.1f", timeLeftMilliSec >= 0.0 and timeLeftMilliSec or 0.0)
-        elseif timeLeftMilliSec <= 0 and timeLeftMilliSec > -0.05 then -- 50ms ping max wait for SPELL_AURA_REMOVED event
-            auraFrame.cooldown:SetText("")
-        else -- fallback in case SPELL_AURA_REMOVED is not fired
+        if Gladdy.db.buffsDynamicColor then
+            if timeLeftSec >= 60 then
+                auraFrame.cooldown:SetTextColor(0.7, 1, 0, Gladdy.db.buffsFontColor.a)
+            elseif timeLeftSec < 60 and timeLeftSec >= 11 then
+                auraFrame.cooldown:SetTextColor(0.7, 1, 0, Gladdy.db.buffsFontColor.a)
+            elseif timeLeftSec <= 10 and timeLeftSec >= 5 then
+                auraFrame.cooldown:SetTextColor(1, 0.7, 0, Gladdy.db.buffsFontColor.a)
+            elseif timeLeftSec <= 4 and timeLeftSec >= 3 then
+                auraFrame.cooldown:SetTextColor(1, 0, 0, Gladdy.db.buffsFontColor.a)
+            elseif timeLeftMilliSec <= 3 and timeLeftMilliSec > 0 then
+                auraFrame.cooldown:SetTextColor(1, 0, 0, Gladdy.db.buffsFontColor.a)
+            end
+        end
+        if timeLeftMilliSec < 0 then
             auraFrame:Hide()
         end
+        Gladdy:FormatTimer(auraFrame.cooldown, timeLeftMilliSec, timeLeftMilliSec <= 3)
     else
         auraFrame.cooldown:SetText("")
     end
@@ -506,17 +392,20 @@ function BuffsDebuffs:AddAura(unit, spellID, auraType, duration, timeLeft, stack
             aura = tremove(self.framePool, #self.framePool)
         else
             aura = CreateFrame("Frame")
-            aura:SetFrameLevel(3)
+            aura:EnableMouse(false)
+            aura:SetFrameStrata(Gladdy.db.buffFrameStrata)
+            aura:SetFrameLevel(Gladdy.db.buffsFrameLevel)
             aura.texture = aura:CreateTexture(nil, "BACKGROUND")
+            aura.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
             aura.texture:SetAllPoints(aura)
             aura.cooldowncircle = CreateFrame("Cooldown", nil, aura, "CooldownFrameTemplate")
-            aura.cooldowncircle:SetFrameLevel(4)
+            aura.cooldowncircle:SetFrameLevel(Gladdy.db.buffsFrameLevel + 1)
             aura.cooldowncircle.noCooldownCount = true -- disable OmniCC
             aura.cooldowncircle:SetAllPoints(aura)
             aura.cooldowncircle:SetReverse(true)
             aura.cooldowncircle:SetHideCountdownNumbers(true)
             aura.overlay = CreateFrame("Frame", nil, aura)
-            aura.overlay:SetFrameLevel(5)
+            aura.overlay:SetFrameLevel(Gladdy.db.buffsFrameLevel + 2)
             aura.overlay:SetAllPoints(aura)
             aura.border = aura.overlay:CreateTexture(nil, "OVERLAY")
             aura.border:SetAllPoints(aura)
@@ -578,36 +467,6 @@ end
 -- OPTIONS
 ------------
 
-local function option(params)
-    local defaults = {
-        get = function(info)
-            local key = info.arg or info[#info]
-            return Gladdy.dbi.profile[key]
-        end,
-        set = function(info, value)
-            local key = info.arg or info[#info]
-            Gladdy.dbi.profile[key] = value
-            if Gladdy.db.buffsCooldownPos == "LEFT" then
-                Gladdy.db.buffsCooldownGrowDirection = "LEFT"
-            elseif Gladdy.db.buffsCooldownPos == "RIGHT" then
-                Gladdy.db.buffsCooldownGrowDirection = "RIGHT"
-            end
-            if Gladdy.db.buffsBuffsCooldownPos == "LEFT" then
-                Gladdy.db.buffsBuffsCooldownGrowDirection = "LEFT"
-            elseif Gladdy.db.buffsBuffsCooldownPos == "RIGHT" then
-                Gladdy.db.buffsBuffsCooldownGrowDirection = "RIGHT"
-            end
-            Gladdy:UpdateFrame()
-        end,
-    }
-
-    for k, v in pairs(params) do
-        defaults[k] = v
-    end
-
-    return defaults
-end
-
 function BuffsDebuffs:GetOptions()
     return {
         headerBuffs = {
@@ -617,7 +476,7 @@ function BuffsDebuffs:GetOptions()
         },
         buffsEnabled = Gladdy:option({
             type = "toggle",
-            name = L["Enable"],
+            name = L["Enabled"],
             desc = L["Enabled Buffs and Debuffs module"],
             order = 3,
         }),
@@ -630,7 +489,7 @@ function BuffsDebuffs:GetOptions()
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 5,
             args = {
                 buffs = {
@@ -640,7 +499,7 @@ function BuffsDebuffs:GetOptions()
                     args = {
                         size = {
                             type = "group",
-                            name = "Size & Padding",
+                            name = L["Size & Padding"],
                             order = 1,
                             args = {
                                 header = {
@@ -656,6 +515,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 5,
                                     max = 50,
                                     step = 1,
+                                    width = "full",
                                 }),
                                 buffsBuffsWidthFactor = Gladdy:option({
                                     type = "range",
@@ -665,6 +525,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 0.5,
                                     max = 2,
                                     step = 0.05,
+                                    width = "full",
                                 }),
                                 buffsBuffsIconPadding = Gladdy:option({
                                     type = "range",
@@ -674,12 +535,13 @@ function BuffsDebuffs:GetOptions()
                                     min = 0,
                                     max = 10,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                             },
                         },
                         position = {
                             type = "group",
-                            name = "Position",
+                            name = L["Position"],
                             order = 3,
                             args = {
                                 header = {
@@ -687,18 +549,6 @@ function BuffsDebuffs:GetOptions()
                                     name = L["Position"],
                                     order = 5,
                                 },
-                                buffsBuffsCooldownPos = option({
-                                    type = "select",
-                                    name = L["Aura Position"],
-                                    desc = L["Position of the aura icons"],
-                                    order = 21,
-                                    values = {
-                                        ["TOP"] = L["Top"],
-                                        ["BOTTOM"] = L["Bottom"],
-                                        ["LEFT"] = L["Left"],
-                                        ["RIGHT"] = L["Right"],
-                                    },
-                                }),
                                 buffsBuffsCooldownGrowDirection = Gladdy:option({
                                     type = "select",
                                     name = L["Grow Direction"],
@@ -716,6 +566,7 @@ function BuffsDebuffs:GetOptions()
                                     min = -400,
                                     max = 400,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                                 buffsBuffsYOffset = Gladdy:option({
                                     type = "range",
@@ -724,6 +575,7 @@ function BuffsDebuffs:GetOptions()
                                     min = -400,
                                     max = 400,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                             },
                         },
@@ -744,6 +596,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 0,
                                     max = 1,
                                     step = 0.05,
+                                    width = "full",
                                 }),
                             }
                         }
@@ -756,7 +609,7 @@ function BuffsDebuffs:GetOptions()
                     args = {
                         size = {
                             type = "group",
-                            name = "Size & Padding",
+                            name = L["Size & Padding"],
                             order = 1,
                             args = {
                                 header = {
@@ -772,6 +625,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 5,
                                     max = 50,
                                     step = 1,
+                                    width = "full",
                                 }),
                                 buffsWidthFactor = Gladdy:option({
                                     type = "range",
@@ -781,6 +635,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 0.5,
                                     max = 2,
                                     step = 0.05,
+                                    width = "full",
                                 }),
                                 buffsIconPadding = Gladdy:option({
                                     type = "range",
@@ -790,12 +645,13 @@ function BuffsDebuffs:GetOptions()
                                     min = 0,
                                     max = 10,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                             },
                         },
                         position = {
                             type = "group",
-                            name = "Position",
+                            name = L["Position"],
                             order = 3,
                             args = {
                                 header = {
@@ -803,18 +659,6 @@ function BuffsDebuffs:GetOptions()
                                     name = L["Position"],
                                     order = 5,
                                 },
-                                buffsCooldownPos = option({
-                                    type = "select",
-                                    name = L["Aura Position"],
-                                    desc = L["Position of the aura icons"],
-                                    order = 21,
-                                    values = {
-                                        ["TOP"] = L["Top"],
-                                        ["BOTTOM"] = L["Bottom"],
-                                        ["LEFT"] = L["Left"],
-                                        ["RIGHT"] = L["Right"],
-                                    },
-                                }),
                                 buffsCooldownGrowDirection = Gladdy:option({
                                     type = "select",
                                     name = L["Grow Direction"],
@@ -832,6 +676,7 @@ function BuffsDebuffs:GetOptions()
                                     min = -400,
                                     max = 400,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                                 buffsYOffset = Gladdy:option({
                                     type = "range",
@@ -840,6 +685,7 @@ function BuffsDebuffs:GetOptions()
                                     min = -400,
                                     max = 400,
                                     step = 0.1,
+                                    width = "full",
                                 }),
                             },
                         },
@@ -860,6 +706,7 @@ function BuffsDebuffs:GetOptions()
                                     min = 0,
                                     max = 1,
                                     step = 0.05,
+                                    width = "full",
                                 }),
                             }
                         }
@@ -867,7 +714,7 @@ function BuffsDebuffs:GetOptions()
                 },
                 cooldown = {
                     type = "group",
-                    name = "Cooldown",
+                    name = L["Cooldown"],
                     order = 3,
                     args = {
                         header = {
@@ -879,6 +726,7 @@ function BuffsDebuffs:GetOptions()
                             type = "toggle",
                             name = L["No Cooldown Circle"],
                             order = 9,
+                            width = "full",
                         }),
                         buffsCooldownAlpha = Gladdy:option({
                             type = "range",
@@ -887,12 +735,29 @@ function BuffsDebuffs:GetOptions()
                             max = 1,
                             step = 0.1,
                             order = 10,
+                            width = "full",
                         }),
+                        buffsCooldownNumberAlpha = {
+                            type = "range",
+                            name = L["Cooldown number alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.1,
+                            order = 11,
+                            width = "full",
+                            set = function(info, value)
+                                Gladdy.db.buffsFontColor.a = value
+                                Gladdy:UpdateFrame()
+                            end,
+                            get = function(info)
+                                return Gladdy.db.buffsFontColor.a
+                            end,
+                        },
                     },
                 },
                 font = {
                     type = "group",
-                    name = "Font",
+                    name = L["Font"],
                     order = 4,
                     args = {
                         header = {
@@ -916,6 +781,7 @@ function BuffsDebuffs:GetOptions()
                             min = 0.1,
                             max = 2,
                             step = 0.1,
+                            width = "full",
                         }),
                         buffsDynamicColor = Gladdy:option({
                             type = "toggle",
@@ -934,7 +800,7 @@ function BuffsDebuffs:GetOptions()
                 },
                 border = {
                     type = "group",
-                    name = "Border",
+                    name = L["Border"],
                     order = 5,
                     args = {
                         header = {
@@ -1018,10 +884,39 @@ function BuffsDebuffs:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        buffFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        buffsFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
         debuffList = {
-            name = "Debuff Lists",
+            name = L["Debuff Lists"],
             type = "group",
             order = 11,
             childGroups = "tree",
@@ -1036,7 +931,7 @@ function BuffsDebuffs:GetOptions()
             end,
         },
         buffList = {
-            name = "Buff Lists",
+            name = L["Buff Lists"],
             type = "group",
             order = 12,
             childGroups = "tree",
@@ -1053,3 +948,168 @@ function BuffsDebuffs:GetOptions()
     }
 end
 
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function BuffsDebuffs:LegacySetPositionDebuffs(unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    self.frames[unit].debuffFrame:ClearAllPoints()
+    local powerBarHeight = Gladdy.db.powerBarEnabled and (Gladdy.db.powerBarHeight + 1) or 0
+    local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize)
+    local verticalMargin = -(Gladdy.db.powerBarHeight)/2
+    local offset = 0
+    if (Gladdy.db.buffsCooldownGrowDirection == "RIGHT") then
+        offset = Gladdy.db.buffsIconSize * Gladdy.db.buffsWidthFactor
+    end
+    local pos = Gladdy.db.buffsCooldownPos
+
+    if pos == "TOP" then
+        verticalMargin = horizontalMargin + 1
+        if Gladdy.db.cooldownYPos == "TOP" and Gladdy.db.cooldown then
+            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
+        end
+        if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
+            self.frames[unit].debuffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset + verticalMargin)
+        else
+            self.frames[unit].debuffFrame:SetPoint("BOTTOMRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset + verticalMargin)
+        end
+    elseif pos == "BOTTOM" then
+        verticalMargin = horizontalMargin + 1
+        if Gladdy.db.cooldownYPos == "BOTTOM" and Gladdy.db.cooldown then
+            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
+        end
+        if Gladdy.db.buffsCooldownGrowDirection == "LEFT" then
+            self.frames[unit].debuffFrame:SetPoint("TOPLEFT", Gladdy.buttons[unit].healthBar, "BOTTOMRIGHT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset -verticalMargin - powerBarHeight)
+        else
+            self.frames[unit].debuffFrame:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "BOTTOMLEFT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset -verticalMargin - powerBarHeight)
+        end
+    elseif pos == "LEFT" then
+        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
+        local anchor = Gladdy:GetAnchor(unit, "LEFT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            self.frames[unit].debuffFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset)
+        else
+            self.frames[unit].debuffFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset)
+        end
+    elseif pos == "RIGHT" then
+        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
+        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            self.frames[unit].debuffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset)
+        else
+            self.frames[unit].debuffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsYOffset)
+        end
+    end
+    return Gladdy.db.newLayout
+end
+
+function BuffsDebuffs:LegacySetPositionBuffs(unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    self.frames[unit].buffFrame:ClearAllPoints()
+    local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize)
+    local verticalMargin = -(Gladdy.db.powerBarHeight)/2
+    local powerBarHeight = Gladdy.db.powerBarEnabled and (Gladdy.db.powerBarHeight + 1) or 0
+    local offset = 0
+    if (Gladdy.db.buffsBuffsCooldownGrowDirection == "RIGHT") then
+        offset = Gladdy.db.buffsBuffsIconSize * Gladdy.db.buffsBuffsWidthFactor
+    end
+
+    local pos = Gladdy.db.buffsBuffsCooldownPos
+
+    if pos == "TOP" then
+        verticalMargin = horizontalMargin + 1
+        if Gladdy.db.cooldownYPos == "TOP" and Gladdy.db.cooldown then
+            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
+        end
+        if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
+            self.frames[unit].buffFrame:SetPoint("BOTTOMLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
+        else
+            self.frames[unit].buffFrame:SetPoint("BOTTOMRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", Gladdy.db.buffsXOffset + offset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
+        end
+    elseif pos == "BOTTOM" then
+        verticalMargin = horizontalMargin + 1
+        if Gladdy.db.cooldownYPos == "BOTTOM" and Gladdy.db.cooldown then
+            verticalMargin = verticalMargin + Gladdy.db.cooldownSize
+        end
+        if Gladdy.db.buffsBuffsCooldownGrowDirection == "LEFT" then
+            self.frames[unit].buffFrame:SetPoint("TOPLEFT", Gladdy.buttons[unit].healthBar, "BOTTOMRIGHT", Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset -verticalMargin - powerBarHeight)
+        else
+            self.frames[unit].buffFrame:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "BOTTOMLEFT", Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset -verticalMargin - powerBarHeight)
+        end
+    elseif pos == "LEFT" then
+        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
+        if (Gladdy.db.trinketPos == "LEFT" and Gladdy.db.trinketEnabled) then
+            horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
+            if (Gladdy.db.classIconPos == "LEFT") then
+                horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
+            end
+        elseif (Gladdy.db.classIconPos == "LEFT") then
+            horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
+            if (Gladdy.db.trinketPos == "LEFT" and Gladdy.db.trinketEnabled) then
+                horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
+            end
+        end
+        if (Gladdy.db.drCooldownPos == "LEFT" and Gladdy.db.drEnabled) then
+            verticalMargin = verticalMargin + Gladdy.db.drIconSize/2 + Gladdy.db.padding/2
+        end
+        if (Gladdy.db.castBarPos == "LEFT") then
+            verticalMargin = verticalMargin -
+                    (((Gladdy.db.castBarHeight < Gladdy.db.castBarIconSize) and Gladdy.db.castBarIconSize
+                            or Gladdy.db.castBarHeight)/2 + Gladdy.db.padding/2)
+        end
+        if (Gladdy.db.cooldownYPos == "LEFT" and Gladdy.db.cooldown) then
+            verticalMargin = verticalMargin + (Gladdy.db.buffsBuffsIconSize/2 + Gladdy.db.padding/2)
+        end
+        --self.frames[unit].buffFrame:SetPoint("RIGHT", Gladdy.buttons[unit].healthBar, "LEFT", -horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
+
+        local anchor = Gladdy:GetAnchor(unit, "LEFT")
+        horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) - 1 + Gladdy.db.padding
+        if anchor == Gladdy.buttons[unit].healthBar then
+            self.frames[unit].buffFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset)
+        else
+            self.frames[unit].buffFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset)
+        end
+
+    elseif pos == "RIGHT" then
+        horizontalMargin = horizontalMargin - 1 + Gladdy.db.padding
+        if (Gladdy.db.trinketPos == "RIGHT" and Gladdy.db.trinketEnabled) then
+            horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
+            if (Gladdy.db.classIconPos == "RIGHT") then
+                horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
+            end
+        elseif (Gladdy.db.classIconPos == "RIGHT") then
+            horizontalMargin = horizontalMargin + (Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor) + Gladdy.db.padding
+            if (Gladdy.db.trinketPos == "RIGHT" and Gladdy.db.trinketEnabled) then
+                horizontalMargin = horizontalMargin + (Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor) + Gladdy.db.padding
+            end
+        end
+        if (Gladdy.db.drCooldownPos == "RIGHT" and Gladdy.db.drEnabled) then
+            verticalMargin = verticalMargin + Gladdy.db.drIconSize/2 + Gladdy.db.padding/2
+        end
+        if (Gladdy.db.castBarPos == "RIGHT") then
+            verticalMargin = verticalMargin -
+                    (((Gladdy.db.castBarHeight < Gladdy.db.castBarIconSize) and Gladdy.db.castBarIconSize
+                            or Gladdy.db.castBarHeight)/2 + Gladdy.db.padding/2)
+        end
+        if (Gladdy.db.cooldownYPos == "RIGHT" and Gladdy.db.cooldown) then
+            verticalMargin = verticalMargin + (Gladdy.db.buffsBuffsIconSize/2 + Gladdy.db.padding/2)
+        end
+        --self.frames[unit].buffFrame:SetPoint("LEFT", Gladdy.buttons[unit].healthBar, "RIGHT", horizontalMargin + Gladdy.db.buffsBuffsXOffset, Gladdy.db.buffsBuffsYOffset + verticalMargin)
+
+        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
+        horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) - 1 + Gladdy.db.padding
+        if anchor == Gladdy.buttons[unit].healthBar then
+            self.frames[unit].buffFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset)
+        else
+            self.frames[unit].buffFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.buffsBuffsXOffset + offset, Gladdy.db.buffsBuffsYOffset)
+        end
+    end
+    return Gladdy.db.newLayout
+end

Modules/Castbar.lua

@@ -18,7 +18,8 @@ local BackdropTemplateMixin = BackdropTemplateMixin
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
-local Castbar = Gladdy:NewModule("Castbar", 70, {
+local Castbar = Gladdy:NewModule("Cast Bar", 70, {
+    castBarEnabled = true,
     castBarHeight = 20,
     castBarWidth = 160,
     castBarIconSize = 22,
@@ -32,8 +33,8 @@ local Castbar = Gladdy:NewModule("Castbar", 70, {
     castBarIconColor = { r = 0, g = 0, b = 0, a = 1 },
     castBarBorderColor = { r = 0, g = 0, b = 0, a = 1 },
     castBarFontColor = { r = 1, g = 1, b = 1, a = 1 },
+    castBarIconEnabled = true,
     castBarGuesses = true,
-    castBarPos = "LEFT",
     castBarXOffset = 0,
     castBarYOffset = 0,
     castBarIconPos = "LEFT",
@@ -41,6 +42,8 @@ local Castbar = Gladdy:NewModule("Castbar", 70, {
     castBarTimerFormat = "LEFT",
     castBarSparkEnabled = true,
     castBarSparkColor = { r = 1, g = 1, b = 1, a = 1 },
+    castBarFrameStrata = "MEDIUM",
+    castBarFrameLevel = 5,
 })
 
 function Castbar:Initialize()
@@ -56,19 +59,28 @@ end
 ---------------------------
 
 function Castbar:CreateFrame(unit)
-    local castBar = CreateFrame("Frame", nil, Gladdy.buttons[unit], BackdropTemplateMixin and "BackdropTemplate")
+    local castBar = CreateFrame("Frame", nil, Gladdy.buttons[unit])
+    castBar:EnableMouse(false)
+    castBar:SetMovable(true)
     castBar.unit = unit
+    castBar:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar:SetFrameLevel(Gladdy.db.castBarFrameLevel)
 
-    castBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.castBarBorderStyle),
+    castBar.backdrop = CreateFrame("Frame", nil, castBar, BackdropTemplateMixin and "BackdropTemplate")
+    castBar.backdrop:SetAllPoints(castBar)
+    castBar.backdrop:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "castBarBorderStyle"),
                                  edgeSize = Gladdy.db.castBarBorderSize })
-    castBar:SetBackdropBorderColor(Gladdy.db.castBarBorderColor.r, Gladdy.db.castBarBorderColor.g, Gladdy.db.castBarBorderColor.b, Gladdy.db.castBarBorderColor.a)
-    castBar:SetFrameLevel(1)
+    castBar.backdrop:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.castBarBorderColor))
+    castBar.backdrop:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.backdrop:SetFrameLevel(Gladdy.db.castBarFrameLevel - 1)
 
     castBar.bar = CreateFrame("StatusBar", nil, castBar)
-    castBar.bar:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.castBarTexture))
-    castBar.bar:SetStatusBarColor(Gladdy.db.castBarColor.r, Gladdy.db.castBarColor.g, Gladdy.db.castBarColor.b, Gladdy.db.castBarColor.a)
+    castBar.bar:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "castBarTexture"))
+    castBar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.castBarColor))
     castBar.bar:SetMinMaxValues(0, 100)
     castBar.bar:SetFrameLevel(0)
+    castBar.bar:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.bar:SetFrameLevel(Gladdy.db.castBarFrameLevel)
 
     castBar.spark = castBar:CreateTexture(nil, "OVERLAY")
     castBar.spark:SetTexture("Interface\\CastingBar\\UI-CastingBar-Spark")
@@ -79,12 +91,15 @@ function Castbar:CreateFrame(unit)
 
     castBar.bg = castBar.bar:CreateTexture(nil, "BACKGROUND")
     castBar.bg:SetAlpha(1)
-    castBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.castBarTexture))
-    castBar.bg:SetVertexColor(Gladdy.db.castBarBgColor.r, Gladdy.db.castBarBgColor.g, Gladdy.db.castBarBgColor.b, Gladdy.db.castBarBgColor.a)
+    castBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "castBarTexture"))
+    castBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.castBarBgColor))
     castBar.bg:SetAllPoints(castBar.bar)
 
     castBar.icon = CreateFrame("Frame", nil, castBar)
+    castBar.icon:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.icon:SetFrameLevel(Gladdy.db.castBarFrameLevel)
     castBar.icon.texture = castBar.icon:CreateTexture(nil, "BACKGROUND")
+    castBar.icon.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
     castBar.icon.texture:SetAllPoints(castBar.icon)
     castBar.icon.texture.overlay = castBar.icon:CreateTexture(nil, "BORDER")
     castBar.icon.texture.overlay:SetAllPoints(castBar.icon.texture)
@@ -98,16 +113,16 @@ function Castbar:CreateFrame(unit)
     end
 
     castBar.spellText = castBar:CreateFontString(nil, "LOW")
-    castBar.spellText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.auraFont), Gladdy.db.castBarFontSize)
-    castBar.spellText:SetTextColor(Gladdy.db.castBarFontColor.r, Gladdy.db.castBarFontColor.g, Gladdy.db.castBarFontColor.b, Gladdy.db.castBarFontColor.a)
+    castBar.spellText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize)
+    castBar.spellText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
     castBar.spellText:SetShadowOffset(1, -1)
     castBar.spellText:SetShadowColor(0, 0, 0, 1)
     castBar.spellText:SetJustifyH("CENTER")
     castBar.spellText:SetPoint("LEFT", 7, 0) -- Text of the spell
 
     castBar.timeText = castBar:CreateFontString(nil, "LOW")
-    castBar.timeText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.auraFont), Gladdy.db.castBarFontSize)
-    castBar.timeText:SetTextColor(Gladdy.db.castBarFontColor.r, Gladdy.db.castBarFontColor.g, Gladdy.db.castBarFontColor.b, Gladdy.db.castBarFontColor.a)
+    castBar.timeText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize)
+    castBar.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
     castBar.timeText:SetShadowOffset(1, -1)
     castBar.timeText:SetShadowColor(0, 0, 0, 1)
     castBar.timeText:SetJustifyH("CENTER")
@@ -119,30 +134,38 @@ function Castbar:CreateFrame(unit)
 end
 
 function Castbar:UpdateFrame(unit)
-    local button = Gladdy.buttons[unit]
     local castBar = self.frames[unit]
     if (not castBar) then
         return
     end
 
+    castBar:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar:SetFrameLevel(Gladdy.db.castBarFrameLevel)
+    castBar.backdrop:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.backdrop:SetFrameLevel(Gladdy.db.castBarFrameLevel - 1)
+    castBar.bar:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.bar:SetFrameLevel(Gladdy.db.castBarFrameLevel)
+    castBar.icon:SetFrameStrata(Gladdy.db.castBarFrameStrata)
+    castBar.icon:SetFrameLevel(Gladdy.db.castBarFrameLevel)
+
     castBar:SetWidth(Gladdy.db.castBarWidth)
     castBar:SetHeight(Gladdy.db.castBarHeight)
-    castBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.castBarBorderStyle),
+    castBar.backdrop:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "castBarBorderStyle"),
                                  edgeSize = Gladdy.db.castBarBorderSize })
-    castBar:SetBackdropBorderColor(Gladdy.db.castBarBorderColor.r, Gladdy.db.castBarBorderColor.g, Gladdy.db.castBarBorderColor.b, Gladdy.db.castBarBorderColor.a)
+    castBar.backdrop:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.castBarBorderColor))
 
-    castBar.bar:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.castBarTexture))
+    castBar.bar:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "castBarTexture"))
     castBar.bar:ClearAllPoints()
-    castBar.bar:SetStatusBarColor(Gladdy.db.castBarColor.r, Gladdy.db.castBarColor.g, Gladdy.db.castBarColor.b, Gladdy.db.castBarColor.a)
+    castBar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.castBarColor))
     castBar.bar:SetPoint("TOPLEFT", castBar, "TOPLEFT", (Gladdy.db.castBarBorderSize/Gladdy.db.statusbarBorderOffset), -(Gladdy.db.castBarBorderSize/Gladdy.db.statusbarBorderOffset))
     castBar.bar:SetPoint("BOTTOMRIGHT", castBar, "BOTTOMRIGHT", -(Gladdy.db.castBarBorderSize/Gladdy.db.statusbarBorderOffset), (Gladdy.db.castBarBorderSize/Gladdy.db.statusbarBorderOffset))
 
-    castBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.castBarTexture))
-    castBar.bg:SetVertexColor(Gladdy.db.castBarBgColor.r, Gladdy.db.castBarBgColor.g, Gladdy.db.castBarBgColor.b, Gladdy.db.castBarBgColor.a)
+    castBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "castBarTexture"))
+    castBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.castBarBgColor))
 
     if Gladdy.db.castBarSparkEnabled then
         castBar.spark:SetHeight(Gladdy.db.castBarHeight * 1.8)
-        castBar.spark:SetVertexColor(Gladdy.db.castBarSparkColor.r, Gladdy.db.castBarSparkColor.g, Gladdy.db.castBarSparkColor.b, Gladdy.db.castBarSparkColor.a)
+        castBar.spark:SetVertexColor(Gladdy:SetColor(Gladdy.db.castBarSparkColor))
     else
         castBar.spark:SetAlpha(0)
     end
@@ -151,6 +174,11 @@ function Castbar:UpdateFrame(unit)
     castBar.icon:SetHeight(Gladdy.db.castBarIconSize)
     castBar.icon.texture:SetAllPoints(castBar.icon)
     castBar.icon:ClearAllPoints()
+    if Gladdy.db.castBarIconEnabled then
+        castBar.icon:Show()
+    else
+        castBar.icon:Hide()
+    end
 
     local rightMargin = 0
     local leftMargin = 0
@@ -162,33 +190,25 @@ function Castbar:UpdateFrame(unit)
         leftMargin = Gladdy.db.castBarIconSize + 1
     end
 
-    castBar:ClearAllPoints()
-    local horizontalMargin = Gladdy.db.highlightBorderSize + Gladdy.db.padding
-    if (Gladdy.db.castBarPos == "LEFT") then
-        local anchor = Gladdy:GetAnchor(unit, "LEFT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            castBar:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin - leftMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
-        else
-            castBar:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding - leftMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
-        end
-    end
-    if (Gladdy.db.castBarPos == "RIGHT") then
-        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            castBar:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + rightMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
-        else
-            castBar:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + rightMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
-        end
-    end
+    Gladdy:SetPosition(castBar, unit, "castBarXOffset", "castBarYOffset", Castbar:LegacySetPosition(castBar, unit, leftMargin, rightMargin), Castbar)
 
-    castBar.spellText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.auraFont), Gladdy.db.castBarFontSize)
-    castBar.spellText:SetTextColor(Gladdy.db.castBarFontColor.r, Gladdy.db.castBarFontColor.g, Gladdy.db.castBarFontColor.b, Gladdy.db.castBarFontColor.a)
+    castBar.spellText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize)
+    castBar.spellText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
 
-    castBar.timeText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.auraFont), Gladdy.db.castBarFontSize)
-    castBar.timeText:SetTextColor(Gladdy.db.castBarFontColor.r, Gladdy.db.castBarFontColor.g, Gladdy.db.castBarFontColor.b, Gladdy.db.castBarFontColor.a)
+    castBar.timeText:SetFont(Gladdy:SMFetch("font", "castBarFont"), Gladdy.db.castBarFontSize)
+    castBar.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.castBarFontColor))
 
     castBar.icon.texture.overlay:SetTexture(Gladdy.db.castBarIconStyle)
-    castBar.icon.texture.overlay:SetVertexColor(Gladdy.db.castBarIconColor.r, Gladdy.db.castBarIconColor.g, Gladdy.db.castBarIconColor.b, Gladdy.db.castBarIconColor.a)
+    castBar.icon.texture.overlay:SetVertexColor(Gladdy:SetColor(Gladdy.db.castBarIconColor))
+
+    if (unit == "arena1") then
+        Gladdy:CreateMover(castBar, "castBarXOffset", "castBarYOffset", L["Cast Bar"],
+                {"TOPLEFT", "TOPLEFT"}, Gladdy.db.castBarWidth, Gladdy.db.castBarHeight,
+                0, 0, "castBarEnabled")
+    end
+    if not Gladdy.db.castBarEnabled then
+        self:CAST_STOP(unit)
+    end
 end
 
 ---------------------------
@@ -229,7 +249,7 @@ function Castbar.OnUpdate(castBar, elapsed)
             castBar.spark:SetPoint("CENTER", castBar.bar, "LEFT", castBar.spark.position, 0)
             castBar.spark:Show()
         end
-    elseif ( GetTime() < castBar.holdTime ) then
+    elseif ( castBar.holdTime and GetTime() < castBar.holdTime ) then
         castBar.timeText:Hide()
         castBar.spark:Hide()
         return
@@ -241,7 +261,7 @@ function Castbar.OnUpdate(castBar, elapsed)
             castBar.fadeOut = nil;
             castBar.timeText:Show()
             castBar.spark:Show()
-            castBar:Hide();
+            castBar:SetAlpha(0)
         end
     end
 end
@@ -250,7 +270,7 @@ Castbar.CastEventsFunc = {}
 Castbar.CastEventsFunc["UNIT_SPELLCAST_START"] = function(castBar, event, ...)
     local name, text, texture, startTime, endTime, isTradeSkill, castID = UnitCastingInfo(castBar.unit)
     if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
-        castBar:Hide()
+        castBar:SetAlpha(0)
         return
     end
 
@@ -281,7 +301,7 @@ Castbar.CastEventsFunc["UNIT_SPELLCAST_SUCCEEDED"] = function(castBar, event, ..
 end
 Castbar.CastEventsFunc["UNIT_SPELLCAST_STOP"] = function(castBar, event, ...)
     if ( not castBar:IsVisible() ) then
-        castBar:Hide()
+        castBar:SetAlpha(0)
     end
     if ( (castBar.casting and event == "UNIT_SPELLCAST_STOP" and select(2, ...) == castBar.castID) or
             (castBar.channeling and event == "UNIT_SPELLCAST_CHANNEL_STOP") ) then
@@ -329,7 +349,7 @@ Castbar.CastEventsFunc["UNIT_SPELLCAST_DELAYED"] = function(castBar, event, ...)
 
         if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
             -- if there is no name, there is no bar
-            castBar:Hide()
+            castBar:SetAlpha(0)
             return
         end
         castBar.value = (GetTime() - (startTime / 1000))
@@ -347,7 +367,7 @@ Castbar.CastEventsFunc["UNIT_SPELLCAST_CHANNEL_START"] = function(castBar, event
     local name, text, texture, startTime, endTime, isTradeSkill, spellID = UnitChannelInfo(castBar.unit)
 
     if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
-        castBar:Hide()
+        castBar:SetAlpha(0)
         return
     end
     if ( castBar.spark ) then
@@ -365,7 +385,7 @@ Castbar.CastEventsFunc["UNIT_SPELLCAST_CHANNEL_UPDATE"] = function(castBar, even
     if ( castBar:IsShown() ) then
         local name, text, texture, startTime, endTime, isTradeSkill = UnitChannelInfo(castBar.unit)
         if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
-            castBar:Hide()
+            castBar:SetAlpha(0)
             return
         end
         castBar.value = ((endTime / 1000) - GetTime())
@@ -394,18 +414,26 @@ function Castbar:CAST_START(unit, spell, icon, value, maxValue, test)
         castBar.channeling = test == "channel"
     end
 
-    castBar.bar:SetStatusBarColor(Gladdy.db.castBarColor.r, Gladdy.db.castBarColor.g, Gladdy.db.castBarColor.b, Gladdy.db.castBarColor.a)
+    castBar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.castBarColor))
     castBar.value = value
     castBar.maxValue = maxValue
     castBar.bar:SetMinMaxValues(0, maxValue)
     castBar.bar:SetValue(value)
+    castBar.icon:SetAlpha(1)
     castBar.icon.texture:SetTexture(icon)
     castBar.spellText:SetText(spell)
     castBar.timeText:SetText(maxValue)
     castBar.bg:Show()
-    castBar:Show()
+    castBar.backdrop:Show()
+    if Gladdy.db.castBarSparkEnabled then
+        castBar.spark:Show()
+    end
     castBar:SetAlpha(1)
-    castBar.icon:Show()
+    if Gladdy.db.castBarIconEnabled then
+        castBar.icon:Show()
+    else
+        castBar.icon:Hide()
+    end
 end
 
 function Castbar:CAST_STOP(unit, ...)
@@ -418,12 +446,14 @@ function Castbar:CAST_STOP(unit, ...)
         castBar.channeling = nil
         castBar.value = 0
         castBar.maxValue = 0
+        castBar.icon:SetAlpha(0)
         castBar.icon.texture:SetTexture("")
         castBar.spellText:SetText("")
         castBar.timeText:SetText("")
         castBar.bar:SetValue(0)
         castBar.bg:Hide()
-        castBar:Hide()
+        castBar.backdrop:Hide()
+        castBar.spark:Hide()
         castBar.icon:Hide()
     else
         castBar.bar:SetStatusBarColor(...)
@@ -437,42 +467,41 @@ end
 ---------------------------
 
 function Castbar:JOINED_ARENA()
-    for i=1, Gladdy.curBracket do
-        local unit = "arena" .. i
-        local castBar = self.frames[unit]
-        castBar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
-        castBar:RegisterEvent("UNIT_SPELLCAST_DELAYED")
-        castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
-        castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
-        castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
-        castBar:RegisterUnitEvent("UNIT_SPELLCAST_START", unit)
-        castBar:RegisterUnitEvent("UNIT_SPELLCAST_STOP", unit)
-        castBar:RegisterUnitEvent("UNIT_SPELLCAST_FAILED", unit)
-        castBar:RegisterUnitEvent("UNIT_SPELLCAST_SUCCEEDED", unit)
-        castBar:SetScript("OnEvent", Castbar.OnEvent)
-        castBar:SetScript("OnUpdate", Castbar.OnUpdate)
-        castBar.fadeOut = nil
-        self:CAST_STOP(unit)
-        --Castbar.OnEvent(castBar, "PLAYER_ENTERING_WORLD")
+    if Gladdy.db.castBarEnabled then
+        for i=1, Gladdy.curBracket do
+            local unit = "arena" .. i
+            local castBar = self.frames[unit]
+            castBar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
+            castBar:RegisterEvent("UNIT_SPELLCAST_DELAYED")
+            castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
+            castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
+            castBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
+            castBar:RegisterUnitEvent("UNIT_SPELLCAST_START", unit)
+            castBar:RegisterUnitEvent("UNIT_SPELLCAST_STOP", unit)
+            castBar:RegisterUnitEvent("UNIT_SPELLCAST_FAILED", unit)
+            castBar:RegisterUnitEvent("UNIT_SPELLCAST_SUCCEEDED", unit)
+            castBar:SetScript("OnEvent", Castbar.OnEvent)
+            castBar:SetScript("OnUpdate", Castbar.OnUpdate)
+            castBar.fadeOut = nil
+            self:CAST_STOP(unit)
+            --Castbar.OnEvent(castBar, "PLAYER_ENTERING_WORLD")
+        end
     end
 end
 
 function Castbar:ResetUnit(unit)
     local castBar = self.frames[unit]
-    castBar:UnregisterEvent("UNIT_SPELLCAST_INTERRUPTED")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_DELAYED")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_CHANNEL_START")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_START")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_STOP")
-    castBar:UnregisterEvent("UNIT_SPELLCAST_FAILED")
+    castBar:UnregisterAllEvents()
     castBar:SetScript("OnEvent", nil)
     castBar:SetScript("OnUpdate", nil)
     castBar.fadeOut = nil
     self:CAST_STOP(unit)
 end
 
+function Castbar:Reset()
+    self.test = nil
+end
+
 ---------------------------
 
 -- TEST
@@ -480,25 +509,30 @@ end
 ---------------------------
 
 function Castbar:Test(unit)
-    local spell, _, icon, value, maxValue, event, endTime, startTime
+    self.test = true
+    if Gladdy.db.castBarEnabled then
+        local spell, _, icon, value, maxValue, event, endTime, startTime
 
-    if (unit == "arena2") then
-        spell, _, icon = GetSpellInfo(27072)
-        value, maxValue, event = 0, 40, "cast"
-    elseif (unit == "arena1") then
-        spell, _, icon = GetSpellInfo(27220)
-        endTime = GetTime() * 1000 + 60*1000
-        startTime = GetTime() * 1000
-        value = (endTime / 1000) - GetTime()
-        maxValue = (endTime - startTime) / 1000
-        event = "channel"
-    elseif (unit == "arena3") then
-        spell, _, icon = GetSpellInfo(20770)
-        value, maxValue, event = 0, 60, "cast"
-    end
+        if (unit == "arena2") then
+            spell, _, icon = GetSpellInfo(27072)
+            value, maxValue, event = 0, 40, "cast"
+        elseif (unit == "arena1") then
+            spell, _, icon = GetSpellInfo(27220)
+            endTime = GetTime() * 1000 + 60*1000
+            startTime = GetTime() * 1000
+            value = (endTime / 1000) - GetTime()
+            maxValue = (endTime - startTime) / 1000
+            event = "channel"
+        else
+            spell, _, icon = GetSpellInfo(20770)
+            value, maxValue, event = 0, 60, "cast"
+        end
 
-    if (spell) then
-        self:CAST_START(unit, spell, icon, value, maxValue, event)
+        if (spell) then
+            self:CAST_START(unit, spell, icon, value, maxValue, event)
+        end
+    else
+        self:CAST_STOP(unit)
     end
 end
 
@@ -517,7 +551,7 @@ local function option(params)
         set = function(info, value)
             local key = info.arg or info[#info]
             Gladdy.dbi.profile[key] = value
-            Gladdy.options.args.Castbar.args.group.args.barFrame.args.castBarBorderSize.max = Gladdy.db.castBarHeight/2
+            Gladdy.options.args["Cast Bar"].args.group.args.barFrame.args.castBarBorderSize.max = Gladdy.db.castBarHeight/2
             if Gladdy.db.castBarBorderSize > Gladdy.db.castBarHeight/2 then
                 Gladdy.db.castBarBorderSize = Gladdy.db.castBarHeight/2
             end
@@ -539,15 +573,21 @@ function Castbar:GetOptions()
             name = L["Cast Bar"],
             order = 2,
         },
+        castBarEnabled = option({
+            type = "toggle",
+            name = L["Enabled"],
+            desc = L["If test is running, type \"/gladdy test\" again"],
+            order = 3,
+        }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
-            order = 3,
+            name = L["Frame"],
+            order = 4,
             args = {
                 barFrame = {
                     type = "group",
-                    name = "Bar",
+                    name = L["Bar"],
                     order = 1,
                     args = {
                         headerSize = {
@@ -561,8 +601,9 @@ function Castbar:GetOptions()
                             desc = L["Height of the bar"],
                             order = 3,
                             min = 0,
-                            max = 50,
+                            max = 200,
                             step = 1,
+                            width = "full",
                         }),
                         castBarWidth = option({
                             type = "range",
@@ -570,8 +611,9 @@ function Castbar:GetOptions()
                             desc = L["Width of the bars"],
                             order = 4,
                             min = 0,
-                            max = 300,
+                            max = 600,
                             step = 1,
+                            width = "full",
                         }),
                         headerTexture = {
                             type = "header",
@@ -612,6 +654,7 @@ function Castbar:GetOptions()
                             min = 0.5,
                             max = Gladdy.db.castBarHeight/2,
                             step = 0.5,
+                            width = "full",
                         }),
                         castBarBorderStyle = option({
                             type = "select",
@@ -630,7 +673,7 @@ function Castbar:GetOptions()
                 },
                 icon = {
                     type = "group",
-                    name = "Icon",
+                    name = L["Icon"],
                     order = 2,
                     args = {
                         headerSize = {
@@ -638,6 +681,12 @@ function Castbar:GetOptions()
                             name = L["Icon Size"],
                             order = 1,
                         },
+                        castBarIconEnabled = option({
+                            type = "toggle",
+                            name = L["Icon Enabled"],
+                            order = 2,
+                            width = "full",
+                        }),
                         castBarIconSize = option({
                             type = "range",
                             name = L["Icon size"],
@@ -645,6 +694,7 @@ function Castbar:GetOptions()
                             min = 0,
                             max = 100,
                             step = 1,
+                            width = "full",
                         }),
                         headerBorder = {
                             type = "header",
@@ -667,7 +717,7 @@ function Castbar:GetOptions()
                 },
                 spark = {
                     type = "group",
-                    name = "Spark",
+                    name = L["Spark"],
                     order = 3,
                     args = {
                         header = {
@@ -691,7 +741,7 @@ function Castbar:GetOptions()
                 },
                 font = {
                     type = "group",
-                    name = "Font",
+                    name = L["Font"],
                     order = 4,
                     args = {
                         header = {
@@ -721,6 +771,7 @@ function Castbar:GetOptions()
                             order = 4,
                             min = 1,
                             max = 20,
+                            width = "full",
                         }),
                         headerFormat = {
                             type = "header",
@@ -741,7 +792,7 @@ function Castbar:GetOptions()
                 },
                 position = {
                     type = "group",
-                    name = "Position",
+                    name = L["Position"],
                     order = 5,
                     args = {
                         header = {
@@ -749,15 +800,6 @@ function Castbar:GetOptions()
                             name = L["Position"],
                             order = 1,
                         },
-                        castBarPos = option({
-                            type = "select",
-                            name = L["Castbar position"],
-                            order = 2,
-                            values = {
-                                ["LEFT"] = L["Left"],
-                                ["RIGHT"] = L["Right"],
-                            },
-                        }),
                         castBarIconPos = option( {
                             type = "select",
                             name = L["Icon position"],
@@ -779,6 +821,7 @@ function Castbar:GetOptions()
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                         castBarYOffset = option({
                             type = "range",
@@ -787,10 +830,71 @@ function Castbar:GetOptions()
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                     }
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        castBarFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        castBarFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 1,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
     }
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Castbar:LegacySetPosition(castBar, unit, leftMargin, rightMargin)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    castBar:ClearAllPoints()
+    local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) + Gladdy.db.padding
+    if (Gladdy.db.castBarPos == "LEFT") then
+        local anchor = Gladdy:GetAnchor(unit, "LEFT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            castBar:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin - leftMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
+        else
+            castBar:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding - leftMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
+        end
+    end
+    if (Gladdy.db.castBarPos == "RIGHT") then
+        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            castBar:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + rightMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
+        else
+            castBar:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + rightMargin + Gladdy.db.castBarXOffset, Gladdy.db.castBarYOffset)
+        end
+    end
+    return Gladdy.db.newLayout
+end

Modules/Classicon.lua

@@ -1,27 +1,100 @@
+local select = select
+
 local Gladdy = LibStub("Gladdy")
 local CreateFrame = CreateFrame
+local GetSpellInfo = GetSpellInfo
 local L = Gladdy.L
-local Classicon = Gladdy:NewModule("Classicon", 80, {
-    classIconPos = "LEFT",
+local Classicon = Gladdy:NewModule("Class Icon", 81, {
+    classIconEnabled = true,
     classIconSize = 60 + 20 + 1,
     classIconWidthFactor = 0.9,
     classIconBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
     classIconBorderColor = { r = 0, g = 0, b = 0, a = 1 },
+    classIconSpecIcon = false,
+    classIconXOffset = 0,
+    classIconYOffset = 0,
+    classIconFrameStrata = "MEDIUM",
+    classIconFrameLevel = 5,
 })
 
+local classIconPath = "Interface\\Addons\\Gladdy\\Images\\Classes\\"
+local classIcons = {
+    ["DRUID"] = classIconPath .. "inv_misc_monsterclaw_04",
+    ["HUNTER"] = classIconPath .. "inv_weapon_bow_07",
+    ["MAGE"] = classIconPath .. "inv_staff_13",
+    ["PALADIN"] = classIconPath .. "inv_hammer_01",
+    ["PRIEST"] = classIconPath .. "inv_staff_30",
+    ["ROGUE"] = classIconPath .. "inv_throwingknife_04",
+    ["SHAMAN"] = classIconPath .. "inv_jewelry_talisman_04",
+    ["WARLOCK"] = classIconPath .. "spell_nature_drowsy",
+    ["WARRIOR"] = classIconPath .. "inv_sword_27",
+}
+
+local specIcons = {
+    --DRUID
+    ["DRUID"] = {
+        [L["Balance"]] = select(3, GetSpellInfo(8921)), -- Moonfire
+        [L["Feral"]] = select(3, GetSpellInfo(27545)), -- Cat Form
+        [L["Restoration"]] = select(3, GetSpellInfo(5185)), -- Healing Touch
+    },
+    ["HUNTER"] = {
+        [L["Beast Mastery"]] = select(3, GetSpellInfo(1515)), -- Tame Beast
+        [L["Marksmanship"]] = select(3, GetSpellInfo(42243)), -- Volley
+        [L["Survival"]] = select(3, GetSpellInfo(1495)), -- Mongoose Bite
+    },
+    ["MAGE"] = {
+        [L["Arcane"]] = select(3, GetSpellInfo(1459)), -- Arcane Intellect
+        [L["Fire"]] = select(3, GetSpellInfo(133)), -- Fireball
+        [L["Frost"]] = select(3, GetSpellInfo(116)), -- Frostbolt
+    },
+    ["PALADIN"] = {
+        [L["Holy"]] = select(3, GetSpellInfo(635)), -- Holy Light
+        [L["Retribution"]] = select(3, GetSpellInfo(7294)), -- Retribution Aura
+        [L["Protection"]] = select(3, GetSpellInfo(32828)), -- Protection Aura
+    },
+    ["PRIEST"] = {
+        [L["Discipline"]] = select(3, GetSpellInfo(1243)), -- Power Word: Fortitude
+        [L["Shadow"]] = select(3, GetSpellInfo(589)), -- Shadow Word: Pain
+        [L["Holy"]] = select(3, GetSpellInfo(635)), -- Holy Light
+    },
+    ["ROGUE"] = {
+        [L["Assassination"]] = select(3, GetSpellInfo(1329)), -- Mutilate (Eviscerate? 2098)
+        [L["Combat"]] = select(3, GetSpellInfo(53)), -- Backstab
+        [L["Subtlety"]] = select(3, GetSpellInfo(1784)), -- Stealth
+    },
+    ["SHAMAN"] = {
+        [L["Elemental"]] = select(3, GetSpellInfo(403)), -- Lightning Bolt
+        [L["Enhancement"]] = select(3, GetSpellInfo(324)), -- Lightning Shield
+        [L["Restoration"]] = select(3, GetSpellInfo(331)), -- Healing Wave
+    },
+    ["WARLOCK"] = {
+        [L["Affliction"]] = select(3, GetSpellInfo(6789)), -- Affliction
+        [L["Demonology"]] = select(3, GetSpellInfo(5500)), -- Sense Demons
+        [L["Destruction"]] = select(3, GetSpellInfo(5740)), -- Rain of Fire
+    },
+    ["WARRIOR"] = {
+        [L["Arms"]] = select(3, GetSpellInfo(12294)), -- Mortal Strike
+        [L["Fury"]] = select(3, GetSpellInfo(12325)), -- Inner Rage
+        [L["Protection"]] = select(3, GetSpellInfo(71)), -- Defensive Stance
+    },
+}
+
 function Classicon:Initialize()
     self.frames = {}
 
     self:RegisterMessage("ENEMY_SPOTTED")
     self:RegisterMessage("UNIT_DEATH")
+    self:RegisterMessage("UNIT_SPEC")
 end
 
 function Classicon:CreateFrame(unit)
     local classIcon = CreateFrame("Frame", nil, Gladdy.buttons[unit])
+    classIcon:EnableMouse(false)
     classIcon:SetFrameStrata("MEDIUM")
     classIcon:SetFrameLevel(1)
     classIcon.texture = classIcon:CreateTexture(nil, "BACKGROUND")
     classIcon.texture:SetAllPoints(classIcon)
+    classIcon.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
 
     classIcon.texture.overlay = classIcon:CreateTexture(nil, "BORDER")
     classIcon.texture.overlay:SetAllPoints(classIcon)
@@ -30,13 +103,6 @@ function Classicon:CreateFrame(unit)
     classIcon:SetFrameStrata("MEDIUM")
     classIcon:SetFrameLevel(2)
 
-    classIcon:ClearAllPoints()
-    if (Gladdy.db.classIconPos == "RIGHT") then
-        classIcon:SetPoint("TOPLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", 2, 2)
-    else
-        classIcon:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", -2, 2)
-    end
-
     Gladdy.buttons[unit].classIcon = classIcon
     self.frames[unit] = classIcon
 end
@@ -47,22 +113,52 @@ function Classicon:UpdateFrame(unit)
         return
     end
 
+    classIcon:SetFrameStrata(Gladdy.db.classIconFrameStrata)
+    classIcon:SetFrameLevel(Gladdy.db.classIconFrameLevel)
+
     classIcon:SetWidth(Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor)
     classIcon:SetHeight(Gladdy.db.classIconSize)
 
-    classIcon:ClearAllPoints()
-    local margin = Gladdy.db.highlightBorderSize + Gladdy.db.padding
-    if (Gladdy.db.classIconPos == "LEFT") then
-        classIcon:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", -margin, 0)
-    else
-        classIcon:SetPoint("TOPLEFT", Gladdy.buttons[unit], "TOPRIGHT", margin, 0)
+    Gladdy:SetPosition(classIcon, unit, "classIconXOffset", "classIconYOffset", Classicon:LegacySetPosition(classIcon, unit), Classicon)
+
+    if (unit == "arena1") then
+        Gladdy:CreateMover(classIcon, "classIconXOffset", "classIconYOffset", L["Class Icon"],
+                {"TOPLEFT", "TOPLEFT"},
+                Gladdy.db.classIconSize * Gladdy.db.classIconWidthFactor,
+                Gladdy.db.classIconSize,
+                0,
+                0, "classIconEnabled")
     end
 
     classIcon.texture:ClearAllPoints()
     classIcon.texture:SetAllPoints(classIcon)
 
     classIcon.texture.overlay:SetTexture(Gladdy.db.classIconBorderStyle)
-    classIcon.texture.overlay:SetVertexColor(Gladdy.db.classIconBorderColor.r, Gladdy.db.classIconBorderColor.g, Gladdy.db.classIconBorderColor.b, Gladdy.db.classIconBorderColor.a)
+    classIcon.texture.overlay:SetVertexColor(Gladdy:SetColor(Gladdy.db.classIconBorderColor))
+    if Gladdy.db.classIconEnabled then
+        classIcon:Show()
+    else
+        classIcon:Hide()
+    end
+end
+
+function Classicon:ENEMY_SPOTTED(unit)
+    local classIcon = self.frames[unit]
+    if (not classIcon) then
+        return
+    end
+
+    classIcon.texture:SetTexture(classIcons[Gladdy.buttons[unit].class])
+    --classIcon.texture:SetTexCoord(unpack(CLASS_BUTTONS[Gladdy.buttons[unit].class]))
+    classIcon.texture:SetAllPoints(classIcon)
+end
+
+function Classicon:UNIT_SPEC(unit, spec)
+    local classIcon = self.frames[unit]
+    if (not Gladdy.db.classIconSpecIcon or not classIcon) then
+        return
+    end
+    classIcon.texture:SetTexture(specIcons[Gladdy.buttons[unit].class][spec])
 end
 
 function Classicon:Test(unit)
@@ -85,24 +181,54 @@ function Classicon:GetOptions()
             name = L["Class Icon"],
             order = 2,
         },
+        classIconEnabled = Gladdy:option({
+            type = "toggle",
+            name = L["Class Icon Enabled"],
+            order = 3,
+        }),
+        classIconSpecIcon = {
+            type = "toggle",
+            name = L["Show Spec Icon"],
+            desc = L["Shows Spec Icon once spec is detected"],
+            order = 4,
+            get = function() return Gladdy.db.classIconSpecIcon end,
+            set = function(_, value)
+                Gladdy.db.classIconSpecIcon = value
+                if Gladdy.curBracket and Gladdy.curBracket > 0 then
+                    for i=1,Gladdy.curBracket do
+                        local unit = "arena" .. i
+                        if (Gladdy.buttons[unit] and Gladdy.buttons[unit].spec) then
+                            self:ENEMY_SPOTTED(unit)
+                            self:UNIT_SPEC(unit, Gladdy.buttons[unit].spec)
+                        end
+                    end
+                end
+            end
+        },
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
-            order = 3,
+            name = L["Frame"],
+            order = 4,
             args = {
                 size = {
                     type = "group",
                     name = L["Icon size"],
                     order = 1,
                     args = {
+                        header = {
+                            type = "header",
+                            name = L["Icon size"],
+                            order = 1,
+                        },
                         classIconSize = Gladdy:option({
                             type = "range",
                             name = L["Icon size"],
-                            min = 1,
+                            min = 3,
                             max = 100,
-                            step = 1,
+                            step = .1,
                             order = 3,
+                            width = "full",
                         }),
                         classIconWidthFactor = Gladdy:option({
                             type = "range",
@@ -111,35 +237,44 @@ function Classicon:GetOptions()
                             max = 2,
                             step = 0.05,
                             order = 4,
+                            width = "full",
                         }),
                     },
                 },
                 position = {
                     type = "group",
                     name = L["Position"],
-                    order = 1,
+                    order = 3,
                     args = {
                         headerPosition = {
                             type = "header",
                             name = L["Position"],
                             order = 5,
                         },
-                        classIconPos = Gladdy:option({
-                            type = "select",
-                            name = L["Icon position"],
-                            desc = L["This changes positions with trinket"],
-                            order = 6,
-                            values = {
-                                ["LEFT"] = L["Left"],
-                                ["RIGHT"] = L["Right"],
-                            },
+                        classIconXOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Horizontal offset"],
+                            order = 11,
+                            min = -800,
+                            max = 800,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                        classIconYOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Vertical offset"],
+                            order = 12,
+                            min = -800,
+                            max = 800,
+                            step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
                 border = {
                     type = "group",
                     name = L["Border"],
-                    order = 1,
+                    order = 2,
                     args = {
                         headerBorder = {
                             type = "header",
@@ -161,42 +296,55 @@ function Classicon:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 4,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        classIconFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        classIconFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
     }
 end
 
-local function getClassIcon(class)
-    -- see https://wow.gamepedia.com/Class_icon
-    local classIcon = "Interface\\Addons\\Gladdy\\Images\\Classes\\"
-    if class == "DRUID" then
-        return classIcon .. "inv_misc_monsterclaw_04"
-    elseif class == "HUNTER" then
-        return classIcon .. "inv_weapon_bow_07"
-    elseif class == "MAGE" then
-        return classIcon .. "inv_staff_13"
-    elseif class == "PALADIN" then
-        return classIcon .. "inv_hammer_01"
-    elseif class == "PRIEST" then
-        return classIcon .. "inv_staff_30"
-    elseif class == "ROGUE" then
-        return classIcon .. "inv_throwingknife_04"
-    elseif class == "SHAMAN" then
-        return classIcon .. "inv_jewelry_talisman_04"
-    elseif class == "WARLOCK" then
-        return classIcon .. "spell_nature_drowsy"
-    elseif class == "WARRIOR" then
-        return classIcon .. "inv_sword_27"
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Classicon:LegacySetPosition(classIcon, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    classIcon:ClearAllPoints()
+    local margin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) + Gladdy.db.padding
+    if (Gladdy.db.classIconPos == "LEFT") then
+        classIcon:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", -margin, 0)
+    else
+        classIcon:SetPoint("TOPLEFT", Gladdy.buttons[unit], "TOPRIGHT", margin, 0)
     end
 end
-
-function Classicon:ENEMY_SPOTTED(unit)
-    local classIcon = self.frames[unit]
-    if (not classIcon) then
-        return
-    end
-
-    classIcon.texture:SetTexture(getClassIcon(Gladdy.buttons[unit].class))
-    --classIcon.texture:SetTexCoord(unpack(CLASS_BUTTONS[Gladdy.buttons[unit].class]))
-    classIcon.texture:SetAllPoints(classIcon)
-end

Modules/Clicks.lua

@@ -0,0 +1,217 @@
+local tinsert = table.insert
+local pairs = pairs
+local tonumber = tonumber
+local tostring = tostring
+
+local GetBindingKey = GetBindingKey
+local ClearOverrideBindings = ClearOverrideBindings
+local SetOverrideBindingClick = SetOverrideBindingClick
+local MACRO, TARGET, FOCUS, ADDON_DISABLED = MACRO, TARGET, FOCUS, ADDON_DISABLED
+
+local Gladdy = LibStub("Gladdy")
+local L = Gladdy.L
+
+local attributes = {
+    { name = L["Target"], button = "1", modifier = "", action = "target", spell = "" },
+    { name = L["Focus"], button = "2", modifier = "", action = "focus", spell = "" },
+}
+for i = 3, 10 do
+    tinsert(attributes, { name = L["Action #%d"]:format(i), button = "", modifier = "", action = "disabled", spell = "" })
+end
+local Clicks = Gladdy:NewModule("Clicks", nil, {
+    attributes = attributes,
+})
+
+BINDING_HEADER_GLADDY = "Gladdy"
+BINDING_NAME_GLADDYBUTTON1_LEFT = L["Left Click Enemy 1"]
+BINDING_NAME_GLADDYBUTTON2_LEFT = L["Left Click Enemy 2"]
+BINDING_NAME_GLADDYBUTTON3_LEFT = L["Left Click Enemy 3"]
+BINDING_NAME_GLADDYBUTTON4_LEFT = L["Left Click Enemy 4"]
+BINDING_NAME_GLADDYBUTTON5_LEFT = L["Left Click Enemy 5"]
+
+BINDING_NAME_GLADDYBUTTON1_RIGHT = L["Right Click Enemy 1"]
+BINDING_NAME_GLADDYBUTTON2_RIGHT = L["Right Click Enemy 2"]
+BINDING_NAME_GLADDYBUTTON3_RIGHT = L["Right Click Enemy 3"]
+BINDING_NAME_GLADDYBUTTON4_RIGHT = L["Right Click Enemy 4"]
+BINDING_NAME_GLADDYBUTTON5_RIGHT = L["Right Click Enemy 5"]
+
+BINDING_NAME_GLADDYBUTTON1_MIDDLE = L["Middle Click Enemy 1"]
+BINDING_NAME_GLADDYBUTTON2_MIDDLE = L["Middle Click Enemy 2"]
+BINDING_NAME_GLADDYBUTTON3_MIDDLE = L["Middle Click Enemy 3"]
+BINDING_NAME_GLADDYBUTTON4_MIDDLE = L["Middle Click Enemy 4"]
+BINDING_NAME_GLADDYBUTTON5_MIDDLE = L["Middle Click Enemy 5"]
+
+BINDING_NAME_GLADDYBUTTON1_BUTTON4 = L["Button4 Click Enemy 1"]
+BINDING_NAME_GLADDYBUTTON2_BUTTON4 = L["Button4 Click Enemy 2"]
+BINDING_NAME_GLADDYBUTTON3_BUTTON4 = L["Button4 Click Enemy 3"]
+BINDING_NAME_GLADDYBUTTON4_BUTTON4 = L["Button4 Click Enemy 4"]
+BINDING_NAME_GLADDYBUTTON5_BUTTON4 = L["Button4 Click Enemy 5"]
+
+BINDING_NAME_GLADDYBUTTON1_BUTTON5 = L["Button5 Click Enemy 1"]
+BINDING_NAME_GLADDYBUTTON2_BUTTON5 = L["Button5 Click Enemy 2"]
+BINDING_NAME_GLADDYBUTTON3_BUTTON5 = L["Button5 Click Enemy 3"]
+BINDING_NAME_GLADDYBUTTON4_BUTTON5 = L["Button5 Click Enemy 4"]
+BINDING_NAME_GLADDYBUTTON5_BUTTON5 = L["Button5 Click Enemy 5"]
+
+function Clicks:Initialize()
+    --
+end
+
+function Clicks:Reset()
+    --
+end
+
+function Clicks:ResetUnit(unit)
+    --
+end
+
+function Clicks:UpdateFrame(unit)
+    self:SetupAttributes(unit)
+end
+
+function Clicks:UpdateFrameOnce()
+    for _, v in pairs(Gladdy.buttons) do
+        local left = GetBindingKey(("GLADDYBUTTON%d_LEFT"):format(v.id))
+        local right = GetBindingKey(("GLADDYBUTTON%d_RIGHT"):format(v.id))
+        local middle = GetBindingKey(("GLADDYBUTTON%d_MIDDLE"):format(v.id))
+        local button4 = GetBindingKey(("GLADDYBUTTON%d_BUTTON4"):format(v.id))
+        local button5 = GetBindingKey(("GLADDYBUTTON%d_BUTTON5"):format(v.id))
+
+        ClearOverrideBindings(v.secure)
+
+        if (left) then
+            SetOverrideBindingClick(v.secure, false, left, v.secure:GetName(), "LeftButton")
+        end
+
+        if (right) then
+            SetOverrideBindingClick(v.secure, false, right, v.secure:GetName(), "RightButton")
+        end
+
+        if (middle) then
+            SetOverrideBindingClick(v.secure, false, middle, v.secure:GetName(), "MiddleButton")
+        end
+
+        if (button4) then
+            SetOverrideBindingClick(v.secure, false, button4, v.secure:GetName(), "Button4")
+        end
+
+        if (button5) then
+            SetOverrideBindingClick(v.secure, false, button5, v.secure:GetName(), "Button5")
+        end
+    end
+end
+
+function Clicks:SetupAttributes(unit)
+    local button = Gladdy.buttons[unit]
+    if (not button) then
+        return
+    end
+
+    for _, v in pairs(Gladdy.db.attributes) do
+        self:SetupAttribute(button, v.button, v.modifier, v.action, v.spell)
+    end
+end
+
+function Clicks:SetupAttribute(button, key, mod, action, spell)
+    local attr = ""
+    local text = ""
+
+    if (action == "macro") then
+        attr = mod .. "macrotext" .. key
+        text = spell:gsub("%*arena%*", button.unit)
+        button.secure:SetAttribute(mod .. "type" .. key, "macro")
+    elseif (action ~= "disabled") then
+        if (action == "target") then
+            attr = mod .. "type" .. key
+            text = "target"
+        elseif (action == "focus") then
+            attr = mod .. "type" .. key
+            text = "focus"
+        elseif (action == "spell") then
+            attr = mod .. "type" .. key
+            text = "spell"
+            button.secure:SetAttribute(mod .. "spell" .. key, spell)
+        end
+    end
+
+    button.secure:SetAttribute(attr, text)
+end
+
+local buttons = { ["1"] = L["Left button"], ["2"] = L["Right button"], ["3"] = L["Middle button"], ["4"] = L["Button 4"], ["5"] = L["Button 5"] }
+local modifiers = { [""] = L["None"], ["*"] = L["All"], ["ctrl-"] = L["CTRL"], ["shift-"] = L["SHIFT"], ["alt-"] = L["ALT"] }
+local clickValues = { ["macro"] = MACRO, ["target"] = TARGET, ["focus"] = FOCUS, ["spell"] = L["Cast Spell"], ["disabled"] = ADDON_DISABLED }
+
+local function SetupAttributeOption(i)
+    return {
+        type = "group",
+        name = Gladdy.dbi.profile.attributes[i].name,
+        desc = Gladdy.dbi.profile.attributes[i].name,
+        order = i + 1,
+        get = function(info)
+            return Gladdy.dbi.profile.attributes[tonumber(info[#info - 1])][info[#info]]
+        end,
+        set = function(info, value)
+            Gladdy.dbi.profile.attributes[tonumber(info[#info - 1])][info[#info]] = value
+
+            if (info[#info] == "name") then
+                Gladdy.options.args.Clicks.args[info[#info - 1]].name = value
+            end
+
+            Gladdy:UpdateFrame()
+        end,
+        args = {
+            name = {
+                type = "input",
+                name = L["Name"],
+                desc = L["Select the name of the click option"],
+                order = 1,
+            },
+            button = {
+                type = "select",
+                name = L["Button"],
+                desc = L["Select which mouse button to use"],
+                order = 2,
+                values = buttons,
+            },
+            modifier = {
+                type = "select",
+                name = L["Modifier"],
+                desc = L["Select which modifier to use"],
+                order = 3,
+                values = modifiers,
+            },
+            action = {
+                type = "select",
+                name = L["Action"],
+                desc = L["Select what action this mouse button does"],
+                order = 4,
+                values = clickValues,
+            },
+            spell = {
+                type = "input",
+                name = L["Cast Spell / Macro"],
+                desc = L["\n|cff1ac742Cast Spell:|r\n" ..
+                        "Type in the spell name.\n" ..
+                        "For example:\n" ..
+                        "|cff17d1c8Polymorph|r\n" ..
+                        "\n" ..
+                        "|cff1ac742Macro:|r\n" ..
+                        "Use *arena* as placeholder.\n" ..
+                        "For example:\n" ..
+                        "|cff17d1c8/cast [@*arena*] Blind\n" ..
+                        "/run SendChatMessage(\"Blinding \" .. UnitName(\"*arena*\"), \"PARTY\")|r"],
+                order = 5,
+                width = "full",
+                multiline = 10,
+            },
+        },
+    }
+end
+
+function Clicks:GetOptions()
+    local options = {}
+    for i = 1, 10 do
+        options[tostring(i)] = SetupAttributeOption(i)
+    end
+    return options
+end

Modules/CombatIndicator.lua

@@ -0,0 +1,283 @@
+local select = select
+local UnitExists, UnitAffectingCombat, GetSpellInfo = UnitExists, UnitAffectingCombat, GetSpellInfo
+local CreateFrame = CreateFrame
+
+local Gladdy = LibStub("Gladdy")
+local L = Gladdy.L
+
+local CombatIndicator = Gladdy:NewModule("Combat Indicator", nil, {
+    ciEnabled = true,
+    ciSize = 20,
+    ciAlpha = 1,
+    ciWidthFactor = 1,
+    ciXOffset = 0,
+    ciYOffset = -31,
+    ciBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
+    ciBorderColor = { r = 0, g = 0, b = 0, a = 1 },
+    ciFrameStrata = "HIGH",
+    ciFrameLevel = 5,
+})
+
+function CombatIndicator:Initialize()
+    self.frames = {}
+    self:RegisterMessage("JOINED_ARENA")
+    self.updateInterval = 0.05
+    self.combatIndicatorIcon = select(3, GetSpellInfo(674))
+end
+
+function CombatIndicator:JOINED_ARENA()
+    self:SetScript("OnUpdate", CombatIndicator.OnEvent)
+    self.lastTimeUpdated = 0
+end
+
+function CombatIndicator:CreateFrame(unit)
+    local button = Gladdy.buttons[unit]
+    if not button then
+        return
+    end
+    local ciFrame = CreateFrame("Frame", "GladdyCombatindicator" .. unit, button)
+    ciFrame:EnableMouse(false)
+    ciFrame:SetMovable(true)
+    ciFrame:SetFrameStrata(Gladdy.db.ciFrameStrata)
+    ciFrame:SetFrameLevel(Gladdy.db.ciFrameLevel)
+    ciFrame:SetHeight(Gladdy.db.ciSize)
+    ciFrame:SetWidth(Gladdy.db.ciSize * Gladdy.db.ciWidthFactor)
+
+    ciFrame.texture = ciFrame:CreateTexture(nil, "OVERLAY")
+    ciFrame.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
+    ciFrame.texture:SetTexture(self.combatIndicatorIcon)
+    ciFrame.texture:SetAllPoints(ciFrame)
+
+    ciFrame.border = ciFrame:CreateTexture(nil, "OVERLAY")
+    ciFrame.border:SetAllPoints(ciFrame)
+    ciFrame.border:SetTexture(Gladdy.db.ciBorderStyle)
+    ciFrame.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.ciBorderColor))
+
+    self.frames[unit] = ciFrame
+    button.ciFrame = ciFrame
+end
+
+function CombatIndicator:UpdateFrame(unit)
+    local button = Gladdy.buttons[unit]
+    local ciFrame = self.frames[unit]
+    if (not button or not ciFrame) then
+        return
+    end
+
+    ciFrame:SetFrameStrata(Gladdy.db.ciFrameStrata)
+    ciFrame:SetFrameLevel(Gladdy.db.ciFrameLevel)
+
+    ciFrame:SetHeight(Gladdy.db.ciSize)
+    ciFrame:SetWidth(Gladdy.db.ciSize * Gladdy.db.ciWidthFactor)
+    ciFrame.border:SetTexture(Gladdy.db.ciBorderStyle)
+    ciFrame.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.ciBorderColor))
+
+    Gladdy:SetPosition(ciFrame, unit, "ciXOffset", "ciYOffset", CombatIndicator:LegacySetPosition(ciFrame, unit), CombatIndicator)
+
+    ciFrame:SetAlpha(Gladdy.db.ciAlpha)
+
+    if (Gladdy.db.ciEnabled == false) then
+        ciFrame:Hide()
+    else
+        ciFrame:Show()
+    end
+    if (unit == "arena1") then
+        Gladdy:CreateMover(ciFrame, "ciXOffset", "ciYOffset", L["Combat Indicator"],
+                {"TOPLEFT", "TOPLEFT"},
+                Gladdy.db.ciSize * Gladdy.db.ciWidthFactor, Gladdy.db.ciSize,
+                0, 0, "ciEnabled")
+    end
+end
+
+function CombatIndicator:Test()
+    self.test = true
+    self:JOINED_ARENA()
+end
+
+function CombatIndicator:Reset()
+    self:SetScript("OnUpdate", nil)
+    self.test = false
+end
+
+function CombatIndicator.OnEvent(self, elapsed)
+    self.lastTimeUpdated = self.lastTimeUpdated + elapsed
+
+    if (self.lastTimeUpdated > self.updateInterval) then
+        for i=1,Gladdy.curBracket do
+            local unit = "arena" .. i
+            if Gladdy.db.ciEnabled and (CombatIndicator.test or (UnitExists(unit) and UnitAffectingCombat(unit))) then
+                CombatIndicator.frames[unit]:Show()
+            else
+                CombatIndicator.frames[unit]:Hide()
+            end
+        end
+        self.lastTimeUpdated = 0
+    end
+end
+
+function CombatIndicator:GetOptions()
+    return {
+        header = {
+            type = "header",
+            name = L["Combat Indicator"],
+            order = 2,
+        },
+        ciEnabled = Gladdy:option({
+            type = "toggle",
+            name = L["Enabled"],
+            desc = L["Enable Combat Indicator icon"],
+            order = 3,
+        }),
+        group = {
+            type = "group",
+            childGroups = "tree",
+            name = L["Frame"],
+            order = 4,
+            args = {
+                general = {
+                    type = "group",
+                    name = L["Frame"],
+                    order = 1,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Frame"],
+                            order = 1,
+                        },
+                        ciSize = Gladdy:option({
+                            type = "range",
+                            name = L["Icon size"],
+                            min = 5,
+                            max = 100,
+                            step = 1,
+                            order = 2,
+                            width = "full",
+                        }),
+                        ciWidthFactor = Gladdy:option({
+                            type = "range",
+                            name = L["Icon width factor"],
+                            min = 0.5,
+                            max = 2,
+                            step = 0.05,
+                            order = 3,
+                            width = "full",
+                        }),
+                        ciAlpha = Gladdy:option({
+                            type = "range",
+                            name = L["Alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.05,
+                            order = 4,
+                            width = "full",
+                        }),
+                    },
+                },
+                position = {
+                    type = "group",
+                    name = L["Position"],
+                    order = 3,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Position"],
+                            order = 4,
+                        },
+                        ciXOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Horizontal offset"],
+                            order = 23,
+                            min = -400,
+                            max = 400,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                        ciYOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Vertical offset"],
+                            order = 24,
+                            min = -400,
+                            max = 400,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                    },
+                },
+                border = {
+                    type = "group",
+                    name = L["Border"],
+                    order = 2,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Border"],
+                            order = 4,
+                        },
+                        ciBorderStyle = Gladdy:option({
+                            type = "select",
+                            name = L["Border style"],
+                            order = 31,
+                            values = Gladdy:GetIconStyles()
+                        }),
+                        ciBorderColor = Gladdy:colorOption({
+                            type = "color",
+                            name = L["Border color"],
+                            desc = L["Color of the border"],
+                            order = 32,
+                            hasAlpha = true,
+                        }),
+                    },
+                },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 5,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        ciFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        ciFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
+            },
+        },
+    }
+end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function CombatIndicator:LegacySetPosition(ciFrame, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    -- LEGACY options
+    local ANCHORS = { ["LEFT"] = "RIGHT", ["RIGHT"] = "LEFT", ["BOTTOM"] = "TOP", ["TOP"] = "BOTTOM"}
+    local ciAnchor = Gladdy.db.ciAnchor or Gladdy.legacy.ciAnchor
+    local ciPos = Gladdy.db.ciPos
+
+    ciFrame:ClearAllPoints()
+    ciFrame:SetPoint(ANCHORS[ciPos], Gladdy.buttons[unit][ciAnchor], ciPos, Gladdy.db.ciXOffset, Gladdy.db.ciYOffset)
+    return Gladdy.db.newLayout
+end

Modules/Cooldowns.lua

@@ -1,4 +1,4 @@
-local type, pairs, ceil, tonumber, mod, tostring, upper, select = type, pairs, ceil, tonumber, mod, tostring, string.upper, select
+local type, pairs, ipairs, ceil, tonumber, mod, tostring, upper, select = type, pairs, ipairs, ceil, tonumber, mod, tostring, string.upper, select
 local GetTime = GetTime
 local CreateFrame = CreateFrame
 local RACE_ICON_TCOORDS = {
@@ -36,13 +36,13 @@ local L = Gladdy.L
 
 local function getDefaultCooldown()
     local cooldowns = {}
-    for class, t in pairs(Gladdy:GetCooldownList()) do
-        for spellId, v in pairs(t) do
-            local spellName, _, texture = GetSpellInfo(spellId)
+    for _,spellTable in pairs(Gladdy:GetCooldownList()) do
+        for spellId,_ in pairs(spellTable) do
+            local spellName = GetSpellInfo(spellId)
             if spellName then
                 cooldowns[tostring(spellId)] = true
             else
-                Gladdy:Print("spellid does not exist  " .. spellId)
+                Gladdy:Debug("ERROR", "spellid does not exist  " .. spellId)
             end
         end
     end
@@ -54,8 +54,8 @@ local Cooldowns = Gladdy:NewModule("Cooldowns", nil, {
     cooldownFontScale = 1,
     cooldownFontColor = { r = 1, g = 1, b = 0, a = 1 },
     cooldown = true,
-    cooldownYPos = "TOP",
-    cooldownXPos = "LEFT",
+    cooldownYGrowDirection = "UP",
+    cooldownXGrowDirection = "RIGHT",
     cooldownYOffset = 0,
     cooldownXOffset = 0,
     cooldownSize = 30,
@@ -66,20 +66,22 @@ local Cooldowns = Gladdy:NewModule("Cooldowns", nil, {
     cooldownBorderColor = { r = 1, g = 1, b = 1, a = 1 },
     cooldownDisableCircle = false,
     cooldownCooldownAlpha = 1,
-    cooldownCooldowns = getDefaultCooldown()
+    cooldownCooldowns = getDefaultCooldown(),
+    cooldownFrameStrata = "MEDIUM",
+    cooldownFrameLevel = 3,
 })
 
 function Cooldowns:Initialize()
     self.cooldownSpellIds = {}
     self.spellTextures = {}
-    for class, t in pairs(Gladdy:GetCooldownList()) do
-        for k, v in pairs(t) do
-            local spellName, _, texture = GetSpellInfo(k)
+    for _,spellTable in pairs(Gladdy:GetCooldownList()) do
+        for spellId,_ in pairs(spellTable) do
+            local spellName, _, texture = GetSpellInfo(spellId)
             if spellName then
-                self.cooldownSpellIds[spellName] = k
-                self.spellTextures[k] = texture
+                self.cooldownSpellIds[spellName] = spellId
+                self.spellTextures[spellId] = texture
             else
-                Gladdy:Print("spellid does not exist  " .. k)
+                Gladdy:Debug("ERROR", "spellid does not exist  " .. spellId)
             end
         end
     end
@@ -93,33 +95,41 @@ function Cooldowns:CreateFrame(unit)
     local button = Gladdy.buttons[unit]
     -- Cooldown frame
     local spellCooldownFrame = CreateFrame("Frame", nil, button)
+    spellCooldownFrame:EnableMouse(false)
+    spellCooldownFrame:SetMovable(true)
+    spellCooldownFrame:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+    spellCooldownFrame:SetFrameLevel(Gladdy.db.cooldownFrameLevel)
     for x = 1, 14 do
         local icon = CreateFrame("Frame", nil, spellCooldownFrame)
         icon:EnableMouse(false)
-        icon:SetFrameLevel(3)
+        icon:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+        icon:SetFrameLevel(Gladdy.db.cooldownFrameLevel)
         icon.texture = icon:CreateTexture(nil, "BACKGROUND")
+        icon.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
         icon.texture:SetAllPoints(icon)
 
         icon.cooldown = CreateFrame("Cooldown", nil, icon, "CooldownFrameTemplate")
         icon.cooldown.noCooldownCount = true
 
-        icon.cooldown:SetFrameLevel(4)
+        icon.cooldown:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+        icon.cooldown:SetFrameLevel(Gladdy.db.cooldownFrameLevel + 1)
         icon.cooldown:SetReverse(false)
         icon.cooldown:SetHideCountdownNumbers(true)
 
         icon.cooldownFrame = CreateFrame("Frame", nil, icon)
         icon.cooldownFrame:ClearAllPoints()
         icon.cooldownFrame:SetAllPoints(icon)
-        icon.cooldownFrame:SetFrameLevel(5)
+        icon.cooldownFrame:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+        icon.cooldownFrame:SetFrameLevel(Gladdy.db.cooldownFrameLevel + 2)
 
         icon.border = icon.cooldownFrame:CreateTexture(nil, "OVERLAY")
         icon.border:SetAllPoints(icon)
         icon.border:SetTexture(Gladdy.db.cooldownBorderStyle)
-        icon.border:SetVertexColor(Gladdy.db.cooldownBorderColor.r, Gladdy.db.cooldownBorderColor.g, Gladdy.db.cooldownBorderColor.b, Gladdy.db.cooldownBorderColor.a)
+        icon.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.cooldownBorderColor))
 
         icon.cooldownFont = icon.cooldownFrame:CreateFontString(nil, "OVERLAY")
-        icon.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), Gladdy.db.cooldownSize / 2  * Gladdy.db.cooldownFontScale, "OUTLINE")
-        icon.cooldownFont:SetTextColor(Gladdy.db.cooldownFontColor.r, Gladdy.db.cooldownFontColor.g, Gladdy.db.cooldownFontColor.b, Gladdy.db.cooldownFontColor.a)
+        icon.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), Gladdy.db.cooldownSize / 2  * Gladdy.db.cooldownFontScale, "OUTLINE")
+        icon.cooldownFont:SetTextColor(Gladdy:SetColor(Gladdy.db.cooldownFontColor))
         icon.cooldownFont:SetAllPoints(icon)
 
         spellCooldownFrame["icon" .. x] = icon
@@ -131,52 +141,41 @@ function Cooldowns:UpdateFrame(unit)
     local button = Gladdy.buttons[unit]
     -- Cooldown frame
     if (Gladdy.db.cooldown) then
-        button.spellCooldownFrame:ClearAllPoints()
-        local verticalMargin = -(Gladdy.db.powerBarHeight)/2
-        if Gladdy.db.cooldownYPos == "TOP" then
-            if Gladdy.db.cooldownXPos == "RIGHT" then
-                button.spellCooldownFrame:SetPoint("BOTTOMRIGHT", button.healthBar, "TOPRIGHT", Gladdy.db.cooldownXOffset, Gladdy.db.highlightBorderSize + Gladdy.db.cooldownYOffset) -- needs to be properly anchored after trinket
-            else
-                button.spellCooldownFrame:SetPoint("BOTTOMLEFT", button.healthBar, "TOPLEFT", Gladdy.db.cooldownXOffset, Gladdy.db.highlightBorderSize + Gladdy.db.cooldownYOffset)
-            end
-        elseif Gladdy.db.cooldownYPos == "BOTTOM" then
-            if Gladdy.db.cooldownXPos == "RIGHT" then
-                button.spellCooldownFrame:SetPoint("TOPRIGHT", button.powerBar, "BOTTOMRIGHT", Gladdy.db.cooldownXOffset, -Gladdy.db.highlightBorderSize + Gladdy.db.cooldownYOffset) -- needs to be properly anchored after trinket
-            else
-                button.spellCooldownFrame:SetPoint("TOPLEFT", button.powerBar, "BOTTOMLEFT", Gladdy.db.cooldownXOffset, -Gladdy.db.highlightBorderSize + Gladdy.db.cooldownYOffset)
-            end
-        elseif Gladdy.db.cooldownYPos == "LEFT" then
-            local anchor = Gladdy:GetAnchor(unit, "LEFT")
-            if anchor == Gladdy.buttons[unit].healthBar then
-                button.spellCooldownFrame:SetPoint("RIGHT", anchor, "LEFT", -(Gladdy.db.highlightBorderSize + Gladdy.db.padding) + Gladdy.db.cooldownXOffset, Gladdy.db.cooldownYOffset)
-            else
-                button.spellCooldownFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.cooldownXOffset, Gladdy.db.cooldownYOffset)
-            end
-        elseif Gladdy.db.cooldownYPos == "RIGHT" then
-            local anchor = Gladdy:GetAnchor(unit, "RIGHT")
-            if anchor == Gladdy.buttons[unit].healthBar then
-                button.spellCooldownFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.highlightBorderSize + Gladdy.db.padding + Gladdy.db.cooldownXOffset, Gladdy.db.cooldownYOffset)
-            else
-                button.spellCooldownFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.cooldownXOffset, Gladdy.db.cooldownYOffset)
-            end
-        end
         button.spellCooldownFrame:SetHeight(Gladdy.db.cooldownSize)
         button.spellCooldownFrame:SetWidth(1)
+        button.spellCooldownFrame:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+        button.spellCooldownFrame:SetFrameLevel(Gladdy.db.cooldownFrameLevel)
         button.spellCooldownFrame:Show()
+
+        Gladdy:SetPosition(button.spellCooldownFrame, unit, "cooldownXOffset", "cooldownYOffset", Cooldowns:LegacySetPosition(button, unit), Cooldowns)
+
+        if (unit == "arena1") then
+            Gladdy:CreateMover(button.spellCooldownFrame,"cooldownXOffset", "cooldownYOffset", L["Cooldown"],
+                    {"TOPLEFT", "TOPLEFT"},
+                    Gladdy.db.cooldownSize * Gladdy.db.cooldownWidthFactor, Gladdy.db.cooldownSize, 0, 0, "cooldown")
+        end
         -- Update each cooldown icon
         local o = 1
         for j = 1, 14 do
             local icon = button.spellCooldownFrame["icon" .. j]
+
+            icon:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+            icon:SetFrameLevel(Gladdy.db.cooldownFrameLevel)
+            icon.cooldown:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+            icon.cooldown:SetFrameLevel(Gladdy.db.cooldownFrameLevel + 1)
+            icon.cooldownFrame:SetFrameStrata(Gladdy.db.cooldownFrameStrata)
+            icon.cooldownFrame:SetFrameLevel(Gladdy.db.cooldownFrameLevel + 2)
+
             icon:SetHeight(Gladdy.db.cooldownSize)
             icon:SetWidth(Gladdy.db.cooldownSize * Gladdy.db.cooldownWidthFactor)
-            icon.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), Gladdy.db.cooldownSize / 2 * Gladdy.db.cooldownFontScale, "OUTLINE")
-            icon.cooldownFont:SetTextColor(Gladdy.db.cooldownFontColor.r, Gladdy.db.cooldownFontColor.g, Gladdy.db.cooldownFontColor.b, Gladdy.db.cooldownFontColor.a)
+            icon.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), Gladdy.db.cooldownSize / 2 * Gladdy.db.cooldownFontScale, "OUTLINE")
+            icon.cooldownFont:SetTextColor(Gladdy:SetColor(Gladdy.db.cooldownFontColor))
             icon:ClearAllPoints()
-            if (Gladdy.db.cooldownXPos == "RIGHT") then
+            if (Gladdy.db.cooldownXGrowDirection == "LEFT") then
                 if (j == 1) then
-                    icon:SetPoint("RIGHT", button.spellCooldownFrame, "RIGHT", 0, 0)
+                    icon:SetPoint("LEFT", button.spellCooldownFrame, "LEFT", 0, 0)
                 elseif (mod(j-1,Gladdy.db.cooldownMaxIconsPerLine) == 0) then
-                    if (Gladdy.db.cooldownYPos == "BOTTOM" or Gladdy.db.cooldownYPos == "LEFT" or Gladdy.db.cooldownYPos == "RIGHT") then
+                    if (Gladdy.db.cooldownYGrowDirection == "DOWN") then
                         icon:SetPoint("TOP", button.spellCooldownFrame["icon" .. o], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
                     else
                         icon:SetPoint("BOTTOM", button.spellCooldownFrame["icon" .. o], "TOP", 0, Gladdy.db.cooldownIconPadding)
@@ -186,11 +185,11 @@ function Cooldowns:UpdateFrame(unit)
                     icon:SetPoint("RIGHT", button.spellCooldownFrame["icon" .. j - 1], "LEFT", -Gladdy.db.cooldownIconPadding, 0)
                 end
             end
-            if (Gladdy.db.cooldownXPos == "LEFT") then
+            if (Gladdy.db.cooldownXGrowDirection == "RIGHT") then
                 if (j == 1) then
                     icon:SetPoint("LEFT", button.spellCooldownFrame, "LEFT", 0, 0)
                 elseif (mod(j-1,Gladdy.db.cooldownMaxIconsPerLine) == 0) then
-                    if (Gladdy.db.cooldownYPos == "BOTTOM" or Gladdy.db.cooldownYPos == "LEFT" or Gladdy.db.cooldownYPos == "RIGHT") then
+                    if (Gladdy.db.cooldownYGrowDirection == "DOWN") then
                         icon:SetPoint("TOP", button.spellCooldownFrame["icon" .. o], "BOTTOM", 0, -Gladdy.db.cooldownIconPadding)
                     else
                         icon:SetPoint("BOTTOM", button.spellCooldownFrame["icon" .. o], "TOP", 0, Gladdy.db.cooldownIconPadding)
@@ -217,11 +216,11 @@ function Cooldowns:UpdateFrame(unit)
             icon.cooldown:SetPoint("CENTER", icon, "CENTER")
             icon.cooldown:SetAlpha(Gladdy.db.cooldownCooldownAlpha)
 
-            icon.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), (icon:GetWidth()/2 - 1) * Gladdy.db.cooldownFontScale, "OUTLINE")
-            icon.cooldownFont:SetTextColor(Gladdy.db.cooldownFontColor.r, Gladdy.db.cooldownFontColor.g, Gladdy.db.cooldownFontColor.b, Gladdy.db.cooldownFontColor.a)
+            icon.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), (icon:GetWidth()/2 - 1) * Gladdy.db.cooldownFontScale, "OUTLINE")
+            icon.cooldownFont:SetTextColor(Gladdy:SetColor(Gladdy.db.cooldownFontColor))
 
             icon.border:SetTexture(Gladdy.db.cooldownBorderStyle)
-            icon.border:SetVertexColor(Gladdy.db.cooldownBorderColor.r, Gladdy.db.cooldownBorderColor.g, Gladdy.db.cooldownBorderColor.b, Gladdy.db.cooldownBorderColor.a)
+            icon.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.cooldownBorderColor))
             icon:Hide()
         end
         button.spellCooldownFrame:Show()
@@ -235,9 +234,16 @@ end
 
 function Cooldowns:Test(unit)
     local button = Gladdy.buttons[unit]
-    button.spellCooldownFrame:Show()
-    button.lastCooldownSpell = 1
-    self:UpdateTestCooldowns(unit)
+    if Gladdy.db.cooldown then
+        button.spellCooldownFrame:Show()
+        button.lastCooldownSpell = 1
+        self:UpdateTestCooldowns(unit)
+    else
+        button.spellCooldownFrame:Hide()
+        button.lastCooldownSpell = 1
+        self:UpdateTestCooldowns(unit)
+    end
+
 end
 
 function Cooldowns:UpdateTestCooldowns(unit)
@@ -251,13 +257,12 @@ function Cooldowns:UpdateTestCooldowns(unit)
         button.test = true
 
         -- use class spells
-        for k, v in pairs(Gladdy:GetCooldownList()[button.class]) do
-            --k is spellId
-            self:CooldownUsed(unit, button.class, k, nil)
+        for spellId,_ in pairs(Gladdy:GetCooldownList()[button.class]) do
+            self:CooldownUsed(unit, button.class, spellId)
         end
         -- use race spells
-        for k, v in pairs(Gladdy:GetCooldownList()[button.race]) do
-            self:CooldownUsed(unit, button.race, k, nil)
+        for spellId,_ in pairs(Gladdy:GetCooldownList()[button.race]) do
+            self:CooldownUsed(unit, button.race, spellId)
         end
     end
 end
@@ -270,7 +275,7 @@ function Cooldowns:SPEC_DETECTED(unit, spec)
     self:DetectSpec(unit, spec)
 end
 
-function Cooldowns:CooldownStart(button, spellId, duration)
+function Cooldowns:CooldownStart(button, spellId, duration, start)
     -- starts timer frame
     if not duration or duration == nil or type(duration) ~= "number" then
         return
@@ -279,25 +284,19 @@ function Cooldowns:CooldownStart(button, spellId, duration)
         if (button.spellCooldownFrame["icon" .. i].spellId == spellId) then
             local frame = button.spellCooldownFrame["icon" .. i]
             frame.active = true
-            frame.timeLeft = duration
-            if (not Gladdy.db.cooldownDisableCircle) then frame.cooldown:SetCooldown(GetTime(), duration) end
+            frame.timeLeft = start and start - GetTime() + duration or duration
+            if (not Gladdy.db.cooldownDisableCircle) then frame.cooldown:SetCooldown(start or GetTime(), duration) end
             frame:SetScript("OnUpdate", function(self, elapsed)
                 self.timeLeft = self.timeLeft - elapsed
                 local timeLeft = ceil(self.timeLeft)
                 if timeLeft >= 540 then
-                    self.cooldownFont:SetText(ceil(timeLeft / 60) .. "m")
-                    self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), Gladdy.db.cooldownSize / 3.1 * Gladdy.db.cooldownFontScale, "OUTLINE")
+                    self.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), Gladdy.db.cooldownSize / 3.1 * Gladdy.db.cooldownFontScale, "OUTLINE")
                 elseif timeLeft < 540 and timeLeft >= 60 then
-                    -- more than 1 minute
-                    self.cooldownFont:SetText(ceil(timeLeft / 60) .. "m")
-                    self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), Gladdy.db.cooldownSize / 2.15 * Gladdy.db.cooldownFontScale, "OUTLINE")
+                    self.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), Gladdy.db.cooldownSize / 2.15 * Gladdy.db.cooldownFontScale, "OUTLINE")
                 elseif timeLeft < 60 and timeLeft > 0 then
-                    -- between 60s and 21s (green)
-                    self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.cooldownFont), Gladdy.db.cooldownSize / 2.15 * Gladdy.db.cooldownFontScale, "OUTLINE")
-                    self.cooldownFont:SetText(timeLeft)
-                else
-                    self.cooldownFont:SetText("")
+                    self.cooldownFont:SetFont(Gladdy:SMFetch("font", "cooldownFont"), Gladdy.db.cooldownSize / 2.15 * Gladdy.db.cooldownFontScale, "OUTLINE")
                 end
+                Gladdy:FormatTimer(self.cooldownFont, self.timeLeft, self.timeLeft < 0)
                 if (self.timeLeft <= 0) then
                     Cooldowns:CooldownReady(button, spellId, frame)
                 end
@@ -329,12 +328,26 @@ function Cooldowns:CooldownReady(button, spellId, frame)
     end
 end
 
+local function notIn(spec, list)
+    for _,v in ipairs(list) do
+        if spec == v then
+            return false
+        end
+    end
+    return true
+end
+
 function Cooldowns:DetectSpec(unit, spec)
 
     local button = Gladdy.buttons[unit]
     if (not button or not spec or button.spec) then
         return
     end
+    if button.class == "PALADIN" and notIn(spec, {L["Holy"], L["Retribution"], L["Protection"]})
+            or button.class == "SHAMAN" and notIn(spec, {L["Restoration"], L["Enhancement"], L["Elemental"]})
+            or button.class == "WARRIOR" and notIn(spec, {L["Arms"], L["Protection"], L["Fury"]}) then
+        return
+    end
 
     button.spec = spec
     if not button.test then
@@ -349,7 +362,6 @@ function Cooldowns:DetectSpec(unit, spec)
     ]]
     if (Gladdy.db.cooldown) then
         local class = Gladdy.buttons[unit].class
-        local race = Gladdy.buttons[unit].race
         for k, v in pairs(Gladdy:GetCooldownList()[class]) do
             if Gladdy.db.cooldownCooldowns[tostring(k)] then
                 --if (self.db.cooldownList[k] ~= false and self.db.cooldownList[class] ~= false) then
@@ -378,7 +390,6 @@ function Cooldowns:DetectSpec(unit, spec)
                 end
             end
         end
-        --end
     end
     ----------------------
     --- RACE FUNCTIONALITY
@@ -480,7 +491,7 @@ function Cooldowns:UpdateCooldowns(button)
     end
 end
 
-function Cooldowns:CooldownUsed(unit, unitClass, spellId, spellName)
+function Cooldowns:CooldownUsed(unit, unitClass, spellId, expirationTimeInSeconds)
     local button = Gladdy.buttons[unit]
     if not button then
         return
@@ -498,8 +509,8 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, spellName)
 
         -- check if we need to reset other cooldowns because of this spell
         if (cooldown.resetCD ~= nil) then
-            for k, v in pairs(cooldown.resetCD) do
-                self:CooldownReady(button, k, false)
+            for spellID,_ in pairs(cooldown.resetCD) do
+                self:CooldownReady(button, spellID, false)
             end
         end
 
@@ -515,9 +526,9 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, spellName)
         if (cooldown.sharedCD ~= nil) then
             local sharedCD = cooldown.sharedCD.cd and cooldown.sharedCD.cd or cd
 
-            for k, v in pairs(cooldown.sharedCD) do
-                if (k ~= "cd") then
-                    self:CooldownStart(button, k, sharedCD)
+            for spellID,_ in pairs(cooldown.sharedCD) do
+                if (spellID ~= "cd") then
+                    self:CooldownStart(button, spellID, sharedCD)
                 end
             end
         end
@@ -525,7 +536,7 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, spellName)
 
     if (Gladdy.db.cooldown) then
         -- start cooldown
-        self:CooldownStart(button, spellId, cd)
+        self:CooldownStart(button, spellId, cd, expirationTimeInSeconds and (GetTime() + expirationTimeInSeconds - cd) or nil)
     end
 
     --[[ announcement
@@ -539,31 +550,6 @@ function Cooldowns:CooldownUsed(unit, unitClass, spellId, spellName)
     end  ]]
 end
 
-local function option(params)
-    local defaults = {
-        get = function(info)
-            local key = info.arg or info[#info]
-            return Gladdy.dbi.profile[key]
-        end,
-        set = function(info, value)
-            local key = info.arg or info[#info]
-            Gladdy.dbi.profile[key] = value
-            if Gladdy.db.cooldownYPos == "LEFT" then
-                Gladdy.db.cooldownXPos = "RIGHT"
-            elseif Gladdy.db.cooldownYPos == "RIGHT" then
-                Gladdy.db.cooldownXPos = "LEFT"
-            end
-            Gladdy:UpdateFrame()
-        end,
-    }
-
-    for k, v in pairs(params) do
-        defaults[k] = v
-    end
-
-    return defaults
-end
-
 function Cooldowns:GetOptions()
     return {
         headerCooldown = {
@@ -573,14 +559,14 @@ function Cooldowns:GetOptions()
         },
         cooldown = Gladdy:option({
             type = "toggle",
-            name = L["Enable"],
+            name = L["Enabled"],
             desc = L["Enabled cooldown module"],
             order = 2,
         }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 3,
             args = {
                 icon = {
@@ -599,7 +585,8 @@ function Cooldowns:GetOptions()
                             desc = L["Size of each cd icon"],
                             order = 4,
                             min = 5,
-                            max = (Gladdy.db.healthBarHeight + Gladdy.db.castBarHeight + Gladdy.db.powerBarHeight + Gladdy.db.bottomMargin) / 2,
+                            max = 50,
+                            width = "full",
                         }),
                         cooldownWidthFactor = Gladdy:option({
                             type = "range",
@@ -609,6 +596,7 @@ function Cooldowns:GetOptions()
                             min = 0.5,
                             max = 2,
                             step = 0.05,
+                            width = "full",
                         }),
                         cooldownIconPadding = Gladdy:option({
                             type = "range",
@@ -618,14 +606,7 @@ function Cooldowns:GetOptions()
                             min = 0,
                             max = 10,
                             step = 0.1,
-                        }),
-                        cooldownMaxIconsPerLine = Gladdy:option({
-                            type = "range",
-                            name = L["Max Icons per row"],
-                            order = 7,
-                            min = 3,
-                            max = 14,
-                            step = 1,
+                            width = "full",
                         }),
                     },
                 },
@@ -643,6 +624,7 @@ function Cooldowns:GetOptions()
                             type = "toggle",
                             name = L["No Cooldown Circle"],
                             order = 8,
+                            width = "full",
                         }),
                         cooldownCooldownAlpha = Gladdy:option({
                             type = "range",
@@ -651,7 +633,24 @@ function Cooldowns:GetOptions()
                             max = 1,
                             step = 0.1,
                             order = 9,
+                            width = "full",
                         }),
+                        cooldownCooldownNumberAlpha = {
+                            type = "range",
+                            name = L["Cooldown number alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.1,
+                            order = 10,
+                            width = "full",
+                            set = function(info, value)
+                                Gladdy.db.cooldownFontColor.a = value
+                                Gladdy:UpdateFrame()
+                            end,
+                            get = function(info)
+                                return Gladdy.db.cooldownFontColor.a
+                            end,
+                        },
                     },
                 },
                 font = {
@@ -680,6 +679,7 @@ function Cooldowns:GetOptions()
                             min = 0.1,
                             max = 2,
                             step = 0.1,
+                            width = "full",
                         }),
                         cooldownFontColor = Gladdy:colorOption({
                             type = "color",
@@ -693,62 +693,71 @@ function Cooldowns:GetOptions()
                 position = {
                     type = "group",
                     name = L["Position"],
-                    order = 4,
+                    order = 5,
                     args = {
                         header = {
                             type = "header",
                             name = L["Position"],
                             order = 2,
                         },
-                        cooldownYPos = option({
+                        cooldownYGrowDirection = Gladdy:option({
                             type = "select",
-                            name = L["Anchor"],
-                            desc = L["Anchor of the cooldown icons"],
+                            name = L["Vertical Grow Direction"],
+                            desc = L["Vertical Grow Direction of the cooldown icons"],
                             order = 3,
                             values = {
-                                ["TOP"] = L["Top"],
-                                ["BOTTOM"] = L["Bottom"],
+                                ["UP"] = L["Up"],
+                                ["DOWN"] = L["Down"],
+                            },
+                        }),
+                        cooldownXGrowDirection = Gladdy:option({
+                            type = "select",
+                            name = L["Horizontal Grow Direction"],
+                            desc = L["Horizontal Grow Direction of the cooldown icons"],
+                            order = 4,
+                            values = {
                                 ["LEFT"] = L["Left"],
                                 ["RIGHT"] = L["Right"],
                             },
                         }),
-                        cooldownXPos = Gladdy:option({
-                            type = "select",
-                            name = L["Grow Direction"],
-                            desc = L["Grow Direction of the cooldown icons"],
-                            order = 4,
-                            values = {
-                                ["LEFT"] = L["Right"],
-                                ["RIGHT"] = L["Left"],
-                            },
+                        cooldownMaxIconsPerLine = Gladdy:option({
+                            type = "range",
+                            name = L["Max Icons per row"],
+                            order = 5,
+                            min = 3,
+                            max = 14,
+                            step = 1,
+                            width = "full",
                         }),
                         headerOffset = {
                             type = "header",
                             name = L["Offset"],
-                            order = 5,
+                            order = 10,
                         },
                         cooldownXOffset = Gladdy:option({
                             type = "range",
                             name = L["Horizontal offset"],
-                            order = 6,
+                            order = 11,
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                         cooldownYOffset = Gladdy:option({
                             type = "range",
                             name = L["Vertical offset"],
-                            order = 7,
+                            order = 12,
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
                 border = {
                     type = "group",
                     name = L["Border"],
-                    order = 5,
+                    order = 4,
                     args = {
                         header = {
                             type = "header",
@@ -770,12 +779,41 @@ function Cooldowns:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        cooldownFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        cooldownFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
         cooldowns = {
             type = "group",
             childGroups = "tree",
-            name = "Cooldowns",
+            name = L["Cooldowns"],
             order = 4,
             args = Cooldowns:GetCooldownOptions(),
         },
@@ -803,10 +841,10 @@ function Cooldowns:GetCooldownOptions()
                 order = o,
                 width = "full",
                 image = select(3, GetSpellInfo(spellId)),
-                get = function(info)
+                get = function()
                     return Gladdy.db.cooldownCooldowns[tostring(spellId)]
                 end,
-                set = function(info, value)
+                set = function(_, value)
                     Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
                     Gladdy:UpdateFrame()
                 end
@@ -832,10 +870,10 @@ function Cooldowns:GetCooldownOptions()
                 order = o,
                 width = "full",
                 image = select(3, GetSpellInfo(spellId)),
-                get = function(info)
+                get = function()
                     return Gladdy.db.cooldownCooldowns[tostring(spellId)]
                 end,
-                set = function(info, value)
+                set = function(_, value)
                     Gladdy.db.cooldownCooldowns[tostring(spellId)] = value
                     Gladdy:UpdateFrame()
                 end
@@ -857,13 +895,76 @@ function Gladdy:UpdateTestCooldowns(i)
         Cooldowns:DetectSpec(unit, button.testSpec)
 
         -- use class spells
-        for k, v in pairs(Gladdy:GetCooldownList()[button.class]) do
+        for spellID,_ in pairs(Gladdy:GetCooldownList()[button.class]) do
             --k is spellId
-            Cooldowns:CooldownUsed(unit, button.class, k, nil)
+            Cooldowns:CooldownUsed(unit, button.class, spellID)
         end
         -- use race spells
-        for k, v in pairs(Gladdy:GetCooldownList()[button.race]) do
-            Cooldowns:CooldownUsed(unit, button.race, k, nil)
+        for spellID,_ in pairs(Gladdy:GetCooldownList()[button.race]) do
+            Cooldowns:CooldownUsed(unit, button.race, spellID)
         end
     end
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Cooldowns:LegacySetPosition(button, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    button.spellCooldownFrame:ClearAllPoints()
+    local powerBarHeight = Gladdy.db.powerBarEnabled and (Gladdy.db.powerBarHeight + 1) or 0
+    local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize)
+
+    local offset = 0
+    if (Gladdy.db.cooldownXPos == "RIGHT") then
+        offset = -(Gladdy.db.cooldownSize * Gladdy.db.cooldownWidthFactor)
+    end
+
+    if Gladdy.db.cooldownYPos == "TOP" then
+        Gladdy.db.cooldownYGrowDirection = "UP"
+        if Gladdy.db.cooldownXPos == "RIGHT" then
+            Gladdy.db.cooldownXGrowDirection = "LEFT"
+            button.spellCooldownFrame:SetPoint("BOTTOMRIGHT", button.healthBar, "TOPRIGHT", Gladdy.db.cooldownXOffset + offset, horizontalMargin + Gladdy.db.cooldownYOffset)
+        else
+            Gladdy.db.cooldownXGrowDirection = "RIGHT"
+            button.spellCooldownFrame:SetPoint("BOTTOMLEFT", button.healthBar, "TOPLEFT", Gladdy.db.cooldownXOffset + offset, horizontalMargin + Gladdy.db.cooldownYOffset)
+        end
+    elseif Gladdy.db.cooldownYPos == "BOTTOM" then
+        Gladdy.db.cooldownYGrowDirection = "DOWN"
+        if Gladdy.db.cooldownXPos == "RIGHT" then
+            Gladdy.db.cooldownXGrowDirection = "LEFT"
+            button.spellCooldownFrame:SetPoint("TOPRIGHT", button.healthBar, "BOTTOMRIGHT", Gladdy.db.cooldownXOffset + offset, -horizontalMargin + Gladdy.db.cooldownYOffset - powerBarHeight)
+        else
+            Gladdy.db.cooldownXGrowDirection = "RIGHT"
+            button.spellCooldownFrame:SetPoint("TOPLEFT", button.healthBar, "BOTTOMLEFT", Gladdy.db.cooldownXOffset + offset, -horizontalMargin + Gladdy.db.cooldownYOffset - powerBarHeight)
+        end
+    elseif Gladdy.db.cooldownYPos == "LEFT" then
+        Gladdy.db.cooldownYGrowDirection = "DOWN"
+        local anchor = Gladdy:GetAnchor(unit, "LEFT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            Gladdy.db.cooldownXGrowDirection = "LEFT"
+            button.spellCooldownFrame:SetPoint("RIGHT", anchor, "LEFT", -(horizontalMargin + Gladdy.db.padding) + Gladdy.db.cooldownXOffset + offset, Gladdy.db.cooldownYOffset)
+        else
+            Gladdy.db.cooldownXGrowDirection = "LEFT"
+            button.spellCooldownFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.cooldownXOffset + offset, Gladdy.db.cooldownYOffset)
+        end
+    elseif Gladdy.db.cooldownYPos == "RIGHT" then
+        Gladdy.db.cooldownYGrowDirection = "DOWN"
+        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            Gladdy.db.cooldownXGrowDirection = "RIGHT"
+            button.spellCooldownFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.padding + Gladdy.db.cooldownXOffset + offset, Gladdy.db.cooldownYOffset)
+        else
+            Gladdy.db.cooldownXGrowDirection = "RIGHT"
+            button.spellCooldownFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.cooldownXOffset + offset, Gladdy.db.cooldownYOffset)
+        end
+    end
+    LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
+
+    return Gladdy.db.newLayout
+end

Modules/Diminishings.lua

@@ -1,14 +1,12 @@
 local select = select
-local pairs,ipairs,tbl_sort,tinsert,format = pairs,ipairs,table.sort,tinsert,format
-
-local drDuration = 18
+local pairs,ipairs,tbl_sort,tinsert,format,rand = pairs,ipairs,table.sort,tinsert,format,math.random
 
 local GetSpellInfo = GetSpellInfo
 local CreateFrame = CreateFrame
 local GetTime = GetTime
 
 local Gladdy = LibStub("Gladdy")
-local DRData = LibStub("DRData-1.0")
+local DRData = LibStub("DRData-1.0-BCC")
 local L = Gladdy.L
 local function defaultCategories()
     local categories = {}
@@ -17,7 +15,7 @@ local function defaultCategories()
         tinsert(indexList, {spellID = k, category = v})
     end
     tbl_sort(indexList, function(a, b) return a.spellID < b.spellID end)
-    for i,v in ipairs(indexList) do
+    for _,v in ipairs(indexList) do
         if not categories[v.category] then
             categories[v.category] = {
                 enabled = true,
@@ -30,9 +28,10 @@ local function defaultCategories()
 end
 local Diminishings = Gladdy:NewModule("Diminishings", nil, {
     drFont = "DorisPP",
+    drFontColorsEnabled = false,
     drFontColor = { r = 1, g = 1, b = 0, a = 1 },
     drFontScale = 1,
-    drCooldownPos = "RIGHT",
+    drGrowDirection = "RIGHT",
     drXOffset = 0,
     drYOffset = 0,
     drIconSize = 36,
@@ -46,17 +45,35 @@ local Diminishings = Gladdy:NewModule("Diminishings", nil, {
     drHalfColor = {r = 1, g = 1, b = 0, a = 1 },
     drQuarterColor = {r = 1, g = 0.7, b = 0, a = 1 },
     drNullColor = {r = 1, g = 0, b = 0, a = 1 },
+    drLevelTextEnabled = true,
+    drLevelTextFont = "DorisPP",
+    drLevelTextScale = 0.8,
+    drLevelTextColor = { r = 1, g = 1, b = 0, a = 1 },
+    drLevelTextColorsEnabled = true,
     drWidthFactor = 1,
-    drCategories = defaultCategories()
+    drCategories = defaultCategories(),
+    drDuration = 18,
+    drFrameStrata = "MEDIUM",
+    drFrameLevel = 3,
 })
 
 local function getDiminishColor(dr)
     if dr == 0.5 then
-        return Gladdy.db.drHalfColor.r, Gladdy.db.drHalfColor.g, Gladdy.db.drHalfColor.b, Gladdy.db.drHalfColor.a
+        return Gladdy:SetColor(Gladdy.db.drHalfColor)
     elseif dr == 0.25 then
-        return Gladdy.db.drQuarterColor.r, Gladdy.db.drQuarterColor.g, Gladdy.db.drQuarterColor.b, Gladdy.db.drQuarterColor.a
+        return Gladdy:SetColor(Gladdy.db.drQuarterColor)
     else
-        return Gladdy.db.drNullColor.r, Gladdy.db.drNullColor.g, Gladdy.db.drNullColor.b, Gladdy.db.drNullColor.a
+        return Gladdy:SetColor(Gladdy.db.drNullColor)
+    end
+end
+
+local function getDiminishText(dr)
+    if dr == 0.5 then
+        return "½"
+    elseif dr == 0.25 then
+        return "¼"
+    else
+        return "ø"
     end
 end
 
@@ -67,13 +84,19 @@ end
 
 function Diminishings:CreateFrame(unit)
     local drFrame = CreateFrame("Frame", nil, Gladdy.buttons[unit])
+    drFrame:EnableMouse(false)
+    drFrame:SetMovable(true)
+    drFrame:SetFrameStrata(Gladdy.db.drFrameStrata)
+    drFrame:SetFrameLevel(Gladdy.db.drFrameLevel)
 
     for i = 1, 16 do
         local icon = CreateFrame("Frame", "GladdyDr" .. unit .. "Icon" .. i, drFrame)
         icon:Hide()
         icon:EnableMouse(false)
-        icon:SetFrameLevel(3)
+        icon:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon:SetFrameLevel(Gladdy.db.drFrameLevel)
         icon.texture = icon:CreateTexture(nil, "BACKGROUND")
+        icon.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
         icon.texture:SetAllPoints(icon)
         icon:SetScript("OnUpdate", function(self, elapsed)
             if (self.active) then
@@ -86,16 +109,12 @@ function Diminishings:CreateFrame(unit)
                     self.dr = nil
                     self.diminishing = 1.0
                     self.texture:SetTexture("")
-                    self.text:SetText("")
+                    self.timeText:SetText("")
                     self:Hide()
                     Diminishings:Positionate(unit)
                 else
                     self.timeLeft = self.timeLeft - elapsed
-                    if self.timeLeft >=5 then
-                        self.timeText:SetFormattedText("%d", self.timeLeft)
-                    else
-                        self.timeText:SetFormattedText("%.1f", self.timeLeft >= 0.0 and self.timeLeft or 0.0)
-                    end
+                    Gladdy:FormatTimer(self.timeText, self.timeLeft, self.timeLeft < 5)
                 end
             end
         end)
@@ -103,13 +122,15 @@ function Diminishings:CreateFrame(unit)
         icon.cooldown = CreateFrame("Cooldown", nil, icon, "CooldownFrameTemplate")
         icon.cooldown.noCooldownCount = true --Gladdy.db.trinketDisableOmniCC
         icon.cooldown:SetHideCountdownNumbers(true)
-        icon.cooldown:SetFrameLevel(4)
+        icon.cooldown:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon.cooldown:SetFrameLevel(Gladdy.db.drFrameLevel + 1)
 
         icon.cooldownFrame = CreateFrame("Frame", nil, icon)
         icon.cooldownFrame:ClearAllPoints()
         icon.cooldownFrame:SetPoint("TOPLEFT", icon, "TOPLEFT")
         icon.cooldownFrame:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT")
-        icon.cooldownFrame:SetFrameLevel(5)
+        icon.cooldownFrame:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon.cooldownFrame:SetFrameLevel(Gladdy.db.drFrameLevel + 2)
 
         --icon.overlay = CreateFrame("Frame", nil, icon)
         --icon.overlay:SetAllPoints(icon)
@@ -117,24 +138,24 @@ function Diminishings:CreateFrame(unit)
         icon.border:SetTexture("Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp")
         icon.border:SetAllPoints(icon)
 
-        icon.text = icon.cooldownFrame:CreateFontString(nil, "OVERLAY")
-        icon.text:SetDrawLayer("OVERLAY")
-        icon.text:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.drFont), 10, "OUTLINE")
-        icon.text:SetTextColor(Gladdy.db.drFontColor.r, Gladdy.db.drFontColor.g, Gladdy.db.drFontColor.b, Gladdy.db.drFontColor.a)
-        icon.text:SetShadowOffset(1, -1)
-        icon.text:SetShadowColor(0, 0, 0, 1)
-        icon.text:SetJustifyH("CENTER")
-        icon.text:SetPoint("CENTER")
-
         icon.timeText = icon.cooldownFrame:CreateFontString(nil, "OVERLAY")
         icon.timeText:SetDrawLayer("OVERLAY")
-        icon.timeText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.drFont), 10, "OUTLINE")
-        icon.timeText:SetTextColor(Gladdy.db.drFontColor.r, Gladdy.db.drFontColor.g, Gladdy.db.drFontColor.b, Gladdy.db.drFontColor.a)
+        icon.timeText:SetFont(Gladdy:SMFetch("font", "drFont"), 10, "OUTLINE")
+        icon.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.drFontColor))
         icon.timeText:SetShadowOffset(1, -1)
         icon.timeText:SetShadowColor(0, 0, 0, 1)
         icon.timeText:SetJustifyH("CENTER")
         icon.timeText:SetPoint("CENTER", icon, "CENTER", 0, 1)
 
+        icon.drLevelText = icon.cooldownFrame:CreateFontString(nil, "OVERLAY")
+        icon.drLevelText:SetDrawLayer("OVERLAY")
+        icon.drLevelText:SetFont(Gladdy:SMFetch("font", "drLevelTextFont"), 10, "OUTLINE")
+        icon.drLevelText:SetTextColor(getDiminishColor(1))
+        icon.drLevelText:SetShadowOffset(1, -1)
+        icon.drLevelText:SetShadowColor(0, 0, 0, 1)
+        icon.drLevelText:SetJustifyH("CENTER")
+        icon.drLevelText:SetPoint("BOTTOM", icon, "BOTTOM", 0, 0)
+
         icon.diminishing = 1
 
         drFrame["icon" .. i] = icon
@@ -159,27 +180,21 @@ function Diminishings:UpdateFrame(unit)
         drFrame:Show()
     end
 
-    drFrame:ClearAllPoints()
-    local horizontalMargin = Gladdy.db.highlightBorderSize + Gladdy.db.padding
-    if (Gladdy.db.drCooldownPos == "LEFT") then
-        local anchor = Gladdy:GetAnchor(unit, "LEFT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            drFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
-        else
-            drFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
-        end
-    end
-    if (Gladdy.db.drCooldownPos == "RIGHT") then
-        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
-        if anchor == Gladdy.buttons[unit].healthBar then
-            drFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
-        else
-            drFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
-        end
-    end
-
-    drFrame:SetWidth(Gladdy.db.drIconSize * 16)
+    drFrame:SetWidth(Gladdy.db.drIconSize)
     drFrame:SetHeight(Gladdy.db.drIconSize)
+    drFrame:SetFrameStrata(Gladdy.db.drFrameStrata)
+    drFrame:SetFrameLevel(Gladdy.db.drFrameLevel)
+
+    Gladdy:SetPosition(drFrame, unit, "drXOffset", "drYOffset", Diminishings:LegacySetPosition(drFrame, unit), Diminishings)
+
+    if (unit == "arena1") then
+        Gladdy:CreateMover(drFrame,"drXOffset", "drYOffset", L["Diminishings"],
+                Gladdy.db.drGrowDirection == "RIGHT" and {"TOPLEFT", "TOPLEFT"} or {"TOPRIGHT", "TOPRIGHT"},
+                Gladdy.db.drIconSize * Gladdy.db.drWidthFactor,
+                Gladdy.db.drIconSize,
+                0,
+                0, "drEnabled")
+    end
 
     for i = 1, 16 do
         local icon = drFrame["icon" .. i]
@@ -187,10 +202,26 @@ function Diminishings:UpdateFrame(unit)
         icon:SetWidth(Gladdy.db.drIconSize * Gladdy.db.drWidthFactor)
         icon:SetHeight(Gladdy.db.drIconSize)
 
-        icon.text:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.drFont), (Gladdy.db.drIconSize/2 - 1) * Gladdy.db.drFontScale, "OUTLINE")
-        icon.text:SetTextColor(Gladdy.db.drFontColor.r, Gladdy.db.drFontColor.g, Gladdy.db.drFontColor.b, Gladdy.db.drFontColor.a)
-        icon.timeText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.drFont), (Gladdy.db.drIconSize/2 - 1) * Gladdy.db.drFontScale, "OUTLINE")
-        icon.timeText:SetTextColor(Gladdy.db.drFontColor.r, Gladdy.db.drFontColor.g, Gladdy.db.drFontColor.b, Gladdy.db.drFontColor.a)
+        icon:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon:SetFrameLevel(Gladdy.db.drFrameLevel)
+        icon.cooldown:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon.cooldown:SetFrameLevel(Gladdy.db.drFrameLevel + 1)
+        icon.cooldownFrame:SetFrameStrata(Gladdy.db.drFrameStrata)
+        icon.cooldownFrame:SetFrameLevel(Gladdy.db.drFrameLevel + 2)
+
+        icon.timeText:SetFont(Gladdy:SMFetch("font", "drFont"), (Gladdy.db.drIconSize/2 - 1) * Gladdy.db.drFontScale, "OUTLINE")
+        if Gladdy.db.drFontColorsEnabled then
+            icon.timeText:SetTextColor(getDiminishColor(icon.diminishing))
+        else
+            icon.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.drFontColor))
+        end
+
+        icon.drLevelText:SetFont(Gladdy:SMFetch("font", "drLevelTextFont"), (Gladdy.db.drIconSize/2 - 1) * Gladdy.db.drLevelTextScale, "OUTLINE")
+        if Gladdy.db.drLevelTextColorsEnabled then
+            icon.drLevelText:SetTextColor(getDiminishColor(icon.diminishing))
+        else
+            icon.drLevelText:SetTextColor(Gladdy:SetColor(Gladdy.db.drLevelTextColor))
+        end
 
         icon.cooldown:SetWidth(icon:GetWidth() - icon:GetWidth()/16)
         icon.cooldown:SetHeight(icon:GetHeight() - icon:GetHeight()/16)
@@ -205,19 +236,25 @@ function Diminishings:UpdateFrame(unit)
         if Gladdy.db.drBorderColorsEnabled then
             icon.border:SetVertexColor(getDiminishColor(icon.diminishing))
         else
-            icon.border:SetVertexColor(Gladdy.db.drBorderColor.r, Gladdy.db.drBorderColor.g, Gladdy.db.drBorderColor.b, Gladdy.db.drBorderColor.a)
+            icon.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.drBorderColor))
+        end
+
+        if Gladdy.db.drLevelTextEnabled then
+            icon.drLevelText:Show()
+        else
+            icon.drLevelText:Hide()
         end
 
         icon:ClearAllPoints()
-        if (Gladdy.db.drCooldownPos == "LEFT") then
+        if (Gladdy.db.drGrowDirection == "LEFT") then
             if (i == 1) then
-                icon:SetPoint("TOPRIGHT")
+                icon:SetPoint("TOPRIGHT", drFrame, "TOPRIGHT")
             else
                 icon:SetPoint("RIGHT", drFrame["icon" .. (i - 1)], "LEFT", -Gladdy.db.drIconPadding, 0)
             end
         else
             if (i == 1) then
-                icon:SetPoint("TOPLEFT")
+                icon:SetPoint("TOPLEFT", drFrame, "TOPLEFT")
             else
                 icon:SetPoint("LEFT", drFrame["icon" .. (i - 1)], "RIGHT", Gladdy.db.drIconPadding, 0)
             end
@@ -229,9 +266,9 @@ function Diminishings:UpdateFrame(unit)
             icon.border:SetTexture(Gladdy.db.drBorderStyle)
         end
 
-        icon.texture:SetTexCoord(.1, .9, .1, .9)
-        icon.texture:SetPoint("TOPLEFT", icon, "TOPLEFT", 2, -2)
-        icon.texture:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", -2, 2)
+        --icon.texture:SetTexCoord(.1, .9, .1, .9)
+        --icon.texture:SetPoint("TOPLEFT", icon, "TOPLEFT", 2, -2)
+        --icon.texture:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", -2, 2)
     end
 end
 
@@ -248,7 +285,6 @@ function Diminishings:ResetUnit(unit)
         icon.active = false
         icon.timeLeft = 0
         icon.texture:SetTexture("")
-        icon.text:SetText("")
         icon.timeText:SetText("")
         icon:Hide()
     end
@@ -260,17 +296,32 @@ end
 
 function Diminishings:Test(unit)
     if Gladdy.db.drEnabled then
-        local spells = { 33786, 118, 8643, 8983 }
-        for i = 1, 4 do
-            if i == 1 then
-                self:AuraFade(unit, spells[i])
-            elseif i == 2 then
-                self:AuraFade(unit, spells[i])
-                self:AuraFade(unit, spells[i])
-            else
-                self:AuraFade(unit, spells[i])
-                self:AuraFade(unit, spells[i])
-                self:AuraFade(unit, spells[i])
+        local enabledCategories = {}
+        for cat,val in pairs(Gladdy.db.drCategories) do
+            if (val.enabled) then
+                tinsert(enabledCategories, {cat = cat , spellIDs = {}})
+                enabledCategories[cat] = #enabledCategories
+            end
+        end
+        for spellId,cat in pairs(DRData:GetSpells()) do
+            if enabledCategories[cat] then
+                tinsert(enabledCategories[enabledCategories[cat]].spellIDs, spellId)
+            end
+        end
+
+        --shuffle
+        for i = #enabledCategories, 2, -1 do
+            local j = rand(i)
+            enabledCategories[i], enabledCategories[j] = enabledCategories[j], enabledCategories[i]
+        end
+
+        --execute test
+        local index, amount = 0,0
+        for i=1, (#enabledCategories < 4 and #enabledCategories) or 4 do
+            amount = rand(1,3)
+            index = rand(1, #enabledCategories[i].spellIDs)
+            for _=1, amount do
+                self:AuraFade(unit, enabledCategories[i].spellIDs[index])
             end
         end
     end
@@ -297,20 +348,35 @@ function Diminishings:AuraFade(unit, spellID)
             lastIcon.diminishing = 1.0
         end
     end
+    if not lastIcon then return end
     lastIcon.dr = drCat
-    lastIcon.timeLeft = drDuration
+    lastIcon.timeLeft = Gladdy.db.drDuration
     lastIcon.diminishing = DRData:NextDR(lastIcon.diminishing)
     if Gladdy.db.drBorderColorsEnabled then
         lastIcon.border:SetVertexColor(getDiminishColor(lastIcon.diminishing))
     else
-        lastIcon.border:SetVertexColor(Gladdy.db.drBorderColor.r, Gladdy.db.drBorderColor.g, Gladdy.db.drBorderColor.b, Gladdy.db.drBorderColor.a)
+        lastIcon.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.drBorderColor))
     end
-    lastIcon.cooldown:SetCooldown(GetTime(), drDuration)
+    lastIcon.cooldown:SetCooldown(GetTime(), Gladdy.db.drDuration)
     if Gladdy.db.drCategories[drCat].forceIcon then
         lastIcon.texture:SetTexture(Gladdy.db.drCategories[drCat].icon)
     else
         lastIcon.texture:SetTexture(select(3, GetSpellInfo(spellID)))
     end
+
+    if Gladdy.db.drFontColorsEnabled then
+        lastIcon.timeText:SetTextColor(getDiminishColor(lastIcon.diminishing))
+    else
+        lastIcon.timeText:SetTextColor(Gladdy:SetColor(Gladdy.db.drFontColor))
+    end
+
+    lastIcon.drLevelText:SetText(getDiminishText(lastIcon.diminishing))
+    if Gladdy.db.drLevelTextColorsEnabled then
+        lastIcon.drLevelText:SetTextColor(getDiminishColor(lastIcon.diminishing))
+    else
+        lastIcon.drLevelText:SetTextColor(Gladdy:SetColor(Gladdy.db.drLevelTextColor))
+    end
+
     lastIcon.active = true
     self:Positionate(unit)
     lastIcon:Show()
@@ -329,13 +395,15 @@ function Diminishings:Positionate(unit)
 
         if (icon.active) then
             icon:ClearAllPoints()
-            if (Gladdy.db.drCooldownPos == "LEFT") then
+            if (Gladdy.db.newLayout and Gladdy.db.drGrowDirection == "LEFT"
+                    or not Gladdy.db.newLayout and Gladdy.db.drCooldownPos == "LEFT") then
                 if (not lastIcon) then
                     icon:SetPoint("TOPRIGHT")
                 else
                     icon:SetPoint("RIGHT", lastIcon, "LEFT", -Gladdy.db.drIconPadding, 0)
                 end
-            else
+            elseif (Gladdy.db.newLayout and Gladdy.db.drGrowDirection == "RIGHT"
+                    or not Gladdy.db.newLayout and Gladdy.db.drCooldownPos == "RIGHT") then
                 if (not lastIcon) then
                     icon:SetPoint("TOPLEFT")
                 else
@@ -357,15 +425,24 @@ function Diminishings:GetOptions()
         },
         drEnabled = Gladdy:option({
             type = "toggle",
-            name = L["Enable"],
+            name = L["Enabled"],
             desc = L["Enabled DR module"],
             order = 3,
         }),
+        drDuration = Gladdy:option({
+            type = "range",
+            name = L["DR Duration"],
+            desc = L["Change the DR Duration in seconds (DR is dynamic between 15-20s)"],
+            order = 4,
+            min = 15,
+            max = 20,
+            step = .1,
+        }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
-            order = 4,
+            name = L["Frame"],
+            order = 5,
             args = {
                 icon = {
                     type = "group",
@@ -383,8 +460,9 @@ function Diminishings:GetOptions()
                             desc = L["Size of the DR Icons"],
                             order = 5,
                             min = 5,
-                            max = 50,
+                            max = 80,
                             step = 1,
+                            width = "full",
                         }),
                         drWidthFactor = Gladdy:option({
                             type = "range",
@@ -394,6 +472,7 @@ function Diminishings:GetOptions()
                             min = 0.5,
                             max = 2,
                             step = 0.05,
+                            width = "full",
                         }),
                         drIconPadding = Gladdy:option({
                             type = "range",
@@ -403,6 +482,7 @@ function Diminishings:GetOptions()
                             min = 0,
                             max = 10,
                             step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
@@ -420,6 +500,7 @@ function Diminishings:GetOptions()
                             type = "toggle",
                             name = L["No Cooldown Circle"],
                             order = 8,
+                            width = "full",
                         }),
                         drCooldownAlpha = Gladdy:option({
                             type = "range",
@@ -428,85 +509,132 @@ function Diminishings:GetOptions()
                             max = 1,
                             step = 0.1,
                             order = 9,
+                            width = "full",
                         }),
+                        drCooldownNumberAlpha = {
+                            type = "range",
+                            name = L["Cooldown number alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.1,
+                            order = 10,
+                            width = "full",
+                            set = function(info, value)
+                                Gladdy.db.drFontColor.a = value
+                                Gladdy:UpdateFrame()
+                            end,
+                            get = function(info)
+                                return Gladdy.db.drFontColor.a
+                            end,
+                        },
                     },
                 },
                 font = {
                     type = "group",
-                    name = L["Font"],
+                    name = L["Cooldown Font"],
                     order = 3,
                     args = {
                         headerFont = {
                             type = "header",
-                            name = L["Font"],
-                            order = 10,
+                            name = L["Cooldown Font"],
+                            order = 1,
                         },
-                        drFont = Gladdy:option({
-                            type = "select",
-                            name = L["Font"],
-                            desc = L["Font of the cooldown"],
-                            order = 11,
-                            dialogControl = "LSM30_Font",
-                            values = AceGUIWidgetLSMlists.font,
+                        drFontColorsEnabled = Gladdy:option({
+                            type = "toggle",
+                            name = L["Enable DR Colors as Font Color"],
+                            desc = L["Shows the current DR Level on the DR icon."],
+                            order = 2,
+                            width = "full",
                         }),
                         drFontColor = Gladdy:colorOption({
                             type = "color",
                             name = L["Font color"],
                             desc = L["Color of the text"],
-                            order = 13,
+                            order = 3,
                             hasAlpha = true,
+                            width = "full",
+                        }),
+                        drFont = Gladdy:option({
+                            type = "select",
+                            name = L["Font"],
+                            desc = L["Font of the cooldown"],
+                            order = 4,
+                            dialogControl = "LSM30_Font",
+                            values = AceGUIWidgetLSMlists.font,
                         }),
                         drFontScale = Gladdy:option({
                             type = "range",
                             name = L["Font scale"],
                             desc = L["Scale of the text"],
-                            order = 12,
+                            order = 5,
                             min = 0.1,
                             max = 2,
                             step = 0.1,
+                            width = "full",
                         }),
                     }
                 },
-                position = {
+                levelText = {
                     type = "group",
-                    name = L["Position"],
+                    name = L["DR Font"],
                     order = 4,
                     args = {
-                        headerPosition = {
+                        headerBorder = {
                             type = "header",
-                            name = L["Position"],
-                            order = 20,
+                            name = L["DR Font"],
+                            order = 1,
                         },
-                        drCooldownPos = Gladdy:option({
+                        drLevelTextEnabled = Gladdy:option({
+                            type = "toggle",
+                            name = L["Enable DR Font"],
+                            desc = L["Shows the current DR Level on the DR icon."],
+                            order = 2,
+                            width = "full",
+                        }),
+                        drLevelTextColorsEnabled = Gladdy:option({
+                            type = "toggle",
+                            name = L["Enable DR Colors as Font Color"],
+                            desc = L["Shows the current DR Level on the DR icon."],
+                            order = 3,
+                            width = "full",
+                            disabled = function()
+                                return not Gladdy.db.drLevelTextEnabled
+                            end,
+                        }),
+                        drLevelTextColor = Gladdy:colorOption({
+                            type = "color",
+                            name = L["DR Font color"],
+                            desc = L["Color of the font"],
+                            order = 4,
+                            hasAlpha = true,
+                            disabled = function()
+                                return not Gladdy.db.drLevelTextEnabled
+                            end,
+                        }),
+                        drLevelTextFont = Gladdy:option({
                             type = "select",
-                            name = L["DR Cooldown position"],
-                            desc = L["Position of the cooldown icons"],
-                            order = 21,
-                            values = {
-                                ["LEFT"] = L["Left"],
-                                ["RIGHT"] = L["Right"],
-                            },
+                            name = L["Font"],
+                            desc = L["Font of the DR Font"],
+                            order = 5,
+                            dialogControl = "LSM30_Font",
+                            values = AceGUIWidgetLSMlists.font,
+                            width = "full",
+                            disabled = function()
+                                return not Gladdy.db.drLevelTextEnabled
+                            end,
                         }),
-                        headerOffset = {
-                            type = "header",
-                            name = L["Offset"],
-                            order = 22,
-                        },
-                        drXOffset = Gladdy:option({
+                        drLevelTextScale = Gladdy:option({
                             type = "range",
-                            name = L["Horizontal offset"],
-                            order = 23,
-                            min = -400,
-                            max = 400,
-                            step = 0.1,
-                        }),
-                        drYOffset = Gladdy:option({
-                            type = "range",
-                            name = L["Vertical offset"],
-                            order = 24,
-                            min = -400,
-                            max = 400,
+                            name = L["Font scale"],
+                            desc = L["Scale of the text"],
+                            order = 6,
+                            min = 0.1,
+                            max = 2,
                             step = 0.1,
+                            width = "full",
+                            disabled = function()
+                                return not Gladdy.db.drLevelTextEnabled
+                            end,
                         }),
                     },
                 },
@@ -518,33 +646,43 @@ function Diminishings:GetOptions()
                         headerBorder = {
                             type = "header",
                             name = L["Border"],
-                            order = 30,
+                            order = 1,
                         },
-                        drBorderStyle = Gladdy:option({
-                            type = "select",
-                            name = L["Border style"],
-                            order = 31,
-                            values = Gladdy:GetIconStyles()
+                        drBorderColorsEnabled = Gladdy:option({
+                            type = "toggle",
+                            name = L["Enable DR Colors as Border Color"],
+                            desc = L["Colors borders of DRs in respective DR Colors"],
+                            order = 2,
+                            width = "full",
                         }),
                         drBorderColor = Gladdy:colorOption({
                             type = "color",
                             name = L["Border color"],
                             desc = L["Color of the border"],
-                            order = 32,
+                            order = 3,
+                            disabled = function()
+                                return Gladdy.db.drBorderColorsEnabled
+                            end,
                             hasAlpha = true,
                         }),
-                        headerBorderColors = {
-                            type = "header",
-                            name = L["DR Border Colors"],
-                            order = 40,
-                        },
-                        drBorderColorsEnabled = Gladdy:option({
-                            type = "toggle",
-                            name = L["Dr Border Colors Enabled"],
-                            desc = L["Colors borders of DRs in respective DR-color below"],
-                            order = 41,
-                            width = "full",
+                        drBorderStyle = Gladdy:option({
+                            type = "select",
+                            name = L["Border style"],
+                            order = 4,
+                            values = Gladdy:GetIconStyles()
                         }),
+                    }
+                },
+                levelColors = {
+                    type = "group",
+                    name = L["DR Colors"],
+                    order = 6,
+                    args = {
+                        headerColors = {
+                            type = "header",
+                            name = L["DR Colors"],
+                            order = 10,
+                        },
                         drHalfColor = Gladdy:colorOption({
                             type = "color",
                             name = L["Half"],
@@ -566,7 +704,76 @@ function Diminishings:GetOptions()
                             order = 44,
                             hasAlpha = true,
                         }),
-                    }
+                    },
+                },
+                position = {
+                    type = "group",
+                    name = L["Position"],
+                    order = 7,
+                    args = {
+                        headerPosition = {
+                            type = "header",
+                            name = L["Position"],
+                            order = 20,
+                        },
+                        drGrowDirection = Gladdy:option({
+                            type = "select",
+                            name = L["DR Grow Direction"],
+                            desc = L["Grow Direction of the dr icons"],
+                            order = 21,
+                            values = {
+                                ["LEFT"] = L["Left"],
+                                ["RIGHT"] = L["Right"],
+                            },
+                        }),
+                        drXOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Horizontal offset"],
+                            order = 23,
+                            min = -400,
+                            max = 400,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                        drYOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Vertical offset"],
+                            order = 24,
+                            min = -400,
+                            max = 400,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                    },
+                },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 8,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        drFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        drFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
                 },
             },
         },
@@ -580,16 +787,39 @@ function Diminishings:GetOptions()
 end
 
 function Diminishings:CategoryOptions()
-    local categories = {}
+    local categories = {
+        checkAll = {
+            order = 1,
+            width = "0.7",
+            name = L["Check All"],
+            type = "execute",
+            func = function()
+                for k,_ in pairs(defaultCategories()) do
+                    Gladdy.db.drCategories[k].enabled = true
+                end
+            end,
+        },
+        uncheckAll = {
+            order = 2,
+            width = "0.7",
+            name = L["Uncheck All"],
+            type = "execute",
+            func = function()
+                for k,_ in pairs(defaultCategories()) do
+                    Gladdy.db.drCategories[k].enabled = false
+                end
+            end,
+        },
+    }
     local indexList = {}
-    for k,v in pairs(DRData:GetCategories()) do
+    for k,_ in pairs(DRData:GetCategories()) do
         tinsert(indexList, k)
     end
     tbl_sort(indexList)
-    for i, k in ipairs(indexList) do
+    for i,k in ipairs(indexList) do
         categories[k] = {
             type = "group",
-            name = DRData:GetCategoryName(k),
+            name = L[DRData:GetCategoryName(k)],
             order = i,
             icon = Gladdy.db.drCategories[k].icon,
             args = {
@@ -597,10 +827,10 @@ function Diminishings:CategoryOptions()
                     type = "toggle",
                     name = L["Enabled"],
                     order = 1,
-                    get = function(info)
+                    get = function()
                         return Gladdy.db.drCategories[k].enabled
                     end,
-                    set = function(info, value)
+                    set = function(_, value)
                         Gladdy.db.drCategories[k].enabled = value
                     end,
                 },
@@ -608,10 +838,10 @@ function Diminishings:CategoryOptions()
                     type = "toggle",
                     name = L["Force Icon"],
                     order = 2,
-                    get = function(info)
+                    get = function()
                         return Gladdy.db.drCategories[k].forceIcon
                     end,
-                    set = function(info, value)
+                    set = function(_, value)
                         Gladdy.db.drCategories[k].forceIcon = value
                     end,
                 },
@@ -621,10 +851,10 @@ function Diminishings:CategoryOptions()
                     desc = L["Icon of the DR"],
                     order = 4,
                     values = Diminishings:GetDRIcons(k),
-                    get = function(info)
+                    get = function()
                         return Gladdy.db.drCategories[k].icon
                     end,
-                    set = function(info, value)
+                    set = function(_, value)
                         Gladdy.db.drCategories[k].icon = value
                         Gladdy.options.args.Diminishings.args.categories.args[k].icon = value
                     end,
@@ -644,3 +874,36 @@ function Diminishings:GetDRIcons(category)
     end
     return icons
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Diminishings:LegacySetPosition(drFrame, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    drFrame:ClearAllPoints()
+    local horizontalMargin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) + Gladdy.db.padding
+    if (Gladdy.db.drCooldownPos == "LEFT") then
+        Gladdy.db.drGrowDirection = "LEFT"
+        local anchor = Gladdy:GetAnchor(unit, "LEFT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            drFrame:SetPoint("RIGHT", anchor, "LEFT", -horizontalMargin + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
+        else
+            drFrame:SetPoint("RIGHT", anchor, "LEFT", -Gladdy.db.padding + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
+        end
+    end
+    if (Gladdy.db.drCooldownPos == "RIGHT") then
+        Gladdy.db.drGrowDirection = "RIGHT"
+        local anchor = Gladdy:GetAnchor(unit, "RIGHT")
+        if anchor == Gladdy.buttons[unit].healthBar then
+            drFrame:SetPoint("LEFT", anchor, "RIGHT", horizontalMargin + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
+        else
+            drFrame:SetPoint("LEFT", anchor, "RIGHT", Gladdy.db.padding + Gladdy.db.drXOffset, Gladdy.db.drYOffset)
+        end
+    end
+    return Gladdy.db.newLayout
+end

Modules/ExportImport.lua

@@ -1,4 +1,4 @@
-local type, pairs = type, pairs
+local type, pairs, str_match = type, pairs, string.match
 
 local Gladdy = LibStub("Gladdy")
 local AceSerializer = LibStub("AceSerializer-3.0")
@@ -6,23 +6,26 @@ local L = Gladdy.L
 local AceGUI = LibStub("AceGUI-3.0")
 local LibDeflate = LibStub:GetLibrary("LibDeflate")
 
-local function table_copy(t)
+
+local function table_copy(t, str)
     local t2 = {};
+    if str == nil then
+        str = "Gladdy.db"
+    end
     for k,v in pairs(t) do
         if type(v) == "table" then
-            t2[k] = table_copy(v);
+            t2[k] = table_copy(v, str .. "." .. k);
         else
+
             t2[k] = v;
         end
     end
     return t2;
 end
 
-local ExportImport = Gladdy:NewModule("ExportImport", nil, {
+local ExportImport = Gladdy:NewModule("Export Import", nil, {
 })
 
-
-
 local export = AceGUI:Create("Frame")
 export:SetWidth(550)
 export.sizer_se:Hide()
@@ -69,6 +72,7 @@ importButton:SetCallback("OnClick", function(widget)
     Gladdy:Reset()
     Gladdy:HideFrame()
     Gladdy:ToggleFrame(3)
+    LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
 end)
 import:AddChild(importButton)
 import.button = importButton
@@ -85,28 +89,80 @@ end)
 import:AddChild(importClearButton)
 import.clearButton = importClearButton
 
+local deletedOptions = { -- backwards compatibility
+    --deleted DR-categories
+    repentance = true,
+    sleep = true,
+    impconc = true,
+    dragonsbreath = true,
+    freezetrap = true,
+    --deleted db options
+    castBarPos = true,
+    buffsCooldownPos = true,
+    buffsBuffsCooldownPos = true,
+    classIconPos = true,
+    ciAnchor = true,
+    ciPos = true,
+    cooldownYPos = true,
+    cooldownXPos = true,
+    drCooldownPos = true,
+    racialAnchor = true,
+    racialPos = true,
+    trinketPos = true,
+    padding = true,
+    growUp = true,
+}
+
+local function checkIsDeletedOption(k, str, msg, errorFound, errorMsg)
+    local isDeleted
+    for key, _ in pairs(deletedOptions) do
+        if str_match(k, key) then
+            isDeleted = true
+            Gladdy:Debug("WARN", "found deleted option =", str .. "." .. k)
+        end
+    end
+    if errorFound then
+        return errorFound, errorMsg
+    end
+    if not isDeleted then
+        return true, msg or str .. "." .. k .. " does not exist"
+    end
+end
+
 function ExportImport:CheckDeserializedOptions(tbl, refTbl, str)
     if str == nil and not tbl.version_major_num then
         return false, "Version conflict: version_major_num not seen"
     end
-    if str == nil and tbl.version_major_num ~= Gladdy.version_major_num then
-        return false, "Version conflict: " .. tbl.version_major_num .. " ~= " .. Gladdy.version_major_num
+    if str == nil and tbl.version_major_num > Gladdy.version_major_num then
+        return false, "Version conflict: Major v" .. tbl.version_major_num .. " ~= v" .. Gladdy.version_major_num
     end
     if str == nil then
         str = "Gladdy.db"
         tbl.version_major_num = nil
     end
-    for k,v in pairs(tbl) do
-        if refTbl[k] == nil then
-            return false, str .. "." .. k .. " does not exist"
-        else
-            if type(v) ~= type(refTbl[k]) then
-                return false, str .. "." .. k .. " type error. Expected " .. type(refTbl[k]) .. " found " .. type(v)
+    local res, msg
+    local errorFound, errorMsg
+    if refTbl == nil then
+        return false, str .. "does not exist"
+    else
+        for k,v in pairs(tbl) do
+            if refTbl[k] == nil then
+                errorFound, errorMsg = checkIsDeletedOption(k, str, nil, errorFound, errorMsg)
+            elseif type(v) ~= type(refTbl[k]) then
+                errorFound = true
+                errorMsg = str .. "." .. k .. " type error. Expected " .. type(refTbl[k]) .. " found " .. type(v)
             elseif type(v) == "table" then
-                ExportImport:CheckDeserializedOptions(v, refTbl[k], str .. "." .. k)
+                res, msg = ExportImport:CheckDeserializedOptions(v, refTbl[k], str .. "." .. k)
+                if not res then
+                    errorFound, errorMsg = checkIsDeletedOption(msg, str, msg, errorFound, errorMsg)
+                end
             end
         end
     end
+
+    if errorFound then
+        return false, errorMsg
+    end
     return true
 end
 
@@ -133,8 +189,8 @@ function ExportImport:GetOptions()
                 export.eb:HighlightText(0, export.eb.editBox:GetNumLetters())
                 export:SetStatusText("Copy this string to share your configuration with others.")
             end,
-            name = "Export",
-            desc = "Export your current profile to share with others or your various accounts.",
+            name = L["Export"],
+            desc = L["Export your current profile to share with others or your various accounts."],
             order = 3,
         },
         import = {
@@ -157,17 +213,28 @@ function ExportImport:GetOptions()
                     import.deserializedTable = deserialized
                 end)
             end,
-            name = "Import",
-            desc = "This will overwrite your current profile!",
+            name = L["Import"],
+            desc = L["This will overwrite your current profile!"],
             order = 4,
         },
     }
 end
 
-function ExportImport:ApplyImport(t, table)
+function ExportImport:ApplyImport(t, table, str)
+    if str == nil then
+        str = "Gladdy.db"
+        if (not t.newLayout) then
+            table.newLayout = false
+        end
+    end
     for k,v in pairs(t) do
         if type(v) == "table" then
-            ExportImport:ApplyImport(v, table[k])
+            if (table[k] ~= nil) then
+                ExportImport:ApplyImport(v, table[k], str .. "." .. k)
+            else
+                Gladdy:Debug("ERROR", "ApplyImport failed for", str .. "." .. k)
+            end
+
         else
             table[k] = v
         end

Modules/Healthbar.lua

@@ -1,6 +1,6 @@
 local pairs = pairs
 local floor = math.floor
-local UnitHealth, UnitHealthMax, UnitName, UnitExists = UnitHealth, UnitHealthMax, UnitName, UnitExists
+local UnitHealth, UnitHealthMax, UnitName, UnitExists, UnitIsDeadOrGhost = UnitHealth, UnitHealthMax, UnitName, UnitExists, UnitIsDeadOrGhost
 
 local CreateFrame = CreateFrame
 local RAID_CLASS_COLORS = RAID_CLASS_COLORS
@@ -8,7 +8,7 @@ local RAID_CLASS_COLORS = RAID_CLASS_COLORS
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
-local Healthbar = Gladdy:NewModule("Healthbar", 100, {
+local Healthbar = Gladdy:NewModule("Health Bar", 100, {
     healthBarFont = "DorisPP",
     healthBarHeight = 60,
     healthBarTexture = "Smooth",
@@ -19,14 +19,18 @@ local Healthbar = Gladdy:NewModule("Healthbar", 100, {
     healthBarFontColor = { r = 1, g = 1, b = 1, a = 1 },
     healthBarNameFontSize = 12,
     healthBarHealthFontSize = 12,
+    healthNameToArenaId = false,
     healthName = true,
     healthActual = false,
     healthMax = true,
     healthPercentage = true,
+    healthFrameStrata = "MEDIUM",
+    healthFrameLevel = 1,
 })
 
 function Healthbar:Initialize()
     self.frames = {}
+    self:RegisterMessage("JOINED_ARENA")
     self:RegisterMessage("ENEMY_SPOTTED")
     self:RegisterMessage("UNIT_DESTROYED")
     self:RegisterMessage("UNIT_DEATH")
@@ -36,32 +40,35 @@ function Healthbar:CreateFrame(unit)
     local button = Gladdy.buttons[unit]
 
     local healthBar = CreateFrame("Frame", nil, Gladdy.buttons[unit], BackdropTemplateMixin and "BackdropTemplate")
-    healthBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.healthBarBorderStyle),
+    healthBar:EnableMouse(false)
+    healthBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "healthBarBorderStyle"),
                                    edgeSize = Gladdy.db.healthBarBorderSize })
-    healthBar:SetBackdropBorderColor(Gladdy.db.healthBarBorderColor.r, Gladdy.db.healthBarBorderColor.g, Gladdy.db.healthBarBorderColor.b, Gladdy.db.healthBarBorderColor.a)
-    healthBar:SetFrameLevel(1)
+    healthBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.healthBarBorderColor))
+    healthBar:SetFrameStrata(Gladdy.db.healthFrameStrata)
+    healthBar:SetFrameLevel(Gladdy.db.healthFrameLevel)
 
     healthBar.hp = CreateFrame("StatusBar", nil, healthBar)
-    healthBar.hp:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.healthBarTexture))
+    healthBar.hp:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "healthBarTexture"))
     healthBar.hp:SetMinMaxValues(0, 100)
-    healthBar.hp:SetFrameLevel(0)
+    healthBar.hp:SetFrameStrata(Gladdy.db.healthFrameStrata)
+    healthBar.hp:SetFrameLevel(Gladdy.db.healthFrameLevel - 1)
 
     healthBar.bg = healthBar.hp:CreateTexture(nil, "BACKGROUND")
-    healthBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.healthBarTexture))
+    healthBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "healthBarTexture"))
     healthBar.bg:ClearAllPoints()
     healthBar.bg:SetAllPoints(healthBar.hp)
     healthBar.bg:SetAlpha(1)
-    healthBar.bg:SetVertexColor(Gladdy.db.healthBarBgColor.r, Gladdy.db.healthBarBgColor.g, Gladdy.db.healthBarBgColor.b, Gladdy.db.healthBarBgColor.a)
+    healthBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.healthBarBgColor))
 
     healthBar.nameText = healthBar:CreateFontString(nil, "LOW", "GameFontNormalSmall")
     if (Gladdy.db.healthBarNameFontSize < 1) then
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarNameFont), 1)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarNameFont"), 1)
         healthBar.nameText:Hide()
     else
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), Gladdy.db.healthBarNameFontSize)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize)
         healthBar.nameText:Show()
     end
-    healthBar.nameText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
+    healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
     healthBar.nameText:SetShadowOffset(1, -1)
     healthBar.nameText:SetShadowColor(0, 0, 0, 1)
     healthBar.nameText:SetJustifyH("CENTER")
@@ -69,13 +76,13 @@ function Healthbar:CreateFrame(unit)
 
     healthBar.healthText = healthBar:CreateFontString(nil, "LOW")
     if (Gladdy.db.healthBarHealthFontSize < 1) then
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), 1)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), 1)
         healthBar.healthText:Hide()
     else
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), Gladdy.db.healthBarHealthFontSize)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize)
         healthBar.healthText:Hide()
     end
-    healthBar.healthText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
+    healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
     healthBar.healthText:SetShadowOffset(1, -1)
     healthBar.healthText:SetShadowColor(0, 0, 0, 1)
     healthBar.healthText:SetJustifyH("CENTER")
@@ -92,12 +99,22 @@ function Healthbar:CreateFrame(unit)
 end
 
 function Healthbar.OnEvent(self, event, unit)
+    local isDead = UnitExists(unit) and UnitIsDeadOrGhost(unit)
     if event == "UNIT_HEALTH" then
+        if isDead then
+            Gladdy:SendMessage("UNIT_DEATH", unit)
+            return
+        end
         local health = UnitHealth(unit)
         local healthMax = UnitHealthMax(unit)
-        Healthbar:SetHealthText(self, health, healthMax)
+        self.hp:SetMinMaxValues(0, healthMax)
         self.hp:SetValue(UnitHealth(unit))
+        Healthbar:SetHealthText(self, health, healthMax)
     elseif event == "UNIT_MAXHEALTH" then
+        if isDead then
+            Gladdy:SendMessage("UNIT_DEATH", unit)
+            return
+        end
         local health = UnitHealth(unit)
         local healthMax = UnitHealthMax(unit)
         self.hp:SetMinMaxValues(0, healthMax)
@@ -106,7 +123,9 @@ function Healthbar.OnEvent(self, event, unit)
     elseif event == "UNIT_NAME_UPDATE" then
         local name = UnitName(unit)
         Gladdy.buttons[unit].name = name
-        self.nameText:SetText(name)
+        if Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
+            self.nameText:SetText(name)
+        end
     end
     if not Gladdy.buttons[unit].class then
         Gladdy:SpotEnemy(unit, true)
@@ -114,33 +133,16 @@ function Healthbar.OnEvent(self, event, unit)
 end
 
 function Healthbar:SetHealthText(healthBar, health, healthMax)
-    local healthText
+    local healthText = ""
     local healthPercentage = floor(health * 100 / healthMax)
 
-    if health == 0 then
+    if health == 0 and UnitExists(healthBar.unit) and UnitIsDeadOrGhost(healthBar.unit) then
         self:UNIT_DEATH(healthBar.unit)
         return
     end
 
-    if (Gladdy.db.healthActual) then
-        healthText = healthMax > 999 and ("%.1fk"):format(health / 1000) or health
-    end
-
-    if (Gladdy.db.healthMax) then
-        local text = healthMax > 999 and ("%.1fk"):format(healthMax / 1000) or healthMax
-        if (healthText) then
-            healthText = ("%s/%s"):format(healthText, text)
-        else
-            healthText = text
-        end
-    end
-
     if (Gladdy.db.healthPercentage) then
-        if (healthText) then
-            healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
-        else
-            healthText = ("%d%%"):format(healthPercentage)
-        end
+        healthText = ("%d%%"):format(healthPercentage)
     end
 
     healthBar.healthText:SetText(healthText)
@@ -152,43 +154,46 @@ function Healthbar:UpdateFrame(unit)
         return
     end
 
-    local iconSize = Gladdy.db.healthBarHeight + Gladdy.db.powerBarHeight
+    healthBar:SetFrameStrata(Gladdy.db.healthFrameStrata)
+    healthBar:SetFrameLevel(Gladdy.db.healthFrameLevel)
+    healthBar.hp:SetFrameStrata(Gladdy.db.healthFrameStrata)
+    healthBar.hp:SetFrameLevel(Gladdy.db.healthFrameLevel - 1)
 
-    healthBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.healthBarTexture))
-    healthBar.bg:SetVertexColor(Gladdy.db.healthBarBgColor.r, Gladdy.db.healthBarBgColor.g, Gladdy.db.healthBarBgColor.b, Gladdy.db.healthBarBgColor.a)
+    healthBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "healthBarTexture"))
+    healthBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.healthBarBgColor))
 
-    healthBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.healthBarBorderStyle),
+    healthBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "healthBarBorderStyle"),
                             edgeSize = Gladdy.db.healthBarBorderSize })
-    healthBar:SetBackdropBorderColor(Gladdy.db.healthBarBorderColor.r, Gladdy.db.healthBarBorderColor.g, Gladdy.db.healthBarBorderColor.b, Gladdy.db.healthBarBorderColor.a)
+    healthBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.healthBarBorderColor))
     healthBar:ClearAllPoints()
-    healthBar:SetPoint("TOPLEFT", Gladdy.buttons[unit], "TOPLEFT", iconSize, 0)
+    healthBar:SetPoint("TOPLEFT", Gladdy.buttons[unit], "TOPLEFT", 0, 0)
     healthBar:SetPoint("BOTTOMRIGHT", Gladdy.buttons[unit], "BOTTOMRIGHT")
 
-    healthBar.hp:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.healthBarTexture))
+    healthBar.hp:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "healthBarTexture"))
     healthBar.hp:ClearAllPoints()
     healthBar.hp:SetPoint("TOPLEFT", healthBar, "TOPLEFT", (Gladdy.db.healthBarBorderSize/Gladdy.db.statusbarBorderOffset), -(Gladdy.db.healthBarBorderSize/Gladdy.db.statusbarBorderOffset))
     healthBar.hp:SetPoint("BOTTOMRIGHT", healthBar, "BOTTOMRIGHT", -(Gladdy.db.healthBarBorderSize/Gladdy.db.statusbarBorderOffset), (Gladdy.db.healthBarBorderSize/Gladdy.db.statusbarBorderOffset))
 
     if (Gladdy.db.healthBarHealthFontSize < 1) then
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), 1)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), 1)
         healthBar.healthText:Hide()
     else
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), Gladdy.db.healthBarHealthFontSize)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarHealthFontSize)
         healthBar.healthText:Show()
     end
     if (Gladdy.db.healthBarNameFontSize < 1) then
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarNameFont), 1)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarNameFont"), 1)
         healthBar.nameText:Hide()
     else
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.healthBarFont), Gladdy.db.healthBarNameFontSize)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "healthBarFont"), Gladdy.db.healthBarNameFontSize)
         if Gladdy.db.healthName then
             healthBar.nameText:Show()
         else
             healthBar.nameText:Hide()
         end
     end
-    healthBar.nameText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
-    healthBar.healthText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
+    healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
+    healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.healthBarFontColor))
 end
 
 function Healthbar:ResetUnit(unit)
@@ -210,10 +215,20 @@ function Healthbar:Test(unit)
         return
     end
 
+    self:JOINED_ARENA()
     self:ENEMY_SPOTTED(unit)
     self:UNIT_HEALTH(unit, button.health, button.healthMax)
 end
 
+function Healthbar:JOINED_ARENA()
+    if Gladdy.db.healthNameToArenaId and Gladdy.db.healthName then
+        for i=1,Gladdy.curBracket do
+            local healthBar = self.frames["arena" .. i]
+            healthBar.nameText:SetText(i)
+        end
+    end
+end
+
 function Healthbar:ENEMY_SPOTTED(unit)
     local healthBar = self.frames[unit]
     local button = Gladdy.buttons[unit]
@@ -228,8 +243,13 @@ function Healthbar:ENEMY_SPOTTED(unit)
         healthBar.hp:SetValue(health)
         Healthbar:SetHealthText(healthBar, health, healthMax)
     end
-    healthBar.nameText:SetText(button.name)
-    healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[button.class].r, RAID_CLASS_COLORS[button.class].g, RAID_CLASS_COLORS[button.class].b, 1)
+    if button.name and Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
+        healthBar.nameText:SetText(button.name)
+    end
+
+    if button.class then
+        healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[button.class].r, RAID_CLASS_COLORS[button.class].g, RAID_CLASS_COLORS[button.class].b, 1)
+    end
 end
 
 function Healthbar:UNIT_HEALTH(unit, health, healthMax)
@@ -243,27 +263,10 @@ function Healthbar:UNIT_HEALTH(unit, health, healthMax)
     Gladdy:SendMessage("UNIT_HEALTH", unit, health, healthMax)
 
     local healthPercentage = floor(health * 100 / healthMax)
-    local healthText
-
-    if (Gladdy.db.healthActual) then
-        healthText = healthMax > 999 and ("%.1fk"):format(health / 1000) or health
-    end
-
-    if (Gladdy.db.healthMax) then
-        local text = healthMax > 999 and ("%.1fk"):format(healthMax / 1000) or healthMax
-        if (healthText) then
-            healthText = ("%s/%s"):format(healthText, text)
-        else
-            healthText = text
-        end
-    end
+    local healthText = ""
 
     if (Gladdy.db.healthPercentage) then
-        if (healthText) then
-            healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
-        else
-            healthText = ("%d%%"):format(healthPercentage)
-        end
+        healthText = ("%d%%"):format(healthPercentage)
     end
 
     healthBar.healthText:SetText(healthText)
@@ -300,7 +303,7 @@ local function option(params)
         set = function(info, value)
             local key = info.arg or info[#info]
             Gladdy.dbi.profile[key] = value
-            Gladdy.options.args.Healthbar.args.group.args.border.args.healthBarBorderSize.max = Gladdy.db.healthBarHeight/2
+            Gladdy.options.args["Health Bar"].args.group.args.border.args.healthBarBorderSize.max = Gladdy.db.healthBarHeight/2
             if Gladdy.db.healthBarBorderSize > Gladdy.db.healthBarHeight/2 then
                 Gladdy.db.healthBarBorderSize = Gladdy.db.healthBarHeight/2
             end
@@ -328,7 +331,7 @@ function Healthbar:GetOptions()
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 3,
             args = {
                 general = {
@@ -349,6 +352,7 @@ function Healthbar:GetOptions()
                             min = 10,
                             max = 100,
                             step = 1,
+                            width = "full",
                         }),
                         healthBarTexture = option({
                             type = "select",
@@ -400,6 +404,7 @@ function Healthbar:GetOptions()
                             step = 0.1,
                             min = 0,
                             max = 20,
+                            width = "full",
                         }),
                         healthBarHealthFontSize = option({
                             type = "range",
@@ -409,6 +414,7 @@ function Healthbar:GetOptions()
                             step = 0.1,
                             min = 0,
                             max = 20,
+                            width = "full",
                         }),
                     },
                 },
@@ -437,6 +443,7 @@ function Healthbar:GetOptions()
                             min = 0.5,
                             max = Gladdy.db.healthBarHeight/2,
                             step = 0.5,
+                            width = "full",
                         }),
                         healthBarBorderColor = Gladdy:colorOption({
                             type = "color",
@@ -447,10 +454,39 @@ function Healthbar:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 4,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        healthFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        healthFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 1,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
                 healthValues = {
                     type = "group",
                     name = L["Health Bar Text"],
-                    order = 4,
+                    order = 5,
                     args = {
                         header = {
                             type = "header",
@@ -459,27 +495,25 @@ function Healthbar:GetOptions()
                         },
                         healthName = option({
                             type = "toggle",
-                            name = L["Show the name"],
+                            name = L["Show name text"],
                             desc = L["Show the units name"],
-                            order = 30,
+                            order = 2,
+                            width = "full",
                         }),
-                        healthActual = option({
+                        healthNameToArenaId = option({
                             type = "toggle",
-                            name = L["Show the actual health"],
-                            desc = L["Show the actual health on the health bar"],
-                            order = 31,
-                        }),
-                        healthMax = option({
-                            type = "toggle",
-                            name = L["Show max health"],
-                            desc = L["Show max health on the health bar"],
-                            order = 32,
+                            name = L["Show ArenaX"],
+                            desc = L["Show 1-5 as name instead"],
+                            order = 3,
+                            width = "full",
+                            disabled = function() return not Gladdy.db.healthName end
                         }),
                         healthPercentage = option({
                             type = "toggle",
                             name = L["Show health percentage"],
                             desc = L["Show health percentage on the health bar"],
-                            order = 33,
+                            order = 6,
+                            width = "full",
                         }),
                     },
                 },

Modules/Highlight.lua

@@ -3,14 +3,18 @@ local CreateFrame, UnitIsUnit = CreateFrame, UnitIsUnit
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 local Highlight = Gladdy:NewModule("Highlight", nil, {
-    highlightBorderSize = 2,
+    highlightBorderSize = 1,
+    highlightInset = false,
     targetBorderColor = { r = 1, g = 0.8, b = 0, a = 1 },
     focusBorderColor = { r = 1, g = 0, b = 0, a = 1 },
     leaderBorderColor = { r = 0, g = 1, b = 0, a = 1 },
+    highlightBorderStyle = "Square Full White",
     highlight = true,
     targetBorder = true,
     focusBorder = true,
     leaderBorder = true,
+    highlightFrameStrata = "MEDIUM",
+    highlightFrameLevel = 20,
 })
 
 function Highlight:Initialize()
@@ -50,21 +54,24 @@ function Highlight:CreateFrame(unit)
         return
     end
 
-    local healthBar = Gladdy.modules.Healthbar.frames[unit]
+    local healthBar = Gladdy.modules["Health Bar"].frames[unit]
 
     local targetBorder = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate")
-    targetBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = Gladdy.db.highlightBorderSize })
-    targetBorder:SetFrameStrata("HIGH")
+    targetBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = Gladdy.db.highlightBorderSize })
+    targetBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    targetBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
     targetBorder:Hide()
 
     local focusBorder = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate")
-    focusBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = Gladdy.db.highlightBorderSize })
-    focusBorder:SetFrameStrata("LOW")
+    focusBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = Gladdy.db.highlightBorderSize })
+    focusBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    focusBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
     focusBorder:Hide()
 
     local leaderBorder = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate")
-    leaderBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = Gladdy.db.highlightBorderSize })
-    leaderBorder:SetFrameStrata("MEDIUM")
+    leaderBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = Gladdy.db.highlightBorderSize })
+    leaderBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    leaderBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
     leaderBorder:Hide()
 
     local highlight = healthBar:CreateTexture(nil, "OVERLAY")
@@ -87,31 +94,58 @@ function Highlight:UpdateFrame(unit)
         return
     end
 
+    local powerBarHeight = Gladdy.db.powerBarEnabled and (Gladdy.db.powerBarHeight + 1) or 0
     local borderSize = Gladdy.db.highlightBorderSize
-    local iconSize = Gladdy.db.healthBarHeight + Gladdy.db.powerBarHeight + 1
-    local width = Gladdy.db.barWidth + borderSize * 2
-    local height = iconSize + borderSize * 2
+    local borderOffset = borderSize
+    local hpAndPowerHeight = Gladdy.db.healthBarHeight + powerBarHeight
+    local width = Gladdy.db.barWidth + (Gladdy.db.highlightInset and 0 or borderSize * 2)
+    local height = hpAndPowerHeight + (Gladdy.db.highlightInset and 0 or borderSize * 2)
+
+    button.targetBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    button.targetBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
+    button.focusBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    button.focusBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
+    button.leaderBorder:SetFrameStrata(Gladdy.db.highlightFrameStrata)
+    button.leaderBorder:SetFrameLevel(Gladdy.db.highlightFrameLevel)
 
     button.targetBorder:SetWidth(width)
     button.targetBorder:SetHeight(height)
     button.targetBorder:ClearAllPoints()
-    button.targetBorder:SetPoint("TOP", button.healthBar, "TOP", 0, borderSize)
-    button.targetBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = borderSize })
-    button.targetBorder:SetBackdropBorderColor(Gladdy.db.targetBorderColor.r, Gladdy.db.targetBorderColor.g, Gladdy.db.targetBorderColor.b, Gladdy.db.targetBorderColor.a)
+    if Gladdy.db.highlightInset then
+        button.targetBorder:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT", -(borderOffset/Gladdy.db.statusbarBorderOffset), (borderOffset/Gladdy.db.statusbarBorderOffset))
+        button.targetBorder:SetPoint("BOTTOMRIGHT",  Gladdy.db.powerBarEnabled and button.powerBar or button.healthBar, "BOTTOMRIGHT", (borderOffset/Gladdy.db.statusbarBorderOffset), -(borderOffset/Gladdy.db.statusbarBorderOffset))
+    else
+        button.targetBorder:SetPoint("TOP", button.healthBar, "TOP", 0, (Gladdy.db.highlightInset and 0 or borderSize))
+    end
+
+    button.targetBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = borderSize })
+    button.targetBorder:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.targetBorderColor))
 
     button.focusBorder:SetWidth(width)
     button.focusBorder:SetHeight(height)
     button.focusBorder:ClearAllPoints()
-    button.focusBorder:SetPoint("TOP", button.healthBar, "TOP", 0, borderSize)
-    button.focusBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = borderSize })
-    button.focusBorder:SetBackdropBorderColor(Gladdy.db.focusBorderColor.r, Gladdy.db.focusBorderColor.g, Gladdy.db.focusBorderColor.b, Gladdy.db.focusBorderColor.a)
+    if Gladdy.db.highlightInset then
+        button.focusBorder:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT", -(borderOffset/Gladdy.db.statusbarBorderOffset), (borderOffset/Gladdy.db.statusbarBorderOffset))
+        button.focusBorder:SetPoint("BOTTOMRIGHT", Gladdy.db.powerBarEnabled and button.powerBar or button.healthBar, "BOTTOMRIGHT", (borderOffset/Gladdy.db.statusbarBorderOffset), -(borderOffset/Gladdy.db.statusbarBorderOffset))
+    else
+        button.focusBorder:SetPoint("TOP", button.healthBar, "TOP", 0, (Gladdy.db.highlightInset and 0 or borderSize))
+    end
+
+    button.focusBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = borderSize })
+    button.focusBorder:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.focusBorderColor))
 
     button.leaderBorder:SetWidth(width)
     button.leaderBorder:SetHeight(height)
     button.leaderBorder:ClearAllPoints()
-    button.leaderBorder:SetPoint("TOP", button.healthBar, "TOP", 0, borderSize)
-    button.leaderBorder:SetBackdrop({ edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = borderSize })
-    button.leaderBorder:SetBackdropBorderColor(Gladdy.db.leaderBorderColor.r, Gladdy.db.leaderBorderColor.g, Gladdy.db.leaderBorderColor.b, Gladdy.db.leaderBorderColor.a)
+    if Gladdy.db.highlightInset then
+        button.leaderBorder:SetPoint("TOPLEFT", button.healthBar, "TOPLEFT", -(borderOffset/Gladdy.db.statusbarBorderOffset), (borderOffset/Gladdy.db.statusbarBorderOffset))
+        button.leaderBorder:SetPoint("BOTTOMRIGHT", button.powerBar, "BOTTOMRIGHT", (borderOffset/Gladdy.db.statusbarBorderOffset), -(borderOffset/Gladdy.db.statusbarBorderOffset))
+    else
+        button.leaderBorder:SetPoint("TOP", button.healthBar, "TOP", 0, (Gladdy.db.highlightInset and 0 or borderSize))
+    end
+
+    button.leaderBorder:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "highlightBorderStyle"), edgeSize = borderSize })
+    button.leaderBorder:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.leaderBorderColor))
     if Gladdy.frame.testing then
         Highlight:Test(unit)
     end
@@ -135,7 +169,7 @@ function Highlight:Test(unit)
     elseif (unit == "arena2") then
         self:Toggle(unit, "target", true)
     elseif (unit == "arena3") then
-        self:Toggle(unit, "leader", true)
+        --self:Toggle(unit, "leader", true)
     end
 end
 
@@ -179,64 +213,136 @@ function Highlight:GetOptions()
             name = L["Highlight"],
             order = 2,
         },
-        highlightBorderSize = {
-            type = "range",
-            name = L["Border size"],
-            desc = L["Border size"],
+        highlightInset = Gladdy:option({
+            type = "toggle",
+            name = L["Show Inside"],
+            desc = L["Show Highlight border inside of frame"],
             order = 3,
-            min = 1,
-            max = 10,
-            step = 1,
+        }),
+        group = {
+            type = "group",
+            childGroups = "tree",
+            name = L["Frame"],
+            order = 3,
+            args = {
+                enabled = {
+                    type = "group",
+                    name = L["Enabled"],
+                    order = 1,
+                    args = {
+                        headerEnable = {
+                            type = "header",
+                            name = L["Enabled"],
+                            order = 10,
+                        },
+                        highlight = Gladdy:option({
+                            type = "toggle",
+                            name = L["Highlight target"],
+                            desc = L["Toggle if the selected target should be highlighted"],
+                            order = 11,
+                            width = "full",
+                        }),
+                        targetBorder = Gladdy:option({
+                            type = "toggle",
+                            name = L["Show border around target"],
+                            desc = L["Toggle if a border should be shown around the selected target"],
+                            order = 12,
+                            width = "full",
+                        }),
+                        focusBorder = Gladdy:option({
+                            type = "toggle",
+                            name = L["Show border around focus"],
+                            desc = L["Toggle of a border should be shown around the current focus"],
+                            order = 13,
+                            width = "full",
+                        }),
+                    },
+                },
+                border = {
+                    type = "group",
+                    name = L["Border"],
+                    order = 2,
+                    args = {
+                        headerHighlight = {
+                            type = "header",
+                            name = L["Border"],
+                            order = 2,
+                        },
+                        highlightBorderSize = Gladdy:option({
+                            type = "range",
+                            name = L["Border size"],
+                            desc = L["Border size"],
+                            order = 4,
+                            min = 1,
+                            max = 20,
+                            step = 1,
+                            width = "full",
+                        }),
+                        highlightBorderStyle = Gladdy:option({
+                            type = "select",
+                            name = L["Border style"],
+                            order = 5,
+                            dialogControl = "LSM30_Border",
+                            values = AceGUIWidgetLSMlists.border,
+                        }),
+                    },
+                },
+                color = {
+                    type = "group",
+                    name = L["Color"],
+                    order = 3,
+                    args = {
+                        headerColor = {
+                            type = "header",
+                            name = L["Colors"],
+                            order = 6,
+                        },
+                        targetBorderColor = Gladdy:colorOption({
+                            type = "color",
+                            name = L["Target border color"],
+                            desc = L["Color of the selected targets border"],
+                            order = 7,
+                            hasAlpha = true,
+                        }),
+                        focusBorderColor = Gladdy:colorOption({
+                            type = "color",
+                            name = L["Focus border color"],
+                            desc = L["Color of the focus border"],
+                            order = 8,
+                            hasAlpha = true,
+                        }),
+                    },
+                },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 4,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        highlightFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        highlightFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 1,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
+            },
         },
-        targetBorderColor = Gladdy:colorOption({
-            type = "color",
-            name = L["Target border color"],
-            desc = L["Color of the selected targets border"],
-            order = 4,
-            hasAlpha = true,
-        }),
-        focusBorderColor = Gladdy:colorOption({
-            type = "color",
-            name = L["Focus border color"],
-            desc = L["Color of the focus border"],
-            order = 5,
-            hasAlpha = true,
-        }),
-        leaderBorderColor = Gladdy:colorOption({
-            type = "color",
-            name = L["Raid leader border color"],
-            desc = L["Color of the raid leader border"],
-            order = 6,
-            hasAlpha = true,
-        }),
-        headerEnable = {
-            type = "header",
-            name = L["Enable/Disable"],
-            order = 10,
-        },
-        highlight = Gladdy:option({
-            type = "toggle",
-            name = L["Highlight target"],
-            desc = L["Toggle if the selected target should be highlighted"],
-            order = 11,
-        }),
-        targetBorder = Gladdy:option({
-            type = "toggle",
-            name = L["Show border around target"],
-            desc = L["Toggle if a border should be shown around the selected target"],
-            order = 12,
-        }),
-        focusBorder = Gladdy:option({
-            type = "toggle",
-            name = L["Show border around focus"],
-            desc = L["Toggle of a border should be shown around the current focus"],
-            order = 13,
-        }),
-        leaderBorder = Gladdy:option({
-            type = "toggle",
-            name = L["Show border around raid leader"],
-            desc = L["Toggle if a border should be shown around the raid leader"],
-            order = 14,
-        }),
     }
 end

Modules/Pets.lua

@@ -1,12 +1,12 @@
 local string_gsub, floor, pairs = string.gsub, math.floor, pairs
-local CreateFrame = CreateFrame
+local CreateFrame, SetPortraitTexture = CreateFrame, SetPortraitTexture
 local UnitHealthMax, UnitHealth, UnitGUID = UnitHealthMax, UnitHealth, UnitGUID
 
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 local Pets = Gladdy:NewModule("Pets", nil, {
     petEnabled = true,
-    petWidth = 100,
+    petWidth = 128,
     petHeight = 20,
     petPortraitEnabled = true,
     petPortraitBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
@@ -21,8 +21,12 @@ local Pets = Gladdy:NewModule("Pets", nil, {
     petHealthBarFontColor = { r = 1, g = 1, b = 1, a = 1 },
     petHealthBarFontSize = 12,
     petHealthPercentage = true,
-    petXOffset = 50,
-    petYOffset = 0,
+    petXOffset = 1,
+    petYOffset = -62,
+    petGroup = false,
+    petMargin = 1,
+    petFrameStrata = "MEDIUM",
+    petFrameLevel = 5,
 })
 
 function Pets:Initialize()
@@ -35,12 +39,12 @@ function Pets:Initialize()
 end
 
 function Pets:JOINED_ARENA()
-    for k,v in pairs(self.frames) do
+    for _,v in pairs(self.frames) do
         v.healthBar:SetAlpha(0)
     end
     if Gladdy.db.petEnabled then
         self:RegisterEvent("UNIT_PET")
-        self:SetScript("OnEvent", function(self, event, unitId)
+        self:SetScript("OnEvent", function(_, event, unitId)
             if event == "UNIT_PET" then
                 local unit = Gladdy.guids[UnitGUID(unitId)]
                 if unit then
@@ -63,9 +67,10 @@ function Pets:ResetUnit(unitId)
 end
 
 function Pets:PET_SPOTTED(unit)
+    Gladdy.guids[UnitGUID(unit)] = unit
     if Gladdy.db.petEnabled then
         self.frames[unit].healthBar:SetAlpha(1)
-        self.frames[unit].healthBar.hp:SetStatusBarColor(Gladdy.db.petHealthBarColor.r, Gladdy.db.petHealthBarColor.g, Gladdy.db.petHealthBarColor.b, Gladdy.db.petHealthBarColor.a)
+        self.frames[unit].healthBar.hp:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.petHealthBarColor))
         self.frames[unit].healthBar:SetScript("OnUpdate", function(self)
             self.hp:SetValue(UnitHealth(self.unit))
             Pets:SetHealthText(self, UnitHealth(unit), UnitHealthMax(unit))
@@ -124,6 +129,7 @@ function Pets:Test(unitId)
         petFrame.healthBar.hp:SetMinMaxValues(0, 6200)
         petFrame.healthBar.hp:SetValue(2000)
         Pets:SetHealthText(petFrame.healthBar, 2000, 6200)
+        SetPortraitTexture(petFrame.healthBar.portrait, "player")
     end
 end
 
@@ -133,12 +139,13 @@ function Pets:CreateFrame(unitId)
         return
     end
     local button = CreateFrame("Frame", "GladdyButtonFramePet" .. unit, Gladdy.frame)
+    button:SetMovable(true)
     --button:SetAlpha(0)
     button:SetPoint("LEFT", Gladdy.buttons[unitId].healthBar, "RIGHT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
 
-    local secure = CreateFrame("Button", "GladdyButton" .. unit, button, "SecureActionButtonTemplate")
-    secure:RegisterForClicks("AnyUp")
+    local secure = CreateFrame("Button", "GladdyButton" .. unit, button, "SecureActionButtonTemplate, SecureHandlerEnterLeaveTemplate")
     secure:RegisterForClicks("AnyUp")
+    secure:RegisterForClicks("AnyDown")
     secure:SetAttribute("*type1", "target")
     secure:SetAttribute("*type2", "focus")
     secure:SetAttribute("unit", unit)
@@ -148,46 +155,48 @@ function Pets:CreateFrame(unitId)
     button.secure = secure
 
     local healthBar = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate")
-    healthBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.petHealthBarBorderStyle),
+    healthBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "petHealthBarBorderStyle"),
                             edgeSize = Gladdy.db.petHealthBarBorderSize })
-    healthBar:SetBackdropBorderColor(Gladdy.db.petHealthBarBorderColor.r, Gladdy.db.petHealthBarBorderColor.g, Gladdy.db.petHealthBarBorderColor.b, Gladdy.db.petHealthBarBorderColor.a)
-    healthBar:SetFrameLevel(1)
+    healthBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.petHealthBarBorderColor))
+    healthBar:SetFrameStrata(Gladdy.db.petFrameStrata)
+    healthBar:SetFrameLevel(Gladdy.db.petFrameLevel)
     healthBar:SetAllPoints(button)
     healthBar:SetAlpha(0)
 
-    healthBar.portrait = healthBar:CreateTexture(nil, "OVERLAY")
+    healthBar.portrait = healthBar:CreateTexture(nil, "BACKGROUND")
     healthBar.portrait:SetPoint("LEFT", healthBar, "RIGHT")
     healthBar.portrait:SetTexCoord(0.1, 0.9, 0.1, 0.9)
     SetPortraitTexture(healthBar.portrait, "player")
     healthBar.portrait.border = healthBar:CreateTexture(nil, "OVERLAY")
     healthBar.portrait.border:SetAllPoints(healthBar.portrait)
     healthBar.portrait.border:SetTexture(Gladdy.db.classIconBorderStyle)
-    healthBar.portrait.border:SetVertexColor(Gladdy.db.petHealthBarBorderColor.r, Gladdy.db.petHealthBarBorderColor.g, Gladdy.db.petHealthBarBorderColor.b, Gladdy.db.petHealthBarBorderColor.a)
+    healthBar.portrait.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.petHealthBarBorderColor))
 
 
     healthBar.hp = CreateFrame("StatusBar", nil, healthBar)
-    healthBar.hp:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.petHealthBarTexture))
-    healthBar.hp:SetStatusBarColor(Gladdy.db.petHealthBarColor.r, Gladdy.db.petHealthBarColor.g, Gladdy.db.petHealthBarColor.b, Gladdy.db.petHealthBarColor.a)
+    healthBar.hp:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "petHealthBarTexture"))
+    healthBar.hp:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.petHealthBarColor))
     healthBar.hp:SetMinMaxValues(0, 100)
-    healthBar.hp:SetFrameLevel(0)
+    healthBar.hp:SetFrameStrata(Gladdy.db.petFrameStrata)
+    healthBar.hp:SetFrameLevel(Gladdy.db.petFrameLevel - 1)
     healthBar.hp:SetAllPoints(healthBar)
 
     healthBar.bg = healthBar.hp:CreateTexture(nil, "BACKGROUND")
-    healthBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.petHealthBarTexture))
+    healthBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "petHealthBarTexture"))
     healthBar.bg:ClearAllPoints()
     healthBar.bg:SetAllPoints(healthBar.hp)
     healthBar.bg:SetAlpha(1)
-    healthBar.bg:SetVertexColor(Gladdy.db.petHealthBarBgColor.r, Gladdy.db.petHealthBarBgColor.g, Gladdy.db.petHealthBarBgColor.b, Gladdy.db.petHealthBarBgColor.a)
+    healthBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.petHealthBarBgColor))
 
     healthBar.nameText = healthBar:CreateFontString(nil, "LOW", "GameFontNormalSmall")
     if (Gladdy.db.petHealthBarFontSize < 1) then
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), 1)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), 1)
         healthBar.nameText:Hide()
     else
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), Gladdy.db.petHealthBarFontSize)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), Gladdy.db.petHealthBarFontSize)
         healthBar.nameText:Show()
     end
-    healthBar.nameText:SetTextColor(Gladdy.db.petHealthBarFontColor.r, Gladdy.db.petHealthBarFontColor.g, Gladdy.db.petHealthBarFontColor.b, Gladdy.db.petHealthBarFontColor.a)
+    healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.petHealthBarFontColor))
     healthBar.nameText:SetShadowOffset(1, -1)
     healthBar.nameText:SetShadowColor(0, 0, 0, 1)
     healthBar.nameText:SetJustifyH("CENTER")
@@ -195,13 +204,13 @@ function Pets:CreateFrame(unitId)
 
     healthBar.healthText = healthBar:CreateFontString(nil, "LOW")
     if (Gladdy.db.petHealthBarFontSize < 1) then
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), 1)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), 1)
         healthBar.healthText:Hide()
     else
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), Gladdy.db.petHealthBarFontSize)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), Gladdy.db.petHealthBarFontSize)
         healthBar.healthText:Hide()
     end
-    healthBar.healthText:SetTextColor(Gladdy.db.petHealthBarFontColor.r, Gladdy.db.petHealthBarFontColor.g, Gladdy.db.petHealthBarFontColor.b, Gladdy.db.petHealthBarFontColor.a)
+    healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.petHealthBarFontColor))
     healthBar.healthText:SetShadowOffset(1, -1)
     healthBar.healthText:SetShadowColor(0, 0, 0, 1)
     healthBar.healthText:SetJustifyH("CENTER")
@@ -240,6 +249,11 @@ function Pets:UpdateFrame(unitId)
         return
     end
 
+    healthBar:SetFrameStrata(Gladdy.db.petFrameStrata)
+    healthBar:SetFrameLevel(Gladdy.db.petFrameLevel)
+    healthBar.hp:SetFrameStrata(Gladdy.db.petFrameStrata)
+    healthBar.hp:SetFrameLevel(Gladdy.db.petFrameLevel - 1)
+
     if not Gladdy.db.petEnabled then
         self.frames[unit]:Hide()
     else
@@ -248,7 +262,22 @@ function Pets:UpdateFrame(unitId)
 
     self.frames[unit]:SetWidth(Gladdy.db.petWidth)
     self.frames[unit]:SetHeight(Gladdy.db.petHeight)
-    self.frames[unit]:SetPoint("LEFT", Gladdy.buttons[unitId].healthBar, "RIGHT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+
+    Gladdy:SetPosition(self.frames[unit], unitId, "petXOffset", "petYOffset", Pets:LegacySetPosition(unit, unitId), Pets)
+
+    if (Gladdy.db.petGroup) then
+        if (unit == "arenapet1") then
+            self.frames[unit]:ClearAllPoints()
+            self.frames[unit]:SetPoint("TOPLEFT", Gladdy.buttons[unitId].healthBar, "TOPLEFT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+        else
+            local previousPet = "arenapet" .. string_gsub(unit, "arenapet", "") - 1
+            self.frames[unit]:ClearAllPoints()
+            self.frames[unit]:SetPoint("TOPLEFT", self.frames[previousPet], "BOTTOMLEFT", 0, - Gladdy.db.petMargin)
+        end
+    else
+        self.frames[unit]:ClearAllPoints()
+        self.frames[unit]:SetPoint("TOPLEFT", Gladdy.buttons[unitId].healthBar, "TOPLEFT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+    end
 
     healthBar.portrait:SetHeight(Gladdy.db.petHeight)
     healthBar.portrait:SetWidth(Gladdy.db.petHeight)
@@ -260,34 +289,37 @@ function Pets:UpdateFrame(unitId)
         healthBar.portrait.border:Show()
     end
     healthBar.portrait.border:SetTexture(Gladdy.db.petPortraitBorderStyle)
-    healthBar.portrait.border:SetVertexColor(Gladdy.db.petHealthBarBorderColor.r, Gladdy.db.petHealthBarBorderColor.g, Gladdy.db.petHealthBarBorderColor.b, Gladdy.db.petHealthBarBorderColor.a)
+    healthBar.portrait.border:SetVertexColor(Gladdy:SetColor(Gladdy.db.petHealthBarBorderColor))
 
-    healthBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.petHealthBarTexture))
-    healthBar.bg:SetVertexColor(Gladdy.db.petHealthBarBgColor.r, Gladdy.db.petHealthBarBgColor.g, Gladdy.db.petHealthBarBgColor.b, Gladdy.db.petHealthBarBgColor.a)
+    healthBar.bg:SetTexture(Gladdy:SMFetch("statusbar",  "petHealthBarTexture"))
+    healthBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.petHealthBarBgColor))
 
-    healthBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.petHealthBarBorderStyle),
+    healthBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "petHealthBarBorderStyle"),
                             edgeSize = Gladdy.db.petHealthBarBorderSize })
-    healthBar:SetBackdropBorderColor(Gladdy.db.petHealthBarBorderColor.r, Gladdy.db.petHealthBarBorderColor.g, Gladdy.db.petHealthBarBorderColor.b, Gladdy.db.petHealthBarBorderColor.a)
+    healthBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.petHealthBarBorderColor))
 
-    healthBar.hp:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.petHealthBarTexture))
-    healthBar.hp:SetStatusBarColor(Gladdy.db.petHealthBarColor.r, Gladdy.db.petHealthBarColor.g, Gladdy.db.petHealthBarColor.b, Gladdy.db.petHealthBarColor.a)
+    healthBar.hp:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "petHealthBarTexture"))
+    healthBar.hp:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.petHealthBarColor))
     healthBar.hp:ClearAllPoints()
     healthBar.hp:SetPoint("TOPLEFT", healthBar, "TOPLEFT", (Gladdy.db.petHealthBarBorderSize/Gladdy.db.statusbarBorderOffset), -(Gladdy.db.petHealthBarBorderSize/Gladdy.db.statusbarBorderOffset))
     healthBar.hp:SetPoint("BOTTOMRIGHT", healthBar, "BOTTOMRIGHT", -(Gladdy.db.petHealthBarBorderSize/Gladdy.db.statusbarBorderOffset), (Gladdy.db.petHealthBarBorderSize/Gladdy.db.statusbarBorderOffset))
 
     if (Gladdy.db.petHealthBarFontSize < 1) then
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), 1)
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), 1)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), 1)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), 1)
         healthBar.nameText:Hide()
         healthBar.healthText:Hide()
     else
-        healthBar.nameText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), Gladdy.db.petHealthBarFontSize)
+        healthBar.nameText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), Gladdy.db.petHealthBarFontSize)
         healthBar.nameText:Show()
-        healthBar.healthText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.petHealthBarFont), Gladdy.db.petHealthBarFontSize)
+        healthBar.healthText:SetFont(Gladdy:SMFetch("font", "petHealthBarFont"), Gladdy.db.petHealthBarFontSize)
         healthBar.healthText:Show()
     end
-    healthBar.nameText:SetTextColor(Gladdy.db.petHealthBarFontColor.r, Gladdy.db.petHealthBarFontColor.g, Gladdy.db.petHealthBarFontColor.b, Gladdy.db.petHealthBarFontColor.a)
-    healthBar.healthText:SetTextColor(Gladdy.db.petHealthBarFontColor.r, Gladdy.db.petHealthBarFontColor.g, Gladdy.db.petHealthBarFontColor.b, Gladdy.db.petHealthBarFontColor.a)
+    healthBar.nameText:SetTextColor(Gladdy:SetColor(Gladdy.db.petHealthBarFontColor))
+    healthBar.healthText:SetTextColor(Gladdy:SetColor(Gladdy.db.petHealthBarFontColor))
+    if (unit == "arenapet1") then
+        Gladdy:CreateMover(self.frames[unit], "petXOffset", "petYOffset", L["Pets"], {"TOPLEFT", "TOPLEFT"})
+    end
 end
 
 function Pets:SetHealthText(healthBar, health, healthMax)
@@ -332,21 +364,21 @@ end
 
 function Pets:GetOptions()
     return {
-        headerHealthbar = {
+        header = {
             type = "header",
-            name = L["Health Bar"],
+            name = L["Pets"],
             order = 2,
         },
         petEnabled = Gladdy:option({
             type = "toggle",
-            name = L["Enable"],
-            desc = L["Enabled Pets module"],
+            name = L["Enabled"],
+            desc = L["Enables Pets module"],
             order = 3,
         }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 3,
             args = {
                 general = {
@@ -367,6 +399,7 @@ function Pets:GetOptions()
                             min = 10,
                             max = 100,
                             step = 1,
+                            width = "full",
                         }),
                         petWidth = option({
                             type = "range",
@@ -374,14 +407,32 @@ function Pets:GetOptions()
                             desc = L["Width of the bar"],
                             order = 4,
                             min = 10,
-                            max = 100,
+                            max = 300,
                             step = 1,
+                            width = "full",
+                        }),
+                        petGroup = option({
+                            type = "toggle",
+                            name = L["Group Pets"],
+                            order = 5,
+                        }),
+                        petMargin = option({
+                            type = "range",
+                            name = L["Margin"],
+                            desc = L["Height of the bar"],
+                            order = 6,
+                            disabled = function()
+                                return not Gladdy.db.petGroup
+                            end,
+                            min = 0,
+                            max = 50,
+                            step = .1,
                         }),
                         petHealthBarTexture = option({
                             type = "select",
                             name = L["Bar texture"],
                             desc = L["Texture of the bar"],
-                            order = 5,
+                            order = 7,
                             dialogControl = "LSM30_Statusbar",
                             values = AceGUIWidgetLSMlists.statusbar,
                         }),
@@ -389,14 +440,14 @@ function Pets:GetOptions()
                             type = "color",
                             name = L["Health color"],
                             desc = L["Color of the status bar"],
-                            order = 6,
+                            order = 8,
                             hasAlpha = true,
                         }),
                         petHealthBarBgColor = Gladdy:colorOption({
                             type = "color",
                             name = L["Background color"],
                             desc = L["Color of the status bar background"],
-                            order = 7,
+                            order = 9,
                             hasAlpha = true,
                         }),
                     },
@@ -457,6 +508,7 @@ function Pets:GetOptions()
                             order = 13,
                             min = 0,
                             max = 20,
+                            width = "full",
                         }),
                     },
                 },
@@ -485,6 +537,7 @@ function Pets:GetOptions()
                             min = 0.5,
                             max = Gladdy.db.petHeight/2,
                             step = 0.5,
+                            width = "full",
                         }),
                         petHealthBarBorderColor = Gladdy:colorOption({
                             type = "color",
@@ -512,6 +565,7 @@ function Pets:GetOptions()
                             min = -600,
                             max = 600,
                             step = 0.1,
+                            width = "full",
                         }),
                         petYOffset = Gladdy:option({
                             type = "range",
@@ -520,13 +574,43 @@ function Pets:GetOptions()
                             min = -600,
                             max = 600,
                             step = 0.1,
+                            width = "full",
                         }),
                     }
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        petFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        petFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 1,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
                 healthValues = {
                     type = "group",
                     name = L["Health Values"],
-                    order = 6,
+                    order = 7,
                     args = {
                         header = {
                             type = "header",
@@ -545,3 +629,30 @@ function Pets:GetOptions()
         },
     }
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Pets:LegacySetPosition(unit, unitId)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    self.frames[unit]:ClearAllPoints()
+    self.frames[unit]:SetPoint("LEFT", Gladdy.buttons[unitId].healthBar, "RIGHT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+    if (Gladdy.db.petGroup) then
+        if (unit == "arenapet1") then
+            self.frames[unit]:SetPoint("LEFT", Gladdy.buttons[unitId].healthBar, "RIGHT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+        else
+            local previousPet = "arenapet" .. string_gsub(unit, "arenapet", "") - 1
+            self.frames[unit]:ClearAllPoints()
+            self.frames[unit]:SetPoint("TOPLEFT", self.frames[previousPet], "BOTTOMLEFT", 0, - Gladdy.db.petMargin)
+        end
+    else
+        self.frames[unit]:ClearAllPoints()
+        self.frames[unit]:SetPoint("LEFT", Gladdy.buttons[unitId].healthBar, "RIGHT", Gladdy.db.petXOffset, Gladdy.db.petYOffset)
+    end
+    return Gladdy.db.newLayout
+end

Modules/Powerbar.lua

@@ -6,7 +6,8 @@ local CreateFrame, UnitPower, UnitPowerType, UnitPowerMax, UnitExists = CreateFr
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
 local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
-local Powerbar = Gladdy:NewModule("Powerbar", 90, {
+local Powerbar = Gladdy:NewModule("Power Bar", 90, {
+    powerBarEnabled = true,
     powerBarFont = "DorisPP",
     powerBarHeight = 20,
     powerBarTexture = "Smooth",
@@ -21,6 +22,8 @@ local Powerbar = Gladdy:NewModule("Powerbar", 90, {
     powerActual = true,
     powerMax = true,
     powerPercentage = false,
+    powerFrameStrata = "MEDIUM",
+    powerFrameLevel = 1,
 })
 
 function Powerbar:Initialize()
@@ -36,33 +39,36 @@ function Powerbar:CreateFrame(unit)
     local button = Gladdy.buttons[unit]
 
     local powerBar = CreateFrame("Frame", nil, Gladdy.buttons[unit], BackdropTemplateMixin and "BackdropTemplate")
-    powerBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.powerBarBorderStyle),
+    powerBar:EnableMouse(false)
+    powerBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "powerBarBorderStyle"),
                                   edgeSize = Gladdy.db.powerBarBorderSize })
-    powerBar:SetBackdropBorderColor(Gladdy.db.powerBarBorderColor.r, Gladdy.db.powerBarBorderColor.g, Gladdy.db.powerBarBorderColor.b, Gladdy.db.powerBarBorderColor.a)
-    powerBar:SetFrameLevel(1)
+    powerBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.powerBarBorderColor))
+    powerBar:SetFrameStrata(Gladdy.db.powerFrameStrata)
+    powerBar:SetFrameLevel(Gladdy.db.powerFrameLevel)
 
     powerBar.energy = CreateFrame("StatusBar", nil, powerBar)
-    powerBar.energy:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture))
+    powerBar.energy:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "powerBarTexture"))
     powerBar.energy:SetMinMaxValues(0, 100)
-    powerBar.energy:SetFrameLevel(0)
+    powerBar.energy:SetFrameStrata(Gladdy.db.powerFrameStrata)
+    powerBar.energy:SetFrameLevel(Gladdy.db.powerFrameLevel - 1)
 
     powerBar.bg = powerBar.energy:CreateTexture(nil, "BACKGROUND")
-    powerBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture))
+    powerBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "powerBarTexture"))
     powerBar.bg:ClearAllPoints()
     powerBar.bg:SetAllPoints(powerBar.energy)
-    powerBar.bg:SetVertexColor(Gladdy.db.powerBarBgColor.r, Gladdy.db.powerBarBgColor.g, Gladdy.db.powerBarBgColor.b, Gladdy.db.powerBarBgColor.a)
+    powerBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.powerBarBgColor))
 
     powerBar.raceText = powerBar:CreateFontString(nil, "LOW")
-    powerBar.raceText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.powerBarFont), Gladdy.db.powerBarFontSize)
-    powerBar.raceText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
+    powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
+    powerBar.raceText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
     powerBar.raceText:SetShadowOffset(1, -1)
     powerBar.raceText:SetShadowColor(0, 0, 0, 1)
     powerBar.raceText:SetJustifyH("CENTER")
     powerBar.raceText:SetPoint("LEFT", 5, 1)
 
     powerBar.powerText = powerBar:CreateFontString(nil, "LOW")
-    powerBar.powerText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.powerBarFont), Gladdy.db.powerBarFontSize)
-    powerBar.powerText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
+    powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
+    powerBar.powerText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
     powerBar.powerText:SetShadowOffset(1, -1)
     powerBar.powerText:SetShadowColor(0, 0, 0, 1)
     powerBar.powerText:SetJustifyH("CENTER")
@@ -112,17 +118,24 @@ function Powerbar:SetPower(powerBar, power, powerMax, powerType)
         end
     end
 
-    if (powerType == 1) then
+    if (powerType == 1 and powerBar.powerType ~= powerType) then
         powerBar.energy:SetStatusBarColor(1, 0, 0, 1)
-    elseif (powerType == 3) then
+        powerBar.powerColor = {r = 1, g = 0, b = 0}
+        powerBar.powerType = powerType
+    elseif (powerType == 3 and powerBar.powerType ~= powerType) then
         powerBar.energy:SetStatusBarColor(1, 1, 0, 1)
-    else
+        powerBar.powerColor = {r = 1, g = 1, b = 0}
+        powerBar.powerType = powerType
+    elseif powerBar.powerType ~= powerType then
         powerBar.energy:SetStatusBarColor(.18, .44, .75, 1)
+        powerBar.powerColor = {r = .18, g = .44, b = .75}
+        powerBar.powerType = powerType
     end
 
     powerBar.powerText:SetText(powerText)
     powerBar.energy:SetMinMaxValues(0, powerMax)
     powerBar.energy:SetValue(power)
+
 end
 
 function Powerbar:UpdateFrame(unit)
@@ -130,12 +143,16 @@ function Powerbar:UpdateFrame(unit)
     if (not powerBar) then
         return
     end
+    local healthBar = Gladdy.modules["Health Bar"].frames[unit]
 
-    local healthBar = Gladdy.modules.Healthbar.frames[unit]
-
-
-    powerBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture))
-    powerBar.bg:SetVertexColor(Gladdy.db.powerBarBgColor.r, Gladdy.db.powerBarBgColor.g, Gladdy.db.powerBarBgColor.b, Gladdy.db.powerBarBgColor.a)
+    if not Gladdy.db.powerBarEnabled then
+        powerBar:Hide()
+        return
+    else
+        powerBar:Show()
+    end
+    powerBar.bg:SetTexture(Gladdy:SMFetch("statusbar", "powerBarTexture"))
+    powerBar.bg:SetVertexColor(Gladdy:SetColor(Gladdy.db.powerBarBgColor))
 
     powerBar:SetWidth(healthBar:GetWidth())
     powerBar:SetHeight(Gladdy.db.powerBarHeight)
@@ -143,19 +160,24 @@ function Powerbar:UpdateFrame(unit)
     powerBar:ClearAllPoints()
     powerBar:SetPoint("TOPLEFT", healthBar, "BOTTOMLEFT", 0, -1)
 
-    powerBar:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.powerBarBorderStyle),
+    powerBar:SetBackdrop({ edgeFile = Gladdy:SMFetch("border", "powerBarBorderStyle"),
                                   edgeSize = Gladdy.db.powerBarBorderSize })
-    powerBar:SetBackdropBorderColor(Gladdy.db.powerBarBorderColor.r, Gladdy.db.powerBarBorderColor.g, Gladdy.db.powerBarBorderColor.b, Gladdy.db.powerBarBorderColor.a)
+    powerBar:SetBackdropBorderColor(Gladdy:SetColor(Gladdy.db.powerBarBorderColor))
 
-    powerBar.energy:SetStatusBarTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture))
+    powerBar.energy:SetStatusBarTexture(Gladdy:SMFetch("statusbar", "powerBarTexture"))
     powerBar.energy:ClearAllPoints()
     powerBar.energy:SetPoint("TOPLEFT", powerBar, "TOPLEFT", (Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset), -(Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset))
     powerBar.energy:SetPoint("BOTTOMRIGHT", powerBar, "BOTTOMRIGHT", -(Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset), (Gladdy.db.powerBarBorderSize/Gladdy.db.statusbarBorderOffset))
 
-    powerBar.raceText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.powerBarFont), Gladdy.db.powerBarFontSize)
-    powerBar.raceText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
-    powerBar.powerText:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.powerBarFont), Gladdy.db.powerBarFontSize)
-    powerBar.powerText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
+    powerBar.raceText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
+    powerBar.raceText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
+    powerBar.powerText:SetFont(Gladdy:SMFetch("font", "powerBarFont"), Gladdy.db.powerBarFontSize)
+    powerBar.powerText:SetTextColor(Gladdy:SetColor(Gladdy.db.powerBarFontColor))
+
+    powerBar:SetFrameStrata(Gladdy.db.powerFrameStrata)
+    powerBar:SetFrameLevel(Gladdy.db.powerFrameLevel)
+    powerBar.energy:SetFrameStrata(Gladdy.db.powerFrameStrata)
+    powerBar.energy:SetFrameLevel(Gladdy.db.powerFrameLevel - 1)
 end
 
 function Powerbar:ResetUnit(unit)
@@ -168,6 +190,8 @@ function Powerbar:ResetUnit(unit)
     powerBar.raceText:SetText("")
     powerBar.powerText:SetText("")
     powerBar.energy:SetValue(0)
+    powerBar.powerType = ""
+    powerBar.powerColor = {r = 1, g = 1, b = 1}
 end
 
 function Powerbar:Test(unit)
@@ -206,8 +230,13 @@ function Powerbar:UNIT_SPEC(unit, spec)
     if (not powerBar or not button) then
         return
     end
+    local raceText = Gladdy.db.powerShowRace and button.raceLoc or ""
 
-    powerBar.raceText:SetText(spec .. " " .. button.raceLoc)
+    if (button.spec and Gladdy.db.powerShowSpec) then
+        raceText = spec .. " " .. raceText
+    end
+
+    powerBar.raceText:SetText(raceText)
 end
 
 function Powerbar:UNIT_POWER(unit, power, powerMax, powerType)
@@ -246,10 +275,13 @@ function Powerbar:UNIT_POWER(unit, power, powerMax, powerType)
 
     if (powerType == 1) then
         powerBar.energy:SetStatusBarColor(1, 0, 0, 1)
+        powerBar.powerColor = {r = 1, g = 0, b = 0}
     elseif (powerType == 3) then
         powerBar.energy:SetStatusBarColor(1, 1, 0, 1)
+        powerBar.powerColor = {r = 1, g = 1, b = 0}
     else
         powerBar.energy:SetStatusBarColor(.18, .44, .75, 1)
+        powerBar.powerColor = {r = .18, g = .44, b = .75}
     end
 
     powerBar.powerText:SetText(powerText)
@@ -284,7 +316,7 @@ local function option(params)
         set = function(info, value)
             local key = info.arg or info[#info]
             Gladdy.dbi.profile[key] = value
-            Gladdy.options.args.Powerbar.args.group.args.border.args.powerBarBorderSize.max = Gladdy.db.powerBarHeight/2
+            Gladdy.options.args["Power Bar"].args.group.args.border.args.powerBarBorderSize.max = Gladdy.db.powerBarHeight/2
             if Gladdy.db.powerBarBorderSize > Gladdy.db.powerBarHeight/2 then
                 Gladdy.db.powerBarBorderSize = Gladdy.db.powerBarHeight/2
             end
@@ -309,11 +341,16 @@ function Powerbar:GetOptions()
             name = L["Power Bar"],
             order = 2,
         },
+        powerBarEnabled = Gladdy:option({
+            type = "toggle",
+            name = L["Enabled"],
+            order = 3,
+        }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
-            order = 3,
+            name = L["Frame"],
+            order = 4,
             args = {
                 general = {
                     type = "group",
@@ -333,6 +370,7 @@ function Powerbar:GetOptions()
                             min = 0,
                             max = 50,
                             step = 1,
+                            width = "full",
                         }),
                         powerBarTexture = option({
                             type = "select",
@@ -384,6 +422,7 @@ function Powerbar:GetOptions()
                             step = 0.1,
                             min = 1,
                             max = 20,
+                            width = "full",
                         }),
                     },
                 },
@@ -412,6 +451,7 @@ function Powerbar:GetOptions()
                             min = 0.5,
                             max = Gladdy.db.powerBarHeight/2,
                             step = 0.5,
+                            width = "full",
                         }),
                         powerBarBorderColor = Gladdy:colorOption({
                             type = "color",
@@ -422,10 +462,39 @@ function Powerbar:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 4,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        powerFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        powerFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 1,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
                 powerValues = {
                     type = "group",
                     name = L["Power Bar Text"],
-                    order = 4,
+                    order = 5,
                     args = {
                         header = {
                             type = "header",

Modules/Racial.lua

@@ -1,29 +1,27 @@
-local ceil, floor, string_format, tonumber = ceil, floor, string.format, tonumber
+local ceil = ceil
 
 local CreateFrame = CreateFrame
 local GetTime = GetTime
 
-
-
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
-local Racial = Gladdy:NewModule("Racial", nil, {
+local Racial = Gladdy:NewModule("Racial", 79, {
     racialFont = "DorisPP",
     racialFontScale = 1,
     racialEnabled = true,
     racialSize = 60 + 20 + 1,
     racialWidthFactor = 0.9,
-    racialAnchor = "trinket",
-    racialPos = "RIGHT",
     racialXOffset = 0,
     racialYOffset = 0,
     racialBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
     racialBorderColor = { r = 0, g = 0, b = 0, a = 1 },
     racialDisableCircle = false,
     racialCooldownAlpha = 1,
+    racialCooldownNumberAlpha = 1,
+    racialFrameStrata = "MEDIUM",
+    racialFrameLevel = 5,
 })
 
-local ANCHORS = { ["LEFT"] = "RIGHT", ["RIGHT"] = "LEFT", ["BOTTOM"] = "TOP", ["TOP"] = "BOTTOM"}
 
 function Racial:Initialize()
     self.frames = {}
@@ -45,59 +43,60 @@ local function iconTimer(self,elapsed)
         local timeLeft = ceil(self.timeLeft)
 
         if timeLeft >= 60 then
-            -- more than 1 minute
-            self.cooldownFont:SetTextColor(1, 1, 0)
-            self.cooldownFont:SetText(floor(timeLeft / 60) .. ":" .. string_format("%02.f", floor(timeLeft - floor(timeLeft / 60) * 60)))
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 0.15* self:GetWidth()) * Gladdy.db.racialFontScale, "OUTLINE")
-        elseif timeLeft < 60 and timeLeft >= 21 then
-            -- between 60s and 21s (green)
-            self.cooldownFont:SetTextColor(0.7, 1, 0)
-            self.cooldownFont:SetText(timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
-        elseif timeLeft < 20.9 and timeLeft >= 11 then
-            -- between 20s and 11s (green)
-            self.cooldownFont:SetTextColor(0, 1, 0)
-            self.cooldownFont:SetText(timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
-        elseif timeLeft <= 10 and timeLeft >= 5 then
-            -- between 10s and 5s (orange)
-            self.cooldownFont:SetTextColor(1, 0.7, 0)
-            self.cooldownFont:SetFormattedText("%.1f", timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
+            self.cooldownFont:SetTextColor(1, 1, 0, Gladdy.db.racialCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), (self:GetWidth()/2 - 0.15* self:GetWidth()) * Gladdy.db.racialFontScale, "OUTLINE")
+        elseif timeLeft < 60 and timeLeft >= 30 then
+            self.cooldownFont:SetTextColor(1, 1, 0, Gladdy.db.racialCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
+        elseif timeLeft < 30 and timeLeft >= 11 then
+            self.cooldownFont:SetTextColor(1, 0.7, 0, Gladdy.db.racialCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
+        elseif timeLeft < 10 and timeLeft >= 5 then
+            self.cooldownFont:SetTextColor(1, 0.7, 0, Gladdy.db.racialCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
         elseif timeLeft < 5 and timeLeft > 0 then
-            -- between 5s and 1s (red)
-            self.cooldownFont:SetTextColor(1, 0, 0)
-            self.cooldownFont:SetFormattedText("%.1f", timeLeft >= 0.0 and timeLeft or 0.0)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
-        else
-            self.cooldownFont:SetText("")
+            self.cooldownFont:SetTextColor(1, 0, 0, Gladdy.db.racialCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE")
         end
+        Gladdy:FormatTimer(self.cooldownFont, self.timeLeft, self.timeLeft < 10, true)
     end
 end
 
 function Racial:CreateFrame(unit)
     local racial = CreateFrame("Button", "GladdyTrinketButton" .. unit, Gladdy.buttons[unit])
+    racial:EnableMouse(false)
+    racial:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial:SetFrameLevel(Gladdy.db.racialFrameLevel)
+
     racial.texture = racial:CreateTexture(nil, "BACKGROUND")
     racial.texture:SetAllPoints(racial)
+    racial.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
     --racial.texture:SetTexture("Interface\\Icons\\INV_Jewelry_TrinketPVP_02")
 
     racial.cooldown = CreateFrame("Cooldown", nil, racial, "CooldownFrameTemplate")
     racial.cooldown.noCooldownCount = true --Gladdy.db.racialDisableOmniCC
     racial.cooldown:SetHideCountdownNumbers(true)
+    racial.cooldown:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.cooldown:SetFrameLevel(Gladdy.db.racialFrameLevel + 1)
 
     racial.cooldownFrame = CreateFrame("Frame", nil, racial)
     racial.cooldownFrame:ClearAllPoints()
     racial.cooldownFrame:SetPoint("TOPLEFT", racial, "TOPLEFT")
     racial.cooldownFrame:SetPoint("BOTTOMRIGHT", racial, "BOTTOMRIGHT")
+    racial.cooldownFrame:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.cooldownFrame:SetFrameLevel(Gladdy.db.racialFrameLevel + 2)
 
     racial.cooldownFont = racial.cooldownFrame:CreateFontString(nil, "OVERLAY")
-    racial.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), 20, "OUTLINE")
+    racial.cooldownFont:SetFont(Gladdy:SMFetch("font", "racialFont"), 20, "OUTLINE")
     --trinket.cooldownFont:SetAllPoints(trinket.cooldown)
     racial.cooldownFont:SetJustifyH("CENTER")
     racial.cooldownFont:SetPoint("CENTER")
 
     racial.borderFrame = CreateFrame("Frame", nil, racial)
     racial.borderFrame:SetAllPoints(racial)
+    racial.borderFrame:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.borderFrame:SetFrameLevel(Gladdy.db.racialFrameLevel + 3)
+
     racial.texture.overlay = racial.borderFrame:CreateTexture(nil, "OVERLAY")
     racial.texture.overlay:SetAllPoints(racial)
     racial.texture.overlay:SetTexture(Gladdy.db.racialBorderStyle)
@@ -116,6 +115,15 @@ function Racial:UpdateFrame(unit)
 
     local width, height = Gladdy.db.racialSize * Gladdy.db.racialWidthFactor, Gladdy.db.racialSize
 
+    racial:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial:SetFrameLevel(Gladdy.db.racialFrameLevel)
+    racial.cooldown:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.cooldown:SetFrameLevel(Gladdy.db.racialFrameLevel + 1)
+    racial.cooldownFrame:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.cooldownFrame:SetFrameLevel(Gladdy.db.racialFrameLevel + 2)
+    racial.borderFrame:SetFrameStrata(Gladdy.db.racialFrameStrata)
+    racial.borderFrame:SetFrameLevel(Gladdy.db.racialFrameLevel + 3)
+
     racial:SetWidth(width)
     racial:SetHeight(height)
     racial.cooldown:SetWidth(width - width/16)
@@ -129,19 +137,16 @@ function Racial:UpdateFrame(unit)
     racial.texture:SetAllPoints(racial)
 
     racial.texture.overlay:SetTexture(Gladdy.db.racialBorderStyle)
-    racial.texture.overlay:SetVertexColor(Gladdy.db.racialBorderColor.r, Gladdy.db.racialBorderColor.g, Gladdy.db.racialBorderColor.b, Gladdy.db.racialBorderColor.a)
+    racial.texture.overlay:SetVertexColor(Gladdy:SetColor(Gladdy.db.racialBorderColor))
 
-    racial:ClearAllPoints()
-    local margin = Gladdy.db.highlightBorderSize + Gladdy.db.padding
-    local parent = Gladdy.buttons[unit][Gladdy.db.racialAnchor]
-    if (Gladdy.db.racialPos == "RIGHT") then
-        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.padding + Gladdy.db.racialXOffset, Gladdy.db.racialYOffset)
-    elseif (Gladdy.db.racialPos == "LEFT") then
-        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, -Gladdy.db.padding + Gladdy.db.racialXOffset, Gladdy.db.racialYOffset)
-    elseif (Gladdy.db.racialPos == "TOP") then
-        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.racialXOffset, Gladdy.db.padding + Gladdy.db.racialYOffset)
-    elseif (Gladdy.db.racialPos == "BOTTOM") then
-        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.racialXOffset, -Gladdy.db.padding + Gladdy.db.racialYOffset)
+    Gladdy:SetPosition(racial, unit, "racialXOffset", "racialYOffset", Racial:LegacySetPosition(racial, unit), Racial)
+
+    if (unit == "arena1") then
+        Gladdy:CreateMover(racial,"racialXOffset", "racialYOffset", L["Racial"],
+                {"TOPLEFT", "TOPLEFT"},
+                Gladdy.db.racialSize * Gladdy.db.racialWidthFactor,
+                Gladdy.db.racialSize,
+                0, 0, "racialEnabled")
     end
 
     if (Gladdy.db.racialEnabled == false) then
@@ -176,14 +181,14 @@ function Racial:Used(unit, startTime, duration)
     end
     if not racial.active then
         racial.timeLeft = duration
-        if not Gladdy.db.trinketDisableCircle then racial.cooldown:SetCooldown(startTime, duration) end
+        if not Gladdy.db.racialDisableCircle then racial.cooldown:SetCooldown(startTime, duration) end
         racial.active = true
     end
 end
 
 function Racial:ENEMY_SPOTTED(unit)
     local racial = self.frames[unit]
-    if (not racial) then
+    if (not racial or not Gladdy.buttons[unit].race) then
         return
     end
     racial.texture:SetTexture(Gladdy:Racials()[Gladdy.buttons[unit].race].texture)
@@ -224,7 +229,7 @@ function Racial:GetOptions()
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 4,
             args = {
                 general = {
@@ -235,7 +240,7 @@ function Racial:GetOptions()
                         header = {
                             type = "header",
                             name = L["Size"],
-                            order = 4,
+                            order = 1,
                         },
                         racialSize = Gladdy:option({
                             type = "range",
@@ -243,7 +248,8 @@ function Racial:GetOptions()
                             min = 5,
                             max = 100,
                             step = 1,
-                            order = 4,
+                            order = 2,
+                            width = "full",
                         }),
                         racialWidthFactor = Gladdy:option({
                             type = "range",
@@ -251,7 +257,8 @@ function Racial:GetOptions()
                             min = 0.5,
                             max = 2,
                             step = 0.05,
-                            order = 6,
+                            order = 3,
+                            width = "full",
                         }),
                     },
                 },
@@ -269,6 +276,7 @@ function Racial:GetOptions()
                             type = "toggle",
                             name = L["No Cooldown Circle"],
                             order = 7,
+                            width = "full",
                         }),
                         racialCooldownAlpha = Gladdy:option({
                             type = "range",
@@ -277,6 +285,16 @@ function Racial:GetOptions()
                             max = 1,
                             step = 0.1,
                             order = 8,
+                            width = "full",
+                        }),
+                        racialCooldownNumberAlpha = Gladdy:option({
+                            type = "range",
+                            name = L["Cooldown number alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.1,
+                            order = 9,
+                            width = "full",
                         }),
                     },
                 },
@@ -306,43 +324,20 @@ function Racial:GetOptions()
                             min = 0.1,
                             max = 2,
                             step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
                 position = {
                     type = "group",
                     name = L["Position"],
-                    order = 4,
+                    order = 5,
                     args = {
                         header = {
                             type = "header",
-                            name = L["Position"],
+                            name = L["Icon position"],
                             order = 4,
                         },
-                        racialAnchor = Gladdy:option({
-                            type = "select",
-                            name = L["Anchor"],
-                            desc = L["This changes the anchor of the racial icon"],
-                            order = 20,
-                            values = {
-                                ["trinket"] = L["Trinket"],
-                                ["classIcon"] = L["Class Icon"],
-                                ["healthBar"] = L["Health Bar"],
-                                ["powerBar"] = L["Power Bar"],
-                            },
-                        }),
-                        racialPos = Gladdy:option({
-                            type = "select",
-                            name = L["Position"],
-                            desc = L["This changes position relative to its anchor of the racial icon"],
-                            order = 21,
-                            values = {
-                                ["LEFT"] = L["Left"],
-                                ["RIGHT"] = L["Right"],
-                                ["TOP"] = L["Top"],
-                                ["BOTTOM"] = L["Bottom"],
-                            },
-                        }),
                         racialXOffset = Gladdy:option({
                             type = "range",
                             name = L["Horizontal offset"],
@@ -350,6 +345,7 @@ function Racial:GetOptions()
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                         racialYOffset = Gladdy:option({
                             type = "range",
@@ -358,6 +354,7 @@ function Racial:GetOptions()
                             min = -400,
                             max = 400,
                             step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
@@ -386,7 +383,62 @@ function Racial:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        racialFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        racialFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
     }
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Racial:LegacySetPosition(racial, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+
+    local ANCHORS = { ["LEFT"] = "RIGHT", ["RIGHT"] = "LEFT", ["BOTTOM"] = "TOP", ["TOP"] = "BOTTOM"}
+    racial:ClearAllPoints()
+    local parent = Gladdy.buttons[unit][Gladdy.db.racialAnchor]
+    if (Gladdy.db.racialPos == "RIGHT") then
+        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.padding + Gladdy.db.racialXOffset, Gladdy.db.racialYOffset)
+    elseif (Gladdy.db.racialPos == "LEFT") then
+        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, -Gladdy.db.padding + Gladdy.db.racialXOffset, Gladdy.db.racialYOffset)
+    elseif (Gladdy.db.racialPos == "TOP") then
+        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.racialXOffset, Gladdy.db.padding + Gladdy.db.racialYOffset)
+    elseif (Gladdy.db.racialPos == "BOTTOM") then
+        racial:SetPoint(ANCHORS[Gladdy.db.racialPos], parent, Gladdy.db.racialPos, Gladdy.db.racialXOffset, -Gladdy.db.padding + Gladdy.db.racialYOffset)
+    end
+    return Gladdy.db.newLayout
+end

Modules/RangeCheck.lua

@@ -0,0 +1,421 @@
+local UnitIsConnected = UnitIsConnected
+local UnitInPhase = UnitInPhase
+local UnitInRaid = UnitInRaid
+local UnitInParty = UnitInParty
+local UnitInRange = UnitInRange
+local CheckInteractDistance = CheckInteractDistance
+local C_Timer = C_Timer
+local UnitIsUnit = UnitIsUnit
+local UnitClass = UnitClass
+local GetSpellInfo = GetSpellInfo
+local RAID_CLASS_COLORS = RAID_CLASS_COLORS
+local LOCALIZED_CLASS_NAMES_MALE = LOCALIZED_CLASS_NAMES_MALE
+local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS
+local select, ipairs, type, tonumber, tostring, format = select, ipairs, type, tonumber, tostring, format
+
+local LibStub = LibStub
+local Gladdy = LibStub("Gladdy")
+local LSR = LibStub("SpellRange-1.0")
+local L = Gladdy.L
+
+local classSpells = {
+    ["MAGE"] =  118,
+    ["PRIEST"] = 32379,
+    ["DRUID"] = 33786,
+    ["SHAMAN"] = 10414,
+    ["PALADIN"] = 10308,
+    ["WARLOCK"] = 5782,
+    ["WARRIOR"] = 25275,
+    ["HUNTER"] = 27018,
+    ["ROGUE"] = 36554,
+}
+
+local function defaultSpells()
+    local defaults = {}
+    for _,class in ipairs(Gladdy.CLASSES) do
+        defaults[class] = { min = classSpells[class] }
+    end
+    return defaults
+end
+
+local RangeCheck = Gladdy:NewModule("Range Check", nil, {
+    rangeCheckEnabled = true,
+    rangeCheckDefaultSpells = defaultSpells(),
+    rangeCheckOorFactor = 1.5,
+    rangeCheckHealthBar = true,
+    rangeCheckHealthBarText = true,
+    rangeCheckPowerBar = true,
+    rangeCheckPowerBarText = true,
+    rangeCheckClassIcon = false,
+    rangeCheckTrinket = false,
+    rangeCheckRacial = false,
+})
+
+function RangeCheck:Initialize()
+    self:RegisterMessage("JOINED_ARENA")
+    self:RegisterMessage("ENEMY_STEALTH")
+    self:RegisterMessage("ENEMY_SPOTTED")
+    self.playerClass = select(2, UnitClass("player"))
+end
+
+function RangeCheck:Reset()
+    self.test = nil
+end
+
+function RangeCheck:ResetUnit(unit)
+    local button = Gladdy.buttons[unit]
+    self:CancelTimer(button)
+    self:SetColor(button, 1)
+    button.classColors = {}
+end
+
+function RangeCheck:Test(unit)
+    local button = Gladdy.buttons[unit]
+    if not button then
+        return
+    end
+    self:ENEMY_SPOTTED(unit)
+    self.test = true
+    button.lastState = 0
+    if Gladdy.db.rangeCheckEnabled then
+        if unit == "arena1" then
+            --button.unit = "target"
+            --self:CreateTimer(button)
+            self:SetRangeAlpha(button, nil)
+        else
+            self:SetRangeAlpha(button, true)
+        end
+    else
+        self:SetRangeAlpha(button, true)
+    end
+end
+
+function RangeCheck:UpdateFrame(unit)
+    if self.test then
+        self:Test(unit)
+    end
+end
+
+function RangeCheck:SetColor(button, oorFac)
+    if button.lastState == oorFac then
+        return
+    end
+
+    if not button.classColors.r then
+        if button.class then
+            button.classColors = { r = RAID_CLASS_COLORS[button.class].r, g = RAID_CLASS_COLORS[button.class].g, b = RAID_CLASS_COLORS[button.class].b }
+        else
+            button.classColors = { r = 0.66, g = 0.66, b = 0.66 }
+        end
+    end
+
+    if Gladdy.db.rangeCheckHealthBar then
+        button.healthBar.hp:SetStatusBarColor(button.classColors.r/oorFac, button.classColors.g/oorFac, button.classColors.b/oorFac, 1)
+    else
+        button.healthBar.hp:SetStatusBarColor(button.classColors.r, button.classColors.g, button.classColors.b, 1)
+    end
+
+    if Gladdy.db.rangeCheckHealthBarText then
+        button.healthBar.nameText:SetTextColor(Gladdy.db.healthBarFontColor.r/oorFac, Gladdy.db.healthBarFontColor.g/oorFac, Gladdy.db.healthBarFontColor.b/oorFac, Gladdy.db.healthBarFontColor.a)
+        button.healthBar.healthText:SetTextColor(Gladdy.db.healthBarFontColor.r/oorFac, Gladdy.db.healthBarFontColor.g/oorFac, Gladdy.db.healthBarFontColor.b/oorFac, Gladdy.db.healthBarFontColor.a)
+    else
+        button.healthBar.nameText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
+        button.healthBar.healthText:SetTextColor(Gladdy.db.healthBarFontColor.r, Gladdy.db.healthBarFontColor.g, Gladdy.db.healthBarFontColor.b, Gladdy.db.healthBarFontColor.a)
+    end
+
+    if Gladdy.db.rangeCheckPowerBar then
+        button.powerBar.energy:SetStatusBarColor(button.powerBar.powerColor.r/oorFac, button.powerBar.powerColor.g/oorFac, button.powerBar.powerColor.b/oorFac, 1)
+    else
+        button.powerBar.energy:SetStatusBarColor(button.powerBar.powerColor.r, button.powerBar.powerColor.g, button.powerBar.powerColor.b, 1)
+    end
+
+    if Gladdy.db.rangeCheckPowerBarText then
+        button.powerBar.raceText:SetTextColor(Gladdy.db.powerBarFontColor.r/oorFac, Gladdy.db.powerBarFontColor.g/oorFac, Gladdy.db.powerBarFontColor.b/oorFac, Gladdy.db.powerBarFontColor.a)
+        button.powerBar.powerText:SetTextColor(Gladdy.db.powerBarFontColor.r/oorFac, Gladdy.db.powerBarFontColor.g/oorFac, Gladdy.db.powerBarFontColor.b/oorFac, Gladdy.db.powerBarFontColor.a)
+    else
+        button.powerBar.raceText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
+        button.powerBar.powerText:SetTextColor(Gladdy.db.powerBarFontColor.r, Gladdy.db.powerBarFontColor.g, Gladdy.db.powerBarFontColor.b, Gladdy.db.powerBarFontColor.a)
+    end
+
+    if Gladdy.db.rangeCheckTrinket then
+        button.trinket.texture:SetVertexColor(1/oorFac, 1/oorFac, 1/oorFac)
+    else
+        button.trinket.texture:SetVertexColor(1, 1, 1)
+    end
+    if Gladdy.db.rangeCheckClassIcon then
+        button.classIcon.texture:SetVertexColor(1/oorFac, 1/oorFac, 1/oorFac)
+        button.aura.icon:SetVertexColor(1/oorFac, 1/oorFac, 1/oorFac)
+    else
+        button.classIcon.texture:SetVertexColor(1, 1, 1)
+        button.aura.icon:SetVertexColor(1, 1, 1)
+    end
+    if Gladdy.db.rangeCheckRacial then
+        button.racial.texture:SetVertexColor(1/oorFac, 1/oorFac, 1/oorFac)
+    else
+        button.racial.texture:SetVertexColor(1, 1, 1)
+    end
+    button.lastState = oorFac
+end
+
+function RangeCheck:SetRangeAlpha(button, inRange)
+    local oorFac = Gladdy.db.rangeCheckOorFactor
+    if inRange then
+        RangeCheck:SetColor(button, 1)
+    else
+        RangeCheck:SetColor(button, oorFac)
+    end
+end
+
+function RangeCheck:JOINED_ARENA()
+    self.test = nil
+    if Gladdy.db.rangeCheckEnabled then
+        for i = 1, Gladdy.curBracket do
+            local button = Gladdy.buttons["arena"..i]
+            --if i == 1 then button.unit = "focus" end
+            self:CreateTimer(button)
+        end
+    end
+end
+
+function RangeCheck:ENEMY_STEALTH(unit, stealth)
+    local button = Gladdy.buttons[unit]
+    if not button then
+        return
+    end
+    button.lastState = 0
+    if stealth then
+        button.classColors = { r = 0.66, g = 0.66, b = 0.66 }
+        if not Gladdy.db.rangeCheckEnabled then
+            button.healthBar.hp:SetStatusBarColor(0.66, 0.66, 0.66, 1)
+        end
+    else
+        if button.class then
+            button.classColors = { r = RAID_CLASS_COLORS[button.class].r, g = RAID_CLASS_COLORS[button.class].g, b = RAID_CLASS_COLORS[button.class].b }
+            if not Gladdy.db.rangeCheckEnabled then
+                button.healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[button.class].r, RAID_CLASS_COLORS[button.class].g, RAID_CLASS_COLORS[button.class].b, 1)
+            end
+        end
+    end
+end
+
+function RangeCheck:ENEMY_SPOTTED(unit)
+    local button = Gladdy.buttons[unit]
+    if (not button) then
+        return
+    end
+    button.classColors = { r = RAID_CLASS_COLORS[button.class].r, g = RAID_CLASS_COLORS[button.class].g, b = RAID_CLASS_COLORS[button.class].b }
+end
+
+function RangeCheck.CheckRange(self)
+    local button = self.parent
+
+    local spell = Gladdy.db.rangeCheckDefaultSpells[RangeCheck.playerClass].min
+
+    if (not UnitIsConnected(button.unit) or not UnitInPhase(button.unit)) then
+        RangeCheck:SetRangeAlpha(button, false)
+    elseif (spell) then
+        RangeCheck:SetRangeAlpha(button, LSR.IsSpellInRange(spell, button.unit) == 1)
+        -- That didn't work, but they are grouped lets try the actual API for this, it's a bit flaky though and not that useful generally
+    elseif (UnitInRaid(button.unit) or UnitInParty(button.unit)) then
+        RangeCheck:SetRangeAlpha(button, UnitInRange(button.unit, "player"))
+        -- Nope, fall back to interaction :(
+    else
+        RangeCheck:SetRangeAlpha(button, CheckInteractDistance(button.unit, 4))
+    end
+end
+
+function RangeCheck:CreateTimer(frame)
+    if not frame.range then
+        frame.range = C_Timer.NewTicker(0.05, RangeCheck.CheckRange)
+        frame.range.parent = frame
+    end
+end
+
+function RangeCheck:CancelTimer(frame)
+    if frame.range then
+        frame.range:Cancel()
+        frame.range = nil
+    end
+end
+
+function RangeCheck:ForceUpdate(frame)
+    if( UnitIsUnit(frame.unit, "player") ) then
+        frame.healthBar:SetAlpha(1)
+        frame.powerBar:SetAlpha(1)
+        self:CancelTimer(frame)
+    else
+        self:CreateTimer(frame)
+        self.CheckRange(frame.parent)
+    end
+end
+
+function RangeCheck:GetOptions()
+    return {
+        header = {
+            type = "header",
+            name = L["Range Check"],
+            order = 2,
+        },
+
+        rangeCheckEnabled = Gladdy:option({
+            type = "toggle",
+            name = L["Enabled"],
+            desc = L["Enable racial icon"],
+            order = 3,
+        }),
+        group = {
+            type = "group",
+            childGroups = "tree",
+            name = L["General"],
+            order = 5,
+            args = {
+                general = {
+                    type = "group",
+                    name = L["General"],
+                    order = 1,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["General"],
+                            order = 1,
+                        },
+                        rangeCheckOorFactor = Gladdy:option({
+                            type = "range",
+                            name = L["Out of Range Darkening Level"],
+                            desc = L["Higher is darker"],
+                            min = 1.1,
+                            max = 5,
+                            step = 0.1,
+                            width = "full",
+                            order = 2,
+                        }),
+                        rangeCheckHealthBar = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " .. L["Health Bar"],
+                            width = "full",
+                            order = 3,
+                        }),
+                        rangeCheckHealthBarText = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Health Bar Text"],
+                            width = "full",
+                            order = 4,
+                        }),
+                        rangeCheckPowerBar = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Power Bar"],
+                            width = "full",
+                            order = 5,
+                        }),
+                        rangeCheckPowerBarText = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Power Bar Text"],
+                            width = "full",
+                            order = 6,
+                        }),
+                        rangeCheckClassIcon = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Class Icon"],
+                            width = "full",
+                            order = 7,
+                        }),
+                        rangeCheckTrinket = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Trinket"],
+                            width = "full",
+                            order = 8,
+                        }),
+                        rangeCheckRacial = Gladdy:option({
+                            type = "toggle",
+                            name = L["Fade"] .. " " ..  L["Racial"],
+                            width = "full",
+                            order = 9,
+                        }),
+                    },
+                },
+            },
+        },
+        oorSpells = {
+            type = "group",
+            childGroups = "tree",
+            name = L["Spells"],
+            order = 5,
+            args = RangeCheck:GetSpells(),
+        },
+    }
+end
+
+function RangeCheck:GetSpells()
+    local group = {
+        description = {
+            type = "description",
+            name = L["Changing the spellID only applies to your player class!\n\nExample: If you are a Paladin and wish to change your range check spell to Repentance, edit the Paladin spellID to 20066."],
+            order = 1,
+        },
+    }
+    for i,class in ipairs(Gladdy.CLASSES) do
+        group[class] = {
+            type = "group",
+            name = LOCALIZED_CLASS_NAMES_MALE[class],
+            order = i + 1,
+            icon = "Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes",
+            iconCoords = CLASS_ICON_TCOORDS[class],
+            args = {
+                headerMin = {
+                    type = "header",
+                    name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min) and format("|T%s:20|t %s - %d" .. L["yds"], select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(6, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)))
+                            or "nil",
+                    order = 1,
+                },
+                min = {
+                    type = "input",
+                    name = "Spell ID", --format("|T%s:20|t %s", select(3, GetSpellInfo(k)), select(1, GetSpellInfo(k)))
+                    order = 2,
+                    width = "full",
+                    pattern = "%d+",
+                    validate = function(_, value)
+                        LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
+                        return type(tonumber(value)) == "number"
+                    end,
+                    --image = select(3, GetSpellInfo(defaultSpells()[class].min)),
+                    get = function(_)
+                        return tostring(Gladdy.db.rangeCheckDefaultSpells[class].min)
+                        end,
+                    set = function(_, value)
+                        Gladdy.db.rangeCheckDefaultSpells[class].min = tonumber(value)
+                        --Gladdy.options.args["Range Check"].args.oorSpells.args[class].args.min.name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min) and format("|T%s:20|t %s", select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)))
+                        --        or "nil"
+                        Gladdy.options.args["Range Check"].args.oorSpells.args[class].args.headerMin.name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min) and format("|T%s:20|t %s - %d" .. L["yds"], select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)), select(6, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].min)))
+                                or "nil"
+                    end
+                },
+                --[[headerMax = {
+                    type = "header",
+                    name = L["Max"],
+                    order = 3,
+                },
+                max = {
+                    type = "input",
+                    name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max) and format("|T%s:20|t %s", select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max)))
+                            or "nil",
+                    order = 4,
+                    width = "full",
+                    pattern = "%d+",
+                    validate = function(_, value)
+                        return type(tonumber(value)) == "number"
+                    end,
+                    --image = select(3, GetSpellInfo(defaultSpells()[class].max)),
+                    get = function(_)
+                        return tostring(Gladdy.db.rangeCheckDefaultSpells[class].max)
+                    end,
+                    set = function(_, value)
+                        Gladdy.db.rangeCheckDefaultSpells[class].max = tonumber(value)
+                        Gladdy.options.args["Range Check"].args.oorSpells.args[class].args.max.name = GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max) and format("|T%s:20|t %s", select(3, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max)), select(1, GetSpellInfo(Gladdy.db.rangeCheckDefaultSpells[class].max)))
+                                or "nil"
+                    end
+                }--]]
+            }
+        }
+    end
+    return group
+end

Modules/ShadowsightTimer.lua

@@ -0,0 +1,433 @@
+local floor, str_find, pairs = math.floor, string.find, pairs
+local CreateFrame = CreateFrame
+
+---------------------------
+
+-- CORE
+
+---------------------------
+
+local Gladdy = LibStub("Gladdy")
+local L = Gladdy.L
+local ShadowsightTimer = Gladdy:NewModule("Shadowsight Timer", nil, {
+    shadowsightTimerEnabled = true,
+    shadowsightTimerLocked = false,
+    shadowsightTimerScale = 1,
+    shadowsightTimerRelPoint1 = "CENTER",
+    shadowsightTimerRelPoint2 = "CENTER",
+    shadowsightTimerX = 0,
+    shadowsightTimerY = 0,
+    shadowsightAnnounce = true,
+    shadowsightTimerStartTime = 91,
+    shadowsightTimerResetTime = 120,
+    shadowsightTimerShowTwoTimer = false,
+    shadowsightTimerFrameStrata = "HIGH",
+    shadowsightTimerFrameLevel = 20,
+})
+
+-- /run LibStub("Gladdy").modules["Shadowsight Timer"]:AURA_GAIN(nil, nil, 34709)
+-- /run LibStub("Gladdy").modules["Shadowsight Timer"].timerFrame1:SetAlpha(0)
+
+function ShadowsightTimer:OnEvent(event, ...)
+    self[event](self, ...)
+end
+
+function ShadowsightTimer:Initialize()
+    self.locale = Gladdy:GetArenaTimer()
+    self:RegisterMessage("JOINED_ARENA")
+    self:CreateAnchor()
+end
+
+function ShadowsightTimer:Reset()
+    self.anchor:Hide()
+    for i=1,2 do
+        self["timerFrame" .. i].active = false
+        self["timerFrame" .. i]:SetScript("OnUpdate", nil)
+        self["timerFrame" .. i].font:SetTextColor(1, 0.8, 0)
+    end
+    self:UnregisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
+    self:SetScript("OnEvent", nil)
+end
+
+---------------------------
+
+-- FRAME SETUP
+
+---------------------------
+
+function ShadowsightTimer:CreateTimerFrame(anchor, name, points)
+    local backdrop = {
+        bgFile = "Interface/Tooltips/UI-Tooltip-Background",
+        edgeFile = "",
+        tile = true, tileSize = 16, edgeSize = 10,
+        insets = {left = 0, right = 0, top = 0, bottom = 0}
+    }
+    self[name] = CreateFrame("Frame", nil, anchor, BackdropTemplateMixin and "BackdropTemplate")
+    self[name]:SetPoint(points[1], anchor, points[2])
+    self[name]:SetBackdrop(backdrop)
+    self[name]:SetBackdropColor(0,0,0,0.8)
+    self[name]:SetHeight(17)
+    self[name]:SetWidth(35)
+
+    self[name].texture = self[name]:CreateTexture(nil,"OVERLAY")
+    self[name].texture:SetWidth(16)
+    self[name].texture:SetHeight(16)
+    self[name].texture:SetTexture("Interface\\Icons\\Spell_Shadow_EvilEye")
+    self[name].texture:SetTexCoord(0.125,0.875,0.125,0.875)
+    self[name].texture:SetPoint("RIGHT", self[name], "LEFT")
+
+    self[name].font = self[name]:CreateFontString(nil,"OVERLAY","GameFontNormal")
+    self[name].font:SetPoint("LEFT", 5, 0)
+    self[name].font:SetJustifyH("LEFT")
+    self[name].font:SetTextColor(1, 0.8, 0)
+
+    self[name]:SetFrameStrata(Gladdy.db.shadowsightTimerFrameStrata)
+    self[name]:SetFrameLevel(Gladdy.db.shadowsightTimerFrameLevel)
+end
+
+function ShadowsightTimer:CreateAnchor()
+    self.anchor = CreateFrame("Frame")
+    self.anchor:SetMovable(true)
+    self.anchor:EnableMouse(true)
+    self.anchor:SetWidth(35)
+    self.anchor:SetHeight(17)
+    self.anchor:SetPoint(Gladdy.db.shadowsightTimerRelPoint1, nil, Gladdy.db.shadowsightTimerRelPoint, Gladdy.db.shadowsightTimerX, Gladdy.db.shadowsightTimerY)
+    self.anchor:SetScript("OnMouseDown",function(self) self:StartMoving() end)
+    self.anchor:SetScript("OnMouseUp",function(self)
+        self:StopMovingOrSizing()
+        Gladdy.db.shadowsightTimerRelPoint1,_,Gladdy.db.shadowsightTimerRelPoint2,Gladdy.db.shadowsightTimerX,Gladdy.db.shadowsightTimerY = self:GetPoint()
+    end)
+    self.anchor:SetScale(Gladdy.db.shadowsightTimerScale)
+    self.anchor:Hide()
+
+    self:CreateTimerFrame(self.anchor, "timerFrame1", {"TOP", "TOP"})
+    local show = Gladdy.db.shadowsightTimerShowTwoTimer
+    self:CreateTimerFrame(show and self.timerFrame1 or self.anchor, "timerFrame2", show and {"TOP", "BOTTOM"} or {"TOP", "TOP"})
+end
+
+function ShadowsightTimer:UpdateFrameOnce()
+    self.anchor:EnableMouse(not Gladdy.db.shadowsightTimerLocked)
+
+    self.anchor:SetFrameStrata(Gladdy.db.shadowsightTimerFrameStrata)
+    self.anchor:SetFrameLevel(Gladdy.db.shadowsightTimerFrameLevel)
+    self.timerFrame1:SetFrameStrata(Gladdy.db.shadowsightTimerFrameStrata)
+    self.timerFrame1:SetFrameLevel(Gladdy.db.shadowsightTimerFrameLevel)
+    self.timerFrame2:SetFrameStrata(Gladdy.db.shadowsightTimerFrameStrata)
+    self.timerFrame2:SetFrameLevel(Gladdy.db.shadowsightTimerFrameLevel)
+
+    if Gladdy.db.shadowsightTimerEnabled then
+        self.anchor:SetScale(Gladdy.db.shadowsightTimerScale)
+        self.anchor:ClearAllPoints()
+        self.anchor:SetPoint(Gladdy.db.shadowsightTimerRelPoint1, nil, Gladdy.db.shadowsightTimerRelPoint2, Gladdy.db.shadowsightTimerX, Gladdy.db.shadowsightTimerY)
+        if Gladdy.frame.testing or Gladdy.curBracket then
+            self.anchor:Show()
+        end
+        if Gladdy.db.shadowsightTimerShowTwoTimer then
+            self.anchor:SetHeight(34)
+            self.timerFrame2:ClearAllPoints()
+            self.timerFrame2:SetPoint("TOP", self.timerFrame1, "BOTTOM")
+            ShadowsightTimer:NotifyStart()
+        else
+            self.anchor:SetHeight(17)
+            self.timerFrame2:ClearAllPoints()
+            self.timerFrame2:SetPoint("TOP", self.anchor, "TOP")
+            ShadowsightTimer:NotifyStart()
+        end
+    else
+        self.anchor:SetScale(Gladdy.db.shadowsightTimerScale)
+        self.anchor:ClearAllPoints()
+        self.anchor:SetPoint(Gladdy.db.shadowsightTimerRelPoint1, nil, Gladdy.db.shadowsightTimerRelPoint2, Gladdy.db.shadowsightTimerX, Gladdy.db.shadowsightTimerY)
+        self.anchor:Hide()
+    end
+end
+
+---------------------------
+
+-- EVENT HANDLING
+
+---------------------------
+
+function ShadowsightTimer:JOINED_ARENA()
+    self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
+    self:SetScript("OnEvent", ShadowsightTimer.OnEvent)
+    for i=1,2 do
+        self["timerFrame" .. i].font:SetText("1:30")
+        self["timerFrame" .. i].font:SetTextColor(1, 0.8, 0)
+    end
+    self.anchor:Show()
+end
+
+function ShadowsightTimer:AURA_GAIN(unit, auraType, spellID)
+    if (spellID == 34709 and Gladdy.db.shadowsightTimerEnabled) then
+        self:Start(Gladdy.db.shadowsightTimerResetTime, self:GetHiddenTimer())
+    end
+end
+
+function ShadowsightTimer:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg)
+    for k,v in pairs(self.locale) do
+        if str_find(msg, v) then
+            if k == 0 then
+                self:Start(nil, self.timerFrame1)
+                self:Start(nil, self.timerFrame2)
+            end
+        end
+    end
+end
+
+---------------------------
+
+-- TEST
+
+---------------------------
+
+function ShadowsightTimer:Test()
+    if Gladdy.db.shadowsightTimerEnabled then
+        self.anchor:Show()
+        ShadowsightTimer:JOINED_ARENA()
+        self:Start(20, self.timerFrame1)
+        self:Start(25, self.timerFrame2)
+    end
+end
+
+---------------------------
+
+-- TIMER
+
+---------------------------
+
+function ShadowsightTimer:Start(time, frame)
+    frame.endTime = time or Gladdy.db.shadowsightTimerStartTime
+    frame.active = true
+    ShadowsightTimer:NotifyStart()
+    frame.announced = nil
+    frame.timeSinceLastUpdate = 0
+    frame.font:SetTextColor(1, 0.8, 0)
+    frame:SetScript("OnUpdate", ShadowsightTimer.OnUpdate)
+end
+
+function ShadowsightTimer.OnUpdate(self, elapsed)
+    self.timeSinceLastUpdate = self.timeSinceLastUpdate + elapsed;
+    self.endTime = self.endTime - elapsed
+
+    if (self.timeSinceLastUpdate > 0.01) then
+        self.font:SetFormattedText(floor(self.endTime / 60) .. ":" ..  "%02d", self.endTime - floor(self.endTime / 60) * 60)
+        self.timeSinceLastUpdate = 0;
+        if floor(self.endTime) == 15 and Gladdy.db.shadowsightAnnounce and not self.announced then
+            self.announced = true
+            Gladdy:SendMessage("SHADOWSIGHT", L["Shadowsight up in %ds"]:format(15))
+        end
+    end
+    if self.endTime <= 0 then
+        if Gladdy.db.shadowsightAnnounce then
+            Gladdy:SendMessage("SHADOWSIGHT", L["Shadowsight up!"])
+        end
+        self:SetScript("OnUpdate", nil)
+        self.font:SetText("0:00")
+        self.font:SetTextColor(0, 1, 0)
+        self.active = false
+        ShadowsightTimer:NotifyEnd()
+    end
+end
+
+function ShadowsightTimer:NotifyStart()
+    local show = Gladdy.db.shadowsightTimerShowTwoTimer
+    if self.timerFrame1.active and self.timerFrame2.active then
+        if self.timerFrame1.endTime < self.timerFrame2.endTime then
+            self.timerFrame1:SetAlpha(1)
+            self.timerFrame2:SetAlpha(show and 1 or 0)
+        else
+            self.timerFrame1:SetAlpha(show and 1 or 0)
+            self.timerFrame2:SetAlpha(1)
+        end
+    else
+        if self.timerFrame1.active then
+            self.timerFrame1:SetAlpha(1)
+            self.timerFrame2:SetAlpha(show and 1 or 0)
+        elseif self.timerFrame2.active then
+            self.timerFrame1:SetAlpha(show and 1 or 0)
+            self.timerFrame2:SetAlpha(1)
+        else
+            self.timerFrame1:SetAlpha(1)
+            self.timerFrame2:SetAlpha(show and 1 or 0)
+        end
+    end
+end
+function ShadowsightTimer:NotifyEnd()
+    local show = Gladdy.db.shadowsightTimerShowTwoTimer
+    if self.timerFrame1.active then
+        self.timerFrame1:SetAlpha(1)
+        self.timerFrame2:SetAlpha(show and 1 or 0)
+    elseif self.timerFrame2.active then
+        self.timerFrame1:SetAlpha(show and 1 or 0)
+        self.timerFrame2:SetAlpha(1)
+    else
+        self.timerFrame1:SetAlpha(1)
+        self.timerFrame2:SetAlpha(show and 1 or 0)
+    end
+end
+function ShadowsightTimer:GetHiddenTimer()
+    if self.timerFrame1.active and self.timerFrame2.active then
+        return self.timerFrame1.endTime < self.timerFrame2.endTime and self.timerFrame1 or self.timerFrame2
+    else
+        return self.timerFrame1.active and self.timerFrame2 or self.timerFrame1
+    end
+end
+
+---------------------------
+
+-- OPTIONS
+
+---------------------------
+
+function ShadowsightTimer:GetOptions()
+    return {
+        headerShadowsight = {
+            type = "header",
+            name = L["Shadowsight Timer"],
+            order = 2,
+        },
+        shadowsightTimerEnabled = Gladdy:option({
+            type = "toggle",
+            name = L["Enabled"],
+            --desc = L["Turns countdown before the start of an arena match on/off."],
+            order = 3,
+        }),
+        shadowsightTimerLocked = Gladdy:option({
+            type = "toggle",
+            name = L["Locked"],
+            --desc = L["Turns countdown before the start of an arena match on/off."],
+            order = 4,
+        }),
+        shadowsightTimerShowTwoTimer = Gladdy:option({
+            type = "toggle",
+            name = L["Show two timers"],
+            order = 5,
+        }),
+        shadowsightAnnounce = Gladdy:option({
+            type = "toggle",
+            name = L["Announce"],
+            --desc = L["Turns countdown before the start of an arena match on/off."],
+            order = 6,
+        }),
+        group = {
+            type = "group",
+            childGroups = "tree",
+            name = L["Frame"],
+            order = 7,
+            args = {
+                general = {
+                    type = "group",
+                    name = L["Scale"],
+                    order = 1,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Scale"],
+                            order = 1,
+                        },
+                        shadowsightTimerScale = Gladdy:option({
+                            type = "range",
+                            name = L["Scale"],
+                            order = 2,
+                            min = 0.1,
+                            max = 5,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                    },
+                },
+                cooldown = {
+                    type = "group",
+                    name = L["Cooldown"],
+                    order = 2,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Shadowsight CDs"],
+                            order = 1,
+                        },
+                        shadowsightTimerStartTime = Gladdy:option({
+                            type = "range",
+                            name = L["Start Time"],
+                            desc = L["Start time in seconds"],
+                            min = 80,
+                            max = 100,
+                            order = 2,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                        shadowsightTimerResetTime = Gladdy:option({
+                            type = "range",
+                            name = L["Reset Time"],
+                            desc = L["Reset time in seconds"],
+                            min = 110,
+                            max = 130,
+                            order = 3,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                    },
+                },
+                --[[font = {
+                    type = "group",
+                    name = L["Font"],
+                    order = 3,
+                    args = {
+                        header = {
+                            type = "header",
+                            name = L["Font"],
+                            order = 4,
+                        },
+                        racialFont = Gladdy:option({
+                            type = "select",
+                            name = L["Font"],
+                            desc = L["Font of the cooldown"],
+                            order = 11,
+                            dialogControl = "LSM30_Font",
+                            values = AceGUIWidgetLSMlists.font,
+                        }),
+                        racialFontScale = Gladdy:option({
+                            type = "range",
+                            name = L["Font scale"],
+                            desc = L["Scale of the font"],
+                            order = 12,
+                            min = 0.1,
+                            max = 2,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                    },
+                },--]]
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        shadowsightTimerFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        shadowsightTimerFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
+            },
+        },
+    }
+end

Modules/TotemPlates.lua

@@ -3,7 +3,7 @@ local UnitExists, UnitIsUnit, UnitName, UnitIsEnemy = UnitExists, UnitIsUnit, Un
 local C_NamePlate = C_NamePlate
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
-local GetSpellInfo, CreateFrame, GetCVar = GetSpellInfo, CreateFrame, GetCVar
+local GetSpellInfo, CreateFrame = GetSpellInfo, CreateFrame
 
 ---------------------------------------------------
 
@@ -26,7 +26,7 @@ local totemData = {
     [string_lower("Disease Cleansing Totem")] = {id = 8170,texture = select(3, GetSpellInfo(8170)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Disease Cleansing Totem
     [string_lower("Healing Stream Totem")] = {id = 5394,texture = select(3, GetSpellInfo(5394)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Healing Stream Totem
     [string_lower("Mana Tide Totem")] = {id = 16190,texture = select(3, GetSpellInfo(16190)), color = {r = 0.078, g = 0.9, b = 0.16, a = 1}, enabled = true, priority = 3}, -- Mana Tide Totem
-    [string_lower("Mana Spring Totem")] = {id = 5675,texture = "Interface\\AddOns\\Gladdy\\Images\\Totems\\Spell_Nature_ManaRegenTotem_edit", color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 1}, -- Mana Spring Totem
+    [string_lower("Mana Spring Totem")] = {id = 5675,texture = select(3, GetSpellInfo(5675)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 1}, -- Mana Spring Totem
     -- Earth
     [string_lower("Earthbind Totem")] = {id = 2484,texture = select(3, GetSpellInfo(2484)), color = {r = 0.5, g = 0.5, b = 0.5, a = 1}, enabled = true, priority = 1}, -- Earthbind Totem
     [string_lower("Stoneclaw Totem")] = {id = 5730,texture = select(3, GetSpellInfo(5730)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Stoneclaw Totem
@@ -36,13 +36,13 @@ local totemData = {
     [string_lower("Tremor Totem")] = {id = 8143,texture = select(3, GetSpellInfo(8143)), color = {r = 1, g = 0.9, b = 0.1, a = 1}, enabled = true, priority = 3}, -- Tremor Totem
     -- Air
     [string_lower("Grounding Totem")] = {id = 8177,texture = select(3, GetSpellInfo(8177)), color = {r = 0, g = 0.53, b = 0.92, a = 1}, enabled = true, priority = 3}, -- Grounding Totem
-    [string_lower("Grace of Air Totem")] = {id = 8835,texture = "Interface\\AddOns\\Gladdy\\Images\\Totems\\Spell_Nature_InvisibilityTotem_edit", color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Grace of Air Totem
+    [string_lower("Grace of Air Totem")] = {id = 8835,texture = select(3, GetSpellInfo(8835)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Grace of Air Totem
     [string_lower("Nature Resistance Totem")] = {id = 10595,texture = select(3, GetSpellInfo(10595)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Nature Resistance Totem
-    [string_lower("Windfury Totem")] = {id = 8512,texture = "Interface\\AddOns\\Gladdy\\Images\\Totems\\Spell_Nature_Windfury_edit", color = {r = 0.96, g = 0, b = 0.07, a = 1}, enabled = true, priority = 2}, -- Windfury Totem
-    [string_lower("Sentry Totem")] = {id = 6495, texture = "Interface\\AddOns\\Gladdy\\Images\\Totems\\Spell_Nature_RemoveCurse_edit", color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Sentry Totem
+    [string_lower("Windfury Totem")] = {id = 8512,texture = select(3, GetSpellInfo(8512)), color = {r = 0.96, g = 0, b = 0.07, a = 1}, enabled = true, priority = 2}, -- Windfury Totem
+    [string_lower("Sentry Totem")] = {id = 6495, texture = select(3, GetSpellInfo(6495)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Sentry Totem
     [string_lower("Windwall Totem")] = {id = 15107,texture = select(3, GetSpellInfo(15107)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Windwall Totem
-    [string_lower("Wrath of Air Totem")] = {id = 3738,texture = "Interface\\AddOns\\Gladdy\\Images\\Totems\\Spell_Nature_SlowingTotem_edit", color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Wrath of Air Totem
-    [string_lower("Tranquil Air Totem")] = {id = 25908,texture = "Interface\\Icons\\INV_Staff_07", color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Tranquil Air Totem
+    [string_lower("Wrath of Air Totem")] = {id = 3738,texture = select(3, GetSpellInfo(3738)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Wrath of Air Totem
+    [string_lower("Tranquil Air Totem")] = {id = 25908,texture = select(3, GetSpellInfo(25908)), color = {r = 0, g = 0, b = 0, a = 1}, enabled = true, priority = 0}, -- Tranquil Air Totem
 }
 local localizedTotemData = {
     ["default"] = {
@@ -78,36 +78,11 @@ local localizedTotemData = {
         [string_lower(select(1, GetSpellInfo(25908)))] = totemData[string_lower("Tranquil Air Totem")], -- Tranquil Air Totem
     },
     ["frFR"] = {
-        [string_lower("Totem incendiaire")] = totemData[string_lower("Searing Totem")],
-        [string_lower("Totem Langue de feu")] = totemData[string_lower("Flametongue Totem")],
-        [string_lower("Totem de lien terrestre")] = totemData[string_lower("Earthbind Totem")],
-        [string_lower("Totem de Griffes de pierre")] = totemData[string_lower("Stoneclaw Totem")],
-        [string_lower("Totem Nova de feu")] = totemData[string_lower("Fire Nova Totem")],
-        [string_lower("Totem de Magma")] = totemData[string_lower("Magma Totem")],
-        [string_lower("Totem de courroux")] = totemData[string_lower("Totem of Wrath")],
-        [string_lower("Totem d'\195\169lementaire de feu")] = totemData[string_lower("Fire Elemental Totem")],
-		[string_lower("Totem d'\195\169l\195\169mentaire de feu")] = totemData[string_lower("Fire Elemental Totem")],
-        [string_lower("Totem de Peau de pierre")] = totemData[string_lower("Stoneskin Totem")],
-        [string_lower("Totem d'\195\169lementaire de terre")] = totemData[string_lower("Earth Elemental Totem")],
-		[string_lower("Totem d'\195\169l\195\169mentaire de terre")] = totemData[string_lower("Earth Elemental Totem")],
-        [string_lower("Totem de Force de la Terre")] = totemData[string_lower("Strength of Earth Totem")],
-        [string_lower("Totem de r\195\169sistance au Givre")] = totemData[string_lower("Frost Resistance Totem")],
-        [string_lower("Totem de r\195\169sistance au Feu")] = totemData[string_lower("Fire Resistance Totem")],
-        [string_lower("Totem de Gl\195\168be")] = totemData[string_lower("Grounding Totem")],
-        [string_lower("Totem de Gr\195\162ce a\195\169rienne")] = totemData[string_lower("Grace of Air Totem")],
-        [string_lower("Totem de R\195\169sistance \195\160 la Nature")] = totemData[string_lower("Nature Resistance Totem")],
-        [string_lower("Totem Furie-des-vents")] = totemData[string_lower("Windfury Totem")],
-        [string_lower("Totem Sentinelle")] = totemData[string_lower("Sentry Totem")],
-        [string_lower("Totem de Mur des vents")] = totemData[string_lower("Windwall Totem")],
-        [string_lower("Totem de courroux de l'air")] = totemData[string_lower("Wrath of Air Totem")],
-        [string_lower("Totem de S\195\169isme")] = totemData[string_lower("Tremor Totem")],
-        [string_lower("Totem gu\195\169risseur")] = totemData[string_lower("Healing Stream Totem")],
-        [string_lower("Totem de Purification du poison")] = totemData[string_lower("Poison Cleansing Totem")],
-        [string_lower("Totem Fontaine de mana")] = totemData[string_lower("Mana Spring Totem")],
-        [string_lower("Totem de Purification des maladies")] = totemData[string_lower("Disease Cleansing Totem")],
-        [string_lower("Totem de purification")] = totemData[string_lower("Disease Cleansing Totem")],
-        [string_lower("Totem de Vague de mana")] = totemData[string_lower("Mana Tide Totem")],
-        [string_lower("Totem de Tranquillit\195\169 de l'air")] = totemData[string_lower("Tranquil Air Totem")],
+        [string_lower("Totem d'\195\169lementaire de terre")] = totemData[string_lower("Earth Elemental Totem")], -- Earth Elemental Totem
+        [string_lower("Totem d'\195\169lementaire de feu")] = totemData[string_lower("Fire Elemental Totem")], -- Fire Elemental Totem
+    },
+    ["ruRU"] = {
+        [string_lower("")] = totemData[string_lower("Sentry Totem")], -- Sentry Totem
     }
 }
 
@@ -122,7 +97,7 @@ local function GetTotemColorDefaultOptions()
         return a.name < b.name
     end)
     for i=1,#indexedList do
-        defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = indexedList[i].enabled, alpha = 0.6}
+        defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = indexedList[i].enabled, alpha = 0.6, customText = ""}
         options["totem" .. indexedList[i].id] = {
             order = i+1,
             name = select(1, GetSpellInfo(indexedList[i].id)),
@@ -138,12 +113,12 @@ local function GetTotemColorDefaultOptions()
                 },
                 enabled = {
                     order = 2,
-                    name = "Enabled",
+                    name = L["Enabled"],
                     desc = "Enable " .. format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))),
                     type = "toggle",
                     width = "full",
-                    get = function(info) return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].enabled end,
-                    set = function(info, value)
+                    get = function() return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].enabled end,
+                    set = function(_, value)
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].enabled = value
                         Gladdy:UpdateFrame()
                     end
@@ -155,15 +130,13 @@ local function GetTotemColorDefaultOptions()
                     order = 3,
                     hasAlpha = true,
                     width = "full",
-                    get = function(info)
-                        local key = info.arg or info[#info]
+                    get = function()
                         return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.r,
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.g,
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.b,
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.a
                     end,
-                    set = function(info, r, g, b, a)
-                        local key = info.arg or info[#info]
+                    set = function(_, r, g, b, a)
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.r,
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.g,
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].color.b,
@@ -179,21 +152,21 @@ local function GetTotemColorDefaultOptions()
                     max = 1,
                     step = 0.1,
                     width = "full",
-                    get = function(info)
+                    get = function()
                         return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].alpha
                     end,
-                    set = function(info, value)
+                    set = function(_, value)
                         Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].alpha = value
                         Gladdy:UpdateFrame()
                     end
                 },
                 customText = {
-                  type = "input",
-                  name = L["Custom totem name"],
-                  order = 5,
-                  width = "full",
-                  get = function(info) return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].customText end,
-                  set = function(info, value) Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].customText = value Gladdy:UpdateFrame() end
+                    type = "input",
+                    name = L["Custom totem name"],
+                    order = 5,
+                    width = "full",
+                    get = function() return Gladdy.db.npTotemColors["totem" .. indexedList[i].id].customText end,
+                    set = function(_, value) Gladdy.db.npTotemColors["totem" .. indexedList[i].id].customText = value Gladdy:UpdateFrame() end
                 },
             }
         }
@@ -201,15 +174,6 @@ local function GetTotemColorDefaultOptions()
     return defaultDB, options, indexedList
 end
 
-local function GetTotemOptions()
-    local indexedList = select(3, GetTotemColorDefaultOptions())
-    local colorList = {}
-    for i=1, #indexedList do
-        tinsert(colorList, Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id])
-    end
-    return colorList
-end
-
 function Gladdy:GetTotemColors()
     return GetTotemColorDefaultOptions()
 end
@@ -220,7 +184,7 @@ end
 
 ---------------------------------------------------
 
-local TotemPlates = Gladdy:NewModule("TotemPlates", nil, {
+local TotemPlates = Gladdy:NewModule("Totem Plates", nil, {
     npTotems = true,
     npTotemsShowFriendly = true,
     npTotemsShowEnemy = true,
@@ -252,7 +216,36 @@ function TotemPlates:Initialize()
     self:RegisterEvent("NAME_PLATE_UNIT_ADDED")
     self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
     self:RegisterEvent("PLAYER_TARGET_CHANGED")
+    self:RegisterEvent("UNIT_NAME_UPDATE")
     self:SetScript("OnEvent", TotemPlates.OnEvent)
+    if Gladdy.db.npTotems and Gladdy.db.npTotemsShowEnemy then
+        --GetCVar("nameplateShowEnemyTotems")
+        --SetCVar("nameplateShowEnemyTotems", true);
+    end
+    if Gladdy.db.npTotems and Gladdy.db.npTotemsShowFriendly then
+        --GetCVar("nameplateShowFriendlyTotems")
+        --SetCVar("nameplateShowFriendlyTotems", true);
+    end
+    self.addon = "Blizzard"
+    if (IsAddOnLoaded("Plater")) then
+        self.addon = "Plater"
+    elseif (IsAddOnLoaded("Kui_Nameplates")) then
+        self.addon = "Kui_Nameplates"
+    elseif (IsAddOnLoaded("NeatPlates")) then
+        self.addon = "NeatPlates"
+    elseif (IsAddOnLoaded("TidyPlates_ThreatPlates")) then
+        self.addon = "TidyPlates_ThreatPlates"
+    elseif (IsAddOnLoaded("Tukui")) then
+        local _, C, _ = Tukui:unpack()
+        if C.NamePlates.Enable then
+            self.addon = "Tukui"
+        end
+    elseif (IsAddOnLoaded("ElvUI")) then
+        local E = unpack(ElvUI)
+        if E.private.nameplates.enable then
+            self.addon = "ElvUI"
+        end
+    end
 end
 
 function TotemPlates:PLAYER_ENTERING_WORLD()
@@ -276,40 +269,158 @@ function TotemPlates:UpdateFrameOnce()
                 Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.b,
                 Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.a)
         nameplate.gladdyTotemFrame.totemName:SetPoint("TOP", nameplate.gladdyTotemFrame, "BOTTOM", Gladdy.db.npTremorFontXOffset, Gladdy.db.npTremorFontYOffset)
-        nameplate.gladdyTotemFrame.totemName:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.npTremorFont), Gladdy.db.npTremorFontSize, "OUTLINE")
+        nameplate.gladdyTotemFrame.totemName:SetFont(Gladdy:SMFetch("font", "npTremorFont"), Gladdy.db.npTremorFontSize, "OUTLINE")
         nameplate.gladdyTotemFrame.totemName:SetText(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].customText or "")
         self:SetTotemAlpha(nameplate.gladdyTotemFrame, k)
-        nameplate.UnitFrame.selectionHighlight:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
-        nameplate.UnitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
+
+        if not Gladdy.db.npTotems then
+            nameplate.gladdyTotemFrame:Hide()
+            self:ToggleAddon(nameplate, true)
+        else
+            nameplate.gladdyTotemFrame:Show()
+            self:ToggleAddon(nameplate)
+        end
+        local isEnemy = UnitIsEnemy("player", nameplate.gladdyTotemFrame.unitID)
+        if Gladdy.db.npTotems and Gladdy.db.npTotemsShowEnemy and isEnemy then
+            nameplate.gladdyTotemFrame:Show()
+            self:ToggleAddon(nameplate)
+        elseif Gladdy.db.npTotems and not Gladdy.db.npTotemsShowEnemy and isEnemy then
+            nameplate.gladdyTotemFrame:Hide()
+            self:ToggleAddon(nameplate, true)
+        end
+        if Gladdy.db.npTotems and Gladdy.db.npTotemsShowFriendly and not isEnemy then
+            nameplate.gladdyTotemFrame:Show()
+            self:ToggleAddon(nameplate)
+        elseif not Gladdy.db.npTotemsShowFriendly and not isEnemy then
+            nameplate.gladdyTotemFrame:Hide()
+            self:ToggleAddon(nameplate, true)
+        end
     end
-    for i,gladdyTotemFrame in ipairs(self.totemPlateCache) do
+    for _,gladdyTotemFrame in ipairs(self.totemPlateCache) do
         gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
         gladdyTotemFrame:SetHeight(Gladdy.db.npTotemPlatesSize)
         gladdyTotemFrame.totemBorder:SetTexture(Gladdy.db.npTotemPlatesBorderStyle)
-        gladdyTotemFrame.totemName:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.npTremorFont), Gladdy.db.npTremorFontSize, "OUTLINE")
+        gladdyTotemFrame.totemName:SetFont(Gladdy:SMFetch("font", "npTremorFont"), Gladdy.db.npTremorFontSize, "OUTLINE")
         gladdyTotemFrame.totemName:SetPoint("TOP", gladdyTotemFrame, "BOTTOM", Gladdy.db.npTremorFontXOffset, Gladdy.db.npTremorFontYOffset)
     end
 end
 
 ---------------------------------------------------
 
+-- TotemPlates Frame
+
+---------------------------------------------------
+
+function TotemPlates:CreateTotemFrame(nameplate)
+    nameplate.gladdyTotemFrame = CreateFrame("Frame")
+    nameplate.gladdyTotemFrame:SetIgnoreParentAlpha(true)
+    nameplate.gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
+    nameplate.gladdyTotemFrame:SetHeight(Gladdy.db.npTotemPlatesSize)
+    nameplate.gladdyTotemFrame.totemIcon = nameplate.gladdyTotemFrame:CreateTexture(nil, "BACKGROUND")
+    nameplate.gladdyTotemFrame.totemIcon:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
+    nameplate.gladdyTotemFrame.totemIcon:ClearAllPoints()
+    nameplate.gladdyTotemFrame.totemIcon:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT")
+    nameplate.gladdyTotemFrame.totemIcon:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT")
+    nameplate.gladdyTotemFrame.totemBorder = nameplate.gladdyTotemFrame:CreateTexture(nil, "BORDER")
+    nameplate.gladdyTotemFrame.totemBorder:ClearAllPoints()
+    nameplate.gladdyTotemFrame.totemBorder:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT")
+    nameplate.gladdyTotemFrame.totemBorder:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT")
+    nameplate.gladdyTotemFrame.totemBorder:SetTexture(Gladdy.db.npTotemPlatesBorderStyle)
+    nameplate.gladdyTotemFrame.totemName = nameplate.gladdyTotemFrame:CreateFontString(nil, "OVERLAY")
+    nameplate.gladdyTotemFrame.totemName:SetFont(Gladdy:SMFetch("font", "npTremorFont"), Gladdy.db.npTremorFontSize, "OUTLINE")
+    nameplate.gladdyTotemFrame.totemName:SetPoint("TOP", nameplate.gladdyTotemFrame, "BOTTOM", Gladdy.db.npTremorFontXOffset, Gladdy.db.npTremorFontYOffset)
+    nameplate.gladdyTotemFrame.selectionHighlight = nameplate.gladdyTotemFrame:CreateTexture(nil, "OVERLAY")
+    nameplate.gladdyTotemFrame.selectionHighlight:SetTexture("Interface/TargetingFrame/UI-TargetingFrame-BarFill")
+    nameplate.gladdyTotemFrame.selectionHighlight:SetAlpha(0)
+    nameplate.gladdyTotemFrame.selectionHighlight:SetBlendMode("ADD")
+    nameplate.gladdyTotemFrame.selectionHighlight:SetIgnoreParentAlpha(true)
+    nameplate.gladdyTotemFrame.selectionHighlight:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
+    nameplate.gladdyTotemFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
+    nameplate.gladdyTotemFrame:SetScript('OnUpdate', TotemPlates.OnUpdate)
+    nameplate.gladdyTotemFrame:SetScript("OnHide", function(self)
+        self.parent = nil
+        self:SetParent(nil)
+    end)
+end
+
+---------------------------------------------------
+
 -- Nameplate functions
 
 ---------------------------------------------------
 
+function TotemPlates:GetAddonFrame(nameplate)
+    if self.addon == "Blizzard" then
+        if nameplate.UnitFrame then
+            return nameplate.UnitFrame
+        end
+    elseif self.addon == "Plater" or self.addon == "Tukui" or self.addon == "ElvUI" then
+        if nameplate.unitFrame then
+            return nameplate.unitFrame
+        end
+    elseif self.addon == "Kui_Nameplates" then
+        if nameplate.kui then
+            return nameplate.kui
+        end
+    elseif self.addon == "NeatPlates" then
+        if nameplate.extended or nameplate.carrier then
+            return nameplate.extended , nameplate.carrier
+        end
+    elseif self.addon == "TidyPlates_ThreatPlates" then
+        if nameplate.TPFrame then
+            return nameplate.TPFrame
+        end
+    end
+end
+
 function TotemPlates:PLAYER_TARGET_CHANGED()
     for k,nameplate in pairs(self.activeTotemNameplates) do
         TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, k)
     end
 end
 
-function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
-    local unitID = ...
+function TotemPlates:ToggleAddon(nameplate, show)
+    local addonFrames = { self:GetAddonFrame(nameplate) }
+    if addonFrames and #addonFrames > 0 then
+        if show then
+            for _,v in ipairs(addonFrames) do
+                v:Show()
+            end
+        else
+            for _,v in ipairs(addonFrames) do
+                v:Hide()
+            end
+        end
+    end
+end
+
+function TotemPlates.OnUpdate(self)
+    if (UnitIsUnit("mouseover", self.unitID) or UnitIsUnit("target", self.unitID)) then
+        self.selectionHighlight:SetAlpha(.25)
+    else
+        self.selectionHighlight:SetAlpha(0)
+    end
+    if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui" or TotemPlates.addon == "ElvUI") and self.parent and self.parent.unitFrame then
+        self.parent.unitFrame:Hide()
+    end
+end
+
+function TotemPlates:OnUnitEvent(unitID)
     local isEnemy = UnitIsEnemy("player", unitID)
+    local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
+    if not nameplate then
+        return
+    end
+    if not Gladdy.db.npTotems then
+        self:ToggleAddon(nameplate, true)
+        return
+    end
     if not Gladdy.db.npTotemsShowEnemy and isEnemy then
+        self:ToggleAddon(nameplate, true)
         return
     end
     if not Gladdy.db.npTotemsShowFriendly and not isEnemy then
+        self:ToggleAddon(nameplate, true)
         return
     end
     local nameplateName = UnitName(unitID)
@@ -317,30 +428,14 @@ function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
     totemName = string_gsub(totemName, "%s+$", "") --trim
     totemName = string_gsub(totemName, "%s+[I,V,X]+$", "") --trim rank
     totemName = string_lower(totemName)
-    local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
-    local totemDataEntry = localizedTotemData["default"][totemName]
+    local totemDataEntry = localizedTotemData["default"][totemName] or localizedTotemData["frFR"][totemName] or localizedTotemData["ruRU"][totemName]
     if totemDataEntry and Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then-- modify this nameplates
-
         if #self.totemPlateCache > 0 then
             nameplate.gladdyTotemFrame = tremove(self.totemPlateCache, #self.totemPlateCache)
         else
-            nameplate.gladdyTotemFrame = CreateFrame("Frame", nil)
-            nameplate.gladdyTotemFrame:SetIgnoreParentAlpha(true)
-            nameplate.gladdyTotemFrame:SetWidth(Gladdy.db.npTotemPlatesSize * Gladdy.db.npTotemPlatesWidthFactor)
-            nameplate.gladdyTotemFrame:SetHeight(Gladdy.db.npTotemPlatesSize)
-            nameplate.gladdyTotemFrame.totemIcon = nameplate.gladdyTotemFrame:CreateTexture(nil, "BACKGROUND")
-            nameplate.gladdyTotemFrame.totemIcon:ClearAllPoints()
-            nameplate.gladdyTotemFrame.totemIcon:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT")
-            nameplate.gladdyTotemFrame.totemIcon:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT")
-            nameplate.gladdyTotemFrame.totemBorder = nameplate.gladdyTotemFrame:CreateTexture(nil, "BORDER")
-            nameplate.gladdyTotemFrame.totemBorder:ClearAllPoints()
-            nameplate.gladdyTotemFrame.totemBorder:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT")
-            nameplate.gladdyTotemFrame.totemBorder:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT")
-            nameplate.gladdyTotemFrame.totemBorder:SetTexture(Gladdy.db.npTotemPlatesBorderStyle)
-            nameplate.gladdyTotemFrame.totemName = nameplate.gladdyTotemFrame:CreateFontString(nil, "OVERLAY")
-            nameplate.gladdyTotemFrame.totemName:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.npTremorFont), Gladdy.db.npTremorFontSize, "OUTLINE")
-            nameplate.gladdyTotemFrame.totemName:SetPoint("TOP", nameplate.gladdyTotemFrame, "BOTTOM", Gladdy.db.npTremorFontXOffset, Gladdy.db.npTremorFontYOffset)
+            self:CreateTotemFrame(nameplate)
         end
+        nameplate.gladdyTotemFrame.unitID = unitID
         nameplate.gladdyTotemFrame.totemDataEntry = totemDataEntry
         nameplate.gladdyTotemFrame.parent = nameplate
         nameplate.gladdyTotemFrame:SetParent(nameplate)
@@ -352,29 +447,29 @@ function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
                 Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.b,
                 Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].color.a)
         nameplate.gladdyTotemFrame.totemName:SetText(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].customText or "")
+        nameplate.gladdyTotemFrame.parent = nameplate
         nameplate.gladdyTotemFrame:Show()
         TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID)
-
-        nameplate.UnitFrame:SetAlpha(0)
-        nameplate.UnitFrame.point = select(2, nameplate.UnitFrame.selectionHighlight:GetPoint())
-        nameplate.UnitFrame.selectionHighlight:ClearAllPoints()
-        nameplate.UnitFrame.selectionHighlight:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
-        nameplate.UnitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
-        nameplate.UnitFrame:SetScript("OnHide", function(unitFrame)
-            unitFrame:SetAlpha(1)
-            unitFrame.selectionHighlight:ClearAllPoints()
-            unitFrame.selectionHighlight:SetPoint("TOPLEFT", unitFrame.point, "TOPLEFT")
-            unitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", unitFrame.point, "BOTTOMRIGHT")
-            unitFrame:SetScript("OnHide", nil)
-        end)
+        self:ToggleAddon(nameplate)
         self.activeTotemNameplates[unitID] = nameplate
+    else
+        self:ToggleAddon(nameplate, true)
     end
 end
 
+function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
+    self:OnUnitEvent(...)
+end
+
+function TotemPlates:UNIT_NAME_UPDATE(...)
+    self:OnUnitEvent(...)
+end
+
 function TotemPlates:NAME_PLATE_UNIT_REMOVED(...)
     local 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)
@@ -415,12 +510,12 @@ function TotemPlates:GetOptions()
     return {
         headerTotems = {
             type = "header",
-            name = L["Totem General"],
+            name = L["Totem Plates"],
             order = 2,
         },
         npTotems = Gladdy:option({
             type = "toggle",
-            name = L["Totem icons on/off"],
+            name = L["Enabled"],
             desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"],
             order = 3,
             width = 0.9,
@@ -442,7 +537,7 @@ function TotemPlates:GetOptions()
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
+            name = L["Frame"],
             order = 4,
             args = {
                 icon = {
@@ -463,6 +558,7 @@ function TotemPlates:GetOptions()
                             min = 20,
                             max = 100,
                             step = 1,
+                            width = "full",
                         }),
                         npTotemPlatesWidthFactor = Gladdy:option({
                             type = "range",
@@ -472,6 +568,7 @@ function TotemPlates:GetOptions()
                             min = 0.5,
                             max = 2,
                             step = 0.05,
+                            width = "full",
                         }),
                     },
                 },
@@ -482,7 +579,7 @@ function TotemPlates:GetOptions()
                     args = {
                         header = {
                             type = "header",
-                            name = L["Icon"],
+                            name = L["Font"],
                             order = 1,
                         },
                         npTremorFont = Gladdy:option({
@@ -501,6 +598,7 @@ function TotemPlates:GetOptions()
                             min = 1,
                             max = 50,
                             step = 0.1,
+                            width = "full",
                         }),
                         npTremorFontXOffset = Gladdy:option({
                             type = "range",
@@ -510,6 +608,7 @@ function TotemPlates:GetOptions()
                             min = -300,
                             max = 300,
                             step = 1,
+                            width = "full",
                         }),
                         npTremorFontYOffset = Gladdy:option({
                             type = "range",
@@ -519,6 +618,7 @@ function TotemPlates:GetOptions()
                             min = -300,
                             max = 300,
                             step = 1,
+                            width = "full",
                         }),
                     },
                 },
@@ -552,21 +652,25 @@ function TotemPlates:GetOptions()
                             min = 0,
                             max = 1,
                             step = 0.1,
-                            width = "double",
+                            width = "full",
                             order = 23,
-                            get = function(info)
-                                local alphas = GetTotemOptions()
-                                for i=2, #alphas do
-                                    if alphas[i].alpha ~= alphas[1].alpha then
-                                        return ""
+                            get = function()
+                                local alpha, i = nil, 1
+                                for _,v in pairs(Gladdy.dbi.profile.npTotemColors) do
+                                    if i == 1 then
+                                        alpha = v.alpha
+                                        i = i + 1
+                                    else
+                                        if v.alpha ~= alpha then
+                                            return ""
+                                        end
                                     end
                                 end
-                                return alphas[1].alpha
+                                return alpha
                             end,
-                            set = function(info, value)
-                                local alphas = GetTotemOptions()
-                                for i=1, #alphas do
-                                    alphas[i].alpha = value
+                            set = function(_, value)
+                                for _,v in pairs(Gladdy.dbi.profile.npTotemColors) do
+                                    v.alpha = value
                                 end
                                 Gladdy:UpdateFrame()
                             end,
@@ -594,23 +698,27 @@ function TotemPlates:GetOptions()
                             name = L["All totem border color"],
                             order = 42,
                             hasAlpha = true,
-                            get = function(info)
-                                local colors = GetTotemOptions()
-                                local color = colors[1].color
-                                for i=2, #colors do
-                                    if colors[i].r ~= color.r or colors[i].color.r ~= color.r or colors[i].color.r ~= color.r or colors[i].color.r ~= color.r then
-                                        return 0, 0, 0, 0
+                            get = function()
+                                local color
+                                local i = 1
+                                for _,v in pairs(Gladdy.dbi.profile.npTotemColors) do
+                                    if i == 1 then
+                                        color = v.color
+                                        i = i + 1
+                                    else
+                                        if v.color.r ~= color.r or v.color.g ~= color.g or v.color.b ~= color.b or v.color.a ~= color.a then
+                                            return 0, 0, 0, 0
+                                        end
                                     end
                                 end
                                 return color.r, color.g, color.b, color.a
                             end,
-                            set = function(info, r, g, b, a)
-                                local colors = GetTotemOptions()
-                                for i=1, #colors do
-                                    colors[i].color.r = r
-                                    colors[i].color.g = g
-                                    colors[i].color.b = b
-                                    colors[i].color.a = a
+                            set = function(_, r, g, b, a)
+                                for _,v in pairs(Gladdy.dbi.profile.npTotemColors) do
+                                    v.color.r = r
+                                    v.color.g = g
+                                    v.color.b = b
+                                    v.color.a = a
                                 end
                                 Gladdy:UpdateFrame()
                             end,
@@ -621,7 +729,7 @@ function TotemPlates:GetOptions()
         },
         npTotemColors = {
             order = 50,
-            name = "Customize Totems",
+            name = L["Customize Totems"],
             type = "group",
             childGroups = "tree",
             args = select(2, Gladdy:GetTotemColors())

Modules/Trinket.lua

@@ -1,4 +1,4 @@
-local ceil, floor, string_format, tonumber = ceil, floor, string.format, tonumber
+local ceil = ceil
 local C_PvP = C_PvP
 
 local CreateFrame = CreateFrame
@@ -6,19 +6,26 @@ local GetTime = GetTime
 
 local Gladdy = LibStub("Gladdy")
 local L = Gladdy.L
-local Trinket = Gladdy:NewModule("Trinket", nil, {
+local Trinket = Gladdy:NewModule("Trinket", 80, {
     trinketFont = "DorisPP",
     trinketFontScale = 1,
+    trinketFontEnabled = true,
     trinketEnabled = true,
     trinketSize = 60 + 20 + 1,
     trinketWidthFactor = 0.9,
-    trinketPos = "RIGHT",
     trinketBorderStyle = "Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp",
     trinketBorderColor = { r = 0, g = 0, b = 0, a = 1 },
     trinketDisableCircle = false,
     trinketCooldownAlpha = 1,
+    trinketCooldownNumberAlpha = 1,
+    trinketXOffset = 0,
+    trinketYOffset = 0,
+    trinketFrameStrata = "MEDIUM",
+    trinketFrameLevel = 5,
+    trinketColored = false,
+    trinketColoredCd = { r = 1, g = 0, b = 0, a = 1 },
+    trinketColoredNoCd = { r = 0, g = 1, b = 0, a = 1 },
 })
-LibStub("AceComm-3.0"):Embed(Trinket)
 
 function Trinket:Initialize()
     self.frames = {}
@@ -32,6 +39,9 @@ local function iconTimer(self, elapsed)
             self.active = false
             self.cooldown:Clear()
             Gladdy:SendMessage("TRINKET_READY", self.unit)
+            if Gladdy.db.trinketColored then
+                self:SetBackdropColor(Gladdy:SetColor(Gladdy.db.trinketColoredNoCd))
+            end
         else
             self.timeLeft = self.timeLeft - elapsed
         end
@@ -39,30 +49,23 @@ local function iconTimer(self, elapsed)
         local timeLeft = ceil(self.timeLeft)
 
         if timeLeft >= 60 then
-            -- more than 1 minute
-            self.cooldownFont:SetTextColor(1, 1, 0)
-            self.cooldownFont:SetText(floor(timeLeft / 60) .. ":" .. string_format("%02.f", floor(timeLeft - floor(timeLeft / 60) * 60)))
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 0.15*self:GetWidth()) * Gladdy.db.trinketFontScale, "OUTLINE")
-        elseif timeLeft < 60 and timeLeft >= 21 then
-            -- between 60s and 21s (green)
-            self.cooldownFont:SetTextColor(0.7, 1, 0)
-            self.cooldownFont:SetText(timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
-        elseif timeLeft < 20.9 and timeLeft >= 11 then
-            -- between 20s and 11s (green)
-            self.cooldownFont:SetTextColor(0, 1, 0)
-            self.cooldownFont:SetText(timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
+            self.cooldownFont:SetTextColor(1, 1, 0, Gladdy.db.trinketCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), (self:GetWidth()/2 - 0.15*self:GetWidth()) * Gladdy.db.trinketFontScale, "OUTLINE")
+        elseif timeLeft < 60 and timeLeft >= 30 then
+            self.cooldownFont:SetTextColor(1, 1, 0, Gladdy.db.trinketCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
+        elseif timeLeft < 30 and timeLeft >= 11 then
+            self.cooldownFont:SetTextColor(1, 0.7, 0, Gladdy.db.trinketCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
         elseif timeLeft <= 10 and timeLeft >= 5 then
-            -- between 10s and 5s (orange)
-            self.cooldownFont:SetTextColor(1, 0.7, 0)
-            self.cooldownFont:SetFormattedText("%.1f", timeLeft)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
+            self.cooldownFont:SetTextColor(1, 0.7, 0, Gladdy.db.trinketCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
         elseif timeLeft < 5 and timeLeft > 0 then
-            -- between 5s and 1s (red)
-            self.cooldownFont:SetTextColor(1, 0, 0)
-            self.cooldownFont:SetFormattedText("%.1f", timeLeft >= 0.0 and timeLeft or 0.0)
-            self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
+            self.cooldownFont:SetTextColor(1, 0, 0, Gladdy.db.trinketCooldownNumberAlpha)
+            self.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE")
+        end
+        if Gladdy.db.trinketFontEnabled then
+            Gladdy:FormatTimer(self.cooldownFont, self.timeLeft, self.timeLeft < 10, true)
         else
             self.cooldownFont:SetText("")
         end
@@ -70,28 +73,41 @@ local function iconTimer(self, elapsed)
 end
 
 function Trinket:CreateFrame(unit)
-    local trinket = CreateFrame("Button", "GladdyTrinketButton" .. unit, Gladdy.buttons[unit])
+    local trinket = CreateFrame("Button", "GladdyTrinketButton" .. unit, Gladdy.buttons[unit], BackdropTemplateMixin and "BackdropTemplate")
+    trinket:SetBackdrop({bgFile = "Interface\\AddOns\\Gladdy\\Images\\trinket" })
+    trinket:EnableMouse(false)
+    trinket:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket:SetFrameLevel(Gladdy.db.trinketFrameLevel)
+
     trinket.texture = trinket:CreateTexture(nil, "BACKGROUND")
     trinket.texture:SetAllPoints(trinket)
     trinket.texture:SetTexture("Interface\\Icons\\INV_Jewelry_TrinketPVP_02")
+    trinket.texture:SetMask("Interface\\AddOns\\Gladdy\\Images\\mask")
 
     trinket.cooldown = CreateFrame("Cooldown", nil, trinket, "CooldownFrameTemplate")
     trinket.cooldown.noCooldownCount = true --Gladdy.db.trinketDisableOmniCC
     trinket.cooldown:SetHideCountdownNumbers(true)
+    trinket.cooldown:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.cooldown:SetFrameLevel(Gladdy.db.trinketFrameLevel + 1)
 
     trinket.cooldownFrame = CreateFrame("Frame", nil, trinket)
     trinket.cooldownFrame:ClearAllPoints()
     trinket.cooldownFrame:SetPoint("TOPLEFT", trinket, "TOPLEFT")
     trinket.cooldownFrame:SetPoint("BOTTOMRIGHT", trinket, "BOTTOMRIGHT")
+    trinket.cooldownFrame:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.cooldownFrame:SetFrameLevel(Gladdy.db.trinketFrameLevel + 2)
 
     trinket.cooldownFont = trinket.cooldownFrame:CreateFontString(nil, "OVERLAY")
-    trinket.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), 20, "OUTLINE")
+    trinket.cooldownFont:SetFont(Gladdy:SMFetch("font", "trinketFont"), 20, "OUTLINE")
     --trinket.cooldownFont:SetAllPoints(trinket.cooldown)
     trinket.cooldownFont:SetJustifyH("CENTER")
     trinket.cooldownFont:SetPoint("CENTER")
 
     trinket.borderFrame = CreateFrame("Frame", nil, trinket)
     trinket.borderFrame:SetAllPoints(trinket)
+    trinket.borderFrame:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.borderFrame:SetFrameLevel(Gladdy.db.trinketFrameLevel + 3)
+
     trinket.texture.overlay = trinket.borderFrame:CreateTexture(nil, "OVERLAY")
     trinket.texture.overlay:SetAllPoints(trinket)
     trinket.texture.overlay:SetTexture(Gladdy.db.trinketBorderStyle)
@@ -110,8 +126,29 @@ function Trinket:UpdateFrame(unit)
         return
     end
 
+    if Gladdy.db.trinketColored then
+        if trinket.active then
+            trinket:SetBackdropColor(Gladdy:SetColor(Gladdy.db.trinketColoredCd))
+        else
+            trinket:SetBackdropColor(Gladdy:SetColor(Gladdy.db.trinketColoredNoCd))
+        end
+        trinket.texture:SetTexture()
+    else
+        trinket:SetBackdropColor(0,0,0,0)
+        trinket.texture:SetTexture("Interface\\Icons\\INV_Jewelry_TrinketPVP_02")
+    end
+
     local width, height = Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor, Gladdy.db.trinketSize
 
+    trinket:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket:SetFrameLevel(Gladdy.db.trinketFrameLevel)
+    trinket.cooldown:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.cooldown:SetFrameLevel(Gladdy.db.trinketFrameLevel + 1)
+    trinket.cooldownFrame:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.cooldownFrame:SetFrameLevel(Gladdy.db.trinketFrameLevel + 2)
+    trinket.borderFrame:SetFrameStrata(Gladdy.db.trinketFrameStrata)
+    trinket.borderFrame:SetFrameLevel(Gladdy.db.trinketFrameLevel + 3)
+
     trinket:SetWidth(width)
     trinket:SetHeight(height)
     trinket.cooldown:SetWidth(width - width/16)
@@ -125,25 +162,28 @@ function Trinket:UpdateFrame(unit)
     trinket.texture:SetAllPoints(trinket)
 
     trinket.texture.overlay:SetTexture(Gladdy.db.trinketBorderStyle)
-    trinket.texture.overlay:SetVertexColor(Gladdy.db.trinketBorderColor.r, Gladdy.db.trinketBorderColor.g, Gladdy.db.trinketBorderColor.b, Gladdy.db.trinketBorderColor.a)
+    trinket.texture.overlay:SetVertexColor(Gladdy:SetColor(Gladdy.db.trinketBorderColor))
 
-    trinket:ClearAllPoints()
-    local margin = Gladdy.db.highlightBorderSize + Gladdy.db.padding
-    if (Gladdy.db.classIconPos == "LEFT") then
-        if (Gladdy.db.trinketPos == "RIGHT") then
-            trinket:SetPoint("TOPLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", margin, 0)
-        else
-            trinket:SetPoint("TOPRIGHT", Gladdy.buttons[unit].classIcon, "TOPLEFT", -Gladdy.db.padding, 0)
-        end
-    else
-        if (Gladdy.db.trinketPos == "RIGHT") then
-            trinket:SetPoint("TOPLEFT", Gladdy.buttons[unit].classIcon, "TOPRIGHT", Gladdy.db.padding, 0)
-        else
-            trinket:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", -margin, 0)
-        end
+    Gladdy:SetPosition(trinket, unit, "trinketXOffset", "trinketYOffset", Trinket:LegacySetPosition(trinket, unit), Trinket)
+
+    if (unit == "arena1") then
+        Gladdy:CreateMover(trinket,"trinketXOffset", "trinketYOffset", L["Trinket"],
+                {"TOPLEFT", "TOPLEFT"},
+                Gladdy.db.trinketSize * Gladdy.db.trinketWidthFactor,
+                Gladdy.db.trinketSize,
+                0,
+                0, "trinketEnabled")
     end
 
-    if (Gladdy.db.trinketEnabled == false) then
+    trinket.cooldown:SetAlpha(Gladdy.db.trinketCooldownAlpha)
+
+    if Gladdy.db.trinketDisableCircle then
+        trinket.cooldown:Hide()
+    else
+        trinket.cooldown:Show()
+    end
+
+    if (not Gladdy.db.trinketEnabled) then
         trinket:Hide()
     else
         trinket:Show()
@@ -207,6 +247,9 @@ function Trinket:Used(unit, startTime, duration)
         trinket.timeLeft = (startTime/1000.0 + duration/1000.0) - GetTime()
         if not Gladdy.db.trinketDisableCircle then trinket.cooldown:SetCooldown(startTime/1000.0, duration/1000.0) end
         trinket.active = true
+        if Gladdy.db.trinketColored then
+            trinket:SetBackdropColor(Gladdy:SetColor(Gladdy.db.trinketColoredCd))
+        end
         Gladdy:SendMessage("TRINKET_USED", unit)
     end
 end
@@ -224,11 +267,37 @@ function Trinket:GetOptions()
             desc = L["Enable trinket icon"],
             order = 3,
         }),
+        trinketColored = Gladdy:option({
+            type = "toggle",
+            name = L["Colored trinket"],
+            desc = L["Shows a solid colored icon when off/off CD."],
+            order = 4,
+        }),
+        trinketColoredCd = Gladdy:colorOption({
+            type = "color",
+            name = L["Colored trinket CD"],
+            desc = L["Color of the border"],
+            order = 5,
+            hasAlpha = true,
+            disabled = function()
+                return not Gladdy.db.trinketColored
+            end,
+        }),
+        trinketColoredNoCd = Gladdy:colorOption({
+            type = "color",
+            name = L["Colored trinket No CD"],
+            desc = L["Color of the border"],
+            order = 6,
+            hasAlpha = true,
+            disabled = function()
+                return not Gladdy.db.trinketColored
+            end,
+        }),
         group = {
             type = "group",
             childGroups = "tree",
-            name = "Frame",
-            order = 4,
+            name = L["Frame"],
+            order = 5,
             args = {
                 general = {
                     type = "group",
@@ -238,15 +307,16 @@ function Trinket:GetOptions()
                         header = {
                             type = "header",
                             name = L["Size"],
-                            order = 4,
+                            order = 1,
                         },
                         trinketSize = Gladdy:option({
                             type = "range",
-                            name = L["Trinket size"],
+                            name = L["Size"],
                             min = 5,
                             max = 100,
                             step = 1,
                             order = 4,
+                            width = "full",
                         }),
                         trinketWidthFactor = Gladdy:option({
                             type = "range",
@@ -255,6 +325,7 @@ function Trinket:GetOptions()
                             max = 2,
                             step = 0.05,
                             order = 6,
+                            width = "full",
                         }),
                     },
                 },
@@ -272,6 +343,7 @@ function Trinket:GetOptions()
                             type = "toggle",
                             name = L["No Cooldown Circle"],
                             order = 7,
+                            width = "full",
                         }),
                         trinketCooldownAlpha = Gladdy:option({
                             type = "range",
@@ -280,6 +352,16 @@ function Trinket:GetOptions()
                             max = 1,
                             step = 0.1,
                             order = 8,
+                            width = "full",
+                        }),
+                        trinketCooldownNumberAlpha = Gladdy:option({
+                            type = "range",
+                            name = L["Cooldown number alpha"],
+                            min = 0,
+                            max = 1,
+                            step = 0.1,
+                            order = 9,
+                            width = "full",
                         }),
                     },
                 },
@@ -291,13 +373,19 @@ function Trinket:GetOptions()
                         header = {
                             type = "header",
                             name = L["Font"],
-                            order = 4,
+                            order = 1,
                         },
+                        trinketFontEnabled = Gladdy:option({
+                            type = "toggle",
+                            name = L["Font Enabled"],
+                            order = 2,
+                            width = "full",
+                        }),
                         trinketFont = Gladdy:option({
                             type = "select",
                             name = L["Font"],
                             desc = L["Font of the cooldown"],
-                            order = 11,
+                            order = 3,
                             dialogControl = "LSM30_Font",
                             values = AceGUIWidgetLSMlists.font,
                         }),
@@ -305,32 +393,41 @@ function Trinket:GetOptions()
                             type = "range",
                             name = L["Font scale"],
                             desc = L["Scale of the font"],
-                            order = 12,
+                            order = 4,
                             min = 0.1,
                             max = 2,
                             step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
                 position = {
                     type = "group",
                     name = L["Position"],
-                    order = 4,
+                    order = 5,
                     args = {
                         header = {
                             type = "header",
-                            name = L["Position"],
+                            name = L["Icon position"],
                             order = 4,
                         },
-                        trinketPos = Gladdy:option({
-                            type = "select",
-                            name = L["Trinket position"],
-                            desc = L["This changes positions of the trinket"],
-                            order = 21,
-                            values = {
-                                ["LEFT"] = L["Left"],
-                                ["RIGHT"] = L["Right"],
-                            },
+                        trinketXOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Horizontal offset"],
+                            order = 23,
+                            min = -800,
+                            max = 800,
+                            step = 0.1,
+                            width = "full",
+                        }),
+                        trinketYOffset = Gladdy:option({
+                            type = "range",
+                            name = L["Vertical offset"],
+                            order = 24,
+                            min = -800,
+                            max = 800,
+                            step = 0.1,
+                            width = "full",
                         }),
                     },
                 },
@@ -359,7 +456,63 @@ function Trinket:GetOptions()
                         }),
                     },
                 },
+                frameStrata = {
+                    type = "group",
+                    name = L["Frame Strata and Level"],
+                    order = 6,
+                    args = {
+                        headerAuraLevel = {
+                            type = "header",
+                            name = L["Frame Strata and Level"],
+                            order = 1,
+                        },
+                        trinketFrameStrata = Gladdy:option({
+                            type = "select",
+                            name = L["Frame Strata"],
+                            order = 2,
+                            values = Gladdy.frameStrata,
+                            sorting = Gladdy.frameStrataSorting,
+                            width = "full",
+                        }),
+                        trinketFrameLevel = Gladdy:option({
+                            type = "range",
+                            name = L["Frame Level"],
+                            min = 0,
+                            max = 500,
+                            step = 1,
+                            order = 3,
+                            width = "full",
+                        }),
+                    },
+                },
             },
         },
     }
 end
+
+---------------------------
+
+-- LAGACY HANDLER
+
+---------------------------
+
+function Trinket:LegacySetPosition(trinket, unit)
+    if Gladdy.db.newLayout then
+        return Gladdy.db.newLayout
+    end
+    trinket:ClearAllPoints()
+    local margin = (Gladdy.db.highlightInset and 0 or Gladdy.db.highlightBorderSize) + Gladdy.db.padding
+    if (Gladdy.db.classIconPos == "LEFT") then
+        if (Gladdy.db.trinketPos == "RIGHT") then
+            trinket:SetPoint("TOPLEFT", Gladdy.buttons[unit].healthBar, "TOPRIGHT", margin, 0)
+        else
+            trinket:SetPoint("TOPRIGHT", Gladdy.buttons[unit].classIcon, "TOPLEFT", -Gladdy.db.padding, 0)
+        end
+    else
+        if (Gladdy.db.trinketPos == "RIGHT") then
+            trinket:SetPoint("TOPLEFT", Gladdy.buttons[unit].classIcon, "TOPRIGHT", Gladdy.db.padding, 0)
+        else
+            trinket:SetPoint("TOPRIGHT", Gladdy.buttons[unit].healthBar, "TOPLEFT", -margin, 0)
+        end
+    end
+end

Modules/VersionCheck.lua

@@ -1,9 +1,11 @@
-local str_match, tonumber, tostring = string.match, tonumber, tostring
+local tonumber, tostring = tonumber, tostring
 
 local UnitName = UnitName
+local IsInGroup, IsInRaid = IsInGroup, IsInRaid
+local LE_PARTY_CATEGORY_HOME, LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_HOME, LE_PARTY_CATEGORY_INSTANCE
 
 local Gladdy = LibStub("Gladdy")
-local L = Gladdy.L
+
 local VersionCheck = Gladdy:NewModule("VersionCheck", 1, {
 })
 LibStub("AceComm-3.0"):Embed(VersionCheck)
@@ -21,6 +23,13 @@ end
 
 function VersionCheck:JOINED_ARENA()
     self:RegisterComm("GladdyVCheck", VersionCheck.OnCommReceived)
+    if IsInRaid(LE_PARTY_CATEGORY_HOME) then
+        self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "RAID", self.playerName)
+    elseif IsInGroup(LE_PARTY_CATEGORY_INSTANCE) or IsInRaid(LE_PARTY_CATEGORY_INSTANCE) then
+        self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "INSTANCE_CHAT", self.playerName)
+    elseif IsInGroup(LE_PARTY_CATEGORY_HOME) then
+        self:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "PARTY", self.playerName)
+    end
 end
 
 function VersionCheck:Test(unit)
@@ -39,7 +48,7 @@ function VersionCheck.OnCommReceived(prefix, message, distribution, sender)
         else
             Gladdy:Warn("Current version", "\"".. addonVersion.."\"", "is outdated. Most recent version is", "\"".. message.."\"")
             Gladdy:Warn("Please download the latest Gladdy version at:")
-            Gladdy:Warn("https://github.com/XiconQoo/Gladdy-TBC")
+            Gladdy:Warn("https://www.curseforge.com/wow/addons/gladdy-tbc or https://github.com/XiconQoo/Gladdy-TBC")
         end
     end
 end

Modules/XiconProfiles.lua

@@ -4,94 +4,172 @@ local L = Gladdy.L
 local XiconProfiles = Gladdy:NewModule("XiconProfiles", nil, {
 })
 
-function XiconProfiles:ApplyKlimp()
-    local deserialized = Gladdy.modules["ExportImport"]:Decode(Gladdy:GetKlimpProfile())
+local function applyProfile(profileString)
+    local deserialized = Gladdy.modules["Export Import"]:Decode(profileString)
     if deserialized then
-        Gladdy.modules["ExportImport"]:ApplyImport(deserialized, Gladdy.db)
-    end
-    Gladdy:Reset()
-    Gladdy:HideFrame()
-    Gladdy:ToggleFrame(3)
-end
-
-function XiconProfiles:ApplyKnall()
-    local deserialized = Gladdy.modules["ExportImport"]:Decode(Gladdy:GetKnallProfile())
-    if deserialized then
-        Gladdy.modules["ExportImport"]:ApplyImport(deserialized, Gladdy.db)
-    end
-    Gladdy:Reset()
-    Gladdy:HideFrame()
-    Gladdy:ToggleFrame(3)
-end
-
-function XiconProfiles:ApplyClassic()
-    local deserialized = Gladdy.modules["ExportImport"]:Decode(Gladdy:GetClassicProfile())
-    if deserialized then
-        Gladdy.modules["ExportImport"]:ApplyImport(deserialized, Gladdy.db)
+        Gladdy.modules["Export Import"]:ApplyImport(deserialized, Gladdy.db)
     end
     Gladdy:Reset()
     Gladdy:HideFrame()
     Gladdy:ToggleFrame(3)
+    Gladdy.options.args.lock.name = Gladdy.db.locked and L["Unlock frame"] or L["Lock frame"]
+    Gladdy.options.args.showMover.name = Gladdy.db.showMover and L["Hide Mover"] or L["Show Mover"]
+    LibStub("AceConfigRegistry-3.0"):NotifyChange("Gladdy")
 end
 
 function XiconProfiles:GetOptions()
     return {
+        headerProfileBlizzard = {
+            type = "header",
+            name = "Blizzard " .. L["Profile"],
+            order = 2,
+        },
+        blizzardProfile = {
+            type = "execute",
+            func = function()
+                Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
+                applyProfile(Gladdy:GetBlizzardProfile())
+            end,
+            name = " ",
+            desc = "Blizzard " .. L["Profile"],
+            image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Blizz1.blp",
+            imageWidth = 350,
+            imageHeight = 175,
+            width = "full",
+            order = 3,
+        },
         headerProfileClassic = {
             type = "header",
-            name = L["Classic Profile"],
-            order = 2,
+            name = "Classic " .. L["Profile"],
+            order = 4,
         },
         classicProfile = {
             type = "execute",
             func = function()
                 Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
-                XiconProfiles:ApplyClassic()
+                applyProfile(Gladdy:GetClassicProfile())
             end,
             name = " ",
-            desc = "Classic Profile",
+            desc = "Classic " .. L["Profile"],
             image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Classic1.blp",
-            imageWidth = 256,
-            imageHeight = 128,
+            imageWidth = 350,
+            imageHeight = 175,
             width = "full",
-            order = 3,
+            order = 5,
+        },
+        headerProfileClassicNoPet = {
+            type = "header",
+            name = "Classic " .. L["Profile"] .. L[" No Pet"],
+            order = 6,
+        },
+        classicProfileNoPet = {
+            type = "execute",
+            func = function()
+                Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
+                applyProfile(Gladdy:GetClassicProfileNoPet())
+            end,
+            name = " ",
+            desc = "Classic " .. L["Profile"] .. L[" No Pet"],
+            image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Classic2.blp",
+            imageWidth = 350,
+            imageHeight = 175,
+            width = "full",
+            order = 7,
         },
         headerProfileKnall = {
             type = "header",
-            name = L["Knall's Profile"],
-            order = 4,
+            name = "Knall's " .. L["Profile"],
+            order = 8,
         },
         knallProfile = {
             type = "execute",
             func = function()
                 Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
-                XiconProfiles:ApplyKnall()
+                applyProfile(Gladdy:GetKnallProfile())
             end,
             name = " ",
-            desc = "Knall's Profile",
+            desc = "Knall's " .. L["Profile"],
             image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Knall1.blp",
-            imageWidth = 256,
-            imageHeight = 128,
+            imageWidth = 350,
+            imageHeight = 175,
             width = "full",
-            order = 5,
+            order = 9,
         },
         headerProfileKlimp = {
             type = "header",
-            name = L["Klimp's Profile"],
-            order = 6,
+            name = "Klimp's " .. L["Profile"],
+            order = 10,
         },
         klimpProfiles = {
             type = "execute",
             func = function()
                 Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
-                XiconProfiles:ApplyKlimp()
+                applyProfile(Gladdy:GetKlimpProfile())
             end,
             image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Klimp1.blp",
-            imageWidth = 256,
-            imageHeight = 128,
+            imageWidth = 350,
+            imageHeight = 175,
             name = " ",
-            desc = "Klimp's Profile",
+            desc = "Klimp's " .. L["Profile"],
             width = "full",
-            order = 7,
+            order = 11,
+        },
+        headerProfileRukk = {
+            type = "header",
+            name = "Rukk1's " .. L["Profile"],
+            order = 12,
+        },
+        rukkProfile = {
+            type = "execute",
+            func = function()
+                Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
+                applyProfile(Gladdy:GetRukkProfile())
+            end,
+            name = " ",
+            desc = "Rukk1's " .. L["Profile"],
+            image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Rukk1.blp",
+            imageWidth = 350,
+            imageHeight = 175,
+            width = "full",
+            order = 13,
+        },
+        headerProfileMir = {
+            type = "header",
+            name = "Mir's " .. L["Profile"],
+            order = 14,
+        },
+        mirProfile = {
+            type = "execute",
+            func = function()
+                Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
+                applyProfile(Gladdy:GetMirProfile())
+            end,
+            name = " ",
+            desc = "Mir's " .. L["Profile"],
+            image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Mir1.blp",
+            imageWidth = 350,
+            imageHeight = 175,
+            width = "full",
+            order = 15,
+        },
+        headerProfileMirEdited = {
+            type = "header",
+            name = "Mir's " .. L["Profile"] .. " edited",
+            order = 16,
+        },
+        mirProfileEdited = {
+            type = "execute",
+            func = function()
+                Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
+                applyProfile(Gladdy:GetMirEditedProfile())
+            end,
+            name = " ",
+            desc = "Mir's " .. L["Profile"],
+            image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Mir1_edited.blp",
+            imageWidth = 350,
+            imageHeight = 175,
+            width = "full",
+            order = 17,
         },
     }
 end

Options.lua

@@ -1,4 +1,7 @@
-local type, pairs, tinsert, tsort, tostring = type, pairs, table.insert, table.sort, tostring
+local type, pairs, tinsert, tsort = type, pairs, table.insert, table.sort
+local tostring, str_match, tonumber, string_format = tostring, string.match, tonumber, string.format
+local ceil, floor = ceil, floor
+local ReloadUI = ReloadUI
 
 local InterfaceOptionsFrame_OpenToFrame = InterfaceOptionsFrame_OpenToFrame
 local GetSpellInfo = GetSpellInfo
@@ -6,35 +9,66 @@ local LOCALIZED_CLASS_NAMES_MALE = LOCALIZED_CLASS_NAMES_MALE
 local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS
 local AURA_TYPE_DEBUFF, AURA_TYPE_BUFF = AURA_TYPE_DEBUFF, AURA_TYPE_BUFF
 
+
 local Gladdy = LibStub("Gladdy")
 local LibClassAuras = LibStub("LibClassAuras-1.0")
 local L = Gladdy.L
 
+Gladdy.TIMER_FORMAT = { tenths = "tenths", seconds = "seconds",
+                       values = {
+                           ["tenths"] = "xx:xx Miliseconds",
+                           ["seconds"] = "xx Seconds"
+                       }}
+
+function Gladdy:FormatTimer(fontString, timeLeft, milibreakpoint, showSeconds)
+    if timeLeft < 0 then
+        fontString:SetText("")
+        return
+    end
+    local time = timeLeft >= 0.0 and timeLeft or 0.0
+    if Gladdy.db.timerFormat == Gladdy.TIMER_FORMAT.tenths and milibreakpoint then
+        fontString:SetFormattedText("%.1f", time)
+    else
+        if time >= 60 then
+            if showSeconds then
+                fontString:SetText(floor(timeLeft / 60) .. ":" .. string_format("%02.f", floor(timeLeft - floor(timeLeft / 60) * 60)))
+            else
+                fontString:SetText(ceil(ceil(time / 60)) .. "m")
+            end
+        else
+            fontString:SetFormattedText("%d", ceil(time))
+        end
+    end
+end
+
 Gladdy.defaults = {
     profile = {
         locked = false,
+        hideBlizzard = "arena",
         x = 0,
         y = 0,
-        growUp = false,
+        growDirection = "BOTTOM",
         frameScale = 1,
-        padding = 3,
+        pixelPerfect = false,
         barWidth = 180,
-        bottomMargin = 10,
-        statusbarBorderOffset = 7,
+        bottomMargin = 2,
+        statusbarBorderOffset = 6,
+        timerFormat = Gladdy.TIMER_FORMAT.tenths,
+        backgroundColor = {r = 0, g = 0, b = 0, a = 0},
+        newLayout = false,
+        showMover = true,
     },
 }
 
 SLASH_GLADDY1 = "/gladdy"
 SlashCmdList["GLADDY"] = function(msg)
-    if (msg == "test2") then
-        Gladdy:ToggleFrame(2)
-    elseif (msg == "test5") then
-        Gladdy:ToggleFrame(5)
-    elseif (msg:find("test")) then
+    if (str_match(msg, "test[1-5]")) then
+        local _, num = str_match(msg, "(test)([1-5])")
+        Gladdy:ToggleFrame(tonumber(num))
+    elseif (msg == "test") then
         Gladdy:ToggleFrame(3)
     elseif (msg == "ui" or msg == "options" or msg == "config") then
         LibStub("AceConfigDialog-3.0"):Open("Gladdy")
-        --Gladdy:ShowOptions()
     elseif (msg == "reset") then
         Gladdy.dbi:ResetProfile()
     elseif (msg == "hide") then
@@ -43,7 +77,8 @@ SlashCmdList["GLADDY"] = function(msg)
     else
         Gladdy:Print(L["Valid slash commands are:"])
         Gladdy:Print("/gladdy ui")
-        Gladdy:Print("/gladdy test2-5")
+        Gladdy:Print("/gladdy test")
+        Gladdy:Print("/gladdy test1-5")
         Gladdy:Print("/gladdy hide")
         Gladdy:Print("/gladdy reset")
     end
@@ -69,6 +104,10 @@ function Gladdy:option(params)
     return defaults
 end
 
+function Gladdy:SetColor(option)
+    return option.r, option.g, option.b, option.a
+end
+
 function Gladdy:colorOption(params)
     local defaults = {
         get = function(info)
@@ -97,6 +136,11 @@ local function setOpt(info, value)
     local key = info.arg or info[#info]
     Gladdy.dbi.profile[key] = value
     Gladdy:UpdateFrame()
+    if Gladdy.db.hideBlizzard == "always" then
+        SetCVar("showArenaEnemyFrames", 0)
+    elseif Gladdy.db.hideBlizzard == "never" then
+        SetCVar("showArenaEnemyFrames", 1)
+    end
 end
 local function getColorOpt(info)
     local key = info.arg or info[#info]
@@ -114,7 +158,7 @@ function Gladdy:SetupModule(name, module, order)
         self.options.args[name] = {
             type = "group",
             name = L[name],
-            desc = L[name .. " settings"],
+            desc = L[name] .. " " .. L["settings"],
             childGroups = "tab",
             order = order,
             args = {},
@@ -152,7 +196,7 @@ local function pairsByKeys(t)
     for k in pairs(t) do
         tinsert(a, k)
     end
-    tsort(a)
+    tsort(a, function(a, b) return L[a] < L[b] end)
 
     local i = 0
     return function()
@@ -169,35 +213,105 @@ end
 function Gladdy:SetupOptions()
     self.options = {
         type = "group",
-        name = "Gladdy",
+        name = L["Gladdy"],
         plugins = {},
         childGroups = "tree",
         get = getOpt,
         set = setOpt,
         args = {
+            lock = {
+                order = 1,
+                width = 0.7,
+                name = Gladdy.db.locked and L["Unlock frame"] or L["Lock frame"],
+                desc = L["Toggle if frame can be moved"],
+                type = "execute",
+                func = function()
+                    Gladdy.db.locked = not Gladdy.db.locked
+                    Gladdy:UpdateFrame()
+                    self.options.args.lock.name = Gladdy.db.locked and L["Unlock frame"] or L["Lock frame"]
+                end,
+            },
+            showMover = {
+                order = 2,
+                width = 0.7,
+                name = Gladdy.db.showMover and L["Hide Mover"] or L["Show Mover"],
+                desc = L["Toggle to show Mover Frames"],
+                type = "execute",
+                func = function()
+                    Gladdy.db.showMover = not Gladdy.db.showMover
+                    Gladdy:UpdateFrame()
+                    self.options.args.showMover.name = Gladdy.db.showMover and L["Hide Mover"] or L["Show Mover"]
+                end,
+            },
+            test = {
+                order = 2,
+                width = 0.7,
+                name = L["Test"],
+                desc = L["Show Test frames"],
+                type = "execute",
+                func = function()
+                    Gladdy:ToggleFrame(3)
+                end,
+            },
+            hide = {
+                order = 3,
+                width = 0.7,
+                name = L["Hide"],
+                desc = L["Hide frames"],
+                type = "execute",
+                func = function()
+                    Gladdy:Reset()
+                    Gladdy:HideFrame()
+                end,
+            },
+            reload = {
+                order = 4,
+                width = 0.7,
+                name = L["ReloadUI"],
+                desc = L["Reloads the UI"],
+                type = "execute",
+                func = function()
+                    ReloadUI()
+                end,
+            },
+            version = {
+                order = 5,
+                width = 1,
+                type = "description",
+                name = "     Gladdy v" .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType
+            },
             general = {
                 type = "group",
                 name = L["General"],
                 desc = L["General settings"],
                 childGroups = "tab",
-                order = 1,
+                order = 5,
                 args = {
-                    locked = {
-                        type = "toggle",
-                        name = L["Lock frame"],
-                        desc = L["Toggle if frame can be moved"],
-                        order = 1,
+                    growDirection = {
+                        type = "select",
+                        name = L["Grow Direction"],
+                        order = 3,
+                        values = {
+                            ["BOTTOM"] = L["Down"],
+                            ["TOP"] = L["Up"],
+                            ["LEFT"] = L["Left"],
+                            ["RIGHT"] = L["Right"],
+                        }
                     },
-                    growUp = {
-                        type = "toggle",
-                        name = L["Grow frame upwards"],
-                        desc = L["If enabled the frame will grow upwards instead of downwards"],
-                        order = 2,
+                    hideBlizzard = {
+                        type = "select",
+                        name = L["Hide Blizzard"],
+                        values = {
+                            ["arena"] = L["Arena only"],
+                            ["never"] = L["Never"],
+                            ["always"] = L["Always"],
+                        },
+                        order = 4,
                     },
                     group = {
                         type = "group",
-                        name = "General",
-                        order = 3,
+                        name = L["General"],
+                        order = 5,
                         childGroups = "tree",
                         args = {
                             frameGeneral = {
@@ -210,42 +324,49 @@ function Gladdy:SetupOptions()
                                         name = L["Frame General"],
                                         order = 3,
                                     },
+                                    pixelPerfect = {
+                                        type = "toggle",
+                                        name = L["Pixel Perfect Scale"],
+                                        desc = L["Enables Pixel Perfect Scale - disables manual "].. L["Frame scale"],
+                                        order = 4,
+                                    },
                                     frameScale = {
                                         type = "range",
                                         name = L["Frame scale"],
                                         desc = L["Scale of the frame"],
-                                        order = 4,
+                                        disabled = function() return Gladdy.db.pixelPerfect end,
+                                        order = 5,
                                         min = .1,
                                         max = 2,
-                                        step = .1,
-                                    },
-                                    padding = {
-                                        type = "range",
-                                        name = L["Frame padding"],
-                                        desc = L["Padding of the frame"],
-                                        order = 5,
-                                        min = 0,
-                                        max = 20,
-                                        step = 1,
+                                        step = .01,
                                     },
                                     barWidth = {
                                         type = "range",
                                         name = L["Frame width"],
                                         desc = L["Width of the bars"],
-                                        order = 6,
+                                        order = 7,
                                         min = 10,
                                         max = 500,
                                         step = 5,
                                     },
                                     bottomMargin = {
                                         type = "range",
-                                        name = L["Bottom margin"],
+                                        name = L["Margin"],
                                         desc = L["Margin between each button"],
-                                        order = 7,
-                                        min = -100,
-                                        max = 100,
+                                        order = 8,
+                                        min = -200,
+                                        max = 200,
                                         step = 1,
                                     },
+                                    backgroundColor = {
+                                        type = "color",
+                                        name = L["Background color"],
+                                        desc = L["Background Color of the frame"],
+                                        order = 9,
+                                        hasAlpha = true,
+                                        get = getColorOpt,
+                                        set = setColorOpt,
+                                    },
                                 }
                             },
                             cooldownGeneral = {
@@ -268,7 +389,8 @@ function Gladdy:SetupOptions()
                                             local c = Gladdy.db.trinketDisableCircle
                                             local d = Gladdy.db.drDisableCircle
                                             local e = Gladdy.db.buffsDisableCircle
-                                            if (a == b and a == c and a == d and a == e) then
+                                            local f = Gladdy.db.racialDisableCircle
+                                            if (a == b and a == c and a == d and a == e and a == f) then
                                                 return a
                                             else
                                                 return ""
@@ -280,6 +402,7 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.trinketDisableCircle = value
                                             Gladdy.db.drDisableCircle = value
                                             Gladdy.db.buffsDisableCircle = value
+                                            Gladdy.db.racialDisableCircle = value
                                             Gladdy:UpdateFrame()
                                         end,
                                         width= "full",
@@ -297,7 +420,8 @@ function Gladdy:SetupOptions()
                                             local c = Gladdy.db.auraCooldownAlpha
                                             local d = Gladdy.db.trinketCooldownAlpha
                                             local e = Gladdy.db.buffsCooldownAlpha
-                                            if (a == b and a == c and a == d and a == e) then
+                                            local f = Gladdy.db.racialCooldownAlpha
+                                            if (a == b and a == c and a == d and a == e and a == f) then
                                                 return a
                                             else
                                                 return ""
@@ -309,9 +433,16 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.auraCooldownAlpha = value
                                             Gladdy.db.trinketCooldownAlpha = value
                                             Gladdy.db.buffsCooldownAlpha = value
+                                            Gladdy.db.racialCooldownAlpha = value
                                             Gladdy:UpdateFrame()
                                         end
                                     },
+                                    timerFormat = Gladdy:option({
+                                        type = "select",
+                                        name = L["Timer Format"],
+                                        order = 11,
+                                        values = Gladdy.TIMER_FORMAT.values
+                                    })
                                 },
                             },
                             fontGeneral = {
@@ -332,33 +463,42 @@ function Gladdy:SetupOptions()
                                         dialogControl = "LSM30_Font",
                                         values = AceGUIWidgetLSMlists.font,
                                         get = function(info)
-                                            local a = Gladdy.db.castBarFont
-                                            local b = Gladdy.db.healthBarFont
-                                            local c = Gladdy.db.powerBarFont
+                                            local a = Gladdy.db.auraFont
+                                            local b = Gladdy.db.buffsFont
+                                            local c = Gladdy.db.castBarFont
                                             local d = Gladdy.db.cooldownFont
                                             local e = Gladdy.db.drFont
-                                            local f = Gladdy.db.auraFont
-                                            local g = Gladdy.db.buffsFont
-                                            if (a == b and a == c and a == d and a == e and a == f and a == g) then
+                                            local f = Gladdy.db.healthBarFont
+                                            local g = Gladdy.db.petHealthBarFont
+                                            local h = Gladdy.db.powerBarFont
+                                            local i = Gladdy.db.racialFont
+                                            local j = Gladdy.db.npTremorFont
+                                            local k = Gladdy.db.trinketFont
+                                            if (a == b and a == c and a == d and a == e and a == f
+                                                    and a == g and a == h and a == i and a == j and a == k) then
                                                 return a
                                             else
                                                 return ""
                                             end
                                         end,
                                         set = function(info, value)
-                                            Gladdy.db.castBarFont = value
-                                            Gladdy.db.healthBarFont = value
-                                            Gladdy.db.powerBarFont = value
-                                            Gladdy.db.cooldownFont = value
-                                            Gladdy.db.drFont = value
                                             Gladdy.db.auraFont = value
                                             Gladdy.db.buffsFont = value
+                                            Gladdy.db.castBarFont = value
+                                            Gladdy.db.cooldownFont = value
+                                            Gladdy.db.drFont = value
+                                            Gladdy.db.healthBarFont = value
+                                            Gladdy.db.petHealthBarFont = value
+                                            Gladdy.db.powerBarFont = value
+                                            Gladdy.db.racialFont = value
+                                            Gladdy.db.npTremorFont = value
+                                            Gladdy.db.trinketFont = value
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
                                     fontColor = {
                                         type = "color",
-                                        name = L["Font color"],
+                                        name = L["Font color text"],
                                         desc = L["Color of the text"],
                                         order = 12,
                                         hasAlpha = true,
@@ -366,8 +506,10 @@ function Gladdy:SetupOptions()
                                             local a = Gladdy.db.healthBarFontColor
                                             local b = Gladdy.db.powerBarFontColor
                                             local c = Gladdy.db.castBarFontColor
+                                            local d = Gladdy.db.petHealthBarFontColor
                                             if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a
-                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a) then
+                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a
+                                                    and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a) then
                                                 return a.r, a.g, a.b, a.a
                                             else
                                                 return { r = 0, g = 0, b = 0, a = 0 }
@@ -378,6 +520,35 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.healthBarFontColor = rgb
                                             Gladdy.db.powerBarFontColor = rgb
                                             Gladdy.db.castBarFontColor = rgb
+                                            Gladdy.db.petHealthBarFontColor = rgb
+                                            Gladdy:UpdateFrame()
+                                        end,
+                                    },
+                                    fontColorCD = {
+                                        type = "color",
+                                        name = L["Font color timer"],
+                                        desc = L["Color of the timers"],
+                                        order = 12,
+                                        hasAlpha = true,
+                                        get = function(info)
+                                            local a = Gladdy.db.auraFontColor
+                                            local b = Gladdy.db.buffsFontColor
+                                            local c = Gladdy.db.cooldownFontColor
+                                            local d = Gladdy.db.drFontColor
+                                            if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a
+                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a
+                                                    and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a) then
+                                                return a.r, a.g, a.b, a.a
+                                            else
+                                                return { r = 0, g = 0, b = 0, a = 0 }
+                                            end
+                                        end,
+                                        set = function(info, r, g, b, a)
+                                            local rgb = {r = r, g = g, b = b, a = a}
+                                            Gladdy.db.auraFontColor = rgb
+                                            Gladdy.db.buffsFontColor = rgb
+                                            Gladdy.db.cooldownFontColor = rgb
+                                            Gladdy.db.drFontColor = rgb
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
@@ -400,27 +571,34 @@ function Gladdy:SetupOptions()
                                         order = 14,
                                         values = Gladdy:GetIconStyles(),
                                         get = function(info)
-                                            if (Gladdy.db.classIconBorderStyle == Gladdy.db.trinketBorderStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.castBarIconStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.auraBorderStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.cooldownBorderStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.buffsBorderStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.drBorderStyle
-                                                    and Gladdy.db.classIconBorderStyle == Gladdy.db.npTotemPlatesBorderStyle) then
-                                                return Gladdy.db.classIconBorderStyle
+                                            if (Gladdy.db.auraBorderStyle == Gladdy.db.buffsBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.castBarIconStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.classIconBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.cooldownBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.ciBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.cooldownBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.drBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.racialBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.npTotemPlatesBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.petPortraitBorderStyle
+                                                    and Gladdy.db.auraBorderStyle == Gladdy.db.trinketBorderStyle) then
+                                                return Gladdy.db.auraBorderStyle
                                             else
                                                 return ""
                                             end
                                         end,
                                         set = function(info, value)
-                                            Gladdy.db.classIconBorderStyle = value
-                                            Gladdy.db.trinketBorderStyle = value
-                                            Gladdy.db.castBarIconStyle = value
                                             Gladdy.db.auraBorderStyle = value
-                                            Gladdy.db.npTotemPlatesBorderStyle = value
-                                            Gladdy.db.cooldownBorderStyle = value
                                             Gladdy.db.buffsBorderStyle = value
+                                            Gladdy.db.castBarIconStyle = value
+                                            Gladdy.db.classIconBorderStyle = value
+                                            Gladdy.db.ciBorderStyle = value
+                                            Gladdy.db.cooldownBorderStyle = value
                                             Gladdy.db.drBorderStyle = value
+                                            Gladdy.db.racialBorderStyle = value
+                                            Gladdy.db.npTotemPlatesBorderStyle = value
+                                            Gladdy.db.petPortraitBorderStyle = value
+                                            Gladdy.db.trinketBorderStyle = value
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
@@ -431,11 +609,25 @@ function Gladdy:SetupOptions()
                                         order = 15,
                                         hasAlpha = true,
                                         get = function(info)
-                                            local a = Gladdy.db.classIconBorderColor
-                                            local b = Gladdy.db.trinketBorderColor
-                                            local c = Gladdy.db.castBarIconColor
+                                            local a = Gladdy.db.auraBuffBorderColor
+                                            local b = Gladdy.db.auraDebuffBorderColor
+                                            local c = Gladdy.db.buffsBorderColor
+                                            local d = Gladdy.db.castBarIconColor
+                                            local e = Gladdy.db.classIconBorderColor
+                                            local f = Gladdy.db.ciBorderColor
+                                            local g = Gladdy.db.cooldownBorderColor
+                                            local h = Gladdy.db.drBorderColor
+                                            local i = Gladdy.db.trinketBorderColor
+                                            local j = Gladdy.db.racialBorderColor
                                             if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a
-                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a) then
+                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a
+                                                    and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a
+                                                    and a.r == e.r and a.g == e.g and a.b == e.b and a.a == e.a
+                                                    and a.r == f.r and a.g == f.g and a.b == f.b and a.a == f.a
+                                                    and a.r == g.r and a.g == g.g and a.b == g.b and a.a == g.a
+                                                    and a.r == h.r and a.g == h.g and a.b == h.b and a.a == h.a
+                                                    and a.r == i.r and a.g == i.g and a.b == i.b and a.a == i.a
+                                                    and a.r == j.r and a.g == j.g and a.b == j.b and a.a == j.a) then
                                                 return a.r, a.g, a.b, a.a
                                             else
                                                 return { r = 0, g = 0, b = 0, a = 0 }
@@ -443,13 +635,16 @@ function Gladdy:SetupOptions()
                                         end,
                                         set = function(info, r, g, b, a)
                                             local rgb = {r = r, g = g, b = b, a = a}
-                                            Gladdy.db.classIconBorderColor = rgb
-                                            Gladdy.db.trinketBorderColor = rgb
-                                            Gladdy.db.castBarIconColor = rgb
-                                            Gladdy.db.npTotemPlatesBorderColor = rgb
-                                            Gladdy.db.drBorderColor = rgb
-                                            Gladdy.db.cooldownBorderColor = rgb
+                                            Gladdy.db.auraBuffBorderColor = rgb
+                                            Gladdy.db.auraDebuffBorderColor = rgb
                                             Gladdy.db.buffsBorderColor = rgb
+                                            Gladdy.db.castBarIconColor = rgb
+                                            Gladdy.db.classIconBorderColor = rgb
+                                            Gladdy.db.ciBorderColor = rgb
+                                            Gladdy.db.cooldownBorderColor = rgb
+                                            Gladdy.db.drBorderColor = rgb
+                                            Gladdy.db.trinketBorderColor = rgb
+                                            Gladdy.db.racialBorderColor = rgb
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
@@ -476,7 +671,8 @@ function Gladdy:SetupOptions()
                                             local a = Gladdy.db.healthBarTexture
                                             local b = Gladdy.db.powerBarTexture
                                             local c = Gladdy.db.castBarTexture
-                                            if (a == b and a == c) then
+                                            local d = Gladdy.db.petHealthBarTexture
+                                            if (a == b and a == c and a == d) then
                                                 return a
                                             else
                                                 return ""
@@ -486,6 +682,7 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.healthBarTexture = value
                                             Gladdy.db.powerBarTexture = value
                                             Gladdy.db.castBarTexture = value
+                                            Gladdy.db.petHealthBarTexture = value
                                             Gladdy:UpdateFrame()
                                         end,
                                         width= "full",
@@ -501,7 +698,8 @@ function Gladdy:SetupOptions()
                                             local a = Gladdy.db.healthBarBorderStyle
                                             local b = Gladdy.db.powerBarBorderStyle
                                             local c = Gladdy.db.castBarBorderStyle
-                                            if (a == b and a == c) then
+                                            local d = Gladdy.db.petHealthBarBorderStyle
+                                            if (a == b and a == c and a == d) then
                                                 return a
                                             else
                                                 return ""
@@ -511,6 +709,7 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.healthBarBorderStyle = value
                                             Gladdy.db.powerBarBorderStyle = value
                                             Gladdy.db.castBarBorderStyle = value
+                                            Gladdy.db.petHealthBarBorderStyle = value
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
@@ -532,8 +731,10 @@ function Gladdy:SetupOptions()
                                             local a = Gladdy.db.castBarBorderColor
                                             local b = Gladdy.db.healthBarBorderColor
                                             local c = Gladdy.db.powerBarBorderColor
+                                            local d = Gladdy.db.petHealthBarBorderColor
                                             if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a
-                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a) then
+                                                    and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a
+                                                    and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a) then
                                                 return a.r, a.g, a.b, a.a
                                             else
                                                 return { r = 0, g = 0, b = 0, a = 0 }
@@ -544,6 +745,7 @@ function Gladdy:SetupOptions()
                                             Gladdy.db.castBarBorderColor = rgb
                                             Gladdy.db.healthBarBorderColor = rgb
                                             Gladdy.db.powerBarBorderColor = rgb
+                                            Gladdy.db.petHealthBarBorderColor = rgb
                                             Gladdy:UpdateFrame()
                                         end,
                                     },
@@ -556,19 +758,19 @@ function Gladdy:SetupOptions()
         },
     }
 
-    local order = 2
+    local order = 6
     for k, v in pairsByKeys(self.modules) do
         self:SetupModule(k, v, order)
         order = order + 1
     end
 
     local options = {
-        name = "Gladdy",
+        name = L["Gladdy"],
         type = "group",
         args = {
             load = {
-                name = "Load configuration",
-                desc = "Load configuration options",
+                name = L["Load configuration"],
+                desc = L["Load configuration options"],
                 type = "execute",
                 func = function()
                     HideUIPanel(InterfaceOptionsFrame)
@@ -595,7 +797,7 @@ function Gladdy:GetAuras(auraType)
         ckeckAll = {
             order = 1,
             width = "0.7",
-            name = "Check All",
+            name = L["Check All"],
             type = "execute",
             func = function(info)
                 if auraType == AURA_TYPE_DEBUFF then
@@ -612,7 +814,7 @@ function Gladdy:GetAuras(auraType)
         uncheckAll = {
             order = 2,
             width = "0.7",
-            name = "Uncheck All",
+            name = L["Uncheck All"],
             type = "execute",
             func = function(info)
                 if auraType == AURA_TYPE_DEBUFF then
@@ -716,7 +918,7 @@ function Gladdy:GetAuras(auraType)
                 name = classSpells[i].name,
                 type = "toggle",
                 image = texture,
-                width = "2",
+                width = "full",
                 arg = tostring(classSpells[i].id[1])
             }
             defaultDebuffs[tostring(classSpells[i].id[1])] = true

README.md

@@ -1,31 +1,50 @@
 # Gladdy - TBC
 
 ### The most powerful arena addon for WoW TBC 2.5.1
-## [v1.06-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.06-Beta/Gladdy_TBC-Classic_v1.06-Beta.zip)
+
+---
+
+## [v2.00-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.00-Release/Gladdy_TBC-Classic_v2.00-Release.zip)
 
 ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
 
 ### Origin
 
-Based on https://github.com/Schaka/gladdy
+Based on https://github.com/miraage/gladdy
 
 ### Motivation for this edit
 
 The goal is to make Gladdy highly configurable in it's appearance. Everything can be arranged left or right independently. Also I gave Gladdy a new look with black borders. A lot can be configured.
 
 ### Modules:
-- Announcement (drink, trinket usage, spec detection ...)
-- ArenaCountDown
-- Auras (show important (de)buffs in the class icon)
-- Cooldown (tracks important cooldowns)
-- Diminishing (tracks DRs)
-- ExportImport (share your profile with your friends in the form of a string, which can be imported)
-- Highlight (highlights focus and target)
-- Pets (show arena pets)
-- TotemPlates (show totem icons instead of normal nameplates)
-- Trinket (tracks trinket usage)
-- VersionCheck (checks if you use an older version that your teammate)
-- XiconProfiles (predefined profiles to start your configuration from)
+- **Announcement** (drink, trinket usage, spec detection ...)
+- **ArenaCountDown**
+- **Auras** (show important (de)buffs as well as interrupts on the class icon)
+- **BuffsDebuffs** (show buffs and debuffs on arena frames - can be filtered)
+- **CastBar** (shows a castbar, can be disabled)
+- **ClassIcon** (or specicon, once detected)
+- **Clicks** (bind spells or macros to click actions)
+- **CombatIndicator** (shows a sword icon if unit is in combat)
+- **Cooldown** (tracks important cooldowns)
+- **Diminishing** (tracks DRs)
+- **ExportImport** (share your profile with your friends in the form of a string, which can be imported)
+- **Highlight** (highlights focus and target)
+- **Pets** (show arena pets)
+- **Racial** (show arena racial cooldowns)
+- **Range Check** (checks the range to a unit by a configurable spell)
+- **Shadowsight Timer** (shows a little movable frame with time left until Shadow Eyes spawn)
+- **TotemPlates** (show totem icons instead of normal nameplates, compatible with **Plater, NeatPlates, KUI, ThreatPlates, ElvUI, TukUI**)
+- **Trinket** (tracks trinket usage)
+- **VersionCheck** (checks if you use an older version that your teammate)
+- **XiconProfiles** (predefined profiles to start your configuration from)
+
+### Valid Slash commands
+
+- **/gladdy ui** (shows config)
+- **/gladdy test** (standard 3v3 test mode)
+- **/gladdy test1** to **/gladdy test5** (test mode with 1-5 frames active)
+- **/gladdy hide** (hides the frames)
+- **/gladdy reset** (resets current profile to default settings)
 
 ## Screenshots
 
@@ -33,8 +52,217 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
 <img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/sample2.jpg" align="right" width="48.5%">
 <img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/sample3.png" width="48.5%">
 
+## Contributors
+
+- [ManneN1](https://github.com/ManneN1)
+- [AlexFolland](https://github.com/AlexFolland)
+- [dfherr](https://github.com/dfherr)
+- [miraage](https://github.com/miraage)
+- [veiz](https://github.com/veiz)
+
+Thank you!
+
+## Special Thanks
+
+- **miraage** - the origininal author of Gladdy! Your work set the foundation for this edit. Thanks!
+- **Schaka** - the maintainer of Gladdy! (thanks for letting me continue Gladdy and all the work you put into the TBC community)
+- **Macumba** (thanks for all the support, your feedback and your dedication for the TBC community)
+- **RMO** (without you I would not have modified Gladdy at all and thanks for all the suggestions and active feedback)
+- **Ur0b0r0s aka DrainTheLock** (thanks for testing, giving feedback and correcting/adding wrong CDs)
+- **Klimp** (thanks for all the suggestions and active feedback)
+- **the whole TBC addons 2.4.3 discord** (thanks for the support and great community, especially the MVPs)
+- **Hydra** (thanks for constructive feedback and suggestions)
+- **Xyz** (thanks for suggestions)
+
+---
+
 ### Changes
 
+### v2.00-Release
+
+This is a packed release with new features and bugfixes. Most importantly, positioning of all elements has been redone with movable frames.
+Thank you for the great feedback and active contribution.
+
+***Attention: Once you install this version it will drastically change your current profile! You can't go back to an earlier version. Either back up your WTF or export your Profile before updating!***
+
+**Here is a list of all changes:**
+- **major release version set to v2**
+  - this will mean, that export strings will still be backwards compatible, but not forward (Gladdy v2.x String can't be imported into Gladdy v1.x but vice versa)
+- **big overhaul of positioning elements added! All elements besides HP and PowerBar can be moved separately**
+  - added Mover Frames for Auras, Interrupts, (De)Buffs, CastBar, ClassIcon, CombatIndicator, Cooldowns, DRs, Pets, Racial, Trinket
+  - this will hopefully make configuration a lot easier
+  - all visible elements' FrameStrata and FrameLevel can be configured (overlap frames how you want it)
+- **SpecDetection:**
+  - fixed spec detection for Paladins
+  - added following spells for better spec detection:
+      - Expose Weakness (Survival Hunter)
+      - Slow (Arcane Mage)
+      - Improved Blink (Arcane Mage)
+      - Vindication (Retribution Paladin)
+      - Holy Shield (Protection Paladin)
+      - Vampiric Embrace (Shadow Priest)
+      - Blade Flurry (Combat Rogue)
+      - Unleashed Rage (Enhancement Shaman)
+      - Flurry (Enhancement Shaman)
+      - Shamanistic Rage (Enhancement Shaman)
+      - Healing Way (Restoration Shaman)
+      - Totem of Wrath (Elemental Shaman)
+      - Dark Pact (Affliction Warlock)
+      - Conflagrate (Destruction Warlock)
+      - Shield Slam (Protection Warrior)
+- **Cooldowns:**
+  - added Fear Ward and Fear Ward Cooldown Detection in case it was used before arena
+  - added following cooldowns:
+      - Scare Beast (Hunter)
+      - Feign Death (Hunter)
+      - Viper Sting (Hunter)
+      - Flare (Hunter)
+      - Fear Ward (Priest)
+      - Shadow Word: Death (Priest)
+      - Evocation (Mage)
+      - Grounding Totem (Shaman)
+      - Spell Lock (Warlock)
+      - Devour Magic (Warlock)
+      - Intercept (Warrior)
+- **Auras/Interrupts:**
+  - can now be detached from ClassIcon and positioned/scaled anywhere separately
+  - added Auras:
+      - Scare Beast (Hunter)
+      - Fear Ward (Priest)
+- **Shadowsight:**
+  - reset timer when buff was taken
+  - add a configurable 2nd timer or show one timer with the closest CD
+- **CastBar Icon can be enabled/disabled**
+- **Trinket solid color option added**
+  - color for Trinket on/off CD can be configured (red/green by default)
+- **fixed some DR-categories** (Hibernate / Chastice / Dragonsbreath / ImpConcussiveShot / Counterattack)
+- **Pixel Perfect option added** (makes your Gladdy Frames pixel perfect - no more weird scaling interferences)
+- **Pets can be grouped** (not perfect yet, but a first step)
+- **added DR-Level Text** (thanks https://github.com/ManneN1)
+- **added zhCN Locale** (thanks https://github.com/veiz)
+- **ClassIcon can be disabled**
+- **add interrupt announcement**
+- **detect SpellLock and Devour Magic cooldowns properly**
+- **minor fixes:**
+  - fixed reloading during arena to properly show all frames
+  - fix grow up positioning
+
+### v1.22-Release
+- fixed import for some localizations not working
+- added cooldown number alpha configurations for Auras, BuffsDebuffs, Cooldowns, Diminishings, Racial & Trinket
+- grounding totem effect fix
+- fixed some buffs/debuffs not being present in BuffsDebuffs
+
+### v1.21-Release
+- fixed error when hiding blizzard frames ArenaEnemyFrames related to ElvUI
+- added Pummel cooldown
+
+### v1.20-Release
+- configurable DR duration
+- scale in 0.01 percent steps
+- added Net-o-Matic, Nigh Invulnerablility Shield, Nigh Invulnerablility Backfire & Flee (Skull of Impending Doom) to Auras
+- added Mangle, Chastise, Avenging Wrath, Rapid Fire to BuffsDebuffs
+- improved testmode to only activate Auras/Buffs/Debuffs/Dr's that are actually enabled
+- added Mir's profile to XiconProfiles
+- added zhTW localization
+- added buttons for Test, Hide & Reload in the config
+- added version in config
+- ArenaCountdown upgrade
+- Repentance, Freezing Trap & Wyvern Sting are now disorients
+- import string now ignores errors on deleted options
+- added (un)checkAll button in DR-Categories in Diminishing Module
+- totemplates fix option to alter all colors/alphas
+- hide blizzard arena pets as well
+- fix shadowsight timer showing when not in arena or testmode
+- some minor refactoring / optimization
+
+### v1.19-Beta
+- fix gladdy frames not showing v2
+- minor bug fixes
+
+### v1.18-Beta
+- castbar font now working properly
+
+### v1.17-Beta
+- option TimerFormat added (seconds or seconds + milliseconds) (General > Cooldown General > Timer Format)
+- hide blizzard arena frames without cvars
+- fix Gladdy bugging out on arena join when in combat
+- fix some TotemPlates issues
+- fix Feign Death causing to reset DR and Aura tracking
+- ArenaX option in Healthbar module now only shows the number
+- add background for all frames (General > Frame General > Background Color)
+- add evasion and banish to Aura
+- add MSBT to Announcement module
+- Shadowsight timer can be locked now
+- add "All" modifier to Clicks module
+- updated testmode for BuffsDebuffs (show only from enabled set)
+- updated Klimp's profile
+- added a new Profile in XiconProfiles -> Rukk1
+
+### v1.16-Beta
+- unit gray in stealth when rangecheck module disabled
+
+### v1.15-Beta
+- hotfix added entangling roots nature's grasp
+
+### v1.14-Beta
+- hotfix for secure button grow direction up
+
+### v1.13-Beta
+- frames behave now to mouseover macros
+- added Range Check module (configurable which spell is used for range check)
+- added Shadowsight Timer module (with announce)
+- added Clicks module
+- added Interrupt Tracker in Aura module (border color by spell school locked)
+- TotemPlates compatible with Plater, NeatPlates, KUI, ThreatPlates, ElvUI, TukUI
+- added a new Classic Profile in XiconProfiles
+- hide blizzard arena frames option added in General
+- castbar enable/disable
+- powerbar enable/disable
+- added some auras (Blackout, Improved Hamstring, Mace Stun, Stormherald Stun, Shadowsight Buff)
+- added Swiftmend and Berserker Rage cooldowns
+- changed textures for Mace Stun, Charge Stun and Intercept Stun
+- reduced BLP size by 80%
+- show XiconProfiles on first login
+- DR bigger icons possible
+- minor fixes
+
+### v1.12-Beta
+- fix classic profile
+
+### v1.11-Beta
+- TotemPlates fix after blizzard update
+
+### v1.10-Beta
+- fix german and russian client not working
+- ArenaCountdown loacalization now working for all languages (except itIT...beta has no option to select italian)
+- Race and Class localization working for all languages
+- Localization finished for German
+
+#### v1.09-Beta
+- fix Blizzard profile not having all modules preconfigured
+
+#### v1.08-Beta
+- fix Buffs not showing on class icon
+- added option highlight to be inside
+- added option to grow frames vertically
+- added new profile to XiconProfile (Blizzard raid style)
+- minor bugfixes
+
+#### v1.07-Beta
+
+- CombatIndicator module added
+- spec icon option added to Classicon module
+- arena1-5 for name option added
+- add a couple buffs to LibClassAuras
+- add blessing of sacrifice and intervene to auras
+- general options updated to apply font/borders/etc for all frames
+- XiconProfiles updated
+- /gladdy test1-5 now possible
+- fix PowerBar text updates
+- click through frames exept health/power bar
+- add mask texture for icons
+
 #### v1.06-Beta
 - fixed BuffsDebuff module
 - fix racial texture reset

embeds.xml

@@ -14,4 +14,5 @@
     <Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
     <Include file="libs\DRData-1.0\DRData-1.0.xml"/>
     <Include file="libs\LibClassAuras-1.0\lib.xml"/>
+    <Include file="libs\LibSpellRange-1.0\lib.xml"/>
 </Ui>