diff --git a/Interface/AddOns/SVUI/framework/docks/docks.lua b/Interface/AddOns/SVUI/framework/docks/docks.lua index e2c05cb..d414c83 100644 --- a/Interface/AddOns/SVUI/framework/docks/docks.lua +++ b/Interface/AddOns/SVUI/framework/docks/docks.lua @@ -142,10 +142,10 @@ end function Dock:ExitFade() if SV.cache.Docks.IsFaded then - SV:SecureFadeOut(self.BottomLeft, 0.2, self.BottomLeft:GetAlpha(), 0, true) - SV:SecureFadeOut(self.BottomLeft.Bar, 0.2, self.BottomLeft.Bar:GetAlpha(), 0, true) - SV:SecureFadeOut(self.BottomRight, 0.2, self.BottomRight:GetAlpha(), 0, true) - SV:SecureFadeOut(self.BottomRight.Bar, 0.2, self.BottomRight.Bar:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomLeft, 2, self.BottomLeft:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomLeft.Bar, 2, self.BottomLeft.Bar:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomRight, 2, self.BottomRight:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomRight.Bar, 2, self.BottomRight.Bar:GetAlpha(), 0, true) SVLib:Trigger("DOCKS_FADE_OUT"); end end diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua b/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua index 683757a..3bdd930 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua +++ b/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua @@ -32,9 +32,6 @@ local SV = select(2, ...) local L = SV.L SV.Comix = CreateFrame("Frame"); -SV.Comix.Basic = _G["SVUI_ComixFrame1"] -SV.Comix.Deluxe = _G["SVUI_ComixFrame2"] -SV.Comix.Premium = _G["SVUI_ComixFrame3"] --[[ ########################################################## LOCAL VARS @@ -112,7 +109,7 @@ function SV.Comix:LaunchDeluxePopup() local coords = COMIX_DATA[1][rng]; 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); + local step1_y = random(-30, 30); if(step1_y > -30 and step1_y < 30) then step1_y = step1_y * 3 end local step2_x = step1_x * 0.5; local step2_y = step1_y * 0.75; @@ -128,9 +125,12 @@ function SV.Comix:LaunchPopup() local coords = COMIX_DATA[1][rng]; 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 step1_y = random(-30, 30); + if(step1_y > -30 and step1_y < 30) then step1_y = step1_y * 3 end + local size = random(64,88) + self.Basic:Size(size,size) self.Basic.tex:SetTexCoord(coords[1],coords[2],coords[3],coords[4]) + self.Basic:ClearAllPoints() self.Basic:Point("CENTER", SV.Screen, "CENTER", step1_x, step1_y) self.Basic.anim:Play() end @@ -172,11 +172,17 @@ local Comix_OnUpdate = function() SV.Comix:ReadyState(true) end local Toasty_OnUpdate = function(self) SV.Comix:ReadyState(true); self.parent:SetAlpha(0) end function SV.Comix:Initialize() + self.Basic = _G["SVUI_ComixFrame1"] + self.Deluxe = _G["SVUI_ComixFrame2"] + self.Premium = _G["SVUI_ComixFrame3"] + + self.Basic:Size(64,64) self.Basic.tex:SetTexCoord(0,0.25,0,0.25) SV.Animate:Kapow(self.Basic, true) self.Basic:SetAlpha(0) self.Basic.anim[2]:SetScript("OnFinished", Comix_OnUpdate) + self.Deluxe:Size(88,88) self.Deluxe.tex:SetTexCoord(0,0.25,0,0.25) SV.Animate:RandomSlide(self.Deluxe, true) self.Deluxe:SetAlpha(0) diff --git a/Interface/AddOns/SVUI/framework/widgets/widgets.xml b/Interface/AddOns/SVUI/framework/widgets/widgets.xml index 8abfa7a..01834dd 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widgets.xml +++ b/Interface/AddOns/SVUI/framework/widgets/widgets.xml @@ -171,7 +171,7 @@ </Frames> </Frame> - <Frame name="SVUI_ComixFrame1" frameStrata="DIALOG" hidden="true"> + <Frame name="SVUI_ComixFrame1" frameStrata="DIALOG"> <Size x="100" y="100"/> <Anchors> <Anchor point="CENTER" relativePoint="CENTER" x="0" y="-50" /> @@ -183,7 +183,7 @@ </Layers> </Frame> - <Frame name="SVUI_ComixFrame2" frameStrata="DIALOG" hidden="true"> + <Frame name="SVUI_ComixFrame2" frameStrata="DIALOG"> <Size x="100" y="100"/> <Anchors> <Anchor point="CENTER" relativePoint="CENTER" x="0" y="-50" /> @@ -195,7 +195,7 @@ </Layers> </Frame> - <Frame name="SVUI_ComixFrame3" frameStrata="DIALOG" hidden="true"> + <Frame name="SVUI_ComixFrame3" frameStrata="DIALOG"> <Size x="100" y="100"/> <Anchors> <Anchor point="CENTER" relativePoint="CENTER" x="0" y="-50" /> diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua index 143b547..7ffa5cc 100644 --- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua +++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua @@ -950,7 +950,7 @@ LibSuperVillain("Registry"):NewCallback("DOCKS_FADE_IN", "DockFadeInChat", DockF local function DockFadeOutChat() local activeChatFrame = FCFDock_GetSelectedWindow(GENERAL_CHAT_DOCK) - SV:SecureFadeOut(activeChatFrame, 0.2, activeChatFrame:GetAlpha(), 0, true) + SV:SecureFadeOut(activeChatFrame, 2, activeChatFrame:GetAlpha(), 0, true) end LibSuperVillain("Registry"):NewCallback("DOCKS_FADE_OUT", "DockFadeOutChat", DockFadeOutChat); diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua index e44b31e..104268f 100644 --- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua +++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua @@ -578,12 +578,13 @@ function MOD:Load() self.Accountant = LibSuperVillain("Registry"):NewGlobal("Accountant") - self.Accountant = self.Accountant or {}; self.Accountant[playerRealm] = self.Accountant[playerRealm] or {}; self.Accountant[playerRealm]["gold"] = self.Accountant[playerRealm]["gold"] or {}; self.Accountant[playerRealm]["gold"][playerName] = self.Accountant[playerRealm]["gold"][playerName] or 0; self.Accountant[playerRealm]["tokens"] = self.Accountant[playerRealm]["tokens"] or {}; - self.Accountant[playerRealm]["tokens"][playerName] = self.Accountant[playerRealm]["tokens"][playerName] or {}; + if(not self.Accountant[playerRealm]["tokens"][playerName] or (self.Accountant[playerRealm]["tokens"][playerName] and type(self.Accountant[playerRealm]["tokens"][playerName]) ~= "table")) then + self.Accountant[playerRealm]["tokens"][playerName] = {}; + end self:NewAnchor(SV.Dock.BottomCenter.Left, 3, "ANCHOR_CURSOR") self:NewAnchor(SV.Dock.BottomCenter.Right, 3, "ANCHOR_CURSOR") diff --git a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua index af41ed9..409b7e5 100644 --- a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua +++ b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua @@ -77,8 +77,8 @@ local function TokenInquiry(id, weekly, capped) end local function TokensEventHandler(self, event,...) - if not IsLoggedIn() or not self then return end - local id = MOD.Accountant[playerRealm]["tokens"][playerName][self.TokenStatIndex]; + if(not IsLoggedIn() or (not self)) then return end + local id = MOD.Accountant[playerRealm]["tokens"][playerName][self.TokenStatIndex] or 738; local _, current, tex = GetCurrencyInfo(id) local currentText = ("\124T%s:12\124t %s"):format(tex, current); self.text:SetText(currentText) diff --git a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua index 0065c36..5b4b42f 100644 --- a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua +++ b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua @@ -617,7 +617,7 @@ local function GetSourceType(guid) return srcType end -function PLUGIN:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, event, _, srcGUID, srcName, srcFlags, sourceRaidFlags, dstGUID, dstName, dstFlags, destRaidFlags, _, spellName) +function PLUGIN:COMBAT_LOG_EVENT_UNFILTERED(_, timestamp, event, _, srcGUID, srcName, srcFlags, sourceRaidFlags, dstGUID, dstName, dstFlags, destRaidFlags, _, spellName) if not srcFlags then return end local flagParse = band(srcFlags, COMBATLOG_OBJECT_REACTION_HOSTILE) local flagged = flagParse == COMBATLOG_OBJECT_REACTION_HOSTILE