diff --git a/.gitignore b/.gitignore index 3e632da..5cc841e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.md +Thumbs.db [Dd]ev*/ diff --git a/Interface/AddOns/SVUI/data/defaults.lua b/Interface/AddOns/SVUI/data/defaults.lua index d13979f..e63e146 100644 --- a/Interface/AddOns/SVUI/data/defaults.lua +++ b/Interface/AddOns/SVUI/data/defaults.lua @@ -570,6 +570,7 @@ SV.defaults["SVOverride"] = { [ERR_ATTACK_MOUNTED] = true, [ERR_ATTACK_PACIFIED] = false, [ERR_ATTACK_STUNNED] = false, + [ERR_ATTACK_NO_ACTIONS] = false, [ERR_AUTOFOLLOW_TOO_FAR] = false, [ERR_BADATTACKFACING] = false, [ERR_BADATTACKPOS] = false, @@ -604,6 +605,8 @@ SV.defaults["SVOverride"] = { [SPELL_FAILED_NO_COMBO_POINTS] = true, [SPELL_FAILED_SPELL_IN_PROGRESS] = true, [SPELL_FAILED_TARGET_AURASTATE] = true, + [SPELL_FAILED_TOO_CLOSE] = false, + [SPELL_FAILED_UNIT_NOT_INFRONT] = false, } }; 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 cd25b13..da16353 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 = true; + CoreObject.DebugMode = false; CoreObject.Schema = GetAddOnMetadata(CoreName, SchemaFromMeta); CoreObject.TitleID = GetAddOnMetadata(CoreName, HeaderFromMeta); diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua index dc40134..7915459 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua @@ -29,20 +29,23 @@ local Update = function(self, event, unit) local r,g,b = 0,0,0; local category = UnitClassification(unit) - if(category == "elite") then - r,g,b = 1,0.75,0,0.7; - showSpecial = true - elseif(category == "rare" or category == "rareelite") then - r,g,b = 0.59,0.79,1,0.7; - showSpecial = true - end if(UnitIsDeadOrGhost(unit)) then - r,g,b = 0,0,0 + r,g,b = 0.15,0.1,0.2; + else + if(category == "elite") then + r,g,b = 1,0.75,0; + showSpecial = true + elseif(category == "rare" or category == "rareelite") then + r,g,b = 0.59,0.79,1; + showSpecial = true + end end + border[1]:SetTexture(r,g,b) border[2]:SetTexture(r,g,b) border[3]:SetTexture(r,g,b) border[4]:SetTexture(r,g,b) + if(special) then if(showSpecial) then special[1]:SetVertexColor(r,g,b) diff --git a/Interface/AddOns/SVUI/packages/override/components/errors.lua b/Interface/AddOns/SVUI/packages/override/components/errors.lua index 7df4617..ce69db1 100644 --- a/Interface/AddOns/SVUI/packages/override/components/errors.lua +++ b/Interface/AddOns/SVUI/packages/override/components/errors.lua @@ -33,21 +33,49 @@ LOCAL VARS ########################################################## ]]-- local UIErrorsFrame = _G.UIErrorsFrame; +local ERR_FILTERS = {}; --[[ ########################################################## EVENTS ########################################################## ]]-- function MOD:UI_ERROR_MESSAGE(event, msg) - if((not msg) or SV.db.SVOverride.errorFilters[msg]) then return end + if((not msg) or ERR_FILTERS[msg]) then return end UIErrorsFrame:AddMessage(msg, 1.0, 0.1, 0.1, 1.0); end local ErrorFrameHandler = function(self, event) if(event == 'PLAYER_REGEN_DISABLED') then + MOD:UnregisterEvent('UI_ERROR_MESSAGE') + else + MOD:RegisterEvent('UI_ERROR_MESSAGE') + end +end + +function MOD:CacheFilters() + for k, v in pairs(SV.db.SVOverride.errorFilters) do + ERR_FILTERS[k] = v + end + if(ERR_FILTERS[INTERRUPTED]) then + ERR_FILTERS[SPELL_FAILED_INTERRUPTED] = true + ERR_FILTERS[SPELL_FAILED_INTERRUPTED_COMBAT] = true + end +end + +function MOD:UpdateErrorFilters() + if(SV.db.SVOverride.filterErrors) then + self:CacheFilters() UIErrorsFrame:UnregisterEvent('UI_ERROR_MESSAGE') + self:RegisterEvent('UI_ERROR_MESSAGE') + if(SV.db.SVOverride.hideErrorFrame) then + self:RegisterEvent('PLAYER_REGEN_DISABLED', ErrorFrameHandler) + self:RegisterEvent('PLAYER_REGEN_ENABLED', ErrorFrameHandler) + end else UIErrorsFrame:RegisterEvent('UI_ERROR_MESSAGE') + self:UnregisterEvent('UI_ERROR_MESSAGE') + self:UnregisterEvent('PLAYER_REGEN_DISABLED') + self:UnregisterEvent('PLAYER_REGEN_ENABLED') end end --[[ @@ -57,10 +85,12 @@ PACKAGE CALL ]]-- function MOD:SetErrorFilters() if(SV.db.SVOverride.filterErrors) then + self:CacheFilters() UIErrorsFrame:UnregisterEvent('UI_ERROR_MESSAGE') self:RegisterEvent('UI_ERROR_MESSAGE') - elseif(SV.db.SVOverride.hideErrorFrame) then - self:RegisterEvent('PLAYER_REGEN_DISABLED', ErrorFrameHandler) - self:RegisterEvent('PLAYER_REGEN_ENABLED', ErrorFrameHandler) + if(SV.db.SVOverride.hideErrorFrame) then + self:RegisterEvent('PLAYER_REGEN_DISABLED', ErrorFrameHandler) + self:RegisterEvent('PLAYER_REGEN_ENABLED', ErrorFrameHandler) + end end end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua index 64940b3..ce9332a 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua @@ -181,8 +181,10 @@ local UpdateThreat = function(self, event, unit) if(status and status > 0) then r, g, b = GetThreatStatusColor(status) threat:SetBackdropBorderColor(r, g, b) + threat:Show() else threat:SetBackdropBorderColor(0, 0, 0, 0.5) + threat:Hide() end end @@ -199,6 +201,7 @@ local UpdatePlayerThreat = function(self, event, unit) self.Combat:Hide() aggro:Show() end + threat:Show() else threat:SetBackdropBorderColor(0, 0, 0, 0.5) if(aggro:IsShown()) then @@ -207,23 +210,25 @@ local UpdatePlayerThreat = function(self, event, unit) self.Combat:Show() end end + threat:Hide() end end local function CreateThreat(frame, unit) if(not frame.ActionPanel) then return; end local threat = CreateFrame("Frame", nil, frame.ActionPanel) - threat:Point("TOPLEFT", frame.ActionPanel, "TOPLEFT", -3, 3) - threat:Point("BOTTOMRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 3, -3) + threat:SetPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", -3, 3) + threat:SetPoint("BOTTOMRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 3, -3) threat:SetBackdrop({ edgeFile = [[Interface\AddOns\SVUI\assets\artwork\Template\GLOW]], edgeSize = 3, - insets = { - left = 2, - right = 2, - top = 2, - bottom = 2 - } + insets = + { + left = 2, + right = 2, + top = 2, + bottom = 2, + }, }); threat:SetBackdropBorderColor(0,0,0,0.5) @@ -257,6 +262,25 @@ local function CreateActionPanel(frame, offset) local panel = CreateFrame('Frame', nil, frame) panel:Point('TOPLEFT', frame, 'TOPLEFT', -1, 1) panel:Point('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', 1, -1) + panel:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeFile = [[Interface\AddOns\SVUI\assets\artwork\Template\GLOW]], + edgeSize = 3, + insets = + { + left = 0, + right = 0, + top = 0, + bottom = 0, + }, + }) + panel:SetBackdropColor(0,0,0) + panel:SetBackdropBorderColor(0,0,0,0.5) + + panel:SetFrameStrata("BACKGROUND") + panel:SetFrameLevel(0) --[[ UNDERLAY BORDER ]]-- local borderLeft = panel:CreateTexture(nil, "BORDER") @@ -309,25 +333,6 @@ local function CreateActionPanel(frame, offset) panel.border[4]:SetPoint("BOTTOMLEFT") panel.border[4]:SetWidth(2) - panel:SetBackdrop({ - bgFile = [[Interface\BUTTONS\WHITE8X8]], - edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, - tileSize = 0, - edgeSize = 1, - insets = - { - left = 0, - right = 0, - top = 0, - bottom = 0, - }, - }) - panel:SetBackdropColor(0,0,0) - panel:SetBackdropBorderColor(0,0,0) - - panel:SetFrameStrata("BACKGROUND") - panel:SetFrameLevel(0) return panel end diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index 720a445..e491d63 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -863,22 +863,24 @@ SV.Options.args.common = { name = L["Filter Errors"], desc = L["Choose specific errors from the list below to hide/ignore"], type = "toggle", - get = function(j)return SV.db.SVOverride.filterErrors end, - set = function(j,value)SV.db.SVOverride.filterErrors = value; SV:StaticPopup_Show("RL_CLIENT") end + get = function(key)return SV.db.SVOverride.filterErrors end, + set = function(key,value)SV.db.SVOverride.filterErrors = value; SV.SVOverride:UpdateErrorFilters() end }, hideErrorFrame = { order = 2, - name = L["Hide Error Text"], - desc = L["Hides the red error text at the top of the screen while in combat."], + name = L["Combat Hide All"], + desc = L["Hides all errors regardless of filtering while in combat."], type = "toggle", - get = function(j)return SV.db.SVOverride.hideErrorFrame end, - set = function(j,value)SV.db.SVOverride.hideErrorFrame = value; SV:StaticPopup_Show("RL_CLIENT") end + disabled = function() return not SV.db.SVOverride.filterErrors end, + get = function(key) return SV.db.SVOverride.hideErrorFrame end, + set = function(key,value)SV.db.SVOverride.hideErrorFrame = value; SV.SVOverride:UpdateErrorFilters() end }, filterGroup = { order = 3, type = "group", guiInline = true, name = L["Filters"], + disabled = function() return not SV.db.SVOverride.filterErrors end, args = {} }, } @@ -895,8 +897,9 @@ if(SV.db.SVOverride.errorFilters) then order = listIndex, type = 'toggle', name = errorName, + width = 'full', get = function(key) return SV.db.SVOverride.errorFilters[errorName]; end, - set = function(key,value) SV.db.SVOverride.errorFilters[errorName] = value; end + set = function(key,value) SV.db.SVOverride.errorFilters[errorName] = value; SV.SVOverride:UpdateErrorFilters() end } listIndex = listIndex + 1 end