2e5bc88 - Working override/vehicle/possess bars

[wowui.git] / OmaUF / CastBar.lua

diff --git a/OmaUF/CastBar.lua b/OmaUF/CastBar.lua
index 1cb98bc..f64cff2 100644 (file)
--- a/OmaUF/CastBar.lua
+++ b/OmaUF/CastBar.lua
@@ -15,6 +15,7 @@ local channelingColor = {0.32, 0.3, 1};
 local M = {};
 OmaUFCastBar = M;
 
 local M = {};
 OmaUFCastBar = M;
 

+-- TODO trade skill bar updates as well, check Quartz modules/Tradeskill.lua

 local function onUpdate(bar)
     if not bar:IsShown() then return end -- TODO little fadeout possibly
     local width = bar.icon:IsShown() and bar.cast.width or bar.cast.width; -- TODO fullwidth
 local function onUpdate(bar)
     if not bar:IsShown() then return end -- TODO little fadeout possibly
     local width = bar.icon:IsShown() and bar.cast.width or bar.cast.width; -- TODO fullwidth


@@ -43,7 +44,7 @@ local function toggleInterruptible(bar, nointr)
         bar.cast:SetVertexColor(unpack(nointerruptColor));
         bar.shield:Show();
     else
         bar.cast:SetVertexColor(unpack(nointerruptColor));
         bar.shield:Show();
     else

-        bar.cast:SetVertexColor(unpack(castingColor));
+        bar.cast:SetVertexColor(unpack(bar.cast.color));

         bar.shield:Hide();
     end
 end
         bar.shield:Hide();
     end
 end


@@ -52,12 +53,15 @@ local function startCast(bar, unit, channeling)
     local name, icon, startTime, endTime, noInterrupt, id;
     if channeling then
         name, _, _, icon, startTime, endTime, _, noInterrupt = UnitChannelInfo(unit);
     local name, icon, startTime, endTime, noInterrupt, id;
     if channeling then
         name, _, _, icon, startTime, endTime, _, noInterrupt = UnitChannelInfo(unit);

+        if not startTime or not endTime then return nil end

         bar.channeling = true;
         bar.channeling = true;

+        bar.cast.color = channelingColor;

     else
         _, _, name, icon, startTime, endTime, _, _, noInterrupt, id = UnitCastingInfo(unit);
     else
         _, _, name, icon, startTime, endTime, _, _, noInterrupt, id = UnitCastingInfo(unit);

+        if not startTime or not endTime then return nil end

         bar.channeling = nil;
         bar.channeling = nil;

+        bar.cast.color = castingColor;

     end
     end

-    if not startTime or not endTime then return nil end

     bar.startTime = startTime / 1000;
     bar.endTime = endTime / 1000;
     -- don't show samwise for non-existent icons
     bar.startTime = startTime / 1000;
     bar.endTime = endTime / 1000;
     -- don't show samwise for non-existent icons


@@ -71,6 +75,7 @@ local function startCast(bar, unit, channeling)
     end
     bar.spell:SetText(ssub(name, 1, bar.spell.count));
     bar.time:SetFormattedText("%.1f", (endTime - startTime)/1000);
     end
     bar.spell:SetText(ssub(name, 1, bar.spell.count));
     bar.time:SetFormattedText("%.1f", (endTime - startTime)/1000);

+    bar.cast:SetVertexColor(unpack(bar.cast.color));

     bar:Show();
     toggleInterruptible(bar, noInterrupt);
     return true;
     bar:Show();
     toggleInterruptible(bar, noInterrupt);
     return true;


@@ -93,6 +98,12 @@ local events = {
     ["UNIT_SPELLCAST_START"] = function(bar, unit)
         startCast(bar, unit);
     end,
     ["UNIT_SPELLCAST_START"] = function(bar, unit)
         startCast(bar, unit);
     end,

+    ["PLAYER_TARGET_CHANGED"] = function(bar)
+        bar:Hide();
+        if not startCast(bar, bar.unit) then
+            startCast(bar, bar.unit, true);
+        end
+    end,

     ["UNIT_SPELLCAST_CHANNEL_START"] = function(bar, unit)
         startCast(bar, unit, true);
     end,
     ["UNIT_SPELLCAST_CHANNEL_START"] = function(bar, unit)
         startCast(bar, unit, true);
     end,


@@ -118,6 +129,8 @@ local function onEvent(bar, event, unit)
     if unit == bar.unit or (bar.unit == "player" and unit == "vehicle") then
         --print(unit, event)
         events[event](bar, unit);
     if unit == bar.unit or (bar.unit == "player" and unit == "vehicle") then
         --print(unit, event)
         events[event](bar, unit);

+    elseif event == "PLAYER_TARGET_CHANGED" then
+        events[event](bar);

     end
 end
 
     end
 end
 


@@ -133,6 +146,7 @@ function M.RegisterCastEvents(bar)
     bar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE");
     bar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE");
     bar:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE");
     bar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE");
     bar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE");
     bar:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE");

+    if bar.unit == "target" then bar:RegisterEvent("PLAYER_TARGET_CHANGED") end

     bar:SetScript("OnUpdate", onUpdate);
     -- trigger initial check
     if not startCast(bar, bar.unit) then
     bar:SetScript("OnUpdate", onUpdate);
     -- trigger initial check
     if not startCast(bar, bar.unit) then


@@ -173,7 +187,7 @@ function M.CreateCastBar(parent, unit, yoffset)
     bar.cast.fullwidth = bar:GetWidth() - 2; -- for casts without icon
     bar.cast:SetWidth(bar.cast.width);
     bar.cast:SetTexture(barTexture);
     bar.cast.fullwidth = bar:GetWidth() - 2; -- for casts without icon
     bar.cast:SetWidth(bar.cast.width);
     bar.cast:SetTexture(barTexture);

-    bar.cast:SetVertexColor(unpack(castingColor));
+    bar.cast.color = castingColor;

     bar.spell = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     bar.spell:SetPoint("LEFT", bar.icon, "RIGHT", 2, 0);
     bar.spell.count = ceil(bar.cast:GetWidth()/10);
     bar.spell = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     bar.spell:SetPoint("LEFT", bar.icon, "RIGHT", 2, 0);
     bar.spell.count = ceil(bar.cast:GetWidth()/10);