diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index bd89c1a..fd10298 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -2912,9 +2912,12 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Web Master Torkon"], "DMRWebMaster" }, { AL["Garlok Flamekeeper"], "DMRGarlok" }, { AL["Halgan Redbrand"], "DMRHalgan" }, + { AL["Slagfist Destroyer"],"DMRSlagfist" }, + { AL["Overlord Blackheart"], "DMROverlord" }, { AL["Elder Hollowblood"], "DMRElderHollowblood" }, { AL["Searistrasz"], "DMRSearistrasz" }, { AL["Zuluhed the Whacked"], "DMRZuluhed" }, + { AL["Trash Mobs"], "DMRTrash" }, }, ["StormwroughtRuins"] = { { AL["Oronok Torn-Heart"], "SWROronok" }, @@ -2929,6 +2932,7 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Lady Drazare"], "SWRLadyDrazare" }, { AL["Remains of the Innocent"], "SWRRemains" }, { AL["Mergothid"], "SWRMergothid" }, + { AL["Trash Mobs"], "SWRTrash" }, }, }; diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 734f154..c24fd5a 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -37,12 +37,24 @@ AtlasLoot_ButtonRegistry = { ["DMRHalgan"] = { Title = AL["Halgan Redbrand"], Prev_Page = "DMRGarlok", + Next_Page = "DMRSlagfist", + Back_Page = "DUNGEONSMENU1", + }; + ["DMRSlagfist"] = { + Title = AL["Slagfist Destroyer"], + Prev_Page = "DMRHalgan", + Next_Page = "DMROverlord", + Back_Page = "DUNGEONSMENU1", + }; + ["DMROverlord"] = { + Title = AL["Overlord Blackheart"], + Prev_Page = "DMRSlagfist", Next_Page = "DMRElderHollowblood", Back_Page = "DUNGEONSMENU1", }; ["DMRElderHollowblood"] = { Title = AL["Elder Hollowblood"], - Prev_Page = "DMRHalgan", + Prev_Page = "DMROverlord", Next_Page = "DMRSearistrasz", Back_Page = "DUNGEONSMENU1", }; @@ -55,6 +67,12 @@ AtlasLoot_ButtonRegistry = { ["DMRZuluhed"] = { Title = AL["Zuluhed the Whacked"], Prev_Page = "DMRSearistrasz", + Next_Page = "DMRTrash", + Back_Page = "DUNGEONSMENU1", + }; + ["DMRTrash"] = { + Title = AL["Trash Mobs"], + Prev_Page = "DMRZuluhed", Back_Page = "DUNGEONSMENU1", }; -- Stormwrought Ruins @@ -126,6 +144,12 @@ AtlasLoot_ButtonRegistry = { ["SWRMergothid"] = { Title = AL["Mergothid"], Prev_Page = "SWRRemains", + Next_Page = "SWRTrash", + Back_Page = "DUNGEONSMENU1", + }; + ["SWRTrash"] = { + Title = AL["Trash Mobs"], + Prev_Page = "SWRMergothid", Back_Page = "DUNGEONSMENU1", }; -- Hateforge Quarry diff --git a/Database/Instances.lua b/Database/Instances.lua index ef71518..c060f6b 100644 --- a/Database/Instances.lua +++ b/Database/Instances.lua @@ -2869,6 +2869,8 @@ AtlasLoot_Data["AtlasLootItems"] = { {{21392,"=q4=#x24#=ds=, #r5#"},{21395,"=q4=#x24#=ds=, #r5#"},{21401,"=q4=#x24#=ds=, #r5#"},{21404,"=q4=#x24#=ds=, #r5#"},{21398,"=q4=#x24#=ds=, #r5#"},}, }, }, + { 0,"","","" }, + { 132, "INV_Scroll_06", "=q3=Plans: Obsidian Belt Buckle", "#p2# (300)", "6%" }, }; AQ20Andorov = { { 22221, "INV_Scroll_03", "=q1=Plans: Obsidian Mail Tunic", "=ds=#p2# #m14#" }, @@ -8173,9 +8175,9 @@ AtlasLoot_Data["AtlasLootItems"] = { { 58041, "INV_Misc_Bone_03", "=q2=Fangmother Essence", "#s14#", "20%" }, { 58040, "INV_Bracer_06", "=q2=Cavernweb Cuffs", "#s8#, #a3#", "20%" }, { 0, "", "", "" }, - { 41834, "INV_Misc_Organ_02", "=q1=Broodmother's Sac", "#m3#", "100%" }, - { 0, "", "", "" }, { 37009, "INV_Misc_MonsterSpiderCarapace_01", "=q2=Cavernweb Hatchling", "#e15#", "10%" }, + { 0, "", "", "" }, + { 41834, "INV_Misc_Organ_02", "=q1=Broodmother's Sac", "#m3#", "100%" }, }; DMRWebMaster = { { 41566, "INV_Jewelry_Ring_22", "=q3=Webmaster's Ring", "#s13#", "20%" }, @@ -8184,9 +8186,9 @@ AtlasLoot_Data["AtlasLootItems"] = { { 41569, "INV_Misc_Cape_07", "=q2=Tattered Orcish Shawl", "#s4#", "20%" }, { 41570, "INV_Misc_Orb_01", "=q2=Idol of Nethalakk", "#s15#", "20%" }, { 0, "", "", "" }, - { 41874, "INV_Misc_StoneTablet_02", "=q2=Fragment of Algoron", "", "100%" }, - { 0, "", "", "" }, { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, + { 0, "", "", "" }, + { 41874, "INV_Misc_StoneTablet_02", "=q2=Fragment of Algoron", "", "100%" }, }; DMRGarlok = { { 41578, "INV_Chest_Cloth_25", "=q3=Flamekeeper's Robe", "#s5#, #a1#", "25%" }, @@ -8196,6 +8198,18 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, }; + DMROverlord = { + { 41726, "INV_Gauntlets_15", "=q3=Slaver's Gauntlets", "#s9#, #a3#", "25%" }, + { 41725, "GenBow_twow3F", "=q3=Dragonmaw Battle Bow", "#w2#", "25%" }, + { 41724, "INV_Shoulder_24", "=q3=Dragonmaw Shoulders", "#s3#, #a2#", "25%" }, + { 41727, "INV_Chest_Leather_02", "=q2=Blackheart Armor", "#s5#, #a3#", "25%" }, + { 0, "", "", "" }, + { 74, "INV_Scroll_05", "=q3=Pattern: Dragonmaw Gloves", "#p7# (170)", "6%" }, + { 0, "", "", "" }, + { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, + { 0, "", "", "" }, + { 41841, "INV_Misc_Head_Orc_01", "=q1=Blackheart's Head", "#m3#", "100%" }, + }; DMRHalgan = { { 58044, "INV_Staff_28", "=q3=Ceremonial Dwarven Staff", "#h2#, #w9#", "25%" }, { 58046, "INV_Shield_03", "=q3=Shield of Galoraz", "#h4#, #w8#", "25%" }, @@ -8204,6 +8218,14 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, }; + DMRSlagfist = { + { 41560, "INV_Misc_StoneTablet_01", "=q3=Shalestone Amulet", "#s2#", "25%" }, + { 41719, "INV_Pants_03", "=q2=Stonelink Leggings", "#s11#, #a3#", "25%" }, + { 41558, "INV_Staff_11", "=q2=The Slagbinder", "#h2#, #w9#", "25%" }, + { 41559, "INV_Axe_12", "=q2=Rock Carver", "#h3#, #w1#", "25%" }, + { 0, "", "", "" }, + { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, + }; DMRElderHollowblood = { { 41721, "GenShield_1F", "=q3=Bulwark of the Old Horde", "#h4#, #w8#", "25%" }, { 41722, "INV_Bracer_08", "=q3=Rockspeaker Bracers", "#s8#, #a1#", "25%" }, @@ -8234,6 +8256,34 @@ AtlasLoot_Data["AtlasLootItems"] = { { 41981, "INV_Letter_15", "=q1=Letter from Korlag Doomsong", "#m2#", "100%" }, { 41711, "INV_Letter_15", "=q1=Letter from Korlag Doomsong", "#m2#", "100%" }, }; + DMRTrash = { + { 58103, "INV_Belt_13", "=q3=Drakeflame Girdle", "#s10#, #a3#", "0.01%" }, + { 58106, "INV_Chest_Leather_08", "=q3=Coal-Dusted Worker's Vest", "#s5#, #a2#", "0.01%" }, + { 58107, "INV_Crown_01", "=q3=Ancestor's Wisdom", "#s1#, #a1#", "0.01%" }, + { 58102, "gnahs_skullshield_1", "=q3=Dragonmaw Bulwark", "#h4#, #w8#", "0.01%" }, + { 58104, "INV_Misc_Cape_18", "=q3=Magmascarred Cloak", "#s4#", "0.01%" }, + { 58108, "INV_Gauntlets_26", "=q3=Drakeskin Gloves", "#s9#, #a2#", "0.01%" }, + { 58109, "INV_Jewelry_Ring_04", "=q3=Kindling Signet", "#s13#", "0.01%" }, + { 58110, "INV_Helmet_18", "=q3=Lantern-Helm of the Deep", "#s1#, #a2#", "0.01%" }, + { 58105, "INV_Bracer_07", "=q3=Bindings of the Forebearer", "#s8#, #a2#", "0.01%" }, + { 0, "", "", "" }, + { 58111, "INV_Chest_Chain_15", "=q2=Dragonmaw Hauberk", "#s5#, #a2#", "0.11%" }, + { 58115, "INV_Boots_Cloth_05", "=q2=Dragonmaw Greaves", "#s12#, #a2#", "0.11%" }, + { 58114, "INV_Pants_Leather_07", "=q2=Dragonmaw Leggings", "#s11#, #a2#", "0.11%" }, + { 58113, "INV_Bracer_02", "=q2=Dragonmaw Bracers", "#s8#, #a2#", "0.11%" }, + { 0, "", "", "" }, + { 70104, "INV_Misc_Note_01", "=q3=Plans: Gemmed Citrine Pendant", "#p18# (160)", "0.02%" }, + { 70153, "INV_Misc_Note_01", "=q3=Plans: Farraki Ceremony Totem", "#p18# (140)", "0.02%" }, + { 70186, "INV_Misc_Note_01", "=q3=Plans: Blackrock Ironclamps", "#p18# (140)", "0.02%" }, + { 0, "", "", "" }, + { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "2.5%" }, + { 30011, "Ability_Hunter_Pet_Crab", "=q3=Diamond Crustacean", "#e7#", "0.5%" }, + { 30012, "ability_hunter_pet_thunder_lizard", "=q3=Black Thunder Lizard", "#e7#", "0.01%" }, + { 30013, "ability_hunter_pet_thunder_lizard", "=q3=Azure Thunder Lizard", "#e7#", "0.05%" }, + { 30014, "ability_hunter_pet_thunder_lizard", "=q3=Green Thunder Lizard", "#e7#", "0.01%" }, + { 30015, "ability_hunter_pet_thunder_lizard", "=q3=Pale Thunder Lizard", "#e7#", "0.5%" }, + { 30016, "ability_hunter_pet_thunder_lizard", "=q3=Red Thunder Lizard", "#e7#", "0.01%" }, + }; -- Stormwrought Ruins SWROronok = { { 58135, "INV_Weapon_ShortBlade_15", "=q3=Dagger of Whispered Madness", "#h1#, #w4#", "25%" }, @@ -8336,4 +8386,32 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "INV_Box_01", "=q6="..AL["Ighal'for"], ""}, { 41939, "INV_Jewelry_Necklace_05", "=q1=Broken Bloodstone Pendant", "#m2#", "100%" }, }, + SWRTrash = { + { 1992, "INV_Misc_Bone_OrcSkull_01", "=q3=Swampchill Fetish", "#s15#", "0.02%" }, + { 2262, "INV_Jewelry_Ring_15", "=q3=Mark of Kern", "#s13#", "0.02%" }, + { 5756, "INV_Weapon_ShortBlade_24", "=q3=Sliverblade", "#h1#, #w4#", "0.02%" }, + { 5819, "INV_Helmet_03", "=q3=Sunblaze Coif", "#s1#, #a3#", "0.02%" }, + { 7727, "INV_Shoulder_23", "=q3=Watchman Pauldrons", "#s3#, #a2#", "0.02%" }, + { 7728, "INV_Chest_Cloth_25", "=q3=Beguiler Robes", "#s5#, #a1#", "0.04%" }, + { 7729, "INV_Weapon_Rifle_06", "=q3=Chesterfall Musket", "#w5#", "0.02%" }, + { 7730, "INV_Hammer_04", "=q3=Cobalt Crusher", "#h2#, #w6#", "0.02%" }, + { 7736, "INV_Mace_11", "=q3=Fight Club", "#h1#, #w6#", "0.02%" }, + { 7752, "INV_Hammer_17", "=q3=Dreamslayer", "#h3#, #w6#", "0.02%" }, + { 7753, "INV_Axe_10", "=q3=Bloodspiller", "#h2#, #w1#", "0.02%" }, + { 7754, "INV_Boots_05", "=q3=Harbinger Boots", "#s12#, #a2#", "0.01%" }, + { 7755, "INV_Shoulder_13", "=q3=Flintrock Shoulders", "#s3#, #a2#", "0.02%" }, + { 7757, "INV_Wand_07", "=q3=Windweaver Staff", "#h2#, #w9#", "0.02%" }, + { 7759, "INV_Chest_Chain_11", "=q3=Archon Chestpiece", "#s5#, #a3#", "0.02%" }, + { 7760, "INV_Pants_06", "=q3=Warchief Kilt", "#s11#, #a2#", "0.02%" }, + { 7761, "INV_Axe_06", "=q3=Steelclaw Reaver", "#h3#, #w1#", "0.02%" }, + { 7786, "INV_Axe_14", "=q3=Headsplitter", "#h1#, #w1#", "0.02%" }, + { 7787, "INV_Shield_02", "=q3=Resplendent Guardian", "#h4#, #w8#", "0.02%" }, + { 8225, "INV_Sword_30", "=q3=Tainted Pierce", "#h1#, #w10#", "0.02%" }, + { 8226, "INV_Sword_18", "=q3=The Butcher", "#h3#, #w10#", "0.02%" }, + { 58131, "INV_Belt_12", "=q2=Stormreaver Belt", "#s10#, #a1#", "0.11%" }, + { 58178, "INV_Boots_05", "=q2=Stormreaver Boots", "#s12#, #a1#", "0.11%" }, + { 0, "", "", "" }, + { 30025, "Ability_Hunter_Pet_Scorpid", "=q3=Silver Riding Scorpid", "#e7#", "1%" }, + { 30040, "Ability_Hunter_Pet_Turtle", "=q3=Admiral Grumbleshell", "#e7#", "5%" }, + }; }; diff --git a/Database/TableRegister.lua b/Database/TableRegister.lua index 14ee395..f237b41 100644 --- a/Database/TableRegister.lua +++ b/Database/TableRegister.lua @@ -17,7 +17,7 @@ AtlasLoot_TableNames = { ["BFDLadySarevess"] = { AL["Blackfathom Deeps"].." - "..AL["Lady Sarevess"], "AtlasLootItems" }, ["BFDGelihast"] = { AL["Blackfathom Deeps"].." - "..AL["Gelihast"], "AtlasLootItems" }, ["BFDBaronAquanis"] = { AL["Blackfathom Deeps"].." - "..AL["Baron Aquanis"], "AtlasLootItems" }, - ["BFDVelthelaxx"] = { AL["Blackfathom Deeps"].." - "..AL["Velthelaxx the Defiler"], "AtlasLootItems"}, + ["BFDVelthelaxx"] = { AL["Blackfathom Deeps"].." - "..AL["Velthelaxx the Defiler"], "AtlasLootItems" }, ["BFDTwilightLordKelris"] = { AL["Blackfathom Deeps"].." - "..AL["Twilight Lord Kelris"], "AtlasLootItems" }, ["BFDOldSerrakis"] = { AL["Blackfathom Deeps"].." - "..AL["Old Serra'kis"], "AtlasLootItems" }, ["BFDAkumai"] = { AL["Blackfathom Deeps"].." - "..AL["Aku'mai"], "AtlasLootItems" }, @@ -316,13 +316,13 @@ AtlasLoot_TableNames = { ["SFKWolfMasterNandos"] = { AL["Shadowfang Keep"].." - "..AL["Wolf Master Nandos"], "AtlasLootItems" }, ["SFKArchmageArugal"] = { AL["Shadowfang Keep"].." - "..AL["Archmage Arugal"], "AtlasLootItems" }, ["SFKDeathswornCaptain"] = { AL["Shadowfang Keep"].." - "..AL["Deathsworn Captain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, - ["SFKPrelate"] = { AL["Shadowfang Keep"].." - "..AL["Prelate Ironmane"], "AtlasLootItems"}, + ["SFKPrelate"] = { AL["Shadowfang Keep"].." - "..AL["Prelate Ironmane"], "AtlasLootItems" }, ["SFKTrash"] = { AL["Shadowfang Keep"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --The Stockade ["SWStTargorr"] = { AL["The Stockade"].." - "..AL["Targorr the Dread"], "AtlasLootItems" }, ["SWStKamDeepfury"] = { AL["The Stockade"].." - "..AL["Kam Deepfury"], "AtlasLootItems" }, ["SWStHamhock"] = { AL["The Stockade"].." - "..AL["Hamhock"], "AtlasLootItems" }, - ["SWStDextren"] = { AL["The Stockade"].." - "..AL["Dextren Ward"], "AtlasLootItems"}, + ["SWStDextren"] = { AL["The Stockade"].." - "..AL["Dextren Ward"], "AtlasLootItems" }, ["SWStBazil"] = { AL["The Stockade"].." - "..AL["Bazil Thredd"], "AtlasLootItems" }, ["SWStBruegalIronknuckle"] = { AL["The Stockade"].." - "..AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["SWStTrash"] = { AL["The Stockade"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, @@ -485,7 +485,7 @@ AtlasLoot_TableNames = { ["ZFZerillis"] = { AL["Zul'Farrak"].." - "..AL["Zerillis"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["ZFTrash"] = { AL["Zul'Farrak"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, ["ZFZeljeb"] = { AL["Zul'Farrak"].." - "..AL["Zel'jeb the Ancient"], "AtlasLootItems" }, - ["ZFChampion"] = { AL["Zul'Farrak"].." - "..AL["Champion Razjal the Quick"], "AtlasLootItems"}, + ["ZFChampion"] = { AL["Zul'Farrak"].." - "..AL["Champion Razjal the Quick"], "AtlasLootItems" }, --Zul'Gurub ["ZGJeklik"] = { AL["Zul'Gurub"].." - "..AL["High Priestess Jeklik"], "AtlasLootItems" }, ["ZGVenoxis"] = { AL["Zul'Gurub"].." - "..AL["High Priest Venoxis"], "AtlasLootItems" }, @@ -532,27 +532,31 @@ AtlasLoot_TableNames = { ["UKHMephistroth"] = { AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], "AtlasLootItems" }, ["UKHTrash"] = { AL["Upper Karazhan Halls"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, -- Dragonmaw Retreat - ["DMRGowlfang"] = { AL["Dragonmaw Retreat"].." - "..AL["Gowlfang"], "AtlasLootItems"}, - ["DMRBroodmother"] = { AL["Dragonmaw Retreat"].." - "..AL["Cavernweb Broodmother"], "AtlasLootItems"}, - ["DMRWebMaster"] = { AL["Dragonmaw Retreat"].." - "..AL["Web Master Torkon"], "AtlasLootItems"}, - ["DMRGarlok"] = { AL["Dragonmaw Retreat"].." - "..AL["Garlok Flamekeeper"], "AtlasLootItems"}, - ["DMRHalgan"] = { AL["Dragonmaw Retreat"].." - "..AL["Halgan Redbrand"], "AtlasLootItems"}, - ["DMRElderHollowblood"] = { AL["Dragonmaw Retreat"].." - "..AL["Elder Hollowblood"], "AtlasLootItems"}, - ["DMRSearistrasz"] = { AL["Dragonmaw Retreat"].." - "..AL["Searistrasz"], "AtlasLootItems"}, - ["DMRZuluhed"] = { AL["Dragonmaw Retreat"].." - "..AL["Zuluhed the Whacked"], "AtlasLootItems"}, + ["DMRGowlfang"] = { AL["Dragonmaw Retreat"].." - "..AL["Gowlfang"], "AtlasLootItems" }, + ["DMRBroodmother"] = { AL["Dragonmaw Retreat"].." - "..AL["Cavernweb Broodmother"], "AtlasLootItems" }, + ["DMRWebMaster"] = { AL["Dragonmaw Retreat"].." - "..AL["Web Master Torkon"], "AtlasLootItems" }, + ["DMRGarlok"] = { AL["Dragonmaw Retreat"].." - "..AL["Garlok Flamekeeper"], "AtlasLootItems" }, + ["DMROverlord"] = { AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"], "AtlasLootItems" }, + ["DMRElderHollowblood"] = { AL["Dragonmaw Retreat"].." - "..AL["Elder Hollowblood"], "AtlasLootItems" }, + ["DMRHalgan"] = { AL["Dragonmaw Retreat"].." - "..AL["Halgan Redbrand"], "AtlasLootItems" }, + ["DMRSlagfist"] = { AL["Dragonmaw Retreat"].." - "..AL["Slagfist Destroyer"], "AtlasLootItems" }, + ["DMRSearistrasz"] = { AL["Dragonmaw Retreat"].." - "..AL["Searistrasz"], "AtlasLootItems" }, + ["DMRZuluhed"] = { AL["Dragonmaw Retreat"].." - "..AL["Zuluhed the Whacked"], "AtlasLootItems" }, + ["DMRTrash"] = { AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, -- Stormwrought Ruins - ["SWROronok"] = { AL["Stormwrought Ruins"].." - "..AL["Oronok Torn-Heart"], "AtlasLootItems"}, - ["SWRDagar"] = { AL["Stormwrought Ruins"].." - "..AL["Dagar the Glutton"], "AtlasLootItems"}, - ["SWRDukeBalor"] = { AL["Stormwrought Ruins"].." - "..AL["Duke Balor the IV"], "AtlasLootItems"}, - ["SWRLibrarian"] = { AL["Stormwrought Ruins"].." - "..AL["Librarian Theodorus"], "AtlasLootItems"}, - ["SWRChieftain"] = { AL["Stormwrought Ruins"].." - "..AL["Chieftain Stormsong"], "AtlasLootItems"}, - ["SWRDeathlord"] = { AL["Stormwrought Ruins"].." - "..AL["Deathlord Tidebane"], "AtlasLootItems"}, - ["SWRSubjugator"] = { AL["Stormwrought Ruins"].." - "..AL["Subjugator Halthas Shadecrest"], "AtlasLootItems"}, - ["SWRMycellakos"] = { AL["Stormwrought Ruins"].." - "..AL["Mycellakos"], "AtlasLootItems"}, - ["SWREldermaw"] = { AL["Stormwrought Ruins"].." - "..AL["Eldermaw the Primordial"], "AtlasLootItems"}, - ["SWRLadyDrazare"] = { AL["Stormwrought Ruins"].." - "..AL["Lady Drazare"], "AtlasLootItems"}, - ["SWRMergothid"] = { AL["Stormwrought Ruins"].." - "..AL["Mergothid"], "AtlasLootItems"}, - ["SWRRemains"] = { AL["Stormwrought Ruins"].." - "..AL["Remains of the Innocent"], "AtlasLootItems"}, + ["SWROronok"] = { AL["Stormwrought Ruins"].." - "..AL["Oronok Torn-Heart"], "AtlasLootItems" }, + ["SWRDagar"] = { AL["Stormwrought Ruins"].." - "..AL["Dagar the Glutton"], "AtlasLootItems" }, + ["SWRDukeBalor"] = { AL["Stormwrought Ruins"].." - "..AL["Duke Balor the IV"], "AtlasLootItems" }, + ["SWRLibrarian"] = { AL["Stormwrought Ruins"].." - "..AL["Librarian Theodorus"], "AtlasLootItems" }, + ["SWRChieftain"] = { AL["Stormwrought Ruins"].." - "..AL["Chieftain Stormsong"], "AtlasLootItems" }, + ["SWRDeathlord"] = { AL["Stormwrought Ruins"].." - "..AL["Deathlord Tidebane"], "AtlasLootItems" }, + ["SWRSubjugator"] = { AL["Stormwrought Ruins"].." - "..AL["Subjugator Halthas Shadecrest"], "AtlasLootItems" }, + ["SWRMycellakos"] = { AL["Stormwrought Ruins"].." - "..AL["Mycellakos"], "AtlasLootItems" }, + ["SWREldermaw"] = { AL["Stormwrought Ruins"].." - "..AL["Eldermaw the Primordial"], "AtlasLootItems" }, + ["SWRLadyDrazare"] = { AL["Stormwrought Ruins"].." - "..AL["Lady Drazare"], "AtlasLootItems" }, + ["SWRMergothid"] = { AL["Stormwrought Ruins"].." - "..AL["Mergothid"], "AtlasLootItems" }, + ["SWRRemains"] = { AL["Stormwrought Ruins"].." - "..AL["Remains of the Innocent"], "AtlasLootItems" }, + ["SWRTrash"] = { AL["Stormwrought Ruins"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, ------------ --- Sets --- ------------ @@ -592,7 +596,7 @@ AtlasLoot_TableNames = { ["DivinersGarments"] = { AL["Diviner's Garments"], "AtlasLootCrafting" }, ["PillagersGarb"] = { AL["Pillager's Garb"], "AtlasLootCrafting" }, ["BloodvineG"] = { AL["Bloodvine Garb"], "AtlasLootCrafting" }, - ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting"}, + ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting" }, --Crafted Sets - Leatherworking ["GriftersArmor"] = { AL["Grifter's Armor"], "AtlasLootCrafting" }, ["PrimalistsTrappings"] = { AL["Primalist's Trappings"], "AtlasLootCrafting" }, @@ -1103,7 +1107,7 @@ AtlasLoot_TableNamesBoss = { ["BFDLadySarevess"] = { AL["Lady Sarevess"], "AtlasLootItems" }, ["BFDGelihast"] = { AL["Gelihast"], "AtlasLootItems" }, ["BFDBaronAquanis"] = { AL["Baron Aquanis"], "AtlasLootItems" }, - ["BFDVelthelaxx"] = { AL["Velthelaxx the Defiler"], "AtlasLootItems"}, + ["BFDVelthelaxx"] = { AL["Velthelaxx the Defiler"], "AtlasLootItems" }, ["BFDTwilightLordKelris"] = { AL["Twilight Lord Kelris"], "AtlasLootItems" }, ["BFDOldSerrakis"] = { AL["Old Serra'kis"], "AtlasLootItems" }, ["BFDAkumai"] = { AL["Aku'mai"], "AtlasLootItems" }, @@ -1415,7 +1419,7 @@ AtlasLoot_TableNamesBoss = { ["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" }, ["AQ20ClassBooks"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Class Books"], "AtlasLootItems" }, ["AQ20Enchants"] = { AL["AQ Enchants"], "AtlasLootItems" }, - ["AQ20SET"] = { AL["Ruins of Ahn'Qiraj Sets"], "AtlasLootSetItems"}, + ["AQ20SET"] = { AL["Ruins of Ahn'Qiraj Sets"], "AtlasLootSetItems" }, }, ["Scarlet Monestery - Armory"] = { ["SMHerod"] = { AL["Herod"], "AtlasLootItems" }, @@ -1480,14 +1484,14 @@ AtlasLoot_TableNamesBoss = { ["SFKWolfMasterNandos"] = { AL["Wolf Master Nandos"], "AtlasLootItems" }, ["SFKArchmageArugal"] = { AL["Archmage Arugal"], "AtlasLootItems" }, ["SFKDeathswornCaptain"] = { AL["Deathsworn Captain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, - ["SFKPrelate"] = { AL["Prelate Ironmane"], "AtlasLootItems"}, + ["SFKPrelate"] = { AL["Prelate Ironmane"], "AtlasLootItems" }, ["SFKTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Shadowfang Keep"] .. ")", "AtlasLootItems" }, }, ["The Stockade"] = { ["SWStTargorr"] = { AL["Targorr the Dread"], "AtlasLootItems" }, ["SWStKamDeepfury"] = { AL["Kam Deepfury"], "AtlasLootItems" }, ["SWStHamhock"] = { AL["Hamhock"], "AtlasLootItems" }, - ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"}, + ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems" }, ["SWStBazil"] = { AL["Bazil Thredd"], "AtlasLootItems" }, ["SWStBruegalIronknuckle"] = { AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["SWStTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Stockade"] .. ")", "AtlasLootItems" }, @@ -1619,7 +1623,7 @@ AtlasLoot_TableNamesBoss = { ["ZFZerillis"] = { AL["Zerillis"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["ZFTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Farrak"] .. ")", "AtlasLootItems" }, ["ZFZeljeb"] = { AL["Zel'jeb the Ancient"], "AtlasLootItems" }, - ["ZFChampion"] = { AL["Champion Razjal the Quick"], "AtlasLootItems"}, + ["ZFChampion"] = { AL["Champion Razjal the Quick"], "AtlasLootItems" }, }, ["Zul'Gurub"] = { ["ZGJeklik"] = { AL["High Priestess Jeklik"], "AtlasLootItems" }, @@ -1672,28 +1676,32 @@ AtlasLoot_TableNamesBoss = { ["UKHTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ["Dragonmaw Retreat"] = { - ["DMRGowlfang"] = { AL["Gowlfang"], "AtlasLootItems"}, - ["DMRBroodmother"] = { AL["Cavernweb Broodmother"], "AtlasLootItems"}, - ["DMRWebMaster"] = { AL["Web Master Torkon"], "AtlasLootItems"}, - ["DMRGarlok"] = { AL["Garlok Flamekeeper"], "AtlasLootItems"}, - ["DMRHalgan"] = { AL["Halgan Redbrand"], "AtlasLootItems"}, - ["DMRElderHollowblood"] = { AL["Elder Hollowblood"], "AtlasLootItems"}, - ["DMRSearistrasz"] = { AL["Searistrasz"], "AtlasLootItems"}, - ["DMRZuluhed"] = { AL["Zuluhed the Whacked"], "AtlasLootItems"}, + ["DMRGowlfang"] = { AL["Gowlfang"], "AtlasLootItems" }, + ["DMRBroodmother"] = { AL["Cavernweb Broodmother"], "AtlasLootItems" }, + ["DMRWebMaster"] = { AL["Web Master Torkon"], "AtlasLootItems" }, + ["DMRGarlok"] = { AL["Garlok Flamekeeper"], "AtlasLootItems" }, + ["DMROverlord"] = { AL["Overlord Blackheart"], "AtlasLootItems" }, + ["DMRElderHollowblood"] = { AL["Elder Hollowblood"], "AtlasLootItems" }, + ["DMRHalgan"] = { AL["Halgan Redbrand"], "AtlasLootItems" }, + ["DMRSlagfist"] = { AL["Slagfist Destroyer"], "AtlasLootItems" }, + ["DMRSearistrasz"] = { AL["Searistrasz"], "AtlasLootItems" }, + ["DMRZuluhed"] = { AL["Zuluhed the Whacked"], "AtlasLootItems" }, + ["DMRTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ["Stormwrought Ruins"] = { - ["SWROronok"] = { AL["Oronok Torn-Heart"], "AtlasLootItems"}, - ["SWRDagar"] = { AL["Dagar the Glutton"], "AtlasLootItems"}, - ["SWRDukeBalor"] = { AL["Duke Balor the IV"], "AtlasLootItems"}, - ["SWRLibrarian"] = { AL["Librarian Theodorus"], "AtlasLootItems"}, - ["SWRChieftain"] = { AL["Chieftain Stormsong"], "AtlasLootItems"}, - ["SWRDeathlord"] = { AL["Deathlord Tidebane"], "AtlasLootItems"}, - ["SWRSubjugator"] = { AL["Subjugator Halthas Shadecrest"], "AtlasLootItems"}, - ["SWRMycellakos"] = { AL["Mycellakos"], "AtlasLootItems"}, - ["SWREldermaw"] = { AL["Eldermaw the Primordial"], "AtlasLootItems"}, - ["SWRLadyDrazare"] = { AL["Lady Drazare"], "AtlasLootItems"}, - ["SWRRemains"] = { AL["Remains of the Innocent"], "AtlasLootItems"}, - ["SWRMergothid"] = { AL["Mergothid"], "AtlasLootItems"}, + ["SWROronok"] = { AL["Oronok Torn-Heart"], "AtlasLootItems" }, + ["SWRDagar"] = { AL["Dagar the Glutton"], "AtlasLootItems" }, + ["SWRDukeBalor"] = { AL["Duke Balor the IV"], "AtlasLootItems" }, + ["SWRLibrarian"] = { AL["Librarian Theodorus"], "AtlasLootItems" }, + ["SWRChieftain"] = { AL["Chieftain Stormsong"], "AtlasLootItems" }, + ["SWRDeathlord"] = { AL["Deathlord Tidebane"], "AtlasLootItems" }, + ["SWRSubjugator"] = { AL["Subjugator Halthas Shadecrest"], "AtlasLootItems" }, + ["SWRMycellakos"] = { AL["Mycellakos"], "AtlasLootItems" }, + ["SWREldermaw"] = { AL["Eldermaw the Primordial"], "AtlasLootItems" }, + ["SWRLadyDrazare"] = { AL["Lady Drazare"], "AtlasLootItems" }, + ["SWRRemains"] = { AL["Remains of the Innocent"], "AtlasLootItems" }, + ["SWRMergothid"] = { AL["Mergothid"], "AtlasLootItems" }, + ["SWRTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ------------ --- Sets --- @@ -1741,7 +1749,7 @@ AtlasLoot_TableNamesBoss = { ["DivinersGarments"] = { AL["Diviner's Garments"], "AtlasLootCrafting" }, ["PillagersGarb"] = { AL["Pillager's Garb"], "AtlasLootCrafting" }, ["BloodvineG"] = { AL["Bloodvine Garb"], "AtlasLootCrafting" }, - ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting"}, + ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting" }, }, --Crafted Sets - Leatherworking ["Crafted Sets - Leatherworking"] = { diff --git a/Database/TooltipStrings.lua b/Database/TooltipStrings.lua index d265aec..c8f53cf 100644 --- a/Database/TooltipStrings.lua +++ b/Database/TooltipStrings.lua @@ -6898,6 +6898,16 @@ AtlasLoot_Data["AtlasLootSources"] = { [58046] = AL["Dragonmaw Retreat"].." - "..AL["Halgan Redbrand"].." (25%)", [58047] = AL["Dragonmaw Retreat"].." - "..AL["Halgan Redbrand"].." (25%)", [58045] = AL["Dragonmaw Retreat"].." - "..AL["Halgan Redbrand"].." (25%)", + [41560] = AL["Dragonmaw Retreat"].." - "..AL["Slagfist Destroyer"].." (25%)", + [41719] = AL["Dragonmaw Retreat"].." - "..AL["Slagfist Destroyer"].." (25%)", + [41558] = AL["Dragonmaw Retreat"].." - "..AL["Slagfist Destroyer"].." (25%)", + [41559] = AL["Dragonmaw Retreat"].." - "..AL["Slagfist Destroyer"].." (25%)", + [41726] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (25%)", + [41725] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (25%)", + [41724] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (25%)", + [41727] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (25%)", + [74] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (6%)", + [41841] = AL["Dragonmaw Retreat"].." - "..AL["Overlord Blackheart"].." (100%)", [41721] = AL["Dragonmaw Retreat"].." - "..AL["Elder Hollowblood"].." (25%)", [41722] = AL["Dragonmaw Retreat"].." - "..AL["Elder Hollowblood"].." (25%)", [41720] = AL["Dragonmaw Retreat"].." - "..AL["Elder Hollowblood"].." (25%)", @@ -6918,6 +6928,28 @@ AtlasLoot_Data["AtlasLootSources"] = { [71] = AL["Dragonmaw Retreat"].." - "..AL["Zuluhed the Whacked"].." (4.5%)", [41981] = AL["Dragonmaw Retreat"].." - "..AL["Zuluhed the Whacked"].." (100%)", [41711] = AL["Dragonmaw Retreat"].." - "..AL["Zuluhed the Whacked"].." (100%)", + [58103] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58106] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58107] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58102] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58104] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58108] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58109] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58110] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58105] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [58111] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.11%)", + [58115] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.11%)", + [58114] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.11%)", + [58113] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.11%)", + [70104] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.02%)", + [70153] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.02%)", + [70186] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.02%)", + [30011] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.5%)", + [30012] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [30013] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.05%)", + [30014] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", + [30015] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.5%)", + [30016] = AL["Dragonmaw Retreat"].." - "..AL["Trash Mobs"].." (0.01%)", [58135] = AL["Stormwrought Ruins"].." - "..AL["Oronok Torn-Heart"].." (25%)", [58137] = AL["Stormwrought Ruins"].." - "..AL["Oronok Torn-Heart"].." (25%)", @@ -6984,6 +7016,9 @@ AtlasLoot_Data["AtlasLootSources"] = { [58201] = AL["Stormwrought Ruins"].." - "..AL["Mergothid"].." (20%)", [41939] = AL["Stormwrought Ruins"].." - "..AL["Mergothid"].." (100%)", [58199] = AL["Stormwrought Ruins"].." - "..AL["Mergothid"].." (1%)", + [58131] = AL["Stormwrought Ruins"].." - "..AL["Trash Mobs"].." (0.11%)", + [58178] = AL["Stormwrought Ruins"].." - "..AL["Trash Mobs"].." (0.11%)", + [30025] = AL["Stormwrought Ruins"].." - "..AL["Trash Mobs"].." (1%)", [58123] = AL["Blackfathom Deeps"].." - "..AL["Velthelaxx the Defiler"].." (25%)", [58121] = AL["Blackfathom Deeps"].." - "..AL["Velthelaxx the Defiler"].." (25%)", @@ -7033,4 +7068,5 @@ AtlasLoot_Data["AtlasLootSources"] = { [41989] = AL["Molten Core"].." - "..AL["Sorcerer-Thane Thaurissan"].." (100%)", [37012] = AL["Naxxramas"].." - "..AL["Maexxna"].." (30%)", + [132] = AL["Ruins of Ahn'Qiraj"].." - "..AL["Ossirian the Unscarred"].." (6%)", } diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index fcd0278..41162e6 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1027,6 +1027,7 @@ AL:RegisterTranslations("enUS", function() return { ["Ouro"] = true, ["Ouro's Intact Hide"] = true, ["Outland"] = true, + ["Overlord Blackheart"] = true, ["Overlord Ramtusk"] = true, ["Overlord Wyrmthalak"] = true, ["Overlord's Resolution"] = true, @@ -1288,6 +1289,7 @@ AL:RegisterTranslations("enUS", function() return { ["Skinning Knife"] = true, ["Skul"] = true, ["Skum"] = true, + ["Slagfist Destroyer"] = true, ["Small Rocket Recipes"] = true, ["Smelting"] = true, ["Smokywood Pastures Extra-Special Gift"] = true,