From c6a38f12f9a8442dacc9cbbf09df32c23f7df1c1 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 22 Apr 2026 18:18:08 +0200 Subject: [PATCH] fix mp5 double counting --- Modules/Data/Constants.lua | 91 +++++--------------------------------- 1 file changed, 12 insertions(+), 79 deletions(-) diff --git a/Modules/Data/Constants.lua b/Modules/Data/Constants.lua index 7f424a18..66fa6185 100755 --- a/Modules/Data/Constants.lua +++ b/Modules/Data/Constants.lua @@ -112,8 +112,8 @@ Data.Aura = { [49280] = true, -- Lightning Shield rank 10 [49281] = true, -- Lightning Shield rank 11 }, - MP5 = { - [430] = 42, -- drink + MP5 = ECS.IsClassic and { + [430] = 42, -- Drink [431] = 104, -- drink [432] = 174, -- drink [833] = 30, -- Green Tea @@ -121,16 +121,16 @@ Data.Aura = { [1135] = 332, -- drink [1137] = 489, -- drink [2639] = 70, -- food + [8384] = 5, -- Pure Water [10250] = 800, -- drink [16609] = 10, -- Warchief's Blessing [18140] = 735, -- Blessed Sunfruit Juice - [18194] = (ECS.IsWotlk and 10 or 8), -- Mana Regeneration + [18194] = 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 + [24363] = 12, -- Mana Regeneration [25696] = 735, -- Drink [25697] = 735, -- Old Enriched Manna Biscuit [25701] = 75, -- Brain Food @@ -142,81 +142,14 @@ Data.Aura = { [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 + [28145] = 11, -- Power of the Guardian + [28509] = 16, -- Greater Mana Regeneration + [28795] = 28, -- Holy Power + [28804] = 24, -- Epiphany + [28820] = 15, -- Lightning Shield + [28824] = 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 @@ -231,7 +164,7 @@ Data.Aura = { [1213886] = 13, -- Flask of Unyielding Sorrow [1220542] = 28, -- Holy Power [1220685] = 28, -- Totemic Power - }, + } or {}, 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