X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/52e517547bb85ea0705fbae13518a4c563abc77d..7cd9b15270a53b3c833f41e00ed755a30e22b2ef:/OmaRF/Indicators.lua?ds=sidebyside diff --git a/OmaRF/Indicators.lua b/OmaRF/Indicators.lua index b3c7d07..3ecdcf6 100644 --- a/OmaRF/Indicators.lua +++ b/OmaRF/Indicators.lua @@ -8,8 +8,9 @@ local CTimerAfter = C_Timer.After; local Settings = OmaRFSettings; local majorAuras = Settings.MajorAuras; -local positions = {}; -local watchedAuras = {}; +local indSize = Settings.IndSize; +local positions = nil; +local watchedAuras = nil; local updaters = {}; local updating = {}; @@ -18,6 +19,49 @@ local auraFilters = {"HELPFUL", "HARMFUL"}; local M = {}; OmaRFIndicators = M; +function M.SetupIndicators(frame) + if not watchedAuras then + watchedAuras = Settings.Character["WatchedAuras"]; + positions = Settings.Character.Positions; + end + + frame.inds = CreateFrame("Frame", nil, frame); + frame.inds:SetAllPoints(); + frame.inds:Hide(); + for _, pos in pairs(positions) do + frame.inds[pos] = frame.inds:CreateTexture(nil, "OVERLAY"); + frame.inds[pos]:SetPoint(pos, frame.inds, pos); + frame.inds[pos]:SetWidth(indSize); + frame.inds[pos]:SetHeight(indSize); + frame.inds[pos]:SetTexture("Interface\\AddOns\\OmaRF\\images\\rhomb"); + frame.inds[pos]:SetVertexColor(1, 0, 0); + frame.inds[pos]:Hide(); + frame.inds[pos].text = frame.inds:CreateFontString(nil, "OVERLAY", "GameFontHighlight"); + frame.inds[pos].text:SetPoint("BOTTOMRIGHT", frame.inds[pos], "BOTTOMRIGHT"); + frame.inds[pos].text:Hide(); + end + frame.major = CreateFrame("Frame", nil, frame); + frame.major:SetPoint("TOPLEFT", frame, "TOPLEFT", 4, -indSize + 4); + frame.major:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT"); + for i = 1,3 do + frame.major[i] = frame.major:CreateTexture(nil, "OVERLAY"); + if i == 1 then + frame.major[i]:SetPoint("TOPLEFT", frame.major, "TOPLEFT"); + else + frame.major[i]:SetPoint("TOPLEFT", frame.major[i-1], "TOPRIGHT"); + end + frame.major[i]:SetWidth(indSize*2); + frame.major[i]:SetHeight(indSize*2); + frame.major[i]:Hide(); + frame.major[i].text = frame.major:CreateFontString(nil, "OVERLAY", "GameFontHighlight"); + frame.major[i].text:SetPoint("BOTTOMRIGHT", frame.major[i], "BOTTOMRIGHT"); + frame.major[i].text:Hide(); + frame.major[i].stack = frame.major:CreateFontString(nil, "OVERLAY", "GameFontHighlight"); + frame.major[i].stack:SetPoint("TOPLEFT", frame.major[i], "TOPLEFT"); + frame.major[i].stack:Hide(); + end +end + local function remaining(text, expires, current) if expires == 0 then text:SetText(""); @@ -74,6 +118,7 @@ function M.CheckIndicators(frame, unit) local name, icon, count, expires, caster, id; local showInds, showMajors, needUpdate = false, false, false; local majorPos = 1; + local alert = false; -- color the whole bar local current = GetTime(); for _, filter in ipairs(auraFilters) do local i = 1; @@ -88,7 +133,8 @@ function M.CheckIndicators(frame, unit) frame.inds[pos].text:Show(); showInds = true; end - if (majorAuras[id] or majorAuras[name]) and majorPos <= 3 then + local major = majorAuras[id] or majorAuras[name]; + if major and majorPos <= 3 then needUpdate = remaining(frame.major[majorPos].text, expires, current); frame.major[majorPos].expires = expires; frame.major[majorPos]:SetTexture(icon); @@ -98,6 +144,9 @@ function M.CheckIndicators(frame, unit) frame.major[majorPos].stack:SetText(count); frame.major[majorPos].stack:Show(); end + if major.bar then + alert = true; + end showMajors = true; majorPos = majorPos + 1; end @@ -121,9 +170,6 @@ function M.CheckIndicators(frame, unit) frame.inds:Hide(); frame.major:Hide(); end -end -function M.LoadChar() - watchedAuras = Settings.Character["WatchedAuras"]; - positions = Settings.Character.Positions; + return alert; end