Fix filter options and split up the reverse option.

Author: Justw8

Locales/deDE.lua

@@ -60,8 +60,10 @@ L["Font"] = "Schriftart"
 --L["Icons"] = "Icons"
 L["If the addon is enabled."] = "Falls das Addon aktiviert ist."
 L["Immune"] = "Immun"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "Links"
 --L["Let Masque skin the icons"] = "Let Masque skin the icons"
 --L["Low"] = "Low"

Locales/enUS.lua

@@ -59,8 +59,10 @@ L["Icon Y Offset"] = true
 L["Icons"] = true
 L["If the addon is enabled."] = true
 L["Immune"] = true
-L["Inverse Filter"] = true
-L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = true
+L["Inverse Spell Filter"] = true
+L["Inverse the logic and only show the spells in the list instead of filtering them away."] = true
+L["Inverse NPC Filter"] = true
+L["Inverse the logic and only show npc's in the list instead of filtering them away."] = true
 L["Left"] = true
 L["Let Masuqe skin the icons"] = true
 L["Low"] = true

Locales/esES.lua

@@ -60,8 +60,10 @@ L["Default"] = "Defecto"
 --L["Icons"] = "Icons"
 L["If the addon is enabled."] = "Falls el addon está activado."
 --L["Immune"] = "Immune"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "Izquierda"
 --L["Let Masque skin the icons"] = "Let Masque skin the icons"
 --L["Low"] = "Low"

Locales/esMX.lua

@@ -60,8 +60,10 @@ if not L then return end
 --L["Icons"] = "Icons"
 --L["If the addon is enabled."] = "If the addon is enabled."
 --L["Immune"] = "Immune"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 --L["Left"] = "Left"
 --L["Let Masque skin the icons"] = "Let Masque skin the icons"
 --L["Low"] = "Low"

Locales/frFR.lua

@@ -60,8 +60,10 @@ L["Icon Y Offset"] = "Décalage de l’icône sur l’axe Y"
 L["Icons"] = "Icônes"
 L["If the addon is enabled."] = "Si l’addon est activé."
 L["Immune"] = "Insensible"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "Gauche"
 L["Let Masuqe skin the icons"] = "Laisser Masque gérer l’apparence des icônes"
 L["Low"] = "Bas"

Locales/koKR.lua

@@ -60,8 +60,10 @@ L["Icon Y Offset"] = "아이콘 Y 오프셋"
 L["Icons"] = "아이콘"
 L["If the addon is enabled."] = "애드온이 활성화 된 경우입니다."
 L["Immune"] = "면역"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "좌측"
 L["Let Masuqe skin the icons"] = "아이콘에 Masque 스킨을 입힙니다"
 --L["Low"] = "Low"

Locales/ruRU.lua

@@ -60,8 +60,10 @@ L["Icon Y Offset"] = "Отступ иконки по Y"
 L["Icons"] = "Иконки"
 L["If the addon is enabled."] = "Если аддон включен"
 L["Immune"] = "Неуязвимость"
---L["Inverse Filter"] = "Inverse Filter"
---L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "Слева"
 L["Let Masuqe skin the icons"] = "Позволить Masque менять стиль иконок"
 L["Low"] = "Нижний"

Locales/zhCN.lua

@@ -60,8 +60,10 @@ L["Icon Y Offset"] = "图标垂直偏移"
 L["Icons"] = "图标"
 L["If the addon is enabled."] = "启用本插件"
 L["Immune"] = "免疫"
-L["Inverse Filter"] = "反向过滤"
-L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "反转逻辑，只显示列表中的技能和NPC，而不是过滤掉它们。"
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "左侧"
 L["Let Masuqe skin the icons"] = "使用 Masque 管理图标"
 L["Low"] = "低"

Locales/zhTW.lua

@@ -60,8 +60,10 @@ L["Icon Y Offset"] = "圖示垂直位置"
 L["Icons"] = "圖示"
 L["If the addon is enabled."] = "啟用這個插件。"
 L["Immune"] = "免疫"
-L["Inverse Filter"] = "反向過濾"
-L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."] = "反向的邏輯，而且僅在列表中顯示法術和NPC，而不是將它們過濾掉。"
+--L["Inverse Spell Filter"] = "Inverse Spell Filter"
+--L["Inverse the logic and only show the spells in the list instead of filtering them away."] = "Inverse the logic and only show the spells in the list instead of filtering them away."
+--L["Inverse NPC Filter"] = "Inverse NPC Filter"
+--L["Inverse the logic and only show npc's in the list instead of filtering them away."] = "Inverse the logic and only show npc's in the list instead of filtering them away."
 L["Left"] = "左"
 L["Let Masuqe skin the icons"] = "讓 Masuqe 插件更改圖示外觀。"
 L["Low"] = "低"

NameplateSCT.lua

@@ -189,7 +189,8 @@ local defaults = {
 			alpha = 0.5,
 		},
 		filterEnabled = false,
-		inverseFilter = false,
+		inverseSpellFilter = false,
+		inverseNPCFilter = false,
 		filter = "",
 		npcFilter = "",
 	},
@@ -743,13 +744,12 @@ if NameplateSCT.db.global.personalOnly and NameplateSCT.db.global.personal and p
 	if NameplateSCT.db.global.filterEnabled then -- Filter out mobId's if needed
 		local _, _, _, _, _, destUnitId = strsplit("-", destGUID)
 		destUnitId = tostring(destUnitId) or "1"
