2f55379 - Add proper indicator support and fix bugs found while playing

[wowui.git] / OmaRF / Indicators.lua

diff --git a/OmaRF/Indicators.lua b/OmaRF/Indicators.lua
index ebece6c..8dd2ba9 100644 (file)
--- a/OmaRF/Indicators.lua
+++ b/OmaRF/Indicators.lua
@@ -1,155 +1,139 @@
-local media = LibStub:GetLibrary("LibSharedMedia-3.0");
-local f = OmaRF.frames;
-local positions = OmaRF.positions;
-local pad = 2;
-local paddings = {
-    TOPLEFT = {pad, -pad},
-    TOPRIGHT = {-pad, -pad},
-    CENTER = {0, 0},
-    BOTTOMLEFT = {pad, pad},
-    BOTTOMRIGHT = {-pad, pad}
-};
-local watchedAuras; -- all watched auras
-local auraFilters = {"HELPFUL", "HARMFUL"};
-local DEFAULT_ICON = "Interface\\AddOns\\OmaRF\\images\\rhomb";
-local _;
-
--- global functions used every update
-local C_TimerAfter = C_Timer.After;
+-- Indicators.lua
+local pairs, ipairs = pairs, ipairs;
+local floor = math.floor;

 local GetTime = GetTime;
 local UnitAura = UnitAura;
 local UnitIsPlayer = UnitIsPlayer;
 local GetTime = GetTime;
 local UnitAura = UnitAura;
 local UnitIsPlayer = UnitIsPlayer;

-local UnitIsConnected = UnitIsConnected;
-local UnitIsDeadOrGhost = UnitIsDeadOrGhost;
-local CompactRaidFrameContainer_ApplyToFrames = CompactRaidFrameContainer_ApplyToFrames;
+local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected;
+local CTimerAfter = C_Timer.After;

 
 

--- list of important auras TODO try to use spellIDs
-local centerAuras = {
-    "Power Word: Shield"
+local watchedAuras = {
+    [53563] = "TOPRIGHT",
+    [156910] = "TOPRIGHT",
+    [200025] = "TOPRIGHT",
+    [200654] = "BOTTOMLEFT",
+};
+local majorAuras = {
+    ["Psychic Assault"] = true,
+    ["Everburning Flames"] = true,
+    ["Corrupt"] = true,
+    ["Sleep Canister"] = true,
+    ["Misery"] = true,
+    ["Necrotic Embrace"] = true,
+    ["Fulminating Pulse"] = true,
+    ["Chilled Blood"] = true,
+    ["Soulblight"] = true,
+    ["Soulburst"] = true,
+    ["Soulbomb"] = true,
+    ["Aqua Bomb"] = true,

 };
 
 };
 

-local function configureIndicators(frame, name)
-    local frameName = name or frame:GetName();
-    if not f[frameName] then return end
+local updaters = {};
+local updating = {};
+local positions = {"TOPRIGHT", "BOTTOMLEFT"};
+local auraFilters = {"HELPFUL", "HARMFUL"};

 
 

-    local config = OmaRF.db.profile.indicators;
-    local font = media and media:Fetch('font', config.indicatorFont) or STANDARD_TEXT_FONT;
-    for pos, ind in pairs(f[frameName]) do
-        ind.text:SetFont(font, config[pos]["textSize"]);
-        ind.text:SetTextColor(unpack(config[pos]["textColor"]));
-        ind.icon:SetWidth(config[pos]["iconSize"]);
-        ind.icon:SetHeight(config[pos]["iconSize"]);
-        ind.icon:SetTexture(DEFAULT_ICON);
-        ind.icon:SetVertexColor(unpack(config[pos]["iconColor"]));
-        if config[pos]["showIcon"] then
-            ind.icon:Show();
-        else
-            ind.icon:Hide();
-        end
+local function remaining(text, expires, current)
+    if expires == 0 then
+        text:SetText("");
+        return false;

     end
     end

-end
-
--- Create the FontStrings used for indicators
-local function setupCompactUnitFrame(frame, name)
-    f[name] = {};
-    for _, pos in ipairs(positions) do
-        f[name][pos] = {};
-        f[name][pos].text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall");
-        f[name][pos].text:SetPoint(pos, frame, pos, paddings[pos][1], paddings[pos][2]);
-        f[name][pos].icon = frame:CreateTexture(nil, "OVERLAY");
-        f[name][pos].icon:SetPoint(pos, frame, pos, paddings[pos][1], paddings[pos][2]);
+    local remain = expires - current;
+    if remain > 8 then
+        text:SetText("");
+    else
+        text:SetText(floor(remain+0.5));

     end
     end

-    configureIndicators(frame, name);
+    return true;

 end
 
 end
 

--- Check the indicators on a frame and update the times on them
-local function updateIndicators(frame)
-    local frameName = frame:GetName();
-    local unit = frame.unit;
-    if not unit then return end -- possible if the frame is just being hidden
+local function updateIndicators(frame, unit)
+    if not frame:IsShown() or not UnitIsConnected(unit) or UnitIsDeadOrGhost(unit) then
+        updating[frame] = nil;
+        return;
+    end

 
 

-    -- Create indicators if needed
-    if not f[frameName] then setupCompactUnitFrame(frame, frameName) end
-    -- Reset current
-    for _, ind in pairs(f[frameName]) do
-        ind.text:SetText("");
-        ind.icon:SetTexture("");
+    local needUpdate = false;
+    local current = GetTime();
+    for _, pos in pairs(positions) do
+        local ind = frame.inds[pos];
+        if ind.expires ~= nil then
+            needUpdate = remaining(ind.text, ind.expires, current) or needUpdate;
+        end

     end
     end

