From 08aaabf73d81e4ea79b8492880c3d0a2aa84a047 Mon Sep 17 00:00:00 2001 From: Lanerra Date: Sat, 25 Oct 2014 11:40:05 -0700 Subject: [PATCH] - Fix bug in colors table - Accidentally removed a necessary function. Oops. --- oUF_Lanerra.lua | 22 +++++++++++++++------- oUF_Lanerra.toc | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/oUF_Lanerra.lua b/oUF_Lanerra.lua index a411bc5..7cb7fe8 100644 --- a/oUF_Lanerra.lua +++ b/oUF_Lanerra.lua @@ -85,13 +85,13 @@ local function UpdateBorder(self) local color if debuff and dispellable then - color = colors.debuff[debuff] + color = oUF.colors.debuff[debuff] elseif threat and threat > 1 then - color = colors.threat[threat] + color = oUF.colors.threat[threat] elseif debuff then - color = colors.debuff[debuff] + color = oUF.colors.debuff[debuff] elseif threat and threat > 0 then - color = colors.threat[threat] + color = oUF.colors.threat[threat] end if color then @@ -101,6 +101,14 @@ local function UpdateBorder(self) end end +-- Color conversion function +function hex(r, g, b) + if(type(r) == 'table') then + if(r.r) then r, g, b = r.r, r.g, r.b else r, g, b = unpack(r) end + end + return ('|cff%02x%02x%02x'):format(r * 255, g * 255, b * 255) +end + -- Formatting function for the display of health and power text local function ShortValue(value) if value >= 1e7 then @@ -207,7 +215,7 @@ local function UpdateHealth(Health, unit, min, max) if (not unit == 'pet' or unit == 'focus' or unit == 'targettarget' or unit == 'player') then if (UnitIsDead(unit) or UnitIsGhost(unit) or not UnitIsConnected(unit)) then Health:SetValue(0) - Health:SetStatusBarColor(.5, .5, .5) + --Health:SetStatusBarColor(.5, .5, .5) end end @@ -1660,7 +1668,7 @@ function oUF:DisableBlizzard(unit) HandleFrame(TargetofFocusFrame) elseif(unit == 'targettarget') then HandleFrame(TargetFrameToT) - elseif(unit:match'(boss)%d?$' == 'boss') then + --[[elseif(unit:match'(boss)%d?$' == 'boss') then local id = unit:match'boss(%d)' if(id) then HandleFrame('Boss' .. id .. 'TargetFrame') @@ -1668,7 +1676,7 @@ function oUF:DisableBlizzard(unit) for i=1, 4 do HandleFrame(('Boss%dTargetFrame'):format(i)) end - end + end]] elseif(unit:match'(party)%d?$' == 'party') then local id = unit:match'party(%d)' if(id) then diff --git a/oUF_Lanerra.toc b/oUF_Lanerra.toc index c5bcf7f..0d144a9 100644 --- a/oUF_Lanerra.toc +++ b/oUF_Lanerra.toc @@ -1,5 +1,5 @@ ## Interface: 60000 -## Version: 1.5.8 +## Version: 1.5.9 ## Title: oUF_Lanerra ## Notes: oUF layout by Lanerra -- 1.7.9.5