diff --git a/Interface/AddOns/SVUI/packages/aura/SVAura.lua b/Interface/AddOns/SVUI/packages/aura/SVAura.lua index c80c9de..be9351b 100644 --- a/Interface/AddOns/SVUI/packages/aura/SVAura.lua +++ b/Interface/AddOns/SVUI/packages/aura/SVAura.lua @@ -358,19 +358,19 @@ do local timeLeft = expiration - GetTime() buff.expiration = timeLeft; buff.duration = duration; + buff.spellName = name; buff.nextUpdate = 0; - buff.bar:SetMinMaxValues(0, duration) - buff.bar:SetValue(timeLeft) - buff:SetAlpha(0.1) - if(duration == 0 and expiration == 0) then - buff:SetScript("OnUpdate", nil) - buff.spellName = nil; - buff.empty:SetAlpha(0) - else + buff:SetAlpha(1) + buff.empty:SetAlpha(1) + if(duration > 0 and timeLeft > 0) then buff:SetAlpha(1) buff:SetScript("OnUpdate", ConsolidatedBuff_OnUpdate) - buff.spellName = name - buff.empty:SetAlpha(1) + buff.bar:SetMinMaxValues(0, duration) + buff.bar:SetValue(timeLeft) + else + buff:SetScript("OnUpdate", nil) + buff.bar:SetMinMaxValues(0, 1) + buff.bar:SetValue(1) end else buff.spellName = nil; diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 0eb6db2..decc0d4 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -1577,6 +1577,8 @@ do frame.transferButton:SetScript("OnLeave", Tooltip_Hide) frame.transferButton:SetScript("OnClick", DepositReagentBank) + hooksecurefunc("DepositReagentBank", function() SVUI_ReagentContainerFrame.Bags[REAGENTBANK_CONTAINER]:RefreshSlots() end) + frame:SetPoint("BOTTOMLEFT", self.BankFrame, "BOTTOMRIGHT", 2, 0) self.ReagentFrame = frame end diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index f166b1d..0715d2c 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -654,7 +654,8 @@ local _hook_OnTipShow = function(self) edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = true, tileSize = 128, - edgeSize = 1 + edgeSize = 1, + insets = {left = 1, right = 1, top = 1, bottom = 1} }) self:SetBackdropColor(0, 0, 0, 0) self:SetBackdropBorderColor(0, 0, 0, 0) @@ -677,7 +678,8 @@ local _hook_OnTipShow = function(self) edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = true, tileSize = 128, - edgeSize = 1 + edgeSize = 1, + insets = {left = 1, right = 1, top = 1, bottom = 1} }) mask:SetBackdropColor(0, 0, 0, 1) mask:SetBackdropBorderColor(0, 0, 0, 1) @@ -772,7 +774,8 @@ local function ApplyTooltipSkins() edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = true, tileSize = 128, - edgeSize = 1 + edgeSize = 1, + insets = {left = 1, right = 1, top = 1, bottom = 1} }) mask:SetBackdropColor(0, 0, 0, 1) mask:SetBackdropBorderColor(0, 0, 0) @@ -830,7 +833,8 @@ local function ApplyTooltipSkins() edgeFile = [[Interface\BUTTONS\WHITE8X8]], tileSize = 128, tile = true, - edgeSize = 1 + edgeSize = 1, + insets = {left = 1, right = 1, top = 1, bottom = 1} }) tooltip:SetBackdropColor(0, 0, 0, 0) tooltip:SetBackdropBorderColor(0, 0, 0, 0) diff --git a/Interface/AddOns/SVUI/scripts/comix.lua b/Interface/AddOns/SVUI/scripts/comix.lua index cfac32f..f279bce 100644 --- a/Interface/AddOns/SVUI/scripts/comix.lua +++ b/Interface/AddOns/SVUI/scripts/comix.lua @@ -112,10 +112,11 @@ function Comix:LaunchPopup(comicType) frame.anim:Play() else local frame = ComixBasicPanel - local step1_x = random(-280, 280); - if(step1_x > -30 and step1_x < 30) then step1_x = 150 end + local step1_x = random(-100, 100); + if(step1_x > -30 and step1_x < 30) then step1_x = step1_x * 3 end + local step1_y = random(-100, 100); + if(step1_y > -30 and step1_y < 30) then step1_y = step1_y * 3 end local step2_x = step1_x * 0.5; - local step1_y = random(50, 100); local step2_y = step1_y * 0.75; frame.tex:SetTexCoord(coords[1],coords[2],coords[3],coords[4]) frame.anim[1]:SetOffset(step1_x, step1_y) diff --git a/Interface/AddOns/SVUI/scripts/raid.lua b/Interface/AddOns/SVUI/scripts/raid.lua index 1be6a0c..9a4aa55 100644 --- a/Interface/AddOns/SVUI/scripts/raid.lua +++ b/Interface/AddOns/SVUI/scripts/raid.lua @@ -48,7 +48,9 @@ end local function ButtonEnter(self) self:SetPanelColor("highlight") - self.icon:SetGradient(unpack(SV.Media.gradient.inverse)) + if(self.icon) then + self.icon:SetGradient(unpack(SV.Media.gradient.inverse)) + end if(self.TText) then GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT", 0, 4) GameTooltip:ClearLines() @@ -59,7 +61,9 @@ end local function ButtonLeave(self) self:SetPanelColor("inverse") - self.icon:SetGradient(unpack(SV.Media.gradient.icon)) + if(self.icon) then + self.icon:SetGradient(unpack(SV.Media.gradient.icon)) + end GameTooltip:Hide() end diff --git a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua index 494635c..5cfcde8 100644 --- a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua +++ b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua @@ -348,7 +348,7 @@ end local function KilledEnemyHandler(guid) local enemy = PLUGIN.cache[guid] - if(enemy) then + if(enemy and enemy.name) then HeadsUpAlarm(("Killed Mortal Enemy: %s"):format(enemy.name), CombatText_StandardScroll, 0.2, 1, 0.1, "sticky"); end enemy = EnemyCache[guid]