diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua index da16353..cd25b13 100644 --- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua +++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua @@ -1178,7 +1178,7 @@ function lib:NewCore(gfile, efile, pfile, cfile, ffile, lfile) CoreObject.NameID = CoreName; CoreObject.Version = AddonVersion; CoreObject.GameVersion = tonumber(InterfaceVersion); - CoreObject.DebugMode = false; + CoreObject.DebugMode = true; CoreObject.Schema = GetAddOnMetadata(CoreName, SchemaFromMeta); CoreObject.TitleID = GetAddOnMetadata(CoreName, HeaderFromMeta); diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 387e256..5a5d136 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -1340,6 +1340,9 @@ do frame.Bags = {} frame.closeButton = CreateFrame("Button", "SVUI_ContainerFrameCloseButton", frame, "UIPanelCloseButton") frame.closeButton:Point("TOPRIGHT", -4, -4) + frame.closeButton:SetScript("PostClick", function() + if(not InCombatLockdown()) then CloseBag(0) end + end) frame.holderFrame = CreateFrame("Frame", nil, frame) frame.holderFrame:Point("TOP", frame, "TOP", 0, -frame.topOffset) @@ -1528,6 +1531,9 @@ do frame.closeButton = CreateFrame("Button", bagName.."CloseButton", frame, "UIPanelCloseButton") frame.closeButton:Point("TOPRIGHT", -4, -4) + frame.closeButton:SetScript("PostClick", function() + if(not InCombatLockdown()) then CloseBag(0) end + end) frame.holderFrame = CreateFrame("Frame", nil, frame) frame.holderFrame:Point("TOP", frame, "TOP", 0, -frame.topOffset) diff --git a/Interface/AddOns/SVUI/packages/stats/stats/system.lua b/Interface/AddOns/SVUI/packages/stats/stats/system.lua index 2f32c24..2c88e81 100644 --- a/Interface/AddOns/SVUI/packages/stats/stats/system.lua +++ b/Interface/AddOns/SVUI/packages/stats/stats/system.lua @@ -135,7 +135,7 @@ end local function OnEnter(self) enteredFrame = true; - local cpuProfiling = GetCVar("scriptProfile") == "1" + local cpuProfiling = false --GetCVar("scriptProfile") == "1" MOD:Tip(self) UpdateMemory() diff --git a/Interface/AddOns/SVUI/packages/tools/components/raidleader.lua b/Interface/AddOns/SVUI/packages/tools/components/raidleader.lua index 98a8462..87ec692 100644 --- a/Interface/AddOns/SVUI/packages/tools/components/raidleader.lua +++ b/Interface/AddOns/SVUI/packages/tools/components/raidleader.lua @@ -130,7 +130,7 @@ function MOD:LoadRaidLeaderTools() self.RaidTool.Menu.toggled = false; self.RaidTool.Menu:SetFrameStrata("HIGH"); - local SVUI_RaidToolToggle = CreateFrame("Button", "SVUI_RaidToolToggle", self.RaidTool, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate") + local SVUI_RaidToolToggle = CreateFrame("Button", "SVUI_RaidToolToggle", self.RaidTool, "SecureHandlerClickTemplate") SVUI_RaidToolToggle:SetAllPoints(self.RaidTool) SVUI_RaidToolToggle:RemoveTextures() SVUI_RaidToolToggle:SetNormalTexture("") diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua index e8c234e..c3101ce 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua @@ -56,10 +56,12 @@ local GetContainerItemInfo = GetContainerItemInfo local GetContainerItemID = GetContainerItemID local ModeLogsFrame; +local ArchRaces = GetNumArchaeologyRaces() + local COUNT_TEX = [[Interface\AddOns\SVUI\assets\artwork\icons\NUMBER-]] local refArtifacts = {}; -for i = 1, 12 do +for i = 1, ArchRaces do refArtifacts[i] = {} end local ArchCrafting = CreateFrame("Frame", "SVUI_ArchCrafting", UIParent) @@ -117,7 +119,7 @@ local function UpdateArtifactBars(index) bar["race"]:SetTextColor(1, 0.8, 0) bar["progress"]:SetTextColor(1, 1, 1) if cache["numKeysockets"] then - keystoneBonus = min(cache["numKeystones"], cache["numKeysockets"]) * 12 + keystoneBonus = min(cache["numKeystones"], cache["numKeysockets"]) * ArchRaces end local actual = min(cache["progress"], cache["total"]) local potential = cache["total"] @@ -157,7 +159,7 @@ end local function UpdateArtifactCache() local found, raceName, raceItemID, cache, _; - for index = 1, 12 do + for index = 1, ArchRaces do found = GetNumArtifactsByRace(index) raceName, _, raceItemID = GetArchaeologyRaceInfo(index) cache = refArtifacts[index] @@ -190,7 +192,7 @@ local function UpdateArtifactCache() if cache["numKeystones"] < cache["numKeysockets"] then cache["numKeystones"] = cache["numKeystones"] + count end - if min(cache["numKeystones"], cache["numKeysockets"]) * 12 + cache["progress"] >= cache["total"] then + if min(cache["numKeystones"], cache["numKeysockets"]) * ArchRaces + cache["progress"] >= cache["total"] then cache["canSolve"] = true end end @@ -438,31 +440,35 @@ function PLUGIN:LoadArchaeologyMode() ArchCrafting:SetFrameStrata("MEDIUM") ArchCrafting:FillInner(ModeLogsFrame) - local BAR_WIDTH = (ArchCrafting:GetWidth() * 0.5) - 4 - local BAR_HEIGHT = (ArchCrafting:GetHeight() / 6) - 4 + local BAR_WIDTH = (ArchCrafting:GetWidth() * 0.33) - 4 + local BAR_HEIGHT = (ArchCrafting:GetHeight() / 5) - 4 - for i = 1, 12 do + for i = 1, ArchRaces do local bar = CreateFrame("StatusBar", nil, ArchCrafting) local solve = CreateFrame("Button", nil, bar, "SecureHandlerClickTemplate") - local yOffset; + local yOffset,xOffset = 0,0; bar:SetPanelTemplate("Bar") bar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) bar:SetSize(BAR_WIDTH,BAR_HEIGHT) - if(i > 6) then - yOffset = ((i - 7) * (BAR_HEIGHT + 4)) + 4 - bar:SetPoint("TOPRIGHT", ArchCrafting, "TOPRIGHT", -2, -yOffset) + if(i > 10) then + xOffset = (BAR_WIDTH * 2) + 6 + yOffset = ((i - 11) * (BAR_HEIGHT + 4)) + 4 + elseif(i > 5) then + xOffset = BAR_WIDTH + 4 + yOffset = ((i - 6) * (BAR_HEIGHT + 4)) + 4 else + xOffset = 2 yOffset = ((i - 1) * (BAR_HEIGHT + 4)) + 4; - bar:SetPoint("TOPLEFT", ArchCrafting, "TOPLEFT", 2, -yOffset) end + bar:SetPoint("TOPLEFT", ArchCrafting, "TOPLEFT", xOffset, -yOffset) bar:SetStatusBarColor(0.2, 0.2, 0.8, 0.5) -- Race Text local race = bar:CreateFontString() - race:SetFontObject(NumberFont_Outline_Large) + race:SetFontObject(NumberFont_Outline_Med) race:SetText(RACE) - race:SetPoint("TOPLEFT", bar, "TOPLEFT", 1, -1) + race:SetPoint("TOPLEFT", bar, "TOPLEFT", 2, -4) race:SetTextColor(1,0.8,0) -- Progress Text diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua index a886f22..b09fe14 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua @@ -281,7 +281,7 @@ end function PLUGIN:DockletReady(addon, dock) if((not addon) or (not dock)) then return false end - if(dock:find(addon)) then + if(dock:find(addon) and IsAddOnLoaded(addon)) then return true end return false @@ -290,60 +290,72 @@ end function PLUGIN:RegisterAddonDocklets() local dock1,dock2,enabled1,enabled2 = self:FetchDocklets(); local tipLeft, tipRight = "", ""; + local activated = false; self.Docklet.Dock1.FrameLink = nil; self.Docklet.Dock2.FrameLink = nil; if(enabled1) then - local width = self.Docklet:GetWidth(); - self.Docklet:Enable(); - - if(enabled2) then - self.Docklet.Dock1:Show() - self.Docklet.Dock1:SetWidth(width * 0.5) - self.Docklet.Dock2:Show() - self.Docklet.Dock2:SetWidth(width * 0.5) - else - self.Docklet.Dock1:Show() - self.Docklet.Dock2:Hide() - self.Docklet.Dock1:SetWidth(width) - end - if(self:DockletReady("Skada", dock1)) then tipLeft = "Skada"; self:Docklet_Skada() + activated = true elseif(self:DockletReady("Omen", dock1)) then tipLeft = "Omen"; self:Docklet_Omen(self.Docklet.Dock1) + activated = true elseif(self:DockletReady("Recount", dock1)) then tipLeft = "Recount"; self:Docklet_Recount(self.Docklet.Dock1) + activated = true elseif(self:DockletReady("TinyDPS", dock1)) then tipLeft = "TinyDPS"; self:Docklet_TinyDPS(self.Docklet.Dock1) + activated = true elseif(self:DockletReady("alDamageMeter", dock1)) then tipLeft = "alDamageMeter"; self:Docklet_alDamageMeter(self.Docklet.Dock1) + activated = true end if(enabled2) then if(self:DockletReady("Skada", dock2)) then - tipRight = "and Skada"; + tipRight = " and Skada"; self:Docklet_Skada() + activated = true elseif(self:DockletReady("Omen", dock2)) then - tipRight = "and Omen"; + tipRight = " and Omen"; self:Docklet_Omen(self.Docklet.Dock2) + activated = true elseif(self:DockletReady("Recount", dock2)) then - tipRight = "and Recount"; + tipRight = " and Recount"; self:Docklet_Recount(self.Docklet.Dock2) + activated = true elseif(self:DockletReady("TinyDPS", dock2)) then - tipRight = "and TinyDPS"; + tipRight = " and TinyDPS"; self:Docklet_TinyDPS(self.Docklet.Dock2) + activated = true elseif(self:DockletReady("alDamageMeter", dock2)) then - tipRight = "and alDamageMeter"; + tipRight = " and alDamageMeter"; self:Docklet_alDamageMeter(self.Docklet.Dock2) + activated = true end end + end + + if(activated) then + self.Docklet:Enable(); + local width = self.Docklet:GetWidth(); + if(enabled2) then + self.Docklet.Dock1:Show() + self.Docklet.Dock1:SetWidth(width * 0.5) + self.Docklet.Dock2:Show() + self.Docklet.Dock2:SetWidth(width * 0.5) + else + self.Docklet.Dock1:Show() + self.Docklet.Dock2:Hide() + self.Docklet.Dock1:SetWidth(width) + end self.Docklet.DockButton:SetAttribute("tipText", ("%s%s"):format(tipLeft, tipRight)); self.Docklet.DockButton:MakeDefault();