From 1d8ff0fb4232f9915a7faac38c93484327e7d713 Mon Sep 17 00:00:00 2001 From: Anch Date: Thu, 15 Dec 2022 21:53:22 +1300 Subject: [PATCH] added new classic items also removed benediction and rhok 'delar quest items and tags --- AtlasLoot/Core/AtlasLoot.lua | 2 +- AtlasLoot/Core/ItemIDsDatabaseFixes.lua | 47 +++++++++++++++---------- AtlasLoot_OriginalWoW/originalwow.lua | 37 +++++++++---------- 3 files changed, 48 insertions(+), 38 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 822a7fe..71010f3 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -1095,7 +1095,7 @@ function AtlasLoot:LoadItemIDsDatabase() -- run for each item in the data if index ~= 0 and data.Normal ~= 0 and not ItemIDsDatabase[data.Normal] then ItemIDsDatabase[data.Normal] = {} - ItemIDsDatabase[data.Normal]["MythicRaid"] = data.Heroic + 1000000 + ItemIDsDatabase[data.Normal]["MythicRaid"] = tonumber("13"..data.Normal); table.insert(ItemIDsDatabase[data.Normal],data.Bloodforged); table.insert(ItemIDsDatabase[data.Normal],data.Normal); if data.Heroic ~= 0 then table.insert(ItemIDsDatabase[data.Normal],data.Heroic) end diff --git a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua index 8238b36..56375c4 100644 --- a/AtlasLoot/Core/ItemIDsDatabaseFixes.lua +++ b/AtlasLoot/Core/ItemIDsDatabaseFixes.lua @@ -25,16 +25,25 @@ ItemIDsDatabase[32837] = { 6032837, 32837, 332837, 232837 }; ItemIDsDatabase[32838] = { 6032838, 32838, 332838, 232838 }; ItemIDsDatabase[30104] = { 6033482, 30104, 330104, 230104 }; +--MC/Ony Items + +ItemIDsDatabase[18216] = { 6018216, 18216, 318216, 218216 }; +ItemIDsDatabase[18215] = { 6018215, 18215, 318215, 218215 }; +ItemIDsDatabase[18211] = { 6018211, 18211, 318211, 218211 }; +ItemIDsDatabase[17084] = { 6017084, 17084, 317084, 217084 }; +ItemIDsDatabase[18212] = { 6018212, 18212, 318212, 218212 }; +ItemIDsDatabase[17083] = { 6017083, 17083, 317083, 217083 }; + --Tier 1 Tokens -ItemIDsDatabase[2522360] = { 2522360, 2522360, 2622360, 2722360 }; -ItemIDsDatabase[2522361] = { 2522361, 2522361, 2622361, 2722361 }; -ItemIDsDatabase[2522350] = { 2522350, 2522350, 2622350, 2722350 }; -ItemIDsDatabase[2522362] = { 2522362, 2522362, 2622362, 2722362 }; -ItemIDsDatabase[2522363] = { 2522363, 2522363, 2622363, 2722363 }; -ItemIDsDatabase[2522364] = { 2522364, 2522364, 2622364, 2722364 }; -ItemIDsDatabase[2522359] = { 2522359, 2522359, 2622359, 2722359 }; -ItemIDsDatabase[2522365] = { 2522365, 2522365, 2622365, 2722365 }; +ItemIDsDatabase[2522360] = { 2522360, 2522360, 2622360, 2722360, MythicRaid = 3722360 }; +ItemIDsDatabase[2522361] = { 2522361, 2522361, 2622361, 2722361, MythicRaid = 3722361 }; +ItemIDsDatabase[2522350] = { 2522350, 2522350, 2622350, 2722350, MythicRaid = 3722350 }; +ItemIDsDatabase[2522362] = { 2522362, 2522362, 2622362, 2722362, MythicRaid = 3722362 }; +ItemIDsDatabase[2522363] = { 2522363, 2522363, 2622363, 2722363, MythicRaid = 3722363 }; +ItemIDsDatabase[2522364] = { 2522364, 2522364, 2622364, 2722364, MythicRaid = 3722364 }; +ItemIDsDatabase[2522359] = { 2522359, 2522359, 2622359, 2722359, MythicRaid = 3722359 }; +ItemIDsDatabase[2522365] = { 2522365, 2522365, 2622365, 2722365, MythicRaid = 3722365 }; --Tier 1 New Sets ItemIDsDatabase[11533] = { 6011533, 11533, 311533, 211533 }; @@ -67,14 +76,14 @@ ItemIDsDatabase[13439] = { 6013439, 13439, 313439, 213439 }; --Tier 2 Tokens -ItemIDsDatabase[2522460] = { 2522460, 2522460, 2622460, 2722460 }; -ItemIDsDatabase[2522461] = { 2522461, 2522461, 2622461, 2722461 }; -ItemIDsDatabase[2522450] = { 2522450, 2522450, 2622450, 2722450 }; -ItemIDsDatabase[2522462] = { 2522462, 2522462, 2622462, 2722462 }; -ItemIDsDatabase[2522464] = { 2522464, 2522464, 2622464, 2722464 }; -ItemIDsDatabase[2522463] = { 2522463, 2522463, 2622463, 2722463 }; -ItemIDsDatabase[2522459] = { 2522459, 2522459, 2622459, 2722459 }; -ItemIDsDatabase[2522465] = { 2522465, 2522465, 2622465, 2722465 }; +ItemIDsDatabase[2522460] = { 2522460, 2522460, 2622460, 2722460, MythicRaid = 3722460 }; +ItemIDsDatabase[2522461] = { 2522461, 2522461, 2622461, 2722461, MythicRaid = 3722461 }; +ItemIDsDatabase[2522450] = { 2522450, 2522450, 2622450, 2722450, MythicRaid = 3722450 }; +ItemIDsDatabase[2522462] = { 2522462, 2522462, 2622462, 2722462, MythicRaid = 3722462 }; +ItemIDsDatabase[2522464] = { 2522464, 2522464, 2622464, 2722464, MythicRaid = 3722464 }; +ItemIDsDatabase[2522463] = { 2522463, 2522463, 2622463, 2722463, MythicRaid = 3722463 }; +ItemIDsDatabase[2522459] = { 2522459, 2522459, 2622459, 2722459, MythicRaid = 3722459 }; +ItemIDsDatabase[2522465] = { 2522465, 2522465, 2622465, 2722465, MythicRaid = 3722465 }; --Tier 3 Tokens @@ -146,11 +155,11 @@ ItemIDsDatabase[24537] = { 6024537, 24537, 324537, 224537 }; ItemIDsDatabase[1333809] = { 1333809, 1333809, 1433809, 1233809 }; --intact vial of kael'thas sunstrider -ItemIDsDatabase[450001] = { 450001, 450001, 450003, 450005 }; -ItemIDsDatabase[450000] = { 450000, 450000, 450002, 450004 }; +ItemIDsDatabase[450001] = { 450001, 450001, 450003, 450005, MythicRaid = 1450003 }; +ItemIDsDatabase[450000] = { 450000, 450000, 450002, 450004, MythicRaid = 1450002 }; for _, v in pairs(ItemIDsDatabase) do if not v["MythicRaid"] then - v["MythicRaid"] = v[3] + 1000000; + v["MythicRaid"] = tonumber("13"..v[2]); end end \ No newline at end of file diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 907045a..4bb3737 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -1425,13 +1425,10 @@ AtlasLoot_Data["MoltenCore"] = { { 8, 19140, "", "=q4=Cauterizing Band", "=ds=#s13#", "", "15.10%" }; { 9, 18805, "", "=q4=Core Hound Tooth", "=ds=#h1#, #w4#", "", "16.06%" }; { 10, 18803, "", "=q4=Finkle's Lava Dredger", "=ds=#h2#, #w6#", "", "12.43%" }; - { 16, 18703, "", "=q4=Ancient Petrified Leaf", "=ds=#m2# =q1=(#c2#)", "", "35.25%" }; - { 17, 18715, "", "=q4=Lok'delar, Stave of the Ancient Keepers", "=q1=#m4#: =ds=#w9#, =q1=#m1# =ds=#c2#" }; - { 18, 18713, "", "=q4=Rhok'delar, Longbow of the Ancient Keepers", "=q1=#m4#: =ds=#w2#, =q1=#m1# =ds=#c2#" }; - { 19, 18714, "", "=q4=Ancient Sinew Wrapped Lamina", "=q1=#m4#: =ds=#w19#, =q1=#m1# =ds=#c2#" }; - { 21, 18646, "", "=q4=The Eye of Divinity", "=ds=#m2# =q1=(#c5#)", "", "28.30%" }; - { 22, 18608, "", "=q4=Benediction", "=q1=#m4#: =ds=#w9#, =q1=#m1# =ds=#c5#" }; - { 23, 18609, "", "=q4=Anathema", "=q1=#m4#: =ds=#w9#, =q1=#m1# =ds=#c5#" }; + { 16, 18715, "", "=q4=Lok'delar, Stave of the Ancient Keepers", "=ds=#w9#" }; + { 17, 18713, "", "=q4=Rhok'delar, Longbow of the Ancient Keepers", "=ds=#w2#" }; + { 19, 18608, "", "=q4=Benediction", "=ds=#w9#" }; + { 20, 18609, "", "=q4=Anathema", "=ds=#w9#" }; }; { Name = BabbleBoss["Ragnaros"]; @@ -1448,13 +1445,14 @@ AtlasLoot_Data["MoltenCore"] = { { 11, 17076, "", "=q4=Bonereaver's Edge", "=ds=#h2#, #w10#", "", "5.12%" }; { 12, 17104, "", "=q4=Spinal Reaper", "=ds=#h2#, #w1#", "", " 4.63%" }; { 13, 17106, "", "=q4=Malistar's Defender", "=ds=#w8#", "", "13.88%" }; - { 15, 21110, "", "=q1=Draconic for Dummies", "=ds=#m3#", "", "100%" }; + { 14, 17083, "", "=q4=Blade of Dragon Bone", "=ds=#h3#, #w10#", "", "13.88%" }; { 16, 2522459, "", "=q4=Chromatic Leggaurds", "=ds=#tt2#", "", "100%", "=TT=T2LEGS" }; - { 18, 17204, "", "=q5=Eye of Sulfuras", "=ds=#m3#", "", "3.42%" }; - { 19, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#" }; - { 21, 19017, "", "=q1=Essence of the Firelord", "=ds=#m3#", "", "0.46%" }; - { 22, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#" }; - { 24, 102107, "", "=q4=Reins of the Magmatic Steed", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; + { 18, 21110, "", "=q1=Draconic for Dummies", "=ds=#m3#", "", "100%" }; + { 20, 17204, "", "=q5=Eye of Sulfuras", "=ds=#m3#", "", "3.42%" }; + { 21, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#" }; + { 23, 19017, "", "=q1=Essence of the Firelord", "=ds=#m3#", "", "0.46%" }; + { 24, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#" }; + { 25, 102107, "", "=q4=Reins of the Magmatic Steed", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; }; { Name = "Random Boss Drops"; @@ -4097,16 +4095,19 @@ AtlasLoot_Data["Onyxia60"] = { { 5, 17067, "", "=q4=Ancient Cornerstone Grimoire", "=ds=#s15#", "", "28.57%" }, { 6, 17075, "", "=q4=Vis'kag the Bloodletter", "=ds=#h1#, #w10#", "", "28.57%" }, { 7, 17068, "", "=q4=Deathbringer", "=ds=#h1#, #w1#", "", "28.57%" }, - { 9, 18705, "", "=q4=Mature Black Dragon Sinew", "=ds=#m3# =q1=#m1# =ds=#c2#", "", "100%" }, - { 10, 18713, "", "=q4=Rhok'delar, Longbow of the Ancient Keepers", "=q1=#m4#: =ds=#w2#, =q1=#m1# =ds=#c2#" }, - { 12, 15410, "", "=q3=Scale of Onyxia", "=ds=#e8#" }, - { 13, 17966, "", "=q2=Onyxia Hide Backpack", "=ds=#m14# #e1#", "", "100%" }, + { 8, 18215, "", "=q4=Insignia of the Dragon", "=ds=#s14#", "", "28.57%" }, + { 9, 18216, "", "=q4=Neltharion's Badge", "=ds=#s14#", "", "28.57%" }, + { 10, 18211, "", "=q4=Wand of the Noble", "=ds=#w12#", "", "28.57%" }, + { 11, 17084, "", "=q4=Mace of the Dragon Knight", "=ds=#h2#, #w6#", "", "28.57%" }, + { 12, 18212, "", "=q4=Band of Nyxondra", "=ds=#s13#", "", "28.57%" }, { 16, 2522460, "", "=q4=Chromatic Headpiece", "=ds=#tt2#", "", "100%", "=TT=T2HEAD" }; { 18, 18423, "", "=q4=Head of Onyxia", "=ds=#m2#", "", "100%" }, { 19, 18404, "", "=q4=Onyxia Tooth Pendant", "=q1=#m4#: =ds=#s2#" }, { 20, 18403, "", "=q4=Dragonslayer's Signet", "=q1=#m4#: =ds=#s13#" }, { 21, 18406, "", "=q4=Onyxia Blood Talisman", "=q1=#m4#: =ds=#s14#" }, - { 23, 49636, "", "=q4=Reins of the Onyxian Drake", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; + { 23, 15410, "", "=q3=Scale of Onyxia", "=ds=#e8#" }, + { 24, 17966, "", "=q2=Onyxia Hide Backpack", "=ds=#m14# #e1#", "", "100%" }, + { 26, 49636, "", "=q4=Reins of the Onyxian Drake", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; }; };