diff --git a/Modules/Config/MeleeSection.lua b/Modules/Config/MeleeSection.lua index d5886b77..26577c97 100755 --- a/Modules/Config/MeleeSection.lua +++ b/Modules/Config/MeleeSection.lua @@ -92,7 +92,7 @@ function _Config:LoadMeleeSection() desc = function() return i18n("Shows/Hides the expertise value.") end, width = 1.5, hidden = function() - return (not ECS.IsWotlk) + return ECS.IsClassic end, disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end, get = function () return ExtendedCharacterStats.profile.melee.expertise.display; end, @@ -383,4 +383,4 @@ function _Config:LoadMeleeSection() }, }, } -end \ No newline at end of file +end diff --git a/Modules/Data/Constants.lua b/Modules/Data/Constants.lua index 9899cfc2..a4e49868 100755 --- a/Modules/Data/Constants.lua +++ b/Modules/Data/Constants.lua @@ -20,402 +20,672 @@ Data.MAGE = 8 Data.WARLOCK = 9 Data.DRUID = 11 -Data.Aura = {} -Data.Aura.AllowCastingManaRegeneration = { - [6117] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 1 - [12051] = 1, -- Evocation - [15271] = (ECS.IsWotlk and 0.83 or 0.5), -- Spirit Tap - [18371] = 0.5, -- Soul Siphon - [22782] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 2 - [22783] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 3 - [23684] = 1, -- Aura of the Blue Dragon - [27125] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 4 - [29166] = 1, -- Innervate - [32932] = 1, -- Sun Shield - [38346] = 0.15, -- Meditation - [43023] = 0.5, -- Mage Armor rank 5 - [43024] = 0.5, -- Mage Armor rank 6 - [49307] = 1, -- Full Mana Regen - [49694] = 0.17, -- Improved Spirit Tap 1/2 - [59000] = 0.33, -- Improved Spirit Tap 2/2 - [408261] = 0.5, -- Dreamstate - [412325] = 0.1, -- Enlightenment - [425124] = 1, -- Arcane Surge - [437357] = 1, -- Gneuromantic Meditation - [456195] = 1, -- Innervate - [468466] = 1, -- Unmaking the Simulacrum - [1213422] = 1, -- Aura of the Blue Dragon +Data.Aura = { + AllowCastingManaRegeneration = { + [6117] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 1 + [12051] = 1, -- Evocation + [15271] = (ECS.IsWotlk and 0.83 or 0.5), -- Spirit Tap + [18371] = 0.5, -- Soul Siphon + [22782] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 2, + [22783] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 3 + [23684] = 1, -- Aura of the Blue Dragon + [27125] = (ECS.IsWotlk and 0.5 or 0.3), -- Mage Armor rank 4 + [29166] = 1, -- Innervate + [32932] = 1, -- Sun Shield + [38346] = 0.15, -- Meditation + [43023] = 0.5, -- Mage Armor rank 5 + [43024] = 0.5, -- Mage Armor rank 6 + [49307] = 1, -- Full Mana Regen + [49694] = 0.17, -- Improved Spirit Tap 1/2 + [59000] = 0.33, -- Improved Spirit Tap 2/2 + [408261] = 0.5, -- Dreamstate + [412325] = 0.1, -- Enlightenment + [425124] = 1, -- Arcane Surge + [437357] = 1, -- Gneuromantic Meditation + [456195] = 1, -- Innervate + [468466] = 1, -- Unmaking the Simulacrum + [1213422] = 1, -- Aura of the Blue Dragon + }, + CritReductionAll = { + [30708] = (ECS.IsWotlk and -3 or nil), -- totem of wrath + [403816] = 6, -- metamorphosis + [428741] = 5, -- molten armor + [430432] = 5, -- battle hardened + }, + CritReductionMelee = { + [47241] = 6, -- metamorphosis + [408680] = 6, -- way of earth + }, + CritReductionSpell = { + [17794] = (ECS.IsWotlk and -1 or nil), -- Shadow Mastery 1/5 + [17797] = (ECS.IsWotlk and -3 or nil), -- Shadow Mastery 2/5 + [17798] = (ECS.IsWotlk and -2 or nil), -- Shadow Mastery 3/5 + [17799] = (ECS.IsWotlk and -4 or nil), -- Shadow Mastery 4/5 + [17800] = (ECS.IsWotlk and -5 or nil), -- Shadow Mastery 5/5 + [22959] = (ECS.IsWotlk and -5 or nil), -- Improved Scorch + }, + IsFeralForm = { + [768] = true, -- Cat Form + [5487] = true, -- Bear Form + [9634] = true, -- Dire Bear Form + }, + IsLightningShield = { + [324] = true, -- Lightning Shield rank 1 + [325] = true, -- Lightning Shield rank 2 + [905] = true, -- Lightning Shield rank 3 + [945] = true, -- Lightning Shield rank 4 + [8134] = true, -- Lightning Shield rank 5 + [10431] = true, -- Lightning Shield rank 6 + [10432] = true, -- Lightning Shield rank 7 + [25469] = true, -- Lightning Shield rank 8 + [25472] = true, -- Lightning Shield rank 9 + [26363] = true, -- Lightning Shield + [26364] = true, -- Lightning Shield + [26365] = true, -- Lightning Shield + [26366] = true, -- Lightning Shield + [26367] = true, -- Lightning Shield + [26369] = true, -- Lightning Shield + [26370] = true, -- Lightning Shield + [26371] = true, -- Lightning Shield + [26372] = true, -- Lightning Shield + [27635] = true, -- Lightning Shield + [32642] = true, -- Spore Cloud + [34828] = true, -- Water Shield + [35320] = true, -- Electric Skin + [49278] = true, -- Lightning Shield + [49279] = true, -- Lightning Shield + [49280] = true, -- Lightning Shield rank 10 + [49281] = true, -- Lightning Shield rank 11 + }, + MP5 = { + [430] = 42, -- drink + [431] = 104, -- drink + [432] = 174, -- drink + [833] = 30, -- Green Tea + [1133] = 249, -- drink + [1135] = 332, -- drink + [1137] = 489, -- drink + [2639] = 70, -- food + [10250] = 800, -- drink + [16609] = 10, -- Warchief's Blessing + [18140] = 735, -- Blessed Sunfruit Juice + [18194] = (ECS.IsWotlk and 10 or 8), -- Mana Regeneration + [21172] = 75, -- Grip of Command + [21174] = 50, -- Aura of Battle + [22734] = 700, -- drink + [23698] = 735, -- Alterac Spring Water + [24363] = (ECS.IsWotlk and 15 or 12), -- Mana Regeneration + [24398] = 43, -- Water Shield Rank 1 TBC / 7 WOTLK + [25696] = 735, -- Drink + [25697] = 735, -- Old Enriched Manna Biscuit + [25701] = 75, -- Brain Food + [25703] = 135, -- Brain Food + [25887] = 210, -- Brain Food + [25889] = 300, -- Brain Food + [26261] = 735, -- Drink + [26402] = 735, -- Drink + [26473] = 367, -- drink + [26475] = 551, -- drink + [27089] = 240*5, -- Drink + [28145] = (ECS.IsWotlk and 14 or 11), -- Power of the Guardian + [28509] = (ECS.IsWotlk and 20 or 16), -- Greater Mana Regeneration + [28519] = (ECS.IsWotlk and 31 or 25), -- Flask of Mighty Restoration + [28795] = (ECS.IsWotlk and 35 or 28), -- Holy Power + [28804] = (ECS.IsWotlk and 30 or 24), -- Epiphany + [28820] = (ECS.IsWotlk and 19 or 15), -- Lightning Shield + [28824] = (ECS.IsWotlk and 35 or 28), -- Totemic Power + [29007] = 489, -- Drink + [29039] = 300, -- Fizzy Energy Drink + [31036] = (ECS.IsWotlk and 56 or 45), -- Verdant Flame + [31462] = 12, -- Moonwell Restoration + [32548] = 33, -- Symbol of Hope + [33265] = (ECS.IsWotlk and 10 or 8), -- well fed + [33736] = 50, -- Water Shield Rank 2 TBC / 8 WOTLK + [33774] = 735, -- Underspore Pod + [34291] = 850, -- drink + [34410] = 10, -- Hellscream's Warsong + [35095] = (ECS.IsWotlk and 26 or 21), -- Enlightenment + [37656] = (ECS.IsWotlk and 95 or 76), -- wisdom + [38437] = (ECS.IsWotlk and 19 or 15), -- Totemic Mastery + [40568] = (ECS.IsWotlk and 12 or 8), -- Unstable Flask of the Elder Only works in Blade's Edge Mountains Plateaus and Gruul's Lair. + [40582] = (ECS.IsWotlk and 12 or 8), -- Unstable Flask of the Elder Only works in Blade's Edge Mountains Plateaus and Gruul's Lair. + [41605] = (ECS.IsWotlk and 31 or 25), -- Mighty Restoration of Shattrath Only active in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple and the Sunwell Plateau. + [41610] = (ECS.IsWotlk and 31 or 25), -- Mighty Restoration of Shattrath Only active in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple and the Sunwell Plateau. + [42308] = 1250, -- brain food + [42312] = 1200, -- Brain Food + [43154] = 489, -- Drink + [43182] = 428*5, -- Drink + [43183] = 640*5, -- Drink + [43742] = (ECS.IsWotlk and 28 or 22), -- Grace of the Naaru + [44107] = 42, -- Brewfest Drink + [44109] = 104, -- Brewfest Drink + [44110] = 174, -- Brewfest Drink + [44111] = 249, -- Brewfest Drink + [44112] = 332, -- Brewfest Drink + [44113] = 489, -- Brewfest Drink + [44114] = 700, -- Brewfest Drink + [44115] = 1200, -- Brewfest Drink + [44116] = 1200, -- Brewfest Drink + [45019] = 332, -- Holiday Drink + [45020] = 1200, -- Holiday Drink + [46386] = (ECS.IsWotlk and 83 or 66), -- Luminous Bluetail + [46755] = 240, -- drink + [49472] = 240*5, -- Drink Coffee + [49623] = 125, -- Effervescence + [52051] = 91, -- Blessing of Zim'Rhuk within Zul'Drak, Gundrak, and Drak'Tharon Keep. + [52127] = 10, -- Water Shield rank 1 + [52129] = 15, -- Water Shield rank 2 + [52131] = 21, -- Water Shield rank 3 + [52134] = 26, -- Water Shield rank 4 + [52136] = 33, -- Water Shield rank 5 + [52138] = 38, -- Water Shield rank 6 + [52911] = 3200, -- Drink + [53373] = 1200, -- Thunderbrew's Hard Ale + [53764] = 30, -- Mighty Mana Regeneration + [54212] = 45, -- Flask of Pure Mojo + [57073] = 640*5, -- Drink + [57107] = 15, -- Well Fed + [57291] = 15, -- Well Fed + [57334] = 40, -- Well Fed + [57960] = 100, -- Water Shield rank 9 + [59674] = 20, -- Moonshroud Residue + [60520] = 220, -- Spark of Life + [61268] = 2160, -- Mana Regeneration + [61830] = 428*5, -- Drink + [64356] = 3200, -- Drink + [64739] = 272, -- Show of Faith + [65003] = 220, -- Memories of Love + [65363] = 3200, -- Brewfest Drink + [67696] = 16, -- Energized + [67750] = 18, -- Energized + [69560] = 3200, -- Brewfest Drink + [69561] = 3200, -- Brewfest Drink + [71584] = 304, -- Revitalized + [72623] = 489, -- Drink + [355366] = 10, -- Warchief's Blessing + [370548] = 10, -- Skeletal Artifact + [430948] = 8, -- Arcane Recovery + [446396] = 12, -- Atal'ai Mojo of Life. This has no effect outside of Sunken Temple. + [446714] = 1104, -- Drink + [448084] = 12, -- Restless Dreams. The benefits of this flask only apply in areas under the influence of the nightmare. + [460939] = 10, -- Might of Stormwind + [460940] = 10, -- Might of Stormwind + [461632] = 1104, -- Stratholme Holy Water + [468767] = 851, -- drink + [473441] = 10, -- Might of Blackrock + [1213886] = 13, -- Flask of Unyielding Sorrow + [1220542] = 28, -- Holy Power + [1220685] = 28, -- Totemic Power + }, + MP5Tooltip = { + [5677] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 1 + [10491] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 2 + [10493] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 3 + [10494] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 4 + [19742] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1 + [19850] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2 + [19852] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3 + [19853] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4 + [19854] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5 + [25290] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6 + [25569] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 5 + [25894] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1 + [25918] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2 + [27142] = 1, -- Blessing of Wisdom rank 7 + [27143] = 1, -- Greater Blessing of Wisdom rank 3 + [48935] = 1, -- Blessing of Wisdom rank 8 + [48936] = 1, -- Blessing of Wisdom rank 9 + [48937] = 1, -- Greater Blessing of Wisdom rank 4 + [48938] = 1, -- Greater Blessing of Wisdom rank 5 + [56521] = 1, -- Blessing of Wisdom + [58775] = 5/2, -- Mana Spring rank 6 + [58776] = 5/2, -- Mana Spring rank 7 + [58777] = 5/2, -- Mana Spring rank 8 + }, + PercentageMp5 = { + [12051] = ((ECS.IsTbc or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation + [18792] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy + [24355] = 0.02*5, -- Drink + [24707] = 0.03*5, -- Food + [25990] = 0.05*5, -- Graccu's Mince Meat Fruitcake + [26263] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum + [29055] = 0.04*5, -- Refreshing Red Apple + [30024] = 0.2*5, -- Drink + [30254] = 0.05*5, -- Evocation + [30874] = 0.05*5, -- Gift of the Water Spirit + [34074] = 0.04/3*5, -- Aspect of the Viper + [35701] = 0.02/4*5, -- Touch of Shadow + [38549] = 0.03*5, -- Empowerment + [38730] = 0.09/2*5, -- Refreshing Mist + [52067] = 0.02/2*5, -- Aura of Regeneration + [53089] = 0.02*5, -- Worgen's Blood + [53517] = 0.1/3*5, -- Roar of Recovery + [54428] = 0.05/3*5, -- Divine Plea + [57056] = 0.02/5*5, -- Aura of Regeneration + [58026] = 0.1/2*5, -- Blessing of the Crusade + [61011] = 0.15/2*5, -- Improved Brilliance Aura + [74501] = 0.05*5, -- Brilliant Tactics + [74719] = 0.05*5, -- Brilliant Tactics + [74865] = 0.05*5, -- Boon of the Loa + [408510] = 0.02, -- Water Shield + [413083] = 0.15, -- Resilience of Nature + [415058] = 0.05/3*5, -- Guarded by the Light + [415423] = 0.1/3*5, -- Aspect of the Viper + [425294] = 0.06*5, -- Dispersion + [437324] = 0.02*5, -- Deep Slumber + [449879] = 0.06*5, -- Dream Fog + [1226808] = 0.05*5, -- Food + }, + PeriodicallyGiveMana = { + [15604] = 150, -- Second Wind + [15822] = 20, -- Dreamless Sleep + [16191] = 170/3*5, -- Mana Tide + [16599] = 50, -- Blessing of Shahram + [17252] = 22, -- Mark of the Dragon Lord + [17328] = 15, -- Aura of Penitence + [17355] = 230/3*5, -- Mana Tide + [17360] = 290/3*5, -- Mana Tide + [17447] = 375, -- Circle of Flame + [18194] = 8, -- Mana Regeneration + [19634] = 50/3*5, -- Mana Rejuvenation + [21955] = 60, -- Razorlash Root + [23108] = 500, -- Blessing of Nordrassil + [23513] = 2500, -- Essence of the Red + [24268] = 60, -- Mar'li's Brain Boost + [24360] = 875, -- Greater Dreamless Sleep + [24884] = 200, -- Earthen Sigil + [25694] = 3, -- Well Fed + [25941] = 6, -- Well Fed + [26551] = 600, -- Jade Owl + [26600] = 300, -- Emerald Owl + [27996] = 50, -- Spellsurge + [28504] = 1500, -- Major Dreamless Sleep + [29040] = 6, -- Fizzy Energy Drink + [29882] = 875, -- Loose Mana + [31045] = 375, -- Talasite Owl + [35478] = 200, -- Drums of Restoration + [38929] = 400/3*5, -- Fel Mana + [45027] = 750, -- Revitalize + [45052] = 750, -- Evocation + [45860] = 1125, -- Breath: Revitalize + [46785] = 375, -- Seaspray Albatross + [53753] = 4500, -- Nightmare Slumber + [54833] = 450, -- Glyph of Innervate + [55740] = 2500, -- Essence of the Red + [71881] = 300, -- Invigoration + [71941] = 200/3*5, -- Twisted Nightmare + [351358] = 200, -- Greater Drums of Restoration + [434851] = 380, -- Minor Evocation + [435168] = 12, -- Guard of the Innovator + [446088] = 24, -- Leyline Attunement + [462858] = 750, -- Circle of Flame + }, + PeriodicallyGiveManaTooltip = { + [5677] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 1 + [10491] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 2 + [10493] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 3 + [10494] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 4 + [19742] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1 + [19850] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2 + [19852] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3 + [19853] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4 + [19854] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5 + [24853] = 5/2, -- Mana Spring + [25290] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6 + [25569] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 5 + [25894] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1 + [25918] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2 + }, + SpellCrit = { + [24907] = ((ECS.IsTBC or ECS.IsWotlk) and 5 or nil), -- Moonkin Aura + [29177] = 6, -- Elemental Devastation Rank 2 + [29178] = 9, -- Elemental Devastation Rank 3 + [30165] = 3, -- Elemental Devastation Rank 1 + [30482] = 3, -- Molten Armor + [30708] = 3, -- Totem of Wrath + [51466] = 3, -- Elemental Oath Rank 1 + [51470] = 5, -- Elemental Oath Rank 2 + }, } -Data.Aura.CritReductionAll = { - [30708] = (ECS.IsWotlk and -3 or nil), -- totem of wrath - [403816] = 6, -- metamorphosis - [428741] = 5, -- molten armor - [430432] = 5, -- battle hardened +Data.Enchant = { + BlockValue = { + [2583] = 15, -- Presence of Might + [2653] = 18, -- Enchant Shield - Tough Shield + [2655] = 15, -- Enchant Shield - Shield Block + [3849] = 81, -- Titanium Plating + [7633] = 15, -- Presence of Valor + }, + Ids = { + ANIMALISTIC_EXPERTISE = 7875, -- Your melee attacks have 5% less chance to be Dodged or Parried. + BIZNICK_SCOPE = 2523, -- 3% Hit from Biznicks 247x128 Accurascope + }, + MP5 = { + [2381] = 10, -- Enchant Chest - Greater Mana Restoration + [2565] = 4, -- Enchant Bracer - Mana Regeneration + [2590] = 4, -- Prophetic Aura + [2624] = 4, -- Minor Mana Oil + [2625] = 8, -- Lesser Mana Oil + [2629] = 12, -- Brilliant Mana Oil + [2656] = 4, -- Enchant Boots - Vitality + [2677] = 14, -- Superior Mana Oil + [2679] = 6, -- Enchant Bracer - Restore Mana Prime + [2715] = 4, -- Resilience of the Scourge + [2980] = 4, -- Greater Inscription of Faith + [2992] = 5, -- Inscription of the Oracle + [2993] = 6, -- Greater Inscription of the Oracle + [3001] = 7, -- Glyph of Renewal + [3150] = 6, -- Enchant Chest – Restore Mana Prime + [3244] = 7, -- Enchant Boots - Greater Vitality + [3298] = 19, -- Exceptional Mana Oil + [3807] = 5, -- Inscription of the Crag + [3809] = 8, -- Greater Inscription of the Crag + [3819] = 10, -- Arcanum of Blissful Mending + [3836] = 8, -- Master's Inscription of the Crag + [7099] = 12, -- Blackfathom Mana Oil. This effect only applies within Blackfathom Deeps. + }, } -Data.Aura.CritReductionMelee = { - [47241] = 6, -- metamorphosis - [408680] = 6, -- way of earth +Data.Gem = { + MP5 = { + [23106] = 1, + [23109] = 1, + [23121] = 2, + [24037] = 3, + [24057] = 2, + [24065] = 2, + [28465] = 1, + [30550] = 2, + [30560] = 2, + [30589] = 2, + [30594] = 2, + [30603] = 2, + [30606] = 2, + [31864] = 1, + [31865] = 2, + [32202] = 4, + [32214] = 2, + [32216] = 2, + [32225] = 2, + }, } -Data.Aura.CritReductionSpell = { - [17794] = (ECS.IsWotlk and -1 or nil), -- Shadow Mastery 1/5 - [17797] = (ECS.IsWotlk and -3 or nil), -- Shadow Mastery 2/5 - [17798] = (ECS.IsWotlk and -2 or nil), -- Shadow Mastery 3/5 - [17799] = (ECS.IsWotlk and -4 or nil), -- Shadow Mastery 4/5 - [17800] = (ECS.IsWotlk and -5 or nil), -- Shadow Mastery 5/5 - [22959] = (ECS.IsWotlk and -5 or nil), -- Improved Scorch -} -Data.Aura.IsFeralForm = { - [768] = true, -- Cat Form - [5487] = true, -- Bear Form - [9634] = true, -- Dire Bear Form -} -Data.Aura.IsLightningShield = { - [324] = true, -- Lightning Shield rank 1 - [325] = true, -- Lightning Shield rank 2 - [905] = true, -- Lightning Shield rank 3 - [945] = true, -- Lightning Shield rank 4 - [8134] = true, -- Lightning Shield rank 5 - [10431] = true, -- Lightning Shield rank 6 - [10432] = true, -- Lightning Shield rank 7 - [25469] = true, -- Lightning Shield rank 8 - [25472] = true, -- Lightning Shield rank 9 - [26363] = true, -- Lightning Shield - [26364] = true, -- Lightning Shield - [26365] = true, -- Lightning Shield - [26366] = true, -- Lightning Shield - [26367] = true, -- Lightning Shield - [26369] = true, -- Lightning Shield - [26370] = true, -- Lightning Shield - [26371] = true, -- Lightning Shield - [26372] = true, -- Lightning Shield - [27635] = true, -- Lightning Shield - [32642] = true, -- Spore Cloud - [34828] = true, -- Water Shield - [35320] = true, -- Electric Skin - [49278] = true, -- Lightning Shield - [49279] = true, -- Lightning Shield - [49280] = true, -- Lightning Shield rank 10 - [49281] = true, -- Lightning Shield rank 11 -} -Data.Aura.MP5 = { - [430] = 42, -- drink - [431] = 104, -- drink - [432] = 174, -- drink - [833] = 30, -- Green Tea - [1133] = 249, -- drink - [1135] = 332, -- drink - [1137] = 489, -- drink - [2639] = 70, -- food - [10250] = 800, -- drink - [16609] = 10, -- Warchief's Blessing - [18140] = 735, -- Blessed Sunfruit Juice - [18194] = (ECS.IsWotlk and 10 or 8), -- Mana Regeneration - [21172] = 75, -- Grip of Command - [21174] = 50, -- Aura of Battle - [22734] = 700, -- drink - [23698] = 735, -- Alterac Spring Water - [24363] = (ECS.IsWotlk and 15 or 12), -- Mana Regeneration - [24398] = 43, -- Water Shield Rank 1 TBC / 7 WOTLK - [25696] = 735, -- Drink - [25697] = 735, -- Old Enriched Manna Biscuit - [25701] = 75, -- Brain Food - [25703] = 135, -- Brain Food - [25887] = 210, -- Brain Food - [25889] = 300, -- Brain Food - [26261] = 735, -- Drink - [26402] = 735, -- Drink - [26473] = 367, -- drink - [26475] = 551, -- drink - [27089] = 240*5, -- Drink - [28145] = (ECS.IsWotlk and 14 or 11), -- Power of the Guardian - [28509] = (ECS.IsWotlk and 20 or 16), -- Greater Mana Regeneration - [28519] = (ECS.IsWotlk and 31 or 25), -- Flask of Mighty Restoration - [28795] = (ECS.IsWotlk and 35 or 28), -- Holy Power - [28804] = (ECS.IsWotlk and 30 or 24), -- Epiphany - [28820] = (ECS.IsWotlk and 19 or 15), -- Lightning Shield - [28824] = (ECS.IsWotlk and 35 or 28), -- Totemic Power - [29007] = 489, -- Drink - [29039] = 300, -- Fizzy Energy Drink - [31036] = (ECS.IsWotlk and 56 or 45), -- Verdant Flame - [31462] = 12, -- Moonwell Restoration - [32548] = 33, -- Symbol of Hope - [33265] = (ECS.IsWotlk and 10 or 8), -- well fed - [33736] = 50, -- Water Shield Rank 2 TBC / 8 WOTLK - [33774] = 735, -- Underspore Pod - [34291] = 850, -- drink - [34410] = 10, -- Hellscream's Warsong - [35095] = (ECS.IsWotlk and 26 or 21), -- Enlightenment - [37656] = (ECS.IsWotlk and 95 or 76), -- wisdom - [38437] = (ECS.IsWotlk and 19 or 15), -- Totemic Mastery - [40568] = (ECS.IsWotlk and 12 or 8), -- Unstable Flask of the Elder Only works in Blade's Edge Mountains Plateaus and Gruul's Lair. - [40582] = (ECS.IsWotlk and 12 or 8), -- Unstable Flask of the Elder Only works in Blade's Edge Mountains Plateaus and Gruul's Lair. - [41605] = (ECS.IsWotlk and 31 or 25), -- Mighty Restoration of Shattrath Only active in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple and the Sunwell Plateau. - [41610] = (ECS.IsWotlk and 31 or 25), -- Mighty Restoration of Shattrath Only active in Tempest Keep, Serpentshrine Cavern, Caverns of Time: Mount Hyjal, Black Temple and the Sunwell Plateau. - [42308] = 1250, -- brain food - [42312] = 1200, -- Brain Food - [43154] = 489, -- Drink - [43182] = 428*5, -- Drink - [43183] = 640*5, -- Drink - [43742] = (ECS.IsWotlk and 28 or 22), -- Grace of the Naaru - [44107] = 42, -- Brewfest Drink - [44109] = 104, -- Brewfest Drink - [44110] = 174, -- Brewfest Drink - [44111] = 249, -- Brewfest Drink - [44112] = 332, -- Brewfest Drink - [44113] = 489, -- Brewfest Drink - [44114] = 700, -- Brewfest Drink - [44115] = 1200, -- Brewfest Drink - [44116] = 1200, -- Brewfest Drink - [45019] = 332, -- Holiday Drink - [45020] = 1200, -- Holiday Drink - [46386] = (ECS.IsWotlk and 83 or 66), -- Luminous Bluetail - [46755] = 240, -- drink - [49472] = 240*5, -- Drink Coffee - [49623] = 125, -- Effervescence - [52051] = 91, -- Blessing of Zim'Rhuk within Zul'Drak, Gundrak, and Drak'Tharon Keep. - [52127] = 10, -- Water Shield rank 1 - [52129] = 15, -- Water Shield rank 2 - [52131] = 21, -- Water Shield rank 3 - [52134] = 26, -- Water Shield rank 4 - [52136] = 33, -- Water Shield rank 5 - [52138] = 38, -- Water Shield rank 6 - [52911] = 3200, -- Drink - [53373] = 1200, -- Thunderbrew's Hard Ale - [53764] = 30, -- Mighty Mana Regeneration - [54212] = 45, -- Flask of Pure Mojo - [57073] = 640*5, -- Drink - [57107] = 15, -- Well Fed - [57291] = 15, -- Well Fed - [57334] = 40, -- Well Fed - [57960] = 100, -- Water Shield rank 9 - [59674] = 20, -- Moonshroud Residue - [60520] = 220, -- Spark of Life - [61268] = 2160, -- Mana Regeneration - [61830] = 428*5, -- Drink - [64356] = 3200, -- Drink - [64739] = 272, -- Show of Faith - [65003] = 220, -- Memories of Love - [65363] = 3200, -- Brewfest Drink - [67696] = 16, -- Energized - [67750] = 18, -- Energized - [69560] = 3200, -- Brewfest Drink - [69561] = 3200, -- Brewfest Drink - [71584] = 304, -- Revitalized - [72623] = 489, -- Drink - [355366] = 10, -- Warchief's Blessing - [370548] = 10, -- Skeletal Artifact - [430948] = 8, -- Arcane Recovery - [446396] = 12, -- Atal'ai Mojo of Life. This has no effect outside of Sunken Temple. - [446714] = 1104, -- Drink - [448084] = 12, -- Restless Dreams. The benefits of this flask only apply in areas under the influence of the nightmare. - [460939] = 10, -- Might of Stormwind - [460940] = 10, -- Might of Stormwind - [461632] = 1104, -- Stratholme Holy Water - [468767] = 851, -- drink - [473441] = 10, -- Might of Blackrock - [1213886] = 13, -- Flask of Unyielding Sorrow - [1220542] = 28, -- Holy Power - [1220685] = 28, -- Totemic Power -} -Data.Aura.MP5Tooltip = { - [5677] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 1 - [10491] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 2 - [10493] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 3 - [10494] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 4 - [19742] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1 - [19850] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2 - [19852] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3 - [19853] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4 - [19854] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5 - [25290] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6 - [25569] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 5 - [25894] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1 - [25918] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2 - [27142] = 1, -- Blessing of Wisdom rank 7 - [27143] = 1, -- Greater Blessing of Wisdom rank 3 - [48935] = 1, -- Blessing of Wisdom rank 8 - [48936] = 1, -- Blessing of Wisdom rank 9 - [48937] = 1, -- Greater Blessing of Wisdom rank 4 - [48938] = 1, -- Greater Blessing of Wisdom rank 5 - [56521] = 1, -- Blessing of Wisdom - [58775] = 5/2, -- Mana Spring rank 6 - [58776] = 5/2, -- Mana Spring rank 7 - [58777] = 5/2, -- Mana Spring rank 8 -} -Data.Aura.PercentageMp5 = { - [12051] = ((ECS.IsTbc or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation - [18792] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy - [24355] = 0.02*5, -- Drink - [24707] = 0.03*5, -- Food - [25990] = 0.05*5, -- Graccu's Mince Meat Fruitcake - [26263] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum - [29055] = 0.04*5, -- Refreshing Red Apple - [30024] = 0.2*5, -- Drink - [30254] = 0.05*5, -- Evocation - [30874] = 0.05*5, -- Gift of the Water Spirit - [34074] = 0.04/3*5, -- Aspect of the Viper - [35701] = 0.02/4*5, -- Touch of Shadow - [38549] = 0.03*5, -- Empowerment - [38730] = 0.09/2*5, -- Refreshing Mist - [52067] = 0.02/2*5, -- Aura of Regeneration - [53089] = 0.02*5, -- Worgen's Blood - [53517] = 0.1/3*5, -- Roar of Recovery - [54428] = 0.05/3*5, -- Divine Plea - [57056] = 0.02/5*5, -- Aura of Regeneration - [58026] = 0.1/2*5, -- Blessing of the Crusade - [61011] = 0.15/2*5, -- Improved Brilliance Aura - [74501] = 0.05*5, -- Brilliant Tactics - [74719] = 0.05*5, -- Brilliant Tactics - [74865] = 0.05*5, -- Boon of the Loa - [408510] = 0.02, -- Water Shield - [413083] = 0.15, -- Resilience of Nature - [415058] = 0.05/3*5, -- Guarded by the Light - [415423] = 0.1/3*5, -- Aspect of the Viper - [425294] = 0.06*5, -- Dispersion - [437324] = 0.02*5, -- Deep Slumber - [449879] = 0.06*5, -- Dream Fog - [1226808] = 0.05*5, -- Food -} -Data.Aura.PeriodicallyGiveMana = { - [15604] = 150, -- Second Wind - [15822] = 20, -- Dreamless Sleep - [16191] = 170/3*5, -- Mana Tide - [16599] = 50, -- Blessing of Shahram - [17252] = 22, -- Mark of the Dragon Lord - [17328] = 15, -- Aura of Penitence - [17355] = 230/3*5, -- Mana Tide - [17360] = 290/3*5, -- Mana Tide - [17447] = 375, -- Circle of Flame - [18194] = 8, -- Mana Regeneration - [19634] = 50/3*5, -- Mana Rejuvenation - [21955] = 60, -- Razorlash Root - [23108] = 500, -- Blessing of Nordrassil - [23513] = 2500, -- Essence of the Red - [24268] = 60, -- Mar'li's Brain Boost - [24360] = 875, -- Greater Dreamless Sleep - [24884] = 200, -- Earthen Sigil - [25694] = 3, -- Well Fed - [25941] = 6, -- Well Fed - [26551] = 600, -- Jade Owl - [26600] = 300, -- Emerald Owl - [27996] = 50, -- Spellsurge - [28504] = 1500, -- Major Dreamless Sleep - [29040] = 6, -- Fizzy Energy Drink - [29882] = 875, -- Loose Mana - [31045] = 375, -- Talasite Owl - [35478] = 200, -- Drums of Restoration - [38929] = 400/3*5, -- Fel Mana - [45027] = 750, -- Revitalize - [45052] = 750, -- Evocation - [45860] = 1125, -- Breath: Revitalize - [46785] = 375, -- Seaspray Albatross - [53753] = 4500, -- Nightmare Slumber - [54833] = 450, -- Glyph of Innervate - [55740] = 2500, -- Essence of the Red - [71881] = 300, -- Invigoration - [71941] = 200/3*5, -- Twisted Nightmare - [351358] = 200, -- Greater Drums of Restoration - [434851] = 380, -- Minor Evocation - [435168] = 12, -- Guard of the Innovator - [446088] = 24, -- Leyline Attunement - [462858] = 750, -- Circle of Flame -} -Data.Aura.PeriodicallyGiveManaTooltip = { - [5677] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 1 - [10491] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 2 - [10493] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 3 - [10494] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 4 - [19742] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1 - [19850] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2 - [19852] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3 - [19853] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4 - [19854] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5 - [24853] = 5/2, -- Mana Spring - [25290] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6 - [25569] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 5 - [25894] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1 - [25918] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2 -} -Data.Aura.SpellCrit = { - [24907] = ((ECS.IsTBC or ECS.IsWotlk) and 5 or nil), -- Moonkin Aura - [29177] = 6, -- Elemental Devastation Rank 2 - [29178] = 9, -- Elemental Devastation Rank 3 - [30165] = 3, -- Elemental Devastation Rank 1 - [30482] = 3, -- Molten Armor - [30708] = 3, -- Totem of Wrath - [51466] = 3, -- Elemental Oath Rank 1 - [51470] = 5, -- Elemental Oath Rank 2 -} -Data.Enchant = {} -Data.Enchant.Ids = { - BIZNICK_SCOPE = 2523, -- 3% Hit from Biznicks 247x128 Accurascope -} -Data.Enchant.MP5 = { - [2381] = 10, -- Enchant Chest - Greater Mana Restoration - [2565] = 4, -- Enchant Bracer - Mana Regeneration - [2590] = 4, -- Prophetic Aura - [2624] = 4, -- Minor Mana Oil - [2625] = 8, -- Lesser Mana Oil - [2629] = 12, -- Brilliant Mana Oil - [2656] = 4, -- Enchant Boots - Vitality - [2677] = 14, -- Superior Mana Oil - [2679] = 6, -- Enchant Bracer - Restore Mana Prime - [2715] = 4, -- Resilience of the Scourge - [2980] = 4, -- Greater Inscription of Faith - [2992] = 5, -- Inscription of the Oracle - [2993] = 6, -- Greater Inscription of the Oracle - [3001] = 7, -- Glyph of Renewal - [3150] = 6, -- Enchant Chest – Restore Mana Prime - [3244] = 7, -- Enchant Boots - Greater Vitality - [3298] = 19, -- Exceptional Mana Oil - [3807] = 5, -- Inscription of the Crag - [3809] = 8, -- Greater Inscription of the Crag - [3819] = 10, -- Arcanum of Blissful Mending - [3836] = 8, -- Master's Inscription of the Crag - [7099] = 12, -- Blackfathom Mana Oil. This effect only applies within Blackfathom Deeps. -} -Data.Enchant.BlockValue = { - ["2583"] = 15, -- Presence of Might - ["2653"] = 18, -- Enchant Shield - Tough Shield - ["2655"] = 15, -- Enchant Shield - Shield Block - ["3849"] = 81, -- Titanium Plating - ["7633"] = 15, -- Presence of Valor -} -Data.Gem = {} -Data.Gem.MP5 = { - [23106] = 1, - [23109] = 1, - [23121] = 2, - [24037] = 3, - [24057] = 2, - [24065] = 2, - [28465] = 1, - [30550] = 2, - [30560] = 2, - [30589] = 2, - [30594] = 2, - [30603] = 2, - [30606] = 2, - [31864] = 1, - [31865] = 2, - [32202] = 4, - [32214] = 2, - [32216] = 2, - [32225] = 2, +Data.Item = { + IncreaseExpertise = { + [233376] = 1, + [233397] = 1, + [233401] = 1, + [233412] = 1, + [233413] = 1, + [233415] = 1, + [233442] = 1, + [233579] = 1, + [233582] = 1, + [233585] = 1, + [233600] = 1, + [233612] = 1, + [233614] = 2, + [233618] = 1, + [233634] = 1, + [233635] = 1, + [233637] = 1, + [233640] = 2, + [233642] = 1, + [233651] = 1, + [233658] = 1, + [233659] = 1, + [233661] = 1, + [233662] = 1, + [233663] = 1, + [233665] = 1, + [233666] = 1, + [233668] = 1, + [233689] = 1, + [233692] = 1, + [233693] = 1, + [233699] = 1, + [233700] = 1, + [233711] = 1, + [233992] = 1, + [234650] = 1, + [234748] = 1, + [234984] = 1, + [234985] = 2, + [235005] = 1, + [235888] = 1, + [236005] = 1, + [236006] = 1, + [236007] = 1, + [236008] = 1, + [236009] = 1, + [236010] = 1, + [236011] = 1, + [236012] = 1, + [236013] = 1, + [236016] = 1, + [236019] = 1, + [236020] = 1, + [236021] = 1, + [236022] = 1, + [236023] = 1, + [236026] = 1, + [236029] = 1, + [236030] = 1, + [236031] = 1, + [236032] = 1, + [236033] = 1, + [236034] = 1, + [236035] = 1, + [236036] = 1, + [236037] = 1, + [236038] = 1, + [236039] = 1, + [236040] = 1, + [236050] = 1, + [236051] = 1, + [236052] = 1, + [236054] = 1, + [236055] = 1, + [236056] = 1, + [236124] = 1, + [236125] = 1, + [236128] = 1, + [236129] = 1, + [236130] = 1, + [236133] = 1, + [236134] = 1, + [236135] = 1, + [236136] = 1, + [236137] = 1, + [236138] = 1, + [236139] = 1, + [236140] = 1, + [236141] = 1, + [236170] = 1, + [236171] = 1, + [236172] = 1, + [236174] = 1, + [236175] = 1, + [236176] = 1, + [236201] = 1, + [236202] = 1, + [236203] = 1, + [236204] = 1, + [236205] = 1, + [236206] = 1, + [236207] = 1, + [236208] = 1, + [236209] = 1, + [236210] = 1, + [236211] = 1, + [236212] = 1, + [236215] = 1, + [236216] = 1, + [236218] = 1, + [236222] = 1, + [236255] = 1, + [236260] = 1, + [236262] = 1, + [236263] = 1, + [236293] = 1, + [236300] = 2, + [236304] = 1, + [236306] = 1, + [236309] = 1, + [236311] = 1, + [236319] = 1, + [236339] = 1, + [236341] = 1, + [237275] = 1, + [237512] = 1, + }, + IsTimeworn = { + [233496] = true, + [233505] = true, + [233506] = true, + [233514] = true, + [233516] = true, + [233517] = true, + [233518] = true, + [233520] = true, + [233521] = true, + [233522] = true, + [233523] = true, + [233559] = true, + [233560] = true, + [233561] = true, + [233563] = true, + [233564] = true, + [233566] = true, + [233567] = true, + [233568] = true, + [233573] = true, + [233574] = true, + [233575] = true, + [233577] = true, + [233578] = true, + [233579] = true, + [233582] = true, + [233583] = true, + [233584] = true, + [233590] = true, + [233591] = true, + [233592] = true, + [233593] = true, + [233594] = true, + [233595] = true, + [233598] = true, + [233603] = true, + [233604] = true, + [233607] = true, + [233608] = true, + [233610] = true, + [233611] = true, + [233612] = true, + [233613] = true, + [233614] = true, + [233617] = true, + [233618] = true, + [233619] = true, + [233622] = true, + [233623] = true, + [233624] = true, + [233625] = true, + [233631] = true, + [233632] = true, + [233633] = true, + [233635] = true, + [233637] = true, + [233644] = true, + [233645] = true, + [233646] = true, + [234062] = true, + [234063] = true, + [234064] = true, + [234065] = true, + [234066] = true, + [234068] = true, + [234069] = true, + [234070] = true, + [234071] = true, + [234072] = true, + [234073] = true, + [234075] = true, + [234077] = true, + [234078] = true, + [234081] = true, + [234082] = true, + [234084] = true, + [234087] = true, + [234088] = true, + [234090] = true, + [234091] = true, + [234093] = true, + [234094] = true, + [234095] = true, + [234098] = true, + [234099] = true, + [234100] = true, + [234102] = true, + [234103] = true, + [234105] = true, + [234106] = true, + [234107] = true, + [234108] = true, + [234109] = true, + [234110] = true, + [234111] = true, + [234114] = true, + [234117] = true, + [234120] = true, + [234123] = true, + [234146] = true, + [234147] = true, + [234148] = true, + [234149] = true, + [234150] = true, + [234156] = true, + [234157] = true, + [234161] = true, + [234162] = true, + [234163] = true, + [234164] = true, + [234165] = true, + [234166] = true, + [234167] = true, + [234168] = true, + [234171] = true, + [234173] = true, + [234174] = true, + [234962] = true, + [234963] = true, + [235047] = true, + }, + TimewornExpertise = { + [234018] = 1, + [234022] = 1, + [234027] = 1, + [234031] = 1, + [234035] = 1, + }, } Data.setNames = { AUGURS_REGALIA = "Augur's Regalia", BLOODSOUL_EMBRACE = "Bloodsoul Embrace", + BONESCYTHE_LEATHERS = "Bonescythe Leathers", DAWN_OF_TRANSCENDENCE = "Dawn of Transcendence", + DREAMWALKER_GUARDIAN = "Dreamwalker Guardian", + DREADNOUGHTS_BATTLEGEAR = "Dreadnought's Battlegear", FEL_IRON_CHAIN = "Fel Iron Chain", FREETHINKERS_ARMOR = "Freethinker's Armor", GREEN_DRAGON_MAIL = "Green Dragon Mail", HARUSPEXS_GARB = "Haruspex's Garb", LIVING_GREEN_DRAGON_MAIL = "Living Green Dragon Mail", + PLAGUEHEART_STITCHINGS = "Plagueheart Stitchings", PRIMAL_MOONCLOTH = "Primal Mooncloth", + REDEMPTION_BULWARK = "Redemption Bulwark", STORMRAGE_RAIMENT = "Stormrage Raiment", + SYMBOLS_OF_UNENDING_LIFE = "Symbols of Unending Life", TEN_STORMS = "The Ten Storms", THE_EARTHSHATTERER = "The Earthshatterer", + THE_EARTHSHATTERER_RESOLVE = "The Earthshatterer Resolve", VESTMENTS_OF_TRANSCENDENCE = "Vestments of Transcendence", WINDHAWK_ARMOR = "Windhawk Armor", } diff --git a/Modules/Data/DataUtils.lua b/Modules/Data/DataUtils.lua index 352c51ef..e8986ed1 100644 --- a/Modules/Data/DataUtils.lua +++ b/Modules/Data/DataUtils.lua @@ -107,7 +107,7 @@ function DataUtils:GetEnchantFromItemLink(itemLink) if itemLink then local _, itemStringLink = GetItemInfo(itemLink) if itemStringLink then - local _, _, enchant = string.find(itemStringLink, "item:%d+:(%d*)") + local _, _, enchant, _ = strsplit(":", itemStringLink, 4) return tonumber(enchant) end end @@ -129,12 +129,12 @@ function DataUtils.GetRuneForEquipSlot(equipSlot) end ---@param itemLink ItemLink ----@return (number, number, number) | nil +---@return (string, string, string) | nil function DataUtils:GetSocketedGemsFromItemLink(itemLink) if itemLink then local _, itemStringLink = GetItemInfo(itemLink) if itemStringLink then - local _, _, gem1, gem2, gem3 = string.find(itemStringLink, "item:%d*:%d*:(%d*):(%d*):(%d*)") + local _, _, gem1, gem2, gem3, _ = strsplit(":", itemStringLink, 6) return gem1, gem2, gem3 end end diff --git a/Modules/Data/ItemSets.lua b/Modules/Data/ItemSets.lua index cabd680a..5f02900c 100755 --- a/Modules/Data/ItemSets.lua +++ b/Modules/Data/ItemSets.lua @@ -17,6 +17,17 @@ local itemSets = { [19691] = true, [19692] = true, }, + [setNames.BONESCYTHE_LEATHERS] = { + [236032] = true, + [236033] = true, + [236034] = true, + [236035] = true, + [236036] = true, + [236037] = true, + [236038] = true, + [236039] = true, + [236040] = true + }, [setNames.DAWN_OF_TRANSCENDENCE] = { [231155] = true, [231156] = true, @@ -27,6 +38,28 @@ local itemSets = { [231161] = true, [231162] = true, }, + [setNames.DREADNOUGHTS_BATTLEGEAR] = { + [236005] = true, + [246006] = true, + [236007] = true, + [236008] = true, + [236009] = true, + [236010] = true, + [236011] = true, + [236012] = true, + [236013] = true + }, + [setNames.DREAMWALKER_GUARDIAN] = { + [236201] = true, + [236202] = true, + [236203] = true, + [236204] = true, + [236205] = true, + [236206] = true, + [236207] = true, + [236208] = true, + [236209] = true + }, [setNames.FEL_IRON_CHAIN] = { [23490] = true, [23491] = true, @@ -62,6 +95,28 @@ local itemSets = { [21874] = true, [21875] = true, }, + [setNames.PLAGUEHEART_STITCHINGS] = { + [236068] = true, + [236069] = true, + [236070] = true, + [236071] = true, + [236072] = true, + [236073] = true, + [236074] = true, + [236075] = true, + [236076] = true + }, + [setNames.REDEMPTION_BULWARK] = { + [236133] = true, + [236134] = true, + [236135] = true, + [236136] = true, + [236137] = true, + [236138] = true, + [236139] = true, + [236140] = true, + [236141] = true + }, [setNames.STORMRAGE_RAIMENT] = { [16897] = true, [16898] = true, @@ -72,6 +127,11 @@ local itemSets = { [16903] = true, [16904] = true, }, + [setNames.SYMBOLS_OF_UNENDING_LIFE] = { + [233417] = true, + [233418] = true, + [233419] = true + }, [setNames.TEN_STORMS] = { [16943] = true, [16944] = true, @@ -83,16 +143,27 @@ local itemSets = { [16950] = true }, [setNames.THE_EARTHSHATTERER] = { - [22468] = true, - [22470] = true, - [22469] = true, - [22466] = true, + [22464] = true, [22465] = true, + [22466] = true, [22467] = true, - [22464] = true, + [22468] = true, + [22469] = true, + [22470] = true, [22471] = true, [23065] = true }, + [setNames.THE_EARTHSHATTERERS_RESOLVE] = { + [236160] = true, + [236162] = true, + [236163] = true, + [236164] = true, + [236165] = true, + [236166] = true, + [236167] = true, + [236168] = true, + [236169] = true + }, [setNames.VESTMENTS_OF_TRANSCENDENCE] = { [16919] = true, [16920] = true, @@ -108,18 +179,30 @@ local itemSets = { [29523] = true, [29524] = true, }, - [setNames.GREEN_DRAGON_MAIL] = { - [15045] = true, - [15046] = true, - [20296] = true, - }, - [setNames.LIVING_GREEN_DRAGON_MAIL] = { - [227877] = true, - [227878] = true, - [227879] = true, - }, } +function Data:HasSetBonusIncreasedExpertise2() + if classId == Data.WARRIOR then + return Data:IsSetBonusActive(setNames.DREADNOUGHTS_BATTLEGEAR, 2) + elseif classId == Data.DRUID then + return Data:IsSetBonusActive(setNames.DREAMWALKER_GUARDIAN, 2) + elseif classId == Data.SHAMAN then + return Data:IsSetBonusActive(setNames.THE_EARTHSHATTERERS_RESOLVE, 2) + elseif classId == Data.PALADIN then + return Data:IsSetBonusActive(setNames.REDEMPTION_BULWARK, 2) + elseif classId == Data.ROGUE then + return Data:IsSetBonusActive(setNames.BONESCYTHE_LEATHERS, 2) + elseif classId == Data.WARLOCK then + return Data:IsSetBonusActive(setNames.PLAGUEHEART_STITCHINGS, 2) + end +end + +function Data:HasSetBonusIncreasedExpertise5() + if classId == Data.DRUID then + return Data:IsSetBonusActive(setNames.SYMBOLS_OF_UNENDING_LIFE, 3) + end +end + ---@return number function Data:GetSetBonusModifierMP5() local mod = 0 diff --git a/Modules/Data/Melee.lua b/Modules/Data/Melee.lua index a58448a6..9b6aa17e 100755 --- a/Modules/Data/Melee.lua +++ b/Modules/Data/Melee.lua @@ -232,6 +232,33 @@ end ---@return number function Data:GetExpertise() local expertise, _ = GetExpertise() + + if ECS.IsSoD then + -- count timeworn items + local timeworn = 0 + for i = 1, 18 do + local id, _ = GetInventoryItemID("player", i) + if Data.Item.IsTimeworn[id] then + timeworn = timeworn + 1 + end + end + + for i = 1, 18 do + local id, _ = GetInventoryItemID("player", i) + expertise = expertise + (Data.Item.IncreaseExpertise[id] or 0) + expertise = expertise + timeworn * (Data.Item.TimewornExpertise[id] or 0) + if classId == Data.DRUID then + local itemLink = GetInventoryItemLink("player", i) + if itemLink then + local enchant = DataUtils:GetEnchantFromItemLink(itemLink) + if enchant and enchant == Data.Enchant.Ids.ANIMALISTIC_EXPERTISE then + expertise = expertise + 5 + end + end + end + end + end + return DataUtils:Round(expertise, 0) end @@ -277,4 +304,3 @@ function Data:GetMeleeHasteBonus() local hasteBonus = GetCombatRatingBonus(CR_HASTE_MELEE) return DataUtils:Round(hasteBonus, 2) .. "%" end - diff --git a/Modules/Profile.lua b/Modules/Profile.lua index 2739d369..cc6e2f5c 100755 --- a/Modules/Profile.lua +++ b/Modules/Profile.lua @@ -127,7 +127,7 @@ local function GetDefaultStatsProfile() textColor = colors.ATTACK_SPEED_SECONDARY, statColor = colors.ATTACK_SPEED_PRIMARY, }, - expertise = {display = true, isTbcOnly = true, refName = "Expertise", text = "Expertise"}, + expertise = {display = true, refName = "Expertise", text = "Expertise"}, expertiseRating = {display = true, isTbcOnly = true, refName = "ExpertiseRating", text = "Expertise Rating"}, hasteRating = { display = true,