[Filters] First pass at phase 3 SoD spells

EsreverWoW · Apr 6, 2024 · 28dfd2c · 28dfd2c
1 parent 569d63d
commit 28dfd2c
Show file tree

Hide file tree

Showing 13 changed files with 228 additions and 21 deletions.
diff --git a/ShestakUI/Config/Filters_TBC/FilgerSpells.lua b/ShestakUI/Config/Filters_TBC/FilgerSpells.lua
@@ -2187,7 +2187,7 @@ C["filger_spells"] = {
 			-- Avenger's Shield
 			{spellID = 31935, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Consecration
-			-- {spellID = 26573, unitID = "target", caster = "player", filter = "DEBUFF"},
+			{spellID = 26573, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Hammer of Justice
 			{spellID = 853, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Holy Vengeance
@@ -3097,9 +3097,9 @@ C["filger_spells"] = {
 			-- Cheap Shot
 			{spellID = 1833, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Crippling Poison r1
-			{spellID = 3409, unitID = "target", caster = "player", filter = "DEBUFF", absID = true},
+			{spellID = 3409, unitID = "target", caster = "all", filter = "DEBUFF", absID = true},
 			-- Crippling Poison r2
-			{spellID = 11201, unitID = "target", caster = "player", filter = "DEBUFF", absID = true},
+			{spellID = 11201, unitID = "target", caster = "all", filter = "DEBUFF", absID = true},
 			-- Deadly Poison
 			{spellID = 2818, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Deadly Throw
@@ -3119,13 +3119,15 @@ C["filger_spells"] = {
 			-- Kick - Silenced
 			{spellID = 18425, unitID = "target", caster = "player", filter = "DEBUFF"},
 			-- Kidney Shot
-			{spellID = 408, unitID = "target", caster = "player", filter = "DEBUFF"},
+			{spellID = 408, unitID = "target", caster = "all", filter = "DEBUFF"},
 			-- Mind-numbing Poison
 			{spellID = 5760, unitID = "target", caster = "all", filter = "DEBUFF"},
 			-- Riposte
-			{spellID = 14251, unitID = "target", caster = "player", filter = "DEBUFF"},
+			{spellID = 14251, unitID = "target", caster = "all", filter = "DEBUFF"},
 			-- Rupture
 			{spellID = 1943, unitID = "target", caster = "player", filter = "DEBUFF"},
+			-- Sap
+			{spellID = 6770, unitID = "target", caster = "all", filter = "DEBUFF"},
 			-- Wound Poison
 			{spellID = 13218, unitID = "target", caster = "all", filter = "DEBUFF"},
 

diff --git a/ShestakUI/Config/Filters_TBC/Nameplates.lua b/ShestakUI/Config/Filters_TBC/Nameplates.lua
@@ -98,7 +98,7 @@ T.DebuffWhiteList = {
 
 	-- Paladin
 	[SpellName(31935)] = true,	-- Avenger's Shield
-	-- [SpellName(26573)] = true,	-- Consecration
+	[SpellName(26573)] = true,	-- Consecration
 	[SpellName(853)] = true,	-- Hammer of Justice
 	[SpellName(31803)] = true,	-- Holy Vengeance
 	[SpellName(20184)] = true,	-- Judgement of Justice

diff --git a/ShestakUI/Config/Filters_Vanilla/ArenaControl.lua b/ShestakUI/Config/Filters_Vanilla/ArenaControl.lua
@@ -105,6 +105,7 @@ T.ArenaControl = {
 	-- Hunter
 	[SpellName(19574)] = 1,		-- Bestial Wrath
 	[SpellName(3045)] = 1,		-- Rapid Fire
+	[SpellName(415407)] = 1,		-- Rapid Killing [Season of Discovery]
 	--Mage
 	[SpellName(12042)] = 1,		-- Arcane Power
 	[SpellName(425124)] = 1,	-- Arcane Surge [Season of Discovery]
@@ -152,6 +153,7 @@ T.ArenaControl = {
 	[SpellName(5277)] = 1,		-- Evasion
 	[SpellName(1856)] = 1,		-- Vanish
 	[SpellName(425336)] = 1,	-- Shamanistic Rage [Season of Discovery]
+	[SpellName(426195)] = 1,	-- Vengeance [Season of Discovery]
 	[SpellName(12976)] = 1,		-- Last Stand
 	[SpellName(23920)] = 1,		-- Spell Reflection
 }
diff --git a/ShestakUI/Config/Filters_Vanilla/CombatText.lua b/ShestakUI/Config/Filters_Vanilla/CombatText.lua
@@ -51,6 +51,7 @@ if T.class == "DRUID" then
 		T.merge[9862] = 740			-- Tranquility r3
 		T.merge[9863] = 740			-- Tranquility r4
 		T.aoespam[408120] = 4		-- Wild Growth [Season of Discovery]
+		T.aoespam[417147] = 3		-- Efflorescence [Season of Discovery]
 		-- Damaging spells
 		T.aoespam[779] = 0			-- Swipe r1
 		T.merge[780] = 779			-- Swipe r2
@@ -203,6 +204,7 @@ elseif T.class == "PALADIN" then
 		T.merge[20922] = 26573		-- Consecration r3
 		T.merge[20923] = 26573		-- Consecration r4
 		T.merge[20924] = 26573		-- Consecration r5
+		T.aoespam[407632] = 1		-- Hammer of the Righteous [Season of Discovery]
 		T.aoespam[20911] = 3		-- Blessing of Sanctuary r1
 		T.merge[20912] = 20911		-- Blessing of Sanctuary r2
 		T.merge[20913] = 20911		-- Blessing of Sanctuary r3
@@ -271,6 +273,7 @@ elseif T.class == "PRIEST" then
 		T.merge[15267] = 14914		-- Holy Fire r7
 		T.merge[15261] = 14914		-- Holy Fire r8
 		T.aoespam[425204] = 2.5		-- Void Plague [Season of Discovery]
+		T.aoespam[431681] = 3		-- Void Zone [Season of Discovery]
 	end
 	if C.combattext.healing then
 		T.healfilter[15290] = false	-- Vampiric Embrace
@@ -319,6 +322,7 @@ elseif T.class == "SHAMAN" then
 		T.merge[10622] = 1064		-- Chain Heal r2
 		T.merge[10623] = 1064		-- Chain Heal r3
 		T.aoespam[409333] = 3		-- Ancestral Guidance [Season of Discovery]
+		T.aoespam[408521] = 6		-- Riptide [Season of Discovery]
 		-- Damaging spells
 		-- T.aoespam[26545] = 3		-- Lightning Shield
 		T.aoespam[421] = 1			-- Chain Lightning r1
@@ -354,6 +358,7 @@ elseif T.class == "SHAMAN" then
 		T.merge[10435] = 3606		-- Searing Bolt r5
 		T.merge[10436] = 3606		-- Searing Bolt r6
 		T.aoespam[409337] = 3		-- Ancestral Guidance [Season of Discovery]
+		-- T.aoespam[432129] = 3		-- Rolling Thunder [Season of Discovery]
 	end
 elseif T.class == "WARLOCK" then
 	if C.combattext.merge_aoe_spam then

diff --git a/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua b/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua
@@ -19,13 +19,15 @@ if C.raidcooldown.enable == true then
 		{724, 600},		-- Lightwell
 		{409324, 120},	-- Ancestral Guidance [Season of Discovery]
 		-- Defense
+		-- {428713, 60},	-- Barkskin [Season of Discovery]
 		{408024, 180},	-- Survival Instincts [Season of Discovery]
 		{1022, 300},	-- Blessing of Protection (300sec base / -120sec from talents)
 		{407804, 120},	-- Divine Sacrifice [Season of Discovery]
 		{633, 3600},	-- Lay on Hands (3600sec base / -1200sec from talents / -720sec from 4pc T3)
 		{425294, 120},	-- Dispersion [Season of Discovery]
 		{402004, 180},	-- Pain Suppression [Season of Discovery]
 		{425207, 180},	-- Power Word: Barrier [Season of Discovery]
+		{426195, 180},	-- Vengeance [Season of Discovery]
 		{871, 1800},	-- Shield Wall
 		{12975, 600},	-- Last Stand
 		-- Taunts

diff --git a/ShestakUI/Config/Filters_Vanilla/Diminishing.lua b/ShestakUI/Config/Filters_Vanilla/Diminishing.lua
@@ -11,6 +11,7 @@ T.DiminishingSpells = {
 	[5211] = {"stun"},				-- Bash
 	[9005] = {"stun"},				-- Pounce
 	[24394] = {"stun"},				-- Intimidation
+	[428739] = {"stun"},				-- Deep Freeze [Season of Discovery]
 	[853] = {"stun"},				-- Hammer of Justice
 	[1833] = {"stun"},				-- Cheap Shot
 	[22703] = {"stun"},				-- Inferno Effect
@@ -77,6 +78,9 @@ T.DiminishingSpells = {
 	-- Horrors
 	[6789] = {"horror"},			-- Death Coil
 
+	-- Unstable Affliction
+	[427719] = {"ua"},				-- Unstable Affliction (Silence) [Season of Discovery]
+
 	-- Roots
 	-- [19675] = {"root"},				-- Feral Charge Effect
 	[339] = {"root"},				-- Entangling Roots