-    -- Hide if unit is dead/disconnected
-    if (not UnitIsConnected(unit)) or UnitIsDeadOrGhost(frame.displayedUnit) then
-        return;
+    for i = 1,3 do
+        local ind = frame.major[i];
+        if ind.expires ~= nil then
+            needUpdate = remaining(ind.text, ind.expires, current) or needUpdate;
+        end

     end
     end

+    if needUpdate then
+        CTimerAfter(0.16, updaters[frame]);
+    else
+        updating[frame] = nil;
+    end
+end

 
 

-    local name, icon, count, debuff, expires, caster, id;
+function OmaCheckIndicators(frame, unit)
+    for _, pos in pairs(positions) do
+        frame.inds[pos].expires = nil;
+        frame.inds[pos]:Hide();
+        frame.inds[pos].text:Hide();
+    end
+    for i = 1,3 do
+        frame.major[i].expires = nil;
+        frame.major[i]:Hide();
+        frame.major[i].text:Hide();
+        frame.major[i].stack:Hide();
+    end
+    local name, icon, count, expires, caster, id;
+    local showInds, showMajors, needUpdate = false, false, false;
+    local majorPos = 1;

     local current = GetTime();
     for _, filter in ipairs(auraFilters) do
         local i = 1;
         while true do
     local current = GetTime();
     for _, filter in ipairs(auraFilters) do
         local i = 1;
         while true do

-            name, _, icon, count, debuff, _, expires, caster, _, _, id = UnitAura(unit, i, filter);
+            name, _, icon, count, _, _, expires, caster, _, _, id = UnitAura(unit, i, filter);

             if not id then break end
             if not id then break end

-            local pos = watchedAuras[name] or watchedAuras[id] or watchedAuras[debuff];
-            if pos then
-                local ind = f[frameName][pos];
-                local config = OmaRF.db.profile.indicators[pos];
-                if not config.mine or UnitIsPlayer(caster) then
-                    if config.showIcon then
-                        -- show icon
-                        if config.useDefaultIcon then
-                            ind.icon:SetTexture(DEFAULT_ICON);
-                        else
-                            ind.icon:SetTexture(icon);
-                        end
-                    end
-                    if config.showText then
-                        -- show text
-                        local text;
-                        local remaining = expires - current;
-                        if remaining > 60 then
-                            text = string.format("%dm", ceil(remaining/60));
-                        else
-                            text = string.format("%d", floor(remaining+0.5));
-                        end
-                        if count > 1 and config.stack then
-                            if text then
-                                text = count.."-"..text;
-                            else
-                                text = count;
-                            end
-                        end
-
-                        ind.text:SetText(text);
-                    end
+            local pos = watchedAuras[id] or watchedAuras[name];
+            if pos and UnitIsPlayer(caster) then
+                needUpdate = remaining(frame.inds[pos].text, expires, current);
+                frame.inds[pos].expires = expires;
+                frame.inds[pos]:Show();
+                frame.inds[pos].text:Show();
+                showInds = true;
+            end
+            if (majorAuras[id] or majorAuras[name]) and majorPos <= 3 then
+                needUpdate = remaining(frame.major[majorPos].text, expires, current);
+                frame.major[majorPos].expires = expires;
+                frame.major[majorPos]:SetTexture(icon);
+                frame.major[majorPos]:Show();
+                frame.major[majorPos].text:Show();
+                if count > 1 then
+                    frame.major[majorPos].stack:SetText(count);
+                    frame.major[majorPos].stack:Show();

                 end
                 end

+                showMajors = true;
+                majorPos = majorPos + 1;

             end
             i = i + 1;
         end
     end
             end
             i = i + 1;
         end
     end

-end
-
--- Update all indicators
-function OmaRF:UpdateAllIndicators()
-    CompactRaidFrameContainer_ApplyToFrames(CompactRaidFrameContainer, "normal", updateIndicators);
-    if OmaRF.running then
-        C_TimerAfter(0.15, OmaRF.UpdateAllIndicators);
-    end
-end
-
--- Used to update everything that is affected by the configuration
-function OmaRF:RefreshConfig()
-    self:OnDisable(); -- clear everything
-    if self.db.profile.enabled then
-        CompactRaidFrameContainer_ApplyToFrames(CompactRaidFrameContainer, "normal", configureIndicators);
-        -- Format aura strings
-        watchedAuras = {};
-        for _, pos in ipairs(positions) do
-            for _, aura in ipairs(self.db.profile.indicators[pos]["auras"]) do
-                watchedAuras[aura] = pos; -- TODO single aura only in one position
+    if showInds or showMajors then
+        frame.inds:Show();
+        frame.major:Show();
+        if needUpdate and not updating[frame] then
+            updating[frame] = true; -- race?
+            -- create a function for updating the indicator
+            local func = updaters[frame];
+            if not func then
+                func = function() updateIndicators(frame, unit) end;
+                updaters[frame] = func;

             end
             end

+            CTimerAfter(0.16, func);

         end
         end

-
-        if next(watchedAuras) ~= nil then
-            self.running = true;
-            C_TimerAfter(0.15, self.UpdateAllIndicators);
-        end
+    else
+        frame.inds:Hide();
+        frame.major:Hide();

     end
 end
     end
 end