X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/a4503dbcafe612d8afde480eaa2974f7440b6a4a..d89467e02ca50fb6e77a6b39cf940c6de28a7bcc:/OmaRF/Indicators.lua

diff --git a/OmaRF/Indicators.lua b/OmaRF/Indicators.lua
index 8a5882c..b3c7d07 100644
--- a/OmaRF/Indicators.lua
+++ b/OmaRF/Indicators.lua
@@ -3,40 +3,20 @@ local pairs, ipairs = pairs, ipairs;
 local floor = math.floor;
 local GetTime = GetTime;
 local UnitAura = UnitAura;
-local UnitIsPlayer = UnitIsPlayer;
 local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected;
 local CTimerAfter = C_Timer.After;
 
-local Frames = OmaFrames;
-local positions = Frames.Positions;
-
-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 Settings = OmaRFSettings;
+local majorAuras = Settings.MajorAuras;
+local positions = {};
+local watchedAuras = {};
 
 local updaters = {};
 local updating = {};
 local auraFilters = {"HELPFUL", "HARMFUL"};
 
 local M = {};
-OmaIndicators = M;
+OmaRFIndicators = M;
 
 local function remaining(text, expires, current)
     if expires == 0 then
@@ -101,7 +81,7 @@ function M.CheckIndicators(frame, unit)
             name, _, icon, count, _, _, expires, caster, _, _, id = UnitAura(unit, i, filter);
             if not id then break end
             local pos = watchedAuras[id] or watchedAuras[name];
-            if pos and UnitIsPlayer(caster) then
+            if pos and caster == "player" then
                 needUpdate = remaining(frame.inds[pos].text, expires, current);
                 frame.inds[pos].expires = expires;
                 frame.inds[pos]:Show();
@@ -142,3 +122,8 @@ function M.CheckIndicators(frame, unit)
         frame.major:Hide();
     end
 end
+
+function M.LoadChar()
+    watchedAuras = Settings.Character["WatchedAuras"];
+    positions = Settings.Character.Positions;
+end