diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 0381b71..1bb3c79 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -519,7 +519,7 @@ do CoordsHolder.playerYCoords:SetFontTemplate(SuperVillain.Media.font.numbers, 12, "OUTLINE") CoordsHolder.playerYCoords:SetTextColor(cColor.r, cColor.g, cColor.b) - local calendarButton = CreateFrame("Button", "SVUI_CalendarButton", SVUI_MinimapFrame) + local calendarButton = CreateFrame("Button", "SVUI_CalendarButton", CoordsHolder) calendarButton:SetSize(22,22) calendarButton:SetPoint("RIGHT", CoordsHolder, "RIGHT", 0, 0) calendarButton:Formula409() @@ -532,7 +532,7 @@ do calendarButton:SetScript("OnLeave", Basic_OnLeave) calendarButton:SetScript("OnClick", Calendar_OnClick) - local trackingButton = CreateFrame("Button", "SVUI_TrackingButton", SVUI_MinimapFrame) + local trackingButton = CreateFrame("Button", "SVUI_TrackingButton", CoordsHolder) trackingButton:SetSize(22,22) trackingButton:SetPoint("RIGHT", calendarButton, "LEFT", -4, 0) trackingButton:Formula409() diff --git a/Interface/AddOns/SVUI/scripts/raid.lua b/Interface/AddOns/SVUI/scripts/raid.lua index 253d144..27e387c 100644 --- a/Interface/AddOns/SVUI/scripts/raid.lua +++ b/Interface/AddOns/SVUI/scripts/raid.lua @@ -250,9 +250,6 @@ local function LoadRaidUtility() for i, gName in pairs(buttons) do local button = _G[gName] if(button) then - _G[gName.."Left"]:SetAlpha(0) - _G[gName.."Middle"]:SetAlpha(0) - _G[gName.."Right"]:SetAlpha(0) button:Formula409() button:SetFramedButtonTemplate() button:HookScript("OnEnter", ButtonEnter) diff --git a/Interface/AddOns/SVUI/system/cartography.lua b/Interface/AddOns/SVUI/system/cartography.lua index 49f0573..631f8d4 100644 --- a/Interface/AddOns/SVUI/system/cartography.lua +++ b/Interface/AddOns/SVUI/system/cartography.lua @@ -153,13 +153,15 @@ do for C in pairs(continents) do local zones = { GetMapZones(C) }; continents[C] = zones; - SetMapZoom(C, 0); - zones[0] = GetCurrentMapAreaID(); - _getmapdata(_cache); - for Z in ipairs(zones) do - SetMapZoom(C, Z); - zones[Z] = GetCurrentMapAreaID(); + local pass, error = pcall(SetMapZoom, C, 0) + if(pass) then + zones[0] = GetCurrentMapAreaID(); _getmapdata(_cache); + for Z in ipairs(zones) do + SetMapZoom(C, Z); + zones[Z] = GetCurrentMapAreaID(); + _getmapdata(_cache); + end end end diff --git a/Interface/AddOns/SVUI/system/database.lua b/Interface/AddOns/SVUI/system/database.lua index aa05e19..60bb982 100644 --- a/Interface/AddOns/SVUI/system/database.lua +++ b/Interface/AddOns/SVUI/system/database.lua @@ -41,6 +41,27 @@ local name = UnitName("player") local pkey = ("%s - %s"):format(name, realm) local databaseListener = CreateFrame("Frame", nil) local CONFIGS = SuperVillain.Configs + +local function SendAddonMessage(msg, prefix) + if(type(msg) == "table") then + msg = tostring(msg) + end + + if(not msg) then return end + + if(prefix) then + local outbound = ("%s %s"):format(prefix, msg); + print(outbound) + else + print(msg) + end +end + +function SuperVillain:Debugger(msg) + if(not self.DebuggingMode) then return end + local outbound = ("|cffFF2F00%s:|r |cff992FFF%s:|r"):format("SVUI", "DEBUG") + SendAddonMessage(msg, outbound) +end --[[ ########################################################## DEFINE SHARED MEDIA diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua index e4204e9..877b253 100644 --- a/Interface/AddOns/SVUI/system/system.lua +++ b/Interface/AddOns/SVUI/system/system.lua @@ -176,12 +176,6 @@ local function SendAddonMessage(msg, prefix) end end -function SuperVillain:Debugger(msg) - if(not self.DebuggingMode) then return end - local outbound = ("|cffFF2F00%s:|r |cff992FFF%s:|r"):format("SVUI", "DEBUG") - SendAddonMessage(msg, outbound) -end - function SuperVillain:AddonMessage(msg) local outbound = ("|cffFF2F00%s:|r"):format("SVUI") SendAddonMessage(msg, outbound) diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua index 7bfe94d..ed5e338 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua @@ -223,7 +223,6 @@ local function FriendsFrameStyle() FriendsTabHeaderRecruitAFriendButtonIcon:SetDrawLayer('OVERLAY') FriendsTabHeaderRecruitAFriendButtonIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) FriendsTabHeaderRecruitAFriendButtonIcon:FillInner() - FriendsTabHeaderRecruitAFriendButton:Point('TOPRIGHT', FriendsTabHeaderSoRButton, 'TOPLEFT', -4, 0) FriendsFrameIgnoreScrollFrame:SetFixedPanelTemplate("Inset") STYLE:ApplyScrollStyle(FriendsFrameIgnoreScrollFrameScrollBar, 4) FriendsFramePendingScrollFrame:SetFixedPanelTemplate("Inset") diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua index 24d2911..2d20d9d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua @@ -91,17 +91,20 @@ local function QuestFrameStyle() --[[MISC STYLINGS REMOVED HERE]]-- - for j = 1, MAX_NUM_ITEMS do - local cLvl = _G["QuestInfoItem"..j]:GetFrameLevel() + 1 - _G["QuestInfoItem"..j]:Formula409() - _G["QuestInfoItem"..j]:Width(_G["QuestInfoItem"..j]:GetWidth()-4) - _G["QuestInfoItem"..j]:SetFrameLevel(cLvl) - - _G["QuestInfoItem"..j.."IconTexture"]:SetTexCoord(0.1, 0.9, 0.1, 0.9) - _G["QuestInfoItem"..j.."IconTexture"]:SetDrawLayer("OVERLAY",1) - _G["QuestInfoItem"..j.."IconTexture"]:Point("TOPLEFT", 2, -2) - _G["QuestInfoItem"..j.."IconTexture"]:Size(_G["QuestInfoItem"..j.."IconTexture"]:GetWidth()-2, _G["QuestInfoItem"..j.."IconTexture"]:GetHeight()-2) - STYLE:ApplyLinkButtonStyle(_G["QuestInfoItem"..j]) + for j = 1, MAX_NUM_ITEMS do + local item = _G["QuestInfoItem"..j] + if(item) then + local cLvl = item:GetFrameLevel() + 1 + item:Formula409() + item:Width(item:GetWidth()-4) + item:SetFrameLevel(cLvl) + + _G["QuestInfoItem"..j.."IconTexture"]:SetTexCoord(0.1, 0.9, 0.1, 0.9) + _G["QuestInfoItem"..j.."IconTexture"]:SetDrawLayer("OVERLAY",1) + _G["QuestInfoItem"..j.."IconTexture"]:Point("TOPLEFT", 2, -2) + _G["QuestInfoItem"..j.."IconTexture"]:Size(_G["QuestInfoItem"..j.."IconTexture"]:GetWidth()-2, _G["QuestInfoItem"..j.."IconTexture"]:GetHeight()-2) + STYLE:ApplyLinkButtonStyle(item) + end end; QuestInfoSkillPointFrame:Formula409() QuestInfoSkillPointFrame:Width(QuestInfoSkillPointFrame:GetWidth()-4) @@ -114,8 +117,7 @@ local function QuestFrameStyle() QuestInfoSkillPointFrameIconTexture:Point("TOPLEFT", 2, -2) QuestInfoSkillPointFrameIconTexture:Size(QuestInfoSkillPointFrameIconTexture:GetWidth()-2, QuestInfoSkillPointFrameIconTexture:GetHeight()-2) QuestInfoSkillPointFrameCount:SetDrawLayer("OVERLAY") - QuestInfoSkillPointFramePoints:ClearAllPoints() - QuestInfoSkillPointFramePoints:Point("BOTTOMRIGHT", QuestInfoSkillPointFrameIconTexture, "BOTTOMRIGHT") + QuestInfoItemHighlight:Formula409() QuestInfoItemHighlight:SetFixedPanelTemplate("Slot") QuestInfoItemHighlight:SetBackdropBorderColor(1, 1, 0) @@ -187,23 +189,19 @@ local function QuestFrameStyle() end; QuestNPCModel:Formula409() QuestNPCModel:SetPanelTemplate("Comic") - QuestNPCModel:Point("TOPLEFT", QuestLogDetailFrame, "TOPRIGHT", 4, -34) + -- QuestNPCModel:Point("TOPLEFT", QuestLogDetailFrame, "TOPRIGHT", 4, -34) QuestNPCModelTextFrame:Formula409() QuestNPCModelTextFrame:SetPanelTemplate("Default") QuestNPCModelTextFrame.Panel:Point("TOPLEFT", QuestNPCModel.Panel, "BOTTOMLEFT", 0, -2) - QuestLogDetailFrame:Formula409() - QuestLogDetailFrame:SetPanelTemplate("Action") - QuestLogDetailScrollFrame:Formula409() - STYLE:ApplyCloseButtonStyle(QuestLogDetailFrameCloseButton) + -- QuestLogDetailFrame:Formula409() + -- QuestLogDetailFrame:SetPanelTemplate("Action") + -- QuestLogDetailScrollFrame:Formula409() + hooksecurefunc("QuestFrame_ShowQuestPortrait", function(m, t, text, u, r, s) QuestNPCModel:ClearAllPoints() QuestNPCModel:SetPoint("TOPLEFT", m, "TOPRIGHT", r+18, s) end) - if not SuperVillain.db.system.questWatch then - WatchFrame:HookScript("OnEvent", QueuedWatchFrameItems) - WatchFrame:HookScript("OnUpdate", QueuedWatchFrameItems) - end; end; --[[ ##########################################################