diff --git a/Interface/AddOns/SVUI/data/defaults.lua b/Interface/AddOns/SVUI/data/defaults.lua index 2600f03..d45d163 100644 --- a/Interface/AddOns/SVUI/data/defaults.lua +++ b/Interface/AddOns/SVUI/data/defaults.lua @@ -823,8 +823,7 @@ SV.defaults["SVUnit"] = { ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = true, ["filterRaid"] = true, - ["filterBlocked"] = true, - ["filterAllowed"] = true, + ["filterAllowed"] = false, ["filterInfinite"] = true, ["filterDispellable"] = false, ["useFilter"] = "", @@ -842,7 +841,6 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = false, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -858,8 +856,7 @@ SV.defaults["SVUnit"] = { ["attachTo"] = "DEBUFFS", ["filterPlayer"] = true, ["filterRaid"] = true, - ["filterBlocked"] = true, - ["filterAllowed"] = true, + ["filterAllowed"] = false, ["filterInfinite"] = true, ["filterDispellable"] = false, ["useFilter"] = "", @@ -1008,12 +1005,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = false, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1047,12 +1039,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = true, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1083,11 +1070,6 @@ SV.defaults["SVUnit"] = { friendly = true, enemy = true, }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, ["filterAllowed"] = { friendly = false, @@ -1239,11 +1221,6 @@ SV.defaults["SVUnit"] = { friendly = true, enemy = false, }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, ["filterAllowed"] = { friendly = false, @@ -1277,12 +1254,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = true, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1390,12 +1362,7 @@ SV.defaults["SVUnit"] = { { friendly = true, enemy = false, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1429,12 +1396,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = true, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1477,12 +1439,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = true, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1594,12 +1551,7 @@ SV.defaults["SVUnit"] = { { friendly = true, enemy = false, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1633,12 +1585,7 @@ SV.defaults["SVUnit"] = { { friendly = false, enemy = true, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1746,8 +1693,7 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "DOWN", ["horizontalGrowth"] = "LEFT", ["filterPlayer"] = true, - ["filterRaid"] = true, - ["filterBlocked"] = true, + ["filterRaid"] = true, ["filterAllowed"] = true, ["filterInfinite"] = true, ["filterDispellable"] = false, @@ -1765,8 +1711,7 @@ SV.defaults["SVUnit"] = { ["anchorPoint"] = "RIGHT", ["verticalGrowth"] = "DOWN", ["horizontalGrowth"] = "RIGHT", - ["filterPlayer"] = false, - ["filterBlocked"] = true, + ["filterPlayer"] = false, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -1867,12 +1812,7 @@ SV.defaults["SVUnit"] = { { friendly = true, enemy = false, - }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, + }, ["filterAllowed"] = { friendly = false, @@ -1907,11 +1847,6 @@ SV.defaults["SVUnit"] = { friendly = false, enemy = true, }, - ["filterBlocked"] = - { - friendly = true, - enemy = true, - }, ["filterAllowed"] = { friendly = false, @@ -2008,7 +1943,6 @@ SV.defaults["SVUnit"] = { ["horizontalGrowth"] = "LEFT", ["filterPlayer"] = false, ["filterRaid"] = false, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -2027,7 +1961,6 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "LEFT", ["filterPlayer"] = true, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -2146,11 +2079,6 @@ SV.defaults["SVUnit"] = { friendly = false, enemy = false, }, - ["filterBlocked"] = - { - friendly = false, - enemy = false, - }, ["filterAllowed"] = { friendly = false, @@ -2185,11 +2113,6 @@ SV.defaults["SVUnit"] = { friendly = false, enemy = false, }, - ["filterBlocked"] = - { - friendly = false, - enemy = false, - }, ["filterAllowed"] = { friendly = false, @@ -2318,7 +2241,6 @@ SV.defaults["SVUnit"] = { ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = true, ["filterRaid"] = true, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = true, ["filterDispellable"] = false, @@ -2337,7 +2259,6 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "DOWN", ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = false, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -2494,7 +2415,6 @@ SV.defaults["SVUnit"] = { ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = true, ["filterRaid"] = true, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = true, ["filterDispellable"] = false, @@ -2513,7 +2433,6 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = false, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, @@ -2631,8 +2550,7 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = true, - ["filterRaid"] = true, - ["filterBlocked"] = true, + ["filterRaid"] = true, ["filterAllowed"] = false, ["filterInfinite"] = true, ["filterDispellable"] = false, @@ -2651,7 +2569,6 @@ SV.defaults["SVUnit"] = { ["verticalGrowth"] = "UP", ["horizontalGrowth"] = "RIGHT", ["filterPlayer"] = false, - ["filterBlocked"] = true, ["filterAllowed"] = false, ["filterInfinite"] = false, ["filterDispellable"] = false, diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua index 70d87c4..4abe6dd 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua @@ -22,6 +22,7 @@ oUF.colors.MonkHarmony = { [3] = {.37, .63, .35, 1}, [4] = {.27, .63, .33, 1}, [5] = {.17, .63, .33, 1}, + [6] = {0, .63, .33, 1}, } local function Update(self, event, unit) @@ -50,10 +51,15 @@ local function Update(self, event, unit) end if hb.numPoints ~= numPoints then - if numPoints == 4 then - hb[5]:Hide() - else + if numPoints == 6 then + hb[5]:Show() + hb[6]:Show() + elseif numPoints == 5 then hb[5]:Show() + hb[6]:Hide() + else + hb[5]:Hide() + hb[6]:Hide() end end @@ -71,7 +77,7 @@ local function Enable(self, unit) self:RegisterEvent("UNIT_DISPLAYPOWER", Update) self:RegisterEvent("PLAYER_LEVEL_UP", Update) - for i = 1, 5 do + for i = 1, 6 do if not hb[i]:GetStatusBarTexture() then hb[i]:SetStatusBarTexture([=[Interface\TargetingFrame\UI-StatusBar]=]) end @@ -81,7 +87,7 @@ local function Enable(self, unit) hb[i]:GetStatusBarTexture():SetHorizTile(false) end - hb.numPoints = 5 + hb.numPoints = 6 return true end diff --git a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua index 94a8766..7a34233 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua @@ -367,70 +367,64 @@ do icon.name = name; icon.priority = 0; - if(_test(auraDB.filterBlocked, friendly)) then - local blackListSpell = SV.filters["Blocked"][name] - if blackListSpell and blackListSpell.enable then - filtered = false - end - pass = true - elseif(_test(auraDB.filterAllowed, friendly)) then - local whiteListSpell = SV.filters["Allowed"][name] - if whiteListSpell and whiteListSpell.enable then - filtered = true; - icon.priority = whiteListSpell.priority - elseif not pass then - filtered = false - end - pass = true - end + if(SV.filters.Blocked[name] and SV.filters.Blocked[name].enable) then + filtered = false; + else + if(_test(auraDB.filterAllowed, friendly)) then + local whiteListSpell = SV.filters.Allowed[name] + if(whiteListSpell and whiteListSpell.enable) then + filtered = true; + icon.priority = whiteListSpell.priority; + end + pass = true + end - if(_test(auraDB.filterPlayer, friendly)) then - if isPlayer then - filtered = true - else - filtered = false + if(_test(auraDB.filterPlayer, friendly)) then + if isPlayer then + filtered = true + else + filtered = false + end + fromPlayer = filtered; + pass = true end - fromPlayer = filtered; - pass = true - elseif(_test(auraDB.filterDispellable, friendly)) then - if (auraType == "buffs" and not isStealable) or (auraType == "debuffs" and debuffType and not MOD.Dispellable[debuffType]) or debuffType == nil then - filtered = false - end - pass = true - end - if _test(auraDB.filterRaid, friendly) then - if shouldConsolidate == 1 then filtered = false end - pass = true - end + if(_test(auraDB.filterDispellable, friendly)) then + if (auraType == "buffs" and not isStealable) or (auraType == "debuffs" and debuffType and not MOD.Dispellable[debuffType]) or debuffType == nil then + filtered = false + end + pass = true + end - if _test(auraDB.filterInfinite, friendly)then - if duration == 0 or not duration then - filtered = false - end - pass = true - end + if(_test(auraDB.filterRaid, friendly)) then + if shouldConsolidate == 1 then filtered = false end + pass = true + end - if SV.filters["Defense"][name] and SV.filters["Defense"][name].enable then - icon.priority = SV.filters["Defense"][name].priority; - isDefensive = true; - end + if(_test(auraDB.filterInfinite, friendly)) then + if((duration == 0) or (not duration)) then + filtered = false + end + pass = true + end - local active = auraDB.useFilter + local active = auraDB.useFilter - if(active and SV.filters[active]) then - local spellDB = SV.filters[active]; - if(active ~= "Blocked") then - if spellDB[name] and spellDB[name].enable and fromPlayer then + if(active and SV.filters[active]) then + local spellDB = SV.filters[active]; + if(spellDB[name] and spellDB[name].enable and fromPlayer) then filtered = true; icon.priority = spellDB[name].priority; - elseif not pass then - filtered = false + else + filtered = pass end - elseif(spellDB[name] and spellDB[name].enable) then - filtered = false - end - end + end + end + + if SV.filters.Defense[name] and SV.filters.Defense[name].enable then + icon.priority = SV.filters.Defense[name].priority; + end + return filtered end @@ -439,67 +433,65 @@ do if((not db) or (db and not db.aurabar)) then return false; end - local barDB = db.aurabar + local auraDB = db.aurabar local isPlayer = caster == "player" or caster == "vehicle" local filtered = true local fromPlayer = true local pass = false; local friendly = UnitIsFriend("player", unit) == 1 and true or false; - if _test(barDB.filterBlocked, friendly) then - local blackList = SV.filters["Blocked"][name] - if blackList and blackList.enable then filtered = false end - pass = true - elseif _test(barDB.filterAllowed, friendly) then - local whiteList = SV.filters["Allowed"][name] - if whiteList and whiteList.enable then - filtered = true - elseif not pass then - filtered = false - end - pass = true - end - - if _test(barDB.filterPlayer, friendly) then - if isPlayer then - filtered = true - else - filtered = false + if(SV.filters.Blocked[name] and SV.filters.Blocked[name].enable) then + filtered = false; + else + if(_test(auraDB.filterAllowed, friendly)) then + local whiteListSpell = SV.filters.Allowed[name] + if(whiteListSpell and whiteListSpell.enable) then + filtered = true; + end + pass = true end - fromPlayer = filtered; - pass = true - elseif _test(barDB.filterDispellable, friendly) then - if (debuffType and not MOD.Dispellable[debuffType]) or debuffType == nil then - filtered = false - end - pass = true - end - if _test(barDB.filterRaid, friendly) then - if shouldConsolidate == 1 then filtered = false end - pass = true - end - - if _test(barDB.filterInfinite, friendly) then - if duration == 0 or not duration then - filtered = false - end - pass = true - end - - local active = barDB.useFilter - if active and active ~= "" and SV.filters[active] then - local spellsDB = SV.filters[active]; - if active ~= "Blocked" then - if spellsDB[name] and spellsDB[name].enable and fromPlayer then - filtered = true - elseif not pass then + if(_test(auraDB.filterPlayer, friendly)) then + if isPlayer then + filtered = true + else filtered = false + end + fromPlayer = filtered; + pass = true + end + + if(_test(auraDB.filterDispellable, friendly)) then + if (auraType == "buffs" and not isStealable) or (auraType == "debuffs" and debuffType and not MOD.Dispellable[debuffType]) or debuffType == nil then + filtered = false + end + pass = true + end + + if(_test(auraDB.filterRaid, friendly)) then + if shouldConsolidate == 1 then filtered = false end + pass = true + end + + if(_test(auraDB.filterInfinite, friendly)) then + if((duration == 0) or (not duration)) then + filtered = false + end + pass = true + end + + local active = auraDB.useFilter + + if(active and SV.filters[active]) then + local spellDB = SV.filters[active]; + if(spellDB[name] and spellDB[name].enable and fromPlayer) then + filtered = true; + else + filtered = pass end - elseif spellsDB[name] and spellsDB[name].enable then - filtered = false end - end + end + return filtered end end diff --git a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua index ba4a449..9894c67 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua @@ -122,7 +122,7 @@ local CHI_DATA = { [3] = {0,0.5,0.5,1}, [4] = {0.5,1,0.5,1}, [5] = {0.5,1,0,0.5}, - [6] = {0.5,1,0,0.5}, + [6] = {0,0.5,0.5,1}, }; function MOD:CreateClassBar(playerFrame) local max = 6 diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua index 47621da..0c2d8ca 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua @@ -962,14 +962,11 @@ end local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer) if isPlayer then - if(SV.db.SVUnit[unitName][auraType].filterAllowed and SV.db.SVUnit[unitName][auraType].filterBlocked) then - SV.db.SVUnit[unitName][auraType].filterBlocked = false - end configTable.filterGroup1 = { order = 10, guiInline = true, type = "group", - name = L["Filters: Allow / Block (Choose One)"], + name = L["Filter Options"], args = { filterAllowed = { order = 1, @@ -977,71 +974,38 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer name = L["Force Allowed List"], desc = L["Don't display any auras not found on the Allowed filter."], get = function(key) return SV.db.SVUnit[unitName][auraType][key[#key]] end, - set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; SV.db.SVUnit[unitName][auraType].filterBlocked = false; end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterBlocked end, + set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; end, }, - filterBlocked = { - order = 2, - type = "toggle", - name = L["Force Blocked List"], - desc = L["Don't display any auras found on the Blocked filter."], - get = function(key) return SV.db.SVUnit[unitName][auraType][key[#key]] end, - set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; SV.db.SVUnit[unitName][auraType].filterAllowed = false; end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterAllowed end, - } - } - } - - if(SV.db.SVUnit[unitName][auraType].filterDispellable and SV.db.SVUnit[unitName][auraType].filterPlayer) then - SV.db.SVUnit[unitName][auraType].filterDispellable = false - end - configTable.filterGroup2 = { - order = 11, - guiInline = true, - type = "group", - name = L["Filters: Player / Dispellable (Choose One)"], - args = { filterPlayer = { - order = 1, + order = 2, type = "toggle", name = L["Only Show Your Auras"], desc = L["Don't display auras that are not yours."], get = function(key) return SV.db.SVUnit[unitName][auraType][key[#key]] end, - set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; SV.db.SVUnit[unitName][auraType].filterDispellable = false; end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterDispellable end, + set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; end, }, filterDispellable = { - order = 2, + order = 3, type = "toggle", name = L["Block Non-Dispellable Auras"], desc = L["Don't display auras that cannot be purged or dispelled by your class."], get = function(key) return SV.db.SVUnit[unitName][auraType][key[#key]] end, - set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; SV.db.SVUnit[unitName][auraType].filterPlayer = false; end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterPlayer end, - } - } - } - - configTable.filterGroup3 = { - order = 12, - guiInline = true, - type = "group", - name = L["Filters: Other"], - args = { + set = function(key, value) SV.db.SVUnit[unitName][auraType][key[#key]] = value; end, + }, filterInfinite = { - order = 14, + order = 4, type = "toggle", name = L["Block Auras Without Duration"], desc = L["Don't display auras that have no duration."] }, filterRaid = { - order = 15, + order = 5, type = "toggle", name = L["Block Raid Buffs"], desc = L["Don't display raid buffs."] }, useFilter = { - order = 16, + order = 6, name = L["Custom Filter"], desc = L["Select a custom filter to include."], type = "select", @@ -1057,17 +1021,11 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer } } else - if(SV.db.SVUnit[unitName][auraType].filterAllowed.friendly and SV.db.SVUnit[unitName][auraType].filterBlocked.friendly) then - SV.db.SVUnit[unitName][auraType].filterBlocked.friendly = false - end - if(SV.db.SVUnit[unitName][auraType].filterAllowed.enemy and SV.db.SVUnit[unitName][auraType].filterBlocked.enemy) then - SV.db.SVUnit[unitName][auraType].filterBlocked.enemy = false - end configTable.filterGroup1 = { order = 10, guiInline = true, type = "group", - name = L["Filters: Allow / Block (Choose One)"], + name = L["Filter Options"], args = { filterAllowed = { order = 1, @@ -1081,8 +1039,7 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display any auras not found on the Allowed filter."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterAllowed.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterAllowed.friendly = m; SV.db.SVUnit[unitName][auraType].filterBlocked.friendly = false; updateFunction(MOD, unitName) end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterBlocked.friendly end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterAllowed.friendly = m; updateFunction(MOD, unitName) end, }, enemy = { order = 2, @@ -1090,55 +1047,12 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display any auras not found on the Allowed filter."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterAllowed.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterAllowed.enemy = m; SV.db.SVUnit[unitName][auraType].filterBlocked.enemy = false; updateFunction(MOD, unitName) end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterBlocked.enemy end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterAllowed.enemy = m; updateFunction(MOD, unitName) end, } }, }, - filterBlocked = { - order = 2, - guiInline = true, - type = "group", - name = L["Force Blocked List"], - args = { - friendly = { - order = 1, - type = "toggle", - name = L["Friendly"], - desc = L["If the unit is friendly to you."].." "..L["Don't display any auras found on the Blocked filter."], - get = function(l)return SV.db.SVUnit[unitName][auraType].filterBlocked.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterBlocked.friendly = m; SV.db.SVUnit[unitName][auraType].filterAllowed.friendly = false; updateFunction(MOD, unitName) end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterAllowed.friendly end, - }, - enemy = { - order = 2, - type = "toggle", - name = L["Enemy"], - desc = L["If the unit is an enemy to you."].." "..L["Don't display any auras found on the Blocked filter."], - get = function(l)return SV.db.SVUnit[unitName][auraType].filterBlocked.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterBlocked.enemy = m; SV.db.SVUnit[unitName][auraType].filterAllowed.enemy = false; updateFunction(MOD, unitName) end, - --disabled = function() return SV.db.SVUnit[unitName][auraType].filterAllowed.enemy end, - } - }, - } - } - } - - - if(SV.db.SVUnit[unitName][auraType].filterDispellable.friendly and SV.db.SVUnit[unitName][auraType].filterPlayer.friendly) then - SV.db.SVUnit[unitName][auraType].filterDispellable.friendly = false - end - if(SV.db.SVUnit[unitName][auraType].filterDispellable.enemy and SV.db.SVUnit[unitName][auraType].filterPlayer.enemy) then - SV.db.SVUnit[unitName][auraType].filterDispellable.enemy = false - end - configTable.filterGroup2 = { - order = 11, - guiInline = true, - type = "group", - name = L["Filters: Player / Dispellable (Choose One)"], - args = { filterPlayer = { - order = 1, + order = 2, guiInline = true, type = "group", name = L["Only Show Your Auras"], @@ -1149,21 +1063,19 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display auras that are not yours."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterPlayer.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterPlayer.friendly = m; SV.db.SVUnit[unitName][auraType].filterDispellable.friendly = false; updateFunction(MOD, unitName) end, - disabled = function() return SV.db.SVUnit[unitName][auraType].filterDispellable.friendly end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterPlayer.friendly = m; updateFunction(MOD, unitName) end, }, enemy = { order = 2, type = "toggle", name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display auras that are not yours."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterPlayer.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterPlayer.enemy = m; SV.db.SVUnit[unitName][auraType].filterDispellable.enemy = false; updateFunction(MOD, unitName) end, - disabled = function() return SV.db.SVUnit[unitName][auraType].filterDispellable.enemy end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterPlayer.enemy = m; updateFunction(MOD, unitName) end, } }, }, filterDispellable = { - order = 2, + order = 3, guiInline = true, type = "group", name = L["Block Non-Dispellable Auras"], @@ -1174,71 +1086,63 @@ local function setAuraFilteringOptions(configTable, unitName, auraType, isPlayer name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display auras that cannot be purged or dispelled by your class."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterDispellable.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterDispellable.friendly = m; SV.db.SVUnit[unitName][auraType].filterPlayer.friendly = false; updateFunction(MOD, unitName) end, - disabled = function() return SV.db.SVUnit[unitName][auraType].filterPlayer.friendly end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterDispellable.friendly = m; updateFunction(MOD, unitName) end, }, enemy = { order = 2, type = "toggle", name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display auras that cannot be purged or dispelled by your class."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterDispellable.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterDispellable.enemy = m; SV.db.SVUnit[unitName][auraType].filterPlayer.enemy = false; updateFunction(MOD, unitName) end, - disabled = function() return SV.db.SVUnit[unitName][auraType].filterPlayer.enemy end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterDispellable.enemy = m; updateFunction(MOD, unitName) end, } }, - } - } - } - - configTable.filterGroup3 = { - order = 12, - guiInline = true, - type = "group", - name = L["Filters: Other"], - args = { + }, filterInfinite = { - order = 1, + order = 4, guiInline = true, type = "group", name = L["Block Auras Without Duration"], args = { friendly = { - order = 2, + order = 1, type = "toggle", name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display auras that have no duration."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterInfinite.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterInfinite.friendly = m;updateFunction(MOD, unitName)end + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterInfinite.friendly = m; updateFunction(MOD, unitName)end }, enemy = { - order = 3, + order = 2, type = "toggle", name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display auras that have no duration."], get = function(l)return SV.db.SVUnit[unitName][auraType].filterInfinite.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterInfinite.enemy = m;updateFunction(MOD, unitName)end + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterInfinite.enemy = m; updateFunction(MOD, unitName)end } } }, filterRaid = { - order = 2, + order = 5, guiInline = true, type = "group", name = L["Block Raid Buffs"], args = { friendly = { - order = 2, - type = "toggle", - name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display raid buffs."], - get = function(l)return SV.db.SVUnit[unitName][auraType].filterRaid.friendly end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterRaid.friendly = m;updateFunction(MOD, unitName)end}, enemy = { - order = 3, - type = "toggle", - name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display raid buffs."], - get = function(l)return SV.db.SVUnit[unitName][auraType].filterRaid.enemy end, - set = function(l, m)SV.db.SVUnit[unitName][auraType].filterRaid.enemy = m;updateFunction(MOD, unitName)end} + order = 1, + type = "toggle", + name = L["Friendly"], desc = L["If the unit is friendly to you."].." "..L["Don't display raid buffs."], + get = function(l)return SV.db.SVUnit[unitName][auraType].filterRaid.friendly end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterRaid.friendly = m;updateFunction(MOD, unitName)end + }, + enemy = { + order = 2, + type = "toggle", + name = L["Enemy"], desc = L["If the unit is an enemy to you."].." "..L["Don't display raid buffs."], + get = function(l)return SV.db.SVUnit[unitName][auraType].filterRaid.enemy end, + set = function(l, m)SV.db.SVUnit[unitName][auraType].filterRaid.enemy = m;updateFunction(MOD, unitName)end + } } }, useFilter = { - order = 3, + order = 6, name = L["Custom Filter"], desc = L["Select a custom filter to include."], type = "select",