From 5cfcf02d317fd0834a0d8764f75440b1726395f2 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:07:21 -0700 Subject: [PATCH] (EMPTY) move spec spells / class spells to LibOpenRaid --- .../LibOpenRaid/ThingsToMantain_Ascension.lua | 275 ++++++++++++++ functions/spells.lua | 338 +----------------- 2 files changed, 278 insertions(+), 335 deletions(-) diff --git a/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua b/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua index a855f914..acda650c 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua @@ -517,4 +517,279 @@ LIB_OPEN_RAID_SPELL_DEFAULT_IDS = { --[id_to_override] = original_id } +-- list of spells that map to a specific spec ID, this is used for spec guessing +LIB_OPEN_RAID_SPEC_SPELL_LIST = { + -- [spellID] = specID + -- Arms Warrior [64] + + -- Fury Warrior [65] + + -- Protection Warrior [66] + + -- Holy Paladin [67] + + -- Protection Paladin [68] + + -- Retribution Paladin [69] + + -- Beast Mastery Hunter [70] + + -- Marksmanship Hunter [71] + + -- Survival Hunter [72] + + -- Assassination Rogue [73] + + -- Combat Rogue [74] + + -- Subtlety Rogue [75] + + -- Discipline Priest [76] + + -- Holy Priest [77] + + -- Shadow Priest [78] + + -- Blood Death Knight [79] + + -- Frost Death Knight [80] + + -- Unholy Death Knight [81] + + -- Elemental Shaman [82] + + -- Enhancement Shaman [83] + + -- Restoration Shaman [84] + + -- Arcane Mage [85] + + -- Fire Mage [86] + + -- Frost Mage [87] + + -- Affliction Warlock [88] + + -- Demonology Warlock [89] + + -- Destruction Warlock [90] + + -- Balance Druid [91] + + -- Feral Druid [92] + + -- Restoration Druid [93] + + -- Hero [94] + + -- Tactics Barbarian [1] + + -- Brutality Barbarian [2] + + -- Ancestry Barbarian [3] + + -- Shadowhunting Witch Doctor [4] + + -- Voodoo Witch Doctor [5] + + -- Brewing Witch Doctor [6] + + -- Felblood Felsworn (Demon Hunter) [7] + + -- Slaying Felsworn (Demon Hunter) [8] + + -- Demonology Felsworn (Demon Hunter) [9] + + -- Boltslinger Witch Hunter [10] + + -- Darkness Witch Hunter [11] + + -- Inquisition Witch Hunter [12] + + -- Witch Knight Witch Hunter [97] + + -- Wind Stormbringer [13] + + -- Gifts Stormbringer [14] + + -- Lightning Stormbringer [15] + + -- Hellfire Knight of Xoroth (Fleshwarden) [16] + + -- Defiance Knight of Xoroth (Fleshwarden) [17] + + -- War Knight of Xoroth (Fleshwarden) [18] + + -- Gladiator Guardian [19] + + -- Inspiration Guardian [20] + + -- Protection Guardian [21] + + -- Discipline Templar (Monk) [22] + + -- Fighting Templar (Monk) [23] + + -- Runes Templar (Monk) [24] + + -- Fleshweaver Son of Arugal [25] + + -- Blood Son of Arugal [26] + + -- Ferocity Son of Arugal [27] + + -- Packleader Son of Arugal [99] + + -- Archery Ranger [28] + + -- Survival Ranger [29] + + -- Dueling Ranger [30] + + -- Displacement Chronomancer [31] + + -- Duality Chronomancer [32] + + -- Time Chronomancer [33] + + -- Death Necromancer [34] + + -- Animation Necromancer [35] + + -- Rime Necromancer [36] + + -- Destruction Pyromancer [37] + + -- Incineration Pyromancer [38] + + -- Draconic Pyromancer [39] + + -- Influence Cultist [40] + + -- Corruption Cultist [41] + + -- Godblade Cultist [42] + + -- Bulwark Cultist [96] + + -- Tides Starcaller [43] + + -- Moonbow Starcaller [44] + + -- Hydromancy Starcaller [45] + + -- Astral Warfare Starcaller [100] + + -- Piety Sun Cleric [46] + + -- Valkyr Sun Cleric [47] + + -- Seraphim Sun Cleric [48] + + -- Blessings Sun Cleric [98] + + -- Mechanics Tinker [49] + + -- Invention Tinker [50] + + -- Firearms Tinker [51] + + -- Fortitude Venomancer (Prophet) [52] + + -- Stalking Venomancer (Prophet) [53] + + -- Venom Venomancer (Prophet) [54] + + -- Vizier Venomancer (Prophet) [101] + + -- Soul Reaper [55] + + -- Reaping Reaper [56] + + -- Domination Reaper [57] + + -- Life Primalist (Wildwalker) [58] + + -- Primal Primalist (Wildwalker) [59] + + -- Mountain King Primalist (Wildwalker) [60] + + -- Geomancy Primalist (Wildwalker) [95] + + -- Runic Runemaster (Spiritmage) [61] + + -- Arcane Runemaster (Spiritmage) [62] + + -- Riftblade Runemaster (Spiritmage) [63] +} + +-- list of spells that map to a specific spec ID, this is used for class guessing +LIB_OPEN_RAID_CLASS_SPELL_LIST = { + -- [spellID] = "CLASS" + -- "HERO" + + -- "WARRIOR" + + -- "DEATHKNIGHT" + + -- "PALADIN" + + -- "PRIEST" + + -- "SHAMAN" + + -- "DRUID" + + -- "ROGUE" + + -- "MAGE" + + -- "WARLOCK" + + -- "HUNTER" + + -- "NECROMANCER" + + -- "PYROMANCER" + + -- "CULTIST" + + -- "STARCALLER" + + -- "SUNCLERIC" + + -- "TINKER" + + -- "SPIRITMAGE" + + -- "WILDWALKER" + + -- "REAPER" + + -- "PROPHET" + + -- "CHRONOMANCER" + + -- "SONOFARUGAL" + + -- "GUARDIAN" + + -- "STORMBRINGER" + + -- "DEMONHUNTER" + + -- "BARBARIAN" + + -- "WITCHDOCTOR" + + -- "WITCHHUNTER" + + -- "FLESHWARDEN" + + -- "MONK" + + -- "RANGER" + +} + LIB_OPEN_RAID_DATABASE_LOADED = true diff --git a/functions/spells.lua b/functions/spells.lua index 4f83578a..e89abe5a 100644 --- a/functions/spells.lua +++ b/functions/spells.lua @@ -11,338 +11,8 @@ do _detalhes.PotionList [spellID] = true end - _detalhes.SpecSpellList = { --~spec - -- Balance Druid: - [33831] = 102, -- Force of Nature - [24858] = 102, -- Moonkin Form - [50516] = 102, -- Typhoon (rank 1) - [53223] = 102, -- Typhoon (rank 2) - [53225] = 102, -- Typhoon (rank 3) - [53226] = 102, -- Typhoon (rank 4) - [61384] = 102, -- Typhoon (rank 5) - [48505] = 102, -- Starfall (rank 1) - [53199] = 102, -- Starfall (rank 2) - [53200] = 102, -- Starfall (rank 3) - [53201] = 102, -- Starfall (rank 4) - - -- Feral DPS (Cat): - [33876] = 103, -- Mangle Cat (rank 1) - [33982] = 103, -- Mangle Cat (rank 2) - [33983] = 103, -- Mangle Cat (rank 3) - [48565] = 103, -- Mangle Cat (rank 4) - [48566] = 103, -- Mangle Cat (rank 5) - - -- Feral Tank (Bear) / Guardian Druid: - [33878] = 104, -- Mangle Bear (rank 1) - [33986] = 104, -- Mangle Bear (rank 2) - [33987] = 104, -- Mangle Bear (rank 3) - [48563] = 104, -- Mangle Bear (rank 4) - [48564] = 104, -- Mangle Bear (rank 5) - - -- Restoration Druid: - [33891] = 105, -- Tree of Life - [18562] = 105, -- Swiftmend - [48438] = 105, -- Wild Growth (rank 1) - [53248] = 105, -- Wild Growth (rank 2) - [53249] = 105, -- Wild Growth (rank 3) - [53251] = 105, -- Wild Growth (rank 4) - - -- Beast Mastery Hunter: - [19574] = 253, -- Bestial Wrath - [53257] = 253, -- Cobra Strikes - - -- Marksmanship Hunter: - [34490] = 254, -- Silecing Shot - [19506] = 254, -- Trueshot Aura - [53209] = 254, -- Chimera Shot - - -- Survival Hunter: - [19386] = 255, -- Wyvern Sting (rank 1) - [24132] = 255, -- Wyvern Sting (rank 2) - [24133] = 255, -- Wyvern Sting (rank 3) - [27068] = 255, -- Wyvern Sting (rank 4) - [49011] = 255, -- Wyvern Sting (rank 5) - [49012] = 255, -- Wyvern Sting (rank 6) - [3674] = 255, -- Black Arrow (rank 1) - [63668] = 255, -- Black Arrow (rank 2) - [63669] = 255, -- Black Arrow (rank 3) - [63670] = 255, -- Black Arrow (rank 4) - [63671] = 255, -- Black Arrow (rank 5) - [63672] = 255, -- Black Arrow (rank 6) - [53301] = 255, -- Explosive Shot (rank 1) - [60051] = 255, -- Explosive Shot (rank 2) - [60052] = 255, -- Explosive Shot (rank 3) - [60053] = 255, -- Explosive Shot (rank 4) - - -- Arcane Mage: - [12043] = 62, -- Presence of Mind - [12042] = 62, -- Arcane Power - [31589] = 62, -- Slow - [44425] = 62, -- Arcane Barrage (rank 1) - [44780] = 62, -- Arcane Barrage (rank 2) - [44781] = 62, -- Arcane Barrage (rank 3) - - -- Fire Mage: - [28682] = 63, -- Combustion - [48108] = 63, -- Hot Streak - [31661] = 63, -- Dragon's Breath (rank 1) - [33041] = 63, -- Dragon's Breath (rank 2) - [33042] = 63, -- Dragon's Breath (rank 3) - [33043] = 63, -- Dragon's Breath (rank 4) - [42949] = 63, -- Dragon's Breath (rank 5) - [42950] = 63, -- Dragon's Breath (rank 6) - [44457] = 63, -- Living Bomb (rank 1) - [55359] = 63, -- Living Bomb (rank 2) - [55360] = 63, -- Living Bomb (rank 3) - - -- Frost Mage: - [11426] = 64, -- Ice Barrier (rank 1) - [13031] = 64, -- Ice Barrier (rank 2) - [13032] = 64, -- Ice Barrier (rank 3) - [13033] = 64, -- Ice Barrier (rank 4) - [27134] = 64, -- Ice Barrier (rank 5) - [33405] = 64, -- Ice Barrier (rank 6) - [43038] = 64, -- Ice Barrier (rank 7) - [43039] = 64, -- Ice Barrier (rank 8) - [44544] = 64, -- Fingers of Frost - [57761] = 64, -- Fireball! (Brain Freeze talent) - [31687] = 64, -- Summon Water Elemental - [44572] = 64, -- Deep Freeze - - -- Holy Paladin: - [20473] = 65, -- Holy Shock (rank 1) - [20929] = 65, -- Holy Shock (rank 2) - [20930] = 65, -- Holy Shock (rank 3) - [27174] = 65, -- Holy Shock (rank 4) - [33072] = 65, -- Holy Shock (rank 5) - [48824] = 65, -- Holy Shock (rank 6) - [48825] = 65, -- Holy Shock (rank 7) - [31842] = 65, -- Divine Illumination - [53563] = 65, -- Beacon of Light - - -- Protection Paladin: - [20925] = 66, -- Holy Shield (rank 1) - [20927] = 66, -- Holy Shield (rank 2) - [20928] = 66, -- Holy Shield (rank 3) - [27179] = 66, -- Holy Shield (rank 4) - [48951] = 66, -- Holy Shield (rank 5) - [48952] = 66, -- Holy Shield (rank 6) - [31935] = 66, -- Avenger's Shield (rank 1) - [32699] = 66, -- Avenger's Shield (rank 2) - [32700] = 66, -- Avenger's Shield (rank 3) - [48826] = 66, -- Avenger's Shield (rank 4) - [48827] = 66, -- Avenger's Shield (rank 5) - [53595] = 66, -- Hammer of the Righteous - - -- Retribution Paladin: - [53489] = 70, -- The Art of War (rank 1) - [59578] = 70, -- The Art of War (rank 2) - [20066] = 70, -- Repentance - [35395] = 70, -- Crusader Strike - [53385] = 70, -- Divine Storm - - -- Discipline Priest: - --[63944] = 256, -- Renewed Hope - [10060] = 256, -- Power Infusion - [33206] = 256, -- Pain Suppression - [47540] = 256, -- Penance (rank 1) - [53005] = 256, -- Penance (rank 2) - [53006] = 256, -- Penance (rank 3) - [53007] = 256, -- Penance (rank 4) - - -- Holy Priest: - [20711] = 257, -- Spirit of Redemption - [724] = 257, -- Lightwell (rank 1) - [27870] = 257, -- Lightwell (rank 2) - [27871] = 257, -- Lightwell (rank 3) - [27875] = 257, -- Lightwell (rank 4) - [48086] = 257, -- Lightwell (rank 5) - [48087] = 257, -- Lightwell (rank 6) - [34861] = 257, -- Circle of Healing (rank 1) - [34863] = 257, -- Circle of Healing (rank 2) - [34864] = 257, -- Circle of Healing (rank 3) - [34865] = 257, -- Circle of Healing (rank 4) - [34866] = 257, -- Circle of Healing (rank 5) - [48088] = 257, -- Circle of Healing (rank 6) - [48089] = 257, -- Circle of Healing (rank 7) - [47788] = 257, -- Guardian Spirit - - -- Shadow Priest: - [15286] = 258, -- Vampiric Embrace - [15473] = 258, -- Shadowform - [34914] = 258, -- Vampiric Touch (rank 1) - [34916] = 258, -- Vampiric Touch (rank 2) - [34917] = 258, -- Vampiric Touch (rank 3) - [48159] = 258, -- Vampiric Touch (rank 4) - [48160] = 258, -- Vampiric Touch (rank 5) - [47585] = 258, -- Dispersion - - -- Assassination Rogue: - [58427] = 259, -- Overkill - [1329] = 259, -- Mutilate (rank 1) - [34411] = 259, -- Mutilate (rank 2) - [34412] = 259, -- Mutilate (rank 3) - [34413] = 259, -- Mutilate (rank 4) - [48663] = 259, -- Mutilate (rank 5) - [48666] = 259, -- Mutilate (rank 6) - [52914] = 259, -- Turn the Tables (rank 1) - [52915] = 259, -- Turn the Tables (rank 2) - [52910] = 259, -- Turn the Tables (rank 3) - [51662] = 259, -- Hunger For Blood - - -- Combat Rogue (Outlaw Rogue): - [13750] = 260, -- Adrenaline Rush - [51690] = 260, -- Killing Spree - [58684] = 260, -- Savage Combat (rank 1) - [58683] = 260, -- Savage Combat (rank 2) - - -- Subtlety Rogue: - [14183] = 261, -- Premeditation - [36554] = 261, -- Shadowstep - [51713] = 261, -- Shadow Dance - - -- Elemental Shaman: - [16166] = 262, -- Elemental Mastery - [30706] = 262, -- Totem of Wrath (rank 1) - [57720] = 262, -- Totem of Wrath (rank 2) - [57721] = 262, -- Totem of Wrath (rank 3) - [57722] = 262, -- Totem of Wrath (rank 4) - [51490] = 262, -- Thunderstorm (rank 1) - [59156] = 262, -- Thunderstorm (rank 2) - [59158] = 262, -- Thunderstorm (rank 3) - [59159] = 262, -- Thunderstorm (rank 4) - - -- Enhancement Shaman: - [17364] = 263, -- Stormstrike - [60103] = 263, -- Lava Lash - [30823] = 263, -- Shamanistic Rage - [53817] = 263, -- Maelstrom Weapon - [51533] = 263, -- Feral Spirit - - -- Restoration Shaman: - [16190] = 264, -- Mana Tide Totem - [51886] = 264, -- Cleanse Spirit - [974] = 264, -- Earth Shield (rank 1) - [32593] = 264, -- Earth Shield (rank 2) - [32594] = 264, -- Earth Shield (rank 3) - [49283] = 264, -- Earth Shield (rank 4) - [49284] = 264, -- Earth Shield (rank 5) - [61295] = 264, -- Riptide (rank 1) - [61299] = 264, -- Riptide (rank 2) - [61300] = 264, -- Riptide (rank 3) - [61301] = 264, -- Riptide (rank 4) - - -- Affliction Warlock: - [30108] = 265, -- Unstable Affliction (rank 1) - [30404] = 265, -- Unstable Affliction (rank 2) - [30405] = 265, -- Unstable Affliction (rank 3) - [47841] = 265, -- Unstable Affliction (rank 4) - [47843] = 265, -- Unstable Affliction (rank 5) - [18220] = 265, -- Dark Pact (rank 1) - [18937] = 265, -- Dark Pact (rank 2) - [18938] = 265, -- Dark Pact (rank 3) - [27265] = 265, -- Dark Pact (rank 4) - [59092] = 265, -- Dark Pact (rank 5) - [48181] = 265, -- Haunt (rank 1) - [59161] = 265, -- Haunt (rank 2) - [59163] = 265, -- Haunt (rank 3) - [59164] = 265, -- Haunt (rank 4) - - -- Demonology Warlock: - [30146] = 266, -- Summon Felguard - -- [48090] = 266, -- Demonic Pact -- Need confirmation for WotLK Classic whether this is the right buff - [47383] = 266, -- Molten Core (rank 1) - [71162] = 266, -- Molten Core (rank 2) - [71165] = 266, -- Molten Core (rank 3) - [63165] = 266, -- Decimation (rank 1) - [63167] = 266, -- Decimation (rank 2) - [47241] = 266, -- Metamorphosis - - -- Destruction Warlock: - [17962] = 267, -- Conflagrate - [30283] = 267, -- Shadowfury (rank 1) - [30413] = 267, -- Shadowfury (rank 2) - [30414] = 267, -- Shadowfury (rank 3) - [47846] = 267, -- Shadowfury (rank 4) - [47847] = 267, -- Shadowfury (rank 5) - [50796] = 267, -- Chaos Bolt (rank 1) - [59170] = 267, -- Chaos Bolt (rank 2) - [59171] = 267, -- Chaos Bolt (rank 3) - [59172] = 267, -- Chaos Bolt (rank 4) - - -- Arms Warrior: - [46856] = 71, -- Trauma (rank 1) - [46857] = 71, -- Trauma (rank 2) - [12294] = 71, -- Mortal Strike (rank 1) - [21551] = 71, -- Mortal Strike (rank 2) - [21552] = 71, -- Mortal Strike (rank 3) - [21553] = 71, -- Mortal Strike (rank 4) - [25248] = 71, -- Mortal Strike (rank 5) - [30330] = 71, -- Mortal Strike (rank 6) - [47485] = 71, -- Mortal Strike (rank 7) - [47486] = 71, -- Mortal Strike (rank 8) - [29623] = 71, -- Endless Rage - [46924] = 71, -- Bladestorm - - -- Fury Warrior: - [29801] = 72, -- Rampage - [23881] = 72, -- Bloodthirst - - -- Protection Warrior: - [50720] = 73, -- Vigilance - [20243] = 73, -- Devastate (rank 1) - [30016] = 73, -- Devastate (rank 2) - [30022] = 73, -- Devastate (rank 3) - [47497] = 73, -- Devastate (rank 4) - [47498] = 73, -- Devastate (rank 5) - [50227] = 73, -- Sword and Board - [46968] = 73, -- Shockwave - - -- Blood Death Knight: - [53137] = 250, -- Abomination's Might (rank 1) - [53138] = 250, -- Abomination's Might (rank 2) - [50452] = 250, -- Bloodworms - [49016] = 250, -- Hysteria - [55233] = 250, -- Vampiric Blood - [55050] = 250, -- Heart Strike (rank 1) - [55258] = 250, -- Heart Strike (rank 2) - [55259] = 250, -- Heart Strike (rank 3) - [55260] = 250, -- Heart Strike (rank 4) - [55261] = 250, -- Heart Strike (rank 5) - [55262] = 250, -- Heart Strike (rank 6) - [49028] = 250, -- Dancing Rune Weapon - - -- Frost Death Knight: - [49203] = 251, -- Hungering Cold - [51271] = 251, -- Unbreakable Armor - [49143] = 251, -- Frost Strike (rank 1) - [51416] = 251, -- Frost Strike (rank 2) - [51417] = 251, -- Frost Strike (rank 3) - [51418] = 251, -- Frost Strike (rank 4) - [51419] = 251, -- Frost Strike (rank 5) - [55268] = 251, -- Frost Strike (rank 6) - [49184] = 251, -- Howling Blast (rank 1) - [51409] = 251, -- Howling Blast (rank 2) - [51410] = 251, -- Howling Blast (rank 3) - [51411] = 251, -- Howling Blast (rank 4) - - -- Unholy Death Knight: - [51052] = 252, -- Anti-Magic Zone - [63583] = 252, -- Desolation (rank 1) - [66800] = 252, -- Desolation (rank 2) - [66801] = 252, -- Desolation (rank 3) - [66802] = 252, -- Desolation (rank 4) - [66803] = 252, -- Desolation (rank 5) - [49222] = 252, -- Bone Shield - [51726] = 252, -- Ebon Plague (rank 1) - [51734] = 252, -- Ebon Plague (rank 2) - [51735] = 252, -- Ebon Plague (rank 3) - [55090] = 252, -- Scourge Strike (rank 1) - [55265] = 252, -- Scourge Strike (rank 2) - [55270] = 252, -- Scourge Strike (rank 3) - [55271] = 252, -- Scourge Strike (rank 4) - [49206] = 252, -- Summon Gargoyle - } + _detalhes.SpecSpellList = LIB_OPEN_RAID_SPEC_SPELL_LIST + _detalhes.ClassSpellList = LIB_OPEN_RAID_CLASS_SPELL_LIST _detalhes.SpecIDToClass = {} for _, class in ipairs(CLASS_SORT_ORDER) do @@ -353,9 +23,7 @@ do end end - _detalhes.ClassSpellList = { - -- [spellID] = "CLASS" - } + -- redirect AbsorbSpells to check IsAbsorbSpell -- only true if mask = 127 (absorbs all schools/phys) _detalhes.AbsorbSpells = setmetatable({}, { __index = function(t,k) local isAbsorb, mask = IsAbsorbSpell(k) return isAbsorb and mask == 127 end })