From fd0e7808f139fcbefaf77e87a533133e2631b6c9 Mon Sep 17 00:00:00 2001 From: Spit <19otari98@gmail.com> Date: Sat, 19 Apr 2025 09:03:48 +0300 Subject: [PATCH] 3.1.1 finally dungeon bosses --- AtlasLoot.toc | 2 +- Core/AtlasLoot.lua | 10 ++- Core/ButtonRegistry.lua | 146 ++++++++++++++++++++++++-------- Core/Tooltip.lua | 26 ++---- Instances/instances.en.lua | 128 ++++++++++++---------------- Locale/locale.en.lua | 8 ++ TableRegister/loottables.en.lua | 20 ++++- 7 files changed, 207 insertions(+), 133 deletions(-) diff --git a/AtlasLoot.toc b/AtlasLoot.toc index 1076fc9..8db18ba 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -3,7 +3,7 @@ ## Notes: Shows possible loot from dungeon bosses and other sources. ## Author: Shagu (pfUI update code), Lexie (Turtle WoW fixes/updates), Otari (overhaul/revamp, menu changes, bugfixes/updates) ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons) -## Version: 3.1.0 +## Version: 3.1.1 ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index e064d1f..05e4891 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -2431,11 +2431,13 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Trash Mobs"], "BWLTrashMobs" }, }, ["Deadmines"] = { + { AL["Jared Voss"], "DMJaredVoss" }, { AL["Rhahk'Zor"], "DMRhahkZor" }, { AL["Miner Johnson"].." ("..AL["Rare"]..")", "DMMinerJohnson" }, { AL["Sneed"], "DMSneed" }, { AL["Sneed's Shredder"], "DMSneedsShredder" }, { AL["Gilnid"], "DMGilnid" }, + { AL["Masterpiece Harvester"], "DMHarvester" }, { AL["Mr. Smite"], "DMMrSmite" }, { AL["Cookie"], "DMCookie" }, { AL["Captain Greenskin"], "DMCaptainGreenskin" }, @@ -2493,6 +2495,7 @@ AtlasLoot_HewdropDown_SubTables = { }, ["SMGraveyard"] = { { AL["Interrogator Vishas"], "SMVishas" }, + { AL["Duke Dreadmoore"], "SMDukeDreadmoore" }, { AL["Scorn"].." ("..AL["Scourge Invasion"]..")", "SMScorn" }, { AL["Ironspine"].." ("..AL["Rare"]..")", "SMIronspine" }, { AL["Azshir the Sleepless"].." ("..AL["Rare"]..")", "SMAzshir" }, @@ -2502,11 +2505,13 @@ AtlasLoot_HewdropDown_SubTables = { }, ["SMLibrary"] = { { AL["Houndmaster Loksey"], "SMHoundmasterLoksey" }, + { AL["Brother Wystan"], "SMBrotherWystan" }, { AL["Arcanist Doan"], "SMDoan" }, { AL["Trash Mobs"], "SMLTrash" }, }, ["SMArmory"] = { { AL["Herod"], "SMHerod" }, + { AL["Armory Quartermaster Daghelm"], "SMQuartermaster" }, { AL["Trash Mobs"], "SMATrash" }, }, ["SMCathedral"] = { @@ -2548,6 +2553,7 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Arugal's Voidwalker"], "SFKArugalsVoidwalker" }, { AL["Wolf Master Nandos"], "SFKWolfMasterNandos" }, { AL["Archmage Arugal"], "SFKArchmageArugal" }, + { AL["Prelate Ironmane"], "SFKPrelate"}, { AL["Trash Mobs"], "SFKTrash" }, }, ["TheStockade"] = { @@ -2760,12 +2766,14 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Lord Cobrahn"], "WCLordCobrahn" }, { AL["Lady Anacondra"], "WCLadyAnacondra" }, { AL["Kresh"], "WCKresh" }, + { AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")", "WCDeviateFaerieDragon" }, + { AL["Zandara Windhoof"], "WCZandara" }, { AL["Lord Pythas"], "WCLordPythas" }, { AL["Skum"], "WCSkum" }, + { AL["Vangros"], "WCVangros" }, { AL["Lord Serpentis"], "WCLordSerpentis" }, { AL["Verdan the Everliving"], "WCVerdan" }, { AL["Mutanus the Devourer"], "WCMutanus" }, - { AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")", "WCDeviateFaerieDragon" }, { AL["Trash Mobs"], "WCTrash" }, }, ["ZulFarrak"] = { diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index daf3b32..3198260 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -849,10 +849,19 @@ AtlasLoot_ButtonRegistry = { Back_Page = "DUNGEONSMENU2"; Back_Title = AL["Dungeons & Raids"]; }; + ["DMJaredVoss"] = { + Title = AL["Jared Voss"]; + Next_Page = "DMRhahkZor"; + Next_Title = AL["Rhahk'Zor"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; ["DMRhahkZor"] = { Title = AL["Rhahk'Zor"]; Next_Page = "DMMinerJohnson"; Next_Title = AL["Miner Johnson"].." ("..AL["Rare"]..")"; + Prev_Page = "DMJaredVoss"; + Prev_Title = AL["Jared Voss"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -885,19 +894,28 @@ AtlasLoot_ButtonRegistry = { }; ["DMGilnid"] = { Title = AL["Gilnid"]; - Next_Page = "DMMrSmite"; - Next_Title = AL["Mr. Smite"]; + Next_Page = "DMHarvester"; + Next_Title = AL["Masterpiece Harvester"]; Prev_Page = "DMSneedsShredder"; Prev_Title = AL["Sneed's Shredder"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; + ["DMHarvester"] = { + Title = AL["Masterpiece Harvester"]; + Next_Page = "DMMrSmite"; + Next_Title = AL["Mr. Smite"]; + Prev_Page = "DMGilnid"; + Prev_Title = AL["Gilnid"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; ["DMMrSmite"] = { Title = AL["Mr. Smite"]; Next_Page = "DMCookie"; Next_Title = AL["Cookie"]; - Prev_Page = "DMGilnid"; - Prev_Title = AL["Gilnid"]; + Prev_Page = "DMHarvester"; + Prev_Title = AL["Masterpiece Harvester"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1290,8 +1308,17 @@ AtlasLoot_ButtonRegistry = { }; ["SMVishas"] = { Title = AL["Interrogator Vishas"]; + Next_Page = "SMDukeDreadmoore"; + Next_Title = AL["Duke Dreadmoore"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; + ["SMDukeDreadmoore"] = { + Title = AL["Duke Dreadmoore"]; Next_Page = "SMScorn"; Next_Title = AL["Scorn"].." ("..AL["Scourge Invasion"]..")"; + Prev_Page = "SMVishas"; + Prev_Title = AL["Interrogator Vishas"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1299,8 +1326,8 @@ AtlasLoot_ButtonRegistry = { Title = AL["Scorn"].." ("..AL["Scourge Invasion"]..")"; Next_Page = "SMIronspine"; Next_Title = AL["Ironspine"].." ("..AL["Rare"]..")"; - Prev_Page = "SMVishas"; - Prev_Title = AL["Interrogator Vishas"]; + Prev_Page = "SMDukeDreadmoore"; + Prev_Title = AL["Duke Dreadmoore"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1349,8 +1376,17 @@ AtlasLoot_ButtonRegistry = { }; ["SMHoundmasterLoksey"] = { Title = AL["Houndmaster Loksey"]; + Next_Page = "SMBrotherWystan"; + Next_Title = AL["Brother Wystan"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; + ["SMBrotherWystan"] = { + Title = AL["Brother Wystan"]; Next_Page = "SMDoan"; Next_Title = AL["Arcanist Doan"]; + Prev_Page = "SMHoundmasterLoksey"; + Prev_Title = AL["Houndmaster Loksey"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1358,8 +1394,8 @@ AtlasLoot_ButtonRegistry = { Title = AL["Arcanist Doan"]; Next_Page = "SMLTrash"; Next_Title = AL["Trash Mobs"]; - Prev_Page = "SMHoundmasterLoksey"; - Prev_Title = AL["Houndmaster Loksey"]; + Prev_Page = "SMBrotherWystan"; + Prev_Title = AL["Brother Wystan"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1372,15 +1408,24 @@ AtlasLoot_ButtonRegistry = { }; ["SMHerod"] = { Title = AL["Herod"]; + Next_Page = "SMQuartermaster"; + Next_Title = AL["Armory Quartermaster Daghelm"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; + ["SMQuartermaster"] = { + Title = AL["Armory Quartermaster Daghelm"]; Next_Page = "SMATrash"; Next_Title = AL["Trash Mobs"]; + Prev_Page = "SMHerod"; + Prev_Title = AL["Herod"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; ["SMATrash"] = { Title = AL["Trash Mobs"]; - Prev_Page = "SMHerod"; - Prev_Title = AL["Herod"]; + Prev_Page = "SMQuartermaster"; + Prev_Title = AL["Armory Quartermaster Daghelm"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -1673,17 +1718,26 @@ AtlasLoot_ButtonRegistry = { }; ["SFKArchmageArugal"] = { Title = AL["Archmage Arugal"]; - Next_Page = "SFKTrash"; - Next_Title = AL["Trash Mobs"]; + Next_Page = "SFKPrelate"; + Next_Title = AL["Prelate Ironmane"]; Prev_Page = "SFKWolfMasterNandos"; Prev_Title = AL["Wolf Master Nandos"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; - ["SFKTrash"] = { - Title = AL["Trash Mobs"]; + ["SFKPrelate"] = { Prev_Page = "SFKArchmageArugal"; Prev_Title = AL["Archmage Arugal"]; + Title = AL["Prelate Ironmane"]; + Next_Page = "SFKTrash"; + Next_Title = AL["Trash Mobs"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; + ["SFKTrash"] = { + Title = AL["Trash Mobs"]; + Prev_Page = "SFKPrelate"; + Prev_Title = AL["Prelate Ironmane"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -3190,37 +3244,64 @@ AtlasLoot_ButtonRegistry = { }; ["WCKresh"] = { Title = AL["Kresh"]; - Next_Page = "WCLordPythas"; - Next_Title = AL["Lord Pythas"]; + Next_Page = "WCDeviateFaerieDragon"; + Next_Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; Prev_Page = "WCLadyAnacondra"; Prev_Title = AL["Lady Anacondra"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; - ["WCLordPythas"] = { - Title = AL["Lord Pythas"]; - Next_Page = "WCSkum"; - Next_Title = AL["Skum"]; + ["WCDeviateFaerieDragon"] = { + Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; + Next_Page = "WCZandara"; + Next_Title = AL["Zandara Windhoof"]; Prev_Page = "WCKresh"; Prev_Title = AL["Kresh"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; + ["WCZandara"] = { + Title = AL["Zandara Windhoof"]; + Next_Page = "WCLordPythas"; + Next_Title = AL["Lord Pythas"]; + Prev_Page = "WCDeviateFaerieDragon"; + Prev_Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; + ["WCLordPythas"] = { + Title = AL["Lord Pythas"]; + Next_Page = "WCSkum"; + Next_Title = AL["Skum"]; + Prev_Page = "WCZandara"; + Prev_Title = AL["Zandara Windhoof"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; ["WCSkum"] = { Title = AL["Skum"]; - Next_Page = "WCLordSerpentis"; - Next_Title = AL["Lord Serpentis"]; + Next_Page = "WCVangros"; + Next_Title = AL["Vangros"]; Prev_Page = "WCLordPythas"; Prev_Title = AL["Lord Pythas"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; + ["WCVangros"] = { + Title = AL["Vangros"]; + Next_Page = "WCLordSerpentis"; + Next_Title = AL["Lord Serpentis"]; + Prev_Page = "WCSkum"; + Prev_Title = AL["Skum"]; + Back_Page = "DUNGEONSMENU1"; + Back_Title = AL["Dungeons & Raids"]; + }; ["WCLordSerpentis"] = { Title = AL["Lord Serpentis"]; Next_Page = "WCVerdan"; Next_Title = AL["Verdan the Everliving"]; - Prev_Page = "WCSkum"; - Prev_Title = AL["Skum"]; + Prev_Page = "WCVangros"; + Prev_Title = AL["Vangros"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; @@ -3235,26 +3316,17 @@ AtlasLoot_ButtonRegistry = { }; ["WCMutanus"] = { Title = AL["Mutanus the Devourer"]; - Next_Page = "WCDeviateFaerieDragon"; - Next_Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; + Next_Page = "WCTrash"; + Next_Title = AL["Trash Mobs"]; Prev_Page = "WCVerdan"; Prev_Title = AL["Verdan the Everliving"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; - ["WCDeviateFaerieDragon"] = { - Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; - Next_Page = "WCTrash"; - Next_Title = AL["Trash Mobs"]; - Prev_Page = "WCMutanus"; - Prev_Title = AL["Mutanus the Devourer"]; - Back_Page = "DUNGEONSMENU1"; - Back_Title = AL["Dungeons & Raids"]; - }; ["WCTrash"] = { Title = AL["Trash Mobs"]; - Prev_Page = "WCDeviateFaerieDragon"; - Prev_Title = AL["Deviate Faerie Dragon"].." ("..AL["Rare"]..")"; + Prev_Page = "WCMutanus"; + Prev_Title = AL["Mutanus the Devourer"]; Back_Page = "DUNGEONSMENU1"; Back_Title = AL["Dungeons & Raids"]; }; diff --git a/Core/Tooltip.lua b/Core/Tooltip.lua index 3c77304..7e8447d 100644 --- a/Core/Tooltip.lua +++ b/Core/Tooltip.lua @@ -1,6 +1,7 @@ -- extra info on GameTooltip and ItemRefTooltip local AtlasLootTip = CreateFrame("Frame", "AtlasLootTip", GameTooltip) - +local strfind = string.find +local GetItemInfo = GetItemInfo local GREY = "|cff999999" local lastSearchName = nil @@ -37,8 +38,8 @@ function GameTooltip.SetHyperlink(self, arg1) local _, _, id = string.find(arg1,"item:(%d+)") GameTooltip.itemID = id end + return HookSetHyperlink(self, arg1) end - return HookSetHyperlink(self, arg1) end local HookSetBagItem = GameTooltip.SetBagItem @@ -155,29 +156,18 @@ function AtlasLootTip.extendTooltip(tooltip) if AtlasLootCharDB.ShowSource ~= true or IsShiftKeyDown() then return end - local strfind = string.find - local pairs = pairs local tooltipName = tooltip:GetName() - local originalTooltip = {} local itemName = getglobal(tooltipName .. "TextLeft1"):GetText() local line2 = getglobal(tooltipName .. "TextLeft2") local craftSpell, source, sourceStr, dropRate local isCraft, isWBLoot, isPvP, isRepReward, isSetPiece, isWorldEvent = false, false, false, false, false, false local itemID = tonumber(tooltip.itemID) - if itemName and itemName ~= "Fashion Coin" and itemID then + if itemName and itemID and itemID ~= 51217 then -- 51217 Fashion Coin if itemID ~= lastItemID then - for row = 1, 30 do - local tooltipRowLeft = getglobal(tooltipName .. 'TextLeft' .. row) - if tooltipRowLeft then - local rowtext = tooltipRowLeft:GetText() - if rowtext then - originalTooltip[row] = {} - originalTooltip[row].text = rowtext - end - end - end - for row=1, table.getn(originalTooltip) do - if strfind(originalTooltip[row].text, "—",1,true) then -- skip items that state which rep they require + for row = 1, tooltip:NumLines() do + local rowtext = getglobal(tooltipName.."TextLeft"..row):GetText() + -- skip items that state which rep they require + if strfind(rowtext or "", "—", 1, true) then return end end diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 949e24e..a33fdb6 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -525,15 +525,15 @@ AtlasLootBossButtons = { "SFKBookofUr"; "SFKWolfMasterNandos"; "SFKArchmageArugal"; + "SFKPrelate"; ""; - "";--SFKPrelate "SFKTrash"; }; SMArmory = { "VanillaKeys"; ""; "SMHerod"; - "";--SMQuartermaster + "SMQuartermaster"; ""; "SMATrash"; "SCARLET"; @@ -557,7 +557,7 @@ AtlasLootBossButtons = { "SMIronspine"; "SMAzshir"; "SMFallenChampion"; - "";--SMDukeDreadmoore + "SMDukeDreadmoore"; ""; "SMGTrash"; "SCARLET"; @@ -567,7 +567,7 @@ AtlasLootBossButtons = { "SMHoundmasterLoksey"; "SMDoan"; "SMDoansBox"; - "";--SMBrotherWystan + "SMBrotherWystan"; ""; "SMLTrash"; "SCARLET"; @@ -681,14 +681,14 @@ AtlasLootBossButtons = { TheDeadmines = { ""; ""; - "";--DMJaredVoss + "DMJaredVoss"; "DMRhahkZor"; "DMMinerJohnson"; "DMSneed"; "DMSneedsShredder"; "DMGilnid"; --"DMDefiasGunpowder"; - "";--DMHarvester + "DMHarvester"; "DMMrSmite"; "DMCookie"; "DMCaptainGreenskin"; @@ -855,10 +855,10 @@ AtlasLootBossButtons = { "WCLadyAnacondra"; "WCKresh"; "WCDeviateFaerieDragon"; - "";--WCZandara + "WCZandara"; "WCLordPythas"; "WCSkum"; - "";--WCVangros + "WCVangros"; "WCLordSerpentis"; "WCVerdan"; "WCMutanus"; @@ -3917,14 +3917,11 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 80710, "INV_SHOULDER_18", "=q2=Turtle Scale Shoulderguards", "=ds=#s3#, #a3#", "33%" }, }; - -- WCZandara = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + WCZandara = { + { 55371, "INV_Belt_08", "=q2=Windborne Sash", "=ds=#s10#, #a1#", "50%" }, + { 55369, "INV_Gauntlets_24", "=q3=Kolkar Marauder Gauntlets", "=ds=#s9#, #a3#", "25%" }, + { 55370, "INV_Wand_08", "=q3=Totem of Static Charge", "=ds=#s16#, #e17# =q15=#c7#", "25%" }, + }; WCLordPythas = { { 6472, "INV_Wand_10", "=q3=Stinging Viper", "=ds=#h1#, #w6#", "33%" }, { 6473, "INV_Shirt_16", "=q2=Armor of the Fang", "=ds=#s5#, #a2#", "33%" }, @@ -3937,14 +3934,11 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 80712, "INV_PANTS_08", "=q3=Charged Leggings", "=ds=#s11#, #a1#", "33%" }, }; - -- WCVangros = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + WCVangros = { + { 55374, "INV_Belt_24", "=q2=Enraging Waistwraps", "=ds=#s10#, #a2#", "50%" }, + { 55372, "INV_Misc_Bone_05", "=q3=Band of the Claw", "=ds=#s13#", "25%" }, + { 55373, "INV_Gauntlets_07", "=q3=Idol of the Apex Predator", "=ds=#s16#, #e16# =q13=#c1#", "25%" }, + }; WCLordSerpentis = { { 6469, "INV_Weapon_Bow_10", "=q3=Venomstrike", "=ds=#w2#", "25%" }, { 5970, "INV_Gauntlets_19", "=q2=Serpent Gloves", "=ds=#s9#, #a1#", "25%" }, @@ -4518,14 +4512,11 @@ AtlasLoot_Data["AtlasLootItems"] = { { 60572, "INV_Shoulder_23", "=q3=Incendosaur Skin Pauldrons", "=ds=#s3#, #a2#, From Elites Outside Dungeon", "0.1%" }, { 60612, "INV_Helmet_47", "=q3=Mixologist Goggles", "=ds=#s1#, #a2#", "0.0025%" }, }; - -- DMJaredVoss = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + DMJaredVoss = { + { 55377, "INV_Misc_Cape_09", "=q2=Chemist's Shawl", "=ds=#s4#", "50%" }, + { 55375, "INV_Drink_06", "=q3=Corrosive Vial", "=ds=#s14#", "25%" }, + { 55376, "INV_Weapon_ShortBlade_02", "=q3=Mixologist", "=ds=#h1#, #w4#", "25%" }, + }; DMRhahkZor = { { 872, "INV_ThrowingAxe_01", "=q2=Rockslicer", "=ds=#h2#, #w1#", "5%" }, { 5187, "INV_Hammer_09", "=q1=Rhahk'Zor's Hammer", "=ds=#h2#, #w6#", "95%" }, @@ -4553,14 +4544,11 @@ AtlasLoot_Data["AtlasLootItems"] = { DMDefiasGunpowder = { { 5397, "INV_Misc_Ammo_Gunpowder_01", "=q1=Defias Gunpowder", "=ds=#m8#", "100%" }, }; - -- DMHarvester = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + DMHarvester = { + { 55380, "INV_Pants_06", "=q2=Craftsman's Pants", "=ds=#s11#, #a2#", "50%" }, + { 55378, "INV_Gauntlets_27", "=q3=Inventor's Mitts", "=ds=#s9#, #a1#", "25%" }, + { 55379, "INV_Weapon_Rifle_03", "=q3=Slag Slugger", "=ds=#w5#", "25%" }, + }; DMMrSmite = { { 7230, "INV_Hammer_09", "=q3=Smite's Mighty Hammer", "=ds=#h2#, #w6#", "20%" }, { 5192, "INV_Sword_24", "=q2=Thief's Blade", "=ds=#h1#, #w10#", "30%" }, @@ -5091,14 +5079,12 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "INV_Box_01", "=q6=#cb1#", "" }, { 7146, "INV_Misc_Key_01", "=q2=The Scarlet Key", "=ds=#e14#" }, }; - -- SMBrotherWystan = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + SMBrotherWystan = { + { 55470, "INV_Misc_Book_08", "=q3=Libram of Radiance", "=ds=#s16#, #e18# =q16=#c4#", "25%" }, + { 55471, "spell_holy_fistofjustice", "=q3=Wystan's Steel Fist", "=ds=#h1#, #w13#", "25%" }, + { 55473, "INV_Jewelry_Necklace_02", "=q3=Pendant of Scarlet Rage", "=ds=#s2#", "25%" }, + { 55472, "INV_Pants_06", "=q3=Swiftstrike Kilt", "=ds=#s11#, #a2#", "25%" }, + }; SMHerod = { { 7719, "INV_Helmet_25", "=q3=Raging Berserker's Helm", "=ds=#s1#, #a3#", "25%" }, { 7718, "INV_Shoulder_01", "=q3=Herod's Shoulder", "=ds=#s3#, #a3#", "25%" }, @@ -5107,14 +5093,12 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" }, }; - -- SMQuartermaster = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + SMQuartermaster = { + { 55475, "INV_Bracer_09", "=q3=Cuffs of Evocation", "=ds=#s8#, #a1#", "25%" }, + { 55477, "INV_Jewelry_Ring_13", "=q3=Loop of Focused Magic", "=ds=#s13#", "25%" }, + { 55476, "INV_Boots_05", "=q3=Treads of Renewal", "=ds=#s12#, #a1#", "25%" }, + { 55474, "INV_ThrowingKnife_02", "=q3=Balanced Razor Shivs", "=ds=#w11#", "25%" }, + }; SMFairbanks = { { 19507, "INV_Shoulder_27", "=q2=Inquisitor's Shawl", "=ds=#s3#, #a1#", "33%" }, { 19508, "INV_Bracer_11", "=q2=Branded Leather Bracers", "=ds=#s8#, #a2#", "33%" }, @@ -5146,14 +5130,12 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" }, }; - -- SMDukeDreadmoore = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + SMDukeDreadmoore = { + { 55386, "INV_Belt_26", "=q3=Harbinger Girdle", "=ds=#s10#, #a3#", "25%" }, + { 55387, "INV_Misc_Book_05", "=q3=Introduction to the Dark Arts", "=ds=#s14#", "25%" }, + { 55388, "INV_Jewelry_Ring_27", "=q3=Slain Sentry's Ring", "=ds=#s13#", "25%" }, + { 55389, "INV_Boots_05", "=q3=Ghoulskin Treads", "=ds=#s12#, #a2#", "25%" }, + }; SMIronspine = { { 7688, "INV_Chest_Plate15", "=q3=Ironspine's Ribcage", "=ds=#s5#, #a3#", "33%" }, { 7687, "INV_Hammer_19", "=q3=Ironspine's Fist", "=ds=#h1#, #w6#", "33%" }, @@ -5737,14 +5719,12 @@ AtlasLoot_Data["AtlasLootItems"] = { { 6340, "INV_Misc_Pelt_Wolf_02", "=q2=Fenrus' Hide", "=ds=#s4#", "50%" }, { 3230, "INV_Bracer_07", "=q2=Black Wolf Bracers", "=ds=#s8#, #a2#", "50%" }, }; - -- SFKPrelate = { - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- { 0, "", "", "" }, - -- }; + SFKPrelate = { + { 55382, "inv_helmet_53", "=q3=Mitre of the First Light", "=ds=#s1#, #a1#", "25%" }, + { 55383, "Spell_Holy_GreaterBlessingofSalvation", "=q3=Prelate's Sigil", "=ds=#s15#", "25%" }, + { 55384, "INV_Sword_25", "=q3=Hilt of Radiance", "=ds=#h1#, #w10#", "25%" }, + { 55385, "INV_Jewelry_Ring_22", "=q3=Signet of Faded Sermons", "=ds=#s13#", "25%" }, + }; SFKArugalsVoidwalker = { { 5943, "INV_Bracer_03", "=q2=Rift Bracers", "=ds=#s8#, #a3#", "3%" }, }; @@ -7923,7 +7903,7 @@ AtlasLoot_Data["AtlasLootItems"] = { { 61281, "inv_boots_cloth_09", "=q4=Shadeweave Boots", "=ds=#s12#, #a1#", "20%" }, { 61273, "INV_Belt_26", "=q4=Earthbreaker Belt", "=ds=#s10#, #a3#", "20%" }, { 61249, "INV_Misc_Pelt_Bear_Ruin_03", "=q4=Pelt of the Great Howler", "=ds=#s4#", "20%" }, - { 61293, "INV_QirajIdol_Night", "=q4=Idol of the Moonfang", "=ds=#s16#, #e16#", "20%" }, + { 61293, "INV_QirajIdol_Night", "=q4=Idol of the Moonfang", "=ds=#s16#, #e16# =q13=#c1#", "20%" }, { 61248, "INV_Weapon_Rifle_TWoW_02_Gray", "=q4=Beasthunter's Blunderbuss", "=ds=#w5#", "20%" }, { 0, "", "", "" }, { 0, "", "", "" }, @@ -8077,7 +8057,7 @@ AtlasLoot_Data["AtlasLootItems"] = { { 61238, "INV_Shield_23", "=q4=Scaleshield of Emerald Flight", "=ds=#w8#", "17%" }, { 61448, "INV_Weapon_Halberd_05", "=q4=Axe of Dormant Slumber", "=ds=#h1#, #w1#", "17%" }, { 61208, "INV_Staff_49", "=q4=Staff of the Dreamer", "=ds=#h2#, #w9#", "17%" }, - { 61455, "Spell_Nature_NatureTouchDecay", "=q4=Idol of the Emerald Rot", "=ds=#s16#, #e16#", "17%" }, + { 61455, "Spell_Nature_NatureTouchDecay", "=q4=Idol of the Emerald Rot", "=ds=#s16#, #e16# =q13=#c1#", "17%" }, { 61203, "INV_Relics_LibramofGrace", "=q4=Libram of the Dreamguard", "=ds=#s16#, #e18#", "17%" }, { 61204, "Spell_Nature_StoneSkinTotem", "=q4=Totem of the Stonebreaker", "=ds=#s16#, #e17#", "17%" }, { 61215, "inv_misc_head_dragon_green", "=q4=Head of Solnius", "=ds=#m2#", "100%", "", "", "", "", "", "", "", "", "", "", { diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index c0af020..a1b454f 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1610,5 +1610,13 @@ AL:RegisterTranslations("enUS", function() return { ["Cla'ckora"] = true, ["Hinterlands"] = true, ["Duskwood"] = true, + ["Brother Wystan"] = true, + ["Duke Dreadmoore"] = true, + ["Armory Quartermaster Daghelm"] = true, + ["Jared Voss"] = true, + ["Masterpiece Harvester"] = true, + ["Prelate Ironmane"] = true, + ["Zandara Windhoof"] = true, + ["Vangros"] = true, } end) diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index b96ffad..ddce24f 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -99,6 +99,7 @@ AtlasLoot_TableNames = { ["BWLNefarian"] = { AL["Blackwing Lair"].." - "..AL["Nefarian"], "AtlasLootItems" }, ["BWLTrashMobs"] = { AL["Blackwing Lair"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --The Deadmines + ["DMJaredVoss"] = { AL["The Deadmines"].." - "..AL["Jared Voss"], "AtlasLootItems" }, ["DMMarisaduPaige"] = { AL["The Deadmines"].." - "..AL["Marisa du'Paige"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["DMBrainwashedNoble"] = { AL["The Deadmines"].." - "..AL["Brainwashed Noble"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["DMForemanThistlenettle"] = { AL["The Deadmines"].." - "..AL["Foreman Thistlenettle"], "AtlasLootItems" }, @@ -107,6 +108,7 @@ AtlasLoot_TableNames = { ["DMSneed"] = { AL["The Deadmines"].." - "..AL["Sneed"], "AtlasLootItems" }, ["DMSneedsShredder"] = { AL["The Deadmines"].." - "..AL["Sneed's Shredder"], "AtlasLootItems" }, ["DMGilnid"] = { AL["The Deadmines"].." - "..AL["Gilnid"], "AtlasLootItems" }, + ["DMHarvester"] = { AL["The Deadmines"].." - "..AL["Masterpiece Harvester"], "AtlasLootItems" }, ["DMDefiasGunpowder"] = { AL["The Deadmines"].." - "..AL["Defias Gunpowder"], "AtlasLootItems" }, ["DMMrSmite"] = { AL["The Deadmines"].." - "..AL["Mr. Smite"], "AtlasLootItems" }, ["DMCookie"] = { AL["The Deadmines"].." - "..AL["Cookie"], "AtlasLootItems" }, @@ -253,6 +255,7 @@ AtlasLoot_TableNames = { ["AQ20Enchants"] = { AL["Ruins of Ahn'Qiraj"].." - ".."Enchants", "AtlasLootItems" }, --Scarlet Monestery - Armory ["SMHerod"] = { AL["Scarlet Monastery (Armory)"].." - "..AL["Herod"], "AtlasLootItems" }, + ["SMQuartermaster"] = { AL["Scarlet Monastery (Armory)"].." - "..AL["Armory Quartermaster Daghelm"], "AtlasLootItems" }, ["SMATrash"] = { AL["Scarlet Monastery (Armory)"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Scarlet Monestery - Cathedral ["SMFairbanks"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["High Inquisitor Fairbanks"], "AtlasLootItems" }, @@ -261,6 +264,7 @@ AtlasLoot_TableNames = { ["SMCTrash"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Scarlet Monestery - Graveyard ["SMVishas"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Interrogator Vishas"], "AtlasLootItems" }, + ["SMDukeDreadmoore"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Duke Dreadmoore"], "AtlasLootItems" }, ["SMScorn"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Scorn"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" }, ["SMIronspine"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Ironspine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["SMAzshir"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Azshir the Sleepless"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, @@ -269,6 +273,7 @@ AtlasLoot_TableNames = { ["SMGTrash"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Scarlet Monestery - Library ["SMHoundmasterLoksey"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Houndmaster Loksey"], "AtlasLootItems" }, + ["SMBrotherWystan"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Brother Wystan"], "AtlasLootItems" }, ["SMDoan"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Arcanist Doan"], "AtlasLootItems" }, ["SMDoansBox"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Doan's Strongbox"], "AtlasLootItems" }, ["SMLTrash"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, @@ -306,6 +311,7 @@ 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"}, ["SFKTrash"] = { AL["Shadowfang Keep"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --The Stockade ["SWStTargorr"] = { AL["The Stockade"].." - "..AL["Targorr the Dread"], "AtlasLootItems" }, @@ -450,12 +456,14 @@ AtlasLoot_TableNames = { ["WCLordCobrahn"] = { AL["Wailing Caverns"].." - "..AL["Lord Cobrahn"], "AtlasLootItems" }, ["WCLadyAnacondra"] = { AL["Wailing Caverns"].." - "..AL["Lady Anacondra"], "AtlasLootItems" }, ["WCKresh"] = { AL["Wailing Caverns"].." - "..AL["Kresh"], "AtlasLootItems" }, + ["WCDeviateFaerieDragon"] = { AL["Wailing Caverns"].." - "..AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, + ["WCZandara"] = { AL["Wailing Caverns"].." - "..AL["Zandara Windhoof"], "AtlasLootItems" }, ["WCLordPythas"] = { AL["Wailing Caverns"].." - "..AL["Lord Pythas"], "AtlasLootItems" }, ["WCSkum"] = { AL["Wailing Caverns"].." - "..AL["Skum"], "AtlasLootItems" }, + ["WCVangros"] = { AL["Wailing Caverns"].." - "..AL["Vangros"], "AtlasLootItems" }, ["WCLordSerpentis"] = { AL["Wailing Caverns"].." - "..AL["Lord Serpentis"], "AtlasLootItems" }, ["WCVerdan"] = { AL["Wailing Caverns"].." - "..AL["Verdan the Everliving"], "AtlasLootItems" }, ["WCMutanus"] = { AL["Wailing Caverns"].." - "..AL["Mutanus the Devourer"], "AtlasLootItems" }, - ["WCDeviateFaerieDragon"] = { AL["Wailing Caverns"].." - "..AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["WCTrash"] = { AL["Wailing Caverns"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Zul'Farrak ["ZFAntusul"] = { AL["Zul'Farrak"].." - "..AL["Antu'sul"], "AtlasLootItems" }, @@ -1204,11 +1212,13 @@ AtlasLoot_TableNamesBoss = { ["SWVTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ["The Deadmines"] = { + ["DMJaredVoss"] = { AL["Jared Voss"], "AtlasLootItems" }, ["DMRhahkZor"] = { AL["Rhahk'Zor"], "AtlasLootItems" }, ["DMMinerJohnson"] = { AL["Miner Johnson"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["DMSneed"] = { AL["Sneed"], "AtlasLootItems" }, ["DMSneedsShredder"] = { AL["Sneed's Shredder"], "AtlasLootItems" }, ["DMGilnid"] = { AL["Gilnid"], "AtlasLootItems" }, + ["DMHarvester"] = { AL["Masterpiece Harvester"], "AtlasLootItems" }, ["DMDefiasGunpowder"] = { AL["Defias Gunpowder"], "AtlasLootItems" }, ["DMMrSmite"] = { AL["Mr. Smite"], "AtlasLootItems" }, ["DMCookie"] = { AL["Cookie"], "AtlasLootItems" }, @@ -1373,6 +1383,7 @@ AtlasLoot_TableNamesBoss = { }, ["Scarlet Monestery - Armory"] = { ["SMHerod"] = { AL["Herod"], "AtlasLootItems" }, + ["SMQuartermaster"] = { AL["Armory Quartermaster Daghelm"], "AtlasLootItems" }, ["SMATrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Armory)"] .. ")", "AtlasLootItems" }, }, ["Scarlet Monestery - Cathedral"] = { @@ -1383,6 +1394,7 @@ AtlasLoot_TableNamesBoss = { }, ["Scarlet Monestery - Graveyard"] = { ["SMVishas"] = { AL["Interrogator Vishas"], "AtlasLootItems" }, + ["SMDukeDreadmoore"] = { AL["Duke Dreadmoore"], "AtlasLootItems" }, ["SMScorn"] = { AL["Scorn"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" }, ["SMIronspine"] = { AL["Ironspine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["SMAzshir"] = { AL["Azshir the Sleepless"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, @@ -1392,6 +1404,7 @@ AtlasLoot_TableNamesBoss = { }, ["Scarlet Monestery - Library"] = { ["SMHoundmasterLoksey"] = { AL["Houndmaster Loksey"], "AtlasLootItems" }, + ["SMBrotherWystan"] = { AL["Brother Wystan"], "AtlasLootItems" }, ["SMDoan"] = { AL["Arcanist Doan"], "AtlasLootItems" }, ["SMDoansBox"] = { AL["Doan's Strongbox"], "AtlasLootItems" }, ["SMLTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Library)"] .. ")", "AtlasLootItems" }, @@ -1431,6 +1444,7 @@ 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"}, ["SFKTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Shadowfang Keep"] .. ")", "AtlasLootItems" }, }, ["The Stockade"] = { @@ -1544,12 +1558,14 @@ AtlasLoot_TableNamesBoss = { ["WCLordCobrahn"] = { AL["Lord Cobrahn"], "AtlasLootItems" }, ["WCLadyAnacondra"] = { AL["Lady Anacondra"], "AtlasLootItems" }, ["WCKresh"] = { AL["Kresh"], "AtlasLootItems" }, + ["WCDeviateFaerieDragon"] = { AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, + ["WCZandara"] = { AL["Zandara Windhoof"], "AtlasLootItems" }, ["WCLordPythas"] = { AL["Lord Pythas"], "AtlasLootItems" }, ["WCSkum"] = { AL["Skum"], "AtlasLootItems" }, + ["WCVangros"] = { AL["Vangros"], "AtlasLootItems" }, ["WCLordSerpentis"] = { AL["Lord Serpentis"], "AtlasLootItems" }, ["WCVerdan"] = { AL["Verdan the Everliving"], "AtlasLootItems" }, ["WCMutanus"] = { AL["Mutanus the Devourer"], "AtlasLootItems" }, - ["WCDeviateFaerieDragon"] = { AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["WCTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Wailing Caverns"] .. ")", "AtlasLootItems" }, }, ["Zul'Farrak"] = {