diff --git a/ShestakUI/Config/Filters/CombatText.lua b/ShestakUI/Config/Filters/CombatText.lua index 961040fc8..b00aa2121 100644 --- a/ShestakUI/Config/Filters/CombatText.lua +++ b/ShestakUI/Config/Filters/CombatText.lua @@ -375,7 +375,7 @@ elseif T.class == "PALADIN" then T.aoespam[85222] = 1 -- Light of Dawn T.aoespam[114852] = 0 -- Holy Prism T.aoespam[119952] = 3 -- Arcing Light - T.aoespam[183811] = 6 -- Judgment of Light + T.aoespam[183811] = 6 -- Judgement of Light T.aoespam[225311] = 1 -- Light of Dawn T.aoespam[377129] = 3 -- Golden Path -- Damaging spells diff --git a/ShestakUI/Config/Filters_Cata/Announcements.lua b/ShestakUI/Config/Filters_Cata/Announcements.lua index 3acb65370..ae254f8f0 100644 --- a/ShestakUI/Config/Filters_Cata/Announcements.lua +++ b/ShestakUI/Config/Filters_Cata/Announcements.lua @@ -63,6 +63,7 @@ if C.announcements.portals == true then [32266] = true, -- Exodar [49360] = true, -- Theramore [33691] = true, -- Shattrath + [88345] = true, -- Tol Barad -- Horde [11417] = true, -- Orgrimmar [11420] = true, -- Thunder Bluff @@ -70,6 +71,7 @@ if C.announcements.portals == true then [32267] = true, -- Silvermoon [49361] = true, -- Stonard [35717] = true, -- Shattrath + [88346] = true, -- Tol Barad -- Alliance/Horde [28148] = true, -- Karazhan [53142] = true, -- Dalaran @@ -78,35 +80,62 @@ end if C.announcements.bad_gear == true then + local badRings = { + [40585] = true, -- Signet of the Kirin Tor + [40586] = true, -- Band of the Kirin Tor + [44934] = true, -- Loop of the Kirin Tor + [44935] = true, -- Ring of the Kirin Tor + [45688] = true, -- Inscribed Band of the Kirin Tor + [45689] = true, -- Inscribed Loop of the Kirin Tor + [45690] = true, -- Inscribed Ring of the Kirin Tor + [45691] = true, -- Inscribed Signet of the Kirin Tor + [48954] = true, -- Etched Band of the Kirin Tor + [48955] = true, -- Etched Loop of the Kirin Tor + [48956] = true, -- Etched Ring of the Kirin Tor + [48957] = true, -- Etched Signet of the Kirin Tor + [51557] = true, -- Runed Signet of the Kirin Tor + [51558] = true, -- Runed Loop of the Kirin Tor + [51559] = true, -- Runed Ring of the Kirin Tor + [51560] = true, -- Runed Band of the Kirin Tor + } + T.AnnounceBadGear = { -- Head [1] = { - 33820, -- Weather-Beaten Fishing Hat - 19972, -- Lucky Fishing Hat + [33820] = true, -- Weather-Beaten Fishing Hat + [19972] = true, -- Lucky Fishing Hat }, -- Neck [2] = { - 32757, -- Blessed Medallion of Karabor + [32757] = true, -- Blessed Medallion of Karabor }, -- Feet [8] = { - 50287, -- Boots of the Bay - 19969, -- Nat Pagle's Extreme Anglin' Boots + [50287] = true, -- Boots of the Bay + [19969] = true, -- Nat Pagle's Extreme Anglin' Boots + }, + -- Rings + [11] = badRings, + [12] = badRings, + -- Back + [15] = { + [65360] = true, -- Cloak of Coordination (Alliance) + [65274] = true, -- Cloak of Coordination (Horde) }, -- Main-Hand [16] = { - 44050, -- Mastercraft Kalu'ak Fishing Pole - 45992, -- Jeweled Fishing Pole - 45991, -- Bone Fishing Pole - 45858, -- Nat's Lucky Fishing Pole - 19970, -- Arcanite Fishing Pole - 19022, -- Nat Pagle's Extreme Angler FC-5000 - 25978, -- Seth's Graphite Fishing Pole - 6367, -- Big Iron Fishing Pole - 6366, -- Darkwood Fishing Pole - 6365, -- Strong Fishing Pole - 12225, -- Blump Family Fishing Pole - 6256, -- Fishing Pole + [44050] = true, -- Mastercraft Kalu'ak Fishing Pole + [45992] = true, -- Jeweled Fishing Pole + [45991] = true, -- Bone Fishing Pole + [45858] = true, -- Nat's Lucky Fishing Pole + [19970] = true, -- Arcanite Fishing Pole + [19022] = true, -- Nat Pagle's Extreme Angler FC-5000 + [25978] = true, -- Seth's Graphite Fishing Pole + [6367] = true, -- Big Iron Fishing Pole + [6366] = true, -- Darkwood Fishing Pole + [6365] = true, -- Strong Fishing Pole + [12225] = true, -- Blump Family Fishing Pole + [6256] = true, -- Fishing Pole }, } end \ No newline at end of file diff --git a/ShestakUI/Config/Filters_Cata/ArenaControl.lua b/ShestakUI/Config/Filters_Cata/ArenaControl.lua index 0d64c0a16..efbd7bfef 100644 --- a/ShestakUI/Config/Filters_Cata/ArenaControl.lua +++ b/ShestakUI/Config/Filters_Cata/ArenaControl.lua @@ -23,13 +23,11 @@ T.ArenaControl = { [SpellName(49203)] = 5, -- Hungering Cold -- Druid [SpellName(5211)] = 5, -- Bash - [SpellName(16922)] = 5, -- Celestial Focus [SpellName(33786)] = 5, -- Cyclone [SpellName(2637)] = 5, -- Hibernate [SpellName(22570)] = 5, -- Maim [SpellName(9005)] = 5, -- Pounce -- Hunter - [SpellName(60210)] = 5, -- Freezing Arrow Effect [SpellName(3355)] = 5, -- Freezing Trap [SpellName(24394)] = 5, -- Intimidation [SpellName(1513)] = 5, -- Scare Beast @@ -49,13 +47,14 @@ T.ArenaControl = { -- Paladin [SpellName(853)] = 5, -- Hammer of Justice [SpellName(20066)] = 5, -- Repentance - [SpellName(20170)] = 5, -- Stun (Seal of Justice Proc) [SpellName(10326)] = 5, -- Turn Evil -- Priest + [SpellName(88625)] = 5, -- Holy Word: Chastise [SpellName(605)] = 5, -- Mind Control [SpellName(64044)] = 5, -- Psychic Horror [SpellName(8122)] = 5, -- Psychic Scream [SpellName(9484)] = 5, -- Shackle Undead + [SpellName(87204)] = 5, -- Sin and Punishment -- Rogue [SpellName(2094)] = 5, -- Blind [SpellName(1833)] = 5, -- Cheap Shot @@ -64,9 +63,12 @@ T.ArenaControl = { [SpellName(6770)] = 5, -- Sap -- Shaman [SpellName(58861)] = 5, -- Bash (Spirit Wolf) + [SpellName(76780)] = 5, -- Bind Elemental + [SpellName(53019)] = 5, -- Earth's Grasp [SpellName(51514)] = 5, -- Hex [SpellName(39796)] = 5, -- Stoneclaw Totem -- Warlock + [SpellName(93975)] = 5, -- Aura of Foreboding [SpellName(6789)] = 5, -- Death Coil [SpellName(5782)] = 5, -- Fear [SpellName(5484)] = 5, -- Howl of Terror @@ -78,14 +80,17 @@ T.ArenaControl = { [SpellName(20253)] = 5, -- Intercept [SpellName(5246)] = 5, -- Intimidating Shout [SpellName(46968)] = 5, -- Shockwave + [SpellName(85388)] = 5, -- Throwdown -- Racial [SpellName(20549)] = 5, -- War Stomp -- Silences [SpellName(47476)] = 4, -- Strangulate + [SpellName(80964)] = 4, -- Skull Bash (Bear) + [SpellName(80965)] = 4, -- Skull Bash (Cat) + [SpellName(81261)] = 4, -- Solar Beam [SpellName(34490)] = 4, -- Silencing Shot [SpellName(18469)] = 4, -- Silenced - Improved Counterspell - [SpellName(63529)] = 4, -- Silenced - Shield of the Templar [SpellName(15487)] = 4, -- Silence [SpellName(1330)] = 4, -- Garrote - Silence [SpellName(18425)] = 4, -- Silenced - Improved Kick @@ -105,12 +110,12 @@ T.ArenaControl = { [SpellName(19185)] = 3, -- Entrapment [SpellName(33395)] = 3, -- Freeze (Water Elemental) [SpellName(122)] = 3, -- Frost Nova - [SpellName(12494)] = 3, -- Frostbite + [SpellName(82691)] = 3, -- Ring of Frost + [SpellName(55080)] = 3, -- Shattered Barrier [SpellName(58373)] = 3, -- Glyph of Hamstring [SpellName(23694)] = 3, -- Improved Hamstring -- Disarms - [SpellName(53359)] = 1, -- Chimera Shot - Scorpid [SpellName(64346)] = 1, -- Fiery Payback [SpellName(51722)] = 1, -- Dismantle [SpellName(676)] = 1, -- Disarm @@ -123,11 +128,10 @@ T.ArenaControl = { -- Buffs -- Death Knight [SpellName(49028)] = 1, -- Dancing Rune Weapon - [SpellName(49796)] = 1, -- Deathchill - [SpellName(63560)] = 1, -- Ghoul Frenzy (Ghoul) + [SpellName(63560)] = 1, -- Dark Transformation (Ghoul) [SpellName(49039)] = 1, -- Lichborne + [SpellName(51271)] = 1, -- Pillar of Frost [SpellName(61777)] = 1, -- Summon Gargoyle - [SpellName(51271)] = 1, -- Unbreakable Armor -- Druid [SpellName(50334)] = 1, -- Berserk [SpellName(29166)] = 1, -- Innervate @@ -142,23 +146,23 @@ T.ArenaControl = { [SpellName(34471)] = 1, -- The Beast Within --Mage [SpellName(12042)] = 1, -- Arcane Power - [SpellName(28682)] = 1, -- Combustion [SpellName(12472)] = 1, -- Icy Veins [SpellName(55342)] = 1, -- Mirror Image [SpellName(12043)] = 1, -- Presence of Mind -- Paladin [SpellName(31884)] = 1, -- Avenging Wrath - [SpellName(20216)] = 1, -- Divine Favor - [SpellName(31842)] = 1, -- Divine Illumination + [SpellName(31842)] = 1, -- Divine Favor [SpellName(1044)] = 1, -- Hand of Freedom [SpellName(1022)] = 1, -- Hand of Protection [SpellName(6940)] = 1, -- Hand of Sacrifice [SpellName(1038)] = 1, -- Hand of Salvation + [SpellName(85696)] = 1, -- Zealotry -- Priest [SpellName(64843)] = 1, -- Divine Hymn [SpellName(6346)] = 1, -- Fear Ward [SpellName(47788)] = 1, -- Guardian Spirit [SpellName(33206)] = 1, -- Pain Suppression + [SpellName(87193)] = 5, -- Paralysis [SpellName(10060)] = 1, -- Power Infusion [SpellName(64901)] = 1, -- Hymn of Hope -- Rogue @@ -199,9 +203,9 @@ T.ArenaControl = { [SpellName(19263)] = 1, -- Deterrence [SpellName(66)] = 1, -- Invisibility [SpellName(31821)] = 1, -- Aura Mastery - [SpellName(70940)] = 1, -- Divine Guardian [SpellName(64205)] = 1, -- Divine Sacrifice [SpellName(47585)] = 1, -- Dispersion + [SpellName(62618)] = 1, -- Power Word: Barrier [SpellName(31224)] = 1, -- Cloak of Shadows [SpellName(5277)] = 1, -- Evasion [SpellName(1856)] = 1, -- Vanish diff --git a/ShestakUI/Config/Filters_Cata/ChannelingTicks.lua b/ShestakUI/Config/Filters_Cata/ChannelingTicks.lua index fb2e6824a..f2f909860 100644 --- a/ShestakUI/Config/Filters_Cata/ChannelingTicks.lua +++ b/ShestakUI/Config/Filters_Cata/ChannelingTicks.lua @@ -22,11 +22,9 @@ T.CastBarTicks = { -- Druid [SpellName(740)] = 4, -- Tranquility [SpellName(16914)] = 10, -- Hurricane - -- Hunter - [SpellName(1510)] = 6, -- Volley -- Mage - -- [SpellName(5143)] = 5, -- Arcane Missiles (accurate for r13 - lower ranks have less ticks) - [SpellName(12051)] = 4, -- Evocation + -- [SpellName(5143)] = 3, -- Arcane Missiles (can be talented to have more ticks) + [SpellName(12051)] = 3, -- Evocation [SpellName(10)] = 8, -- Blizzard -- Priest [SpellName(64843)] = 4, -- Divine Hymn @@ -38,7 +36,6 @@ T.CastBarTicks = { [SpellName(1120)] = 5, -- Drain Soul [SpellName(755)] = 10, -- Health Funnel [SpellName(689)] = 5, -- Drain Life - [SpellName(5138)] = 5, -- Drain Mana [SpellName(1949)] = 15, -- Hellfire [SpellName(5740)] = 4, -- Rain of Fire } diff --git a/ShestakUI/Config/Filters_Cata/CombatText.lua b/ShestakUI/Config/Filters_Cata/CombatText.lua index d3ea08e99..3dd34edfa 100644 --- a/ShestakUI/Config/Filters_Cata/CombatText.lua +++ b/ShestakUI/Config/Filters_Cata/CombatText.lua @@ -28,166 +28,54 @@ if T.class == "DEATHKNIGHT" then T.aoespam[52212] = 3 -- Death and Decay T.aoespam[55050] = 2.5 -- Heart Strike T.aoespam[50401] = 3 -- Razor Frost - T.aoespam[49217] = 3 -- Wandering Plague -- Merging mh/oh strikes T.aoespam[49020] = 0.5 -- Obliterate MH - -- T.aoespam[66198] = 0 -- Obliterate OH + T.merge[66198] = 49020 -- Obliterate OH T.aoespam[49998] = 0.5 -- Death Strike MH - -- T.aoespam[66188] = 0 -- Death Strike OH + T.merge[66188] = 49998 -- Death Strike OH T.aoespam[45462] = 0.5 -- Plague Strike MH - -- T.aoespam[66216] = 0 -- Plague Strike OH + T.merge[66216] = 45462 -- Plague Strike OH T.aoespam[49143] = 0.5 -- Frost Strike MH - -- T.aoespam[66196] = 0 -- Frost Strike OH - end - if C.combattext.healing then - T.healfilter[50475] = true -- Blood Presence + T.merge[66196] = 49143 -- Frost Strike OH + T.aoespam[45902] = 0.5 -- Blood Strike MH + T.merge[66215] = 45902 -- Blood Strike OH + T.aoespam[56815] = 0.5 -- Rune Strike MH + T.merge[66217] = 56815 -- Rune Strike OH + T.aoespam[85948] = 0.5 -- Festering Strike MH + T.merge[86061] = 85948 -- Festering Strike OH end elseif T.class == "DRUID" then if C.combattext.merge_aoe_spam then -- Healing spells T.aoespam[22842] = 3.5 -- Frenzied Regeneration T.aoespam[48504] = 3 -- Living Seed - T.aoespam[774] = 4 -- Rejuvenation r1 - T.merge[1058] = 774 -- Rejuvenation r2 - T.merge[1430] = 774 -- Rejuvenation r3 - T.merge[2090] = 774 -- Rejuvenation r4 - T.merge[2091] = 774 -- Rejuvenation r5 - T.merge[3627] = 774 -- Rejuvenation r6 - T.merge[8910] = 774 -- Rejuvenation r7 - T.merge[9839] = 774 -- Rejuvenation r8 - T.merge[9840] = 774 -- Rejuvenation r9 - T.merge[9841] = 774 -- Rejuvenation r10 - T.merge[25299] = 774 -- Rejuvenation r11 - T.merge[26981] = 774 -- Rejuvenation r12 - T.merge[26982] = 774 -- Rejuvenation r13 - T.merge[48440] = 774 -- Rejuvenation r14 - T.merge[48441] = 774 -- Rejuvenation r15 - T.aoespam[8936] = 4 -- Regrowth r1 - T.merge[8938] = 8936 -- Regrowth r2 - T.merge[8939] = 8936 -- Regrowth r3 - T.merge[8940] = 8936 -- Regrowth r4 - T.merge[8941] = 8936 -- Regrowth r5 - T.merge[9750] = 8936 -- Regrowth r6 - T.merge[9856] = 8936 -- Regrowth r7 - T.merge[9857] = 8936 -- Regrowth r8 - T.merge[9858] = 8936 -- Regrowth r9 - T.merge[26980] = 8936 -- Regrowth r10 - T.merge[48442] = 8936 -- Regrowth r11 - T.merge[48443] = 8936 -- Regrowth r12 - T.aoespam[44203] = 3 -- Tranquility r1 - T.merge[44205] = 44203 -- Tranquility r2 - T.merge[44206] = 44203 -- Tranquility r3 - T.merge[44207] = 44203 -- Tranquility r4 - T.merge[44208] = 44203 -- Tranquility r5 - T.merge[48444] = 44203 -- Tranquility r6 - T.merge[48445] = 44203 -- Tranquility r7 - T.aoespam[48438] = 4 -- Wild Growth r1 - T.merge[53248] = 48438 -- Wild Growth r2 - T.merge[53249] = 48438 -- Wild Growth r3 - T.merge[53251] = 48438 -- Wild Growth r4 + T.aoespam[774] = 4 -- Rejuvenation + T.aoespam[8936] = 4 -- Regrowth + T.aoespam[44203] = 3 -- Tranquility + T.aoespam[81269] = 3 -- Efflorescence + T.aoespam[48438] = 4 -- Wild Growth -- Damaging spells - T.aoespam[779] = 0 -- Swipe (Bear) r1 - T.merge[780] = 779 -- Swipe (Bear) r2 - T.merge[769] = 779 -- Swipe (Bear) r3 - T.merge[9754] = 779 -- Swipe (Bear) r4 - T.merge[9908] = 779 -- Swipe (Bear) r5 - T.merge[26997] = 779 -- Swipe (Bear) r6 - T.merge[48561] = 779 -- Swipe (Bear) r7 - T.merge[48562] = 779 -- Swipe (Bear) r8 + T.aoespam[779] = 0 -- Swipe (Bear) T.aoespam[62078] = 0 -- Swipe (Cat) - T.aoespam[8921] = 3 -- Moonfire r1 - T.merge[8924] = 8921 -- Moonfire r2 - T.merge[8925] = 8921 -- Moonfire r3 - T.merge[8926] = 8921 -- Moonfire r4 - T.merge[8927] = 8921 -- Moonfire r5 - T.merge[8928] = 8921 -- Moonfire r6 - T.merge[8929] = 8921 -- Moonfire r7 - T.merge[9833] = 8921 -- Moonfire r8 - T.merge[9834] = 8921 -- Moonfire r9 - T.merge[9835] = 8921 -- Moonfire r10 - T.merge[26987] = 8921 -- Moonfire r11 - T.merge[26988] = 8921 -- Moonfire r12 - T.merge[48462] = 8921 -- Moonfire r13 - T.merge[48463] = 8921 -- Moonfire r14 - T.aoespam[50286] = 3 -- Starfall r1 - T.merge[53196] = 50286 -- Starfall r2 - T.merge[53197] = 50286 -- Starfall r3 - T.merge[53198] = 50286 -- Starfall r4 - T.aoespam[42231] = 3 -- Hurricane r1 - T.merge[42232] = 42231 -- Hurricane r2 - T.merge[42233] = 42231 -- Hurricane r3 - T.merge[42230] = 42231 -- Hurricane r4 - T.merge[48466] = 42231 -- Hurricane r5 - T.aoespam[1822] = 3 -- Rake r1 - T.merge[1823] = 1822 -- Rake r2 - T.merge[1824] = 1822 -- Rake r3 - T.merge[9904] = 1822 -- Rake r4 - T.merge[27003] = 1822 -- Rake r5 - T.merge[48573] = 1822 -- Rake r6 - T.merge[48574] = 1822 -- Rake r7 - T.aoespam[1079] = 3 -- Rip r1 - T.merge[9492] = 1079 -- Rip r2 - T.merge[9493] = 1079 -- Rip r3 - T.merge[9752] = 1079 -- Rip r4 - T.merge[9894] = 1079 -- Rip r5 - T.merge[9896] = 1079 -- Rip r6 - T.merge[27008] = 1079 -- Rip r7 - T.merge[49799] = 1079 -- Rip r8 - T.merge[49800] = 1079 -- Rip r9 - T.aoespam[61391] = 0 -- Typhoon r1 - T.merge[61390] = 61391 -- Typhoon r2 - T.merge[61388] = 61391 -- Typhoon r3 - T.merge[61387] = 61391 -- Typhoon r4 - T.merge[53227] = 61391 -- Typhoon r5 + T.aoespam[8921] = 3 -- Moonfire + T.aoespam[93402] = 3 -- Sunfire + T.aoespam[50286] = 3 -- Starfall + T.aoespam[42231] = 3 -- Hurricane + T.aoespam[1822] = 3 -- Rake + T.aoespam[1079] = 3 -- Rip + T.aoespam[61391] = 0 -- Typhoon + T.aoespam[88751] = 3 -- Wild Mushroom end if C.combattext.healing then end elseif T.class == "HUNTER" then if C.combattext.merge_aoe_spam then - T.aoespam[1978] = 3 -- Serpent Sting r1 - T.merge[13549] = 1978 -- Serpent Sting r2 - T.merge[13550] = 1978 -- Serpent Sting r3 - T.merge[13551] = 1978 -- Serpent Sting r4 - T.merge[13552] = 1978 -- Serpent Sting r5 - T.merge[13553] = 1978 -- Serpent Sting r6 - T.merge[13554] = 1978 -- Serpent Sting r7 - T.merge[13555] = 1978 -- Serpent Sting r8 - T.merge[25295] = 1978 -- Serpent Sting r9 - T.merge[27016] = 1978 -- Serpent Sting r10 - T.merge[49000] = 1978 -- Serpent Sting r11 - T.merge[49001] = 1978 -- Serpent Sting r12 - T.aoespam[2643] = 0 -- Multi-Shot r1 - T.merge[14288] = 2643 -- Multi-Shot r2 - T.merge[14289] = 2643 -- Multi-Shot r3 - T.merge[14290] = 2643 -- Multi-Shot r4 - T.merge[25294] = 2643 -- Multi-Shot r5 - T.merge[27021] = 2643 -- Multi-Shot r6 - T.merge[49047] = 2643 -- Multi-Shot r7 - T.merge[49048] = 2643 -- Multi-Shot r8 - T.aoespam[13812] = 3 -- Explosive Trap r1 - T.merge[14314] = 13812 -- Explosive Trap r2 - T.merge[14315] = 13812 -- Explosive Trap r3 - T.merge[27026] = 13812 -- Explosive Trap r4 - T.merge[49064] = 13812 -- Explosive Trap r5 - T.merge[49065] = 13812 -- Explosive Trap r6 - T.aoespam[42243] = 1 -- Volley r1 - T.merge[42244] = 42243 -- Volley r2 - T.merge[42245] = 42243 -- Volley r3 - T.merge[42234] = 42243 -- Volley r4 - T.merge[58432] = 42243 -- Volley r5 - T.merge[58433] = 42243 -- Volley r6 + T.aoespam[1978] = 3 -- Serpent Sting + T.aoespam[2643] = 0 -- Multi-Shot + T.aoespam[13812] = 3 -- Explosive Trap T.aoespam[63468] = 3 -- Piercing Shots -- Healing spells - T.aoespam[136] = 9 -- Mend Pet r1 - T.merge[3111] = 136 -- Mend Pet r2 - T.merge[3661] = 136 -- Mend Pet r3 - T.merge[3662] = 136 -- Mend Pet r4 - T.merge[13542] = 136 -- Mend Pet r5 - T.merge[13543] = 136 -- Mend Pet r6 - T.merge[13544] = 136 -- Mend Pet r7 - T.merge[27046] = 136 -- Mend Pet r8 - T.merge[48989] = 136 -- Mend Pet r9 - T.merge[48990] = 136 -- Mend Pet r10 + T.aoespam[136] = 9 -- Mend Pet end if C.combattext.healing then T.healfilter[19579] = true -- Spirit Bond r1 @@ -195,205 +83,61 @@ elseif T.class == "HUNTER" then end elseif T.class == "MAGE" then if C.combattext.merge_aoe_spam then - T.aoespam[44457] = 3.5 -- Living Bomb r1 - T.merge[55359] = 44457 -- Living Bomb r2 - T.merge[55360] = 44457 -- Living Bomb r3 - T.aoespam[2120] = 0 -- Flamestrike r1 - T.merge[2121] = 2120 -- Flamestrike r2 - T.merge[8422] = 2120 -- Flamestrike r3 - T.merge[8423] = 2120 -- Flamestrike r4 - T.merge[10215] = 2120 -- Flamestrike r5 - T.merge[10216] = 2120 -- Flamestrike r6 - T.merge[27086] = 2120 -- Flamestrike r7 - T.merge[42925] = 2120 -- Flamestrike r8 - T.merge[42926] = 2120 -- Flamestrike r9 + T.aoespam[44457] = 3.5 -- Living Bomb + T.aoespam[2120] = 0 -- Flamestrike + T.merge[88148] = 2120 -- Flamestrike (Improved Flamestrike) T.aoespam[12654] = 3 -- Ignite - T.aoespam[31661] = 0 -- Dragon's Breath r1 - T.merge[33041] = 31661 -- Dragon's Breath r2 - T.merge[33042] = 31661 -- Dragon's Breath r3 - T.merge[33043] = 31661 -- Dragon's Breath r4 - T.merge[42949] = 31661 -- Dragon's Breath r5 - T.merge[42950] = 31661 -- Dragon's Breath r6 - T.aoespam[42208] = 3 -- Blizzard r1 - T.merge[42209] = 42208 -- Blizzard r2 - T.merge[42210] = 42208 -- Blizzard r3 - T.merge[42211] = 42208 -- Blizzard r4 - T.merge[42212] = 42208 -- Blizzard r5 - T.merge[42213] = 42208 -- Blizzard r6 - T.merge[42198] = 42208 -- Blizzard r7 - T.merge[42937] = 42208 -- Blizzard r8 - T.merge[42938] = 42208 -- Blizzard r9 - T.aoespam[122] = 0 -- Frost Nova r1 - T.merge[865] = 122 -- Frost Nova r2 - T.merge[6131] = 122 -- Frost Nova r3 - T.merge[10230] = 122 -- Frost Nova r4 - T.merge[27088] = 122 -- Frost Nova r5 - T.merge[42917] = 122 -- Frost Nova r6 - T.aoespam[1449] = 0 -- Arcane Explosion r1 - T.merge[8437] = 1449 -- Arcane Explosion r2 - T.merge[8438] = 1449 -- Arcane Explosion r3 - T.merge[8439] = 1449 -- Arcane Explosion r4 - T.merge[10201] = 1449 -- Arcane Explosion r5 - T.merge[10202] = 1449 -- Arcane Explosion r6 - T.merge[27080] = 1449 -- Arcane Explosion r7 - T.merge[27082] = 1449 -- Arcane Explosion r8 - T.merge[42920] = 1449 -- Arcane Explosion r9 - T.merge[42921] = 1449 -- Arcane Explosion r10 - T.aoespam[120] = 0 -- Cone of Cold r1 - T.merge[8492] = 120 -- Cone of Cold r2 - T.merge[10159] = 120 -- Cone of Cold r3 - T.merge[10160] = 120 -- Cone of Cold r4 - T.merge[10161] = 120 -- Cone of Cold r5 - T.merge[27087] = 120 -- Cone of Cold r6 - T.merge[42930] = 120 -- Cone of Cold r7 - T.merge[42931] = 120 -- Cone of Cold r8 - T.aoespam[7268] = 1.6 -- Arcane Missiles r1 - T.merge[7269] = 7268 -- Arcane Missiles r2 - T.merge[7270] = 7268 -- Arcane Missiles r3 - T.merge[8419] = 7268 -- Arcane Missiles r4 - T.merge[8418] = 7268 -- Arcane Missiles r5 - T.merge[10273] = 7268 -- Arcane Missiles r6 - T.merge[10274] = 7268 -- Arcane Missiles r7 - T.merge[25346] = 7268 -- Arcane Missiles r8 - T.merge[27076] = 7268 -- Arcane Missiles r9 - T.merge[38700] = 7268 -- Arcane Missiles r10 - T.merge[38703] = 7268 -- Arcane Missiles r11 - T.merge[42844] = 7268 -- Arcane Missiles r12 - T.merge[42845] = 7268 -- Arcane Missiles r13 - T.aoespam[11113] = 0 -- Blast Wave r1 - T.merge[13018] = 11113 -- Blast Wave r2 - T.merge[13019] = 11113 -- Blast Wave r3 - T.merge[13020] = 11113 -- Blast Wave r4 - T.merge[13021] = 11113 -- Blast Wave r5 - T.merge[27133] = 11113 -- Blast Wave r6 - T.merge[33933] = 11113 -- Blast Wave r7 - T.merge[42944] = 11113 -- Blast Wave r8 - T.merge[42945] = 11113 -- Blast Wave r9 + T.merge[413841] = 12654 -- Ignite + T.merge[413843] = 12654 -- Ignite + T.aoespam[31661] = 0 -- Dragon's Breath + T.aoespam[42208] = 3 -- Blizzard + T.aoespam[122] = 0 -- Frost Nova + T.aoespam[1449] = 0 -- Arcane Explosion + T.aoespam[120] = 0 -- Cone of Cold + T.aoespam[7268] = 1.6 -- Arcane Missiles + T.aoespam[11113] = 0 -- Blast Wave + T.aoespam[82731] = 1 -- Flame Orb + T.aoespam[92283] = 1 -- Frostfire Orb T.aoespam[59637] = 3 -- Fire Blast (Mirror Image) T.aoespam[59638] = 3 -- Frostbolt (Mirror Image) - T.aoespam[44425] = 1.2 -- Arcane Barrage r1 - T.merge[44780] = 44425 -- Arcane Barrage r2 - T.merge[44781] = 44425 -- Arcane Barrage r3 + T.aoespam[44425] = 1.2 -- Arcane Barrage + end + if C.combattext.healing then + T.healfilter[91394] = true -- Permafrost end elseif T.class == "PALADIN" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[20267] = 6 -- Judgment of Light + T.aoespam[85222] = 1 -- Light of Dawn -- Damaging spells - T.aoespam[53600] = 0.5 -- Shield of the Righteous r1 - T.merge[61411] = 53600 -- Shield of the Righteous r2 - T.aoespam[26573] = 3 -- Consecration r1 - T.merge[20116] = 26573 -- Consecration r2 - T.merge[20922] = 26573 -- Consecration r3 - T.merge[20923] = 26573 -- Consecration r4 - T.merge[20924] = 26573 -- Consecration r5 - T.merge[27173] = 26573 -- Consecration r6 - T.merge[48818] = 26573 -- Consecration r7 - T.merge[48819] = 26573 -- Consecration r8 + T.aoespam[53600] = 0.5 -- Shield of the Righteous + T.aoespam[26573] = 3 -- Consecration T.aoespam[53385] = 0 -- Divine Storm T.aoespam[53595] = 1 -- Hammer of the Righteous - T.aoespam[20925] = 3 -- Holy Shield r1 - T.merge[20927] = 20925 -- Holy Shield r2 - T.merge[20928] = 20925 -- Holy Shield r3 - T.merge[27179] = 20925 -- Holy Shield r4 - T.merge[48951] = 20925 -- Holy Shield r5 - T.merge[48952] = 20925 -- Holy Shield r6 + T.aoespam[20424] = 1 -- Seal of Command + T.aoespam[20925] = 3 -- Holy Shield end elseif T.class == "PRIEST" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[34861] = 1 -- Circle of Healing r1 - T.merge[34863] = 34861 -- Circle of Healing r2 - T.merge[34864] = 34861 -- Circle of Healing r3 - T.merge[34865] = 34861 -- Circle of Healing r4 - T.merge[34866] = 34861 -- Circle of Healing r5 - T.merge[48088] = 34861 -- Circle of Healing r6 - T.merge[48089] = 34861 -- Circle of Healing r7 + T.aoespam[34861] = 1 -- Circle of Healing T.aoespam[15290] = 4 -- Vampiric Embrace - T.aoespam[47750] = 2.5 -- Penance r1 - T.merge[52983] = 47750 -- Penance r2 - T.merge[52984] = 47750 -- Penance r3 - T.merge[52985] = 47750 -- Penance r4 - T.aoespam[23455] = 0 -- Holy Nova r1 - T.merge[23458] = 23455 -- Holy Nova r2 - T.merge[23459] = 23455 -- Holy Nova r3 - T.merge[27803] = 23455 -- Holy Nova r4 - T.merge[27804] = 23455 -- Holy Nova r5 - T.merge[27805] = 23455 -- Holy Nova r6 - T.merge[25329] = 23455 -- Holy Nova r7 - T.merge[48075] = 23455 -- Holy Nova r8 - T.merge[48076] = 23455 -- Holy Nova r9 - T.aoespam[139] = 3 -- Renew r1 - T.merge[6074] = 139 -- Renew r2 - T.merge[6075] = 139 -- Renew r3 - T.merge[6076] = 139 -- Renew r4 - T.merge[6077] = 139 -- Renew r5 - T.merge[6078] = 139 -- Renew r6 - T.merge[10927] = 139 -- Renew r7 - T.merge[10928] = 139 -- Renew r8 - T.merge[10929] = 139 -- Renew r9 - T.merge[25315] = 139 -- Renew r10 - T.merge[25221] = 139 -- Renew r11 - T.merge[25222] = 139 -- Renew r12 - T.merge[48067] = 139 -- Renew r13 - T.merge[48068] = 139 -- Renew r14 + T.aoespam[47750] = 2.5 -- Penance + T.aoespam[23455] = 0 -- Holy Nova + T.aoespam[139] = 3 -- Renew T.aoespam[64844] = 3 -- Divine Hymn T.aoespam[32546] = 3 -- Binding Heal - T.aoespam[596] = 0 -- Prayer of Healing r1 - T.merge[996] = 596 -- Prayer of Healing r2 - T.merge[10960] = 596 -- Prayer of Healing r3 - T.merge[10961] = 596 -- Prayer of Healing r4 - T.merge[25316] = 596 -- Prayer of Healing r5 - T.merge[25308] = 596 -- Prayer of Healing r6 - T.merge[48072] = 596 -- Prayer of Healing r7 + T.aoespam[596] = 0 -- Prayer of Healing + T.aoespam[56161] = 0 -- Glyph of Prayer of Healing + T.aoespam[33110] = 3 -- Prayer of Mending + T.aoespam[81751] = 3 -- Atonement -- Damaging spells - T.aoespam[49821] = 3 -- Mind Sear r1 - T.merge[53022] = 49821 -- Mind Sear r2 - T.aoespam[15237] = 0 -- Holy Nova r1 - T.merge[15430] = 15237 -- Holy Nova r2 - T.merge[15431] = 15237 -- Holy Nova r3 - T.merge[27799] = 15237 -- Holy Nova r4 - T.merge[27800] = 15237 -- Holy Nova r5 - T.merge[27801] = 15237 -- Holy Nova r6 - T.merge[25331] = 15237 -- Holy Nova r7 - T.merge[48077] = 15237 -- Holy Nova r8 - T.merge[48078] = 15237 -- Holy Nova r9 - T.aoespam[589] = 4 -- Shadow Word: Pain r1 - T.merge[594] = 589 -- Shadow Word: Pain r2 - T.merge[970] = 589 -- Shadow Word: Pain r3 - T.merge[992] = 589 -- Shadow Word: Pain r4 - T.merge[2767] = 589 -- Shadow Word: Pain r5 - T.merge[10892] = 589 -- Shadow Word: Pain r6 - T.merge[10893] = 589 -- Shadow Word: Pain r7 - T.merge[10894] = 589 -- Shadow Word: Pain r8 - T.merge[25367] = 589 -- Shadow Word: Pain r9 - T.merge[25368] = 589 -- Shadow Word: Pain r10 - T.merge[48124] = 589 -- Shadow Word: Pain r11 - T.merge[48125] = 589 -- Shadow Word: Pain r12 - T.aoespam[15407] = 3 -- Mind Flay r1 - T.merge[17311] = 15407 -- Mind Flay r2 - T.merge[17312] = 15407 -- Mind Flay r3 - T.merge[17313] = 15407 -- Mind Flay r4 - T.merge[17314] = 15407 -- Mind Flay r5 - T.merge[18807] = 15407 -- Mind Flay r6 - T.merge[25387] = 15407 -- Mind Flay r7 - T.merge[48155] = 15407 -- Mind Flay r8 - T.merge[48156] = 15407 -- Mind Flay r9 - T.aoespam[47666] = 2.5 -- Penance r1 - T.merge[52998] = 47666 -- Penance r2 - T.merge[52999] = 47666 -- Penance r3 - T.merge[53000] = 47666 -- Penance r4 - T.aoespam[14914] = 3 -- Holy Fire r1 - T.merge[15262] = 14914 -- Holy Fire r2 - T.merge[15263] = 14914 -- Holy Fire r3 - T.merge[15264] = 14914 -- Holy Fire r4 - T.merge[15265] = 14914 -- Holy Fire r5 - T.merge[15266] = 14914 -- Holy Fire r6 - T.merge[15267] = 14914 -- Holy Fire r7 - T.merge[15261] = 14914 -- Holy Fire r8 - T.merge[25384] = 14914 -- Holy Fire r9 - T.merge[48134] = 14914 -- Holy Fire r10 - T.merge[48135] = 14914 -- Holy Fire r11 + T.aoespam[49821] = 3 -- Mind Sear + T.aoespam[589] = 4 -- Shadow Word: Pain + T.aoespam[15407] = 3 -- Mind Flay + T.aoespam[47666] = 2.5 -- Penance + T.aoespam[14914] = 3 -- Holy Fire + T.aoespam[87532] = 3 -- Shadowy Apparition end if C.combattext.healing then T.healfilter[15290] = false -- Vampiric Embrace @@ -402,288 +146,86 @@ elseif T.class == "ROGUE" then if C.combattext.merge_aoe_spam then T.aoespam[51723] = 1 -- Fan of Knives T.aoespam[2818] = 5 -- Deadly Poison - T.merge[2819] = 2818 -- Deadly Poison II - T.merge[11353] = 2818 -- Deadly Poison III - T.merge[11354] = 2818 -- Deadly Poison IV - T.merge[25349] = 2818 -- Deadly Poison V - T.merge[26968] = 2818 -- Deadly Poison VI - -- T.merge[26968] = 2818 -- Deadly Poison VII -- Note: What is the spell ID, if it even exists? - T.merge[57969] = 2818 -- Deadly Poison VIII - T.aoespam[703] = 5 -- Garrote r1 - T.merge[8631] = 703 -- Garrote r2 - T.merge[8632] = 703 -- Garrote r3 - T.merge[8633] = 703 -- Garrote r4 - T.merge[11289] = 703 -- Garrote r5 - T.merge[11290] = 703 -- Garrote r6 - T.merge[26839] = 703 -- Garrote r7 - T.merge[26884] = 703 -- Garrote r8 - T.merge[48675] = 703 -- Garrote r9 - T.merge[48676] = 703 -- Garrote r10 + T.aoespam[703] = 5 -- Garrote T.aoespam[8680] = 3 -- Instant Poison - T.merge[8685] = 8680 -- Instant Poison II - T.merge[8688] = 8680 -- Instant Poison III - T.merge[11338] = 8680 -- Instant Poison IV - T.merge[11336] = 8680 -- Instant Poison V - T.merge[11337] = 8680 -- Instant Poison VI - T.merge[26890] = 8680 -- Instant Poison VII - T.merge[57964] = 8680 -- Instant Poison VIII T.aoespam[22482] = 3 -- Blade Flurry T.aoespam[57841] = 3 -- Killing Spree - T.merge[57842] = 57841 -- Killing Spree [Trigger] - T.aoespam[5374] = 0 -- Mutilate r1 - T.merge[34414] = 5374 -- Mutilate r2 - T.merge[34416] = 5374 -- Mutilate r3 - T.merge[34419] = 5374 -- Mutilate r4 - T.merge[48662] = 5374 -- Mutilate r5 - T.merge[48665] = 5374 -- Mutilate r6 - T.aoespam[1943] = 5 -- Rupture r1 - T.merge[8639] = 1943 -- Rupture r2 - T.merge[8640] = 1943 -- Rupture r3 - T.merge[11273] = 1943 -- Rupture r4 - T.merge[11274] = 1943 -- Rupture r5 - T.merge[11275] = 1943 -- Rupture r6 - T.merge[26867] = 1943 -- Rupture r7 - T.merge[48671] = 1943 -- Rupture r8 - T.merge[48672] = 1943 -- Rupture r9 + T.merge[57842] = 57841 -- Killing Spree Off-Hand + T.aoespam[5374] = 0 -- Mutilate + T.aoespam[1943] = 5 -- Rupture T.merge[27576] = 5374 -- Mutilate Off-Hand - T.merge[27576] = 5374 -- Mutilate Off-Hand r1 - T.merge[34415] = 5374 -- Mutilate Off-Hand r2 - T.merge[34417] = 5374 -- Mutilate Off-Hand r3 - T.merge[34418] = 5374 -- Mutilate Off-Hand r4 - T.merge[48661] = 5374 -- Mutilate Off-Hand r5 - T.merge[48664] = 5374 -- Mutilate Off-Hand r6 + T.merge[32321] = 5374 -- Mutilate Off-Hand + T.aoespam[86392] = 3 -- Main Gauche end elseif T.class == "SHAMAN" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[5672] = 5 -- Healing Stream Totem r1 - T.merge[6371] = 5672 -- Healing Stream Totem r2 - T.merge[6372] = 5672 -- Healing Stream Totem r3 - T.merge[10460] = 5672 -- Healing Stream Totem r4 - T.merge[10461] = 5672 -- Healing Stream Totem r5 - T.merge[25566] = 5672 -- Healing Stream Totem r6 - T.merge[58763] = 5672 -- Healing Stream Totem r7 - T.merge[58764] = 5672 -- Healing Stream Totem r8 - T.merge[58765] = 5672 -- Healing Stream Totem r9 - T.aoespam[1064] = 3 -- Chain Heal r1 - T.merge[10622] = 1064 -- Chain Heal r2 - T.merge[10623] = 1064 -- Chain Heal r3 - T.merge[25422] = 1064 -- Chain Heal r4 - T.merge[25423] = 1064 -- Chain Heal r5 - T.merge[55458] = 1064 -- Chain Heal r6 - T.merge[55459] = 1064 -- Chain Heal r7 - T.aoespam[61295] = 6 -- Riptide r1 - T.merge[61299] = 61295 -- Riptide r2 - T.merge[61300] = 61295 -- Riptide r3 - T.merge[61301] = 61295 -- Riptide r4 - T.aoespam[51945] = 3 -- Earthliving r1 - T.merge[51990] = 51945 -- Earthliving r2 - T.merge[51997] = 51945 -- Earthliving r3 - T.merge[51998] = 51945 -- Earthliving r4 - T.merge[51999] = 51945 -- Earthliving r5 - T.merge[52000] = 51945 -- Earthliving r6 + T.aoespam[73921] = 5 -- Healing Rain + T.aoespam[5672] = 5 -- Healing Stream Totem + T.aoespam[1064] = 3 -- Chain Heal + T.aoespam[61295] = 6 -- Riptide + T.aoespam[51945] = 3 -- Earthliving + T.aoespam[98021] = 3 -- Spirit Link -- Damaging spells -- T.aoespam[26545] = 3 -- Lightning Shield - T.aoespam[421] = 1 -- Chain Lightning r1 - T.merge[930] = 421 -- Chain Lightning r2 - T.merge[2860] = 421 -- Chain Lightning r3 - T.merge[10605] = 421 -- Chain Lightning r4 - T.merge[25439] = 421 -- Chain Lightning r5 - T.merge[25442] = 421 -- Chain Lightning r6 - T.merge[49270] = 421 -- Chain Lightning r7 - T.merge[49271] = 421 -- Chain Lightning r8 - T.aoespam[8349] = 0 -- Fire Nova r1 - T.merge[8502] = 8349 -- Fire Nova r2 - T.merge[8503] = 8349 -- Fire Nova r3 - T.merge[11306] = 8349 -- Fire Nova r4 - T.merge[11307] = 8349 -- Fire Nova r5 - T.merge[25535] = 8349 -- Fire Nova r6 - T.merge[25537] = 8349 -- Fire Nova r7 - T.merge[61654] = 8349 -- Fire Nova r8 - T.merge[61650] = 8349 -- Fire Nova r9 - T.aoespam[51490] = 0 -- Thunderstorm r1 - T.merge[59156] = 51490 -- Thunderstorm r2 - T.merge[59158] = 51490 -- Thunderstorm r3 - T.merge[59159] = 51490 -- Thunderstorm r4 - T.aoespam[8187] = 3 -- Magma Totem r1 - T.merge[10579] = 8187 -- Magma Totem r2 - T.merge[10580] = 8187 -- Magma Totem r3 - T.merge[10581] = 8187 -- Magma Totem r4 - T.merge[25550] = 8187 -- Magma Totem r5 - T.merge[58732] = 8187 -- Magma Totem r6 - T.merge[58735] = 8187 -- Magma Totem r7 - T.aoespam[8050] = 4 -- Flame Shock r1 - T.merge[8052] = 8050 -- Flame Shock r2 - T.merge[8053] = 8050 -- Flame Shock r3 - T.merge[10447] = 8050 -- Flame Shock r4 - T.merge[10448] = 8050 -- Flame Shock r5 - T.merge[29228] = 8050 -- Flame Shock r6 - T.merge[25457] = 8050 -- Flame Shock r7 - T.merge[49232] = 8050 -- Flame Shock r8 - T.merge[49233] = 8050 -- Flame Shock r9 + T.aoespam[421] = 1 -- Chain Lightning + T.aoespam[8349] = 0 -- Fire Nova + T.aoespam[51490] = 0 -- Thunderstorm + T.aoespam[77478] = 3 -- Earthquake + T.merge[86861] = 77478 -- Earthquake + T.aoespam[8187] = 3 -- Magma Totem + T.aoespam[8050] = 4 -- Flame Shock T.aoespam[10444] = 3 -- Flametongue Attack T.merge[65978] = 10444 -- Flametongue Attack - T.aoespam[3606] = 3 -- Searing Bolt r1 - T.merge[6350] = 3606 -- Searing Bolt r2 - T.merge[6351] = 3606 -- Searing Bolt r3 - T.merge[6352] = 3606 -- Searing Bolt r4 - T.merge[10435] = 3606 -- Searing Bolt r5 - T.merge[10436] = 3606 -- Searing Bolt r6 - T.merge[25530] = 3606 -- Searing Bolt r7 - T.merge[58700] = 3606 -- Searing Bolt r8 - T.merge[58701] = 3606 -- Searing Bolt r9 - T.merge[58702] = 3606 -- Searing Bolt r10 + T.aoespam[3606] = 3 -- Searing Bolt T.aoespam[32175] = 0 -- Stormstrike T.merge[32176] = 32175 -- Stormstrike Off-Hand end elseif T.class == "WARLOCK" then if C.combattext.merge_aoe_spam then - T.aoespam[172] = 3 -- Corruption r1 - T.merge[6222] = 172 -- Corruption r2 - T.merge[6223] = 172 -- Corruption r3 - T.merge[7648] = 172 -- Corruption r4 - T.merge[11671] = 172 -- Corruption r5 - T.merge[11672] = 172 -- Corruption r6 - T.merge[25311] = 172 -- Corruption r7 - T.merge[27216] = 172 -- Corruption r8 - T.merge[47812] = 172 -- Corruption r9 - T.merge[47813] = 172 -- Corruption r10 - T.aoespam[348] = 3 -- Immolate r1 - T.merge[707] = 348 -- Immolate r2 - T.merge[1094] = 348 -- Immolate r3 - T.merge[2941] = 348 -- Immolate r4 - T.merge[11665] = 348 -- Immolate r5 - T.merge[11667] = 348 -- Immolate r6 - T.merge[11668] = 348 -- Immolate r7 - T.merge[25309] = 348 -- Immolate r8 - T.merge[27215] = 348 -- Immolate r9 - T.merge[47810] = 348 -- Immolate r10 - T.merge[47811] = 348 -- Immolate r11 - T.aoespam[980] = 3 -- Agony r1 - T.merge[1014] = 980 -- Agony r2 - T.merge[6217] = 980 -- Agony r3 - T.merge[11711] = 980 -- Agony r4 - T.merge[11712] = 980 -- Agony r5 - T.merge[11713] = 980 -- Agony r6 - T.merge[27218] = 980 -- Agony r7 - T.merge[47863] = 980 -- Agony r8 - T.merge[47864] = 980 -- Agony r9 + T.aoespam[172] = 3 -- Corruption + T.aoespam[348] = 3 -- Immolate + T.aoespam[980] = 3 -- Agony T.aoespam[63108] = 3 -- Siphon Life - T.aoespam[42223] = 3 -- Rain of Fire r1 - T.merge[42224] = 42223 -- Rain of Fire r2 - T.merge[42225] = 42223 -- Rain of Fire r3 - T.merge[42226] = 42223 -- Rain of Fire r4 - T.merge[42218] = 42223 -- Rain of Fire r5 - T.merge[47817] = 42223 -- Rain of Fire r6 - T.merge[47818] = 42223 -- Rain of Fire r7 - T.aoespam[5857] = 3 -- Hellfire Effect r1 - T.merge[11681] = 5857 -- Hellfire Effect r2 - T.merge[11682] = 5857 -- Hellfire Effect r3 - T.merge[27214] = 5857 -- Hellfire Effect r4 - T.merge[47822] = 5857 -- Hellfire Effect r5 + T.aoespam[42223] = 3 -- Rain of Fire + T.aoespam[5857] = 3 -- Hellfire Effect T.aoespam[20153] = 3 -- Immolation (Infernal) T.aoespam[22703] = 0 -- Infernal Awakening end if C.combattext.healing then - T.healfilter[689] = true -- Drain Life r1 - T.healfilter[699] = true -- Drain Life r2 - T.healfilter[709] = true -- Drain Life r3 - T.healfilter[7651] = true -- Drain Life r4 - T.healfilter[11699] = true -- Drain Life r5 - T.healfilter[11700] = true -- Drain Life r6 - T.healfilter[27219] = true -- Drain Life r7 - T.healfilter[27220] = true -- Drain Life r8 - T.healfilter[47857] = true -- Drain Life r9 + T.healfilter[689] = true -- Drain Life + T.healfilter[89420] = true -- Drain Life T.healfilter[63108] = true -- Siphon Life + T.healfilter[63106] = true -- Siphon Life + T.healfilter[54181] = true -- Fel Synergy end elseif T.class == "WARRIOR" then if C.combattext.merge_aoe_spam then -- Healing spells T.aoespam[55694] = 3.5 -- Enraged Regeneration -- Damaging spells - T.aoespam[845] = 0.5 -- Cleave r1 - T.merge[7369] = 845 -- Cleave r2 - T.merge[11608] = 845 -- Cleave r3 - T.merge[11609] = 845 -- Cleave r4 - T.merge[20569] = 845 -- Cleave r5 - T.merge[25231] = 845 -- Cleave r6 - T.merge[47519] = 845 -- Cleave r7 - T.merge[47520] = 845 -- Cleave r8 - T.aoespam[5308] = 0.5 -- Execute r1 (Sweeping Strikes) - T.merge[20658] = 5308 -- Execute r2 (Sweeping Strikes) - T.merge[20660] = 5308 -- Execute r3 (Sweeping Strikes) - T.merge[20661] = 5308 -- Execute r4 (Sweeping Strikes) - T.merge[20662] = 5308 -- Execute r5 (Sweeping Strikes) - T.merge[25234] = 5308 -- Execute r6 (Sweeping Strikes) - T.merge[25236] = 5308 -- Execute r7 (Sweeping Strikes) - T.merge[47470] = 5308 -- Execute r8 (Sweeping Strikes) - T.merge[47471] = 5308 -- Execute r9 (Sweeping Strikes) - T.aoespam[7384] = 0.5 -- Overpower r1 (Sweeping Strikes) - T.merge[7887] = 7384 -- Overpower r2 (Sweeping Strikes) - T.merge[11584] = 7384 -- Overpower r3 (Sweeping Strikes) - T.merge[11585] = 7384 -- Overpower r4 (Sweeping Strikes) - T.aoespam[1464] = 0.5 -- Slam r1 (Sweeping Strikes) - T.merge[8820] = 1464 -- Slam r2 (Sweeping Strikes) - T.merge[11604] = 1464 -- Slam r3 (Sweeping Strikes) - T.merge[11605] = 1464 -- Slam r4 (Sweeping Strikes) - T.merge[25241] = 1464 -- Slam r5 (Sweeping Strikes) - T.merge[25242] = 1464 -- Slam r6 (Sweeping Strikes) - T.merge[47474] = 1464 -- Slam r7 (Sweeping Strikes) - T.merge[47475] = 1464 -- Slam r8 (Sweeping Strikes) - T.aoespam[12294] = 0.5 -- Mortal Strike r1 (Sweeping Strikes) - T.merge[21551] = 12294 -- Mortal Strike r2 (Sweeping Strikes) - T.merge[21552] = 12294 -- Mortal Strike r3 (Sweeping Strikes) - T.merge[21553] = 12294 -- Mortal Strike r4 (Sweeping Strikes) - T.merge[25248] = 12294 -- Mortal Strike r5 (Sweeping Strikes) - T.merge[30330] = 12294 -- Mortal Strike r6 (Sweeping Strikes) - T.merge[47485] = 12294 -- Mortal Strike r7 (Sweeping Strikes) - T.merge[47486] = 12294 -- Mortal Strike r8 (Sweeping Strikes) + T.aoespam[845] = 0.5 -- Cleave + T.aoespam[5308] = 0.5 -- Execute (Sweeping Strikes) + T.aoespam[7384] = 0.5 -- Overpower (Sweeping Strikes) + T.aoespam[1464] = 0.5 -- Slam (Sweeping Strikes) + T.merge[81101] = 1464 -- Slam Off-Hand + T.merge[97992] = 1464 -- Slam Off-Hand + T.aoespam[12294] = 0.5 -- Mortal Strike (Sweeping Strikes) T.aoespam[12162] = 3 -- Deep Wounds r1 T.merge[12850] = 12162 -- Deep Wounds r2 T.merge[12868] = 12162 -- Deep Wounds r3 T.aoespam[1680] = 1.5 -- Whirlwind - T.merge[44949] = 1680 -- Whirlwind [Trigger] - T.aoespam[6343] = 0 -- Thunder Clap r1 - T.merge[8198] = 6343 -- Thunder Clap r2 - T.merge[8204] = 6343 -- Thunder Clap r3 - T.merge[8205] = 6343 -- Thunder Clap r4 - T.merge[11580] = 6343 -- Thunder Clap r5 - T.merge[11581] = 6343 -- Thunder Clap r6 - T.merge[25264] = 6343 -- Thunder Clap r7 - T.merge[47501] = 6343 -- Thunder Clap r8 - T.merge[47502] = 6343 -- Thunder Clap r9 - T.aoespam[6572] = 0 -- Revenge r1 - T.merge[6574] = 6572 -- Revenge r2 - T.merge[7379] = 6572 -- Revenge r3 - T.merge[11600] = 6572 -- Revenge r4 - T.merge[11601] = 6572 -- Revenge r5 - T.merge[25288] = 6572 -- Revenge r6 - T.merge[25269] = 6572 -- Revenge r7 - T.merge[30357] = 6572 -- Revenge r8 - T.merge[57823] = 6572 -- Revenge r9 - T.aoespam[772] = 3 -- Rend r1 - T.merge[6546] = 772 -- Rend r2 - T.merge[6547] = 772 -- Rend r3 - T.merge[6548] = 772 -- Rend r4 - T.merge[11572] = 772 -- Rend r5 - T.merge[11573] = 772 -- Rend r6 - T.merge[11574] = 772 -- Rend r7 - T.merge[25208] = 772 -- Rend r8 - T.merge[46845] = 772 -- Rend r9 - T.merge[47465] = 772 -- Rend r10 - T.aoespam[23881] = 0 -- Bloodthirst r1 - T.merge[23892] = 23881 -- Bloodthirst r2 - T.merge[23893] = 23881 -- Bloodthirst r3 - T.merge[23894] = 23881 -- Bloodthirst r4 - T.merge[25251] = 23881 -- Bloodthirst r5 - T.merge[30335] = 23881 -- Bloodthirst r6 + T.merge[44949] = 1680 -- Whirlwind Off-Hand + T.merge[95738] = 1680 -- Whirlwind Off-Hand + T.aoespam[52174] = 0 -- Heroic Leap + T.aoespam[96103] = 0.5 -- Raging Blow (Sweeping Strikes) + T.merge[85384] = 96103 -- Raging Blow Off-Hand + T.aoespam[6343] = 0 -- Thunder Clap + T.aoespam[6572] = 0 -- Revenge + T.aoespam[772] = 3 -- Rend + T.aoespam[23881] = 0 -- Bloodthirst end if C.combattext.healing then - T.healfilter[23880] = true -- Bloodthirst Heal r1 - T.healfilter[23889] = true -- Bloodthirst Heal r2 - T.healfilter[23890] = true -- Bloodthirst Heal r3 - T.healfilter[23891] = true -- Bloodthirst Heal r4 - T.healfilter[25253] = true -- Bloodthirst Heal r5 - T.healfilter[30340] = true -- Bloodthirst Heal r6 + T.healfilter[23880] = true -- Bloodthirst Heal end end diff --git a/ShestakUI/Config/Filters_Cata/Cooldowns.lua b/ShestakUI/Config/Filters_Cata/Cooldowns.lua index e96b24702..fa1c3903c 100644 --- a/ShestakUI/Config/Filters_Cata/Cooldowns.lua +++ b/ShestakUI/Config/Filters_Cata/Cooldowns.lua @@ -8,88 +8,61 @@ local T, C, L = unpack(ShestakUI) if C.raidcooldown.enable == true then T.raid_spells = { -- Battle resurrection - {20484, 600}, -- Rebirth r1 (600sec base / -300sec from 5pc AQ Set) - {20739, 600}, -- Rebirth r2 (600sec base / -300sec from 5pc AQ Set) - {20742, 600}, -- Rebirth r3 (600sec base / -300sec from 5pc AQ Set) - {20747, 600}, -- Rebirth r4 (600sec base / -300sec from 5pc AQ Set) - {20748, 600}, -- Rebirth r5 (600sec base / -300sec from 5pc AQ Set) - {26994, 600}, -- Rebirth r6 (600sec base / -300sec from 5pc AQ Set) - {48477, 600}, -- Rebirth r7 (600sec base / -300sec from 5pc AQ Set) - {20707, 900}, -- Soulstone Resurrection r1 - {20762, 900}, -- Soulstone Resurrection r2 - {20763, 900}, -- Soulstone Resurrection r3 - {20764, 900}, -- Soulstone Resurrection r4 - {20765, 900}, -- Soulstone Resurrection r5 - {27239, 900}, -- Soulstone Resurrection r6 - {47883, 900}, -- Soulstone Resurrection r7 - {27740, 3600}, -- Reincarnation (3600sec base / -900sec from talents / -300sec for Totem) + {20484, 600}, -- Rebirth (600sec base / -300sec from 5pc AQ Set) + {20707, 900}, -- Soulstone Resurrection + {27740, 3600}, -- Reincarnation -- Jumper Cables -- {8342, 1800}, -- Goblin Jumper Cables -- {22999, 1800}, -- Goblin Jumper Cables XL -- {54732, 1800}, -- Gnomish Army Knife -- Heroism + {90355, 360}, -- Ancient Hysteria (360sec base / -252sec from talents) + {80353, 300}, -- Time Warp {2825, 300}, -- Bloodlust {32182, 300}, -- Heroism -- Healing - {740, 480}, -- Tranquility r1 (480sec base / -288sec from talents / -240sec from 8pc T1) - {8918, 480}, -- Tranquility r2 (480sec base / -288sec from talents / -240sec from 8pc T1) - {9862, 480}, -- Tranquility r3 (480sec base / -288sec from talents / -240sec from 8pc T1) - {9863, 480}, -- Tranquility r4 (480sec base / -288sec from talents / -240sec from 8pc T1) - {26983, 480}, -- Tranquility r5 (480sec base / -288sec from talents / -240sec from 8pc T1) - {48446, 480}, -- Tranquility r6 (480sec base / -288sec from talents / -240sec from 8pc T1) - {48447, 480}, -- Tranquility r7 (480sec base / -288sec from talents / -240sec from 8pc T1) - {64843, 480}, -- Divine Hymn - {724, 180}, -- Lightwell r1 - {27870, 180}, -- Lightwell r2 - {27871, 180}, -- Lightwell r3 - {28275, 180}, -- Lightwell r4 - {48086, 180}, -- Lightwell r5 - {48087, 180}, -- Lightwell r6 + {740, 480}, -- Tranquility (480sec base / -300sec from talents / -240sec from 8pc T1) + {64843, 480}, -- Divine Hymn (480sec base / -300sec from talents) + {724, 180}, -- Lightwell -- Defense {48707, 45}, -- Anti-Magic Shell - {51052, 180}, -- Anti-Magic Zone + {51052, 120}, -- Anti-Magic Zone {42650, 600}, -- Army of the Dead - {49222, 60}, -- Bone Shield (60sec base / -10sec from 4pc T9) + {49222, 60}, -- Bone Shield {48792, 120}, -- Icebound Fortitude + {22812, 60}, -- Barkskin (60sec base / -12sec from 4pc T9) {61336, 180}, -- Survival Instincts + {31850, 180}, -- Ardent Defender {31821, 120}, -- Aura Mastery {64205, 120}, -- Divine Sacrifice - {1022, 300}, -- Hand of Protection r1 (300sec base / -120sec from talents) - {5599, 300}, -- Hand of Protection r2 (300sec base / -120sec from talents) - {10278, 300}, -- Hand of Protection r3 (300sec base / -120sec from talents) - {6940, 120}, -- Hand of Sacrifice - {633, 1200}, -- Lay on Hands r1 (1200sec base / -240sec from talents / -300sec from glyph / -240sec from 4pc T3) - {2800, 1200}, -- Lay on Hands r2 (1200sec base / -240sec from talents / -300sec from glyph / -240sec from 4pc T3) - {10310, 1200}, -- Lay on Hands r3 (1200sec base / -240sec from talents / -300sec from glyph / -240sec from 4pc T3) - {27154, 1200}, -- Lay on Hands r4 (1200sec base / -240sec from talents / -300sec from glyph / -240sec from 4pc T3) - {48788, 1200}, -- Lay on Hands r5 (1200sec base / -240sec from talents / -300sec from glyph / -240sec from 4pc T3) + {498, 60}, -- Divine Protection (60sec base / -30sec from talents / -30sec from 4pc T9) + {86659, 300}, -- Guardian of Ancient Kings (300sec base / -120sec from talents) + {1022, 300}, -- Hand of Protection (300sec base / -120sec from talents) + {6940, 120}, -- Hand of Sacrifice (120sec base / -30sec from talents / -24sec from talents) + {633, 600}, -- Lay on Hands (600sec base / -180sec from glyph / -240sec from 4pc T3) {47788, 180}, -- Guardian Spirit - {33206, 180}, -- Pain Suppression (180sec base / -36sec from talents) - {12975, 180}, -- Last Stand (180sec base / -60sec from glyph) + {33206, 180}, -- Pain Suppression + {62618, 180}, -- Power Word: Barrier + {98008, 180}, -- Spirit Link Totem + {12975, 180}, -- Last Stand + {97462, 180}, -- Rallying Cry {2565, 60}, -- Shield Block (60sec base / -20sec from talents / -10sec from 4pc T9) - {871, 300}, -- Shield Wall (300sec base / -60sec from talents / -120sec from glyph) + {871, 300}, -- Shield Wall (300sec base / -180sec from talents) -- Taunts {5209, 180}, -- Challenging Roar (180sec base / -30sec from glyph) {1161, 180}, -- Challenging Shout - {694, 120}, -- Mocking Blow r1 - {7400, 120}, -- Mocking Blow r2 - {7402, 120}, -- Mocking Blow r3 - {20559, 120}, -- Mocking Blow r4 - {20560, 120}, -- Mocking Blow r5 - {25266, 120}, -- Mocking Blow r6 - {47504, 120}, -- Mocking Blow r7 -- Mana Regeneration {29166, 180}, -- Innervate (180sec base / -48sec from 4pc T4) {64901, 360}, -- Hymn of Hope - {16190, 300}, -- Mana Tide Totem + {16190, 180}, -- Mana Tide Totem -- Other {49016, 180}, -- Hysteria / Unholy Frenzy {34477, 30}, -- Misdirection - {1038, 120}, -- Hand of Salvation - {6346, 180}, -- Fear Ward (180sec base / -60sec from glyph) - {10060, 120}, -- Power Infusion (120sec base / -24sec from talents) + {1038, 120}, -- Hand of Salvation (120sec base / -24sec from talents) + {6346, 120}, -- Fear Ward (180sec base / -60sec from glyph) + {10060, 120}, -- Power Infusion {57934, 30}, -- Tricks of the Trade (30sec base / -10sec from talents) - -- {29858, 180}, -- Soulshatter + -- {29858, 120}, -- Soulshatter } if #C.raidcooldown.spells_list > 0 then @@ -108,14 +81,16 @@ end if C.enemycooldown.enable == true then T.enemy_spells = { -- Interrupts and Silences - {47476, 100}, -- Strangulate (120sec base / -20sec from glyph) + {47476, 60}, -- Strangulate (120sec base / -60sec from talents) + {80965, 10}, -- Skull Bash (60sec base / -50sec from talents) + {78675, 60}, -- Solar Beam {34490, 20}, -- Silencing Shot {2139, 24}, -- Counterspell (24sec base / -2sec from ZG neck) - {63529, 30}, -- Silenced - Shield of the Templar + {96231, 10}, -- Rebuke {15487, 45}, -- Silence - {1766, 10}, -- Kick (10sec base / -0.5sec from ZG neck) - {57994, 5}, -- Wind Shear (6sec base / -1sec from talents) - {19244, 24}, -- Spell Lock (Felhunter) + {1766, 8}, -- Kick (10sec base / -2sec from glyph / -0.5sec from ZG neck) + {57994, 5}, -- Wind Shear (15sec base / -10sec from talents) + {19647, 24}, -- Spell Lock (Felhunter) {6552, 10}, -- Pummel -- Crowd Controls {60192, 22}, -- Freezing Arrow (30sec base / -6sec from talents / -4sec from 2pc D3 / -2sec from 4pc PvP) @@ -123,62 +98,66 @@ if C.enemycooldown.enable == true then {19503, 30}, -- Scatter Shot {19386, 54}, -- Wyvern Sting (60sec base / -6sec from glyph) {31661, 20}, -- Dragon's Breath - {11113, 30}, -- Blast Wave (30sec base / -4sec from 4pc T4) - {853, 40}, -- Hammer of Justice (60sec base / -20sec from talents / -10sec from talents / -0.5sec from ZG neck) + {11113, 15}, -- Blast Wave (30sec base / -4sec from 4pc T4) + {853, 40}, -- Hammer of Justice (60sec base / -20sec from talents) {20066, 60}, -- Repentance - {6789, 120}, -- Death Coil (120sec base / -18sec from 5pc ZG Set) - {64044, 120}, -- Psychic Horror - {8122, 23}, -- Psychic Scream (30sec base / -3sec from gloves / -4sec from talents / +8sec from glyph) - {2094, 90}, -- Blind (180sec base / -90sec from talents) + {6789, 120}, -- Death Coil (120sec base / -30sec from 4pc PvP) + {64044, 90}, -- Psychic Horror (120sec base / -30sec from glyph) + {8122, 23}, -- Psychic Scream (30sec base / -3sec from gloves / -4sec from talents / +3sec from glyph) + {2094, 120}, -- Blind (180sec base / -60sec from talents) {5484, 32}, -- Howl of Terror (40sec base / -8sec from glyph) {30283, 20}, -- Shadowfury {12809, 30}, -- Concussion Blow {46968, 17}, -- Shockwave (20sec base / -3sec from glyph) + {85388, 45}, -- Throwdown -- Defense abilities {48707, 45}, -- Anti-Magic Shell - {51052, 180}, -- Anti-Magic Zone - {49222, 60}, -- Bone Shield (60sec base / -10sec from 4pc T9) + {51052, 120}, -- Anti-Magic Zone + {49222, 60}, -- Bone Shield {48792, 120}, -- Icebound Fortitude - {51271, 60}, -- Unbreakable Armor (60sec base / -10sec from 4pc T9) + {51271, 60}, -- Pillar of Frost (60sec base / -10sec from 4pc T9) {55233, 60}, -- Vampiric Blood (60sec base / -10sec from 4pc T9) {22812, 60}, -- Barkskin (60sec base / -12sec from 4pc T9) - {19263, 50}, -- Deterrence (60sec base / -10sec from glyph) + {61336, 180}, -- Survival Instincts + {19263, 120}, -- Deterrence (120sec base / -10sec from glyph) {45438, 240}, -- Ice Block (300sec base / -60sec from talents / -40sec from 4pc T4) - {66, 60}, -- Invisibility (180sec base / -120sec from talents) - {1044, 25}, -- Hand of Freedom (25sec base / -4sec from talents) - {6940, 120}, -- Hand of Sacrifice - {1038, 120}, -- Hand of Salvation + {66, 135}, -- Invisibility (180sec base / -45sec from talents) + {31850, 180}, -- Ardent Defender + {1044, 20}, -- Hand of Freedom (25sec base / -5sec from talents) + {6940, 90}, -- Hand of Sacrifice (120sec base / -30sec from talents / -24sec from talents) + {1038, 96}, -- Hand of Salvation (120sec base / -24sec from talents) {1022, 180}, -- Hand of Protection (300sec base / -120sec from talents) - {498, 180}, -- Divine Protection (180sec base / -60sec from talents / -30sec from 4pc T9) - {642, 300}, -- Divine Shield (300sec base / -60sec from talents) + {498, 30}, -- Divine Protection (60sec base / -30sec from talents / -30sec from 4pc T9) + {86659, 300}, -- Guardian of Ancient Kings (300sec base / -120sec from talents) + {642, 300}, -- Divine Shield {6346, 120}, -- Fear Ward (180sec base / -60sec from glyph) {47585, 75}, -- Dispersion (120sec base / -45sec from glyph) - {47788, 144}, -- Guardian Spirit - {33206, 144}, -- Pain Suppression (180sec base / -36sec from talents) - {31224, 30}, -- Cloak of Shadows (60sec base / -30sec from talents) - {5277, 120}, -- Evasion (180sec base / -60sec from talents / -60sec from 3pc AQ Set) + {47788, 180}, -- Guardian Spirit + {33206, 180}, -- Pain Suppression + {62618, 180}, -- Power Word: Barrier + {31224, 90}, -- Cloak of Shadows (120sec base / -30sec from talents) + {5277, 180}, -- Evasion (180sec base / -60sec from 3pc AQ Set) {1856, 120}, -- Vanish (180sec base / -60sec from talents / -30sec from 3pc T1) - -- {8178, 11}, -- Grounding Totem Effect (15sec base / -2sec from talents / -1.5sec from 4pc PvP) - {18499, 20}, -- Berserker Rage (30sec base / -10sec from talents) - {46924, 45}, -- Bladestorm (60sec base / -15sec from glyph) - {12975, 120}, -- Last Stand (180sec base / -60sec from glyph) + -- {8178, 22}, -- Grounding Totem Effect (25sec base / -2sec from talents / -3sec from 4pc PvP) + {18499, 24}, -- Berserker Rage (30sec base / -6sec from talents) + {46924, 75}, -- Bladestorm (90sec base / -15sec from glyph) + {12975, 180}, -- Last Stand {2565, 40}, -- Shield Block (60sec base / -20sec from talents / -10sec from 4pc T9) - {871, 180}, -- Shield Wall (300sec base / -60sec from talents / -120sec from glyph) - -- {23920, 9}, -- Spell Reflection (10sec base / -1sec from glyph) + {871, 120}, -- Shield Wall (300sec base / -180sec from talents) + -- {23920, 20}, -- Spell Reflection (25sec base / -5sec from glyph) {59752, 120}, -- Every Man for Himself / Will to Survive {65116, 120}, -- Stoneform {7744, 120}, -- Will of the Forsaken -- Heals -- {28880, 180}, -- Gift of the Naaru -- Disarms - {53359, 60}, -- Chimera Shot - Scorpid {64346, 60}, -- Fiery Payback {51722, 60}, -- Dismantle - {676, 40}, -- Disarm (60sec base / -20sec from talents) + {676, 60}, -- Disarm -- Mana Regeneration {29166, 180}, -- Innervate (180sec base / -48sec from 4pc T4) {64901, 360}, -- Hymn of Hope - {16190, 300}, -- Mana Tide Totem + {16190, 180}, -- Mana Tide Totem -- Trinket (TEMPORARY) {42292, 120}, -- PvP Trinket {65547, 120}, -- PvP Trinket diff --git a/ShestakUI/Config/Filters_Cata/Diminishing.lua b/ShestakUI/Config/Filters_Cata/Diminishing.lua index 1bbda6ab7..c0846314e 100644 --- a/ShestakUI/Config/Filters_Cata/Diminishing.lua +++ b/ShestakUI/Config/Filters_Cata/Diminishing.lua @@ -9,38 +9,25 @@ if C.unitframe.enable ~= true or C.unitframe.show_arena ~= true or C.unitframe.p T.DiminishingSpells = { -- Stuns [47481] = {"stun"}, -- Gnaw (Ghoul) - [5211] = {"stun"}, -- Bash r1 - [6798] = {"stun"}, -- Bash r2 - [8983] = {"stun"}, -- Bash r3 - [9005] = {"stun"}, -- Pounce r1 - [9823] = {"stun"}, -- Pounce r2 - [9827] = {"stun"}, -- Pounce r3 - [27006] = {"stun"}, -- Pounce r4 - [49803] = {"stun"}, -- Pounce r5 + [5211] = {"stun"}, -- Bash + [9005] = {"stun"}, -- Pounce [24394] = {"stun"}, -- Intimidation [44572] = {"stun"}, -- Deep Freeze - [853] = {"stun"}, -- Hammer of Justice r1 - [5588] = {"stun"}, -- Hammer of Justice r2 - [5589] = {"stun"}, -- Hammer of Justice r3 - [10308] = {"stun"}, -- Hammer of Justice r4 + [853] = {"stun"}, -- Hammer of Justice [1833] = {"stun"}, -- Cheap Shot [58861] = {"stun"}, -- Bash (Spirit Wolf) - [60995] = {"stun"}, -- Demon Charge (Metamorphosis) + [93975] = {"stun"}, -- Aura of Foreboding r1 + [93986] = {"stun"}, -- Aura of Foreboding r2 + [60995] = {"stun"}, -- Demon Leap (Metamorphosis) [22703] = {"stun"}, -- Inferno Effect [30153] = {"stun"}, -- Intercept (Felguard) - [30283] = {"stun"}, -- Shadowfury r1 - [30413] = {"stun"}, -- Shadowfury r2 - [30414] = {"stun"}, -- Shadowfury r3 - [47846] = {"stun"}, -- Shadowfury r4 - [47847] = {"stun"}, -- Shadowfury r5 + [30283] = {"stun"}, -- Shadowfury [7922] = {"stun"}, -- Charge Stun + [96273] = {"stun"}, -- Charge Stun [12809] = {"stun"}, -- Concussion Blow - [20253] = {"stun"}, -- Intercept r1 - [20614] = {"stun"}, -- Intercept r2 - [20615] = {"stun"}, -- Intercept r3 - [25273] = {"stun"}, -- Intercept r4 - [25274] = {"stun"}, -- Intercept r5 + [20253] = {"stun"}, -- Intercept [46968] = {"stun"}, -- Shockwave + [85388] = {"stun"}, -- Throwdown [20549] = {"stun"}, -- War Stomp (Racial) [835] = {"stun"}, -- Tidal Charm [4064] = {"stun"}, -- Rough Copper Bomb @@ -65,9 +52,8 @@ T.DiminishingSpells = { --[[ -- Stun Procs - [16922] = {"stunproc"}, -- Celestial Focus [12355] = {"stunproc"}, -- Impact - [20170] = {"stunproc"}, -- Seal of Justice + [77505] = {"stunproc"}, -- Earthquake [39796] = {"stunproc"}, -- Stoneclaw Totem [56] = {"stunproc"}, -- Stun (The Chief's Enforcer / Bludgeon of the Grinning Dog / The Judge's Gavel / Hammer of the Titans) [15283] = {"stunproc"}, -- Stunning Blow (Dark Iron Pulverizer) @@ -77,10 +63,7 @@ T.DiminishingSpells = { -- Disorients [49203] = {"disorient"}, -- Hungering Cold [22570] = {"disorient"}, -- Maim - [118] = {"disorient"}, -- Polymorph r1 - [12824] = {"disorient"}, -- Polymorph r2 - [12825] = {"disorient"}, -- Polymorph r3 - [12826] = {"disorient"}, -- Polymorph r4 + [118] = {"disorient"}, -- Polymorph [61305] = {"disorient"}, -- Polymorph: Black Cat [28272] = {"disorient"}, -- Polymorph: Pig [61721] = {"disorient"}, -- Polymorph: Rabbit @@ -88,30 +71,17 @@ T.DiminishingSpells = { [61780] = {"disorient"}, -- Polymorph: Turkey [28271] = {"disorient"}, -- Polymorph: Turtle [59634] = {"disorient"}, -- Polymorph - Penguin - [1776] = {"disorient"}, -- Gouge r1 - [1777] = {"disorient"}, -- Gouge r2 - [8629] = {"disorient"}, -- Gouge r3 - [11285] = {"disorient"}, -- Gouge r4 - [11286] = {"disorient"}, -- Gouge r5 - [38764] = {"disorient"}, -- Gouge r6 - [6770] = {"disorient"}, -- Sap r1 - [2070] = {"disorient"}, -- Sap r2 - [11297] = {"disorient"}, -- Sap r3 - [51724] = {"disorient"}, -- Sap r4 + [88625] = {"disorient"}, -- Holy Word: Chastise + [1776] = {"disorient"}, -- Gouge + [6770] = {"disorient"}, -- Sap + [76780] = {"disorient"}, -- Bind Elemental [51514] = {"disorient"}, -- Hex [13327] = {"disorient"}, -- Reckless Charge (Horned Viking Helmet / Goblin Rocket Helmet) [26108] = {"disorient"}, -- Glimpse of Madness (Dark Edge of Insanity) -- Sleeps - [2637] = {"sleep"}, -- Hibernate r1 - [18657] = {"sleep"}, -- Hibernate r2 - [18658] = {"sleep"}, -- Hibernate r3 - [19386] = {"sleep"}, -- Wyvern Sting r1 - [24132] = {"sleep"}, -- Wyvern Sting r2 - [24133] = {"sleep"}, -- Wyvern Sting r3 - [27068] = {"sleep"}, -- Wyvern Sting r4 - [49011] = {"sleep"}, -- Wyvern Sting r5 - [49012] = {"sleep"}, -- Wyvern Sting r6 + [2637] = {"sleep"}, -- Hibernate + [19386] = {"sleep"}, -- Wyvern Sting -- Charms [605] = {"charm"}, -- Mind Control @@ -119,30 +89,18 @@ T.DiminishingSpells = { [13181] = {"charm"}, -- Gnomish Thinking Cap / Mind Amplification Dish -- Fears - [1513] = {"fear"}, -- Scare Beast r1 - [14326] = {"fear"}, -- Scare Beast r2 - [14327] = {"fear"}, -- Scare Beast r3 - [8122] = {"fear"}, -- Psychic Scream r1 - [8124] = {"fear"}, -- Psychic Scream r2 - [10888] = {"fear"}, -- Psychic Scream r3 - [10890] = {"fear"}, -- Psychic Scream r4 - [5782] = {"fear"}, -- Fear r1 - [6213] = {"fear"}, -- Fear r2 - [6215] = {"fear"}, -- Fear r3 - [5484] = {"fear"}, -- Howl of Terror r1 - [17928] = {"fear"}, -- Howl of Terror r2 + [1513] = {"fear"}, -- Scare Beast + [8122] = {"fear"}, -- Psychic Scream + [87204] = {"fear"}, -- Sin and Punishment + [5782] = {"fear"}, -- Fear + [5484] = {"fear"}, -- Howl of Terror [6358] = {"fear"}, -- Seduction (Succubus) [5246] = {"fear"}, -- Intimidating Shout [5134] = {"fear"}, -- Flash Bomb (Flash Bomb) -- Horrors [64044] = {"horror"}, -- Psychic Horror - [6789] = {"horror"}, -- Death Coil r1 - [17925] = {"horror"}, -- Death Coil r2 - [17926] = {"horror"}, -- Death Coil r3 - [27223] = {"horror"}, -- Death Coil r4 - [47859] = {"horror"}, -- Death Coil r5 - [47860] = {"horror"}, -- Death Coil r6 + [6789] = {"horror"}, -- Death Coil -- Unstable Affliction [43523] = {"ua"}, -- Unstable Affliction (Silence) @@ -151,37 +109,20 @@ T.DiminishingSpells = { -- Roots [53534] = {"root"}, -- Chains of Ice -- [45334] = {"root"}, -- Feral Charge Effect - [339] = {"root"}, -- Entangling Roots r1 - [1062] = {"root"}, -- Entangling Roots r2 - [5195] = {"root"}, -- Entangling Roots r3 - [5196] = {"root"}, -- Entangling Roots r4 - [9852] = {"root"}, -- Entangling Roots r5 - [9853] = {"root"}, -- Entangling Roots r6 - [26989] = {"root"}, -- Entangling Roots r7 - [53308] = {"root"}, -- Entangling Roots r8 - [19975] = {"root"}, -- Entangling Roots r1 (Nature's Grasp) - [19974] = {"root"}, -- Entangling Roots r2 (Nature's Grasp) - [19973] = {"root"}, -- Entangling Roots r3 (Nature's Grasp) - [19972] = {"root"}, -- Entangling Roots r4 (Nature's Grasp) - [19971] = {"root"}, -- Entangling Roots r5 (Nature's Grasp) - [19970] = {"root"}, -- Entangling Roots r6 (Nature's Grasp) - [27010] = {"root"}, -- Entangling Roots r7 (Nature's Grasp) - [53313] = {"root"}, -- Entangling Roots r8 (Nature's Grasp) - [19306] = {"root"}, -- Counterattack r1 - [19306] = {"root"}, -- Counterattack r2 - [20909] = {"root"}, -- Counterattack r3 - [20910] = {"root"}, -- Counterattack r4 - [48998] = {"root"}, -- Counterattack r5 - [48999] = {"root"}, -- Counterattack r6 + [339] = {"root"}, -- Entangling Roots + [19975] = {"root"}, -- Entangling Roots (Nature's Grasp) + [19306] = {"root"}, -- Counterattack [19185] = {"root"}, -- Entrapment [33395] = {"root"}, -- Freeze (Water Elemental) - [122] = {"root"}, -- Frost Nova r1 - [865] = {"root"}, -- Frost Nova r2 - [6131] = {"root"}, -- Frost Nova r3 - [10230] = {"root"}, -- Frost Nova r4 - [27088] = {"root"}, -- Frost Nova r5 - [42917] = {"root"}, -- Frost Nova r6 - -- [12494] = {"root"}, -- Frostbite + [122] = {"root"}, -- Frost Nova + [82691] = {"root"}, -- Ring of Frost + [55080] = {"root"}, -- Shattered Barrier r1 + [83073] = {"root"}, -- Shattered Barrier r2 + [87193] = {"root"}, -- Paralysis r1 + [87194] = {"root"}, -- Paralysis r2 + [93974] = {"root"}, -- Aura of Foreboding r1 + [93987] = {"root"}, -- Aura of Foreboding r2 + [53019] = {"root"}, -- Earth's Grasp -- [58373] = {"root"}, -- Glyph of Hamstring -- [23694] = {"root"}, -- Improved Hamstring -- [27868] = {"root"}, -- Freeze (Magister's Regalia / Sorcerer's Regalia / Deadman's Hand) @@ -189,7 +130,6 @@ T.DiminishingSpells = { --[[ -- Disarms - [53359] = {"disarm"}, -- Chimera Shot - Scorpid [64346] = {"disarm"}, -- Fiery Payback [64058] = {"disarm"}, -- Psychic Horror [51722] = {"disarm"}, -- Dismantle @@ -199,14 +139,16 @@ T.DiminishingSpells = { --[[ -- Silences [47476] = {"silence"}, -- Strangulate + [80964] = {"silence"}, -- Skull Bash (Bear) + [80965] = {"silence"}, -- Skull Bash (Cat) [34490] = {"silence"}, -- Silencing Shot [18469] = {"silence"}, -- Silenced - Improved Counterspell - [63529] = {"silence"}, -- Silenced - Shield of the Templar + [31935] = {"silence"}, -- Avenger's Shield [15487] = {"silence"}, -- Silence [1330] = {"silence"}, -- Garrote - Silence - [18425] = {"silence"}, -- Silenced - Improved Kick [24259] = {"silence"}, -- Spell Lock (Felhunter) [18498] = {"silence"}, -- Silenced - Gag Order + [18425] = {"silence"}, -- Silenced - Improved Kick [28730] = {"silence"}, -- Arcane Torrent (Mana) [25046] = {"silence"}, -- Arcane Torrent (Energy) [50613] = {"silence"}, -- Arcane Torrent (Runic Power) @@ -219,21 +161,13 @@ T.DiminishingSpells = { [2094] = {"cycloneblind"}, -- Blind -- Freezing Trap - [60210] = {"freezingtrap"}, -- Freezing Arrow Effect - [3355] = {"freezingtrap"}, -- Freezing Trap r1 - [14308] = {"freezingtrap"}, -- Freezing Trap r2 - [14309] = {"freezingtrap"}, -- Freezing Trap r3 + [3355] = {"freezingtrap"}, -- Freezing Trap -- Scatter Shot [19503] = {"scattershot"}, -- Scatter Shot -- Dragon's Breath - [31661] = {"dragonsbreath"}, -- Dragon's Breath r1 - [33041] = {"dragonsbreath"}, -- Dragon's Breath r2 - [33042] = {"dragonsbreath"}, -- Dragon's Breath r3 - [33043] = {"dragonsbreath"}, -- Dragon's Breath r4 - [42949] = {"dragonsbreath"}, -- Dragon's Breath r5 - [42950] = {"dragonsbreath"}, -- Dragon's Breath r6 + [31661] = {"dragonsbreath"}, -- Dragon's Breath -- Repentance [20066] = {"repentance"}, -- Repentance @@ -245,23 +179,15 @@ T.DiminishingSpells = { --[[ -- Shackle Undead - [9484] = {"shackle"}, -- Shackle Undead r1 - [9485] = {"shackle"}, -- Shackle Undead r2 - [10955] = {"shackle"}, -- Shackle Undead r3 + [9484] = {"shackle"}, -- Shackle Undead --]] -- Kidney Shot - [408] = {"kidneyshot"}, -- Kidney Shot r1 - [8643] = {"kidneyshot"}, -- Kidney Shot r2 + [408] = {"kidneyshot"}, -- Kidney Shot -- Frost Shock - [8056] = {"frostshock"}, -- Frost Shock r1 - [8058] = {"frostshock"}, -- Frost Shock r2 - [10472] = {"frostshock"}, -- Frost Shock r3 - [10473] = {"frostshock"}, -- Frost Shock r4 - [25464] = {"frostshock"}, -- Frost Shock r5 - [49235] = {"frostshock"}, -- Frost Shock r6 - [49236] = {"frostshock"}, -- Frost Shock r7 + [8056] = {"frostshock"}, -- Frost Shock + [73682] = {"frostshock"}, -- Unleash Frost } local function GetIcon(id) diff --git a/ShestakUI/Config/Filters_Cata/FilgerSpells.lua b/ShestakUI/Config/Filters_Cata/FilgerSpells.lua index f4812c916..6bd54a718 100644 --- a/ShestakUI/Config/Filters_Cata/FilgerSpells.lua +++ b/ShestakUI/Config/Filters_Cata/FilgerSpells.lua @@ -141,18 +141,16 @@ C["filger_spells"] = { {spellID = 48707, unitID = "player", caster = "player", filter = "BUFF"}, -- Blood Tap {spellID = 45529, unitID = "player", caster = "player", filter = "BUFF"}, - -- Bloody Vengeance - {spellID = 50447, unitID = "player", caster = "player", filter = "BUFF"}, -- Bone Shield {spellID = 49222, unitID = "player", caster = "player", filter = "BUFF"}, -- Dancing Rune Weapon {spellID = 49028, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deathchill - {spellID = 49796, unitID = "player", caster = "player", filter = "BUFF"}, + -- Dark Simulacrum + {spellID = 77616, unitID = "player", caster = "player", filter = "BUFF"}, + -- Dark Transformation + {spellID = 63560, unitID = "pet", caster = "player", filter = "BUFF"}, -- Desolation {spellID = 63583, unitID = "player", caster = "player", filter = "BUFF"}, - -- Ghoul Frenzy - {spellID = 63560, unitID = "pet", caster = "player", filter = "BUFF"}, -- Icebound Fortitude {spellID = 48792, unitID = "player", caster = "player", filter = "BUFF"}, -- Icy Talons @@ -161,10 +159,14 @@ C["filger_spells"] = { -- {spellID = 55610, unitID = "player", caster = "player", filter = "BUFF"}, -- Lichborne {spellID = 49039, unitID = "player", caster = "player", filter = "BUFF"}, + -- Pillar of Frost + {spellID = 51271, unitID = "player", caster = "player", filter = "BUFF"}, + -- Runic Corruption + {spellID = 51460, unitID = "player", caster = "player", filter = "BUFF"}, + -- Shadow Infusion + {spellID = 91342, unitID = "pet", caster = "player", filter = "BUFF"}, -- Summon Gargoyle {spellID = 61777, unitID = "player", caster = "player", filter = "BUFF"}, - -- Unbreakable Armor - {spellID = 51271, unitID = "player", caster = "player", filter = "BUFF"}, -- Vampiric Blood {spellID = 55233, unitID = "player", caster = "player", filter = "BUFF"}, }, @@ -178,26 +180,16 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs - -- Acclimation (Arcane) - {spellID = 50486, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Acclimation (Fire) - {spellID = 50362, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Acclimation (Frost) - {spellID = 50485, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Acclimation (Nature) - {spellID = 50488, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Acclimation (Shadow) - {spellID = 50489, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Acclimation (Holy) - {spellID = 50490, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Blade Barrier - {spellID = 51789, unitID = "player", caster = "player", filter = "BUFF"}, + -- Blood Shield + {spellID = 77535, unitID = "player", caster = "player", filter = "BUFF"}, -- Freezing Fog (Rime) {spellID = 59052, unitID = "player", caster = "player", filter = "BUFF"}, -- Killing Machine {spellID = 51124, unitID = "player", caster = "player", filter = "BUFF"}, -- Scent of Blood {spellID = 50421, unitID = "player", caster = "player", filter = "BUFF"}, + -- Sudden Doom + {spellID = 81340, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Advantage (Increased Damage, Proc) [Scourgelord's Battlegear] @@ -211,34 +203,6 @@ C["filger_spells"] = { -- Unholy Might (Strength, Proc) [Thassarian's Battlegear / Koltira's Battlegear] {spellID = 67117, unitID = "player", caster = "player", filter = "BUFF"}, - -- Sigils - -- Evasion (Dodge, Rune Strike) [Sigil of Insolence] - {spellID = 67380, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Indomitable (Strength, Obliterate/Scourge Strike/Death Strike) [Sigil of the Hanged Man] - {spellID = 71227, unitID = "player", caster = "player", filter = "BUFF"}, - -- Precognition (Dodge, Rune Strike) [Sigil of the Bone Gryphon] - {spellID = 71229, unitID = "player", caster = "player", filter = "BUFF"}, - -- Shadow of Death (Dodge, Rune Strike) [Sigil of Deflection] - {spellID = 64963, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Sigil of Haunted Dreams (Critical Strike, Blood Strike/Heart Strike) [Sigil of Haunted Dreams] - {spellID = 60828, unitID = "player", caster = "player", filter = "BUFF"}, - -- Unflinching Valor (Defense Rating, Icy Touch) [Sigil of the Unfaltering Knight] - {spellID = 62146, unitID = "player", caster = "player", filter = "BUFF"}, - -- Unholy Force (Strength, Obliterate/Scourge Strike/Death Strike) [Sigil of Virulence] - {spellID = 67383, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Aggression (Attack Power, Plague Strike) [Savage Gladiator's Sigil of Strife] - {spellID = 60544, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Aggression (Attack Power, Plague Strike) [Hateful Gladiator's Sigil of Strife] - {spellID = 60547, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Aggression (Attack Power, Plague Strike) [Deadly Gladiator's Sigil of Strife] - {spellID = 60549, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Libram of Fortitude (Attack Power, Plague Strike) [Furious Gladiator's Sigil of Strife] - {spellID = 60551, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Aggression (Attack Power, Plague Strike) [Relentless Gladiator's Sigil of Strife] - {spellID = 60553, unitID = "player", caster = "player", filter = "BUFF"}, - -- Fury of the Gladiator (Attack Power, Plague Strike) [Wrathful Gladiator's Sigil of Strife] - {spellID = 60555, unitID = "player", caster = "player", filter = "BUFF"}, - -- Trinkets -- Class -- Deflection (Parry, Proc) [Soul Harvester's Charm] @@ -683,8 +647,6 @@ C["filger_spells"] = { -- Blood Plague {spellID = 55078, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Crypt Fever - {spellID = 50508, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Chains of Ice {spellID = 53534, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Dark Command @@ -696,7 +658,7 @@ C["filger_spells"] = { -- Desecration {spellID = 55741, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Ebon Plague - {spellID = 51726, unitID = "target", caster = "all", filter = "DEBUFF"}, + {spellID = 65142, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Frost Fever {spellID = 55095, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Gnaw (Ghoul) @@ -705,8 +667,10 @@ C["filger_spells"] = { {spellID = 49203, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Icy Clutch (Chilblains) {spellID = 50434, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Mark of Blood - {spellID = 49005, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Necrotic Strike + {spellID = 73975, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Scarlet Fever + {spellID = 96265, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Strangulate {spellID = 47476, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Summon Gargoyle @@ -715,8 +679,10 @@ C["filger_spells"] = { {spellID = 50536, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Chilled [Enchant Weapon - Icy Chill] @@ -782,22 +748,20 @@ C["filger_spells"] = { {spellID = 45529, filter = "CD"}, -- Bone Shield {spellID = 49222, filter = "CD"}, - -- Corpse Explosion - {spellID = 49158, filter = "CD"}, -- Dancing Rune Weapon {spellID = 49028, filter = "CD"}, -- Dark Command {spellID = 56222, filter = "CD"}, + -- Dark Simulacrum + {spellID = 77606, filter = "CD"}, + -- Dark Transformation + {spellID = 63560, filter = "CD"}, -- Death and Decay {spellID = 43265, filter = "CD"}, -- Death Grip {spellID = 57602, filter = "CD"}, - -- Deathchill - {spellID = 49796, filter = "CD"}, -- Empower Rune Weapon {spellID = 47568, filter = "CD"}, - -- Ghoul Frenzy - {spellID = 63560, filter = "CD"}, -- Horn of Winter {spellID = 57330, filter = "CD"}, -- Howling Blast @@ -810,8 +774,10 @@ C["filger_spells"] = { {spellID = 48792, filter = "CD"}, -- Lichborne {spellID = 49039, filter = "CD"}, - -- Mark of Blood - {spellID = 49005, filter = "CD"}, + -- Outbreak + {spellID = 77575, filter = "CD"}, + -- Pillar of Frost + {spellID = 51271, filter = "CD"}, -- Raise Ally {spellID = 61999, filter = "CD"}, -- Raise Dead @@ -822,8 +788,6 @@ C["filger_spells"] = { {spellID = 47476, filter = "CD"}, -- Summon Gargoyle {spellID = 49206, filter = "CD"}, - -- Unbreakable Armor - {spellID = 51271, filter = "CD"}, -- Vampiric Blood {spellID = 55233, filter = "CD"}, @@ -849,7 +813,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, @@ -890,28 +854,36 @@ C["filger_spells"] = { {spellID = 5229, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Frenzied Regeneration {spellID = 22842, unitID = "player", caster = "player", filter = "BUFF"}, + -- Lunar Shower + {spellID = 81006, unitID = "player", caster = "player", filter = "BUFF"}, -- Natural Perfection {spellID = 45281, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nature's Bounty + {spellID = 96206, unitID = "player", caster = "player", filter = "BUFF"}, -- Nature's Grace {spellID = 16886, unitID = "player", caster = "player", filter = "BUFF"}, -- Nature's Grasp {spellID = 16689, unitID = "player", caster = "player", filter = "BUFF"}, -- Nature's Swiftness {spellID = 17116, unitID = "player", caster = "player", filter = "BUFF"}, + -- Pulverize + {spellID = 80951, unitID = "player", caster = "player", filter = "BUFF"}, -- Savage Roar {spellID = 52610, unitID = "player", caster = "player", filter = "BUFF"}, - -- Starfall r1 + -- Shooting Stars + {spellID = 93400, unitID = "player", caster = "player", filter = "BUFF"}, + -- Stampeding Roar (Bear) + {spellID = 77761, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Stampeding Roar (Cat) + {spellID = 77764, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Starfall {spellID = 48505, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Starfall r2 - {spellID = 53199, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Starfall r3 - {spellID = 53200, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Starfall r4 - {spellID = 53201, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Survival Instincts {spellID = 61336, unitID = "player", caster = "player", filter = "BUFF"}, -- Tiger's Fury {spellID = 5217, unitID = "player", caster = "player", filter = "BUFF"}, + -- Tree of Life + {spellID = 33891, unitID = "player", caster = "player", filter = "BUFF"}, }, { Name = "P_PROC_ICON", @@ -923,16 +895,22 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs - -- Clearcasting [Omen of Clarity / Nightsong Battlegear] + -- Clearcasting [Omen of Clarity / Malfurion's Gift / Nightsong Battlegear] {spellID = 16870, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Eclipse (Lunar) {spellID = 48518, unitID = "player", caster = "player", filter = "BUFF"}, -- Eclipse (Solar) {spellID = 48517, unitID = "player", caster = "player", filter = "BUFF"}, + -- Fury of Stormrage + {spellID = 81093, unitID = "player", caster = "player", filter = "BUFF"}, -- Owlkin Frenzy {spellID = 48391, unitID = "player", caster = "player", filter = "BUFF"}, -- Predator's Swiftness {spellID = 69369, unitID = "player", caster = "player", filter = "BUFF"}, + -- Savage Defense + {spellID = 62606, unitID = "player", caster = "player", filter = "BUFF"}, + -- Stampede + {spellID = 81016, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Elune's Wrath (Special, Proc) [Nightsong Garb] @@ -952,62 +930,6 @@ C["filger_spells"] = { -- Wrath of Elune (Special, Proc) [Wyrmhide Battlegear / Gladiator's Wildhide] {spellID = 46833, unitID = "player", caster = "player", filter = "BUFF"}, - -- Idols - -- Agile (Agility, Mangle/Shred) [Idol of Mutilation] - {spellID = 67355, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Agile (Agility, Lacerate/Rake) [Idol of the Crying Moon] - {spellID = 71175, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Blessing of the Moon Goddess (Critical Strike, Proc) [Idol of Lunar Fury] - {spellID = 67360, unitID = "player", caster = "player", filter = "BUFF"}, - -- Evasion (Dodge, Lacerate/Swipe) [Idol of Mutilation] - {spellID = 67354, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lunar Grace (Spell Power, Proc) [Idol of the Unseen Moon] - {spellID = 43740, unitID = "player", caster = "player", filter = "BUFF"}, - -- Mark of the White Stag (Attack Power, Mangle) [Idol of the White Stag] - {spellID = 41038, unitID = "player", caster = "player", filter = "BUFF"}, - -- Primal Fury (Agility, Mangle) [Idol of the Plainstalker] - {spellID = 48834, unitID = "player", caster = "player", filter = "BUFF"}, - -- Primal Instinct (Agility, Mangle) [Idol of Terror] - {spellID = 43738, unitID = "player", caster = "player", filter = "BUFF"}, - -- Primal Wrath (Agility, Mangle) [Idol of the Corruptor] - {spellID = 64951, unitID = "player", caster = "player", filter = "BUFF"}, - -- Rejuvenating (Spell Power, Proc) [Idol of Flaring Growth] - {spellID = 67358, unitID = "player", caster = "player", filter = "BUFF"}, - -- Resilient (Resilience, Moonfire/Mangle) [Idol of Resolve / Idol of Steadfastness] - {spellID = 43839, unitID = "player", caster = "player", filter = "BUFF"}, - -- Snap and Snarl (Strength, Shred/Swipe) [Idol of the Wastes] - {spellID = 52021, unitID = "player", caster = "player", filter = "BUFF"}, - -- Soothing (Spell Power, Rejuvenation) [Idol of the Black Willow] - {spellID = 71184, unitID = "player", caster = "player", filter = "BUFF"}, - -- Venture Might (Spirit, Moonfire) [Idol of Arcane Terror] - {spellID = 57909, unitID = "player", caster = "player", filter = "BUFF"}, - -- Vicious (Critical Strike, Proc) [Idol of the Lunar Eclipse] - {spellID = 71177, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Aggression (Attack Power, Mangle) [Savage Gladiator's Idol of Resolve] - {spellID = 60544, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Magic (Spell Power, Moonfire) [Savage Gladiator's Idol of Steadfastness] - {spellID = 60565, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Aggression (Attack Power, Mangle) [Hateful Gladiator's Idol of Resolve] - {spellID = 60547, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Magic (Spell Power, Moonfire) [Hateful Gladiator's Idol of Steadfastness] - {spellID = 60566, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Aggression (Attack Power, Mangle) [Deadly Gladiator's Idol of Resolve] - {spellID = 60549, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Magic (Spell Power, Moonfire) [Deadly Gladiator's Idol of Steadfastness] - {spellID = 60567, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Libram of Fortitude (Attack Power, Mangle) [Furious Gladiator's Idol of Resolve] - {spellID = 60551, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Idol of Steadfastness (Spell Power, Moonfire) [Furious Gladiator's Idol of Steadfastness] - {spellID = 60568, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Aggression (Attack Power, Mangle) [Relentless Gladiator's Idol of Resolve] - {spellID = 60553, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Survival (Spell Power, Moonfire) [Relentless Gladiator's Idol of Steadfastness] - {spellID = 60569, unitID = "player", caster = "player", filter = "BUFF"}, - -- Fury of the Gladiator (Attack Power, Mangle) [Wrathful Gladiator's Idol of Resolve] - {spellID = 60555, unitID = "player", caster = "player", filter = "BUFF"}, - -- Intuition of the Gladiator (Spell Power, Moonfire) [Wrathful Gladiator's Idol of Steadfastness] - {spellID = 60570, unitID = "player", caster = "player", filter = "BUFF"}, - -- Trinkets -- Class -- Blessing of Cenarius (Strength, Proc) [Ashtongue Talisman of Equilibrium - Mangle] @@ -1714,20 +1636,14 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", T_DEBUFF_ICON_Anchor}, - -- Bash r1 + -- Bash {spellID = 5211, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Bash r2 - {spellID = 6798, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Bash r3 - {spellID = 8983, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Celestial Focus (Starfire Stun) - {spellID = 16922, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Challenging Roar {spellID = 5209, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Demoralizing Roar {spellID = 99, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Earth and Moon - {spellID = 60431, unitID = "target", caster = "all", filter = "DEBUFF"}, + {spellID = 60433, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Faerie Fire {spellID = 770, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Faerie Fire (Feral) @@ -1736,8 +1652,8 @@ C["filger_spells"] = { {spellID = 45334, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Feral Charge - Cat / Dazed {spellID = 50259, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Glyph of Rake - {spellID = 54820, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Fungal Growth + -- {spellID = 81288, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Growl {spellID = 6795, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hurricane @@ -1758,30 +1674,36 @@ C["filger_spells"] = { {spellID = 33876, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Moonfire {spellID = 8921, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Pounce r1 + -- Pounce {spellID = 9005, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Pounce r2 - {spellID = 9823, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Pounce r3 - {spellID = 9827, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Pounce r4 - {spellID = 27006, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Pounce r5 - {spellID = 49803, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Pounce Bleed {spellID = 9007, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Rake {spellID = 1822, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Rip {spellID = 1079, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Skull Bash (Bear) + {spellID = 80964, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Skull Bash (Cat) + {spellID = 80965, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Skull Bash (Increased Mana Cost) + -- {spellID = 82364, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Solar Beam + {spellID = 78675, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Soothe Animal {spellID = 2908, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Sunfire + {spellID = 93402, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Thrash + {spellID = 77758, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Typhoon {spellID = 61391, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Deathfrost [Enchant Weapon - Deathfrost] @@ -1798,8 +1720,6 @@ C["filger_spells"] = { BarWidth = 186, Position = {"LEFT", T_DE_BUFF_BAR_Anchor}, - -- Abolish Poison - {spellID = 2893, unitID = "target", caster = "player", filter = "BUFF"}, -- Lifebloom {spellID = 33763, unitID = "target", caster = "player", filter = "BUFF"}, -- Living Seed @@ -1846,38 +1766,10 @@ C["filger_spells"] = { -- Cyclone {spellID = 33786, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r1 + -- Entangling Roots {spellID = 339, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r2 - {spellID = 1062, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r3 - {spellID = 5195, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r4 - {spellID = 5196, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r5 - {spellID = 9852, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r6 - {spellID = 9853, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r7 - {spellID = 26989, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r8 - {spellID = 53308, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r1 (Nature's Grasp) + -- Entangling Roots (Nature's Grasp) {spellID = 19975, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r2 (Nature's Grasp) - {spellID = 19974, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r3 (Nature's Grasp) - {spellID = 19973, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r4 (Nature's Grasp) - {spellID = 19972, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r5 (Nature's Grasp) - {spellID = 19971, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r6 (Nature's Grasp) - {spellID = 19970, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r7 (Nature's Grasp) - {spellID = 27010, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r8 (Nature's Grasp) - {spellID = 53313, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, -- Hibernate {spellID = 2637, unitID = "focus", caster = "all", filter = "DEBUFF"}, }, @@ -1907,10 +1799,10 @@ C["filger_spells"] = { {spellID = 5229, filter = "CD", absID = true}, -- Faerie Fire (Feral) {spellID = 16857, filter = "CD"}, - -- Feral Charge - Bear - {spellID = 16979, filter = "CD"}, - -- Feral Charge - Cat - {spellID = 49376, filter = "CD"}, + -- Feral Charge (Bear) + {spellID = 16979, filter = "CD", absID = true}, + -- Feral Charge (Cat) + {spellID = 49376, filter = "CD", absID = true}, -- Force of Nature {spellID = 33831, filter = "CD"}, -- Frenzied Regeneration @@ -1933,26 +1825,44 @@ C["filger_spells"] = { {spellID = 5215, filter = "CD"}, -- Rebirth {spellID = 20484, filter = "CD"}, + -- Skull Bash (Bear) + {spellID = 80964, filter = "CD", absID = true}, + -- Skull Bash (Cat) + {spellID = 80965, filter = "CD", absID = true}, + -- Solar Beam + {spellID = 78675, filter = "CD"}, + -- Stampeding Roar (Bear) + {spellID = 77761, filter = "CD", absID = true}, + -- Stampeding Roar (Cat) + {spellID = 77764, filter = "CD", absID = true}, -- Starfall {spellID = 48505, filter = "CD"}, + -- Starsurge + {spellID = 78674, filter = "CD"}, -- Survival Instincts {spellID = 61336, filter = "CD"}, -- Swiftmend {spellID = 18562, filter = "CD"}, + -- Thrash + {spellID = 77758, filter = "CD"}, -- Tiger's Fury {spellID = 5217, filter = "CD"}, -- Tranquility {spellID = 740, filter = "CD"}, + -- Tree of Life + {spellID = 33891, filter = "CD"}, -- Typhoon {spellID = 50516, filter = "CD"}, -- Wild Growth {spellID = 48438, filter = "CD"}, + -- Wild Mushroom: Detonate + {spellID = 88751, filter = "CD"}, -- Racial -- Shadowmeld (Night Elf) {spellID = 58984, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -1981,24 +1891,20 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", P_BUFF_ICON_Anchor}, - -- Aspect of the Beast - -- {spellID = 13161, unitID = "player", caster = "player", filter = "BUFF"}, -- Aspect of the Cheetah {spellID = 5118, unitID = "player", caster = "player", filter = "BUFF"}, - -- Aspect of the Dragonhawk - -- {spellID = 61846, unitID = "player", caster = "player", filter = "BUFF"}, + -- Aspect of the Fox + -- {spellID = 82661, unitID = "player", caster = "player", filter = "BUFF"}, -- Aspect of the Hawk -- {spellID = 13165, unitID = "player", caster = "player", filter = "BUFF"}, - -- Aspect of the Monkey - -- {spellID = 13163, unitID = "player", caster = "player", filter = "BUFF"}, -- Aspect of the Pack {spellID = 13159, unitID = "player", caster = "player", filter = "BUFF"}, - -- Aspect of the Viper - {spellID = 34074, unitID = "player", caster = "player", filter = "BUFF"}, -- Aspect of the Wild -- {spellID = 20043, unitID = "player", caster = "player", filter = "BUFF"}, -- Bestial Wrath {spellID = 19574, unitID = "pet", caster = "player", filter = "BUFF"}, + -- Camouflage + -- {spellID = 51755, unitID = "player", caster = "player", filter = "BUFF"}, -- Cobra Reflexes {spellID = 25077, unitID = "pet", caster = "all", filter = "BUFF"}, -- Dash (Boar / Cat / Hyena / Raptor / Tallstrider / Wolf) @@ -2009,22 +1915,22 @@ C["filger_spells"] = { -- {spellID = 23145, unitID = "pet", caster = "all", filter = "BUFF"}, -- Eagle Eye -- {spellID = 6197, unitID = "player", caster = "player", filter = "BUFF"}, - -- Eyes of the Beast - -- {spellID = 1002, unitID = "player", caster = "player", filter = "BUFF"}, -- Feed Pet -- {spellID = 1539, unitID = "pet", caster = "player", filter = "BUFF"}, -- Feign Death {spellID = 5384, unitID = "player", caster = "player", filter = "BUFF"}, + -- Focus Fire + {spellID = 82692, unitID = "player", caster = "player", filter = "BUFF"}, -- Frenzy Effect {spellID = 19615, unitID = "pet", caster = "all", filter = "BUFF"}, -- Furious Howl (Wolf) {spellID = 24604, unitID = "player", caster = "all", filter = "BUFF"}, - -- Kill Command - {spellID = 58914, unitID = "pet", caster = "player", filter = "BUFF"}, + -- Hunting Party + -- {spellID = 53290, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Lock and Load {spellID = 56453, unitID = "player", caster = "player", filter = "BUFF"}, - -- Master Tactician - {spellID = 34833, unitID = "player", caster = "player", filter = "BUFF"}, + -- Master's Call + {spellID = 62305, unitID = "player", caster = "player", filter = "BUFF"}, -- Mend Pet {spellID = 136, unitID = "pet", caster = "player", filter = "BUFF"}, -- Misdirection @@ -2039,6 +1945,8 @@ C["filger_spells"] = { {spellID = 53230, unitID = "player", caster = "player", filter = "BUFF"}, -- Raptor Strike (Glyph of Raptor Strike) {spellID = 63087, unitID = "player", caster = "player", filter = "BUFF"}, + -- Ready, Set, Aim... + {spellID = 82925, unitID = "player", caster = "player", filter = "BUFF"}, -- Shell Shield (Turtle) {spellID = 26064, unitID = "pet", caster = "all", filter = "BUFF"}, -- Sniper Training @@ -2049,10 +1957,10 @@ C["filger_spells"] = { -- {spellID = 1515, unitID = "player", caster = "player", filter = "BUFF"}, -- The Beast Within {spellID = 34471, unitID = "player", caster = "player", filter = "BUFF"}, + -- Trap Launcher + {spellID = 77769, unitID = "player", caster = "player", filter = "BUFF"}, -- Trueshot Aura {spellID = 19506, unitID = "pet", caster = "player", filter = "BUFF"}, - -- Warp (Warp Stalker) - -- {spellID = 35346, unitID = "pet", caster = "all", filter = "BUFF"}, }, { Name = "P_PROC_ICON", @@ -2064,14 +1972,22 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs + -- Bombardment + {spellID = 82921, unitID = "player", caster = "player", filter = "BUFF"}, -- Cobra Strikes {spellID = 53257, unitID = "pet", caster = "player", filter = "BUFF"}, -- Improved Steady Shot {spellID = 53220, unitID = "player", caster = "player", filter = "BUFF"}, -- Master Tactician {spellID = 34833, unitID = "player", caster = "player", filter = "BUFF"}, + -- Posthaste + {spellID = 83559, unitID = "player", caster = "player", filter = "BUFF"}, -- Quick Shots {spellID = 6150, unitID = "player", caster = "player", filter = "BUFF"}, + -- Resistance is Futile! + {spellID = 82897, unitID = "player", caster = "player", filter = "BUFF"}, + -- Sic 'Em! + {spellID = 83359, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Exploit Weakness (Increased Damage, Proc) [Ahn'Kahar Blood Hunter's Battlegear] @@ -2385,34 +2301,20 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", T_DEBUFF_ICON_Anchor}, - -- Aimed Shot - {spellID = 19434, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Beast Lore -- {spellID = 1462, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Black Arrow {spellID = 3674, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Charge (Boar) {spellID = 25999, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Chimera Shot - Scorpid - {spellID = 53359, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Concussive Barrage {spellID = 35101, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Concussive Shot {spellID = 5116, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Counterattack {spellID = 19306, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Demoralizing Screech r1 (Bat / Bird of Prey / Carrion Bird) + -- Demoralizing Screech (Bat / Bird of Prey / Carrion Bird) {spellID = 24423, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Demoralizing Screech r2 (Bat / Bird of Prey / Carrion Bird) - {spellID = 24577, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Demoralizing Screech r3 (Bat / Bird of Prey / Carrion Bird) - {spellID = 24578, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Demoralizing Screech r4 (Bat / Bird of Prey / Carrion Bird) - {spellID = 24579, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Demoralizing Screech r5 (Bat / Bird of Prey / Carrion Bird) - {spellID = 27051, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Demoralizing Screech r6 (Bat / Bird of Prey / Carrion Bird) - {spellID = 55487, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Distracting Shot {spellID = 20736, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Entrapment @@ -2421,48 +2323,38 @@ C["filger_spells"] = { {spellID = 53301, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Explosive Trap Effect -- {spellID = 13812, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Expose Weakness - {spellID = 34501, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Fire Breath (Dragonhawk) {spellID = 34889, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Flare -- {spellID = 1543, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Frost Trap Aura - {spellID = 13810, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Glyph of Freezing Trap + -- Frozen Wake (Glyph of Freezing Trap) {spellID = 61394, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hunter's Mark {spellID = 1130, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Ice Trap + {spellID = 13810, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Immolation Trap -- {spellID = 13797, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Intimidation {spellID = 24394, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, + -- Marked for Death + {spellID = 88691, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Piercing Shots {spellID = 63468, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Poison Spit (Serpent) {spellID = 35387, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Scatter Shot {spellID = 19503, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Scorpid Poison r1 (Scorpid) + -- Scorpid Poison (Scorpid) {spellID = 24640, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Poison r2 (Scorpid) - {spellID = 24583, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Poison r3 (Scorpid) - {spellID = 24586, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Poison r4 (Scorpid) - {spellID = 24587, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Poison r5 (Scorpid) - {spellID = 27060, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Poison r6 (Scorpid) - {spellID = 55728, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Scorpid Sting - {spellID = 3043, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Serpent Sting {spellID = 1978, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Silencing Shot {spellID = 34490, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Viper Sting - {spellID = 3034, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Time Warp (Warp Stalker) + {spellID = 35346, unitID = "target", caster = "pet", filter = "DEBUFF", absID = true}, + -- Widow Venom + {spellID = 82654, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Wing Clip {spellID = 2974, unitID = "target", caster = "player", filter = "DEBUFF"}, @@ -2471,8 +2363,10 @@ C["filger_spells"] = { {spellID = 23577, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Deathfrost [Enchant Weapon - Deathfrost] @@ -2502,8 +2396,6 @@ C["filger_spells"] = { BarWidth = 189, Position = {"LEFT", PVE_PVP_CC_Anchor}, - -- Freezing Arrow Effect - {spellID = 60210, unitID = "focus", caster = "player", filter = "DEBUFF"}, -- Freezing Trap Effect {spellID = 3355, unitID = "focus", caster = "player", filter = "DEBUFF"}, -- Scare Beast @@ -2521,14 +2413,16 @@ C["filger_spells"] = { Position = {"TOP", COOLDOWN_Anchor}, -- Self + -- Ancient Hysteria + {spellID = 90355, filter = "CD"}, -- Arcane Shot {spellID = 3044, filter = "CD"}, - -- Aimed Shot - {spellID = 19434, filter = "CD"}, -- Bestial Wrath {spellID = 19574, filter = "CD"}, -- Black Arrow {spellID = 3674, filter = "CD"}, + -- Camouflage + {spellID = 51753, filter = "CD"}, -- Chimera Shot {spellID = 53209, filter = "CD"}, -- Concussive Shot @@ -2545,20 +2439,30 @@ C["filger_spells"] = { {spellID = 53301, filter = "CD"}, -- Explosive Trap {spellID = 13813, filter = "CD"}, + -- Explosive Trap (Trap Launcher) + -- {spellID = 82939, filter = "CD"}, -- Feed Pet {spellID = 6991, filter = "CD"}, -- Feign Death {spellID = 5384, filter = "CD"}, + -- Fervor + {spellID = 82726, filter = "CD"}, -- Flare {spellID = 1543, filter = "CD", absID = true}, - -- Freezing Arrow - {spellID = 60192, filter = "CD"}, + -- Focus Fire + {spellID = 82692, filter = "CD"}, -- Freezing Trap {spellID = 1499, filter = "CD"}, - -- Frost Trap + -- Freezing Trap (Trap Launcher) + -- {spellID = 60192, filter = "CD"}, + -- Ice Trap {spellID = 13809, filter = "CD"}, + -- Ice Trap (Trap Launcher) + -- {spellID = 82941, filter = "CD"}, -- Immolation Trap {spellID = 13795, filter = "CD"}, + -- Immolation Trap (Trap Launcher) + -- {spellID = 82945, filter = "CD"}, -- Intimidation {spellID = 19577, filter = "CD", absID = true}, -- Kill Command @@ -2571,8 +2475,6 @@ C["filger_spells"] = { {spellID = 53271, filter = "CD"}, -- Misdirection {spellID = 34477, filter = "CD"}, - -- Mongoose Bite - {spellID = 1495, filter = "CD"}, -- Multi-Shot {spellID = 2643, filter = "CD"}, -- Rapid Fire @@ -2589,12 +2491,12 @@ C["filger_spells"] = { {spellID = 34490, filter = "CD"}, -- Snake Trap {spellID = 34600, filter = "CD"}, + -- Snake Trap (Trap Launcher) + -- {spellID = 82948, filter = "CD"}, -- Tranquilizing Shot {spellID = 19801, filter = "CD"}, - -- Viper Sting - {spellID = 3034, filter = "CD"}, - -- Volley - {spellID = 1510, filter = "CD"}, + -- Trap Launcher + {spellID = 77769, filter = "CD"}, -- Wyvern Sting {spellID = 19386, filter = "CD"}, @@ -2609,7 +2511,7 @@ C["filger_spells"] = { {spellID = 26064, filter = "CD"}, -- Thunderstomp (Gorilla) {spellID = 26090, filter = "CD"}, - -- Warp (Warp Stalker) + -- Time Warp (Warp Stalker) {spellID = 35346, filter = "CD"}, -- Racial @@ -2630,7 +2532,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -2663,40 +2565,8 @@ C["filger_spells"] = { {spellID = 36032, unitID = "player", caster = "player", filter = "DEBUFF"}, -- Arcane Power {spellID = 12042, unitID = "player", caster = "player", filter = "BUFF"}, - -- Blazing Speed - {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, - -- Combustion - {spellID = 28682, unitID = "player", caster = "player", filter = "BUFF"}, -- Evocation {spellID = 12051, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r1 - {spellID = 543, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r2 - {spellID = 8457, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r3 - {spellID = 8458, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r4 - {spellID = 10223, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r5 - {spellID = 10225, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r6 - {spellID = 27128, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Ward r7 - {spellID = 43010, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r1 - {spellID = 6143, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r2 - {spellID = 8461, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r3 - {spellID = 8462, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r4 - {spellID = 10177, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r5 - {spellID = 28609, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r6 - {spellID = 32796, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Ward r7 - {spellID = 43012, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Ice Barrier {spellID = 11426, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Ice Block @@ -2707,28 +2577,16 @@ C["filger_spells"] = { {spellID = 47000, unitID = "player", caster = "player", filter = "BUFF"}, -- Invisibility -- {spellID = 32612, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r1 + -- Mage Ward + {spellID = 543, unitID = "player", caster = "player", filter = "BUFF"}, + -- Mana Shield {spellID = 1463, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r2 - {spellID = 8494, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r3 - {spellID = 8495, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r4 - {spellID = 10191, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r5 - {spellID = 10192, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r6 - {spellID = 10193, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r7 - {spellID = 27131, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r8 - {spellID = 43019, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Shield r9 - {spellID = 43020, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Mirror Image {spellID = 55342, unitID = "player", caster = "player", filter = "BUFF"}, -- Presence of Mind {spellID = 12043, unitID = "player", caster = "player", filter = "BUFF"}, + -- Pyromaniac + {spellID = 83582, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Quad Core (Increase Damage, Mirror Image) [Bloodmage's Regalia] @@ -2746,8 +2604,10 @@ C["filger_spells"] = { -- Buffs -- Arcane Potency -- {spellID = 57529, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Burning Determination - {spellID = 54748, unitID = "player", caster = "player", filter = "BUFF"}, + -- Blazing Speed + {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, + -- Brain Freeze + {spellID = 57761, unitID = "player", caster = "player", filter = "BUFF"}, -- Clearcasting [Arcane Concentration] {spellID = 12536, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Fingers of Frost @@ -2756,14 +2616,12 @@ C["filger_spells"] = { {spellID = 54741, unitID = "player", caster = "player", filter = "BUFF"}, -- Focus Magic -- {spellID = 54648, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fireball! [Brain Freeze] - {spellID = 57761, unitID = "player", caster = "player", filter = "BUFF"}, -- Hot Streak {spellID = 48108, unitID = "player", caster = "player", filter = "BUFF"}, -- Incanter's Absorption {spellID = 44413, unitID = "player", caster = "player", filter = "BUFF"}, - -- Missile Barrage - {spellID = 44401, unitID = "player", caster = "player", filter = "BUFF"}, + -- Invocation + {spellID = 87098, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Arcane Madness (Spell Power, Proc) [Tirisfal Regalia] @@ -3189,110 +3047,32 @@ C["filger_spells"] = { {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Blizzard -- {spellID = 10, unitID = "target", caster = "player", filter = "DEBUFF"}, - --[[ - -- Chilled r1 (Blizzard) - {spellID = 12484, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Chilled r2 (Blizzard) - {spellID = 12485, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Chilled r3 (Blizzard) - {spellID = 12486, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - --]] + -- Chilled (Blizzard) + -- {spellID = 12484, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Chilled (Frost Armor) - {spellID = 6136, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + {spellID = 7321, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Chilled (Ice Armor) {spellID = 7321, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r1 + -- Cone of Cold {spellID = 120, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r2 - {spellID = 8492, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r3 - {spellID = 10159, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r4 - {spellID = 10160, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r5 - {spellID = 10161, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r6 - {spellID = 27087, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r7 - {spellID = 42930, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Cone of Cold r8 - {spellID = 42931, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Critical Mass + {spellID = 22959, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Deep Freeze + {spellID = 44572, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Dragon's Breath {spellID = 31661, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Fireball r1 + -- Fireball {spellID = 133, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r2 - {spellID = 143, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r3 - {spellID = 145, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r4 - {spellID = 3140, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r5 - {spellID = 8400, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r6 - {spellID = 8401, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r7 - {spellID = 8402, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r8 - {spellID = 10148, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r9 - {spellID = 10149, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r10 - {spellID = 10150, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r11 - {spellID = 10151, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r12 - {spellID = 25306, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r13 - {spellID = 27070, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r14 - {spellID = 38692, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r15 - {spellID = 42832, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fireball r16 - {spellID = 42833, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fire Vulnerability (Improved Scorch) - {spellID = 22959, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Flamestrike -- {spellID = 2120, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frost Nova - {spellID = 122, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Frostbite - {spellID = 12494, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Frostbolt r1 + {spellID = 122, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Frostbolt {spellID = 116, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r2 - {spellID = 205, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r3 - {spellID = 837, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r4 - {spellID = 7322, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r5 - {spellID = 8406, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r6 - {spellID = 8407, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r7 - {spellID = 8408, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r8 - {spellID = 10179, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r9 - {spellID = 10180, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r10 - {spellID = 10181, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r11 - {spellID = 25304, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r12 - {spellID = 27071, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r13 - {spellID = 27072, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r14 - {spellID = 38697, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r15 - {spellID = 42841, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frostbolt r16 - {spellID = 42842, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frostfire Bolt {spellID = 44614, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Frostfire Orb + {spellID = 84721, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Ignite {spellID = 12654, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Impact @@ -3303,6 +3083,12 @@ C["filger_spells"] = { {spellID = 68391, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Pyroblast {spellID = 11366, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Pyroblast! + {spellID = 92315, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Ring of Frost + {spellID = 82691, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Shattered Barrier + {spellID = 55080, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Silenced - Improved Counterspell {spellID = 18469, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Slow @@ -3317,8 +3103,10 @@ C["filger_spells"] = { {spellID = 27868, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Deathfrost [Enchant Weapon - Deathfrost] @@ -3349,14 +3137,8 @@ C["filger_spells"] = { BarWidth = 189, Position = {"LEFT", PVE_PVP_CC_Anchor}, - -- Polymorph r1 + -- Polymorph {spellID = 118, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r2 - {spellID = 12824, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r3 - {spellID = 12825, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r4 - {spellID = 12826, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, -- Polymorph: Black Cat {spellID = 61305, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, -- Polymorph: Pig @@ -3398,30 +3180,38 @@ C["filger_spells"] = { {spellID = 120, filter = "CD"}, -- Counterspell {spellID = 2139, filter = "CD"}, + -- Deep Freeze + {spellID = 44572, filter = "CD"}, -- Dragon's Breath {spellID = 31661, filter = "CD"}, -- Fire Blast {spellID = 2136, filter = "CD"}, - -- Fire Ward - {spellID = 543, filter = "CD"}, + -- Flame Orb + {spellID = 82731, filter = "CD"}, -- Freeze (Water Elemental) {spellID = 33395, filter = "CD", absID = true}, + -- Frostfire Orb + {spellID = 92283, filter = "CD"}, -- Frost Nova {spellID = 122, filter = "CD"}, - -- Frost Ward - {spellID = 6143, filter = "CD"}, -- Ice Barrier {spellID = 11426, filter = "CD"}, -- Ice Block {spellID = 45438, filter = "CD"}, -- Icy Veins {spellID = 12472, filter = "CD"}, + -- Mage Ward + {spellID = 543, filter = "CD"}, -- Mirror Image {spellID = 55342, filter = "CD"}, -- Presence of Mind {spellID = 12043, filter = "CD"}, + -- Ring of Frost + {spellID = 82676, filter = "CD"}, -- Summon Water Elemental {spellID = 31687, filter = "CD"}, + -- Time Warp + {spellID = 80353, filter = "CD"}, -- Racial -- Arcane Torrent (Mana) @@ -3467,18 +3257,18 @@ C["filger_spells"] = { Position = {"TOP", P_BUFF_ICON_Anchor}, -- Ardent Defender - {spellID = 66233, unitID = "player", caster = "player", filter = "DEBUFF"}, + {spellID = 31850, unitID = "player", caster = "player", filter = "DEBUFF"}, -- Avenging Wrath {spellID = 31884, unitID = "player", caster = "player", filter = "BUFF"}, -- Concentration Aura -- {spellID = 19746, unitID = "player", caster = "player", filter = "BUFF"}, + -- Conviction + {spellID = 20050, unitID = "player", caster = "player", filter = "BUFF"}, -- Crusader Aura -- {spellID = 32223, unitID = "player", caster = "player", filter = "BUFF"}, -- Devotion Aura -- {spellID = 465, unitID = "player", caster = "player", filter = "BUFF"}, -- Divine Favor - {spellID = 20216, unitID = "player", caster = "player", filter = "BUFF"}, - -- Divine Illumination {spellID = 31842, unitID = "player", caster = "player", filter = "BUFF"}, -- Divine Plea {spellID = 54428, unitID = "player", caster = "player", filter = "BUFF"}, @@ -3486,60 +3276,48 @@ C["filger_spells"] = { {spellID = 498, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Divine Shield {spellID = 642, unitID = "player", caster = "player", filter = "BUFF"}, - -- Fire Resistance Aura - -- {spellID = 19891, unitID = "player", caster = "player", filter = "BUFF"}, -- Forbearance {spellID = 25771, unitID = "player", caster = "player", filter = "DEBUFF"}, - -- Frost Resistance Aura - -- {spellID = 19888, unitID = "player", caster = "player", filter = "BUFF"}, - -- Holy Shield r1 + -- Guardian of Ancient Kings (Avenger's Shield) + {spellID = 86659, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Guardian of Ancient Kings (Holy Shock) + {spellID = 86669, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Guardian of Ancient Kings (Templar's Verdict) + {spellID = 86698, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Holy Shield {spellID = 20925, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Holy Shield r2 - {spellID = 20927, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Holy Shield r3 - {spellID = 20928, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Holy Shield r4 - {spellID = 27179, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Holy Shield r5 - {spellID = 48951, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Holy Shield r6 - {spellID = 48952, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Light's Grace - {spellID = 31834, unitID = "player", caster = "player", filter = "BUFF"}, -- Infusion of Light {spellID = 53672, unitID = "player", caster = "player", filter = "BUFF"}, + -- Judgements of the Bold + {spellID = 89906, unitID = "player", caster = "player", filter = "BUFF"}, -- Judgements of the Pure {spellID = 53655, unitID = "player", caster = "player", filter = "BUFF"}, + -- Judgements of the Wise + {spellID = 31930, unitID = "player", caster = "player", filter = "BUFF"}, + -- Resistance Aura + -- {spellID = 19891, unitID = "player", caster = "player", filter = "BUFF"}, -- Retribution Aura -- {spellID = 7294, unitID = "player", caster = "player", filter = "BUFF"}, + -- Sacred Shield + {spellID = 96263, unitID = "player", caster = "player", filter = "BUFF"}, --[[ - -- Seal of Blood - {spellID = 31892, unitID = "player", caster = "player", filter = "BUFF"}, - -- Seal of Command - {spellID = 27170, unitID = "player", caster = "player", filter = "BUFF"}, -- Seal of Corruption {spellID = 348704, unitID = "player", caster = "player", filter = "BUFF"}, + -- Seal of Insight + {spellID = 20165, unitID = "player", caster = "player", filter = "BUFF"}, -- Seal of Justice {spellID = 20164, unitID = "player", caster = "player", filter = "BUFF"}, - -- Seal of Light - {spellID = 20165, unitID = "player", caster = "player", filter = "BUFF"}, -- Seal of Righteousness - {spellID = 21084, unitID = "player", caster = "player", filter = "BUFF"}, - -- Seal of Vengeance + {spellID = 20154, unitID = "player", caster = "player", filter = "BUFF"}, + -- Seal of Truth {spellID = 31801, unitID = "player", caster = "player", filter = "BUFF"}, - -- Seal of Wisdom - {spellID = 20166, unitID = "player", caster = "player", filter = "BUFF"}, - -- Seal of the Martyr - {spellID = 348700, unitID = "player", caster = "player", filter = "BUFF"}, --]] - -- Shadow Resistance Aura - -- {spellID = 19876, unitID = "player", caster = "player", filter = "BUFF"}, - -- Vengeance r1 - {spellID = 20050, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Vengeance r2 - {spellID = 20052, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Vengeance r3 - {spellID = 20053, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Selfless + {spellID = 90811, unitID = "player", caster = "player", filter = "BUFF"}, + -- Speed of Light + {spellID = 85497, unitID = "player", caster = "player", filter = "BUFF"}, + -- Zealotry + {spellID = 85696, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Aegis (Block Value, Shield of Righteousness) [Aegis Plate] @@ -3559,12 +3337,24 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs + -- Crusader + {spellID = 94686, unitID = "player", caster = "player", filter = "BUFF"}, + -- Daybreak + {spellID = 88819, unitID = "player", caster = "player", filter = "BUFF"}, + -- Divine Purpose + {spellID = 90174, unitID = "player", caster = "player", filter = "BUFF"}, + -- Grand Crusader + {spellID = 85416, unitID = "player", caster = "player", filter = "BUFF"}, + -- Long Arm of the Law + {spellID = 87173, unitID = "player", caster = "player", filter = "BUFF"}, -- Reckoning {spellID = 20178, unitID = "player", caster = "player", filter = "BUFF"}, -- Redoubt {spellID = 20128, unitID = "player", caster = "player", filter = "BUFF"}, + -- Sacred Duty + {spellID = 85433, unitID = "player", caster = "player", filter = "BUFF"}, -- The Art of War - {spellID = 53489, unitID = "player", caster = "player", filter = "BUFF"}, + {spellID = 59578, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Crusader's Wrath (Spell Power, Proc) [Lightforge Armor / Soulforge Armor] @@ -3580,50 +3370,6 @@ C["filger_spells"] = { -- Lesser Spell Blasting (Spell Power, Proc) [Spellstrike Infusion] {spellID = 32108, unitID = "player", caster = "player", filter = "BUFF"}, - -- Librams - -- Blessed (Spell Power, Holy Shock) [Libram of Blinding Light] - {spellID = 71192, unitID = "player", caster = "player", filter = "BUFF"}, - -- Bulwark of the Lightbringer (Block Value, Judgement) [Tome of the Lightbringer] - {spellID = 41043, unitID = "player", caster = "player", filter = "BUFF"}, - -- Crusader's Command (Attack Power, Judgement of Command) [Libram of Divine Judgement] - {spellID = 43747, unitID = "player", caster = "player", filter = "BUFF"}, - -- Evasion (Dodge, Hammer of The Righteous) [Libram of Defiance] - {spellID = 67378, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Evasive (Dodge, Shield of Righteousness) [Libram of the Eternal Tower] - {spellID = 71197, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Formidable (Strength, Crusader Strike) [Libram of Three Truths] - {spellID = 71187, unitID = "player", caster = "player", filter = "BUFF"}, - -- Grace of the Naaru (Mp5, Holy Light) [Libram of Mending] - {spellID = 43742, unitID = "player", caster = "player", filter = "BUFF"}, - -- Holy Judgement (Spell Power, Holy Light) [Libram of Veracity] - {spellID = 67364, unitID = "player", caster = "player", filter = "BUFF"}, - -- Holy Strength (Strength, Seal of Vengeance/Seal of Corruption) [Libram of Valiance] - {spellID = 67371, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Increased Block (Block Value, Holy Shield) [Libram of the Sacred Shield] - {spellID = 65182, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Justice (Critical Strike, Judgement) [Libram of Avengement] - {spellID = 34260, unitID = "player", caster = "player", filter = "BUFF"}, - -- Libram of Obstruction (Block Value, Judgement) [Libram of Obstruction] - {spellID = 60795, unitID = "player", caster = "player", filter = "BUFF"}, - -- Libram of Reciprocation (Critical Strike, Judgement of Command) [Libram of Reciprocation] - {spellID = 60819, unitID = "player", caster = "player", filter = "BUFF"}, - -- Resilient (Resilience, Judgement/Holy Shield) [Libram of Fortitude / Libram of Vengeance] - {spellID = 43839, unitID = "player", caster = "player", filter = "BUFF"}, - -- Vengeful Justice (Critical Strike, Judgement) [Libram of Furious Blows] - {spellID = 48836, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Aggression (Attack Power, Crusader Strike) [Savage Gladiator's Libram of Fortitude] - {spellID = 60544, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Aggression (Attack Power, Crusader Strike) [Hateful Gladiator's Libram of Fortitude] - {spellID = 60547, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Aggression (Attack Power, Crusader Strike) [Deadly Gladiator's Libram of Fortitude] - {spellID = 60549, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Libram of Fortitude (Attack Power, Crusader Strike) [Furious Gladiator's Libram of Fortitude] - {spellID = 60551, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Aggression (Attack Power, Crusader Strike) [Relentless Gladiator's Libram of Fortitude] - {spellID = 60553, unitID = "player", caster = "player", filter = "BUFF"}, - -- Fury of the Gladiator (Attack Power, Crusader Strike) [Wrathful Gladiator's Libram of Fortitude] - {spellID = 60555, unitID = "player", caster = "player", filter = "BUFF"}, - -- Trinkets -- Class -- Blessing of Righteousness (Spell Power, Proc) [Tome of Fiery Redemption] @@ -4361,43 +4107,35 @@ C["filger_spells"] = { -- Avenger's Shield {spellID = 31935, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Blood Corruption - {spellID = 53742, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 356110, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Censure + {spellID = 31803, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Consecration {spellID = 26573, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Dazed - Avenger's Shield + {spellID = 63529, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Denounce + {spellID = 85509, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hammer of Justice {spellID = 853, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hand of Reckoning {spellID = 62124, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Heart of the Crusader - {spellID = 21183, unitID = "target", caster = "all", filter = "DEBUFF"}, - -- Holy Vengeance - {spellID = 31803, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Holy Wrath {spellID = 2812, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Judgement of Justice - {spellID = 20184, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Judgement of Light - {spellID = 20185, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Judgement of the Just + -- Judgements of the Just {spellID = 68055, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Judgement of Wisdom - {spellID = 20186, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Repentance {spellID = 20066, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Righteous Vengeance - {spellID = 61840, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Seal of Justice (Stun) + -- Seal of Justice {spellID = 20170, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Silenced - Shield of the Templar - {spellID = 63529, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Vindication - {spellID = 67, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Trinket Effects -- Enduring Judgement (DoT, Proc) [Ashtongue Talisman of Zeal] {spellID = 40471, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Chilled [Enchant Weapon - Icy Chill] @@ -4428,12 +4166,6 @@ C["filger_spells"] = { {spellID = 53563, unitID = "target", caster = "player", filter = "BUFF"}, -- Holy Mending (Aegis Regalia) {spellID = 64891, unitID = "target", caster = "player", filter = "BUFF"}, - -- Sacred Cleansing - {spellID = 53659, unitID = "target", caster = "player", filter = "BUFF", absID = true}, - -- Sacred Shield - {spellID = 53601, unitID = "target", caster = "player", filter = "BUFF", absID = true}, - -- Sheath of Light - {spellID = 54203, unitID = "target", caster = "player", filter = "BUFF"}, -- Enduring Light (HoT, Proc) [Ashtongue Talisman of Zeal] {spellID = 40471, unitID = "target", caster = "player", filter = "BUFF"}, -- Holy Power (Armor, Proc) [Redemption Armor] @@ -4444,14 +4176,12 @@ C["filger_spells"] = { {spellID = 28795, unitID = "target", caster = "player", filter = "BUFF", absID = true}, -- Holy Power (Spell Power, Proc) [Redemption Armor] {spellID = 28793, unitID = "target", caster = "player", filter = "BUFF", absID = true}, - -- Libram of Justice - {spellID = 34135, unitID = "target", caster = "player", filter = "BUFF"}, - -- Merciless Libram of Justice - {spellID = 42369, unitID = "target", caster = "player", filter = "BUFF"}, - -- Vengeful Libram of Justice - {spellID = 43727, unitID = "target", caster = "player", filter = "BUFF"}, - -- Brutal Libram of Justice - {spellID = 46093, unitID = "target", caster = "player", filter = "BUFF"}, + -- Holy Radiance + {spellID = 82327, unitID = "target", caster = "player", filter = "BUFF"}, + -- Illuminated Healing + {spellID = 86273, unitID = "target", caster = "player", filter = "BUFF"}, + -- Word of Glory + {spellID = 85673, unitID = "target", caster = "player", filter = "BUFF"}, -- Trinket Effects -- Blessing of Ancient Kings (Absorb, Proc) [Val'anyr, Hammer of Ancient Kings] @@ -4500,6 +4230,8 @@ C["filger_spells"] = { Position = {"TOP", COOLDOWN_Anchor}, -- Self + -- Ardent Defender + {spellID = 31850, filter = "CD"}, -- Aura Mastery {spellID = 31821, filter = "CD"}, -- Avenger's Shield @@ -4511,11 +4243,7 @@ C["filger_spells"] = { -- Crusader Strike {spellID = 35395, filter = "CD"}, -- Divine Favor - {spellID = 20216, filter = "CD"}, - -- Divine Illumination {spellID = 31842, filter = "CD"}, - -- Divine Intervention - {spellID = 19752, filter = "CD"}, -- Divine Plea {spellID = 54428, filter = "CD"}, -- Divine Protection @@ -4528,6 +4256,8 @@ C["filger_spells"] = { {spellID = 53385, filter = "CD"}, -- Exorcism {spellID = 879, filter = "CD"}, + -- Guardian of Ancient Kings + {spellID = 86150, filter = "CD"}, -- Hand of Freedom {spellID = 1044, filter = "CD"}, -- Hand of Protection @@ -4554,6 +4284,8 @@ C["filger_spells"] = { {spellID = 20271, filter = "CD", absID = true}, -- Lay on Hands {spellID = 633, filter = "CD"}, + -- Rebuke + {spellID = 96231, filter = "CD"}, -- Repentance {spellID = 20066, filter = "CD"}, -- Righteous Defense @@ -4562,6 +4294,10 @@ C["filger_spells"] = { {spellID = 53600, filter = "CD"}, -- Turn Evil {spellID = 10326, filter = "CD"}, + -- Word of Glory + {spellID = 85673, filter = "CD"}, + -- Zealotry + {spellID = 85696, filter = "CD"}, -- Racial -- Arcane Torrent (Mana) @@ -4600,26 +4336,48 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", P_BUFF_ICON_Anchor}, + -- Archangel + {spellID = 81700, unitID = "player", caster = "player", filter = "BUFF"}, -- Borrowed Time {spellID = 59887, unitID = "player", caster = "player", filter = "BUFF"}, + -- Chakra + {spellID = 14751, unitID = "player", caster = "player", filter = "BUFF"}, + -- Chakra: Chastise + {spellID = 81209, unitID = "player", caster = "player", filter = "BUFF"}, + -- Chakra: Sanctuary + {spellID = 81206, unitID = "player", caster = "player", filter = "BUFF"}, + -- Chakra: Serenity + {spellID = 81208, unitID = "player", caster = "player", filter = "BUFF"}, + -- Dark Archangel + {spellID = 87153, unitID = "player", caster = "player", filter = "BUFF"}, -- Dispersion {spellID = 47585, unitID = "player", caster = "player", filter = "BUFF"}, -- Fade {spellID = 586, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Holy Word: Serenity + {spellID = 88684, unitID = "player", caster = "player", filter = "BUFF"}, -- Inner Fire - {spellID = 588, unitID = "player", caster = "player", filter = "BUFF"}, + -- {spellID = 588, unitID = "player", caster = "player", filter = "BUFF"}, -- Inner Focus - {spellID = 14751, unitID = "player", caster = "player", filter = "BUFF"}, + {spellID = 89485, unitID = "player", caster = "player", filter = "BUFF"}, + -- Inner Will + -- {spellID = 73413, unitID = "player", caster = "player", filter = "BUFF"}, + -- Mind Melt + {spellID = 81292, unitID = "player", caster = "player", filter = "BUFF"}, + -- Mind Quickening + -- {spellID = 49868, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Mind Spike + {spellID = 87178, unitID = "player", caster = "player", filter = "BUFF"}, -- Renewed Hope -- {spellID = 63944, unitID = "player", caster = "player", filter = "BUFF"}, -- Serendipity {spellID = 63731, unitID = "player", caster = "player", filter = "BUFF"}, -- Shadowform - {spellID = 15473, unitID = "player", caster = "player", filter = "BUFF"}, - -- Shadowy Insight (Glyph of Shadow) - {spellID = 61792, unitID = "player", caster = "player", filter = "BUFF"}, + -- {spellID = 15473, unitID = "player", caster = "player", filter = "BUFF"}, -- Spirit of Redemption {spellID = 27827, unitID = "player", caster = "player", filter = "BUFF"}, + -- Strength of Soul + {spellID = 96266, unitID = "player", caster = "player", filter = "BUFF"}, -- Vampiric Embrace -- {spellID = 15290, unitID = "player", caster = "player", filter = "BUFF"}, -- Vampiric Touch @@ -4645,20 +4403,20 @@ C["filger_spells"] = { {spellID = 27813, unitID = "player", caster = "player", filter = "BUFF"}, -- Blessed Resilience {spellID = 33143, unitID = "player", caster = "player", filter = "BUFF"}, + -- Dark Evangelism + {spellID = 87117, unitID = "player", caster = "player", filter = "BUFF"}, + -- Empowered Shadow + {spellID = 95799, unitID = "player", caster = "player", filter = "BUFF"}, + -- Evangelism + {spellID = 81660, unitID = "player", caster = "player", filter = "BUFF"}, -- Focused Will - {spellID = 45237, unitID = "player", caster = "player", filter = "BUFF"}, - -- Focused Casting [Martyrdom] - {spellID = 14743, unitID = "player", caster = "player", filter = "BUFF"}, - -- Holy Concentration - {spellID = 34754, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Improved Spirit Tap - {spellID = 49694, unitID = "player", caster = "player", filter = "BUFF"}, - -- Shadow Weaving - {spellID = 15258, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Spirit Tap - {spellID = 15271, unitID = "player", caster = "player", filter = "BUFF"}, + {spellID = 45241, unitID = "player", caster = "player", filter = "BUFF"}, + -- Glyph of Spirit Tap + {spellID = 81301, unitID = "player", caster = "player", filter = "BUFF"}, + -- Shadow Orb + {spellID = 77487, unitID = "player", caster = "player", filter = "BUFF"}, -- Surge of Light - {spellID = 33151, unitID = "player", caster = "player", filter = "BUFF"}, + {spellID = 88688, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Divine Protection (Absorb, Proc) [Vestments of the Devout / Vestments of the Virtuous] @@ -5078,26 +4836,12 @@ C["filger_spells"] = { {spellID = 2944, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Holy Fire {spellID = 14914, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Holy Word: Chastise + {spellID = 88625, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Mind Control {spellID = 605, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Mind Flay r1 + -- Mind Flay {spellID = 15407, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r2 - {spellID = 17311, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r3 - {spellID = 17312, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r4 - {spellID = 17313, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r5 - {spellID = 17314, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r6 - {spellID = 18807, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r7 - {spellID = 25387, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r8 - {spellID = 48155, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Mind Flay r9 - {spellID = 48156, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Mind Sear (Primary) {spellID = 48045, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Mind Sear (Secondary) @@ -5108,6 +4852,10 @@ C["filger_spells"] = { {spellID = 2096, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Misery {spellID = 33196, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Paralysis r1 + {spellID = 87193, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Paralysis r2 + {spellID = 87194, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Psychic Horror (Horror) {spellID = 64044, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Psychic Horror (Disarm) @@ -5118,22 +4866,18 @@ C["filger_spells"] = { {spellID = 589, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Silence {spellID = 15487, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Sin and Punishment + {spellID = 87204, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Vampiric Embrace {spellID = 15286, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Vampiric Touch r1 + -- Vampiric Touch {spellID = 34914, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Vampiric Touch r2 - {spellID = 34916, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Vampiric Touch r3 - {spellID = 34917, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Vampiric Touch r4 - {spellID = 48159, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Vampiric Touch r5 - {spellID = 48160, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Deathfrost [Enchant Weapon - Deathfrost] @@ -5150,18 +4894,18 @@ C["filger_spells"] = { BarWidth = 186, Position = {"LEFT", T_DE_BUFF_BAR_Anchor}, - -- Abolish Disease - {spellID = 552, unitID = "target", caster = "player", filter = "BUFF"}, -- Armor of Faith (Absorb, Proc) [Vestments of Faith] {spellID = 28810, unitID = "target", caster = "player", filter = "BUFF"}, -- Blessed Healing (HoT, Proc) [Crimson Acolyte's Raiment] {spellID = 70772, unitID = "target", caster = "player", filter = "BUFF"}, - -- Body and Soul r1 + -- Body and Soul {spellID = 64128, unitID = "target", caster = "player", filter = "BUFF"}, - -- Body and Soul r2 - {spellID = 65081, unitID = "target", caster = "player", filter = "BUFF"}, -- Divine Aegis {spellID = 47753, unitID = "target", caster = "player", filter = "BUFF"}, + -- Echo of Light + {spellID = 77489, unitID = "target", caster = "player", filter = "BUFF"}, + -- Glyph of Prayer of Healing + {spellID = 56161, unitID = "target", caster = "player", filter = "BUFF"}, -- Grace {spellID = 47930, unitID = "target", caster = "player", filter = "BUFF"}, -- Greater Heal (HoT, Proc) [Vestments of Transcendence] @@ -5227,8 +4971,14 @@ C["filger_spells"] = { Position = {"TOP", COOLDOWN_Anchor}, -- Self + -- Archangel + {spellID = 81700, filter = "CD"}, + -- Chakra + {spellID = 14751, filter = "CD"}, -- Circle of Healing {spellID = 34861, filter = "CD"}, + -- Dark Archangel + {spellID = 87153, filter = "CD"}, -- Devouring Plague {spellID = 2944, filter = "CD"}, -- Dispersion @@ -5241,8 +4991,16 @@ C["filger_spells"] = { {spellID = 6346, filter = "CD"}, -- Holy Fire {spellID = 14914, filter = "CD"}, + -- Holy Word: Chastise + {spellID = 88625, filter = "CD"}, + -- Holy Word: Sanctuary + {spellID = 88685, filter = "CD"}, + -- Holy Word: Serenity + {spellID = 88684, filter = "CD"}, -- Inner Focus - {spellID = 14751, filter = "CD"}, + {spellID = 89485, filter = "CD"}, + -- Leap of Faith + {spellID = 73325, filter = "CD"}, -- Lightwell {spellID = 724, filter = "CD"}, -- Mind Blast @@ -5251,6 +5009,8 @@ C["filger_spells"] = { {spellID = 47540, filter = "CD"}, -- Power Infusion {spellID = 10060, filter = "CD"}, + -- Power Word: Barrier + {spellID = 62618, filter = "CD"}, -- Power Word: Shield {spellID = 17, filter = "CD"}, -- Prayer of Mending @@ -5325,26 +5085,32 @@ C["filger_spells"] = { {spellID = 31224, unitID = "player", caster = "player", filter = "BUFF"}, -- Cold Blood {spellID = 14177, unitID = "player", caster = "player", filter = "BUFF"}, + -- Combat Readiness + {spellID = 74001, unitID = "player", caster = "player", filter = "BUFF"}, + -- Deep Insight [Bandit's Guile] + {spellID = 84747, unitID = "player", caster = "player", filter = "BUFF"}, -- Evasion {spellID = 5277, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Envenom {spellID = 32645, unitID = "player", caster = "player", filter = "BUFF"}, - -- Find Weakness - {spellID = 31234, unitID = "player", caster = "player", filter = "BUFF"}, - -- Ghostly Strike - {spellID = 14278, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hunger For Blood - {spellID = 63848, unitID = "player", caster = "player", filter = "BUFF"}, -- Killing Spree {spellID = 51690, unitID = "player", caster = "player", filter = "BUFF"}, -- Master of Subtlety {spellID = 31665, unitID = "player", caster = "player", filter = "BUFF"}, + -- Moderate Insight [Bandit's Guile] + {spellID = 84746, unitID = "player", caster = "player", filter = "BUFF"}, -- Overkill {spellID = 58427, unitID = "player", caster = "player", filter = "BUFF"}, + -- Recuperate + {spellID = 73651, unitID = "player", caster = "player", filter = "BUFF"}, + -- Revealing Strike + {spellID = 84617, unitID = "player", caster = "player", filter = "BUFF"}, -- Shadow Dance {spellID = 51713, unitID = "player", caster = "player", filter = "BUFF"}, -- Shadowstep {spellID = 36563, unitID = "player", caster = "player", filter = "BUFF"}, + -- Shallow Insight [Bandit's Guile] + {spellID = 84745, unitID = "player", caster = "player", filter = "BUFF"}, -- Slice and Dice {spellID = 5171, unitID = "player", caster = "player", filter = "BUFF"}, -- Sprint @@ -5364,6 +5130,10 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs + -- Combat Insight + {spellID = 74002, unitID = "player", caster = "player", filter = "BUFF"}, + -- Deadly Momentum + {spellID = 84590, unitID = "player", caster = "player", filter = "BUFF"}, -- Remorseless Attacks {spellID = 14143, unitID = "player", caster = "player", filter = "BUFF"}, -- Turn the Tables @@ -5731,14 +5501,20 @@ C["filger_spells"] = { {spellID = 51722, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Expose Armor {spellID = 8647, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Find Weakness + {spellID = 91021, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Garrote {spellID = 703, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Garrote - Silence {spellID = 1330, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Gouge {spellID = 1776, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Groggy + {spellID = 79124, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hemorrhage - {spellID = 16511, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 16511, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Hemorrhage (Glyph of Hemorrhage) + {spellID = 89775, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Interrupt {spellID = 32747, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Kidney Shot @@ -5755,14 +5531,18 @@ C["filger_spells"] = { {spellID = 58684, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Silenced - Improved Kick {spellID = 18425, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Vendetta + {spellID = 79140, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Waylay {spellID = 51693, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Wound Poison {spellID = 13218, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Weapons -- Gutgore Ripper (Special, Proc) [Rusted Gutgore Ripper] @@ -5833,6 +5613,8 @@ C["filger_spells"] = { {spellID = 31224, filter = "CD"}, -- Cold Blood {spellID = 14177, filter = "CD"}, + -- Combat Readiness + {spellID = 74001, filter = "CD"}, -- Dismantle {spellID = 51722, filter = "CD"}, -- Distract @@ -5841,8 +5623,6 @@ C["filger_spells"] = { {spellID = 5277, filter = "CD"}, -- Feint {spellID = 1966, filter = "CD"}, - -- Ghostly Strike - {spellID = 14278, filter = "CD"}, -- Gouge {spellID = 1776, filter = "CD"}, -- Kick @@ -5855,12 +5635,16 @@ C["filger_spells"] = { {spellID = 14183, filter = "CD"}, -- Preparation {spellID = 14185, filter = "CD"}, + -- Redirect + {spellID = 73981, filter = "CD"}, -- Riposte {spellID = 14251, filter = "CD"}, -- Shadow Dance {spellID = 51713, filter = "CD"}, -- Shadowstep {spellID = 36554, filter = "CD"}, + -- Smoke Bomb + {spellID = 76577, filter = "CD"}, -- Sprint {spellID = 2983, filter = "CD"}, -- Stealth @@ -5869,6 +5653,8 @@ C["filger_spells"] = { {spellID = 57934, filter = "CD"}, -- Vanish {spellID = 1856, filter = "CD"}, + -- Vendetta + {spellID = 79140, filter = "CD"}, -- Racial -- Arcane Torrent (Energy) @@ -5920,45 +5706,23 @@ C["filger_spells"] = { Position = {"TOP", P_BUFF_ICON_Anchor}, -- Elemental Devastation - {spellID = 30165, unitID = "player", caster = "player", filter = "BUFF"}, + {spellID = 29178, unitID = "player", caster = "player", filter = "BUFF"}, -- Elemental Mastery {spellID = 16166, unitID = "player", caster = "player", filter = "BUFF"}, -- Elemental Oath -- {spellID = 51466, unitID = "player", caster = "player", filter = "BUFF"}, -- Far Sight -- {spellID = 6196, unitID = "player", caster = "player", filter = "BUFF"}, - --[[ - -- Fire Resistance Totem r1 - {spellID = 8185, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Resistance Totem r2 - {spellID = 10534, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Resistance Totem r3 - {spellID = 10535, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Resistance Totem r4 - {spellID = 25563, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Resistance Totem r5 - {spellID = 58738, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Fire Resistance Totem r6 - {spellID = 58740, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --]] + -- Fire Resistance Totem + -- {spellID = 8185, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Flurry {spellID = 16257, unitID = "player", caster = "player", filter = "BUFF"}, -- Focused (Shamanistic) -- {spellID = 43339, unitID = "player", caster = "player", filter = "BUFF"}, - --[[ - -- Frost Resistance Totem r1 - {spellID = 8182, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Resistance Totem r2 - {spellID = 10476, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Resistance Totem r3 - {spellID = 10477, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Resistance Totem r4 - {spellID = 25560, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Resistance Totem r5 - {spellID = 58742, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Frost Resistance Totem r6 - {spellID = 58744, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --]] + -- Focused Insight + {spellID = 77800, unitID = "player", caster = "player", filter = "BUFF"}, + -- Frost Resistance Totem + -- {spellID = 8182, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Ghost Wolf -- {spellID = 2645, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Grace of Air @@ -5967,68 +5731,22 @@ C["filger_spells"] = { -- {spellID = 8178, unitID = "player", caster = "player", filter = "BUFF"}, -- Healing Stream -- {spellID = 5672, unitID = "player", caster = "player", filter = "BUFF"}, - -- Lightning Shield r1 + -- Lightning Shield {spellID = 324, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r2 - {spellID = 325, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r3 - {spellID = 905, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r4 - {spellID = 945, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r5 - {spellID = 8134, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r6 - {spellID = 10431, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r7 - {spellID = 10432, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r8 - {spellID = 25469, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r9 - {spellID = 25472, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r10 - {spellID = 49280, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Lightning Shield r11 - {spellID = 49281, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --[[ - -- Mana Spring Totem r1 - {spellID = 5677, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r2 - {spellID = 10491, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r3 - {spellID = 10493, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r4 - {spellID = 10494, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r5 - {spellID = 25570, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r6 - {spellID = 58775, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r7 - {spellID = 58776, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Mana Spring Totem r8 - {spellID = 58777, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --]] + -- Mana Spring Totem + -- {spellID = 5677, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Nature's Swiftness {spellID = 16188, unitID = "player", caster = "player", filter = "BUFF"}, - --[[ - -- Nature Resistance Totem r1 - {spellID = 10596, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Nature Resistance Totem r2 - {spellID = 10598, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Nature Resistance Totem r3 - {spellID = 10599, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Nature Resistance Totem r4 - {spellID = 25574, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Nature Resistance Totem r5 - {spellID = 58748, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Nature Resistance Totem r6 - {spellID = 58750, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --]] + -- Nature Resistance Totem + -- {spellID = 10596, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Sentry Totem -- {spellID = 6495, unitID = "player", caster = "player", filter = "BUFF"}, -- Shamanistic Rage {spellID = 30823, unitID = "player", caster = "player", filter = "BUFF"}, -- Spirit Walk (Spirit Wolf) {spellID = 58875, unitID = "player", caster = "all", filter = "BUFF"}, + -- Spiritwalker's Grace + {spellID = 79206, unitID = "player", caster = "player", filter = "BUFF"}, -- Stoneskin Totem -- {spellID = 8072, unitID = "player", caster = "player", filter = "BUFF"}, -- Strength of Earth @@ -6037,26 +5755,16 @@ C["filger_spells"] = { {spellID = 55198, unitID = "player", caster = "player", filter = "BUFF"}, -- Totem of Wrath -- {spellID = 30708, unitID = "player", caster = "player", filter = "BUFF"}, + -- Totemic Wrath + -- {spellID = 77746, unitID = "player", caster = "player", filter = "BUFF"}, + -- Unleash Flame + {spellID = 73683, unitID = "player", caster = "player", filter = "BUFF"}, + -- Unleash Wind + {spellID = 73681, unitID = "player", caster = "player", filter = "BUFF"}, -- Unleashed Rage -- {spellID = 30802, unitID = "player", caster = "player", filter = "BUFF"}, - -- Water Shield r1 + -- Water Shield {spellID = 52127, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r2 - {spellID = 52129, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r3 - {spellID = 52131, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r4 - {spellID = 52134, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r5 - {spellID = 52136, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r6 - {spellID = 52138, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r7 - {spellID = 24398, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r8 - {spellID = 33736, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Water Shield r9 - {spellID = 57960, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Windwall Totem -- {spellID = 15108, unitID = "player", caster = "player", filter = "BUFF"}, -- Wrath of Air Totem @@ -6082,10 +5790,22 @@ C["filger_spells"] = { {spellID = 52179, unitID = "player", caster = "player", filter = "BUFF"}, -- Clearcasting (Elemental Focus) {spellID = 16246, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Lava Flows + {spellID = 65264, unitID = "player", caster = "player", filter = "BUFF"}, -- Maelstrom Weapon {spellID = 53817, unitID = "player", caster = "player", filter = "BUFF"}, -- Nature's Guardian {spellID = 31616, unitID = "player", caster = "player", filter = "BUFF"}, + -- Seasoned Winds (Arcane) + {spellID = 97621, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Seasoned Winds (Fire) + {spellID = 97618, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Seasoned Winds (Frost) + {spellID = 97619, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Seasoned Winds (Nature) + {spellID = 97620, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Seasoned Winds (Shadow) + {spellID = 97622, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Tidal Waves {spellID = 53390, unitID = "player", caster = "player", filter = "BUFF"}, @@ -6117,56 +5837,6 @@ C["filger_spells"] = { -- Wave Trance (Special, Proc) [Cataclysm Raiment] {spellID = 39950, unitID = "player", caster = "player", filter = "BUFF"}, - -- Totems - -- Elemental Strength (Attack Power, Shocks) [Stonebreaker's Totem] - {spellID = 43749, unitID = "player", caster = "player", filter = "BUFF"}, - -- Elemental Tenacity (Attack Power, Shocks) [Totem of the Tundra] - {spellID = 48838, unitID = "player", caster = "player", filter = "BUFF"}, - -- Energized (Haste, Lightning Bolt) [Skycall Totem] - {spellID = 43751, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Energized (Haste, Lightning Bolt) [Totem of Electrifying Wind] - {spellID = 67385, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Energized (Spell Power, Riptide) [Totem of the Surging Sea] - {spellID = 71220, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enraged (Attack Power, Stormstrike) [Totem of the Avalanche] - {spellID = 71216, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Essence of the Storm (Haste, Stormstrike) [Totem of Dueling] - {spellID = 60766, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious (Haste, Flame Shock) [Bizuri's Totem of Shattered Ice] - {spellID = 71199, unitID = "player", caster = "player", filter = "BUFF"}, - -- Resilient (Resilience, Stormstrike/Shocks) [Totem of Indomitability / Totem of Survival] - {spellID = 43839, unitID = "player", caster = "player", filter = "BUFF"}, - -- Spiritual Trance (Spell Power, Chain Heal) [Totem of Calming Tides] - {spellID = 67388, unitID = "player", caster = "player", filter = "BUFF"}, - -- Totem of the Elemental Plane (Haste, Lightning Bolt) [Totem of the Elemental Plane] - {spellID = 60771, unitID = "player", caster = "player", filter = "BUFF"}, - -- Volcanic Fury (Attack Power, Lava Lash) [Totem of Quaking Earth] - {spellID = 67391, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Aggression (Attack Power, Lava Lash) [Savage Gladiator's Totem of Indomitability] - {spellID = 60544, unitID = "player", caster = "player", filter = "BUFF"}, - -- Savage Magic (Spell Power, Shocks) [Savage Gladiator's Totem of Survival] - {spellID = 60565, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Aggression (Attack Power, Lava Lash) [Hateful Gladiator's Totem of Indomitability] - {spellID = 60547, unitID = "player", caster = "player", filter = "BUFF"}, - -- Hateful Magic (Spell Power, Shocks) [Hateful Gladiator's Totem of Survival] - {spellID = 60566, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Aggression (Attack Power, Lava Lash) [Deadly Gladiator's Totem of Indomitability] - {spellID = 60549, unitID = "player", caster = "player", filter = "BUFF"}, - -- Deadly Magic (Spell Power, Shocks) [Deadly Gladiator's Totem of Survival] - {spellID = 60567, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Libram of Fortitude (Attack Power, Lava Lash) [Furious Gladiator's Totem of Indomitability] - {spellID = 60551, unitID = "player", caster = "player", filter = "BUFF"}, - -- Furious Gladiator's Idol of Steadfastness (Spell Power, Shocks) [Furious Gladiator's Totem of Survival] - {spellID = 60568, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Aggression (Attack Power, Lava Lash) [Relentless Gladiator's Totem of Indomitability] - {spellID = 60553, unitID = "player", caster = "player", filter = "BUFF"}, - -- Relentless Survival (Spell Power, Shocks) [Relentless Gladiator's Totem of Survival] - {spellID = 60569, unitID = "player", caster = "player", filter = "BUFF"}, - -- Fury of the Gladiator (Attack Power, Lava Lash) [Wrathful Gladiator's Totem of Indomitability] - {spellID = 60555, unitID = "player", caster = "player", filter = "BUFF"}, - -- Intuition of the Gladiator (Spell Power, Shocks) [Wrathful Gladiator's Totem of Survival] - {spellID = 60570, unitID = "player", caster = "player", filter = "BUFF"}, - -- Trinkets -- Class -- Energized Shield (Special, Use) [Wushoolay's Charm of Spirits] @@ -6789,40 +6459,36 @@ C["filger_spells"] = { {spellID = 58861, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Earthbind {spellID = 3600, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Earthquake + {spellID = 86861, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Electrified [Worldbreaker Garb] {spellID = 64930, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Flame Shock {spellID = 8050, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Frost Shock r1 + -- Frost Shock {spellID = 8056, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r2 - {spellID = 8058, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r3 - {spellID = 10472, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r4 - {spellID = 10473, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r5 - {spellID = 25464, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r6 - {spellID = 49235, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Frost Shock r7 - {spellID = 49236, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frostbrand Attack {spellID = 8034, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames + {spellID = 77661, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Stoneclaw Totem {spellID = 39796, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Stormstrike - {spellID = 17364, unitID = "target", caster = "all", filter = "DEBUFF"}, + {spellID = 17364, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Twin Howl {spellID = 58857, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Unleash Frost + {spellID = 73682, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Item Sets -- Lava Burst (DoT, Proc) [Nobundo's Regalia / Thrall's Regalia] {spellID = 71824, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Weapons -- Gutgore Ripper (Special, Proc) [Rusted Gutgore Ripper] @@ -6917,6 +6583,10 @@ C["filger_spells"] = { BarWidth = 189, Position = {"LEFT", PVE_PVP_CC_Anchor}, + -- Bind Elemental + {spellID = 76780, unitID = "focus", caster = "all", filter = "DEBUFF"}, + -- Earth's Grasp + {spellID = 53019, unitID = "focus", caster = "all", filter = "DEBUFF"}, -- Hex {spellID = 51514, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, }, @@ -6934,6 +6604,8 @@ C["filger_spells"] = { {spellID = 2825, filter = "CD"}, -- Chain Lightning {spellID = 421, filter = "CD"}, + -- Cleansing Waters + {spellID = 86961, filter = "CD"}, -- Earth Elemental Totem {spellID = 2062, filter = "CD"}, -- Earth Shock @@ -6952,6 +6624,8 @@ C["filger_spells"] = { {spellID = 8056, filter = "CD"}, -- Grounding Totem {spellID = 8177, filter = "CD"}, + -- Healing Rain + {spellID = 73920, filter = "CD"}, -- Heroism {spellID = 32182, filter = "CD"}, -- Hex @@ -6964,12 +6638,18 @@ C["filger_spells"] = { {spellID = 16190, filter = "CD"}, -- Nature's Swiftness {spellID = 16188, filter = "CD"}, + -- Primal Strike + {spellID = 73899, filter = "CD"}, -- Reincarnation {spellID = 20608, filter = "CD"}, -- Riptide {spellID = 61295, filter = "CD"}, -- Shamanistic Rage {spellID = 30823, filter = "CD"}, + -- Spirit Link Totem + {spellID = 98008, filter = "CD"}, + -- Spiritwalker's Grace + {spellID = 79206, filter = "CD"}, -- Stoneclaw Totem {spellID = 5730, filter = "CD"}, -- Stormstrike @@ -6978,6 +6658,8 @@ C["filger_spells"] = { {spellID = 51490, filter = "CD"}, -- Tidal Force {spellID = 55198, filter = "CD"}, + -- Unleash Elements + {spellID = 73680, filter = "CD"}, -- Wind Shear {spellID = 57994, filter = "CD"}, @@ -6993,7 +6675,7 @@ C["filger_spells"] = { -- Gift of the Naaru (Draenei) {spellID = 28880, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -7022,74 +6704,64 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", P_BUFF_ICON_Anchor}, - -- Amplify Curse - -- {spellID = 18288, unitID = "player", caster = "player", filter = "BUFF"}, -- Backdraft {spellID = 54274, unitID = "player", caster = "player", filter = "BUFF"}, -- Blood Pact (Imp) -- {spellID = 6307, unitID = "player", caster = "all", filter = "BUFF"}, -- Consume Shadows (Voidwalker) -- {spellID = 17767, unitID = "pet", caster = "all", filter = "BUFF"}, - -- Demonic Empowerment (Imp - Increased Critical Strike) - {spellID = 54444, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + -- Dark Intent + {spellID = 85767, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demon Soul: Felguard + {spellID = 79462, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demon Soul: Felhunter + {spellID = 79460, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demon Soul: Imp + {spellID = 79459, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demon Soul: Succubus + {spellID = 79463, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demon Soul: Voidwalker + {spellID = 79464, unitID = "player", caster = "player", filter = "BUFF"}, -- Demonic Empowerment (Voidwalker - Increased Health/Increased Threat Generation) - {spellID = 54443, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54443, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Empowerment (Succubus - Improved Invisibility) - {spellID = 54436, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Demonic Empowerment (Felguard - Increased Attack Speed/CC Immunity) - {spellID = 54508, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54436, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, + -- Demonic Empowerment (Felguard - CC Immunity) + {spellID = 54508, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Pact -- {spellID = 48090, unitID = "player", caster = "player", filter = "BUFF"}, + -- Demonic Rebirth + {spellID = 88448, unitID = "player", caster = "player", filter = "BUFF"}, -- Eye of Kilrogg -- {spellID = 126, unitID = "player", caster = "player", filter = "BUFF"}, - --[[ - -- Fire Shield r1 (Imp) - {spellID = 2947, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r2 (Imp) - {spellID = 8316, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r3 (Imp) - {spellID = 8317, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r4 (Imp) - {spellID = 11770, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r5 (Imp) - {spellID = 11771, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r6 (Imp) - {spellID = 27269, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Fire Shield r7 (Imp) - {spellID = 47983, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - --]] -- Health Funnel -- {spellID = 755, unitID = "player", caster = "player", filter = "BUFF"}, -- Hellfire -- {spellID = 1949, unitID = "player", caster = "player", filter = "BUFF"}, -- Immolation Aura (Metamorphosis) {spellID = 50589, unitID = "player", caster = "player", filter = "BUFF"}, - -- Life Tap (Glyph of Life Tap) - {spellID = 63321, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --[[ - -- Master Demonologist (Imp - Increased Fire Damage) - {spellID = 23759, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Master Demonologist (Voidwalker - Physical Damage Reduction) - {spellID = 23760, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Master Demonologist (Succubus - Increased Shadow Damage) - {spellID = 23761, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Master Demonologist (Felhunter - Spell Damage Reduction) - {spellID = 23762, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Master Demonologist (Felguard - Increased Damage/Damage Reduction) - {spellID = 35702, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - --]] -- Metamorphosis {spellID = 47241, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Ward + {spellID = 91711, unitID = "player", caster = "player", filter = "BUFF"}, -- Paranoia (Felhunter) -- {spellID = 19480, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Phase Shift (Imp) -- {spellID = 4511, unitID = "pet", caster = "all", filter = "BUFF"}, - -- Pyroclasm - {spellID = 18093, unitID = "player", caster = "player", filter = "BUFF"}, -- Sacrifice (Voidwalker) {spellID = 7812, unitID = "player", caster = "player", filter = "BUFF"}, -- Shadow Ward {spellID = 6229, unitID = "player", caster = "player", filter = "BUFF"}, + -- Soul Harvest + {spellID = 79268, unitID = "player", caster = "player", filter = "BUFF"}, + -- Soulburn + {spellID = 74434, unitID = "player", caster = "player", filter = "BUFF"}, + -- Soulburn: Demonic Circle + {spellID = 79438, unitID = "player", caster = "player", filter = "BUFF"}, + -- Soulburn: Healthstone + {spellID = 79437, unitID = "player", caster = "player", filter = "BUFF"}, + -- Soulburn: Searing Pain + {spellID = 79440, unitID = "player", caster = "player", filter = "BUFF"}, -- Soul Link -- {spellID = 25228, unitID = "player", caster = "player", filter = "BUFF"}, }, @@ -7113,8 +6785,18 @@ C["filger_spells"] = { {spellID = 64368, unitID = "player", caster = "player", filter = "BUFF"}, -- Molten Core {spellID = 47383, unitID = "player", caster = "player", filter = "BUFF"}, - -- Nether Protection - {spellID = 30299, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Arcane) + {spellID = 54373, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Fire) + {spellID = 54371, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Frost) + {spellID = 54372, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Holy) + {spellID = 54370, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Nature) + {spellID = 54375, unitID = "player", caster = "player", filter = "BUFF"}, + -- Nether Protection (Shadow) + {spellID = 54374, unitID = "player", caster = "player", filter = "BUFF"}, -- Shadow Trance {spellID = 17941, unitID = "player", caster = "player", filter = "BUFF"}, @@ -7522,70 +7204,38 @@ C["filger_spells"] = { -- Aftermath {spellID = 18118, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Challenging Howl (Metamorphosis) - {spellID = 59671, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Aura of Foreboding + {spellID = 93975, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Bane of Agony + {spellID = 980, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Bane of Doom + {spellID = 603, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Bane of Havoc + {spellID = 80240, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Burning Embers + {spellID = 85421, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Conflagrate {spellID = 17962, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Corruption r1 + -- Corruption {spellID = 172, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r2 - {spellID = 6222, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r3 - {spellID = 6223, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r4 - {spellID = 7648, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r5 - {spellID = 11671, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r6 - {spellID = 11672, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r7 - {spellID = 25311, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r8 - {spellID = 27216, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r9 - {spellID = 47812, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Corruption r10 - {spellID = 47813, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Cripple (Doomguard) {spellID = 20812, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Agony - {spellID = 980, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Curse of Doom - {spellID = 603, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Curse of Exhaustion {spellID = 18223, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Curse of Idiocy - {spellID = 1010, unitID = "target", caster = "all", filter = "DEBUFF"}, + -- Curse of Gul'dan + {spellID = 86000, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Curse of Tongues {spellID = 1714, unitID = "target", caster = "all", filter = "DEBUFF"}, - -- Curse of Weakness r1 + -- Curse of Weakness {spellID = 702, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r2 - {spellID = 1108, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r3 - {spellID = 6205, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r4 - {spellID = 7646, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r5 - {spellID = 11707, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r6 - {spellID = 11708, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r7 - {spellID = 27224, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r8 - {spellID = 30909, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Curse of Weakness r9 - {spellID = 50511, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Curse of the Elements {spellID = 1490, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Death Coil {spellID = 6789, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Demon Charge (Metamorphosis) + -- Demon Leap (Metamorphosis) {spellID = 60995, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Drain Life {spellID = 689, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Drain Mana - {spellID = 5138, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Drain Soul {spellID = 1120, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Enslave Demon @@ -7608,38 +7258,20 @@ C["filger_spells"] = { {spellID = 6358, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Shadowburn -- {spellID = 29341, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Shadowflame r1 + -- Shadowflame {spellID = 47960, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Shadowflame r2 - {spellID = 61291, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Shadowfury {spellID = 30283, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Shadow Embrace {spellID = 32386, unitID = "target", caster = "all", filter = "DEBUFF"}, - -- Shadow Vulnerability r1 (Improved Shadow Bolt) + -- Shadow Vulnerability (Improved Shadow Bolt) {spellID = 17794, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Shadow Vulnerability r2 (Improved Shadow Bolt) - {spellID = 17798, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Shadow Vulnerability r3 (Improved Shadow Bolt) - {spellID = 17797, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Shadow Vulnerability r4 (Improved Shadow Bolt) - {spellID = 17799, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Shadow Vulnerability r5 (Improved Shadow Bolt) - {spellID = 17800, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Spell Lock (Felhunter) {spellID = 24259, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Rend (Doomguard) {spellID = 21949, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Unstable Affliction r1 + -- Unstable Affliction {spellID = 30108, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Unstable Affliction r2 - {spellID = 30404, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Unstable Affliction r3 - {spellID = 30405, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Unstable Affliction r4 - {spellID = 47841, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Unstable Affliction r5 - {spellID = 47843, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Unstable Affliction (Silence) {spellID = 31117, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, @@ -7648,8 +7280,10 @@ C["filger_spells"] = { {spellID = 32108, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Enchants -- Deathfrost [Enchant Weapon - Deathfrost] @@ -7694,24 +7328,26 @@ C["filger_spells"] = { Position = {"TOP", COOLDOWN_Anchor}, -- Self - -- Challenging Howl (Metamorphosis) - {spellID = 59671, filter = "CD"}, -- Chaos Bolt {spellID = 50796, filter = "CD"}, -- Conflagrate {spellID = 17962, filter = "CD"}, - -- Curse of Doom - {spellID = 603, filter = "CD"}, -- Death Coil {spellID = 6789, filter = "CD"}, - -- Demon Charge (Metamorphosis) + -- Demon Leap (Metamorphosis) {spellID = 54785, filter = "CD"}, + -- Demon Soul + {spellID = 77801, filter = "CD"}, -- Demonic Circle: Teleport {spellID = 48020, filter = "CD"}, -- Demonic Empowerment {spellID = 47193, filter = "CD", absID = true}, + -- Demonic Rebirth + {spellID = 88448, filter = "CD"}, -- Fel Domination {spellID = 18708, filter = "CD"}, + -- Hand of Gul'dan + {spellID = 71521, filter = "CD"}, -- Haunt {spellID = 48181, filter = "CD"}, -- Howl of Terror @@ -7722,14 +7358,12 @@ C["filger_spells"] = { {spellID = 1122, filter = "CD", absID = true}, -- Metamorphosis {spellID = 47241, filter = "CD"}, - -- Ritual of Doom - {spellID = 18540, filter = "CD"}, + -- Nether Ward + {spellID = 91711, filter = "CD"}, -- Ritual of Souls {spellID = 29893, filter = "CD"}, -- Ritual of Summoning {spellID = 698, filter = "CD"}, - -- Shadow Cleave (Metamorphosis) - {spellID = 50581, filter = "CD"}, -- Shadow Ward {spellID = 6229, filter = "CD"}, -- Shadowburn @@ -7740,8 +7374,14 @@ C["filger_spells"] = { {spellID = 30283, filter = "CD"}, -- Soul Fire {spellID = 6353, filter = "CD"}, + -- Soul Harvest + {spellID = 79268, filter = "CD"}, + -- Soulburn + {spellID = 74434, filter = "CD"}, -- Soulshatter {spellID = 29858, filter = "CD"}, + -- Summon Doomguard + {spellID = 18540, filter = "CD"}, -- Pets -- Intercept (Felguard) @@ -7749,7 +7389,7 @@ C["filger_spells"] = { -- Rain of Fire (Doomguard) {spellID = 4629, filter = "CD", absID = true}, -- Spell Lock (Felhunter) - {spellID = 19244, filter = "CD"}, + {spellID = 19647, filter = "CD"}, -- Suffering (Voidwalker) {spellID = 17735, filter = "CD"}, @@ -7802,32 +7442,26 @@ C["filger_spells"] = { {spellID = 18499, unitID = "player", caster = "player", filter = "BUFF"}, -- Bladestorm {spellID = 46924, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Bloodrage - {spellID = 29131, unitID = "player", caster = "player", filter = "BUFF"}, -- Bloodthirst {spellID = 23885, unitID = "player", caster = "player", filter = "BUFF"}, -- Commanding Shout {spellID = 469, unitID = "player", caster = "all", filter = "BUFF"}, + -- Deadly Calm + {spellID = 85730, unitID = "player", caster = "player", filter = "BUFF"}, -- Death Wish {spellID = 12292, unitID = "player", caster = "player", filter = "BUFF"}, -- Enrage (Improved Defensive Stance) {spellID = 57514, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enrage r1 (Wrecking Crew) + -- Enrage (Wrecking Crew) {spellID = 57518, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enrage r2 (Wrecking Crew) - {spellID = 57519, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enrage r3 (Wrecking Crew) - {spellID = 57520, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enrage r4 (Wrecking Crew) - {spellID = 57521, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Enrage r5 (Wrecking Crew) - {spellID = 57522, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Enraged Regeneration {spellID = 55694, unitID = "player", caster = "player", filter = "BUFF"}, -- Flurry {spellID = 12966, unitID = "player", caster = "player", filter = "BUFF"}, -- Glyph of Blocking {spellID = 58374, unitID = "player", caster = "player", filter = "BUFF"}, + -- Inner Rage + {spellID = 1134, unitID = "player", caster = "player", filter = "BUFF"}, -- Last Stand {spellID = 12975, unitID = "player", caster = "player", filter = "BUFF"}, -- Rampage @@ -7859,24 +7493,38 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs + -- Battle Trance + {spellID = 12964, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Blood Craze {spellID = 16488, unitID = "player", caster = "player", filter = "BUFF"}, + -- Die by the Sword + {spellID = 85386, unitID = "player", caster = "player", filter = "BUFF"}, -- Enrage {spellID = 12880, unitID = "player", caster = "player", filter = "BUFF", absID = true}, - -- Glyph of Revenge - {spellID = 58363, unitID = "player", caster = "player", filter = "BUFF"}, + -- Hold the Line + {spellID = 84619, unitID = "player", caster = "player", filter = "BUFF"}, + -- Incite + {spellID = 86627, unitID = "player", caster = "player", filter = "BUFF"}, -- Juggernaut {spellID = 65156, unitID = "player", caster = "player", filter = "BUFF"}, - -- Overpower Ready! (Glyph of Overpower) - {spellID = 68051, unitID = "player", caster = "player", filter = "BUFF"}, + -- Meat Cleaver + {spellID = 85738, unitID = "player", caster = "player", filter = "BUFF"}, + -- Rude Interruption + {spellID = 86662, unitID = "player", caster = "player", filter = "BUFF"}, -- Second Wind {spellID = 29841, unitID = "player", caster = "player", filter = "BUFF", absID = true}, -- Slam! {spellID = 46916, unitID = "player", caster = "player", filter = "BUFF"}, + -- Slaughter + {spellID = 84584, unitID = "player", caster = "player", filter = "BUFF"}, -- Sudden Death {spellID = 52437, unitID = "player", caster = "player", filter = "BUFF"}, -- Taste for Blood {spellID = 60503, unitID = "player", caster = "player", filter = "BUFF"}, + -- Thunderstruck + {spellID = 87095, unitID = "player", caster = "player", filter = "BUFF"}, + -- Victorious + {spellID = 82368, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Battle Rush (Physical Haste, Proc) [Destroyer Armor] @@ -8368,6 +8016,8 @@ C["filger_spells"] = { {spellID = 1161, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Charge Stun {spellID = 7922, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Colossus Smash + {spellID = 86346, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Concussion Blow {spellID = 12809, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Demoralizing Shout @@ -8388,34 +8038,12 @@ C["filger_spells"] = { {spellID = 20511, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Intimidating Shout (Fear) {spellID = 5246, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Mocking Blow - {spellID = 694, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Mortal Strike {spellID = 12294, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Piercing Howl {spellID = 12323, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Rend r1 + -- Rend {spellID = 772, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r2 - {spellID = 6546, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r3 - {spellID = 6547, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r4 - {spellID = 6548, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r5 - {spellID = 11572, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r6 - {spellID = 11573, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r7 - {spellID = 11574, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r8 - {spellID = 25208, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r9 - {spellID = 46845, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Rend r10 - {spellID = 47465, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Revenge Stun - {spellID = 11574, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Shattering Throw {spellID = 64382, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Shockwave @@ -8424,32 +8052,18 @@ C["filger_spells"] = { {spellID = 18498, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Sunder Armor {spellID = 7386, unitID = "target", caster = "all", filter = "DEBUFF"}, - -- Thunder Clap r1 + -- Throwdown + {spellID = 85388, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Thunder Clap {spellID = 6343, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r2 - {spellID = 8198, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r3 - {spellID = 8204, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r4 - {spellID = 8205, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r5 - {spellID = 11580, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r6 - {spellID = 11581, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r7 - {spellID = 25264, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r8 - {spellID = 47501, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, - -- Thunder Clap r9 - {spellID = 47502, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Trauma {spellID = 46856, unitID = "target", caster = "all", filter = "DEBUFF"}, - -- Unrelenting Assault - {spellID = 64849, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Trinket Effects - -- Searing Flames (DoT, Proc) [Purified Shard of the Gods / Shiny Shard of the Gods] - {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Searing Flames (DoT, Proc) [Purified Shard of the Gods] + {spellID = 69729, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Searing Flames (DoT, Proc) [Shiny Shard of the Gods] + {spellID = 69730, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Weapons -- Gutgore Ripper (Special, Proc) [Rusted Gutgore Ripper] @@ -8516,16 +8130,18 @@ C["filger_spells"] = { {spellID = 18499, filter = "CD"}, -- Bladestorm {spellID = 46924, filter = "CD", absID = true}, - -- Bloodrage - {spellID = 2687, filter = "CD"}, -- Bloodthirst {spellID = 23881, filter = "CD"}, -- Challenging Shout {spellID = 1161, filter = "CD"}, -- Charge {spellID = 100, filter = "CD"}, + -- Colossus Smash + {spellID = 86346, filter = "CD"}, -- Concussion Blow {spellID = 12809, filter = "CD"}, + -- Deadly Calm + {spellID = 85730, filter = "CD"}, -- Death Wish {spellID = 12292, filter = "CD"}, -- Disarm @@ -8534,8 +8150,14 @@ C["filger_spells"] = { {spellID = 55694, filter = "CD"}, -- Heroic Fury {spellID = 60970, filter = "CD"}, + -- Heroic Leap + {spellID = 6544, filter = "CD"}, + -- Heroic Strike + {spellID = 78, filter = "CD"}, -- Heroic Throw {spellID = 57755, filter = "CD"}, + -- Inner Rage + {spellID = 1134, filter = "CD"}, -- Intercept {spellID = 20252, filter = "CD"}, -- Intervene @@ -8544,22 +8166,24 @@ C["filger_spells"] = { {spellID = 5246, filter = "CD"}, -- Last Stand {spellID = 12975, filter = "CD"}, - -- Mocking Blow - {spellID = 694, filter = "CD"}, -- Mortal Strike {spellID = 12294, filter = "CD"}, -- Overpower {spellID = 7384, filter = "CD"}, -- Pummel {spellID = 6552, filter = "CD", absID = true}, + -- Raging Blow + {spellID = 85288, filter = "CD"}, + -- Rallying Cry + {spellID = 97462, filter = "CD"}, -- Recklessness {spellID = 1719, filter = "CD"}, -- Retaliation {spellID = 20230, filter = "CD"}, -- Revenge {spellID = 6572, filter = "CD"}, - -- Shield Bash - {spellID = 72, filter = "CD"}, + -- Shattering Throw + {spellID = 64382, filter = "CD"}, -- Shield Block {spellID = 2565, filter = "CD"}, -- Shield Slam @@ -8570,10 +8194,14 @@ C["filger_spells"] = { {spellID = 46968, filter = "CD"}, -- Spell Reflection {spellID = 23920, filter = "CD"}, + -- Strike + {spellID = 88161, filter = "CD", absID = true}, -- Sweeping Strikes {spellID = 12328, filter = "CD"}, -- Taunt {spellID = 355, filter = "CD"}, + -- Throwdown + {spellID = 85388, filter = "CD"}, -- Thunder Clap {spellID = 6343, filter = "CD", absID = true}, -- Whirlwind @@ -8599,7 +8227,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, @@ -8741,10 +8369,14 @@ C["filger_spells"] = { {spellID = 45401, unitID = "player", caster = "player", filter = "BUFF"}, -- Raid Amplifiers + -- Ancient Hysteria + {spellID = 90355, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Bloodlust {spellID = 2825, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Heroism {spellID = 32182, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + -- Time Warp + {spellID = 80353, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Drums of Battle {spellID = 35476, unitID = "player", caster = "all", filter = "BUFF"}, -- Drums of War @@ -8811,26 +8443,26 @@ C["filger_spells"] = { {spellID = 50461, unitID = "player", caster = "all", filter = "BUFF"}, -- Aura Mastery {spellID = 31821, unitID = "player", caster = "all", filter = "BUFF"}, - -- Divine Guardian - {spellID = 70940, unitID = "player", caster = "all", filter = "BUFF"}, -- Divine Sacrifice {spellID = 64205, unitID = "player", caster = "all", filter = "BUFF"}, -- Hand of Protection {spellID = 1022, unitID = "player", caster = "all", filter = "BUFF"}, -- Hand of Sacrifice {spellID = 6940, unitID = "player", caster = "all", filter = "BUFF"}, - -- Lay on Hands (Physical Damage Reduction) - {spellID = 20233, unitID = "player", caster = "all", filter = "BUFF"}, + -- Glyph of Power Word: Barrier + -- {spellID = 90785, unitID = "player", caster = "all", filter = "BUFF"}, -- Guardian Spirit {spellID = 47788, unitID = "player", caster = "all", filter = "BUFF"}, -- Pain Suppression {spellID = 33206, unitID = "player", caster = "all", filter = "BUFF"}, + -- Power Word: Barrier + {spellID = 81782, unitID = "player", caster = "all", filter = "BUFF"}, -- Other -- Innervate {spellID = 29166, unitID = "player", caster = "all", filter = "BUFF"}, -- Hymn of Hope - {spellID = 64901, unitID = "player", caster = "all", filter = "BUFF"}, + {spellID = 64904, unitID = "player", caster = "all", filter = "BUFF"}, -- Mana Tide {spellID = 16191, unitID = "player", caster = "all", filter = "BUFF"}, -- Hand of Freedom @@ -8839,8 +8471,6 @@ C["filger_spells"] = { {spellID = 6346, unitID = "player", caster = "all", filter = "BUFF"}, -- Grounding Totem Effect {spellID = 8178, unitID = "player", caster = "all", filter = "BUFF"}, - -- Divine Intervention - {spellID = 19752, unitID = "player", caster = "all", filter = "BUFF"}, -- Hysteria / Unholy Frenzy {spellID = 49016, unitID = "player", caster = "all", filter = "BUFF"}, -- Focus Magic @@ -8849,12 +8479,10 @@ C["filger_spells"] = { {spellID = 130, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Beacon of Light {spellID = 53563, unitID = "player", caster = "all", filter = "BUFF"}, - -- Sacred Shield - {spellID = 53601, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Body and Soul r1 + -- Holy Radiance + {spellID = 82327, unitID = "player", caster = "all", filter = "BUFF"}, + -- Body and Soul {spellID = 64128, unitID = "player", caster = "all", filter = "BUFF", absID = true}, - -- Body and Soul r2 - {spellID = 65081, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Levitate {spellID = 1706, unitID = "player", caster = "all", filter = "BUFF", absID = true}, -- Power Infusion @@ -8867,6 +8495,8 @@ C["filger_spells"] = { -- {spellID = 20707, unitID = "player", caster = "all", filter = "BUFF"}, -- Intervene {spellID = 3411, unitID = "player", caster = "all", filter = "BUFF"}, + -- Rallying Cry + {spellID = 97463, unitID = "player", caster = "all", filter = "BUFF"}, -- Safeguard {spellID = 46946, unitID = "player", caster = "all", filter = "BUFF"}, -- Vigilance @@ -8965,38 +8595,20 @@ C["filger_spells"] = { {spellID = 49203, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Druid - -- Bash r1 + -- Bash {spellID = 5211, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Bash r2 - {spellID = 6798, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Bash r3 - {spellID = 8983, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Celestial Focus (Starfire Stun) - {spellID = 16922, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Cyclone {spellID = 33786, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Hibernate {spellID = 2637, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Maim {spellID = 22570, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Pounce r1 + -- Pounce {spellID = 9005, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Pounce r2 - {spellID = 9823, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Pounce r3 - {spellID = 9827, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Pounce r4 - {spellID = 27006, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Pounce r5 - {spellID = 49803, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Hunter -- Charge (Boar) {spellID = 25999, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Chimera Shot - Scorpid - {spellID = 53359, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Freezing Arrow Effect - {spellID = 60210, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Freezing Trap Effect {spellID = 3355, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Intimidation @@ -9011,14 +8623,8 @@ C["filger_spells"] = { {spellID = 64346, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Impact {spellID = 12355, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Polymorph r1 + -- Polymorph {spellID = 118, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r2 - {spellID = 12824, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r3 - {spellID = 12825, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Polymorph r4 - {spellID = 12826, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Polymorph: Black Cat {spellID = 61305, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Polymorph: Pig @@ -9035,48 +8641,32 @@ C["filger_spells"] = { {spellID = 59634, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Paladin - -- Hammer of Justice r1 + -- Hammer of Justice {spellID = 853, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Hammer of Justice r2 - {spellID = 5588, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Hammer of Justice r3 - {spellID = 5589, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Hammer of Justice r4 - {spellID = 10308, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Holy Wrath r1 + -- Holy Wrath {spellID = 2812, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Holy Wrath r2 - {spellID = 10318, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Holy Wrath r3 - {spellID = 27139, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Holy Wrath r4 - {spellID = 48816, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Holy Wrath r5 - {spellID = 48817, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Repentance {spellID = 20066, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Seal of Justice (Stun) - {spellID = 20170, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Turn Evil {spellID = 10326, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Priest + -- Holy Word: Chastise + {spellID = 88625, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Mind Control {spellID = 605, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Paralysis + {spellID = 87193, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Psychic Horror (Horror) {spellID = 64044, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Psychic Horror (Disarm) {spellID = 64058, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Psychic Scream r1 + -- Psychic Scream {spellID = 8122, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Psychic Scream r2 - {spellID = 8124, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Psychic Scream r3 - {spellID = 10888, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Psychic Scream r4 - {spellID = 10890, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Shackle Undead {spellID = 9484, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Sin and Punishment + {spellID = 87204, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Rogue -- Blind @@ -9085,22 +8675,10 @@ C["filger_spells"] = { {spellID = 1833, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Dismantle {spellID = 51722, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Gouge r1 + -- Gouge {spellID = 1776, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Gouge r2 - {spellID = 1777, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Gouge r3 - {spellID = 8629, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Gouge r4 - {spellID = 11285, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Gouge r5 - {spellID = 11286, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Gouge r6 - {spellID = 38764, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Kidney Shot r1 + -- Kidney Shot {spellID = 408, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Kidney Shot r2 - {spellID = 8643, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Sap {spellID = 6770, unitID = "player", caster = "all", filter = "DEBUFF"}, @@ -9109,26 +8687,16 @@ C["filger_spells"] = { {spellID = 39796, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Warlock - -- Banish r1 + -- Aura of Foreboding + {spellID = 93975, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Banish {spellID = 710, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Banish r2 - {spellID = 18647, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Death Coil r1 + -- Death Coil {spellID = 6789, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Death Coil r2 - {spellID = 17925, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Death Coil r3 - {spellID = 17926, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Death Coil r4 - {spellID = 27223, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Demon Charge (Metamorphosis) + -- Demon Leap (Metamorphosis) {spellID = 60995, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Fear r1 + -- Fear {spellID = 5782, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Fear r2 - {spellID = 6213, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Fear r3 - {spellID = 6215, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Howl of Terror {spellID = 5484, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Intercept (Felguard) @@ -9145,18 +8713,16 @@ C["filger_spells"] = { {spellID = 12809, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Disarm {spellID = 676, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Intercept r1 + -- Intercept {spellID = 20253, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Intercept r2 - {spellID = 20614, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Intercept r3 - {spellID = 20615, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Intimidating Shout (Cower) {spellID = 20511, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Intimidating Shout (Fear) {spellID = 5246, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Shockwave {spellID = 46968, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Throwdown + {spellID = 85388, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Racial -- War Stomp @@ -9165,6 +8731,12 @@ C["filger_spells"] = { -- Silences -- Strangulate {spellID = 47476, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Skull Bash (Bear) + {spellID = 80964, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Skull Bash (Cat) + {spellID = 80965, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Solar Beam + {spellID = 78675, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Silencing Shot {spellID = 34490, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Silenced - Improved Counterspell @@ -9195,38 +8767,10 @@ C["filger_spells"] = { -- Roots -- Chains of Ice {spellID = 53534, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Entangling Roots r1 + -- Entangling Roots {spellID = 339, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r2 - {spellID = 1062, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r3 - {spellID = 5195, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r4 - {spellID = 5196, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r5 - {spellID = 9852, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r6 - {spellID = 9853, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r7 - {spellID = 26989, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r8 - {spellID = 53308, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r1 (Nature's Grasp) + -- Entangling Roots (Nature's Grasp) {spellID = 19975, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r2 (Nature's Grasp) - {spellID = 19974, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r3 (Nature's Grasp) - {spellID = 19973, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r4 (Nature's Grasp) - {spellID = 19972, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r5 (Nature's Grasp) - {spellID = 19971, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r6 (Nature's Grasp) - {spellID = 19970, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r7 (Nature's Grasp) - {spellID = 27010, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Entangling Roots r8 (Nature's Grasp) - {spellID = 53313, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Feral Charge - Bear {spellID = 16979, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Counterattack @@ -9235,18 +8779,12 @@ C["filger_spells"] = { {spellID = 19185, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Freeze (Water Elemental) {spellID = 33395, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Nova r1 + -- Frost Nova {spellID = 122, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Nova r2 - {spellID = 865, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Nova r3 - {spellID = 6131, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Nova r4 - {spellID = 10230, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Nova r5 - {spellID = 27088, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbite - {spellID = 12494, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Ring of Frost + {spellID = 82691, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Shattered Barrier + {spellID = 55080, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Glyph of Hamstring {spellID = 58373, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Improved Hamstring @@ -9257,112 +8795,40 @@ C["filger_spells"] = { {spellID = 55741, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Icy Clutch (Chilblains) {spellID = 50434, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Fungal Growth + -- {spellID = 81288, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Concussive Barrage {spellID = 35101, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Concussive Shot {spellID = 5116, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Frost Trap Aura + -- Ice Trap {spellID = 13810, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Wing Clip {spellID = 2974, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r1 + -- Blast Wave {spellID = 11113, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r2 - {spellID = 13018, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r3 - {spellID = 13019, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r4 - {spellID = 13020, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r5 - {spellID = 13021, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r6 - {spellID = 27133, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Blast Wave r7 - {spellID = 33933, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - --[[ - -- Chilled r1 (Blizzard) - {spellID = 12484, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Chilled r2 (Blizzard) - {spellID = 12485, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Chilled r3 (Blizzard) - {spellID = 12486, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - --]] + -- Chilled (Blizzard) + -- {spellID = 12484, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Chilled (Frost Armor) - -- {spellID = 6136, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- {spellID = 7321, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Chilled (Ice Armor) -- {spellID = 7321, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r1 + -- Cone of Cold {spellID = 120, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r2 - {spellID = 8492, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r3 - {spellID = 10159, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r4 - {spellID = 10160, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r5 - {spellID = 10161, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r6 - {spellID = 27087, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r7 - {spellID = 42930, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Cone of Cold r8 - {spellID = 42931, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r1 + -- Deep Freeze + {spellID = 44572, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Frostbolt {spellID = 116, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r2 - {spellID = 205, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r3 - {spellID = 837, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r4 - {spellID = 7322, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r5 - {spellID = 8406, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r6 - {spellID = 8407, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r7 - {spellID = 8408, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r8 - {spellID = 10179, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r9 - {spellID = 10180, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r10 - {spellID = 10181, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r11 - {spellID = 25304, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r12 - {spellID = 27071, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r13 - {spellID = 27072, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r14 - {spellID = 38697, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r15 - {spellID = 42841, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frostbolt r16 - {spellID = 42842, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Frostfire Bolt {spellID = 44614, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Frostfire Orb + {spellID = 84721, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Slow {spellID = 31589, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Avenger's Shield {spellID = 31935, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r1 + -- Mind Flay {spellID = 15407, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r2 - {spellID = 17311, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r3 - {spellID = 17312, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r4 - {spellID = 17313, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r5 - {spellID = 17314, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r6 - {spellID = 18807, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r7 - {spellID = 25387, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r8 - {spellID = 48155, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Mind Flay r9 - {spellID = 48156, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Blade Twisting (Dazed) {spellID = 31125, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Crippling Poison @@ -9371,22 +8837,12 @@ C["filger_spells"] = { {spellID = 26679, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Earthbind {spellID = 3600, unitID = "player", caster = "all", filter = "DEBUFF"}, - -- Frost Shock r1 + -- Frost Shock {spellID = 8056, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r2 - {spellID = 8058, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r3 - {spellID = 10472, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r4 - {spellID = 10473, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r5 - {spellID = 25464, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r6 - {spellID = 49235, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, - -- Frost Shock r7 - {spellID = 49236, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Frostbrand Attack {spellID = 8034, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Unleash Frost + {spellID = 73682, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Aftermath {spellID = 18118, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Cripple (Doomguard) @@ -9400,6 +8856,16 @@ C["filger_spells"] = { -- Piercing Howl {spellID = 12323, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Other + -- Dark Simulacrum + {spellID = 77606, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Cauterize + {spellID = 87023, unitID = "player", caster = "player", filter = "DEBUFF"}, + -- Smoke Bomb + {spellID = 76577, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Rocket Fuel Leak + {spellID = 94794, unitID = "player", caster = "player", filter = "DEBUFF"}, + -- Raids: Wrath of the Lich King Classic -- Mutated Slash (Mutated Abomination / Professor Putricide) {spellID = 70542, unitID = "target", caster = "all", filter = "DEBUFF"}, @@ -9411,7 +8877,6 @@ C["filger_spells"] = { --[[ -- Raids: Classic --]] - }, --[[ { diff --git a/ShestakUI/Config/Filters_Cata/Nameplates.lua b/ShestakUI/Config/Filters_Cata/Nameplates.lua index 8e64d3808..c60c811f1 100644 --- a/ShestakUI/Config/Filters_Cata/Nameplates.lua +++ b/ShestakUI/Config/Filters_Cata/Nameplates.lua @@ -20,35 +20,33 @@ T.DebuffWhiteList = { -- Death Knight [SpellName(55078)] = true, -- Blood Plague [SpellName(53534)] = true, -- Chains of Ice - [SpellName(50508)] = true, -- Crypt Fever [SpellName(56222)] = true, -- Dark Command [SpellName(43265)] = true, -- Death and Decay [SpellName(57603)] = true, -- Death Grip [SpellName(55741)] = true, -- Desecration - [SpellName(51726)] = true, -- Ebon Plague + [SpellName(65142)] = true, -- Ebon Plague [SpellName(55095)] = true, -- Frost Fever [SpellName(47481)] = true, -- Gnaw (Ghoul) [SpellName(49203)] = true, -- Hungering Cold [SpellName(50434)] = true, -- Icy Clutch (Chilblains) - [SpellName(49005)] = true, -- Mark of Blood + [SpellName(73975)] = true, -- Necrotic Strike + [SpellName(96265)] = true, -- Scarlet Fever [SpellName(47476)] = true, -- Strangulate [SpellName(49206)] = true, -- Summon Gargoyle [SpellName(50536)] = true, -- Unholy Blight - [SpellName(3439)] = true, -- Wandering Plague -- Druid [SpellName(5211)] = true, -- Bash - [SpellName(16922)] = true, -- Celestial Focus (Starfire Stun) [SpellName(5209)] = true, -- Challenging Roar [SpellName(33786)] = true, -- Cyclone [SpellName(99)] = true, -- Demoralizing Roar - [SpellName(60431)] = true, -- Earth and Moon + [SpellName(60433)] = true, -- Earth and Moon [SpellName(339)] = true, -- Entangling Roots -- [SpellName(19975)] = true, -- Entangling Roots (Nature's Grasp) [SpellName(770)] = true, -- Faerie Fire [SpellName(16857)] = true, -- Faerie Fire (Feral) [SpellName(45334)] = true, -- Feral Charge Effect [SpellName(50259)] = true, -- Feral Charge - Cat / Dazed - [SpellName(54820)] = true, -- Glyph of Rake + -- [SpellName(81288)] = true, -- Fungal Growth [SpellName(6795)] = true, -- Growl [SpellName(2637)] = true, -- Hibernate -- [SpellName(16914)] = true, -- Hurricane @@ -63,15 +61,18 @@ T.DebuffWhiteList = { [SpellName(9007)] = true, -- Pounce Bleed [SpellName(1822)] = true, -- Rake [SpellName(1079)] = true, -- Rip + [SpellName(80964)] = true, -- Skull Bash (Bear) + [SpellName(80965)] = true, -- Skull Bash (Cat) + -- [SpellName(82364)] = true, -- Skull Bash (Increased Mana Cost) [SpellName(2908)] = true, -- Soothe Animal + [SpellName(93402)] = true, -- Sunfire + [SpellName(77758)] = true, -- Thrash [SpellName(61391)] = true, -- Typhoon -- Hunter - [SpellName(19434)] = true, -- Aimed Shot -- [SpellName(1462)] = true, -- Beast Lore [SpellName(3674)] = true, -- Black Arrow [SpellName(25999)] = true, -- Charge (Boar) - [SpellName(53359)] = true, -- Chimera Shot - Scorpid [SpellName(35101)] = true, -- Concussive Barrage [SpellName(5116)] = true, -- Concussive Shot [SpellName(19306)] = true, -- Counterattack @@ -80,25 +81,23 @@ T.DebuffWhiteList = { [SpellName(19185)] = true, -- Entrapment [SpellName(53301)] = true, -- Explosive Shot [SpellName(13812)] = true, -- Explosive Trap Effect - [SpellName(34501)] = true, -- Expose Weakness [SpellName(34889)] = true, -- Fire Breath (Dragonhawk) [SpellName(1543)] = true, -- Flare - [SpellName(60210)] = true, -- Freezing Arrow Effect [SpellName(3355)] = true, -- Freezing Trap Effect - [SpellName(13810)] = true, -- Frost Trap Aura [SpellName(61394)] = true, -- Glyph of Freezing Trap [SpellName(1130)] = true, -- Hunter's Mark + [SpellName(13810)] = true, -- Ice Trap [SpellName(13797)] = true, -- Immolation Trap [SpellName(24394)] = true, -- Intimidation + [SpellName(88691)] = true, -- Marked for Death [SpellName(63468)] = true, -- Piercing Shots [SpellName(35387)] = true, -- Poison Spit (Serpent) [SpellName(1513)] = true, -- Scare Beast [SpellName(19503)] = true, -- Scatter Shot [SpellName(24640)] = true, -- Scorpid Poison (Scorpid) - [SpellName(3043)] = true, -- Scorpid Sting [SpellName(1978)] = true, -- Serpent Sting [SpellName(34490)] = true, -- Silencing Shot - [SpellName(3034)] = true, -- Viper Sting + [SpellName(82654)] = true, -- Widow Venom [SpellName(2974)] = true, -- Wing Clip [SpellName(19386)] = true, -- Wyvern Sting @@ -106,59 +105,57 @@ T.DebuffWhiteList = { [SpellName(11113)] = true, -- Blast Wave -- [SpellName(10)] = true, -- Blizzard -- [SpellName(12484)] = true, -- Chilled (Blizzard) - [SpellName(6136)] = true, -- Chilled (Frost Armor) + [SpellName(7321)] = true, -- Chilled (Frost Armor) -- [SpellName(7321)] = true, -- Chilled (Ice Armor) [SpellName(120)] = true, -- Cone of Cold + [SpellName(22959)] = true, -- Critical Mass [SpellName(44572)] = true, -- Deep Freeze [SpellName(31661)] = true, -- Dragon's Breath [SpellName(64346)] = true, -- Fiery Payback [SpellName(133)] = true, -- Fireball - [SpellName(22959)] = true, -- Fire Vulnerability (Improved Scorch) [SpellName(2120)] = true, -- Flamestrike [SpellName(122)] = true, -- Frost Nova - [SpellName(12494)] = true, -- Frostbite [SpellName(116)] = true, -- Frostbolt [SpellName(44614)] = true, -- Frostfire Bolt + [SpellName(84721)] = true, -- Frostfire Orb [SpellName(12654)] = true, -- Ignite [SpellName(12355)] = true, -- Impact [SpellName(44457)] = true, -- Living Bomb [SpellName(68391)] = true, -- Permafrost [SpellName(118)] = true, -- Polymorph [SpellName(11366)] = true, -- Pyroblast + [SpellName(92315)] = true, -- Pyroblast! + [SpellName(55080)] = true, -- Shattered Barrier [SpellName(18469)] = true, -- Silenced - Improved Counterspell [SpellName(31589)] = true, -- Slow [SpellName(12579)] = true, -- Winter's Chill -- Paladin [SpellName(31935)] = true, -- Avenger's Shield - [SpellName(53742)] = true, -- Blood Corruption + [SpellName(356110)] = true, -- Blood Corruption + [SpellName(31803)] = true, -- Censure [SpellName(26573)] = true, -- Consecration + [SpellName(63529)] = true, -- Dazed - Avenger's Shield + [SpellName(85509)] = true, -- Denounce [SpellName(853)] = true, -- Hammer of Justice [SpellName(62124)] = true, -- Hand of Reckoning - [SpellName(21183)] = true, -- Heart of the Crusader - [SpellName(31803)] = true, -- Holy Vengeance [SpellName(2812)] = true, -- Holy Wrath - [SpellName(20184)] = true, -- Judgement of Justice - [SpellName(20185)] = true, -- Judgement of Light [SpellName(68055)] = true, -- Judgements of the Just - [SpellName(20186)] = true, -- Judgement of Wisdom [SpellName(20066)] = true, -- Repentance - [SpellName(61840)] = true, -- Righteous Vengeance - [SpellName(53659)] = true, -- Sacred Cleansing [SpellName(20170)] = true, -- Seal of Justice (Stun) - [SpellName(63529)] = true, -- Silenced - Shield of the Templar [SpellName(10326)] = true, -- Turn Evil - [SpellName(67)] = true, -- Vindication -- Priest [SpellName(2944)] = true, -- Devouring Plague [SpellName(14914)] = true, -- Holy Fire + [SpellName(88625)] = true, -- Holy Word: Chastise [SpellName(605)] = true, -- Mind Control [SpellName(15407)] = true, -- Mind Flay [SpellName(48045)] = true, -- Mind Sear [SpellName(453)] = true, -- Mind Soothe [SpellName(2096)] = true, -- Mind Vision [SpellName(33196)] = true, -- Misery + [SpellName(87193)] = true, -- Paralysis [SpellName(64044)] = true, -- Psychic Horror [SpellName(8122)] = true, -- Psychic Scream [SpellName(9484)] = true, -- Shackle Undead @@ -176,10 +173,13 @@ T.DebuffWhiteList = { [SpellName(26679)] = true, -- Deadly Throw [SpellName(51722)] = true, -- Dismantle [SpellName(8647)] = true, -- Expose Armor + [SpellName(91021)] = true, -- Find Weakness [SpellName(703)] = true, -- Garrote [SpellName(1330)] = true, -- Garrote - Silence [SpellName(1776)] = true, -- Gouge + [SpellName(79124)] = true, -- Groggy [SpellName(16511)] = true, -- Hemorrhage + -- [SpellName(89775)] = true, -- Hemorrhage (Glyph of Hemorrhage) [SpellName(32747)] = true, -- Interrupt [SpellName(408)] = true, -- Kidney Shot [SpellName(5760)] = true, -- Mind-numbing Poison @@ -188,38 +188,46 @@ T.DebuffWhiteList = { [SpellName(6770)] = true, -- Sap [SpellName(58684)] = true, -- Savage Combat [SpellName(18425)] = true, -- Silenced - Improved Kick + [SpellName(79140)] = true, -- Vendetta [SpellName(51693)] = true, -- Waylay [SpellName(13218)] = true, -- Wound Poison -- Shaman [SpellName(58861)] = true, -- Bash (Spirit Wolf) + [SpellName(76780)] = true, -- Bind Elemental + [SpellName(53019)] = true, -- Earth's Grasp [SpellName(3600)] = true, -- Earthbind + [SpellName(86861)] = true, -- Earthquake [SpellName(64930)] = true, -- Electrified (Worldbreaker Garb) [SpellName(8050)] = true, -- Flame Shock [SpellName(8056)] = true, -- Frost Shock [SpellName(8034)] = true, -- Frostbrand Attack + [SpellName(51514)] = true, -- Hex + [SpellName(77661)] = true, -- Searing Flames [SpellName(39796)] = true, -- Stoneclaw Totem [SpellName(17364)] = true, -- Stormstrike [SpellName(58857)] = true, -- Twin Howl + [SpellName(73682)] = true, -- Unleash Frost -- Warlock [SpellName(18118)] = true, -- Aftermath + [SpellName(93975)] = true, -- Aura of Foreboding + [SpellName(980)] = true, -- Bane of Agony + [SpellName(603)] = true, -- Bane of Doom + [SpellName(80240)] = true, -- Bane of Havoc [SpellName(710)] = true, -- Banish - [SpellName(59671)] = true, -- Challenging Howl (Metamorphosis) + [SpellName(85421)] = true, -- Burning Embers [SpellName(17962)] = true, -- Conflagrate [SpellName(172)] = true, -- Corruption [SpellName(20812)] = true, -- Cripple (Doomguard) - [SpellName(980)] = true, -- Curse of Agony - [SpellName(603)] = true, -- Curse of Doom [SpellName(18223)] = true, -- Curse of Exhaustion - [SpellName(1010)] = true, -- Curse of Idiocy + [SpellName(86000)] = true, -- Curse of Gul'dan [SpellName(1714)] = true, -- Curse of Tongues [SpellName(702)] = true, -- Curse of Weakness [SpellName(1490)] = true, -- Curse of the Elements [SpellName(6789)] = true, -- Death Coil - [SpellName(60995)] = true, -- Demon Charge (Metamorphosis) + [SpellName(60995)] = true, -- Demon Leap (Metamorphosis) [SpellName(689)] = true, -- Drain Life - [SpellName(5138)] = true, -- Drain Mana [SpellName(1120)] = true, -- Drain Soul [SpellName(1098)] = true, -- Enslave Demon [SpellName(5782)] = true, -- Fear @@ -245,6 +253,7 @@ T.DebuffWhiteList = { [SpellName(30069)] = true, -- Blood Frenzy [SpellName(1161)] = true, -- Challenging Shout [SpellName(7922)] = true, -- Charge Stun + [SpellName(86346)] = true, -- Colossus Smash [SpellName(12809)] = true, -- Concussion Blow [SpellName(1160)] = true, -- Demoralizing Shout [SpellName(676)] = true, -- Disarm @@ -255,7 +264,6 @@ T.DebuffWhiteList = { [SpellName(20253)] = true, -- Intercept [SpellName(20511)] = true, -- Intimidating Shout (Cower) [SpellName(5246)] = true, -- Intimidating Shout (Fear) - [SpellName(694)] = true, -- Mocking Blow [SpellName(12294)] = true, -- Mortal Strike [SpellName(12323)] = true, -- Piercing Howl [SpellName(772)] = true, -- Rend @@ -264,9 +272,9 @@ T.DebuffWhiteList = { [SpellName(18498)] = true, -- Silenced - Gag Order [SpellName(7386)] = true, -- Sunder Armor [SpellName(355)] = true, -- Taunt + [SpellName(85388)] = true, -- Throwdown [SpellName(6343)] = true, -- Thunder Clap [SpellName(46856)] = true, -- Trauma - [SpellName(64849)] = true, -- Unrelenting Assault -- Racial [SpellName(25046)] = true, -- Arcane Torrent @@ -287,93 +295,109 @@ T.BuffWhiteList = { [SpellName(48707)] = true, -- Anti-Magic Shell [SpellName(50461)] = true, -- Anti-Magic Zone [SpellName(42650)] = true, -- Army of the Dead - -- [SpellName(51789)] = true, -- Blade Barrier + [SpellName(77535)] = true, -- Blood Shield [SpellName(45529)] = true, -- Blood Tap - [SpellName(50447)] = true, -- Bloody Vengeance [SpellName(49222)] = true, -- Bone Shield [SpellName(49028)] = true, -- Dancing Rune Weapon - [SpellName(49796)] = true, -- Deathchill + [SpellName(77606)] = true, -- Dark Simulacrum + [SpellName(63560)] = true, -- Dark Transformation (Ghoul) [SpellName(63583)] = true, -- Desolation [SpellName(59052)] = true, -- Freezing Fog (Rime) - [SpellName(63560)] = true, -- Ghoul Frenzy (Ghoul) [SpellName(57330)] = true, -- Horn of Winter [SpellName(48792)] = true, -- Icebound Fortitude -- [SpellName(50882)] = true, -- Icy Talons -- [SpellName(55610)] = true, -- Improved Icy Talons [SpellName(51124)] = true, -- Killing Machine [SpellName(49039)] = true, -- Lichborne + [SpellName(51271)] = true, -- Pillar of Frost + [SpellName(51460)] = true, -- Runic Corruption [SpellName(50421)] = true, -- Scent of Blood + [SpellName(91342)] = true, -- Shadow Infusion + [SpellName(81340)] = true, -- Sudden Doom [SpellName(61777)] = true, -- Summon Gargoyle - [SpellName(51271)] = true, -- Unbreakable Armor [SpellName(55233)] = true, -- Vampiric Blood -- Druid - [SpellName(2893)] = true, -- Abolish Poison [SpellName(22812)] = true, -- Barkskin [SpellName(50334)] = true, -- Berserk [SpellName(1850)] = true, -- Dash [SpellName(5229)] = true, -- Enrage [SpellName(22842)] = true, -- Frenzied Regeneration + [SpellName(81093)] = true, -- Fury of Stormrage [SpellName(29166)] = true, -- Innervate -- [SpellName(24932)] = true, -- Leader of the Pack [SpellName(33763)] = true, -- Lifebloom [SpellName(48504)] = true, -- Living Seed + -- [SpellName(81006)] = true, -- Lunar Shower -- [SpellName(45281)] = true, -- Natural Perfection + -- [SpellName(96206)] = true, -- Nature's Bounty -- [SpellName(16886)] = true, -- Nature's Grace [SpellName(16689)] = true, -- Nature's Grasp [SpellName(17116)] = true, -- Nature's Swiftness - -- [SpellName(16870)] = true, -- Omen of Clarity / Nightsong Battlegear (Clearcasting) + -- [SpellName(16870)] = true, -- Omen of Clarity / Malfurion's Gift / Nightsong Battlegear (Clearcasting) -- [SpellName(69369)] = true, -- Predator's Swiftness -- [SpellName(48391)] = true, -- Owlkin Frenzy -- [SpellName(5215)] = true, -- Prowl + -- [SpellName(80951)] = true, -- Pulverize [SpellName(8936)] = true, -- Regrowth [SpellName(774)] = true, -- Rejuvenation + [SpellName(62606)] = true, -- Savage Defense [SpellName(52610)] = true, -- Savage Roar + -- [SpellName(93400)] = true, -- Shooting Stars [SpellName(48505)] = true, -- Starfall [SpellName(61336)] = true, -- Survival Instincts - -- [SpellName(34123)] = true, -- Tree of Life + [SpellName(33891)] = true, -- Tree of Life [SpellName(5217)] = true, -- Tiger's Fury -- [SpellName(5225)] = true, -- Track Humanoids [SpellName(740)] = true, -- Tranquility + -- [SpellName(81016)] = true, -- Stampede + [SpellName(77761)] = true, -- Stampeding Roar (Bear) + [SpellName(77764)] = true, -- Stampeding Roar (Cat) [SpellName(48438)] = true, -- Wild Growth -- Hunter - -- [SpellName(13161)] = true, -- Aspect of the Beast [SpellName(5118)] = true, -- Aspect of the Cheetah + -- [SpellName(82661)] = true, -- Aspect of the Fox -- [SpellName(13165)] = true, -- Aspect of the Hawk - -- [SpellName(13163)] = true, -- Aspect of the Monkey [SpellName(13159)] = true, -- Aspect of the Pack - [SpellName(34074)] = true, -- Aspect of the Viper -- [SpellName(20043)] = true, -- Aspect of the Wild [SpellName(19574)] = true, -- Bestial Wrath + [SpellName(82921)] = true, -- Bombardment + -- [SpellName(51755)] = true, -- Camouflage [SpellName(25077)] = true, -- Cobra Reflexes (Pet) [SpellName(53257)] = true, -- Cobra Strikes (Pet) [SpellName(61684)] = true, -- Dash (Pet) [SpellName(19263)] = true, -- Deterrence [SpellName(23145)] = true, -- Dive (Pet) [SpellName(6197)] = true, -- Eagle Eye - [SpellName(1002)] = true, -- Eyes of the Beast -- [SpellName(1539)] = true, -- Feed Pet [SpellName(5384)] = true, -- Feign Death -- [SpellName(34456)] = true, -- Ferocious Inspiration + [SpellName(82692)] = true, -- Focus Fire [SpellName(19615)] = true, -- Frenzy Effect [SpellName(24604)] = true, -- Furious Howl (Wolf) + -- [SpellName(53290)] = true, -- Hunting Party [SpellName(53220)] = true, -- Improved Steady Shot - [SpellName(58914)] = true, -- Kill Command (Pet) [SpellName(56453)] = true, -- Lock and Load [SpellName(34833)] = true, -- Master Tactician + [SpellName(62305)] = true, -- Master's Call [SpellName(136)] = true, -- Mend Pet + [SpellName(83559)] = true, -- Posthaste -- [SpellName(24450)] = true, -- Prowl (Cat) [SpellName(6150)] = true, -- Quick Shots [SpellName(3045)] = true, -- Rapid Fire [SpellName(35098)] = true, -- Rapid Killing [SpellName(53230)] = true, -- Rapid Recuperation Effect [SpellName(63087)] = true, -- Raptor Strike (Glyph of Raptor Strike) + [SpellName(82925)] = true, -- Ready, Set, Aim... + [SpellName(82897)] = true, -- Resistance is Futile! [SpellName(26064)] = true, -- Shell Shield (Turtle) + [SpellName(83359)] = true, -- Sic 'Em! [SpellName(64420)] = true, -- Sniper Training -- [SpellName(19579)] = true, -- Spirit Bond -- [SpellName(1515)] = true, -- Tame Beast [SpellName(34471)] = true, -- The Beast Within + [SpellName(35346)] = true, -- Time Warp (Warp Stalker) -- [SpellName(1494)] = true, -- Track Beasts -- [SpellName(19878)] = true, -- Track Demons -- [SpellName(19879)] = true, -- Track Dragonkin @@ -382,8 +406,8 @@ T.BuffWhiteList = { -- [SpellName(19885)] = true, -- Track Hidden -- [SpellName(19883)] = true, -- Track Humanoids -- [SpellName(19884)] = true, -- Track Undead + [SpellName(77769)] = true, -- Trap Launcher -- [SpellName(19506)] = true, -- Trueshot Aura - [SpellName(35346)] = true, -- Warp (Warp Stalker) -- Mage -- [SpellName(36032)] = true, -- Arcane Blast @@ -391,15 +415,11 @@ T.BuffWhiteList = { -- [SpellName(57529)] = true, -- Arcane Potency [SpellName(12042)] = true, -- Arcane Power [SpellName(31643)] = true, -- Blazing Speed - [SpellName(54748)] = true, -- Burning Determination - [SpellName(28682)] = true, -- Combustion + -- [SpellName(57761)] = true, -- Brain Freeze [SpellName(60803)] = true, -- Curse Immunity (Glyph of Remove Curse) [SpellName(44544)] = true, -- Fingers of Frost - -- [SpellName(57761)] = true, -- Fireball! - [SpellName(543)] = true, -- Fire Ward [SpellName(54741)] = true, -- Firestarter -- [SpellName(54648)] = true, -- Focus Magic - [SpellName(6143)] = true, -- Frost Ward [SpellName(48108)] = true, -- Hot Streak [SpellName(11426)] = true, -- Ice Barrier [SpellName(45438)] = true, -- Ice Block @@ -407,90 +427,112 @@ T.BuffWhiteList = { [SpellName(47000)] = true, -- Improved Blink [SpellName(44413)] = true, -- Incanter's Absorption -- [SpellName(66)] = true, -- Invisibility + [SpellName(87098)] = true, -- Invocation + [SpellName(543)] = true, -- Mage Ward [SpellName(1463)] = true, -- Mana Shield [SpellName(55342)] = true, -- Mirror Image - [SpellName(44401)] = true, -- Missile Barrage [SpellName(12043)] = true, -- Presence of Mind + [SpellName(83582)] = true, -- Pyromaniac [SpellName(130)] = true, -- Slow Fall + [SpellName(80353)] = true, -- Time Warp -- Paladin [SpellName(31884)] = true, -- Avenging Wrath [SpellName(53563)] = true, -- Beacon of Light -- [SpellName(19746)] = true, -- Concentration Aura + [SpellName(20050)] = true, -- Conviction + [SpellName(94686)] = true, -- Crusader -- [SpellName(32223)] = true, -- Crusader Aura + [SpellName(88819)] = true, -- Daybreak -- [SpellName(465)] = true, -- Devotion Aura - [SpellName(20216)] = true, -- Divine Favor - [SpellName(31842)] = true, -- Divine Illumination - -- [SpellName(19752)] = true, -- Divine Intervention + [SpellName(31842)] = true, -- Divine Favor [SpellName(498)] = true, -- Divine Protection + [SpellName(90174)] = true, -- Divine Purpose [SpellName(642)] = true, -- Divine Shield - -- [SpellName(19891)] = true, -- Fire Resistance Aura - -- [SpellName(19888)] = true, -- Frost Resistance Aura + [SpellName(85416)] = true, -- Grand Crusader + [SpellName(86659)] = true, -- Guardian of Ancient Kings (Avenger's Shield) + -- [SpellName(86669)] = true, -- Guardian of Ancient Kings (Holy Shock) + -- [SpellName(86698)] = true, -- Guardian of Ancient Kings (Templar's Verdict) [SpellName(1044)] = true, -- Hand of Freedom [SpellName(1022)] = true, -- Hand of Protection [SpellName(6940)] = true, -- Hand of Sacrifice [SpellName(1038)] = true, -- Hand of Salvation [SpellName(64891)] = true, -- Holy Mending + [SpellName(82327)] = true, -- Holy Radiance [SpellName(20925)] = true, -- Holy Shield -- [SpellName(53672)] = true, -- Infusion of Light + [SpellName(86273)] = true, -- Illuminated Healing + -- [SpellName(89906)] = true, -- Judgements of the Bold -- [SpellName(53655)] = true, -- Judgements of the Pure - [SpellName(20233)] = true, -- Lay on Hands (Physical Damage Reduction) - -- [SpellName(31834)] = true, -- Light's Grace + -- [SpellName(31930)] = true, -- Judgements of the Wise + [SpellName(87173)] = true, -- Long Arm of the Law -- [SpellName(20178)] = true, -- Reckoning -- [SpellName(20128)] = true, -- Redoubt + -- [SpellName(19891)] = true, -- Resistance Aura -- [SpellName(7294)] = true, -- Retribution Aura - [SpellName(53601)] = true, -- Sacred Shield - -- [SpellName(31892)] = true, -- Seal of Blood - -- [SpellName(27170)] = true, -- Seal of Command + [SpellName(85433)] = true, -- Sacred Duty + [SpellName(96263)] = true, -- Sacred Shield -- [SpellName(348704)] = true, -- Seal of Corruption + -- [SpellName(20165)] = true, -- Seal of Insight -- [SpellName(20164)] = true, -- Seal of Justice - -- [SpellName(20165)] = true, -- Seal of Light - -- [SpellName(21084)] = true, -- Seal of Righteousness - -- [SpellName(31801)] = true, -- Seal of Vengeance - -- [SpellName(20166)] = true, -- Seal of Wisdom - -- [SpellName(348700)] = true, -- Seal of the Martyr + -- [SpellName(20154)] = true, -- Seal of Righteousness + -- [SpellName(31801)] = true, -- Seal of Truth + [SpellName(90811)] = true, -- Selfless -- [SpellName(5502)] = true, -- Sense Undead - -- [SpellName(19876)] = true, -- Shadow Resistance Aura - [SpellName(54203)] = true, -- Sheath of Light - [SpellName(53489)] = true, -- The Art of War - [SpellName(20050)] = true, -- Vengeance + [SpellName(85497)] = true, -- Speed of Light + [SpellName(59578)] = true, -- The Art of War + [SpellName(85696)] = true, -- Zealotry -- Priest - [SpellName(552)] = true, -- Abolish Disease + [SpellName(81700)] = true, -- Archangel [SpellName(27813)] = true, -- Blessed Recovery [SpellName(33143)] = true, -- Blessed Resilience [SpellName(64128)] = true, -- Body and Soul -- [SpellName(59887)] = true, -- Borrowed Time + [SpellName(14751)] = true, -- Chakra + [SpellName(81209)] = true, -- Chakra: Chastise + [SpellName(81206)] = true, -- Chakra: Sanctuary + [SpellName(81208)] = true, -- Chakra: Serenity + [SpellName(87153)] = true, -- Dark Archangel + -- [SpellName(87117)] = true, -- Dark Evangelism [SpellName(47585)] = true, -- Dispersion [SpellName(47753)] = true, -- Divine Aegis [SpellName(64843)] = true, -- Divine Hymn + [SpellName(77489)] = true, -- Echo of Light + -- [SpellName(95799)] = true, -- Empowered Shadow + -- [SpellName(81660)] = true, -- Evangelism -- [SpellName(586)] = true, -- Fade [SpellName(6346)] = true, -- Fear Ward - -- [SpellName(45237)] = true, -- Focused Will + -- [SpellName(45241)] = true, -- Focused Will + -- [SpellName(90785)] = true, -- Glyph of Power Word: Barrier + [SpellName(56161)] = true, -- Glyph of Prayer of Healing + [SpellName(81301)] = true, -- Glyph of Spirit Tap [SpellName(47930)] = true, -- Grace [SpellName(47788)] = true, -- Guardian Spirit - -- [SpellName(34754)] = true, -- Holy Concentration - [SpellName(49694)] = true, -- Improved Spirit Tap - [SpellName(588)] = true, -- Inner Fire - [SpellName(14751)] = true, -- Inner Focus + [SpellName(88684)] = true, -- Holy Word: Serenity + -- [SpellName(588)] = true, -- Inner Fire + [SpellName(89485)] = true, -- Inner Focus + -- [SpellName(73413)] = true, -- Inner Will [SpellName(14893)] = true, -- Inspiration [SpellName(1706)] = true, -- Levitate [SpellName(7001)] = true, -- Lightwell Renew - -- [SpellName(14743)] = true, -- Martyrdom (Focused Casting) + [SpellName(81292)] = true, -- Mind Melt + -- [SpellName(49868)] = true, -- Mind Quickening + -- [SpellName(87178)] = true, -- Mind Spike [SpellName(10060)] = true, -- Power Infusion [SpellName(33206)] = true, -- Pain Suppression + [SpellName(81782)] = true, -- Power Word: Barrier [SpellName(17)] = true, -- Power Word: Shield [SpellName(41635)] = true, -- Prayer of Mending [SpellName(139)] = true, -- Renew -- [SpellName(63944)] = true, -- Renewed Hope -- [SpellName(63731)] = true, -- Serendipity -- [SpellName(15473)] = true, -- Shadowform - [SpellName(61792)] = true, -- Shadowy Insight (Glyph of Shadow) + -- [SpellName(77487)] = true, -- Shadow Orb [SpellName(27827)] = true, -- Spirit of Redemption - [SpellName(15271)] = true, -- Spirit Tap - -- [SpellName(33151)] = true, -- Surge of Light + [SpellName(96266)] = true, -- Strength of Soul + -- [SpellName(88688)] = true, -- Surge of Light [SpellName(64901)] = true, -- Hymn of Hope - [SpellName(15258)] = true, -- Shadow Weaving -- [SpellName(15290)] = true, -- Vampiric Embrace -- [SpellName(34919)] = true, -- Vampiric Touch @@ -500,16 +542,21 @@ T.BuffWhiteList = { [SpellName(45182)] = true, -- Cheating Death [SpellName(31224)] = true, -- Cloak of Shadows [SpellName(14177)] = true, -- Cold Blood + [SpellName(74002)] = true, -- Combat Insight + [SpellName(74001)] = true, -- Combat Readiness + [SpellName(84590)] = true, -- Deadly Momentum + [SpellName(84747)] = true, -- Deep Insight [Bandit's Guile] [SpellName(5277)] = true, -- Evasion - [SpellName(31234)] = true, -- Find Weakness - [SpellName(14278)] = true, -- Ghostly Strike - [SpellName(63848)] = true, -- Hunger For Blood [SpellName(51690)] = true, -- Killing Spree [SpellName(31665)] = true, -- Master of Subtlety + [SpellName(84746)] = true, -- Moderate Insight [Bandit's Guile] [SpellName(58427)] = true, -- Overkill + [SpellName(73651)] = true, -- Recuperate [SpellName(14143)] = true, -- Remorseless Attacks + [SpellName(84617)] = true, -- Revealing Strike [SpellName(51713)] = true, -- Shadow Dance [SpellName(36563)] = true, -- Shadowstep + [SpellName(84745)] = true, -- Shallow Insight [Bandit's Guile] [SpellName(5171)] = true, -- Slice and Dice [SpellName(2983)] = true, -- Sprint -- [SpellName(1784)] = true, -- Stealth @@ -522,19 +569,21 @@ T.BuffWhiteList = { [SpellName(2825)] = true, -- Bloodlust [SpellName(51945)] = true, -- Earthliving [SpellName(974)] = true, -- Earth Shield - [SpellName(30165)] = true, -- Elemental Devastation + [SpellName(29178)] = true, -- Elemental Devastation -- [SpellName(16246)] = true, -- Elemental Focus (Clearcasting) [SpellName(16166)] = true, -- Elemental Mastery -- [SpellName(51466)] = true, -- Elemental Oath [SpellName(6196)] = true, -- Far Sight -- [SpellName(8185)] = true, -- Fire Resistance Totem [SpellName(16257)] = true, -- Flurry + [SpellName(77800)] = true, -- Focused Insight -- [SpellName(8182)] = true, -- Frost Resistance Totem -- [SpellName(2645)] = true, -- Ghost Wolf -- [SpellName(8836)] = true, -- Grace of Air [SpellName(8178)] = true, -- Grounding Totem Effect -- [SpellName(5672)] = true, -- Healing Stream [SpellName(32182)] = true, -- Heroism + [SpellName(65264)] = true, -- Lava Flows [SpellName(324)] = true, -- Lightning Shield [SpellName(53817)] = true, -- Maelstrom Weapon -- [SpellName(5677)] = true, -- Mana Spring Totem @@ -543,91 +592,116 @@ T.BuffWhiteList = { [SpellName(16188)] = true, -- Nature's Swiftness -- [SpellName(10596)] = true, -- Nature Resistance Totem [SpellName(61295)] = true, -- Riptide + [SpellName(97621)] = true, -- Seasoned Winds (Arcane) + -- [SpellName(97618)] = true, -- Seasoned Winds (Fire) + -- [SpellName(97619)] = true, -- Seasoned Winds (Frost) + -- [SpellName(97620)] = true, -- Seasoned Winds (Nature) + -- [SpellName(97622)] = true, -- Seasoned Winds (Shadow) -- [SpellName(6495)] = true, -- Sentry Totem -- [SpellName(43339)] = true, -- Shamanistic Focus (Focused) [SpellName(30823)] = true, -- Shamanistic Rage [SpellName(58875)] = true, -- Spirit Walk (Spirit Wolf) + [SpellName(79206)] = true, -- Spiritwalker's Grace -- [SpellName(8072)] = true, -- Stoneskin Totem -- [SpellName(8076)] = true, -- Strength of Earth [SpellName(55198)] = true, -- Tidal Force [SpellName(53390)] = true, -- Tidal Waves -- [SpellName(30708)] = true, -- Totem of Wrath + -- [SpellName(77746)] = true, -- Totemic Wrath + [SpellName(73683)] = true, -- Unleash Flame + [SpellName(73681)] = true, -- Unleash Wind -- [SpellName(30802)] = true, -- Unleashed Rage [SpellName(52127)] = true, -- Water Shield -- [SpellName(15108)] = true, -- Windwall Totem -- [SpellName(2895)] = true, -- Wrath of Air Totem -- Warlock - [SpellName(18288)] = true, -- Amplify Curse [SpellName(54274)] = true, -- Backdraft [SpellName(34936)] = true, -- Backlash -- [SpellName(6307)] = true, -- Blood Pact (Imp) [SpellName(17767)] = true, -- Consume Shadows (Voidwalker) + [SpellName(85767)] = true, -- Dark Intent [SpellName(63165)] = true, -- Decimation - [SpellName(54444)] = true, -- Demonic Empowerment (Imp - Increased Critical Strike) + [SpellName(79462)] = true, -- Demon Soul: Felguard + [SpellName(79460)] = true, -- Demon Soul: Felhunter + [SpellName(79459)] = true, -- Demon Soul: Imp + [SpellName(79463)] = true, -- Demon Soul: Succubus + [SpellName(79464)] = true, -- Demon Soul: Voidwalker [SpellName(54443)] = true, -- Demonic Empowerment (Voidwalker - Increased Health/Increased Threat Generation) [SpellName(54436)] = true, -- Demonic Empowerment (Succubus - Improved Invisibility) - [SpellName(54508)] = true, -- Demonic Empowerment (Felguard - Increased Attack Speed/CC Immunity) + [SpellName(54508)] = true, -- Demonic Empowerment (Felguard - CC Immunity) -- [SpellName(48090)] = true, -- Demonic Pact + [SpellName(88448)] = true, -- Demonic Rebirth [SpellName(47283)] = true, -- Empowered Imp [SpellName(64368)] = true, -- Eradication [SpellName(126)] = true, -- Eye of Kilrogg - [SpellName(2947)] = true, -- Fire Shield (Imp) [SpellName(755)] = true, -- Health Funnel [SpellName(1949)] = true, -- Hellfire [SpellName(50589)] = true, -- Immolation Aura (Metamorphosis) -- [SpellName(7870)] = true, -- Lesser Invisibility (Succubus) - [SpellName(63321)] = true, -- Life Tap (Glyph of Life Tap) - -- [SpellName(23759)] = true, -- Master Demonologist (Imp - Increased Fire Damage) - -- [SpellName(23760)] = true, -- Master Demonologist (Voidwalker - Physical Damage Reduction) - -- [SpellName(23761)] = true, -- Master Demonologist (Succubus - Increased Shadow Damage) - -- [SpellName(23762)] = true, -- Master Demonologist (Felhunter - Spell Damage Reduction) - -- [SpellName(35702)] = true, -- Master Demonologist (Felguard - Increased Damage/Damage Reduction) [SpellName(47241)] = true, -- Metamorphosis [SpellName(47383)] = true, -- Molten Core - [SpellName(30299)] = true, -- Nether Protection + [SpellName(54373)] = true, -- Nether Protection (Arcane) + [SpellName(54371)] = true, -- Nether Protection (Fire) + [SpellName(54372)] = true, -- Nether Protection (Frost) + [SpellName(54370)] = true, -- Nether Protection (Holy) + [SpellName(54375)] = true, -- Nether Protection (Nature) + [SpellName(54374)] = true, -- Nether Protection (Shadow) + [SpellName(91711)] = true, -- Nether Ward -- [SpellName(19480)] = true, -- Paranoia (Felhunter) -- [SpellName(4511)] = true, -- Phase Shift (Imp) - [SpellName(18093)] = true, -- Pyroclasm [SpellName(7812)] = true, -- Sacrifice (Voidwalker) -- [SpellName(5500)] = true, -- Sense Demons [SpellName(17941)] = true, -- Shadow Trance [SpellName(6229)] = true, -- Shadow Ward - [SpellName(20707)] = true, -- Soulstone Resurrection + [SpellName(79268)] = true, -- Soul Harvest [SpellName(25228)] = true, -- Soul Link + [SpellName(74434)] = true, -- Soulburn + [SpellName(79438)] = true, -- Soulburn: Demonic Circle + [SpellName(79437)] = true, -- Soulburn: Healthstone + [SpellName(79440)] = true, -- Soulburn: Searing Pain + [SpellName(20707)] = true, -- Soulstone Resurrection -- Warrior [SpellName(6673)] = true, -- Battle Shout + [SpellName(12964)] = true, -- Battle Trance [SpellName(18499)] = true, -- Berserker Rage [SpellName(46924)] = true, -- Bladestorm - [SpellName(29131)] = true, -- Bloodrage [SpellName(23885)] = true, -- Bloodthirst [SpellName(16488)] = true, -- Blood Craze [SpellName(469)] = true, -- Commanding Shout + [SpellName(85730)] = true, -- Deadly Calm [SpellName(12292)] = true, -- Death Wish + [SpellName(85386)] = true, -- Die by the Sword [SpellName(12880)] = true, -- Enrage [SpellName(57514)] = true, -- Enrage (Improved Defensive Stance) [SpellName(57518)] = true, -- Enrage (Wrecking Crew) [SpellName(55694)] = true, -- Enraged Regeneration [SpellName(12966)] = true, -- Flurry [SpellName(58374)] = true, -- Glyph of Blocking - [SpellName(58363)] = true, -- Glyph of Revenge + [SpellName(84619)] = true, -- Hold the Line + [SpellName(86627)] = true, -- Incite + [SpellName(1134)] = true, -- Inner Rage [SpellName(3411)] = true, -- Intervene [SpellName(65156)] = true, -- Juggernaut [SpellName(12975)] = true, -- Last Stand - [SpellName(68051)] = true, -- Overpower Ready! (Glyph of Overpower) + [SpellName(85738)] = true, -- Meat Cleaver -- [SpellName(29801)] = true, -- Rampage [SpellName(1719)] = true, -- Recklessness [SpellName(20230)] = true, -- Retaliation + [SpellName(86662)] = true, -- Rude Interruption [SpellName(46946)] = true, -- Safeguard [SpellName(29841)] = true, -- Second Wind [SpellName(2565)] = true, -- Shield Block [SpellName(871)] = true, -- Shield Wall [SpellName(46916)] = true, -- Slam! + [SpellName(84584)] = true, -- Slaughter [SpellName(23920)] = true, -- Spell Reflection [SpellName(52437)] = true, -- Sudden Death [SpellName(12328)] = true, -- Sweeping Strikes [SpellName(60503)] = true, -- Taste for Blood + [SpellName(87095)] = true, -- Thunderstruck + [SpellName(82368)] = true, -- Victorious [SpellName(50720)] = true, -- Vigilance -- Racial diff --git a/ShestakUI/Config/Filters_Cata/OpenItems.lua b/ShestakUI/Config/Filters_Cata/OpenItems.lua index 81e1496bf..c8c485a1b 100644 --- a/ShestakUI/Config/Filters_Cata/OpenItems.lua +++ b/ShestakUI/Config/Filters_Cata/OpenItems.lua @@ -190,4 +190,51 @@ T.OpenItems = { [54535] = true, -- Keg-Shaped Treasure Chest [54536] = true, -- Satchel of Chilled Goods [54537] = true, -- Heart-Shaped Box + [57540] = true, -- Coldridge Mountaineer's Pouch + [60681] = true, -- Cannary's Cache + [61387] = true, -- Hidden Stash + [62062] = true, -- Bulging Sack of Gold + [64491] = true, -- Royal Reward + [64657] = true, -- Canopic Jar + [65513] = true, -- Crate of Tasty Meat + [66943] = true, -- Treasures from Grim Batol + [67248] = true, -- Satchel of Helpful Goods + [67250] = true, -- Satchel of Helpful Goods + [67414] = true, -- Bag of Shiny Things + [67495] = true, -- Strange Bloated Stomach + [67539] = true, -- Tiny Treasure Chest + [67597] = true, -- Sealed Crate + [68384] = true, -- Moonkin Egg + [68598] = true, -- Very Fat Sack of Coins + [68689] = true, -- Imported Supplies + [68795] = true, -- Stendel's Bane + [68813] = true, -- Satchel of Freshly-Picked Herbs + [69817] = true, -- Hive Queen's Honeycomb + [69818] = true, -- Giant Sack + [69822] = true, -- Master Chef's Groceries + [69823] = true, -- Gub's Catch + [69886] = true, -- Bag of Coins + [69903] = true, -- Satchel of Exotic Mysteries + [69999] = true, -- Moat Monster Feeding Kit + [70719] = true, -- Water-Filled Gills + [70931] = true, -- Scrooge's Payoff + [71631] = true, -- Zen'Vorka's Cache + [72201] = true, -- Plump Intestines + [73792] = true, -- Stolen Present + [77501] = true, -- Blue Blizzcon Bag + [78897] = true, -- Pouch o' Tokens + [78898] = true, -- Sack o' Tokens + [78899] = true, -- Pouch o' Tokens + [78900] = true, -- Pouch o' Tokens + [78901] = true, -- Pouch o' Tokens + [78902] = true, -- Pouch o' Tokens + [78903] = true, -- Pouch o' Tokens + [78904] = true, -- Pouch o' Tokens + [78905] = true, -- Sack o' Tokens + [78906] = true, -- Sack o' Tokens + [78907] = true, -- Sack o' Tokens + [78908] = true, -- Sack o' Tokens + [78909] = true, -- Sack o' Tokens + [78910] = true, -- Sack o' Tokens + [78930] = true, -- Sealed Crate } diff --git a/ShestakUI/Config/Filters_Cata/RaidAuraWatch.lua b/ShestakUI/Config/Filters_Cata/RaidAuraWatch.lua index ab0a0a422..385fb696a 100644 --- a/ShestakUI/Config/Filters_Cata/RaidAuraWatch.lua +++ b/ShestakUI/Config/Filters_Cata/RaidAuraWatch.lua @@ -21,19 +21,18 @@ T.RaidBuffs = { {34477, "TOPRIGHT", {0.2, 0.2, 1}}, -- Misdirection }, PALADIN = { - -- Lay on Hands (Physical Damage Reduction) {53563, "TOPRIGHT", {0.7, 0.3, 0.7}}, -- Beacon of Light - -- {114163, "BOTTOMLEFT", {0.9, 0.6, 0.4}}, -- Eternal Flame + {82327, "BOTTOMLEFT", {0.9, 0.6, 0.4}}, -- Holy Radiance {1022, "BOTTOMRIGHT", {0.2, 0.2, 1}, true}, -- Hand of Protection {1044, "BOTTOMRIGHT", {0.89, 0.45, 0}, true}, -- Hand of Freedom {6940, "BOTTOMRIGHT", {0.89, 0.1, 0.1}, true}, -- Hand of Sacrifice {1038, "BOTTOMRIGHT", {0.93, 0.75, 0}, true}, -- Hand of Salvation - {53601, "TOPLEFT", {0.4, 0.7, 0.2}, true}, -- Sacred Shield + {86273, "TOPLEFT", {0.4, 0.7, 0.2}, true}, -- Illuminated Healing }, PRIEST = { - -- Abolish Disease (move to all?) -- Fear Ward -- Guardian Spirit + -- Echo of Light {41635, "BOTTOMRIGHT", {0.2, 0.7, 0.2}}, -- Prayer of Mending {139, "BOTTOMLEFT", {0.4, 0.7, 0.2}}, -- Renew {17, "TOPLEFT", {0.81, 0.85, 0.1}, true}, -- Power Word: Shield @@ -68,7 +67,6 @@ T.RaidBuffs = { {23333, "LEFT", {1, 0, 0}, true}, -- Warsong flag, Horde {23335, "LEFT", {0, 0, 1}, true}, -- Warsong flag, Alliance {34976, "LEFT", {1, 0, 0}, true}, -- Netherstorm Flag - {2893, "RIGHT", {0, 1, 0}, true}, -- Abolish Poison {36488, "RIGHT", {0.89, 0.1, 0.1}, true}, -- Infernal Protection [Cosmic Infuser] {26470, "RIGHT", {0.8, 0.2, 0}, true}, -- Persistent Shield [Scarab Brooch] {64413, "RIGHT", {0.8, 0.2, 0}, true}, -- Protection of Ancient Kings [Val'anyr, Hammer of Ancient Kings] @@ -1168,7 +1166,8 @@ T.RaidDebuffs = { ----------------------------------------------------------------- -- Other ----------------------------------------------------------------- - + [SpellName(87023)] = 4, -- Cauterize + [SpellName(94794)] = 4, -- Rocket Fuel Leak } ----------------------------------------------------------------- @@ -1183,7 +1182,6 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(47476)] = 3, -- Strangulate -- Druid [SpellName(5211)] = 3, -- Bash - [SpellName(16922)] = 3, -- Celestial Focus [SpellName(33786)] = 3, -- Cyclone [SpellName(339)] = 2, -- Entangling Roots [SpellName(19975)] = 2, -- Entangling Roots (Nature's Grasp) @@ -1191,11 +1189,12 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(2637)] = 3, -- Hibernate [SpellName(22570)] = 3, -- Maim [SpellName(9005)] = 3, -- Pounce + [SpellName(80964)] = 3, -- Skull Bash (Bear) + [SpellName(80965)] = 3, -- Skull Bash (Cat) + [SpellName(81261)] = 2, -- Solar Beam -- Hunter - [SpellName(53359)] = 2, -- Chimera Shot - Scorpid [SpellName(19306)] = 2, -- Counterattack [SpellName(19185)] = 2, -- Entrapment - [SpellName(60210)] = 3, -- Freezing Arrow Effect [SpellName(3355)] = 3, -- Freezing Trap Effect [SpellName(2637)] = 3, -- Hibernate [SpellName(24394)] = 3, -- Intimidation @@ -1207,7 +1206,6 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(31661)] = 3, -- Dragon's Breath [SpellName(64346)] = 3, -- Fiery Payback [SpellName(33395)] = 2, -- Freeze (Water Elemental) - [SpellName(12494)] = 2, -- Frostbite [SpellName(122)] = 2, -- Frost Nova [SpellName(12355)] = 3, -- Impact [SpellName(118)] = 3, -- Polymorph @@ -1218,15 +1216,16 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(61780)] = 3, -- Polymorph: Turkey [SpellName(28271)] = 3, -- Polymorph: Turtle [SpellName(59634)] = 3, -- Polymorph - Penguin + [SpellName(55080)] = 2, -- Shattered Barrier [SpellName(18469)] = 3, -- Silenced - Improved Counterspell -- Paladin [SpellName(853)] = 3, -- Hammer of Justice [SpellName(20066)] = 3, -- Repentance - [SpellName(63529)] = 3, -- Silenced - Shield of the Templar - [SpellName(20170)] = 3, -- Stun (Seal of Justice Proc) [SpellName(10326)] = 3, -- Turn Evil -- Priest + [SpellName(88625)] = 3, -- Holy Word: Chastise [SpellName(605)] = 3, -- Mind Control + [SpellName(87193)] = 3, -- Paralysis [SpellName(64044)] = 3, -- Psychic Horror [SpellName(8122)] = 3, -- Psychic Scream [SpellName(9484)] = 3, -- Shackle Undead @@ -1241,13 +1240,17 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(408)] = 3, -- Kidney Shot [SpellName(6770)] = 3, -- Sap [SpellName(18425)] = 3, -- Silenced - Improved Kick + [SpellName(76577)] = 5, -- Smoke Bomb -- Shaman [SpellName(58861)] = 3, -- Bash (Spirit Wolf) + [SpellName(76780)] = 3, -- Bind Elemental + [SpellName(53019)] = 3, -- Earth's Grasp [SpellName(51514)] = 3, -- Hex [SpellName(39796)] = 3, -- Stoneclaw Totem -- Warlock + [SpellName(93975)] = 3, -- Aura of Foreboding [SpellName(6789)] = 3, -- Death Coil - [SpellName(60995)] = 3, -- Demon Charge (Metamorphosis) + [SpellName(60995)] = 3, -- Demon Leap (Metamorphosis) [SpellName(5782)] = 3, -- Fear [SpellName(5484)] = 3, -- Howl of Terror [SpellName(30153)] = 3, -- Intercept (Felguard) @@ -1264,6 +1267,7 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(20253)] = 3, -- Intercept [SpellName(46968)] = 3, -- Shockwave [SpellName(18498)] = 3, -- Silenced - Gag Order + [SpellName(85388)] = 3, -- Throwdown -- Racial [SpellName(28730)] = 3, -- Arcane Torrent [SpellName(20549)] = 3, -- War Stomp diff --git a/ShestakUI/Config/Filters_Cata/Reminders.lua b/ShestakUI/Config/Filters_Cata/Reminders.lua index 0a3b0c0fa..66db525f5 100644 --- a/ShestakUI/Config/Filters_Cata/Reminders.lua +++ b/ShestakUI/Config/Filters_Cata/Reminders.lua @@ -82,40 +82,27 @@ if C.reminder.raid_buffs_enable == true or C.announcements.flask_food == true th SpellName(66623), -- Well Fed (+40 Attack Power / 47 Spell Power / +40 Stamina) [Bountiful Feast] }, Mp5 = { - SpellName(25894), -- Greater Blessing of Wisdom - SpellName(19742), -- Blessing of Wisdom SpellName(5677), -- Mana Spring }, AP = { - SpellName(25782), -- Greater Blessing of Might SpellName(19740), -- Blessing of Might SpellName(6673), -- Battle Shout }, Intellect = { - SpellName(23028), -- Arcane Brilliance SpellName(1459), -- Arcane Intellect SpellName(46302), -- K'iru's Song of Victory SpellName(61316), -- Dalaran Brilliance - SpellName(61024), -- Dalaran Intellect SpellName(8096), -- Intellect [Scroll of Intellect] }, Kings = { - SpellName(25898), -- Greater Blessing of Kings SpellName(20217), -- Blessing of Kings SpellName(69378), -- Blessing of Forgotten Kings [Drums of Forgotten Kings] }, Mark = { - SpellName(21849), -- Gift of the Wild SpellName(1126), -- Mark of the Wild - SpellName(69381), -- Gift of the Wild [Drums of the Wild] - }, - Spirit = { - SpellName(27681), -- Prayer of Spirit - SpellName(14752), -- Divine Spirit }, Stamina = { SpellName(21562), -- Prayer of Fortitude - SpellName(1243), -- Power Word: Fortitude SpellName(46302), -- K'iru's Song of Victory SpellName(69377), -- Fortitude [Runescroll of Fortitude] }, @@ -190,7 +177,6 @@ if C.reminder.solo_buffs_enable == true then [1] = { -- Mark of the Wild group ["spells"] = { SpellName(1126), -- Mark of the Wild - SpellName(21849), -- Gift of the Wild }, ["combat"] = true, ["instance"] = true, @@ -199,13 +185,10 @@ if C.reminder.solo_buffs_enable == true then HUNTER = { [1] = { -- Aspects group ["spells"] = { - SpellName(61846), -- Aspect of the Dragonhawk SpellName(13165), -- Aspect of the Hawk - SpellName(13161), -- Aspect of the Beast SpellName(5118), -- Aspect of the Cheetah - SpellName(13163), -- Aspect of the Monkey + SpellName(82661), -- Aspect of the Fox SpellName(13159), -- Aspect of the Pack - SpellName(34074), -- Aspect of the Viper SpellName(20043), -- Aspect of the Wild }, ["combat"] = true, @@ -226,7 +209,7 @@ if C.reminder.solo_buffs_enable == true then [1] = { -- Armors group ["spells"] = { SpellName(30482), -- Molten Armor - SpellName(168), -- Frost Armor + SpellName(7302), -- Frost Armor SpellName(6117), -- Mage Armor SpellName(7302), -- Ice Armor }, @@ -237,10 +220,8 @@ if C.reminder.solo_buffs_enable == true then [2] = { -- Intellect group ["spells"] = { SpellName(1459), -- Arcane Intellect - SpellName(23028), -- Arcane Brilliance SpellName(46302), -- K'iru's Song of Victory SpellName(61316), -- Dalaran Brilliance - SpellName(61024), -- Dalaran Intellect }, ["combat"] = true, ["instance"] = true, @@ -262,9 +243,7 @@ if C.reminder.solo_buffs_enable == true then SpellName(465), -- Devotion Aura SpellName(7294), -- Retribution Aura SpellName(19746), -- Concentration Aura - SpellName(19891), -- Fire Resistance Aura - SpellName(19888), -- Frost Resistance Aura - SpellName(19876), -- Shadow Resistance Aura + SpellName(19891), -- Resistance Aura }, ["combat"] = true, ["instance"] = true, @@ -274,11 +253,6 @@ if C.reminder.solo_buffs_enable == true then SpellName(20217), -- Blessing of Kings SpellName(19740), -- Blessing of Might SpellName(20911), -- Blessing of Sanctuary - SpellName(19742), -- Blessing of Wisdom - SpellName(25898), -- Greater Blessing of Kings - SpellName(25782), -- Greater Blessing of Might - SpellName(25899), -- Greater Blessing of Sanctuary - SpellName(25894), -- Greater Blessing of Wisdom }, ["combat"] = true, ["instance"] = true, @@ -286,15 +260,11 @@ if C.reminder.solo_buffs_enable == true then }, [4] = { -- Seals group ["spells"] = { - SpellName(21084), -- Seal of Righteousness - SpellName(31892), -- Seal of Blood - SpellName(20375), -- Seal of Command + SpellName(31801), -- Seal of Truth SpellName(348704), -- Seal of Corruption + SpellName(20154), -- Seal of Righteousness SpellName(20164), -- Seal of Justice - SpellName(20165), -- Seal of Light - SpellName(31801), -- Seal of Vengeance - SpellName(20166), -- Seal of Wisdom - SpellName(348700), -- Seal of the Martyr + SpellName(20165), -- Seal of Insight }, ["combat"] = true, ["instance"] = true, @@ -305,6 +275,7 @@ if C.reminder.solo_buffs_enable == true then [1] = { -- Inner Fire/Will group ["spells"] = { SpellName(588), -- Inner Fire + SpellName(73413), -- Inner Will }, ["combat"] = true, ["instance"] = true, @@ -313,32 +284,21 @@ if C.reminder.solo_buffs_enable == true then }, [2] = { -- Stamina Group ["spells"] = { - SpellName(1243), -- Power Word: Fortitude SpellName(21562), -- Prayer of Fortitude SpellName(46302), -- K'iru's Song of Victory }, ["combat"] = true, ["instance"] = true, }, - [3] = { -- Spirit - ["spells"] = { - SpellName(14752), -- Divine Spirit - SpellName(27681), -- Prayer of Spirit - }, - ["combat"] = true, - ["instance"] = true, - -- ["level"] = 30, - }, - [4] = { -- Shadow Resistance group + [3] = { -- Shadow Resistance group ["spells"] = { - SpellName(976), -- Shadow Protection - SpellName(27683), -- Prayer of Shadow Protection + SpellName(27683), -- Shadow Protection }, ["combat"] = true, ["instance"] = true, -- ["level"] = 30, }, - [5] = { -- Vampiric Embrace group + [4] = { -- Vampiric Embrace group ["spells"] = { SpellName(15286), -- Vampiric Embrace }, @@ -348,7 +308,7 @@ if C.reminder.solo_buffs_enable == true then -- ["level"] = 30, }, --[[ - [6] = { -- Shadowform group + [5] = { -- Shadowform group ["spells"] = { SpellName(15473), -- Shadowform }, @@ -362,27 +322,10 @@ if C.reminder.solo_buffs_enable == true then [1] = { -- Main Hand Weapon Enchant group ["spells"] = { SpellName(8679), -- Instant Poison - SpellName(8686), -- Instant Poison II - SpellName(8688), -- Instant Poison III - SpellName(11338), -- Instant Poison IV - SpellName(11339), -- Instant Poison V - SpellName(11340), -- Instant Poison VI - SpellName(26891), -- Instant Poison VII - SpellName(57967), -- Instant Poison VIII - SpellName(57968), -- Instant Poison IX SpellName(2823), -- Deadly Poison - SpellName(2824), -- Deadly Poison II - SpellName(11355), -- Deadly Poison III - SpellName(11356), -- Deadly Poison IV - SpellName(25351), -- Deadly Poison V - SpellName(26967), -- Deadly Poison VI - SpellName(27186), -- Deadly Poison VII - SpellName(57972), -- Deadly Poison VIII - SpellName(57973), -- Deadly Poison IX SpellName(3408), -- Crippling Poison SpellName(5761), -- Mind-numbing Poison SpellName(13219), -- Wound Poison - SpellName(26785), -- Anesthetic Poison }, ["mainhand"] = true, ["combat"] = true, @@ -393,27 +336,10 @@ if C.reminder.solo_buffs_enable == true then [2] = { -- Off-Hand Weapon Enchant group ["spells"] = { SpellName(8679), -- Instant Poison - SpellName(8686), -- Instant Poison II - SpellName(8688), -- Instant Poison III - SpellName(11338), -- Instant Poison IV - SpellName(11339), -- Instant Poison V - SpellName(11340), -- Instant Poison VI - SpellName(26891), -- Instant Poison VII - SpellName(57967), -- Instant Poison VIII - SpellName(57968), -- Instant Poison IX SpellName(2823), -- Deadly Poison - SpellName(2824), -- Deadly Poison II - SpellName(11355), -- Deadly Poison III - SpellName(11356), -- Deadly Poison IV - SpellName(25351), -- Deadly Poison V - SpellName(26967), -- Deadly Poison VI - SpellName(27186), -- Deadly Poison VII - SpellName(57972), -- Deadly Poison VIII - SpellName(57973), -- Deadly Poison IX SpellName(3408), -- Crippling Poison SpellName(5761), -- Mind-numbing Poison SpellName(13219), -- Wound Poison - SpellName(26785), -- Anesthetic Poison }, ["offhand"] = true, ["combat"] = true, @@ -465,16 +391,7 @@ if C.reminder.solo_buffs_enable == true then [1] = { -- Armors group ["spells"] = { SpellName(28176), -- Fel Armor - SpellName(706), -- Demon Armor - SpellName(687), -- Demon Skin - }, - ["combat"] = true, - ["instance"] = true, - ["pvp"] = true, - }, - [2] = { -- Amplify Curse group - ["spells"] = { - SpellName(18288), -- Amplify Curse + SpellName(687), -- Demon Armor }, ["combat"] = true, ["instance"] = true, diff --git a/ShestakUI/Config/Filters_TBC/Announcements.lua b/ShestakUI/Config/Filters_TBC/Announcements.lua index a4a313b8d..bc994233b 100644 --- a/ShestakUI/Config/Filters_TBC/Announcements.lua +++ b/ShestakUI/Config/Filters_TBC/Announcements.lua @@ -68,27 +68,27 @@ if C.announcements.bad_gear == true then T.AnnounceBadGear = { -- Head [1] = { - 33820, -- Weather-Beaten Fishing Hat - 19972, -- Lucky Fishing Hat + [33820] = true, -- Weather-Beaten Fishing Hat + [19972] = true, -- Lucky Fishing Hat }, -- Neck [2] = { - 32757, -- Blessed Medallion of Karabor + [32757] = true, -- Blessed Medallion of Karabor }, -- Feet [8] = { - 19969, -- Nat Pagle's Extreme Anglin' Boots + [19969] = true, -- Nat Pagle's Extreme Anglin' Boots }, -- Main-Hand [16] = { - 19970, -- Arcanite Fishing Pole - 19022, -- Nat Pagle's Extreme Angler FC-5000 - 25978, -- Seth's Graphite Fishing Pole - 6367, -- Big Iron Fishing Pole - 6366, -- Darkwood Fishing Pole - 6365, -- Strong Fishing Pole - 12225, -- Blump Family Fishing Pole - 6256, -- Fishing Pole + [19970] = true, -- Arcanite Fishing Pole + [19022] = true, -- Nat Pagle's Extreme Angler FC-5000 + [25978] = true, -- Seth's Graphite Fishing Pole + [6367] = true, -- Big Iron Fishing Pole + [6366] = true, -- Darkwood Fishing Pole + [6365] = true, -- Strong Fishing Pole + [12225] = true, -- Blump Family Fishing Pole + [6256] = true, -- Fishing Pole }, } end \ No newline at end of file diff --git a/ShestakUI/Config/Filters_TBC/CombatText.lua b/ShestakUI/Config/Filters_TBC/CombatText.lua index 60aa4169e..76f5ca038 100644 --- a/ShestakUI/Config/Filters_TBC/CombatText.lua +++ b/ShestakUI/Config/Filters_TBC/CombatText.lua @@ -194,11 +194,11 @@ elseif T.class == "MAGE" then elseif T.class == "PALADIN" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[20267] = 6 -- Judgment of Light r1 - T.merge[20341] = 20267 -- Judgment of Light r2 - T.merge[20342] = 20267 -- Judgment of Light r3 - T.merge[20343] = 20267 -- Judgment of Light r4 - T.merge[27163] = 20267 -- Judgment of Light r5 + T.aoespam[20267] = 6 -- Judgement of Light r1 + T.merge[20341] = 20267 -- Judgement of Light r2 + T.merge[20342] = 20267 -- Judgement of Light r3 + T.merge[20343] = 20267 -- Judgement of Light r4 + T.merge[27163] = 20267 -- Judgement of Light r5 -- Damaging spells T.aoespam[26573] = 3 -- Consecration r1 T.merge[20116] = 26573 -- Consecration r2 @@ -251,6 +251,7 @@ elseif T.class == "PRIEST" then T.merge[10961] = 596 -- Prayer of Healing r4 T.merge[25316] = 596 -- Prayer of Healing r5 T.merge[25308] = 596 -- Prayer of Healing r6 + T.aoespam[33110] = 3 -- Prayer of Mending -- Damaging spells T.aoespam[15237] = 0 -- Holy Nova r1 T.merge[15430] = 15237 -- Holy Nova r2 @@ -479,7 +480,7 @@ elseif T.class == "WARRIOR" then T.merge[12850] = 12162 -- Deep Wounds r2 T.merge[12868] = 12162 -- Deep Wounds r3 T.aoespam[1680] = 1.5 -- Whirlwind - T.merge[44949] = 1680 -- Whirlwind [Trigger] + T.merge[44949] = 1680 -- Whirlwind Off-Hand T.aoespam[6343] = 0 -- Thunder Clap r1 T.merge[8198] = 6343 -- Thunder Clap r2 T.merge[8204] = 6343 -- Thunder Clap r3 diff --git a/ShestakUI/Config/Filters_TBC/Cooldowns.lua b/ShestakUI/Config/Filters_TBC/Cooldowns.lua index 383bece5c..56792f5ec 100644 --- a/ShestakUI/Config/Filters_TBC/Cooldowns.lua +++ b/ShestakUI/Config/Filters_TBC/Cooldowns.lua @@ -38,6 +38,7 @@ if C.raidcooldown.enable == true then {27871, 360}, -- Lightwell r3 {28275, 360}, -- Lightwell r4 -- Defense + {22812, 60}, -- Barkskin {1022, 300}, -- Blessing of Protection r1 (300sec base / -120sec from talents) {5599, 300}, -- Blessing of Protection r2 (300sec base / -120sec from talents) {10278, 300}, -- Blessing of Protection r3 (300sec base / -120sec from talents) @@ -45,6 +46,7 @@ if C.raidcooldown.enable == true then -- {20729, 30}, -- Blessing of Sacrifice r2 -- {27147, 30}, -- Blessing of Sacrifice r3 -- {27148, 30}, -- Blessing of Sacrifice r4 + {498, 300}, -- Divine Protection {633, 3600}, -- Lay on Hands r1 (3600sec base / -1200sec from talents / -720sec from 4pc T3) {2800, 3600}, -- Lay on Hands r2 (3600sec base / -1200sec from talents / -720sec from 4pc T3) {10310, 3600}, -- Lay on Hands r3 (3600sec base / -1200sec from talents / -720sec from 4pc T3) @@ -100,11 +102,11 @@ if C.enemycooldown.enable == true then {19386, 120}, -- Wyvern Sting {31661, 20}, -- Dragon's Breath {11113, 30}, -- Blast Wave (30sec base / -4sec from 4pc T4) - {853, 35}, -- Hammer of Justice (60sec base / -10sec from 4pc PvP / -15sec from talents / -0.5sec from ZG neck) + {853, 35}, -- Hammer of Justice (60sec base / -10sec from 4pc PvP / -15sec from talents) {20066, 60}, -- Repentance {6789, 120}, -- Death Coil (120sec base / -18sec from 5pc ZG Set) {8122, 23}, -- Psychic Scream (30sec base / -3sec from gloves / -4sec from talents) - {2094, 90}, -- Blind (180sec base / -90sec from talents) + {2094, 120}, -- Blind (180sec base / -60sec from talents) {5484, 40}, -- Howl of Terror {30283, 20}, -- Shadowfury {12809, 45}, -- Concussion Blow diff --git a/ShestakUI/Config/Filters_TBC/FilgerSpells.lua b/ShestakUI/Config/Filters_TBC/FilgerSpells.lua index c8f199c3c..42a856473 100644 --- a/ShestakUI/Config/Filters_TBC/FilgerSpells.lua +++ b/ShestakUI/Config/Filters_TBC/FilgerSpells.lua @@ -719,7 +719,7 @@ C["filger_spells"] = { -- Shadowmeld (Night Elf) {spellID = 20580, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -784,8 +784,6 @@ C["filger_spells"] = { {spellID = 19615, unitID = "pet", caster = "all", filter = "BUFF"}, -- Furious Howl (Wolf) {spellID = 24604, unitID = "player", caster = "all", filter = "BUFF"}, - -- Master Tactician - {spellID = 34833, unitID = "player", caster = "player", filter = "BUFF"}, -- Mend Pet {spellID = 136, unitID = "pet", caster = "player", filter = "BUFF"}, -- Misdirection @@ -821,6 +819,8 @@ C["filger_spells"] = { -- Buffs -- Ferocious Inspiration {spellID = 34456, unitID = "player", caster = "all", filter = "BUFF"}, + -- Master Tactician + {spellID = 34833, unitID = "player", caster = "player", filter = "BUFF"}, -- Quick Shots {spellID = 6150, unitID = "player", caster = "player", filter = "BUFF"}, @@ -1191,7 +1191,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -1222,8 +1222,6 @@ C["filger_spells"] = { -- Arcane Power {spellID = 12042, unitID = "player", caster = "player", filter = "BUFF"}, - -- Blazing Speed - {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, -- Combustion {spellID = 28682, unitID = "player", caster = "player", filter = "BUFF"}, -- Evocation @@ -1289,6 +1287,8 @@ C["filger_spells"] = { Position = {"TOP", P_PROC_ICON_Anchor}, -- Buffs + -- Blazing Speed + {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, -- Clearcasting [Arcane Concentration] {spellID = 12536, unitID = "player", caster = "player", filter = "BUFF", absID = true}, @@ -1474,8 +1474,20 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", T_DEBUFF_ICON_Anchor}, - -- Blast Wave - {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Blast Wave r1 + {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r2 + {spellID = 13018, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r3 + {spellID = 13019, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r4 + {spellID = 13020, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r5 + {spellID = 13021, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r6 + {spellID = 27133, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r7 + {spellID = 33933, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Blizzard -- {spellID = 10, unitID = "target", caster = "player", filter = "DEBUFF"}, --[[ @@ -1537,7 +1549,7 @@ C["filger_spells"] = { -- Flamestrike -- {spellID = 2120, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frost Nova - {spellID = 122, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 122, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Frostbite {spellID = 12494, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Frostbolt r1 @@ -2186,6 +2198,8 @@ C["filger_spells"] = { -- Avenger's Shield {spellID = 31935, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Blood Corruption + {spellID = 356110, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Consecration {spellID = 26573, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hammer of Justice @@ -3871,7 +3885,7 @@ C["filger_spells"] = { -- Gift of the Naaru (Draenei) {spellID = 28880, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -4811,6 +4825,8 @@ C["filger_spells"] = { {spellID = 12292, filter = "CD"}, -- Disarm {spellID = 676, filter = "CD", absID = true}, + -- Heroic Strike + {spellID = 78, filter = "CD"}, -- Intercept {spellID = 20252, filter = "CD"}, -- Intervene @@ -4872,7 +4888,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, diff --git a/ShestakUI/Config/Filters_TBC/Nameplates.lua b/ShestakUI/Config/Filters_TBC/Nameplates.lua index 9a56f5a61..be40a81c7 100644 --- a/ShestakUI/Config/Filters_TBC/Nameplates.lua +++ b/ShestakUI/Config/Filters_TBC/Nameplates.lua @@ -98,6 +98,7 @@ T.DebuffWhiteList = { -- Paladin [SpellName(31935)] = true, -- Avenger's Shield + [SpellName(356110)] = true, -- Blood Corruption [SpellName(26573)] = true, -- Consecration [SpellName(853)] = true, -- Hammer of Justice [SpellName(31803)] = true, -- Holy Vengeance @@ -453,8 +454,8 @@ T.BuffWhiteList = { -- [SpellName(5500)] = true, -- Sense Demons [SpellName(17941)] = true, -- Shadow Trance [SpellName(6229)] = true, -- Shadow Ward - [SpellName(20707)] = true, -- Soulstone Resurrection [SpellName(25228)] = true, -- Soul Link + [SpellName(20707)] = true, -- Soulstone Resurrection [SpellName(19478)] = true, -- Tainted Blood (Felhunter) -- Warrior diff --git a/ShestakUI/Config/Filters_Vanilla/Announcements.lua b/ShestakUI/Config/Filters_Vanilla/Announcements.lua index 07b732620..1842ee4e5 100644 --- a/ShestakUI/Config/Filters_Vanilla/Announcements.lua +++ b/ShestakUI/Config/Filters_Vanilla/Announcements.lua @@ -60,21 +60,21 @@ if C.announcements.bad_gear == true then T.AnnounceBadGear = { -- Head [1] = { - 19972, -- Lucky Fishing Hat + [19972] = true, -- Lucky Fishing Hat }, -- Feet [8] = { - 19969, -- Nat Pagle's Extreme Anglin' Boots + [19969] = true, -- Nat Pagle's Extreme Anglin' Boots }, -- Main-Hand [16] = { - 19970, -- Arcanite Fishing Pole - 19022, -- Nat Pagle's Extreme Angler FC-5000 - 6367, -- Big Iron Fishing Pole - 6366, -- Darkwood Fishing Pole - 6365, -- Strong Fishing Pole - 12225, -- Blump Family Fishing Pole - 6256, -- Fishing Pole + [19970] = true, -- Arcanite Fishing Pole + [19022] = true, -- Nat Pagle's Extreme Angler FC-5000 + [6367] = true, -- Big Iron Fishing Pole + [6366] = true, -- Darkwood Fishing Pole + [6365] = true, -- Strong Fishing Pole + [12225] = true, -- Blump Family Fishing Pole + [6256] = true, -- Fishing Pole }, } end \ No newline at end of file diff --git a/ShestakUI/Config/Filters_Vanilla/CombatText.lua b/ShestakUI/Config/Filters_Vanilla/CombatText.lua index fef6c0bae..9127bf2d5 100644 --- a/ShestakUI/Config/Filters_Vanilla/CombatText.lua +++ b/ShestakUI/Config/Filters_Vanilla/CombatText.lua @@ -194,10 +194,10 @@ elseif T.class == "MAGE" then elseif T.class == "PALADIN" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[20267] = 6 -- Judgment of Light r1 - T.merge[20341] = 20267 -- Judgment of Light r2 - T.merge[20342] = 20267 -- Judgment of Light r3 - T.merge[20343] = 20267 -- Judgment of Light r4 + T.aoespam[20267] = 6 -- Judgement of Light r1 + T.merge[20341] = 20267 -- Judgement of Light r2 + T.merge[20342] = 20267 -- Judgement of Light r3 + T.merge[20343] = 20267 -- Judgement of Light r4 -- Damaging spells T.aoespam[26573] = 3 -- Consecration r1 T.merge[20116] = 26573 -- Consecration r2 diff --git a/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua b/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua index 286782842..4f745a2d1 100644 --- a/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua +++ b/ShestakUI/Config/Filters_Vanilla/Cooldowns.lua @@ -19,9 +19,10 @@ if C.raidcooldown.enable == true then {724, 600}, -- Lightwell {409324, 120}, -- Ancestral Guidance [Season of Discovery] -- Defense - -- {428713, 60}, -- Barkskin [Season of Discovery] + {428713, 60}, -- Barkskin [Season of Discovery] {408024, 180}, -- Survival Instincts [Season of Discovery] {1022, 300}, -- Blessing of Protection (300sec base / -120sec from talents) + {498, 300}, -- Divine Protection {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] @@ -71,7 +72,7 @@ if C.enemycooldown.enable == true then {19503, 30}, -- Scatter Shot {19386, 120}, -- Wyvern Sting {11113, 45}, -- Blast Wave - {853, 45}, -- Hammer of Justice (60sec base / -10sec from 4pc PvP / -15sec from talents / -0.5sec from ZG neck) + {853, 45}, -- Hammer of Justice (60sec base / -10sec from 4pc PvP / -15sec from talents) {20066, 60}, -- Repentance {6789, 120}, -- Death Coil (120sec base / -18sec from 5pc ZG Set) {8122, 26}, -- Psychic Scream (30sec base / -4sec from talents) @@ -80,6 +81,8 @@ if C.enemycooldown.enable == true then {12809, 45}, -- Concussion Blow -- Defense abilities {22812, 60}, -- Barkskin + {428713, 60}, -- Barkskin [Season of Discovery] + {408024, 180}, -- Survival Instincts [Season of Discovery] {19263, 300}, -- Deterrence {11958, 300}, -- Ice Block {1044, 14}, -- Blessing of Freedom (20sec base / -6sec from talents) diff --git a/ShestakUI/Config/Filters_Vanilla/FilgerSpells.lua b/ShestakUI/Config/Filters_Vanilla/FilgerSpells.lua index 4c0a0a8fc..2ee15d333 100644 --- a/ShestakUI/Config/Filters_Vanilla/FilgerSpells.lua +++ b/ShestakUI/Config/Filters_Vanilla/FilgerSpells.lua @@ -471,7 +471,7 @@ C["filger_spells"] = { -- Shadowmeld (Night Elf) {spellID = 20580, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -831,7 +831,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -1026,8 +1026,16 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", T_DEBUFF_ICON_Anchor}, - -- Blast Wave - {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Blast Wave r1 + {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r2 + {spellID = 13018, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r3 + {spellID = 13019, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r4 + {spellID = 13020, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r5 + {spellID = 13021, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Blizzard -- {spellID = 10, unitID = "target", caster = "player", filter = "DEBUFF"}, --[[ @@ -1083,7 +1091,7 @@ C["filger_spells"] = { -- Flamestrike -- {spellID = 2120, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frost Nova - {spellID = 122, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 122, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Frostbite {spellID = 12494, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Frostbolt r1 @@ -2682,7 +2690,7 @@ C["filger_spells"] = { -- Blood Fury {spellID = 23234, filter = "CD", absID = true}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -3363,6 +3371,8 @@ C["filger_spells"] = { {spellID = 676, filter = "CD", absID = true}, -- Enraged Regeneration [Season of Discovery] {spellID = 402913, filter = "CD"}, + -- Heroic Strike + {spellID = 78, filter = "CD"}, -- Intercept {spellID = 20252, filter = "CD"}, -- Intervene [Season of Discovery] @@ -3426,7 +3436,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, diff --git a/ShestakUI/Config/Filters_Vanilla/Nameplates.lua b/ShestakUI/Config/Filters_Vanilla/Nameplates.lua index b7be29566..7ae7266e1 100644 --- a/ShestakUI/Config/Filters_Vanilla/Nameplates.lua +++ b/ShestakUI/Config/Filters_Vanilla/Nameplates.lua @@ -490,8 +490,8 @@ T.BuffWhiteList = { [SpellName(426311)] = true, -- Shadow and Flame [Season of Discovery] [SpellName(17941)] = true, -- Shadow Trance [SpellName(6229)] = true, -- Shadow Ward - [SpellName(20707)] = true, -- Soulstone Resurrection [SpellName(25228)] = true, -- Soul Link + [SpellName(20707)] = true, -- Soulstone Resurrection [SpellName(19478)] = true, -- Tainted Blood (Felhunter) [SpellName(426195)] = true, -- Vengeance [Season of Discovery] diff --git a/ShestakUI/Config/Filters_Wrath/Announcements.lua b/ShestakUI/Config/Filters_Wrath/Announcements.lua index 3acb65370..cfdf13432 100644 --- a/ShestakUI/Config/Filters_Wrath/Announcements.lua +++ b/ShestakUI/Config/Filters_Wrath/Announcements.lua @@ -81,32 +81,32 @@ if C.announcements.bad_gear == true then T.AnnounceBadGear = { -- Head [1] = { - 33820, -- Weather-Beaten Fishing Hat - 19972, -- Lucky Fishing Hat + [33820] = true, -- Weather-Beaten Fishing Hat + [19972] = true, -- Lucky Fishing Hat }, -- Neck [2] = { - 32757, -- Blessed Medallion of Karabor + [32757] = true, -- Blessed Medallion of Karabor }, -- Feet [8] = { - 50287, -- Boots of the Bay - 19969, -- Nat Pagle's Extreme Anglin' Boots + [50287] = true, -- Boots of the Bay + [19969] = true, -- Nat Pagle's Extreme Anglin' Boots }, -- Main-Hand [16] = { - 44050, -- Mastercraft Kalu'ak Fishing Pole - 45992, -- Jeweled Fishing Pole - 45991, -- Bone Fishing Pole - 45858, -- Nat's Lucky Fishing Pole - 19970, -- Arcanite Fishing Pole - 19022, -- Nat Pagle's Extreme Angler FC-5000 - 25978, -- Seth's Graphite Fishing Pole - 6367, -- Big Iron Fishing Pole - 6366, -- Darkwood Fishing Pole - 6365, -- Strong Fishing Pole - 12225, -- Blump Family Fishing Pole - 6256, -- Fishing Pole + [44050] = true, -- Mastercraft Kalu'ak Fishing Pole + [45992] = true, -- Jeweled Fishing Pole + [45991] = true, -- Bone Fishing Pole + [45858] = true, -- Nat's Lucky Fishing Pole + [19970] = true, -- Arcanite Fishing Pole + [19022] = true, -- Nat Pagle's Extreme Angler FC-5000 + [25978] = true, -- Seth's Graphite Fishing Pole + [6367] = true, -- Big Iron Fishing Pole + [6366] = true, -- Darkwood Fishing Pole + [6365] = true, -- Strong Fishing Pole + [12225] = true, -- Blump Family Fishing Pole + [6256] = true, -- Fishing Pole }, } end \ No newline at end of file diff --git a/ShestakUI/Config/Filters_Wrath/ArenaControl.lua b/ShestakUI/Config/Filters_Wrath/ArenaControl.lua index 0d64c0a16..4fa4285bf 100644 --- a/ShestakUI/Config/Filters_Wrath/ArenaControl.lua +++ b/ShestakUI/Config/Filters_Wrath/ArenaControl.lua @@ -64,6 +64,7 @@ T.ArenaControl = { [SpellName(6770)] = 5, -- Sap -- Shaman [SpellName(58861)] = 5, -- Bash (Spirit Wolf) + [SpellName(53019)] = 5, -- Earth's Grasp [SpellName(51514)] = 5, -- Hex [SpellName(39796)] = 5, -- Stoneclaw Totem -- Warlock @@ -106,6 +107,7 @@ T.ArenaControl = { [SpellName(33395)] = 3, -- Freeze (Water Elemental) [SpellName(122)] = 3, -- Frost Nova [SpellName(12494)] = 3, -- Frostbite + [SpellName(55080)] = 3, -- Shattered Barrier [SpellName(58373)] = 3, -- Glyph of Hamstring [SpellName(23694)] = 3, -- Improved Hamstring diff --git a/ShestakUI/Config/Filters_Wrath/CombatText.lua b/ShestakUI/Config/Filters_Wrath/CombatText.lua index d3ea08e99..789ea1255 100644 --- a/ShestakUI/Config/Filters_Wrath/CombatText.lua +++ b/ShestakUI/Config/Filters_Wrath/CombatText.lua @@ -31,13 +31,17 @@ if T.class == "DEATHKNIGHT" then T.aoespam[49217] = 3 -- Wandering Plague -- Merging mh/oh strikes T.aoespam[49020] = 0.5 -- Obliterate MH - -- T.aoespam[66198] = 0 -- Obliterate OH + T.merge[66198] = 49020 -- Obliterate OH T.aoespam[49998] = 0.5 -- Death Strike MH - -- T.aoespam[66188] = 0 -- Death Strike OH + T.merge[66188] = 49998 -- Death Strike OH T.aoespam[45462] = 0.5 -- Plague Strike MH - -- T.aoespam[66216] = 0 -- Plague Strike OH + T.merge[66216] = 45462 -- Plague Strike OH T.aoespam[49143] = 0.5 -- Frost Strike MH - -- T.aoespam[66196] = 0 -- Frost Strike OH + T.merge[66196] = 49143 -- Frost Strike OH + T.aoespam[45902] = 0.5 -- Blood Strike MH + T.merge[66215] = 45902 -- Blood Strike OH + T.aoespam[56815] = 0.5 -- Rune Strike MH + T.merge[66217] = 56815 -- Rune Strike OH end if C.combattext.healing then T.healfilter[50475] = true -- Blood Presence @@ -278,7 +282,7 @@ elseif T.class == "MAGE" then elseif T.class == "PALADIN" then if C.combattext.merge_aoe_spam then -- Healing spells - T.aoespam[20267] = 6 -- Judgment of Light + T.aoespam[20267] = 6 -- Judgement of Light -- Damaging spells T.aoespam[53600] = 0.5 -- Shield of the Righteous r1 T.merge[61411] = 53600 -- Shield of the Righteous r2 @@ -292,6 +296,7 @@ elseif T.class == "PALADIN" then T.merge[48819] = 26573 -- Consecration r8 T.aoespam[53385] = 0 -- Divine Storm T.aoespam[53595] = 1 -- Hammer of the Righteous + T.aoespam[20424] = 1 -- Seal of Command T.aoespam[20925] = 3 -- Holy Shield r1 T.merge[20927] = 20925 -- Holy Shield r2 T.merge[20928] = 20925 -- Holy Shield r3 @@ -346,6 +351,7 @@ elseif T.class == "PRIEST" then T.merge[25316] = 596 -- Prayer of Healing r5 T.merge[25308] = 596 -- Prayer of Healing r6 T.merge[48072] = 596 -- Prayer of Healing r7 + T.aoespam[33110] = 3 -- Prayer of Mending -- Damaging spells T.aoespam[49821] = 3 -- Mind Sear r1 T.merge[53022] = 49821 -- Mind Sear r2 @@ -429,7 +435,7 @@ elseif T.class == "ROGUE" then T.merge[57964] = 8680 -- Instant Poison VIII T.aoespam[22482] = 3 -- Blade Flurry T.aoespam[57841] = 3 -- Killing Spree - T.merge[57842] = 57841 -- Killing Spree [Trigger] + T.merge[57842] = 57841 -- Killing Spree Off-Hand T.aoespam[5374] = 0 -- Mutilate r1 T.merge[34414] = 5374 -- Mutilate r2 T.merge[34416] = 5374 -- Mutilate r3 @@ -445,7 +451,6 @@ elseif T.class == "ROGUE" then T.merge[26867] = 1943 -- Rupture r7 T.merge[48671] = 1943 -- Rupture r8 T.merge[48672] = 1943 -- Rupture r9 - T.merge[27576] = 5374 -- Mutilate Off-Hand T.merge[27576] = 5374 -- Mutilate Off-Hand r1 T.merge[34415] = 5374 -- Mutilate Off-Hand r2 T.merge[34417] = 5374 -- Mutilate Off-Hand r3 @@ -595,6 +600,8 @@ elseif T.class == "WARLOCK" then T.healfilter[27220] = true -- Drain Life r8 T.healfilter[47857] = true -- Drain Life r9 T.healfilter[63108] = true -- Siphon Life + T.healfilter[63106] = true -- Siphon Life + T.healfilter[54181] = true -- Fel Synergy end elseif T.class == "WARRIOR" then if C.combattext.merge_aoe_spam then @@ -642,7 +649,7 @@ elseif T.class == "WARRIOR" then T.merge[12850] = 12162 -- Deep Wounds r2 T.merge[12868] = 12162 -- Deep Wounds r3 T.aoespam[1680] = 1.5 -- Whirlwind - T.merge[44949] = 1680 -- Whirlwind [Trigger] + T.merge[44949] = 1680 -- Whirlwind Off-Hand T.aoespam[6343] = 0 -- Thunder Clap r1 T.merge[8198] = 6343 -- Thunder Clap r2 T.merge[8204] = 6343 -- Thunder Clap r3 diff --git a/ShestakUI/Config/Filters_Wrath/Cooldowns.lua b/ShestakUI/Config/Filters_Wrath/Cooldowns.lua index e96b24702..e9e8e2ee4 100644 --- a/ShestakUI/Config/Filters_Wrath/Cooldowns.lua +++ b/ShestakUI/Config/Filters_Wrath/Cooldowns.lua @@ -31,13 +31,13 @@ if C.raidcooldown.enable == true then {2825, 300}, -- Bloodlust {32182, 300}, -- Heroism -- Healing - {740, 480}, -- Tranquility r1 (480sec base / -288sec from talents / -240sec from 8pc T1) - {8918, 480}, -- Tranquility r2 (480sec base / -288sec from talents / -240sec from 8pc T1) - {9862, 480}, -- Tranquility r3 (480sec base / -288sec from talents / -240sec from 8pc T1) - {9863, 480}, -- Tranquility r4 (480sec base / -288sec from talents / -240sec from 8pc T1) - {26983, 480}, -- Tranquility r5 (480sec base / -288sec from talents / -240sec from 8pc T1) - {48446, 480}, -- Tranquility r6 (480sec base / -288sec from talents / -240sec from 8pc T1) - {48447, 480}, -- Tranquility r7 (480sec base / -288sec from talents / -240sec from 8pc T1) + {740, 480}, -- Tranquility r1 (480sec base / -288sec from talents / -72sec from 8pc T1) + {8918, 480}, -- Tranquility r2 (480sec base / -288sec from talents / -72sec from 8pc T1) + {9862, 480}, -- Tranquility r3 (480sec base / -288sec from talents / -72sec from 8pc T1) + {9863, 480}, -- Tranquility r4 (480sec base / -288sec from talents / -72sec from 8pc T1) + {26983, 480}, -- Tranquility r5 (480sec base / -288sec from talents / -72sec from 8pc T1) + {48446, 480}, -- Tranquility r6 (480sec base / -288sec from talents / -72sec from 8pc T1) + {48447, 480}, -- Tranquility r7 (480sec base / -288sec from talents / -72sec from 8pc T1) {64843, 480}, -- Divine Hymn {724, 180}, -- Lightwell r1 {27870, 180}, -- Lightwell r2 @@ -47,12 +47,14 @@ if C.raidcooldown.enable == true then {48087, 180}, -- Lightwell r6 -- Defense {48707, 45}, -- Anti-Magic Shell - {51052, 180}, -- Anti-Magic Zone + {51052, 120}, -- Anti-Magic Zone {42650, 600}, -- Army of the Dead {49222, 60}, -- Bone Shield (60sec base / -10sec from 4pc T9) {48792, 120}, -- Icebound Fortitude + {22812, 60}, -- Barkskin (60sec base / -12sec from 4pc T9) {61336, 180}, -- Survival Instincts {31821, 120}, -- Aura Mastery + {498, 180}, -- Divine Protection (180sec base / -60sec from talents / -30sec from 4pc T9) {64205, 120}, -- Divine Sacrifice {1022, 300}, -- Hand of Protection r1 (300sec base / -120sec from talents) {5599, 300}, -- Hand of Protection r2 (300sec base / -120sec from talents) @@ -124,28 +126,28 @@ if C.enemycooldown.enable == true then {19386, 54}, -- Wyvern Sting (60sec base / -6sec from glyph) {31661, 20}, -- Dragon's Breath {11113, 30}, -- Blast Wave (30sec base / -4sec from 4pc T4) - {853, 40}, -- Hammer of Justice (60sec base / -20sec from talents / -10sec from talents / -0.5sec from ZG neck) + {853, 40}, -- Hammer of Justice (60sec base / -20sec from talents / -10sec from talents) {20066, 60}, -- Repentance {6789, 120}, -- Death Coil (120sec base / -18sec from 5pc ZG Set) {64044, 120}, -- Psychic Horror {8122, 23}, -- Psychic Scream (30sec base / -3sec from gloves / -4sec from talents / +8sec from glyph) - {2094, 90}, -- Blind (180sec base / -90sec from talents) + {2094, 120}, -- Blind (180sec base / -60sec from talents) {5484, 32}, -- Howl of Terror (40sec base / -8sec from glyph) {30283, 20}, -- Shadowfury {12809, 30}, -- Concussion Blow {46968, 17}, -- Shockwave (20sec base / -3sec from glyph) -- Defense abilities {48707, 45}, -- Anti-Magic Shell - {51052, 180}, -- Anti-Magic Zone + {51052, 120}, -- Anti-Magic Zone {49222, 60}, -- Bone Shield (60sec base / -10sec from 4pc T9) {48792, 120}, -- Icebound Fortitude {51271, 60}, -- Unbreakable Armor (60sec base / -10sec from 4pc T9) {55233, 60}, -- Vampiric Blood (60sec base / -10sec from 4pc T9) {22812, 60}, -- Barkskin (60sec base / -12sec from 4pc T9) - {19263, 50}, -- Deterrence (60sec base / -10sec from glyph) + {19263, 90}, -- Deterrence (90sec base / -10sec from glyph) {45438, 240}, -- Ice Block (300sec base / -60sec from talents / -40sec from 4pc T4) - {66, 60}, -- Invisibility (180sec base / -120sec from talents) - {1044, 25}, -- Hand of Freedom (25sec base / -4sec from talents) + {66, 126}, -- Invisibility (180sec base / -54sec from talents) + {1044, 25}, -- Hand of Freedom {6940, 120}, -- Hand of Sacrifice {1038, 120}, -- Hand of Salvation {1022, 180}, -- Hand of Protection (300sec base / -120sec from talents) @@ -153,14 +155,14 @@ if C.enemycooldown.enable == true then {642, 300}, -- Divine Shield (300sec base / -60sec from talents) {6346, 120}, -- Fear Ward (180sec base / -60sec from glyph) {47585, 75}, -- Dispersion (120sec base / -45sec from glyph) - {47788, 144}, -- Guardian Spirit + {47788, 180}, -- Guardian Spirit {33206, 144}, -- Pain Suppression (180sec base / -36sec from talents) - {31224, 30}, -- Cloak of Shadows (60sec base / -30sec from talents) + {31224, 60}, -- Cloak of Shadows (90sec base / -30sec from talents) {5277, 120}, -- Evasion (180sec base / -60sec from talents / -60sec from 3pc AQ Set) {1856, 120}, -- Vanish (180sec base / -60sec from talents / -30sec from 3pc T1) -- {8178, 11}, -- Grounding Totem Effect (15sec base / -2sec from talents / -1.5sec from 4pc PvP) {18499, 20}, -- Berserker Rage (30sec base / -10sec from talents) - {46924, 45}, -- Bladestorm (60sec base / -15sec from glyph) + {46924, 75}, -- Bladestorm (90sec base / -15sec from glyph) {12975, 120}, -- Last Stand (180sec base / -60sec from glyph) {2565, 40}, -- Shield Block (60sec base / -20sec from talents / -10sec from 4pc T9) {871, 180}, -- Shield Wall (300sec base / -60sec from talents / -120sec from glyph) diff --git a/ShestakUI/Config/Filters_Wrath/Diminishing.lua b/ShestakUI/Config/Filters_Wrath/Diminishing.lua index 1bbda6ab7..b12fed60c 100644 --- a/ShestakUI/Config/Filters_Wrath/Diminishing.lua +++ b/ShestakUI/Config/Filters_Wrath/Diminishing.lua @@ -182,6 +182,8 @@ T.DiminishingSpells = { [27088] = {"root"}, -- Frost Nova r5 [42917] = {"root"}, -- Frost Nova r6 -- [12494] = {"root"}, -- Frostbite + [55080] = {"root"}, -- Shattered Barrier + [53019] = {"root"}, -- Earth's Grasp -- [58373] = {"root"}, -- Glyph of Hamstring -- [23694] = {"root"}, -- Improved Hamstring -- [27868] = {"root"}, -- Freeze (Magister's Regalia / Sorcerer's Regalia / Deadman's Hand) diff --git a/ShestakUI/Config/Filters_Wrath/FilgerSpells.lua b/ShestakUI/Config/Filters_Wrath/FilgerSpells.lua index f4812c916..a373c45de 100644 --- a/ShestakUI/Config/Filters_Wrath/FilgerSpells.lua +++ b/ShestakUI/Config/Filters_Wrath/FilgerSpells.lua @@ -849,7 +849,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, @@ -933,6 +933,8 @@ C["filger_spells"] = { {spellID = 48391, unitID = "player", caster = "player", filter = "BUFF"}, -- Predator's Swiftness {spellID = 69369, unitID = "player", caster = "player", filter = "BUFF"}, + -- Savage Defense + {spellID = 62606, unitID = "player", caster = "player", filter = "BUFF"}, -- Item Sets -- Elune's Wrath (Special, Proc) [Nightsong Garb] @@ -1952,7 +1954,7 @@ C["filger_spells"] = { -- Shadowmeld (Night Elf) {spellID = 58984, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -2023,8 +2025,8 @@ C["filger_spells"] = { {spellID = 58914, unitID = "pet", caster = "player", filter = "BUFF"}, -- Lock and Load {spellID = 56453, unitID = "player", caster = "player", filter = "BUFF"}, - -- Master Tactician - {spellID = 34833, unitID = "player", caster = "player", filter = "BUFF"}, + -- Master's Call + {spellID = 62305, unitID = "player", caster = "player", filter = "BUFF"}, -- Mend Pet {spellID = 136, unitID = "pet", caster = "player", filter = "BUFF"}, -- Misdirection @@ -2630,7 +2632,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -2663,8 +2665,6 @@ C["filger_spells"] = { {spellID = 36032, unitID = "player", caster = "player", filter = "DEBUFF"}, -- Arcane Power {spellID = 12042, unitID = "player", caster = "player", filter = "BUFF"}, - -- Blazing Speed - {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, -- Combustion {spellID = 28682, unitID = "player", caster = "player", filter = "BUFF"}, -- Evocation @@ -2746,6 +2746,8 @@ C["filger_spells"] = { -- Buffs -- Arcane Potency -- {spellID = 57529, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Blazing Speed + {spellID = 31643, unitID = "player", caster = "player", filter = "BUFF"}, -- Burning Determination {spellID = 54748, unitID = "player", caster = "player", filter = "BUFF"}, -- Clearcasting [Arcane Concentration] @@ -3185,8 +3187,24 @@ C["filger_spells"] = { IconSize = C.filger.buffs_size, Position = {"TOP", T_DEBUFF_ICON_Anchor}, - -- Blast Wave - {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Blast Wave r1 + {spellID = 11113, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r2 + {spellID = 13018, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r3 + {spellID = 13019, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r4 + {spellID = 13020, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r5 + {spellID = 13021, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r6 + {spellID = 27133, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r7 + {spellID = 33933, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r8 + {spellID = 42944, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Blast Wave r9 + {spellID = 42945, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Blizzard -- {spellID = 10, unitID = "target", caster = "player", filter = "DEBUFF"}, --[[ @@ -3217,6 +3235,8 @@ C["filger_spells"] = { {spellID = 42930, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Cone of Cold r8 {spellID = 42931, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, + -- Deep Freeze + {spellID = 44572, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Dragon's Breath {spellID = 31661, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Fireball r1 @@ -3251,12 +3271,10 @@ C["filger_spells"] = { {spellID = 42832, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Fireball r16 {spellID = 42833, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, - -- Fire Vulnerability (Improved Scorch) - {spellID = 22959, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Flamestrike -- {spellID = 2120, unitID = "target", caster = "player", filter = "DEBUFF", absID = true}, -- Frost Nova - {spellID = 122, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 122, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Frostbite {spellID = 12494, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Frostbolt r1 @@ -3297,12 +3315,16 @@ C["filger_spells"] = { {spellID = 12654, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Impact {spellID = 12355, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Improved Scorch + {spellID = 22959, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Living Bomb {spellID = 44457, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Permafrost {spellID = 68391, unitID = "target", caster = "all", filter = "DEBUFF", absID = true}, -- Pyroblast {spellID = 11366, unitID = "target", caster = "player", filter = "DEBUFF"}, + -- Shattered Barrier + {spellID = 55080, unitID = "target", caster = "all", filter = "DEBUFF"}, -- Silenced - Improved Counterspell {spellID = 18469, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Slow @@ -3398,6 +3420,8 @@ C["filger_spells"] = { {spellID = 120, filter = "CD"}, -- Counterspell {spellID = 2139, filter = "CD"}, + -- Deep Freeze + {spellID = 44572, filter = "CD"}, -- Dragon's Breath {spellID = 31661, filter = "CD"}, -- Fire Blast @@ -4361,7 +4385,7 @@ C["filger_spells"] = { -- Avenger's Shield {spellID = 31935, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Blood Corruption - {spellID = 53742, unitID = "target", caster = "player", filter = "DEBUFF"}, + {spellID = 356110, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Consecration {spellID = 26573, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Hammer of Justice @@ -4378,7 +4402,7 @@ C["filger_spells"] = { {spellID = 20184, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Judgement of Light {spellID = 20185, unitID = "target", caster = "player", filter = "DEBUFF"}, - -- Judgement of the Just + -- Judgements of the Just {spellID = 68055, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Judgement of Wisdom {spellID = 20186, unitID = "target", caster = "player", filter = "DEBUFF"}, @@ -6082,6 +6106,8 @@ C["filger_spells"] = { {spellID = 52179, unitID = "player", caster = "player", filter = "BUFF"}, -- Clearcasting (Elemental Focus) {spellID = 16246, unitID = "player", caster = "player", filter = "BUFF", absID = true}, + -- Lava Flows + {spellID = 65264, unitID = "player", caster = "player", filter = "BUFF"}, -- Maelstrom Weapon {spellID = 53817, unitID = "player", caster = "player", filter = "BUFF"}, -- Nature's Guardian @@ -6812,7 +6838,7 @@ C["filger_spells"] = { -- Stoneclaw Totem {spellID = 39796, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Stormstrike - {spellID = 17364, unitID = "target", caster = "all", filter = "DEBUFF"}, + {spellID = 17364, unitID = "target", caster = "player", filter = "DEBUFF"}, -- Twin Howl {spellID = 58857, unitID = "target", caster = "all", filter = "DEBUFF"}, @@ -6917,6 +6943,8 @@ C["filger_spells"] = { BarWidth = 189, Position = {"LEFT", PVE_PVP_CC_Anchor}, + -- Earth's Grasp + {spellID = 53019, unitID = "focus", caster = "all", filter = "DEBUFF"}, -- Hex {spellID = 51514, unitID = "focus", caster = "all", filter = "DEBUFF", absID = true}, }, @@ -6993,7 +7021,7 @@ C["filger_spells"] = { -- Gift of the Naaru (Draenei) {spellID = 28880, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Items -- Back @@ -7031,13 +7059,13 @@ C["filger_spells"] = { -- Consume Shadows (Voidwalker) -- {spellID = 17767, unitID = "pet", caster = "all", filter = "BUFF"}, -- Demonic Empowerment (Imp - Increased Critical Strike) - {spellID = 54444, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54444, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Empowerment (Voidwalker - Increased Health/Increased Threat Generation) - {spellID = 54443, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54443, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Empowerment (Succubus - Improved Invisibility) - {spellID = 54436, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54436, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Empowerment (Felguard - Increased Attack Speed/CC Immunity) - {spellID = 54508, unitID = "player", caster = "all", filter = "BUFF", absID = true}, + {spellID = 54508, unitID = "pet", caster = "all", filter = "BUFF", absID = true}, -- Demonic Pact -- {spellID = 48090, unitID = "player", caster = "player", filter = "BUFF"}, -- Eye of Kilrogg @@ -8534,6 +8562,8 @@ C["filger_spells"] = { {spellID = 55694, filter = "CD"}, -- Heroic Fury {spellID = 60970, filter = "CD"}, + -- Heroic Strike + {spellID = 78, filter = "CD"}, -- Heroic Throw {spellID = 57755, filter = "CD"}, -- Intercept @@ -8558,6 +8588,8 @@ C["filger_spells"] = { {spellID = 20230, filter = "CD"}, -- Revenge {spellID = 6572, filter = "CD"}, + -- Shattering Throw + {spellID = 64382, filter = "CD"}, -- Shield Bash {spellID = 72, filter = "CD"}, -- Shield Block @@ -8599,7 +8631,7 @@ C["filger_spells"] = { -- Stoneform (Dwarf) {spellID = 20594, filter = "CD"}, -- War Stomp (Tauren) - {spellID = 20600, filter = "CD", absID = true}, + {spellID = 20549, filter = "CD", absID = true}, -- Will of the Forsaken (Forsaken) {spellID = 7744, filter = "CD"}, @@ -8830,7 +8862,7 @@ C["filger_spells"] = { -- Innervate {spellID = 29166, unitID = "player", caster = "all", filter = "BUFF"}, -- Hymn of Hope - {spellID = 64901, unitID = "player", caster = "all", filter = "BUFF"}, + {spellID = 64904, unitID = "player", caster = "all", filter = "BUFF"}, -- Mana Tide {spellID = 16191, unitID = "player", caster = "all", filter = "BUFF"}, -- Hand of Freedom @@ -9247,6 +9279,8 @@ C["filger_spells"] = { {spellID = 27088, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Frostbite {spellID = 12494, unitID = "player", caster = "all", filter = "DEBUFF"}, + -- Shattered Barrier + {spellID = 55080, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Glyph of Hamstring {spellID = 58373, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Improved Hamstring @@ -9279,6 +9313,10 @@ C["filger_spells"] = { {spellID = 27133, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Blast Wave r7 {spellID = 33933, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Blast Wave r8 + {spellID = 42944, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Blast Wave r9 + {spellID = 42945, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, --[[ -- Chilled r1 (Blizzard) {spellID = 12484, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, @@ -9307,6 +9345,8 @@ C["filger_spells"] = { {spellID = 42930, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Cone of Cold r8 {spellID = 42931, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, + -- Deep Freeze + {spellID = 44572, unitID = "player", caster = "all", filter = "DEBUFF"}, -- Frostbolt r1 {spellID = 116, unitID = "player", caster = "all", filter = "DEBUFF", absID = true}, -- Frostbolt r2 diff --git a/ShestakUI/Config/Filters_Wrath/Nameplates.lua b/ShestakUI/Config/Filters_Wrath/Nameplates.lua index 8e64d3808..fca0e7892 100644 --- a/ShestakUI/Config/Filters_Wrath/Nameplates.lua +++ b/ShestakUI/Config/Filters_Wrath/Nameplates.lua @@ -113,7 +113,6 @@ T.DebuffWhiteList = { [SpellName(31661)] = true, -- Dragon's Breath [SpellName(64346)] = true, -- Fiery Payback [SpellName(133)] = true, -- Fireball - [SpellName(22959)] = true, -- Fire Vulnerability (Improved Scorch) [SpellName(2120)] = true, -- Flamestrike [SpellName(122)] = true, -- Frost Nova [SpellName(12494)] = true, -- Frostbite @@ -121,17 +120,19 @@ T.DebuffWhiteList = { [SpellName(44614)] = true, -- Frostfire Bolt [SpellName(12654)] = true, -- Ignite [SpellName(12355)] = true, -- Impact + [SpellName(22959)] = true, -- Improved Scorch [SpellName(44457)] = true, -- Living Bomb [SpellName(68391)] = true, -- Permafrost [SpellName(118)] = true, -- Polymorph [SpellName(11366)] = true, -- Pyroblast + [SpellName(55080)] = true, -- Shattered Barrier [SpellName(18469)] = true, -- Silenced - Improved Counterspell [SpellName(31589)] = true, -- Slow [SpellName(12579)] = true, -- Winter's Chill -- Paladin [SpellName(31935)] = true, -- Avenger's Shield - [SpellName(53742)] = true, -- Blood Corruption + [SpellName(356110)] = true, -- Blood Corruption [SpellName(26573)] = true, -- Consecration [SpellName(853)] = true, -- Hammer of Justice [SpellName(62124)] = true, -- Hand of Reckoning @@ -193,11 +194,13 @@ T.DebuffWhiteList = { -- Shaman [SpellName(58861)] = true, -- Bash (Spirit Wolf) + [SpellName(53019)] = true, -- Earth's Grasp [SpellName(3600)] = true, -- Earthbind [SpellName(64930)] = true, -- Electrified (Worldbreaker Garb) [SpellName(8050)] = true, -- Flame Shock [SpellName(8056)] = true, -- Frost Shock [SpellName(8034)] = true, -- Frostbrand Attack + [SpellName(51514)] = true, -- Hex [SpellName(39796)] = true, -- Stoneclaw Totem [SpellName(17364)] = true, -- Stormstrike [SpellName(58857)] = true, -- Twin Howl @@ -362,6 +365,7 @@ T.BuffWhiteList = { [SpellName(58914)] = true, -- Kill Command (Pet) [SpellName(56453)] = true, -- Lock and Load [SpellName(34833)] = true, -- Master Tactician + [SpellName(62305)] = true, -- Master's Call [SpellName(136)] = true, -- Mend Pet -- [SpellName(24450)] = true, -- Prowl (Cat) [SpellName(6150)] = true, -- Quick Shots @@ -535,6 +539,7 @@ T.BuffWhiteList = { [SpellName(8178)] = true, -- Grounding Totem Effect -- [SpellName(5672)] = true, -- Healing Stream [SpellName(32182)] = true, -- Heroism + [SpellName(65264)] = true, -- Lava Flows [SpellName(324)] = true, -- Lightning Shield [SpellName(53817)] = true, -- Maelstrom Weapon -- [SpellName(5677)] = true, -- Mana Spring Totem @@ -593,8 +598,8 @@ T.BuffWhiteList = { -- [SpellName(5500)] = true, -- Sense Demons [SpellName(17941)] = true, -- Shadow Trance [SpellName(6229)] = true, -- Shadow Ward - [SpellName(20707)] = true, -- Soulstone Resurrection [SpellName(25228)] = true, -- Soul Link + [SpellName(20707)] = true, -- Soulstone Resurrection -- Warrior [SpellName(6673)] = true, -- Battle Shout diff --git a/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua b/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua index ab0a0a422..b8ae52c52 100644 --- a/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua +++ b/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua @@ -1218,6 +1218,7 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(61780)] = 3, -- Polymorph: Turkey [SpellName(28271)] = 3, -- Polymorph: Turtle [SpellName(59634)] = 3, -- Polymorph - Penguin + [SpellName(55080)] = 2, -- Shattered Barrier [SpellName(18469)] = 3, -- Silenced - Improved Counterspell -- Paladin [SpellName(853)] = 3, -- Hammer of Justice @@ -1243,6 +1244,7 @@ if C.raidframe.plugins_pvp_debuffs == true then [SpellName(18425)] = 3, -- Silenced - Improved Kick -- Shaman [SpellName(58861)] = 3, -- Bash (Spirit Wolf) + [SpellName(53019)] = 3, -- Earth's Grasp [SpellName(51514)] = 3, -- Hex [SpellName(39796)] = 3, -- Stoneclaw Totem -- Warlock diff --git a/ShestakUI/Modules/UnitFrames/Nameplates.lua b/ShestakUI/Modules/UnitFrames/Nameplates.lua index 13ec5ba35..9f5790ea1 100644 --- a/ShestakUI/Modules/UnitFrames/Nameplates.lua +++ b/ShestakUI/Modules/UnitFrames/Nameplates.lua @@ -183,7 +183,6 @@ if T.Vanilla or T.TBC then [GetSpellInfo(8071)] = 136098, -- Stoneskin Totem [GetSpellInfo(8075)] = 136023, -- Strength of Earth Totem [GetSpellInfo(8143)] = 136108, -- Tremor Totem - [GetSpellInfo(8177)] = 136039, -- Grounding Totem -- Fire [GetSpellInfo(1535)] = 135824, -- Fire Nova Totem [GetSpellInfo(3599)] = 135825, -- Searing Totem @@ -199,22 +198,30 @@ if T.Vanilla or T.TBC then [GetSpellInfo(16190)] = 135861, -- Mana Tide Totem -- Air [GetSpellInfo(6495)] = 136082, -- Sentry Totem + [GetSpellInfo(8177)] = 136039, -- Grounding Totem [GetSpellInfo(8512)] = 136114, -- Windfury Totem [GetSpellInfo(8835)] = 136046, -- Grace of Air Totem [GetSpellInfo(10595)] = 136061, -- Nature Resistance Totem [GetSpellInfo(15107)] = 136022, -- Windwall Totem [GetSpellInfo(25908)] = 136013, -- Tranquil Air Totem } + + if T.TBC then + totemData[GetSpellInfo(2062)] = 136024 -- Earth Elemental Totem + totemData[GetSpellInfo(2894)] = 135790 -- Fire Elemental Totem + totemData[GetSpellInfo(3738)] = 136092 -- Wrath of Air Totem + end elseif T.Wrath then totemData = { -- Earth + [GetSpellInfo(2062)] = 136024, -- Earth Elemental Totem [GetSpellInfo(2484)] = 136102, -- Earthbind Totem [GetSpellInfo(5730)] = 136097, -- Stoneclaw Totem [GetSpellInfo(8071)] = 136098, -- Stoneskin Totem [GetSpellInfo(8075)] = 136023, -- Strength of Earth Totem [GetSpellInfo(8143)] = 136108, -- Tremor Totem - [GetSpellInfo(8177)] = 136039, -- Grounding Totem -- Fire + [GetSpellInfo(2894)] = 135790, -- Fire Elemental Totem [GetSpellInfo(1535)] = 135824, -- Fire Nova Totem [GetSpellInfo(3599)] = 135825, -- Searing Totem [GetSpellInfo(8181)] = 135866, -- Frost Resistance Totem @@ -223,47 +230,41 @@ elseif T.Wrath then -- Water [GetSpellInfo(5394)] = 135127, -- Healing Stream Totem [GetSpellInfo(5675)] = 136053, -- Mana Spring Totem - -- [GetSpellInfo(8166)] = 136070, -- Poison Cleansing Totem - [GetSpellInfo(8170)] = 136019, -- Disease Cleansing Totem + [GetSpellInfo(8170)] = 136019, -- Cleansing Totem [GetSpellInfo(8184)] = 135832, -- Fire Resistance Totem [GetSpellInfo(16190)] = 135861, -- Mana Tide Totem -- Air + [GetSpellInfo(3738)] = 136092, -- Wrath of Air Totem [GetSpellInfo(6495)] = 136082, -- Sentry Totem + [GetSpellInfo(8177)] = 136039, -- Grounding Totem [GetSpellInfo(8512)] = 136114, -- Windfury Totem - -- [GetSpellInfo(8835)] = 136046, -- Grace of Air Totem [GetSpellInfo(10595)] = 136061, -- Nature Resistance Totem - -- [GetSpellInfo(15107)] = 136022, -- Windwall Totem - -- [GetSpellInfo(25908)] = 136013, -- Tranquil Air Totem } elseif T.Cata then totemData = { -- Earth + [GetSpellInfo(2062)] = 136024, -- Earth Elemental Totem [GetSpellInfo(2484)] = 136102, -- Earthbind Totem [GetSpellInfo(5730)] = 136097, -- Stoneclaw Totem [GetSpellInfo(8071)] = 136098, -- Stoneskin Totem [GetSpellInfo(8075)] = 136023, -- Strength of Earth Totem [GetSpellInfo(8143)] = 136108, -- Tremor Totem - [GetSpellInfo(8177)] = 136039, -- Grounding Totem -- Fire - [GetSpellInfo(1535)] = 135824, -- Fire Nova Totem + [GetSpellInfo(2894)] = 135790, -- Fire Elemental Totem [GetSpellInfo(3599)] = 135825, -- Searing Totem - -- [GetSpellInfo(8181)] = 135866, -- Frost Resistance Totem [GetSpellInfo(8190)] = 135826, -- Magma Totem [GetSpellInfo(8227)] = 136040, -- Flametongue Totem -- Water [GetSpellInfo(5394)] = 135127, -- Healing Stream Totem [GetSpellInfo(5675)] = 136053, -- Mana Spring Totem - -- [GetSpellInfo(8166)] = 136070, -- Poison Cleansing Totem - -- [GetSpellInfo(8170)] = 136019, -- Disease Cleansing Totem - [GetSpellInfo(8184)] = 135832, -- Fire Resistance Totem + [GetSpellInfo(8184)] = 135832, -- Elemental Resistance Totem [GetSpellInfo(16190)] = 135861, -- Mana Tide Totem -- Air - -- [GetSpellInfo(6495)] = 136082, -- Sentry Totem + [GetSpellInfo(3738)] = 136092, -- Wrath of Air Totem + [GetSpellInfo(8177)] = 136039, -- Grounding Totem [GetSpellInfo(8512)] = 136114, -- Windfury Totem - -- [GetSpellInfo(8835)] = 136046, -- Grace of Air Totem - -- [GetSpellInfo(10595)] = 136061, -- Nature Resistance Totem - -- [GetSpellInfo(15107)] = 136022, -- Windwall Totem - -- [GetSpellInfo(25908)] = 136013, -- Tranquil Air Totem + [GetSpellInfo(87718)] = 136013, -- Totem of Tranquil Mind + [GetSpellInfo(98008)] = 237586, -- Spirit Link Totem } else totemData = {