diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Animate.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Animate.lua index 46605a9..6293d3a 100644 --- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Animate.lua +++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Animate.lua @@ -137,8 +137,12 @@ local Kapow_OnPlay = function(self) parent:SetScale(parent.startscale or 1) end -local Kapow_OnFinished = function(self) +local Kapow_OnStop = function(self) self.parent:SetAlpha(0) +end + +local Kapow_OnFinished = function(self) + self:Stop() end local Kapow_OnUpdate = function(self) diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 5ca4139..9e01adb 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -386,10 +386,10 @@ local function AdjustMapSize() BlackoutWorld:SetTexture(0, 0, 0, 1) end - WorldMapFrame:SetFrameLevel(2) - WorldMapDetailFrame:SetFrameLevel(4) + WorldMapFrame:SetFrameLevel(1) + WorldMapDetailFrame:SetFrameLevel(2) WorldMapFrame:SetFrameStrata('HIGH') - WorldMapArchaeologyDigSites:SetFrameLevel(6) + WorldMapArchaeologyDigSites:SetFrameLevel(3) WorldMapArchaeologyDigSites:SetFrameStrata('DIALOG') end @@ -412,8 +412,8 @@ local function UpdateWorldMapConfig() SVUI_MiniMapCoords:Hide() else SVUI_MiniMapCoords:Show() - MOD.CoordTimer = SV.Timers:ExecuteLoop(UpdateMapCoords, 0.2) UpdateMapCoords() + MOD.CoordTimer = SV.Timers:ExecuteLoop(UpdateMapCoords, 0.2) end AdjustMapSize() end @@ -525,10 +525,10 @@ local _hook_WorldMapFrame_OnShow = function() Initialized = true end - WorldMapFrame:SetFrameLevel(2) - WorldMapDetailFrame:SetFrameLevel(4) + WorldMapFrame:SetFrameLevel(1) + WorldMapDetailFrame:SetFrameLevel(2) WorldMapFrame:SetFrameStrata('HIGH') - WorldMapArchaeologyDigSites:SetFrameLevel(6) + WorldMapArchaeologyDigSites:SetFrameLevel(3) WorldMapArchaeologyDigSites:SetFrameStrata('DIALOG') end @@ -844,15 +844,15 @@ function MOD:Load() if(SV.db.SVMap.tinyWorldMap) then setfenv(WorldMapFrame_OnShow, setmetatable({ UpdateMicroButtons = SV.fubar }, { __index = _G })) WorldMapFrame:SetParent(SV.UIParent) - WorldMapFrame:SetFrameLevel(4) + WorldMapFrame:SetFrameLevel(1) WorldMapFrame:SetFrameStrata('HIGH') - WorldMapDetailFrame:SetFrameLevel(6) + WorldMapDetailFrame:SetFrameLevel(2) WorldMapFrame:HookScript('OnShow', _hook_WorldMapFrame_OnShow) WorldMapFrame:HookScript('OnHide', _hook_WorldMapFrame_OnHide) end local CoordsHolder = CreateFrame('Frame', 'SVUI_WorldMapCoords', WorldMapFrame) - CoordsHolder:SetFrameLevel(WorldMapDetailFrame:GetFrameLevel()+1) + CoordsHolder:SetFrameLevel(WorldMapDetailFrame:GetFrameLevel() + 1) CoordsHolder:SetFrameStrata(WorldMapDetailFrame:GetFrameStrata()) CoordsHolder.playerCoords=CoordsHolder:CreateFontString(nil,'OVERLAY') CoordsHolder.mouseCoords=CoordsHolder:CreateFontString(nil,'OVERLAY') diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 8e17d70..4c7a893 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -860,7 +860,7 @@ end function MOD:Load() BNToastFrame:Point("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMLEFT", 0, -10) - SV.Mentalo:Add(BNToastFrame, L["BNet Frame"], nil, nil, nil, nil, "BNET") + SV.Mentalo:Add(BNToastFrame, L["BNet Frame"]) NewHook(BNToastFrame, "SetPoint", _hook_BNToastOnShow) if not SV.db.SVTip.enable then return end diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua index 416bc1d..a5a3c9c 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua @@ -224,9 +224,9 @@ EVENT HANDLER do local SURVEYCDFONT = SV.Media.font.numbers local SURVEYCOLOR = { - {0.1, 1, 0.1}, - {1, 0.5, 0.1}, - {1, 0.1, 0} + {0.1, 1, 0.1, 1}, + {1, 0.5, 0.1, 1}, + {1, 0.1, 0, 1} } local SURVEYSCALE = {3, 2, 1} local last = 0 @@ -237,13 +237,13 @@ do local ArchSiteFound; local ArchCanSurvey, ArchWillSurvey = false, false; - SurveyCooldown:SetPoint("CENTER", UIParent, "CENTER", 0, 0) + SurveyCooldown:SetPoint("CENTER", UIParent, "CENTER", 0, -50) SurveyCooldown:SetSize(50, 50) SurveyCooldown.text = SurveyCooldown:CreateTexture(nil, "OVERLAY") SurveyCooldown.text:SetAllPoints(SurveyCooldown) SurveyCooldown.text:SetVertexColor(0,1,0.12,0.5) SurveyCooldown:SetScale(1) - SV.Animate:Kapow(SurveyCooldown, true) + SV.Animate:Kapow(SurveyCooldown) local Arch_OnEvent = function(self, event, ...) if(InCombatLockdown() or not archSpell) then return end @@ -294,32 +294,32 @@ do local Survey_OnUpdate = function(self, elapsed) last = last + elapsed - if last > 1 then + if last >= 1 then time = time - 1 - local img = COUNT_TEX .. time - if time <= 0 then - self:SetScript("OnUpdate", nil) - self.text:SetTexture(nil) - self:SetScale(1) - time = 3 - else - self.text:SetTexture(img) + if time > 0 then + self.text:SetTexture(COUNT_TEX .. time) self.text:SetVertexColor(unpack(SURVEYCOLOR[time])) - self:SetScale(SURVEYSCALE[time]) - self.anim:Play() + if not self.anim:IsPlaying() then + self.anim:Play() + end + else + time = 3 + self:SetScript("OnUpdate", nil) end last = 0 - else - self:SetScript("OnUpdate", nil) end end local Survey_OnEvent = function(self, event, unit, _, _, _, spellid) if not unit == "player" then return end if spellid == 80451 then + time = 3 self.text:SetTexture(COUNT_TEX .. 3) - self:SetScale(1) + self.text:SetVertexColor(1,0,0,1) self:SetScript("OnUpdate", Survey_OnUpdate) + if not self.anim:IsPlaying() then + self.anim:Play() + end end end