-		if (NameplateSCT.db.global.inverseFilter and not npcFiltersTable[destUnitId]) -- Inverse filter
+		if (NameplateSCT.db.global.inverseNPCFilter and not npcFiltersTable[destUnitId]) -- Inverse filter
 			or
-		(not NameplateSCT.db.global.inverseFilter and npcFiltersTable[destUnitId]) -- Normal Filter
+		(not NameplateSCT.db.global.inverseNPCFilter and npcFiltersTable[destUnitId]) -- Normal Filter
 		then return end
 	end
 	if playerGUID == sourceGUID or (NameplateSCT.db.global.personal and playerGUID == destGUID) then -- Player events
-
 		local destUnit = guidToUnit[destGUID]
 		if (destUnit) or (destGUID == playerGUID and NameplateSCT.db.global.personal) then
 			if (string.find(clue, "_DAMAGE")) then
@@ -766,7 +766,7 @@ if NameplateSCT.db.global.personalOnly and NameplateSCT.db.global.personal and p
 				end
 				if NameplateSCT.db.global.filterEnabled then
 					local spellInFilter = filtersTable[tostring(spellId)] or filtersTable[spellName]
-					if (NameplateSCT.db.global.inverseFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseFilter and spellInFilter) then
+					if (NameplateSCT.db.global.inverseSpellFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseSpellFilter and spellInFilter) then
 						return
 					end
 				end
@@ -788,7 +788,7 @@ if NameplateSCT.db.global.personalOnly and NameplateSCT.db.global.personal and p
 				end
 				if NameplateSCT.db.global.filterEnabled then
 					local spellInFilter = filtersTable[tostring(spellId)] or filtersTable[spellName]
-					if (NameplateSCT.db.global.inverseFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseFilter and spellInFilter) then
+					if (NameplateSCT.db.global.inverseSpellFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseSpellFilter and spellInFilter) then
 						return
 					end
 				end
@@ -816,7 +816,7 @@ if NameplateSCT.db.global.personalOnly and NameplateSCT.db.global.personal and p
 				end
 				if NameplateSCT.db.global.filterEnabled then
 					local spellInFilter = filtersTable[tostring(spellId)] or filtersTable[spellName]
-					if (NameplateSCT.db.global.inverseFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseFilter and spellInFilter) then
+					if (NameplateSCT.db.global.inverseSpellFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseSpellFilter and spellInFilter) then
 						return
 					end
 				end
@@ -838,7 +838,7 @@ if NameplateSCT.db.global.personalOnly and NameplateSCT.db.global.personal and p
 				end
 				if NameplateSCT.db.global.filterEnabled then
 					local spellInFilter = filtersTable[tostring(spellId)] or filtersTable[spellName]
-					if (NameplateSCT.db.global.inverseFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseFilter and spellInFilter) then
+					if (NameplateSCT.db.global.inverseSpellFilter and not spellInFilter) or (not NameplateSCT.db.global.inverseSpellFilter and spellInFilter) then
 						return
 					end
 				end
@@ -1943,23 +1943,37 @@ local filters = {
 			get = function() return NameplateSCT.db.global.filterEnabled end,
 			set = function(_, newValue) NameplateSCT.db.global.filterEnabled = newValue end,
 			order = 1,
-			width = "half",
+			width = 1,
+		},
+		inverseSpellFilter = {
+			type = "toggle",
+			name = L["Inverse Spell Filter"],
+			desc = L["Inverse the logic and only show the spells in the list instead of filtering them away."],
+			get = function() return NameplateSCT.db.global.inverseSpellFilter end,
+			set = function(_, newValue) NameplateSCT.db.global.inverseSpellFilter = newValue end,
+			order = 1.5,
+			width = 1,
 		},
 		inverseFilter = {
 			type = "toggle",
-			name = L["Inverse Filter"],
-			desc = L["Inverse the logic, and only show the spells and npc's in the list instead of filtering them away."],
-			get = function() return NameplateSCT.db.global.inverseFilter end,
-			set = function(_, newValue) NameplateSCT.db.global.inverseFilter = newValue end,
+			name = L["Inverse NPC Filter"],
+			desc = L["Inverse the logic and only show npc's in the list instead of filtering them away."],
+			get = function() return NameplateSCT.db.global.inverseNPCFilter end,
+			set = function(_, newValue) NameplateSCT.db.global.inverseNPCFilter = newValue end,
 			order = 1.5,
-			width = "half",
+			width = 1,
+		},
+		header = {
+			type = "header",
+			name = "",
+			order = 2,
 		},
 		spellList = {
 			type = "input",
 			name = L["Spells"],
 			multiline = 20,
 			desc = L["Spellid/Spellname seperated by line\n\nWhite hits/melee = melee"],
-			order = 2,
+			order = 3,
 			width = 1,
 			get = function() return NameplateSCT.db.global.filter end,
 			set = function(_, newValue) NameplateSCT:updateFilterTable(newValue) end,
@@ -1969,7 +1983,7 @@ local filters = {
 			name = L["NPCs"],
 			multiline = 20,
 			desc = L["NPC id (eg: 23682) seperated by line\n\n The example is the Headless Horseman."],
-			order = 3,
+			order = 4,
 			width = 1,
 			get = function() return NameplateSCT.db.global.npcFilter end,
 			set = function(_, newValue) NameplateSCT:updateNPCFilterTable(newValue) end,