diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index fd86ca5..79ffa70 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -41,6 +41,7 @@ local L = LibLocale() local Registry = LibStub("LibSystemRegistry-1.0"); local CONFIGS = SV.private local MOD = {}; +MOD.MinimapButtons = {} --[[ ########################################################## LOCALIZED GLOBALS @@ -112,10 +113,7 @@ local MiniMap_MouseWheel = function(self, delta) end do - local buttonCache = { - {"Node", "Tab", "Pin", "SVUI_ConsolidatedBuffs", "GameTimeframe", "HelpOpenTicketButton", "SVUI_MinimapFrame", "SVUI_EnhancedMinimap", "QueueStatusMinimapButton", "TimeManagerClockButton", "Archy", "GatherMatePin", "GatherNote", "GuildInstance", "HandyNotesPin", "MinimMap", "Spy_MapNoteList_mini", "ZGVMarker"}, - {} - } + local reserved = {"Node", "Tab", "Pin", "SVUI_ConsolidatedBuffs", "GameTimeframe", "HelpOpenTicketButton", "SVUI_MinimapFrame", "SVUI_EnhancedMinimap", "QueueStatusMinimapButton", "TimeManagerClockButton", "Archy", "GatherMatePin", "GatherNote", "GuildInstance", "HandyNotesPin", "MinimMap", "Spy_MapNoteList_mini", "ZGVMarker"} local function UpdateMinimapButtons() if(not MOD.db.minimapbar.enable) then return end @@ -125,11 +123,10 @@ do MMBBar:Width(MOD.db.minimapbar.buttonSize + 4) local lastButton, anchor, relative, xPos, yPos; - local list = buttonCache[2] - local count = #list + local list = MOD.MinimapButtons + local count = 1 - for i = 1, count do - local btn = _G[list[i]] + for name,btn in pairs(list) do local preset = btn.preset; if(MOD.db.minimapbar.styleType == "NOANCHOR") then btn:SetParent(preset.Parent) @@ -172,7 +169,8 @@ do btn:SetPoint(anchor, lastButton, relative, xPos, yPos) end end - lastButton = btn + lastButton = btn + count = count + 1 end if (MOD.db.minimapbar.styleType ~= "NOANCHOR" and (count > 0)) then if MOD.db.minimapbar.styleType == "HORIZONTAL" then @@ -193,7 +191,6 @@ do local isLib = false; if name:sub(1,len("LibDBIcon")) == "LibDBIcon" then isLib = true end if(not isLib) then - local reserved = buttonCache[1] local count = #reserved for i = 1, count do if name:sub(1,len(reserved[i])) == reserved[i] then return end @@ -253,8 +250,7 @@ do btn.isStyled = true - local nextindex = #buttonCache[2] + 1 - buttonCache[2][nextindex] = name + MOD.MinimapButtons[name] = btn end end diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua index d57860c..788c12e 100644 --- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua +++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua @@ -500,6 +500,8 @@ function MOD:RefreshUnitLayout(frame, template) end end + if GRID_MODE then portraitOverlay = false end + if frame.Portrait then frame.Portrait:Hide() frame.Portrait:ClearAllPoints() diff --git a/Interface/AddOns/SVUI/system/setup.lua b/Interface/AddOns/SVUI/system/setup.lua index bb6f54b..ffd317a 100644 --- a/Interface/AddOns/SVUI/system/setup.lua +++ b/Interface/AddOns/SVUI/system/setup.lua @@ -1117,6 +1117,12 @@ local function LoadAllPresets() ["gridAllowed"] = true, ["wrapXOffset"] = 1, ["wrapYOffset"] = 1, + ["power"] = { + ["enable"] = false, + }, + portrait = { + enable = false, + }, }, ["raid10"] = { ["gridAllowed"] = true, diff --git a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua index 32b82e1..cdb4e40 100644 --- a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua +++ b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.lua @@ -58,6 +58,8 @@ PLUGIN = Registry:NewPrototype(SVUIAddOnName) local SCHEMA = PLUGIN.___schema; _G["WhisperVillain"] = PLUGIN; + +local PlayersName = UnitName("player") --[[ ########################################################## LOCAL VARS @@ -684,7 +686,11 @@ do if(not outbound) then outbound = PhraseSearch(sInput, mapkey, data) end - return outbound + if(SV.db[SCHEMA].prefix == true) then + return ("%s's Answering Service: %s"):format(PlayersName, outbound) + else + return outbound + end end function PLUGIN:TakeAMessage(caller, inbound) diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua index a95dac1..50f1949 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua @@ -284,7 +284,7 @@ BUILD FUNCTION ########################################################## ]]-- function PLUGIN:Load() - if not SV.db[SCHEMA].enable then return end + if IsAddOnLoaded("Altoholic") or not SV.db[SCHEMA].enable then return end self.db = SV.db[SCHEMA] diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua index f65006b..dc0a3f4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua @@ -40,7 +40,7 @@ local function CalendarStyle() STYLE:ApplyWindowStyle(CalendarFrame) STYLE:ApplyCloseButtonStyle(CalendarCloseButton) - CalendarCloseButton:Point("TOPRIGHT", CalendarFrame, "TOPRIGHT", -4, -4) + CalendarCloseButton:SetPoint("TOPRIGHT", CalendarFrame, "TOPRIGHT", -4, -4) STYLE:ApplyPaginationStyle(CalendarPrevMonthButton) STYLE:ApplyPaginationStyle(CalendarNextMonthButton) @@ -55,24 +55,24 @@ local function CalendarStyle() local cftext = _G["CalendarFilterFrameText"] if(cftext) then cftext:ClearAllPoints() - cftext:Point("RIGHT", cfbutton, "LEFT", -2, 0) + cftext:SetPoint("RIGHT", cfbutton, "LEFT", -2, 0) end local cfbutton = _G["CalendarFilterButton"]; if(cfbutton) then cfbutton:ClearAllPoints() - cfbutton:Point("RIGHT", cfframe, "RIGHT", -10, 3) + cfbutton:SetPoint("RIGHT", cfframe, "RIGHT", -10, 3) STYLE:ApplyPaginationStyle(cfbutton, true) - cfframe.Panel:Point("TOPLEFT", 20, 2) - cfframe.Panel:Point("BOTTOMRIGHT", cfbutton, "BOTTOMRIGHT", 2, -2) + cfframe.Panel:SetPoint("TOPLEFT", 20, 2) + cfframe.Panel:SetPoint("BOTTOMRIGHT", cfbutton, "BOTTOMRIGHT", 2, -2) end end end local l = CreateFrame("Frame", "CalendarFrameBackdrop", CalendarFrame) l:SetFixedPanelTemplate("Default") - l:Point("TOPLEFT", 10, -72) - l:Point("BOTTOMRIGHT", -8, 3) + l:SetPoint("TOPLEFT", 10, -72) + l:SetPoint("BOTTOMRIGHT", -8, 3) CalendarContextMenu:SetFixedPanelTemplate("Default") hooksecurefunc(CalendarContextMenu, "SetBackdropColor", function(f, r, g, b, a) if r ~= 0 or g ~= 0 or b ~= 0 or a ~= 0.5 then @@ -89,12 +89,12 @@ local function CalendarStyle() end CalendarCreateEventFrame:RemoveTextures() CalendarCreateEventFrame:SetFixedPanelTemplate("Transparent", true) - CalendarCreateEventFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) + CalendarCreateEventFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarCreateEventTitleFrame:RemoveTextures() CalendarCreateEventCreateButton:SetButtonTemplate() CalendarCreateEventMassInviteButton:SetButtonTemplate() CalendarCreateEventInviteButton:SetButtonTemplate() - CalendarCreateEventInviteButton:Point("TOPLEFT", CalendarCreateEventInviteEdit, "TOPRIGHT", 4, 1) + CalendarCreateEventInviteButton:SetPoint("TOPLEFT", CalendarCreateEventInviteEdit, "TOPRIGHT", 4, 1) CalendarCreateEventInviteEdit:Width(CalendarCreateEventInviteEdit:GetWidth()-2) CalendarCreateEventInviteList:RemoveTextures() CalendarCreateEventInviteList:SetFixedPanelTemplate("Default") @@ -126,7 +126,7 @@ local function CalendarStyle() F:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes") F:SetTexCoord(E[1]+0.015, E[2]-0.02, E[3]+0.018, E[4]-0.02) end - CalendarClassButton1:Point("TOPLEFT", CalendarClassButtonContainer, "TOPLEFT", 5, 0) + CalendarClassButton1:SetPoint("TOPLEFT", CalendarClassButtonContainer, "TOPLEFT", 5, 0) CalendarClassTotalsButton:RemoveTextures() CalendarClassTotalsButton:SetPanelTemplate("Default") end) @@ -148,17 +148,17 @@ local function CalendarStyle() CalendarMassInviteGuildMaxLevelEdit:SetEditboxTemplate() CalendarViewRaidFrame:RemoveTextures() CalendarViewRaidFrame:SetFixedPanelTemplate("Transparent", true) - CalendarViewRaidFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) + CalendarViewRaidFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewRaidTitleFrame:RemoveTextures() STYLE:ApplyCloseButtonStyle(CalendarViewRaidCloseButton) CalendarViewHolidayFrame:RemoveTextures(true) CalendarViewHolidayFrame:SetFixedPanelTemplate("Transparent", true) - CalendarViewHolidayFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) + CalendarViewHolidayFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewHolidayTitleFrame:RemoveTextures() STYLE:ApplyCloseButtonStyle(CalendarViewHolidayCloseButton) CalendarViewEventFrame:RemoveTextures() CalendarViewEventFrame:SetFixedPanelTemplate("Transparent", true) - CalendarViewEventFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) + CalendarViewEventFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewEventTitleFrame:RemoveTextures() CalendarViewEventDescriptionContainer:RemoveTextures() CalendarViewEventDescriptionContainer:SetFixedPanelTemplate("Transparent", true)