diff --git a/AtlasLoot.toc b/AtlasLoot.toc index 2a7e38e..28dc05b 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.0.6 +## Version: 3.0.7 ## SavedVariables: AtlasLoot_updateavailable ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index a5037a3..fce9a3a 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -127,7 +127,11 @@ function AtlasLootDefaultFrame_OnShow() --Set the item table to the loot table AtlasLoot_SetItemInfoFrame(pFrame); --Show the last displayed loot table - AtlasLoot_ShowBossLoot(AtlasLootCharDB.LastBoss, AtlasLootCharDB.LastBossText, pFrame); + if AtlasLootItemsFrame.refresh then + AtlasLoot_ShowBossLoot(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[3], pFrame) + else + AtlasLoot_ShowBossLoot(AtlasLootCharDB.LastBoss, AtlasLootCharDB.LastBossText, pFrame); + end end --[[ @@ -410,8 +414,11 @@ function AtlasLootDefaultFrame_OnHide() end AtlasLoot_Hewdrop:Close(1); AtlasLoot_HewdropSubMenu:Close(1); + if AtlasLootItemsFrame.refresh then + AtlasLootCharDB.LastBoss = AtlasLootItemsFrame.refresh[1] + AtlasLootCharDB.LastBossText = AtlasLootItemsFrame.refresh[3] + end end - --[[ AtlasLoot_SetupForAtlas: This function sets up the Atlas specific XML objects @@ -1138,9 +1145,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end end --This is a valid QuickLook, so show the UI objects - AtlasLoot_QuickLooks:Show(); - AtlasLootQuickLooksButton:Show(); - AtlasLootServerQueryButton:Hide(); + if dataID ~= "SearchResult" and dataID ~= "WishList" then + AtlasLoot_QuickLooks:Show(); + AtlasLootQuickLooksButton:Show(); + AtlasLootServerQueryButton:Hide(); + end --Insert the item description extra = dataSource[dataID][i][4]; extra = AtlasLoot_FixText(extra); @@ -1177,13 +1186,18 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end else --else show the texture + if strfind(dataSource[dataID][i][2], "^CLASS") then + local class = gsub(dataSource[dataID][i][2], "CLASS", "") + iconFrame:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\"..class) + else iconFrame:SetTexture("Interface\\Icons\\"..dataSource[dataID][i][2]); + end end if iconFrame:GetTexture() == nil then iconFrame:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark"); - itemButton.itemTexture = "Interface\\Icons\\INV_Misc_QuestionMark"; - else - itemButton.itemTexture = iconFrame:GetTexture(); + -- itemButton.itemTexture = "Interface\\Icons\\INV_Misc_QuestionMark"; + -- else + -- itemButton.itemTexture = iconFrame:GetTexture(); end --Set the name and description of the item nameFrame:SetText(text); @@ -1246,7 +1260,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end --Set prices for items, up to 5 different currencies can be used in combination if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][5] then - local wishDataID, wishDataSource = strsplit("|", dataSource[dataID][i][5]) + local wishDataID, wishDataSource = AtlasLoot_Strsplit("|", dataSource[dataID][i][5]) if wishDataSource == "AtlasLootRepItems" then if wishDataID and AtlasLoot_IsLootTableAvailable(wishDataID) then for _, v in ipairs(AtlasLoot_Data[wishDataSource][wishDataID]) do @@ -1311,25 +1325,25 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if itemButton.container then border:Show() end - itemButton.iteminfo = {}; + --itemButton.iteminfo = {}; local spellID if isItem then - itemButton.iteminfo.idcore = dataSource[dataID][i][1]; - _, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][1]); - itemButton.storeID = dataSource[dataID][i][1]; + --itemButton.iteminfo.idcore = dataSource[dataID][i][1]; + --_, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][1]); + --itemButton.storeID = dataSource[dataID][i][1]; itemButton.dressingroomID = dataSource[dataID][i][1]; - itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() + --itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() elseif isEnchant then spellID = tonumber(string.sub(dataSource[dataID][i][1], 2)); - itemButton.iteminfo.idcore = dataSource[dataID][i][2]; - _, _, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][2]); - itemButton.storeID = dataSource[dataID][i][2]; + --itemButton.iteminfo.idcore = dataSource[dataID][i][2]; + --_, _, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][2]); + --itemButton.storeID = dataSource[dataID][i][2]; if GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] and GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= nil and GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= "" then itemButton.dressingroomID = GetSpellInfoAtlasLootDB["enchants"][spellID]["item"]; else itemButton.dressingroomID = spellID; end - itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() + --itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() if GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= nil and GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= "" then if not GetItemInfo(GetSpellInfoAtlasLootDB["enchants"][spellID]["item"]) then GameTooltip:SetHyperlink("item:"..GetSpellInfoAtlasLootDB["enchants"][spellID]["item"]..":0:0:0"); @@ -1337,11 +1351,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end elseif isSpell then spellID = tonumber(string.sub(dataSource[dataID][i][1], 2)); - itemButton.iteminfo.idcore = dataSource[dataID][i][1]; - _, _, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][1]); - itemButton.storeID = dataSource[dataID][i][1]; + --itemButton.iteminfo.idcore = dataSource[dataID][i][1]; + --_, _, _, _, _, _, _, _, itemButton.iteminfo.icontexture = GetItemInfo(dataSource[dataID][i][1]); + --itemButton.storeID = dataSource[dataID][i][1]; itemButton.dressingroomID = GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"]; - itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() + --itemButton.extraText = getglobal("AtlasLootItem_"..i.."_Extra"):GetText() if GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"] ~= "" then if not GetItemInfo(GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"]) then GameTooltip:SetHyperlink("item:"..GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"]..":0:0:0"); @@ -1370,7 +1384,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) local droprate = dataSource[dataID][i][5]; if droprate and string.find(droprate, "%%") then itemButton.droprate = droprate end end - itemButton.i = 1; + --itemButton.i = 1; itemButton:Show(); --If the item is not in cache, querying the server may cause a disconnect --Show a red box around the item to indicate this to the user @@ -1418,8 +1432,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) --Hide navigation buttons if we click Quicklooks in Atlas if AtlasFrame and AtlasFrame:IsVisible() then if this.sourcePage then - local _, dSource = strsplit("|", this.sourcePage) - if dSource == "AtlasLootItems" then + local _, dataSource = AtlasLoot_Strsplit("|", this.sourcePage) + if dataSource == "AtlasLootItems" then AtlasLootItemsFrame_BACK:Hide() AtlasLootItemsFrame_NEXT:Hide() AtlasLootItemsFrame_PREV:Hide() @@ -1442,6 +1456,50 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) else AtlasLootItemsFrame_CloseButton:Hide(); end + local subMenu = nil + local bossName = "" + local category = "" + for k, v in pairs(AtlasLoot_HewdropDown_SubTables) do + if subMenu then + break + end + for i, n in pairs(AtlasLoot_HewdropDown_SubTables[k]) do + if n[2] == dataID then + subMenu = AtlasLoot_HewdropDown_SubTables[k] + bossName = n[1] + -- for k1, v1 in pairs(AtlasLoot_HewdropDown) do + -- for k2, v2 in pairs(AtlasLoot_HewdropDown[k1]) do + -- for k3, v3 in pairs(AtlasLoot_HewdropDown[k1][k2]) do + -- if type(v3[1]) == "string" then + -- if v3[2] == k then + -- category = v3[1] + -- break + -- end + -- elseif type(v3[1] == "table") then + -- for k4, v4 in pairs(v3[1]) do + -- if v4[2] == k then + -- category = v4[1] + -- break + -- end + -- end + -- end + -- end + -- end + -- end + break + end + end + end + if subMenu then + AtlasLoot_HewdropSubMenuRegister(subMenu) + AtlasLootDefaultFrame_SubMenu:Enable() + AtlasLootDefaultFrame_SelectedTable:SetText(bossName) + AtlasLootDefaultFrame_SelectedTable:Show() + else + AtlasLootDefaultFrame_SubMenu:Disable() + AtlasLootDefaultFrame_SelectedTable:Hide() + end + --AtlasLootDefaultFrame_SelectedCategory:SetText(category) --Anchor the item frame where it is supposed to be AtlasLoot_SetItemInfoFrame(pFrame); AtlasLootItemsFrameContainer:Hide() @@ -1691,38 +1749,32 @@ function AtlasLoot_HewdropRegister() ) end -function AtlasLoot_OpenMenu(menu_name) +function AtlasLoot_OpenMenu(menuName) AtlasLoot_QuickLooks:Hide(); AtlasLootQuickLooksButton:Hide(); AtlasLootServerQueryButton:Hide(); - AtlasLootDefaultFrame_SelectedCategory:SetText(menu_name) + AtlasLootDefaultFrame_SelectedCategory:SetText(menuName) AtlasLootDefaultFrame_SubMenu:Disable(); AtlasLootDefaultFrame_SelectedTable:SetText(""); AtlasLootDefaultFrame_SelectedTable:Show(); AtlasLootCharDB.LastBoss = this.lootpage; - AtlasLootCharDB.LastBossText = menu_name; - if menu_name == "Crafting" then + AtlasLootCharDB.LastBossText = menuName; + if menuName == "Crafting" then AtlasLoot_ShowItemsFrame("CRAFTINGMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "PvP Rewards" then + elseif menuName == "PvP Rewards" then AtlasLoot_ShowItemsFrame("PVPMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "World Events" then + elseif menuName == "World Events" then AtlasLoot_ShowItemsFrame("WORLDEVENTMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "Collections" then + elseif menuName == "Collections" then AtlasLoot_ShowItemsFrame("SETMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "Factions" then + elseif menuName == "Factions" then AtlasLoot_ShowItemsFrame("REPMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "World Bosses" then + elseif menuName == "World Bosses" then AtlasLoot_ShowItemsFrame("WORLDBOSSMENU", "dummy", "dummy", pFrame) - CloseDropDownMenus() - elseif menu_name == "Dungeons & Raids" then + elseif menuName == "Dungeons & Raids" then AtlasLoot_ShowItemsFrame("DUNGEONSMENU1", "dummy", "dummy", pFrame) - CloseDropDownMenus() end + CloseDropDownMenus() end --[[ @@ -1793,16 +1845,18 @@ AtlasLoot_NavButton_OnClick: Called when <-, -> or 'Back' are pressed and calls up the appropriate loot page ]] function AtlasLoot_NavButton_OnClick() - if AtlasLootCharDB.LastBoss == "DUNGEONSMENU1" then - AtlasLoot_DungeonsMenu2() - AtlasLootDefaultFrame_SubMenu:Disable(); - return - elseif AtlasLootCharDB.LastBoss == "DUNGEONSMENU2" then - AtlasLoot_DungeonsMenu1() - AtlasLootDefaultFrame_SubMenu:Disable(); - return - end - if AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[2] and AtlasLootItemsFrame.refresh[4] then + if AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[1] and AtlasLootItemsFrame.refresh[2] and AtlasLootItemsFrame.refresh[4] then + if AtlasLootItemsFrame.refresh[1] == "DUNGEONSMENU1" then + AtlasLootItemsFrame.refresh[1] = "DUNGEONSMENU2" + AtlasLoot_DungeonsMenu2() + AtlasLootDefaultFrame_SubMenu:Disable(); + return + elseif AtlasLootItemsFrame.refresh[1] == "DUNGEONSMENU2" then + AtlasLootItemsFrame.refresh[1] = "DUNGEONSMENU1" + AtlasLoot_DungeonsMenu1() + AtlasLootDefaultFrame_SubMenu:Disable(); + return + end if string.sub(this.lootpage, 1, 16) == "SearchResultPage" then AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]); elseif string.sub(this.lootpage, 1, 12) == "WishListPage" then @@ -2107,7 +2161,7 @@ function AtlasLootMinimapButton_SetPosition(v) AtlasLootMinimapButton_UpdatePosition(); end -function strsplit(delim, str, maxNb, onlyLast) +function AtlasLoot_Strsplit(delim, str, maxNb, onlyLast) -- Eliminate bad cases... if string.find(str, delim) == nil then return { str } @@ -2139,171 +2193,166 @@ end --This is a multi-layer table defining the main loot listing. --Entries have the text to display, loot table or sub table to link to and if the link is to a loot table or sub table AtlasLoot_HewdropDown = { - [1] = { - [AL["Dungeons & Raids"]] = { - [1] = {{ AL["[13-18] Ragefire Chasm"], "RagefireChasm", "Submenu" },}, - [2] = {{ AL["[17-24] Wailing Caverns"], "WailingCaverns", "Submenu" },}, - [3] = {{ AL["[17-24] The Deadmines"], "Deadmines", "Submenu" },}, - [4] = {{ AL["[22-30] Shadowfang Keep"], "ShadowfangKeep", "Submenu" },}, - [5] = {{ AL["[23-32] Blackfathom Deeps"], "BlackfathomDeeps", "Submenu" },}, - [6] = {{ AL["[22-30] The Stockade"], "TheStockade", "Submenu" },}, - [7] = {{ AL["[29-38] Gnomeregan"], "Gnomeregan", "Submenu" },}, - [8] = {{ AL["[29-38] Razorfen Kraul"], "RazorfenKraul", "Submenu" },}, - [9] = {{ AL["[32-38] The Crescent Grove"], "TheCrescentGrove", "Submenu" },}, - [10] = {[AL["[27-45] Scarlet Monastery"]] = { + {[AL["Dungeons & Raids"]] = { + {{ AL["[13-18] Ragefire Chasm"], "RagefireChasm", "Submenu" },}, + {{ AL["[17-24] Wailing Caverns"], "WailingCaverns", "Submenu" },}, + {{ AL["[17-24] The Deadmines"], "Deadmines", "Submenu" },}, + {{ AL["[22-30] Shadowfang Keep"], "ShadowfangKeep", "Submenu" },}, + {{ AL["[23-32] Blackfathom Deeps"], "BlackfathomDeeps", "Submenu" },}, + {{ AL["[22-30] The Stockade"], "TheStockade", "Submenu" },}, + {{ AL["[29-38] Gnomeregan"], "Gnomeregan", "Submenu" },}, + {{ AL["[29-38] Razorfen Kraul"], "RazorfenKraul", "Submenu" },}, + {{ AL["[32-38] The Crescent Grove"], "TheCrescentGrove", "Submenu" },}, + {[ AL["[27-45] Scarlet Monastery"]] = { { AL["[27-36] Scarlet Monastery (Graveyard)"], "SMGraveyard", "Submenu" }, { AL["[28-39] Scarlet Monastery (Library)"], "SMLibrary", "Submenu" }, { AL["[32-41] Scarlet Monastery (Armory)"], "SMArmory", "Submenu" }, { AL["[35-45] Scarlet Monastery (Cathedral)"], "SMCathedral", "Submenu" }, },}, - [11] = {{ AL["[36-46] Razorfen Downs"], "RazorfenDowns", "Submenu" },}, - [12] = {{ AL["[40-51] Uldaman"], "Uldaman", "Submenu" },}, - [13] = {{ AL["[42-50] Gilneas City"], "GilneasCity", "Submenu" },}, - [14] = {{ AL["[45-55] Maraudon"], "Maraudon", "Submenu" },}, - [15] = {{ AL["[44-54] Zul'Farrak"], "ZulFarrak", "Submenu" },}, - [16] = {{ AL["[50-60] The Sunken Temple"], "SunkenTemple", "Submenu" },}, - [17] = {{ AL["[50-60] Hateforge Quarry"], "HateforgeQuarry", "Submenu" },}, - [18] = {{ AL["[52-60] Blackrock Depths"], "BlackrockDepths", "Submenu" },}, - [19] = {[AL["[55-60] Dire Maul"]] = { + {{ AL["[36-46] Razorfen Downs"], "RazorfenDowns", "Submenu" },}, + {{ AL["[40-51] Uldaman"], "Uldaman", "Submenu" },}, + {{ AL["[42-50] Gilneas City"], "GilneasCity", "Submenu" },}, + {{ AL["[45-55] Maraudon"], "Maraudon", "Submenu" },}, + {{ AL["[44-54] Zul'Farrak"], "ZulFarrak", "Submenu" },}, + {{ AL["[50-60] The Sunken Temple"], "SunkenTemple", "Submenu" },}, + {{ AL["[50-60] Hateforge Quarry"], "HateforgeQuarry", "Submenu" },}, + {{ AL["[52-60] Blackrock Depths"], "BlackrockDepths", "Submenu" },}, + {[AL["[55-60] Dire Maul"]] = { { AL["[55-60] Dire Maul (East)"], "DireMaulEast", "Submenu" }, { AL["[57-60] Dire Maul (West)"], "DireMaulWest", "Submenu" }, { AL["[57-60] Dire Maul (North)"], "DireMaulNorth", "Submenu" }, },}, - [20] = {{ AL["[58-60] Scholomance"], "Scholomance", "Submenu" },}, - [21] = {{ AL["[58-60] Stratholme"], "Stratholme", "Submenu" },}, - [22] = {{ AL["[55-60] Lower Blackrock Spire"], "LowerBlackrock", "Submenu" },}, - [23] = {{ AL["[58-60] Upper Blackrock Spire"], "UpperBlackrock", "Submenu" },}, - [24] = {{ AL["[58-60] Karazhan Crypt"], "KarazhanCrypt", "Submenu" },}, - [25] = {{ AL["[60] Caverns of Time: Black Morass"], "CavernsOfTimeBlackMorass", "Submenu" },}, - [26] = {{ AL["[60] Stormwind Vault"], "StormwindVault", "Submenu" },}, - [27] = {{ AL["[RAID] Zul'Gurub"], "ZulGurub", "Submenu" },}, - [28] = {{ AL["[RAID] Ruins of Ahn'Qiraj"], "RuinsofAQ", "Submenu" },}, - [29] = {{ AL["[RAID] Molten Core"], "MoltenCore", "Submenu" },}, - [30] = {{ AL["[RAID] Onyxia's Lair"], "Onyxia", "Submenu" },}, - [31] = {{ AL["[RAID] Lower Karazhan Halls"], "LowerKara", "Submenu" },}, - [32] = {{ AL["[RAID] Blackwing Lair"], "BlackwingLair", "Submenu" },}, - [33] = {{ AL["[RAID] Emerald Sanctum"], "EmeraldSanctum", "Submenu" },}, - [34] = {{ AL["[RAID] Temple of Ahn'Qiraj"], "TempleofAQ", "Submenu" },}, - [35] = {{ AL["[RAID] Naxxramas"], "Naxxramas", "Submenu" },}, + {{ AL["[58-60] Scholomance"], "Scholomance", "Submenu" },}, + {{ AL["[58-60] Stratholme"], "Stratholme", "Submenu" },}, + {{ AL["[55-60] Lower Blackrock Spire"], "LowerBlackrock", "Submenu" },}, + {{ AL["[58-60] Upper Blackrock Spire"], "UpperBlackrock", "Submenu" },}, + {{ AL["[58-60] Karazhan Crypt"], "KarazhanCrypt", "Submenu" },}, + {{ AL["[60] Caverns of Time: Black Morass"], "CavernsOfTimeBlackMorass", "Submenu" },}, + {{ AL["[60] Stormwind Vault"], "StormwindVault", "Submenu" },}, + {{ AL["[RAID] Zul'Gurub"], "ZulGurub", "Submenu" },}, + {{ AL["[RAID] Ruins of Ahn'Qiraj"], "RuinsofAQ", "Submenu" },}, + {{ AL["[RAID] Molten Core"], "MoltenCore", "Submenu" },}, + {{ AL["[RAID] Onyxia's Lair"], "Onyxia", "Submenu" },}, + {{ AL["[RAID] Lower Karazhan Halls"], "LowerKara", "Submenu" },}, + {{ AL["[RAID] Blackwing Lair"], "BlackwingLair", "Submenu" },}, + {{ AL["[RAID] Emerald Sanctum"], "EmeraldSanctum", "Submenu" },}, + {{ AL["[RAID] Temple of Ahn'Qiraj"], "TempleofAQ", "Submenu" },}, + {{ AL["[RAID] Naxxramas"], "Naxxramas", "Submenu" },}, }, }, - [2] = { [AL["World Bosses"]] = { - [1] = {{AL["Azuregos"], "AAzuregos", "Table" },}, - [2] = {{AL["Emeriss"], "DEmeriss", "Table" },}, - [3] = {{AL["Lethon"], "DLethon", "Table" },}, - [4] = {{AL["Taerar"], "DTaerar", "Table" },}, - [5] = {{AL["Ysondre"], "DYsondre", "Table" },}, - [6] = {{AL["Lord Kazzak"], "KKazzak", "Table" },}, - [7] = {{AL["Nerubian Overseer"], "Nerubian", "Table" },}, - [8] = {{AL["Dark Reaver of Karazhan"], "Reaver", "Table" },}, - [9] = {{AL["Ostarius"], "Ostarius", "Table" },}, - [10] = {{AL["Concavius"], "Concavius", "Table" },}, - [11] = {{AL["Moo"], "CowKing", "Table" },}, - [12] = {{"Cla'ckora", "Clackora", "Table"},}, + {[AL["World Bosses"]] = { + {{AL["Azuregos"], "AAzuregos", "Table" },}, + {{AL["Emeriss"], "DEmeriss", "Table" },}, + {{AL["Lethon"], "DLethon", "Table" },}, + {{AL["Taerar"], "DTaerar", "Table" },}, + {{AL["Ysondre"], "DYsondre", "Table" },}, + {{AL["Lord Kazzak"], "KKazzak", "Table" },}, + {{AL["Nerubian Overseer"], "Nerubian", "Table" },}, + {{AL["Dark Reaver of Karazhan"], "Reaver", "Table" },}, + {{AL["Ostarius"], "Ostarius", "Table" },}, + {{AL["Concavius"], "Concavius", "Table" },}, + {{AL["Moo"], "CowKing", "Table" },}, + {{AL["Cla'ckora"], "Clackora", "Table"},}, }, }, - - [3] = {[AL["PvP Rewards"]] = { - [1] = {{ AL["PvP Armor Sets"], "PVPSET", "Table" },}, - [2] = {{ AL["PvP Accessories"], "PvP60Accessories1", "Table" },}, - [3] = {{ AL["Rank 14 Weapons"], "PVPWeapons1", "Table" },}, - [4] = {{ AL["PvP Mounts"], "PvPMountsPvP", "Table" },}, - [5] = {{ AL["Blood Ring"], "BRRepMenu", "Table" },}, - [6] = {{ AL["Alterac Valley"], "AVRepMenu", "Table" },}, - [7] = {{ AL["Arathi Basin"], "ABRepMenu", "Table" },}, - [8] = {{ AL["Warsong Gulch"], "WSGRepMenu", "Table" },}, + {[AL["PvP Rewards"]] = { + {{ AL["PvP Armor Sets"], "PVPSET", "Table" },}, + {{ AL["PvP Accessories"], "PvP60Accessories1", "Table" },}, + {{ AL["Rank 14 Weapons"], "PVPWeapons1", "Table" },}, + {{ AL["PvP Mounts"], "PvPMountsPvP", "Table" },}, + {{ AL["Blood Ring"], "BRRepMenu", "Table" },}, + {{ AL["Alterac Valley"], "AVRepMenu", "Table" },}, + {{ AL["Arathi Basin"], "ABRepMenu", "Table" },}, + {{ AL["Warsong Gulch"], "WSGRepMenu", "Table" },}, }, }, - [4] = {[AL["Collections"]] = { - [1] = {{ AL["Sets"], "PRE60SET", "Table" },}, - [2] = {{ AL["Zul'Gurub Sets"], "ZGSET", "Table" },}, - [3] = {{ AL["Ruins of Ahn'Qiraj Sets"], "AQ20SET", "Table" },}, - [4] = {{ AL["Temple of Ahn'Qiraj Sets"], "AQ40SET", "Table" },}, - [5] = {{ AL["Karazhan Sets"], "KARASET", "Table" },}, - [6] = {{ AL["Dungeon 1/2 Sets"], "T0SET", "Table" },}, - [7] = {{ AL["Tier 1 Sets"], "T1SET", "Table" },}, - [8] = {{ AL["Tier 2 Sets"], "T2SET", "Table" },}, - [9] = {{ AL["Tier 3 Sets"], "T3SET", "Table" },}, - [10] = {{ AL["Legendary Items"], "Legendaries", "Table" },}, - [11] = {{ AL["World Epics"], "WORLDEPICS", "Table" },}, - [12] = {{ AL["Rare Pets"], "RarePets1", "Table" },}, - [13] = {{ AL["Rare Mounts"], "RareMounts", "Table" },}, - [14] = {{ AL["Fashion"], "DonationRewards2", "Table" },}, - [15] = {{ AL["Tabards"], "Tabards", "Table" },}, + {[AL["Collections"]] = { + {{ AL["Sets"], "PRE60SET", "Table" },}, + {{ AL["Zul'Gurub Sets"], "ZGSET", "Table" },}, + {{ AL["Ruins of Ahn'Qiraj Sets"], "AQ20SET", "Table" },}, + {{ AL["Temple of Ahn'Qiraj Sets"], "AQ40SET", "Table" },}, + {{ AL["Karazhan Sets"], "KARASET", "Table" },}, + {{ AL["Dungeon 1/2 Sets"], "T0SET", "Table" },}, + {{ AL["Tier 1 Sets"], "T1SET", "Table" },}, + {{ AL["Tier 2 Sets"], "T2SET", "Table" },}, + {{ AL["Tier 3 Sets"], "T3SET", "Table" },}, + {{ AL["Legendary Items"], "Legendaries", "Table" },}, + {{ AL["World Epics"], "WORLDEPICS", "Table" },}, + {{ AL["Rare Pets"], "RarePets1", "Table" },}, + {{ AL["Rare Mounts"], "RareMounts", "Table" },}, + {{ AL["Fashion"], "DonationRewards2", "Table" },}, + {{ AL["Tabards"], "Tabards", "Table" },}, --[15] = {{ AL["Old Mounts"], "OldMounts", "Table" },}, --[16] = {{ AL["Unobtainable Mounts"], "UnobMounts", "Table" },}, }, }, - [5] = { - [AL["Factions"]] = { - [1] = {{ AL["Argent Dawn"], "Argent1" , "Table" },}, - [2] = {{ AL["Bloodsail Buccaneers"], "Bloodsail1", "Table" },}, - [3] = {{ AL["Brood of Nozdormu"], "AQBroodRings", "Table" },}, - [4] = {{ AL["Cenarion Circle"], "Cenarion1", "Table" }}, - [5] = {{ AL["Dalaran"], "Dalaran", "Table" },}, - [6] = {{ AL["Darkmoon Faire"], "Darkmoon", "Table" },}, - [7] = {{ AL["Darkspear Trolls"], "DarkspearTrolls", "Table" },}, - [8] = {{ AL["Darnassus"], "Darnassus", "Table" },}, - [9] = {{ AL["Durotar Labor Union"], "DurotarLaborUnion", "Table" },}, - [10] = {{ AL["Frostwolf Clan"], "Frostwolf1", "Table" },}, - [11] = {{ AL["Gelkis Clan Centaur"], "GelkisClan1", "Table" },}, - [12] = {{ AL["Gnomeregan Exiles"], "GnomereganExiles", "Table" },}, - [13] = {{ AL["Hydraxian Waterlords"], "WaterLords1", "Table" },}, - [14] = {{ AL["Ironforge"], "Ironforge", "Table" },}, - [15] = {{ AL["Magram Clan Centaur"], "MagramClan1", "Table" },}, - [16] = {{ AL["Orgrimmar"], "Orgrimmar", "Table" },}, - [17] = {{ AL["Revantusk Trolls"], "Revantusk", "Table" },}, - [18] = {{ AL["Silvermoon Remnant"], "Helf", "Table" },}, - [19] = {{ AL["Stormpike Guard"], "Stormpike1", "Table" },}, - [20] = {{ AL["Stormwind"], "Stormwind", "Table" },}, - [21] = {{ AL["Thorium Brotherhood"], "Thorium1", "Table" },}, - [22] = {{ AL["Thunder Bluff"], "ThunderBluff", "Table" },}, - [23] = {{ AL["Timbermaw Hold"], "Timbermaw", "Table" },}, - [24] = {{ AL["Undercity"], "Undercity", "Table" },}, - [25] = {{ AL["Wardens of Time"], "Wardens1", "Table" },}, - [26] = {{ AL["Wildhammer Clan"], "Wildhammer", "Table" },}, - [27] = {{ AL["Wintersaber Trainers"], "Wintersaber1", "Table" },}, - [28] = {{ AL["Zandalar Tribe"], "Zandalar1", "Table" },}, + {[AL["Factions"]] = { + {{ AL["Argent Dawn"], "Argent1" , "Table" },}, + {{ AL["Bloodsail Buccaneers"], "Bloodsail1", "Table" },}, + {{ AL["Brood of Nozdormu"], "AQBroodRings", "Table" },}, + {{ AL["Cenarion Circle"], "Cenarion1", "Table" }}, + {{ AL["Dalaran"], "Dalaran", "Table" },}, + {{ AL["Darkmoon Faire"], "Darkmoon", "Table" },}, + {{ AL["Darkspear Trolls"], "DarkspearTrolls", "Table" },}, + {{ AL["Darnassus"], "Darnassus", "Table" },}, + {{ AL["Durotar Labor Union"], "DurotarLaborUnion", "Table" },}, + {{ AL["Frostwolf Clan"], "Frostwolf1", "Table" },}, + {{ AL["Gelkis Clan Centaur"], "GelkisClan1", "Table" },}, + {{ AL["Gnomeregan Exiles"], "GnomereganExiles", "Table" },}, + {{ AL["Hydraxian Waterlords"], "WaterLords1", "Table" },}, + {{ AL["Ironforge"], "Ironforge", "Table" },}, + {{ AL["Magram Clan Centaur"], "MagramClan1", "Table" },}, + {{ AL["Orgrimmar"], "Orgrimmar", "Table" },}, + {{ AL["Revantusk Trolls"], "Revantusk", "Table" },}, + {{ AL["Silvermoon Remnant"], "Helf", "Table" },}, + {{ AL["Stormpike Guard"], "Stormpike1", "Table" },}, + {{ AL["Stormwind"], "Stormwind", "Table" },}, + {{ AL["Thorium Brotherhood"], "Thorium1", "Table" },}, + {{ AL["Thunder Bluff"], "ThunderBluff", "Table" },}, + {{ AL["Timbermaw Hold"], "Timbermaw", "Table" },}, + {{ AL["Undercity"], "Undercity", "Table" },}, + {{ AL["Wardens of Time"], "Wardens1", "Table" },}, + {{ AL["Wildhammer Clan"], "Wildhammer", "Table" },}, + {{ AL["Wintersaber Trainers"], "Wintersaber1", "Table" },}, + {{ AL["Zandalar Tribe"], "Zandalar1", "Table" },}, }, }, - - [6] = {[AL["World Events"]] = { - [1] = {{ AL["Abyssal Council"], "AbyssalTemplars", "Table" },}, - [2] = {{ AL["Children's Week"], "ChildrensWeek", "Table" },}, - [3] = {{ AL["Elemental Invasion"], "ElementalInvasion", "Table" },}, - [4] = {{ AL["Feast of Winter Veil"], "Winterviel1", "Table" },}, - [5] = {{ AL["Gurubashi Arena"], "GurubashiArena", "Table" },}, - [6] = {{ AL["Hallow's End"], "Halloween1", "Table" },}, - [7] = {{ AL["Harvest Festival"], "HarvestFestival", "Table" },}, - [8] = {{ AL["Love is in the Air"], "Valentineday", "Table" },}, - [9] = {{ AL["Lunar Festival"], "LunarFestival1", "Table" },}, - [10] = {{ AL["Midsummer Fire Festival"], "MidsummerFestival", "Table" },}, - [11] = {{ AL["Noblegarden"], "Noblegarden", "Table" },}, - [12] = {{ AL["Scourge Invasion"], "ScourgeInvasionEvent1", "Table" },}, - [13] = {{ AL["Stranglethorn Fishing Extravaganza"], "FishingExtravaganza", "Table" },}, + {[AL["World Events"]] = { + {{ AL["Abyssal Council"], "AbyssalTemplars", "Table" },}, + {{ AL["Children's Week"], "ChildrensWeek", "Table" },}, + {{ AL["Elemental Invasion"], "ElementalInvasion", "Table" },}, + {{ AL["Feast of Winter Veil"], "Winterviel1", "Table" },}, + {{ AL["Gurubashi Arena"], "GurubashiArena", "Table" },}, + {{ AL["Hallow's End"], "Halloween1", "Table" },}, + {{ AL["Harvest Festival"], "HarvestFestival", "Table" },}, + {{ AL["Love is in the Air"], "Valentineday", "Table" },}, + {{ AL["Lunar Festival"], "LunarFestival1", "Table" },}, + {{ AL["Midsummer Fire Festival"], "MidsummerFestival", "Table" },}, + {{ AL["Noblegarden"], "Noblegarden", "Table" },}, + {{ AL["Scourge Invasion"], "ScourgeInvasionEvent1", "Table" },}, + {{ AL["Stranglethorn Fishing Extravaganza"], "FishingExtravaganza", "Table" },}, }, }, - [7] = { - [AL["Crafting"]] = { - [1] = { { AL["Alchemy"], "ALCHEMYMENU", "Table" }, }, - [2] = { { (AL["Blacksmithing"]), "SMITHINGMENU", "Table" }, }, - [3] = { { (AL["Enchanting"]), "ENCHANTINGMENU", "Table" }, }, - [4] = { { (AL["Engineering"]), "ENGINEERINGMENU", "Table" }, }, - [5] = { { (AL["Herbalism"]), "Herbalism1", "Table" }, }, - [6] = { { (AL["Leatherworking"]), "LEATHERWORKINGMENU", "Table" }, }, - [7] = { { (AL["Jewelcrafting"]), "JEWELCRAFTMENU", "Table" }, }, - [8] = { { (AL["Mining"]), "Mining1", "Table" }, }, - [9] = { { (AL["Tailoring"]), "TAILORINGMENU", "Table" }, }, - [10] = { { (AL["Cooking"]), "COOKINGMENU", "Table" }, }, - [11] = { { (AL["First Aid"]), "FirstAid1", "Table" }, }, - [12] = { { (AL["Survival"]), "Survival1", "Table" }, }, - [13] = { { (AL["Gardening"]), "Survival2", "Table" }, }, - [14] = { { (AL["Poisons"]), "Poisons1", "Table" }, }, - [15] = { { AL["Crafted Sets"], "CRAFTSET", "Table" },}, - [16] = { { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, }, + {[AL["Crafting"]] = { + { { AL["Alchemy"], "ALCHEMYMENU", "Table" }, }, + { { (AL["Blacksmithing"]), "SMITHINGMENU", "Table" }, }, + { { (AL["Enchanting"]), "ENCHANTINGMENU", "Table" }, }, + { { (AL["Engineering"]), "ENGINEERINGMENU", "Table" }, }, + { { (AL["Herbalism"]), "Herbalism1", "Table" }, }, + { { (AL["Leatherworking"]), "LEATHERWORKINGMENU", "Table" }, }, + { { (AL["Jewelcrafting"]), "JEWELCRAFTMENU", "Table" }, }, + { { (AL["Mining"]), "Mining1", "Table" }, }, + { { (AL["Tailoring"]), "TAILORINGMENU", "Table" }, }, + { { (AL["Cooking"]), "COOKINGMENU", "Table" }, }, + { { (AL["First Aid"]), "FirstAid1", "Table" }, }, + { { (AL["Survival"]), "Survival1", "Table" }, }, + { { (AL["Gardening"]), "Survival2", "Table" }, }, + { { (AL["Poisons"]), "Poisons1", "Table" }, }, + { { AL["Crafted Sets"], "CRAFTSET", "Table" },}, + { { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, }, }, }, - [8] = {{ "Rare Spawns", "RareSpawns", "Submenu" },}, + {{ "Rare Spawns", "RareSpawns", "Submenu" },}, }; --This table defines all the subtables needed for the full menu @@ -2799,7 +2848,7 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Ostarius"], "Ostarius" }, { AL["Concavius"], "Concavius" }, { AL["Moo"], "CowKing" }, - { "Cla'ckora", "Clackora" }, + { AL["Cla'ckora"], "Clackora" }, }, ["RareSpawns"] = { { "|cffffffff[17]|cffffd200 Earthcaller Rezengal |cffffffff(Stonetalon)", "EarthcallerRezengal" }, @@ -2840,292 +2889,291 @@ AtlasLoot_HewdropDown_SubTables = { { "|cffffffff[??]|cffffd200 Widow of the Woods |cffffffff(Gilneas)", "WidowoftheWoods" }, { "|cffffffff[??]|cffffd200 M-0L1Y |cffffffff(???)", "M0L1Y" }, }, - ["AbyssalCouncil"] = { - { AL["Abyssal Council"].." - "..AL["Templars"], "AbyssalTemplars" }, - { AL["Abyssal Council"].." - "..AL["Dukes"], "AbyssalDukes" }, - { AL["Abyssal Council"].." - "..AL["High Council"], "AbyssalLords" }, - }, - ["Winterviel"] = { - { AL["Feast of Winter Veil"], "Winterviel1"}, - { AL["Feast of Winter Veil"], "Winterviel2"}, - }, - ["Factions"] = { - { AL["Argent Dawn"], "Argent1" }, - { AL["Bloodsail Buccaneers"], "Bloodsail1" }, - { AL["Brood of Nozdormu"], "AQBroodRings" }, - { AL["Cenarion Circle"], "Cenarion1" }, - { AL["Dalaran"], "Dalaran" }, - { AL["Darkmoon Faire"], "Darkmoon" }, - { AL["Darkspear Trolls"], "DarkspearTrolls" }, - { AL["Darnassus"], "Darnassus" }, - { AL["Durotar Labor Union"], "DurotarLaborUnion" }, - { AL["Frostwolf Clan"], "Frostwolf1" }, - { AL["Gelkis Clan Centaur"], "GelkisClan1" }, - { AL["Gnomeregan Exiles"], "GnomereganExiles" }, - { AL["Hydraxian Waterlords"], "WaterLords1" }, - { AL["Ironforge"], "Ironforge" }, - { AL["Magram Clan Centaur"], "MagramClan1" }, - { AL["Orgrimmar"], "Orgrimmar" }, - { AL["Revantusk Trolls"], "Revantusk" }, - { AL["Silvermoon Remnant"], "Helf" }, - { AL["Stormpike Guard"], "Stormpike1" }, - { AL["Stormwind"], "Stormwind" }, - { AL["Thorium Brotherhood"], "Thorium1" }, - { AL["Thunder Bluff"], "ThunderBluff" }, - { AL["Timbermaw Hold"], "Timbermaw" }, - { AL["Undercity"], "Undercity" }, - { AL["Wardens of Time"], "Wardens1" }, - { AL["Wildhammer Clan"], "Wildhammer" }, - { AL["Wintersaber Trainers"], "Wintersaber1" }, - { AL["Zandalar Tribe"], "Zandalar1" }, - }, - ["BoEWorldEpics"] = { - { AtlasLoot_TableNames["WorldEpics3"][1], "WorldEpics3" }, - { AtlasLoot_TableNames["WorldEpics2"][1], "WorldEpics2" }, - { AtlasLoot_TableNames["WorldEpics1"][1], "WorldEpics1" }, - }, - ["CraftSetBlacksmith"] = { - { AL["Steel Plate"], "SteelPlate" }, - { AL["Imperial Plate"], "ImperialPlate" }, - { AL["The Darksoul"], "TheDarksoul" }, - { AL["Bloodsoul Embrace"], "BloodsoulEmbrace" }, - }, - ["CraftSetLeatherwork"] = { - { AL["Grifter's Armor"], "GriftersArmor" }, - { AL["Primalist's Trappings"], "PrimalistsTrappings" }, - { AL["Volcanic Armor"], "VolcanicArmor" }, - { AL["Ironfeather Armor"], "IronfeatherArmor" }, - { AL["Stormshroud Armor"], "StormshroudArmor" }, - { AL["Devilsaur Armor"], "DevilsaurArmor" }, - { AL["Blood Tiger Harness"], "BloodTigerH" }, - { AL["Primal Batskin"], "PrimalBatskin" }, - { AL["Red Dragon Mail"], "RedDragonM" }, - { AL["Green Dragon Mail"], "GreenDragonM" }, - { AL["Blue Dragon Mail"], "BlueDragonM" }, - { AL["Black Dragon Mail"], "BlackDragonM" }, - }, - ["CraftSetTailoring"] = { - { AL["Augerer's Attire"], "AugerersAttire" }, - { AL["Shadoweave"], "ShadoweaveSet" }, - { AL["Diviner's Garments"], "DivinersGarments" }, - { AL["Pillager's Garb"], "PillagersGarb" }, - { AL["Bloodvine Garb"], "BloodvineG" }, - }, - ["DungeonSets12"] = { - { "|cffffffff"..AL["Priest"], "T0Priest" }, - { "|cff68ccef"..AL["Mage"], "T0Mage" }, - { "|cff9382c9"..AL["Warlock"], "T0Warlock" }, - { "|cfffff468"..AL["Rogue"], "T0Rogue" }, - { "|cffff7c0a"..AL["Druid"], "T0Druid" }, - { "|cffaad372"..AL["Hunter"], "T0Hunter" }, - { "|cff2773ff"..AL["Shaman"], "T0Shaman" }, - { "|cfff48cba"..AL["Paladin"], "T0Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "T0Warrior" }, - }, - ["AQ20Sets"] = { - { "|cffffffff"..AL["Priest"], "AQ20Priest" }, - { "|cff68ccef"..AL["Mage"], "AQ20Mage" }, - { "|cff9382c9"..AL["Warlock"], "AQ20Warlock" }, - { "|cfffff468"..AL["Rogue"], "AQ20Rogue" }, - { "|cffff7c0a"..AL["Druid"], "AQ20Druid" }, - { "|cffaad372"..AL["Hunter"], "AQ20Hunter" }, - { "|cff2773ff"..AL["Shaman"], "AQ20Shaman" }, - { "|cfff48cba"..AL["Paladin"], "AQ20Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "AQ20Warrior" }, - }, - ["AQ40Sets"] = { - { "|cffffffff"..AL["Priest"], "AQ40Priest" }, - { "|cff68ccef"..AL["Mage"], "AQ40Mage" }, - { "|cff9382c9"..AL["Warlock"], "AQ40Warlock" }, - { "|cfffff468"..AL["Rogue"], "AQ40Rogue" }, - { "|cffff7c0a"..AL["Druid"], "AQ40Druid" }, - { "|cffaad372"..AL["Hunter"], "AQ40Hunter" }, - { "|cff2773ff"..AL["Shaman"], "AQ40Shaman" }, - { "|cfff48cba"..AL["Paladin"], "AQ40Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "AQ40Warrior" }, - }, - ["T1Sets"] = { - { "|cffffffff"..AL["Priest"], "T1Priest" }, - { "|cff68ccef"..AL["Mage"], "T1Mage" }, - { "|cff9382c9"..AL["Warlock"], "T1Warlock" }, - { "|cfffff468"..AL["Rogue"], "T1Rogue" }, - { "|cffff7c0a"..AL["Druid"], "T1Druid" }, - { "|cffaad372"..AL["Hunter"], "T1Hunter" }, - { "|cff2773ff"..AL["Shaman"], "T1Shaman" }, - { "|cfff48cba"..AL["Paladin"], "T1Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "T1Warrior" }, - }, - ["T2Sets"] = { - { "|cffffffff"..AL["Priest"], "T2Priest" }, - { "|cff68ccef"..AL["Mage"], "T2Mage" }, - { "|cff9382c9"..AL["Warlock"], "T2Warlock" }, - { "|cfffff468"..AL["Rogue"], "T2Rogue" }, - { "|cffff7c0a"..AL["Druid"], "T2Druid" }, - { "|cffaad372"..AL["Hunter"], "T2Hunter" }, - { "|cff2773ff"..AL["Shaman"], "T2Shaman" }, - { "|cfff48cba"..AL["Paladin"], "T2Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "T2Warrior" }, - }, - ["T3Sets"] = { - { "|cffffffff"..AL["Priest"], "T3Priest" }, - { "|cff68ccef"..AL["Mage"], "T3Mage" }, - { "|cff9382c9"..AL["Warlock"], "T3Warlock" }, - { "|cfffff468"..AL["Rogue"], "T3Rogue" }, - { "|cffff7c0a"..AL["Druid"], "T3Druid" }, - { "|cffaad372"..AL["Hunter"], "T3Hunter" }, - { "|cff2773ff"..AL["Shaman"], "T3Shaman" }, - { "|cfff48cba"..AL["Paladin"], "T3Paladin" }, - { "|cffc69b6d"..AL["Warrior"], "T3Warrior" }, - }, - ["ZGSets"] = { - { "|cffffffff"..AL["Priest"], "ZGPriest" }, - { "|cff68ccef"..AL["Mage"], "ZGMage" }, - { "|cff9382c9"..AL["Warlock"], "ZGWarlock" }, - { "|cfffff468"..AL["Rogue"], "ZGRogue" }, - { "|cffff7c0a"..AL["Druid"], "ZGDruid" }, - { "|cffaad372"..AL["Hunter"], "ZGHunter" }, - { "|cff2773ff"..AL["Shaman"], "ZGShaman" }, - { "|cfff48cba"..AL["Paladin"], "ZGPaladin" }, - { "|cffc69b6d"..AL["Warrior"], "ZGWarrior" }, - { AL["Zul'Gurub Rings"], "ZGRings" }, - { AL["The Twin Blades of Hakkari"], "HakkariBlades" }, - { AL["Zul'Gurub Rings"], "ZGRings" }, - }, - ["Pre60Sets"] = { - { AL["Bloodmail Regalia"], "ScholoMail" }, - { AL["Cadaverous Garb"], "ScholoLeather" }, - { AL["Chain of the Scarlet Crusade"], "SCARLET" }, - { AL["Dal'Rend's Arms"], "DalRend" }, - { AL["Deathbone Guardian"], "ScholoPlate" }, - { AL["Defias Leather"], "DEADMINES" }, - { AL["Embrace of the Viper"], "WAILING" }, - { AL["Ironweave Battlesuit"], "IRONWEAVE" }, - { AL["Necropile Raiment"], "ScholoCloth" }, - { AL["Primal Blessing"], "PrimalBlessing" }, - { AL["Scourge Invasion"], "ScourgeInvasion" }, - { AL["Shard of the Gods"], "ShardOfGods" }, - { AL["Spider's Kiss"], "SpiderKiss" }, - { AL["Spirit of Eskhandar"], "SpiritofEskhandar" }, - { AL["The Gladiator"], "BLACKROCKD" }, - { AL["The Postmaster"], "STRAT" }, - - }, - ["BRRewards"] = { - { AL["Friendly Reputation Rewards"], "BRRepFriendly" }, - { AL["Honored Reputation Rewards"], "BRRepHonored" }, - { AL["Revered Reputation Rewards"], "BRRepRevered" }, - { AL["Exalted Reputation Rewards"], "BRRepExalted" }, - { AL["Token of Blood Rewards"], "BRRepTokens" }, - }, - ["AVRewards"] = { - { AL["Friendly Reputation Rewards"], "AVRepFriendly" }, - { AL["Honored Reputation Rewards"], "AVRepHonored" }, - { AL["Revered Reputation Rewards"], "AVRepRevered" }, - { AL["Exalted Reputation Rewards"], "AVRepExalted" }, - { AL["Exalted Reputation Rewards"], "AVRepExalted" }, - { AL["Korrak the Bloodrager"], "AVKorrak" }, - { AL["Ivus & Lokholar"], "AVLokholarIvus" }, - }, - ["ABRewards"] = { - { "Arathi Basin Menu", "ABRepMenu" }, - { AL["Friendly Reputation Rewards"], "ABRepFriendly" }, - { AL["Honored Reputation Rewards"], "ABRepHonored5059" }, - { AL["Revered Reputation Rewards"], "ABRepRevered5059" }, - { AL["Exalted Reputation Rewards"], "ABRepExalted" }, - }, - ["PvPArmorSets"] = { - { AL["Priest"], "PVPPriest" }, - { AL["Mage"], "PVPMage" }, - { AL["Warlock"], "PVPWarlock" }, - { AL["Rogue"], "PVPRogue" }, - { AL["Druid"], "PVPDruid" }, - { AL["Hunter"], "PVPHunter" }, - { AL["Shaman"], "PVPShaman" }, - { AL["Paladin"], "PVPPaladin" }, - { AL["Warrior"], "PVPWarrior" }, - }, - ["WSGRewards"] = { - { "Warsong Gulch Menu", "WSGRepMenu" }, - { AL["Friendly Reputation Rewards"], "WSGRepFriendly" }, - { AL["Honored Reputation Rewards"], "WSGRepHonored5059" }, - { AL["Revered Reputation Rewards"], "WSGRepRevered5059" }, - { AL["Exalted Reputation Rewards"], "WSGRepExalted60" }, - }, - ["Alchemy"] = { - { AtlasLoot_TableNames["AlchemyApprentice1"][1], "AlchemyApprentice1" }, - { AtlasLoot_TableNames["AlchemyJourneyman1"][1], "AlchemyJourneyman1" }, - { AtlasLoot_TableNames["AlchemyExpert1"][1], "AlchemyExpert1" }, - { AtlasLoot_TableNames["AlchemyArtisan1"][1], "AlchemyArtisan1" }, - { AtlasLoot_TableNames["AlchemyHealingAndMana1"][1], "AlchemyHealingAndMana1" }, - { AtlasLoot_TableNames["AlchemyFlasks1"][1], "AlchemyFlasks1" }, - { AtlasLoot_TableNames["AlchemyTransmutes1"][1], "AlchemyTransmutes1" }, - { AtlasLoot_TableNames["AlchemyDefensive1"][1], "AlchemyDefensive1" }, - { AtlasLoot_TableNames["AlchemyOffensive1"][1], "AlchemyOffensive1" }, - { AtlasLoot_TableNames["AlchemyOther1"][1], "AlchemyOther1" }, - }, - ["Blacksmithing"] = { - { AtlasLoot_TableNames["SmithingApprentice1"][1], "SmithingApprentice1" }, - { AtlasLoot_TableNames["SmithingJourneyman1"][1], "SmithingJourneyman1" }, - { AtlasLoot_TableNames["SmithingExpert1"][1], "SmithingExpert1" }, - { AtlasLoot_TableNames["SmithingArtisan1"][1], "SmithingArtisan1" }, - { AtlasLoot_TableNames["Armorsmith1"][1], "Armorsmith1" }, - { AtlasLoot_TableNames["Weaponsmith1"][1], "Weaponsmith1" }, - { AtlasLoot_TableNames["Axesmith1"][1], "Axesmith1" }, - { AtlasLoot_TableNames["Hammersmith1"][1], "Hammersmith1" }, - { AtlasLoot_TableNames["Swordsmith1"][1], "Swordsmith1" }, - }, - ["Cooking"] = { - { AtlasLoot_TableNames["CookingApprentice1"][1], "CookingApprentice1" }, - { AtlasLoot_TableNames["CookingJourneyman1"][1], "CookingJourneyman1" }, - { AtlasLoot_TableNames["CookingExpert1"][1], "CookingExpert1" }, - { AtlasLoot_TableNames["CookingArtisan1"][1], "CookingArtisan1" }, - }, - ["Enchanting"] = { - { AtlasLoot_TableNames["EnchantingApprentice1"][1], "EnchantingApprentice1" }, - { AtlasLoot_TableNames["EnchantingJourneyman1"][1], "EnchantingJourneyman1" }, - { AtlasLoot_TableNames["EnchantingExpert1"][1], "EnchantingExpert1" }, - { AtlasLoot_TableNames["EnchantingArtisan1"][1], "EnchantingArtisan1" }, - { AtlasLoot_TableNames["EnchantingCloak1"][1], "EnchantingCloak1" }, - { AtlasLoot_TableNames["EnchantingChest1"][1], "EnchantingChest1" }, - { AtlasLoot_TableNames["EnchantingBracer1"][1], "EnchantingBracer1" }, - { AtlasLoot_TableNames["EnchantingGlove1"][1], "EnchantingGlove1" }, - { AtlasLoot_TableNames["EnchantingBoots1"][1], "EnchantingBoots1" }, - { AtlasLoot_TableNames["Enchanting2HWeapon1"][1], "Enchanting2HWeapon1" }, - { AtlasLoot_TableNames["EnchantingWeapon1"][1], "EnchantingWeapon1" }, - { AtlasLoot_TableNames["EnchantingShield1"][1], "EnchantingShield1" }, - { AtlasLoot_TableNames["EnchantingMisc1"][1], "EnchantingMisc1" }, - }, - ["Engineering"] = { - { AtlasLoot_TableNames["EngineeringApprentice1"][1], "EngineeringApprentice1" }, - { AtlasLoot_TableNames["EngineeringJourneyman1"][1], "EngineeringJourneyman1" }, - { AtlasLoot_TableNames["EngineeringExpert1"][1], "EngineeringExpert1" }, - { AtlasLoot_TableNames["EngineeringArtisan1"][1], "EngineeringArtisan1" }, - { AtlasLoot_TableNames["Gnomish1"][1], "Gnomish1" }, - { AtlasLoot_TableNames["Goblin1"][1], "Goblin1" }, - }, - ["Leatherworking"] = { - { AtlasLoot_TableNames["LeatherApprentice1"][1], "LeatherApprentice1" }, - { AtlasLoot_TableNames["LeatherJourneyman1"][1], "LeatherJourneyman1" }, - { AtlasLoot_TableNames["LeatherExpert1"][1], "LeatherExpert1" }, - { AtlasLoot_TableNames["LeatherArtisan1"][1], "LeatherArtisan1" }, - { AtlasLoot_TableNames["Dragonscale1"][1], "Dragonscale1" }, - { AtlasLoot_TableNames["Elemental1"][1], "Elemental1" }, - { AtlasLoot_TableNames["Tribal1"][1], "Tribal1" }, - }, - ["Mining"] = { - { AL["Mining"], "Mining1" }, - { AL["Smelting"], "Smelting1" }, - }, - ["Tailoring"] = { - { AtlasLoot_TableNames["TailoringApprentice1"][1], "TailoringApprentice1" }, - { AtlasLoot_TableNames["TailoringJourneyman1"][1], "TailoringJourneyman1" }, - { AtlasLoot_TableNames["TailoringExpert1"][1], "TailoringExpert1" }, - { AtlasLoot_TableNames["TailoringArtisan1"][1], "TailoringArtisan1" }, - }, - ["Survival"] = { - { AtlasLoot_TableNames["Survival1"][1], "Survival1" }, - { AtlasLoot_TableNames["Survival2"][1], "Survival2" }, - }, + -- ["AbyssalCouncil"] = { + -- { AL["Abyssal Council"].." - "..AL["Templars"], "AbyssalTemplars" }, + -- { AL["Abyssal Council"].." - "..AL["Dukes"], "AbyssalDukes" }, + -- { AL["Abyssal Council"].." - "..AL["High Council"], "AbyssalLords" }, + -- }, + -- ["Winterviel"] = { + -- { AL["Feast of Winter Veil"], "Winterviel1"}, + -- { AL["Feast of Winter Veil"], "Winterviel2"}, + -- }, + -- ["Factions"] = { + -- { AL["Argent Dawn"], "Argent1" }, + -- { AL["Bloodsail Buccaneers"], "Bloodsail1" }, + -- { AL["Brood of Nozdormu"], "AQBroodRings" }, + -- { AL["Cenarion Circle"], "Cenarion1" }, + -- { AL["Dalaran"], "Dalaran" }, + -- { AL["Darkmoon Faire"], "Darkmoon" }, + -- { AL["Darkspear Trolls"], "DarkspearTrolls" }, + -- { AL["Darnassus"], "Darnassus" }, + -- { AL["Durotar Labor Union"], "DurotarLaborUnion" }, + -- { AL["Frostwolf Clan"], "Frostwolf1" }, + -- { AL["Gelkis Clan Centaur"], "GelkisClan1" }, + -- { AL["Gnomeregan Exiles"], "GnomereganExiles" }, + -- { AL["Hydraxian Waterlords"], "WaterLords1" }, + -- { AL["Ironforge"], "Ironforge" }, + -- { AL["Magram Clan Centaur"], "MagramClan1" }, + -- { AL["Orgrimmar"], "Orgrimmar" }, + -- { AL["Revantusk Trolls"], "Revantusk" }, + -- { AL["Silvermoon Remnant"], "Helf" }, + -- { AL["Stormpike Guard"], "Stormpike1" }, + -- { AL["Stormwind"], "Stormwind" }, + -- { AL["Thorium Brotherhood"], "Thorium1" }, + -- { AL["Thunder Bluff"], "ThunderBluff" }, + -- { AL["Timbermaw Hold"], "Timbermaw" }, + -- { AL["Undercity"], "Undercity" }, + -- { AL["Wardens of Time"], "Wardens1" }, + -- { AL["Wildhammer Clan"], "Wildhammer" }, + -- { AL["Wintersaber Trainers"], "Wintersaber1" }, + -- { AL["Zandalar Tribe"], "Zandalar1" }, + -- }, + -- ["BoEWorldEpics"] = { + -- { AtlasLoot_TableNames["WorldEpics3"][1], "WorldEpics3" }, + -- { AtlasLoot_TableNames["WorldEpics2"][1], "WorldEpics2" }, + -- { AtlasLoot_TableNames["WorldEpics1"][1], "WorldEpics1" }, + -- }, + -- ["CraftSetBlacksmith"] = { + -- { AL["Steel Plate"], "SteelPlate" }, + -- { AL["Imperial Plate"], "ImperialPlate" }, + -- { AL["The Darksoul"], "TheDarksoul" }, + -- { AL["Bloodsoul Embrace"], "BloodsoulEmbrace" }, + -- }, + -- ["CraftSetLeatherwork"] = { + -- { AL["Grifter's Armor"], "GriftersArmor" }, + -- { AL["Primalist's Trappings"], "PrimalistsTrappings" }, + -- { AL["Volcanic Armor"], "VolcanicArmor" }, + -- { AL["Ironfeather Armor"], "IronfeatherArmor" }, + -- { AL["Stormshroud Armor"], "StormshroudArmor" }, + -- { AL["Devilsaur Armor"], "DevilsaurArmor" }, + -- { AL["Blood Tiger Harness"], "BloodTigerH" }, + -- { AL["Primal Batskin"], "PrimalBatskin" }, + -- { AL["Red Dragon Mail"], "RedDragonM" }, + -- { AL["Green Dragon Mail"], "GreenDragonM" }, + -- { AL["Blue Dragon Mail"], "BlueDragonM" }, + -- { AL["Black Dragon Mail"], "BlackDragonM" }, + -- }, + -- ["CraftSetTailoring"] = { + -- { AL["Augerer's Attire"], "AugerersAttire" }, + -- { AL["Shadoweave"], "ShadoweaveSet" }, + -- { AL["Diviner's Garments"], "DivinersGarments" }, + -- { AL["Pillager's Garb"], "PillagersGarb" }, + -- { AL["Bloodvine Garb"], "BloodvineG" }, + -- }, + -- ["DungeonSets12"] = { + -- { "|cffffffff"..AL["Priest"], "T0Priest" }, + -- { "|cff68ccef"..AL["Mage"], "T0Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "T0Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "T0Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "T0Druid" }, + -- { "|cffaad372"..AL["Hunter"], "T0Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "T0Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "T0Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "T0Warrior" }, + -- }, + -- ["AQ20Sets"] = { + -- { "|cffffffff"..AL["Priest"], "AQ20Priest" }, + -- { "|cff68ccef"..AL["Mage"], "AQ20Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "AQ20Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "AQ20Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "AQ20Druid" }, + -- { "|cffaad372"..AL["Hunter"], "AQ20Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "AQ20Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "AQ20Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "AQ20Warrior" }, + -- }, + -- ["AQ40Sets"] = { + -- { "|cffffffff"..AL["Priest"], "AQ40Priest" }, + -- { "|cff68ccef"..AL["Mage"], "AQ40Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "AQ40Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "AQ40Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "AQ40Druid" }, + -- { "|cffaad372"..AL["Hunter"], "AQ40Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "AQ40Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "AQ40Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "AQ40Warrior" }, + -- }, + -- ["T1Sets"] = { + -- { "|cffffffff"..AL["Priest"], "T1Priest" }, + -- { "|cff68ccef"..AL["Mage"], "T1Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "T1Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "T1Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "T1Druid" }, + -- { "|cffaad372"..AL["Hunter"], "T1Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "T1Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "T1Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "T1Warrior" }, + -- }, + -- ["T2Sets"] = { + -- { "|cffffffff"..AL["Priest"], "T2Priest" }, + -- { "|cff68ccef"..AL["Mage"], "T2Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "T2Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "T2Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "T2Druid" }, + -- { "|cffaad372"..AL["Hunter"], "T2Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "T2Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "T2Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "T2Warrior" }, + -- }, + -- ["T3Sets"] = { + -- { "|cffffffff"..AL["Priest"], "T3Priest" }, + -- { "|cff68ccef"..AL["Mage"], "T3Mage" }, + -- { "|cff9382c9"..AL["Warlock"], "T3Warlock" }, + -- { "|cfffff468"..AL["Rogue"], "T3Rogue" }, + -- { "|cffff7c0a"..AL["Druid"], "T3Druid" }, + -- { "|cffaad372"..AL["Hunter"], "T3Hunter" }, + -- { "|cff2773ff"..AL["Shaman"], "T3Shaman" }, + -- { "|cfff48cba"..AL["Paladin"], "T3Paladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "T3Warrior" }, + -- }, + -- ["ZGSets"] = { + -- { "|cffffffff"..AL["Priest"], "ZGPriest" }, + -- { "|cff68ccef"..AL["Mage"], "ZGMage" }, + -- { "|cff9382c9"..AL["Warlock"], "ZGWarlock" }, + -- { "|cfffff468"..AL["Rogue"], "ZGRogue" }, + -- { "|cffff7c0a"..AL["Druid"], "ZGDruid" }, + -- { "|cffaad372"..AL["Hunter"], "ZGHunter" }, + -- { "|cff2773ff"..AL["Shaman"], "ZGShaman" }, + -- { "|cfff48cba"..AL["Paladin"], "ZGPaladin" }, + -- { "|cffc69b6d"..AL["Warrior"], "ZGWarrior" }, + -- { AL["Zul'Gurub Rings"], "ZGRings" }, + -- { AL["The Twin Blades of Hakkari"], "HakkariBlades" }, + -- { AL["Zul'Gurub Rings"], "ZGRings" }, + -- }, + -- ["Pre60Sets"] = { + -- { AL["Bloodmail Regalia"], "ScholoMail" }, + -- { AL["Cadaverous Garb"], "ScholoLeather" }, + -- { AL["Chain of the Scarlet Crusade"], "SCARLET" }, + -- { AL["Dal'Rend's Arms"], "DalRend" }, + -- { AL["Deathbone Guardian"], "ScholoPlate" }, + -- { AL["Defias Leather"], "DEADMINES" }, + -- { AL["Embrace of the Viper"], "WAILING" }, + -- { AL["Ironweave Battlesuit"], "IRONWEAVE" }, + -- { AL["Necropile Raiment"], "ScholoCloth" }, + -- { AL["Primal Blessing"], "PrimalBlessing" }, + -- { AL["Scourge Invasion"], "ScourgeInvasion" }, + -- { AL["Shard of the Gods"], "ShardOfGods" }, + -- { AL["Spider's Kiss"], "SpiderKiss" }, + -- { AL["Spirit of Eskhandar"], "SpiritofEskhandar" }, + -- { AL["The Gladiator"], "BLACKROCKD" }, + -- { AL["The Postmaster"], "STRAT" }, + -- }, + -- ["BRRewards"] = { + -- { AL["Friendly Reputation Rewards"], "BRRepFriendly" }, + -- { AL["Honored Reputation Rewards"], "BRRepHonored" }, + -- { AL["Revered Reputation Rewards"], "BRRepRevered" }, + -- { AL["Exalted Reputation Rewards"], "BRRepExalted" }, + -- { AL["Token of Blood Rewards"], "BRRepTokens" }, + -- }, + -- ["AVRewards"] = { + -- { AL["Friendly Reputation Rewards"], "AVRepFriendly" }, + -- { AL["Honored Reputation Rewards"], "AVRepHonored" }, + -- { AL["Revered Reputation Rewards"], "AVRepRevered" }, + -- { AL["Exalted Reputation Rewards"], "AVRepExalted" }, + -- { AL["Exalted Reputation Rewards"], "AVRepExalted" }, + -- { AL["Korrak the Bloodrager"], "AVKorrak" }, + -- { AL["Ivus & Lokholar"], "AVLokholarIvus" }, + -- }, + -- ["ABRewards"] = { + -- { "Arathi Basin Menu", "ABRepMenu" }, + -- { AL["Friendly Reputation Rewards"], "ABRepFriendly" }, + -- { AL["Honored Reputation Rewards"], "ABRepHonored5059" }, + -- { AL["Revered Reputation Rewards"], "ABRepRevered5059" }, + -- { AL["Exalted Reputation Rewards"], "ABRepExalted" }, + -- }, + -- ["PvPArmorSets"] = { + -- { AL["Priest"], "PVPPriest" }, + -- { AL["Mage"], "PVPMage" }, + -- { AL["Warlock"], "PVPWarlock" }, + -- { AL["Rogue"], "PVPRogue" }, + -- { AL["Druid"], "PVPDruid" }, + -- { AL["Hunter"], "PVPHunter" }, + -- { AL["Shaman"], "PVPShaman" }, + -- { AL["Paladin"], "PVPPaladin" }, + -- { AL["Warrior"], "PVPWarrior" }, + -- }, + -- ["WSGRewards"] = { + -- { "Warsong Gulch Menu", "WSGRepMenu" }, + -- { AL["Friendly Reputation Rewards"], "WSGRepFriendly" }, + -- { AL["Honored Reputation Rewards"], "WSGRepHonored5059" }, + -- { AL["Revered Reputation Rewards"], "WSGRepRevered5059" }, + -- { AL["Exalted Reputation Rewards"], "WSGRepExalted60" }, + -- }, + -- ["Alchemy"] = { + -- { AtlasLoot_TableNames["AlchemyApprentice1"][1], "AlchemyApprentice1" }, + -- { AtlasLoot_TableNames["AlchemyJourneyman1"][1], "AlchemyJourneyman1" }, + -- { AtlasLoot_TableNames["AlchemyExpert1"][1], "AlchemyExpert1" }, + -- { AtlasLoot_TableNames["AlchemyArtisan1"][1], "AlchemyArtisan1" }, + -- { AtlasLoot_TableNames["AlchemyHealingAndMana1"][1], "AlchemyHealingAndMana1" }, + -- { AtlasLoot_TableNames["AlchemyFlasks1"][1], "AlchemyFlasks1" }, + -- { AtlasLoot_TableNames["AlchemyTransmutes1"][1], "AlchemyTransmutes1" }, + -- { AtlasLoot_TableNames["AlchemyDefensive1"][1], "AlchemyDefensive1" }, + -- { AtlasLoot_TableNames["AlchemyOffensive1"][1], "AlchemyOffensive1" }, + -- { AtlasLoot_TableNames["AlchemyOther1"][1], "AlchemyOther1" }, + -- }, + -- ["Blacksmithing"] = { + -- { AtlasLoot_TableNames["SmithingApprentice1"][1], "SmithingApprentice1" }, + -- { AtlasLoot_TableNames["SmithingJourneyman1"][1], "SmithingJourneyman1" }, + -- { AtlasLoot_TableNames["SmithingExpert1"][1], "SmithingExpert1" }, + -- { AtlasLoot_TableNames["SmithingArtisan1"][1], "SmithingArtisan1" }, + -- { AtlasLoot_TableNames["Armorsmith1"][1], "Armorsmith1" }, + -- { AtlasLoot_TableNames["Weaponsmith1"][1], "Weaponsmith1" }, + -- { AtlasLoot_TableNames["Axesmith1"][1], "Axesmith1" }, + -- { AtlasLoot_TableNames["Hammersmith1"][1], "Hammersmith1" }, + -- { AtlasLoot_TableNames["Swordsmith1"][1], "Swordsmith1" }, + -- }, + -- ["Cooking"] = { + -- { AtlasLoot_TableNames["CookingApprentice1"][1], "CookingApprentice1" }, + -- { AtlasLoot_TableNames["CookingJourneyman1"][1], "CookingJourneyman1" }, + -- { AtlasLoot_TableNames["CookingExpert1"][1], "CookingExpert1" }, + -- { AtlasLoot_TableNames["CookingArtisan1"][1], "CookingArtisan1" }, + -- }, + -- ["Enchanting"] = { + -- { AtlasLoot_TableNames["EnchantingApprentice1"][1], "EnchantingApprentice1" }, + -- { AtlasLoot_TableNames["EnchantingJourneyman1"][1], "EnchantingJourneyman1" }, + -- { AtlasLoot_TableNames["EnchantingExpert1"][1], "EnchantingExpert1" }, + -- { AtlasLoot_TableNames["EnchantingArtisan1"][1], "EnchantingArtisan1" }, + -- { AtlasLoot_TableNames["EnchantingCloak1"][1], "EnchantingCloak1" }, + -- { AtlasLoot_TableNames["EnchantingChest1"][1], "EnchantingChest1" }, + -- { AtlasLoot_TableNames["EnchantingBracer1"][1], "EnchantingBracer1" }, + -- { AtlasLoot_TableNames["EnchantingGlove1"][1], "EnchantingGlove1" }, + -- { AtlasLoot_TableNames["EnchantingBoots1"][1], "EnchantingBoots1" }, + -- { AtlasLoot_TableNames["Enchanting2HWeapon1"][1], "Enchanting2HWeapon1" }, + -- { AtlasLoot_TableNames["EnchantingWeapon1"][1], "EnchantingWeapon1" }, + -- { AtlasLoot_TableNames["EnchantingShield1"][1], "EnchantingShield1" }, + -- { AtlasLoot_TableNames["EnchantingMisc1"][1], "EnchantingMisc1" }, + -- }, + -- ["Engineering"] = { + -- { AtlasLoot_TableNames["EngineeringApprentice1"][1], "EngineeringApprentice1" }, + -- { AtlasLoot_TableNames["EngineeringJourneyman1"][1], "EngineeringJourneyman1" }, + -- { AtlasLoot_TableNames["EngineeringExpert1"][1], "EngineeringExpert1" }, + -- { AtlasLoot_TableNames["EngineeringArtisan1"][1], "EngineeringArtisan1" }, + -- { AtlasLoot_TableNames["Gnomish1"][1], "Gnomish1" }, + -- { AtlasLoot_TableNames["Goblin1"][1], "Goblin1" }, + -- }, + -- ["Leatherworking"] = { + -- { AtlasLoot_TableNames["LeatherApprentice1"][1], "LeatherApprentice1" }, + -- { AtlasLoot_TableNames["LeatherJourneyman1"][1], "LeatherJourneyman1" }, + -- { AtlasLoot_TableNames["LeatherExpert1"][1], "LeatherExpert1" }, + -- { AtlasLoot_TableNames["LeatherArtisan1"][1], "LeatherArtisan1" }, + -- { AtlasLoot_TableNames["Dragonscale1"][1], "Dragonscale1" }, + -- { AtlasLoot_TableNames["Elemental1"][1], "Elemental1" }, + -- { AtlasLoot_TableNames["Tribal1"][1], "Tribal1" }, + -- }, + -- ["Mining"] = { + -- { AL["Mining"], "Mining1" }, + -- { AL["Smelting"], "Smelting1" }, + -- }, + -- ["Tailoring"] = { + -- { AtlasLoot_TableNames["TailoringApprentice1"][1], "TailoringApprentice1" }, + -- { AtlasLoot_TableNames["TailoringJourneyman1"][1], "TailoringJourneyman1" }, + -- { AtlasLoot_TableNames["TailoringExpert1"][1], "TailoringExpert1" }, + -- { AtlasLoot_TableNames["TailoringArtisan1"][1], "TailoringArtisan1" }, + -- }, + -- ["Survival"] = { + -- { AtlasLoot_TableNames["Survival1"][1], "Survival1" }, + -- { AtlasLoot_TableNames["Survival2"][1], "Survival2" }, + -- }, }; -------------------------------------------------------------------------------- @@ -3365,7 +3413,7 @@ function AtlasLootItem_OnClick(arg1) local color = strsub(getglobal("AtlasLootItem_"..this:GetID().."_Name"):GetText(), 1, 10); local id = this:GetID(); local name = strsub(getglobal("AtlasLootItem_"..this:GetID().."_Name"):GetText(), 11); - local texture = strsplit("\\", getglobal("AtlasLootItem_"..this:GetID().."_Icon"):GetTexture(), 0, true) + local texture = AtlasLoot_Strsplit("\\", getglobal("AtlasLootItem_"..this:GetID().."_Icon"):GetTexture(), 0, true) local dataID = AtlasLootItemsFrame.refresh[1] local dataSource = AtlasLootItemsFrame.refresh[2] local bossName = AtlasLootItemsFrame.refresh[3] @@ -3440,7 +3488,7 @@ function AtlasLootItem_OnClick(arg1) AtlasLoot_AddToWishlist(this.itemID, texture, this.itemIDName, this.itemIDExtra, dataID.."|"..dataSource); end elseif((dataID == "SearchResult" or dataID == "WishList") and this.sourcePage) then - local dataID, dataSource = strsplit("|", this.sourcePage); + local dataID, dataSource = AtlasLoot_Strsplit("|", this.sourcePage); if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1], framePoint); end @@ -3465,7 +3513,7 @@ function AtlasLootItem_OnClick(arg1) elseif(IsControlKeyDown()) then DressUpItemLink("item:"..this.dressingroomID..":0:0:0"); elseif((dataID == "SearchResult" or dataID == "WishList") and this.sourcePage) then - local dataID, dataSource = strsplit("|", this.sourcePage); + local dataID, dataSource = AtlasLoot_Strsplit("|", this.sourcePage); if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); end @@ -3529,8 +3577,8 @@ function AtlasLootItem_OnClick(arg1) elseif(IsControlKeyDown()) then DressUpItemLink("item:"..this.dressingroomID..":0:0:0"); elseif((dataID == "SearchResult" or dataID == "WishList") and this.sourcePage) then - local d1, d2 = strsplit("|", this.sourcePage); - if(d1 and d2 and AtlasLoot_IsLootTableAvailable(d1)) then + local dataID, dataSource = AtlasLoot_Strsplit("|", this.sourcePage); + if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); end end @@ -3692,6 +3740,11 @@ function AtlasLoot_ContainerItem_OnClick(arg1) local _, _, _, color = GetItemQualityColor(quality) tex = string.gsub(tex, "Interface\\Icons\\", "") local extra = this.extraInfo + local lootpage, dataSource + if lastSelectedButton then + lootpage = lastSelectedButton.lootpage + dataSource = lastSelectedButton.dataSource + end if IsShiftKeyDown() and arg1 == "LeftButton" then if AtlasLootCharDB.AllLinks then if WIM_EditBoxInFocus then @@ -3703,7 +3756,9 @@ function AtlasLoot_ContainerItem_OnClick(arg1) elseif(IsControlKeyDown() and name) then DressUpItemLink(link); elseif(IsAltKeyDown() and (itemID ~= 0)) then - if AtlasLootItemsFrame.refresh then + if lootpage then + AtlasLoot_AddToWishlist(itemID, tex, name, extra, lootpage.."|"..dataSource) + elseif AtlasLootItemsFrame.refresh then local dataID = AtlasLootItemsFrame.refresh[1] local dataSource = AtlasLootItemsFrame.refresh[2] if dataID == "WishList" then @@ -3887,111 +3942,3 @@ function AtlasLoot_GetChatLink(id) local e = string.sub(d, 2) return "\124"..e.."\124H"..b.."\124h["..a.."]\124h\124r" end ---[[ ---pfUI.api.strsplit --Uses code borrowed from pfUI by Shagu -local function AtlasLoot_strsplit(delimiter, subject) - if not subject then return nil end - local delimiter, fields = delimiter or ":", {} - local pattern = string.format("([^%s]+)", delimiter) - string.gsub(subject, pattern, function(c) fields[table.getn(fields)+1] = c end) - return unpack(fields) -end - ---Update announcing code taken from pfUI by Shagu -local major, minor, fix = AtlasLoot_strsplit(".", tostring(GetAddOnMetadata("AtlasLoot", "Version"))) -local alreadyshown = false -local localversion = tonumber(major*10000 + minor*100 + fix) -local remoteversion = tonumber(AtlasLoot_updateavailable) or 0 -local loginchannels = { "BATTLEGROUND", "RAID", "GUILD" } -local groupchannels = { "BATTLEGROUND", "RAID" } - -AtlasLoot_updater = CreateFrame("Frame") -AtlasLoot_updater:RegisterEvent("CHAT_MSG_ADDON") -AtlasLoot_updater:RegisterEvent("CHAT_MSG_CHANNEL") -AtlasLoot_updater:RegisterEvent("PLAYER_ENTERING_WORLD") ---AtlasLoot_updater:RegisterEvent("PARTY_MEMBERS_CHANGED") --Remove some unnecessary addon spam and allow different AtlasLoot branches to coexist -AtlasLoot_updater:RegisterEvent("CHAT_MSG_CHANNEL_JOIN") - -AtlasLootUserCounter = {} -PlayerCounter = {} - -AtlasLoot_updater:SetScript("OnEvent", function() - if event == "CHAT_MSG_ADDON" and arg1 == "AtlasLoot" then - local v, remoteversion, remotetitle = AtlasLoot_strsplit(":", arg2) - local _,title = GetAddOnInfo("AtlasLoot") - local remoteversion = tonumber(remoteversion) - if remoteversion >= 40000 then remoteversion = 0 end --Block for people using some version from another version of WoW. - if v == "VERSION" and remoteversion and title == remotetitle then - if remoteversion > localversion then - AtlasLoot_updateavailable = remoteversion - if not alreadyshown then - DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r New version available! https://github.com/Otari98/AtlasLoot") - alreadyshown = true - end - end - end - end - - if event == "CHAT_MSG_CHANNEL_JOIN" then - local name = arg2 - if not PlayerCounter[name] then - PlayerCounter[name] = 1 - end - end - - if event == "CHAT_MSG_CHANNEL" then - local _,_,source = string.find(arg4,"(%d+)%.") - if source then - _,name = GetChannelName(source) - end - if not name then return end - if string.upper(name) == "LFT" then - local msg, v, remoteversion, remotetitle = AtlasLoot_strsplit(":", arg1) - if msg == "Atlasloot" then - local remoteversion = tonumber(remoteversion) or 0 - local _,title = GetAddOnInfo("AtlasLoot") - if remoteversion >= 40000 then remoteversion = 0 end --Block for people using some version from another version of WoW. - if v == "VERSION" and remoteversion and title == remotetitle then - if remoteversion > localversion then - AtlasLoot_updateavailable = remoteversion - if not alreadyshown then - DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r New version available! https://github.com/Otari98/AtlasLoot") - alreadyshown = true - end - end - end - local name = arg2 - if not AtlasLootUserCounter[name] then - AtlasLootUserCounter[name] = 1 - end - end - end - end - - local _,title = GetAddOnInfo("AtlasLoot") - if event == "PARTY_MEMBERS_CHANGED" then - local groupsize = GetNumRaidMembers() > 0 and GetNumRaidMembers() or GetNumPartyMembers() > 0 and GetNumPartyMembers() or 0 - if ( this.group or 0 ) < groupsize then - for _, chan in pairs(groupchannels) do - SendAddonMessage("AtlasLoot", "VERSION:" .. localversion..":"..title, chan) - end - end - this.group = groupsize - end - - if event == "PLAYER_ENTERING_WORLD" then - if not alreadyshown and localversion < remoteversion then - DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r New version available! https://github.com/Otari98/AtlasLoot") - AtlasLoot_updateavailable = localversion - alreadyshown = true - end - - for _, chan in pairs(loginchannels) do - SendAddonMessage("AtlasLoot", "VERSION:" .. localversion..":"..title, chan) - end - if GetChannelName("LFT") ~= 0 then - SendChatMessage("Atlasloot:VERSION:" .. localversion..":"..title, "CHANNEL", nil, GetChannelName("LFT")) - end - end - end) -]] \ No newline at end of file diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml index 3bd3cfb..affbf68 100644 --- a/Core/AtlasLoot.xml +++ b/Core/AtlasLoot.xml @@ -546,6 +546,10 @@ AtlasLoot_ShowWishList(); CloseDropDownMenus(); + AtlasLootDefaultFrame_SubMenu:Disable() + AtlasLootDefaultFrame_SelectedTable:Hide() + AtlasLootQuickLooksButton:Hide() + AtlasLoot_QuickLooks:Hide() local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); diff --git a/Core/PvP.lua b/Core/PvP.lua index 7e2fee2..efbbb6b 100644 --- a/Core/PvP.lua +++ b/Core/PvP.lua @@ -336,55 +336,55 @@ function AtlasLootPVPSetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff"..AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest") + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest") AtlasLootMenuItem_3.lootpage="PVPPriest"; AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef"..AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage="PVPMage"; AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9"..AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage="PVPWarlock"; AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468"..AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue") + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue") AtlasLootMenuItem_6.lootpage="PVPRogue"; AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a"..AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid") + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid") AtlasLootMenuItem_7.lootpage="PVPDruid"; AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372"..AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter") + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter") AtlasLootMenuItem_18.lootpage="PVPHunter"; AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff"..AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage="PVPShaman"; AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba"..AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin") + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin") AtlasLootMenuItem_20.lootpage="PVPPaladin"; AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d"..AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior") + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior") AtlasLootMenuItem_21.lootpage="PVPWarrior"; AtlasLootMenuItem_21:Show(); end diff --git a/Core/Sets.lua b/Core/Sets.lua index 6a959b8..e717d4d 100644 --- a/Core/Sets.lua +++ b/Core/Sets.lua @@ -3,21 +3,20 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); local ORANGE = "|cffFF8400"; local data = AtlasLoot_Data["AtlasLootSetItems"] -local classCoords = { - ["warrior"] = { 0, 0.25, 0, 0.25 }, - ["mage"] = { 0.25, 0.5, 0, 0.25 }, - ["rogue"] = { 0.5, 0.745, 0, 0.25 }, - ["druid"] = { 0.75, 0.99, 0, 0.25 }, - ["hunter"] = { 0, 0.25, 0.25, 0.5 }, - ["shaman"] = { 0.25, 0.50, 0.25, 0.5 }, - ["priest"] = { 0.50, 0.75, 0.25, 0.5 }, - ["warlock"] = { 0.75, 0.99, 0.25, 0.5 }, - ["paladin"] = { 0, 0.25, 0.5, 0.75 }, -} - -function AtlasLoot_SetClassIcon(object, class) - object:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes") - object:SetTexCoord(unpack(classCoords[class])) +function AtlasLoot_GetDataSource(dataID) + local source = nil + for k in pairs(AtlasLoot_Data) do + if source then + break + end + for i in pairs(AtlasLoot_Data[k]) do + if i == dataID then + source = k + break + end + end + end + return source end function AtlasLoot_PrepMenu(backPage, title) @@ -26,10 +25,12 @@ function AtlasLoot_PrepMenu(backPage, title) getglobal("AtlasLootItem_" .. i.."Border"):Hide() end for i = 1, 30, 1 do + local button = getglobal("AtlasLootMenuItem_" .. i) getglobal("AtlasLootMenuItem_" .. i.."Border"):Hide() - getglobal("AtlasLootMenuItem_" .. i):Hide(); - getglobal("AtlasLootMenuItem_" .. i).isheader = false; - getglobal("AtlasLootMenuItem_" .. i).container = nil + button:Hide(); + button.isheader = false; + button.container = nil + button.dataSource = nil getglobal("AtlasLootMenuItem_" .. i .. "_Icon"):SetTexCoord(0, 1, 0, 1) end if backPage then @@ -279,7 +280,9 @@ function AtlasLootPRE60SetMenu() AtlasLootMenuItem_23.container = data.SpiritofEskhandarC AtlasLootMenuItem_23:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -290,63 +293,63 @@ function AtlasLootZGSetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest") + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest") AtlasLootMenuItem_3.lootpage = "ZGPriest"; AtlasLootMenuItem_3.container = data.ZGPriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "ZGMage"; AtlasLootMenuItem_4.container = data.ZGMageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "ZGWarlock"; AtlasLootMenuItem_5.container = data.ZGWarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue") + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue") AtlasLootMenuItem_6.lootpage = "ZGRogue"; AtlasLootMenuItem_6.container = data.ZGRogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid") + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid") AtlasLootMenuItem_7.lootpage = "ZGDruid"; AtlasLootMenuItem_7.container = data.ZGDruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter") + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter") AtlasLootMenuItem_18.lootpage = "ZGHunter"; AtlasLootMenuItem_18.container = data.ZGHunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "ZGShaman"; AtlasLootMenuItem_19.container = data.ZGShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin") + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin") AtlasLootMenuItem_20.lootpage = "ZGPaladin"; AtlasLootMenuItem_20.container = data.ZGPaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior") + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior") AtlasLootMenuItem_21.lootpage = "ZGWarrior"; AtlasLootMenuItem_21.container = data.ZGWarriorC AtlasLootMenuItem_21:Show(); @@ -372,7 +375,9 @@ function AtlasLootZGSetMenu() AtlasLootMenuItem_25.container = data.HakkariBladesC AtlasLootMenuItem_25:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -383,68 +388,70 @@ function AtlasLootAQ40SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest") + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest") AtlasLootMenuItem_3.lootpage = "AQ40Priest"; AtlasLootMenuItem_3.container = data.AQ40PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "AQ40Mage"; AtlasLootMenuItem_4.container = data.AQ40MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "AQ40Warlock"; AtlasLootMenuItem_5.container = data.AQ40WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "AQ40Rogue"; AtlasLootMenuItem_6.container = data.AQ40RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "AQ40Druid"; AtlasLootMenuItem_7.container = data.AQ40DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "AQ40Hunter"; AtlasLootMenuItem_18.container = data.AQ40HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "AQ40Shaman"; AtlasLootMenuItem_19.container = data.AQ40ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "AQ40Paladin"; AtlasLootMenuItem_20.container = data.AQ40PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "AQ40Warrior"; AtlasLootMenuItem_21.container = data.AQ40WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -455,68 +462,70 @@ function AtlasLootAQ20SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "AQ20Priest"; AtlasLootMenuItem_3.container = data.AQ20PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "AQ20Mage"; AtlasLootMenuItem_4.container = data.AQ20MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "AQ20Warlock"; AtlasLootMenuItem_5.container = data.AQ20WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "AQ20Rogue"; AtlasLootMenuItem_6.container = data.AQ20RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "AQ20Druid"; AtlasLootMenuItem_7.container = data.AQ20DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "AQ20Hunter"; AtlasLootMenuItem_18.container = data.AQ20HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "AQ20Shaman"; AtlasLootMenuItem_19.container = data.AQ20ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "AQ20Paladin"; AtlasLootMenuItem_20.container = data.AQ20PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "AQ20Warrior"; AtlasLootMenuItem_21.container = data.AQ20WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -527,68 +536,70 @@ function AtlasLootT0SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "T0Priest"; AtlasLootMenuItem_3.container = data.T0PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage"); + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage"); AtlasLootMenuItem_4.lootpage = "T0Mage"; AtlasLootMenuItem_4.container = data.T0MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "T0Warlock"; AtlasLootMenuItem_5.container = data.T0WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue") + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue") AtlasLootMenuItem_6.lootpage = "T0Rogue"; AtlasLootMenuItem_6.container = data.T0RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid") + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid") AtlasLootMenuItem_7.lootpage = "T0Druid"; AtlasLootMenuItem_7.container = data.T0DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter") + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter") AtlasLootMenuItem_18.lootpage = "T0Hunter"; AtlasLootMenuItem_18.container = data.T0HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "T0Shaman"; AtlasLootMenuItem_19.container = data.T0ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin") + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin") AtlasLootMenuItem_20.lootpage = "T0Paladin"; AtlasLootMenuItem_20.container = data.T0PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior") + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior") AtlasLootMenuItem_21.lootpage = "T0Warrior"; AtlasLootMenuItem_21.container = data.T0WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -599,68 +610,70 @@ function AtlasLootT1SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "T1Priest"; AtlasLootMenuItem_3.container = data.T1PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "T1Mage"; AtlasLootMenuItem_4.container = data.T1MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "T1Warlock"; AtlasLootMenuItem_5.container = data.T1WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "T1Rogue"; AtlasLootMenuItem_6.container = data.T1RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "T1Druid"; AtlasLootMenuItem_7.container = data.T1DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "T1Hunter"; AtlasLootMenuItem_18.container = data.T1HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "T1Shaman"; AtlasLootMenuItem_19.container = data.T1ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "T1Paladin"; AtlasLootMenuItem_20.container = data.T1PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "T1Warrior"; AtlasLootMenuItem_21.container = data.T1WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -671,68 +684,70 @@ function AtlasLootT2SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "T2Priest"; AtlasLootMenuItem_3.container = data.T2PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "T2Mage"; AtlasLootMenuItem_4.container = data.T2MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "T2Warlock"; AtlasLootMenuItem_5.container = data.T2WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "T2Rogue"; AtlasLootMenuItem_6.container = data.T2RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "T2Druid"; AtlasLootMenuItem_7.container = data.T2DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "T2Hunter"; AtlasLootMenuItem_18.container = data.T2HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "T2Shaman"; AtlasLootMenuItem_19.container = data.T2ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "T2Paladin"; AtlasLootMenuItem_20.container = data.T2PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "T2Warrior"; AtlasLootMenuItem_21.container = data.T2WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -743,68 +758,70 @@ function AtlasLootT3SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "T3Priest"; AtlasLootMenuItem_3.container = data.T3PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "T3Mage"; AtlasLootMenuItem_4.container = data.T3MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "T3Warlock"; AtlasLootMenuItem_5.container = data.T3WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "T3Rogue"; AtlasLootMenuItem_6.container = data.T3RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "T3Druid"; AtlasLootMenuItem_7.container = data.T3DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "T3Hunter"; AtlasLootMenuItem_18.container = data.T3HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "T3Shaman"; AtlasLootMenuItem_19.container = data.T3ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "T3Paladin"; AtlasLootMenuItem_20.container = data.T3PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "T3Warrior"; AtlasLootMenuItem_21.container = data.T3WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end @@ -815,68 +832,70 @@ function AtlasLoot_Kara40SetMenu() --Priest AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]); AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest"); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest"); AtlasLootMenuItem_3.lootpage = "T35Priest"; AtlasLootMenuItem_3.container = data.T35PriestC AtlasLootMenuItem_3:Show(); --Mage AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]); AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage") + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage") AtlasLootMenuItem_4.lootpage = "T35Mage"; AtlasLootMenuItem_4.container = data.T35MageC AtlasLootMenuItem_4:Show(); --Warlock AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]); AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock") + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock") AtlasLootMenuItem_5.lootpage = "T35Warlock"; AtlasLootMenuItem_5.container = data.T35WarlockC AtlasLootMenuItem_5:Show(); --Rogue AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue"); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue"); AtlasLootMenuItem_6.lootpage = "T35Rogue"; AtlasLootMenuItem_6.container = data.T35RogueC AtlasLootMenuItem_6:Show(); --Druid AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]); AtlasLootMenuItem_7_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid"); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid"); AtlasLootMenuItem_7.lootpage = "T35Druid"; AtlasLootMenuItem_7.container = data.T35DruidC AtlasLootMenuItem_7:Show(); --Hunter AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]); AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter"); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter"); AtlasLootMenuItem_18.lootpage = "T35Hunter"; AtlasLootMenuItem_18.container = data.T35HunterC AtlasLootMenuItem_18:Show(); --Shaman AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]); AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman") + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman") AtlasLootMenuItem_19.lootpage = "T35Shaman"; AtlasLootMenuItem_19.container = data.T35ShamanC AtlasLootMenuItem_19:Show(); --Paladin AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin"); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin"); AtlasLootMenuItem_20.lootpage = "T35Paladin"; AtlasLootMenuItem_20.container = data.T35PaladinC AtlasLootMenuItem_20:Show(); --Warrior AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior"); + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior"); AtlasLootMenuItem_21.lootpage = "T35Warrior"; AtlasLootMenuItem_21.container = data.T35WarriorC AtlasLootMenuItem_21:Show(); for i = 1, 30 do - if getglobal("AtlasLootMenuItem_"..i).container then + local button = getglobal("AtlasLootMenuItem_" .. i) + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if button.container then getglobal("AtlasLootMenuItem_"..i.."Border"):Show() end end diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua index 47e2059..e87ef73 100644 --- a/Core/TextParsing.lua +++ b/Core/TextParsing.lua @@ -4,6 +4,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); -- Text replacement function -------------------------------------------------------------------------------- function AtlasLoot_FixText(text) + local gsub = string.gsub --Armour class text = gsub(text, "#a1#", AL["Cloth"]); text = gsub(text, "#a2#", AL["Leather"]); @@ -151,7 +152,6 @@ function AtlasLoot_FixText(text) text = gsub(text, "#st5#", AL["Zolo"]); text = gsub(text, "#st6#", AL["Zul'Lor"]); - -- Misc phrases and mod specific stuff text = gsub(text, "#m1#", AL["Classes"]); text = gsub(text, "#m2#", AL["This Item Begins a Quest"]); @@ -653,14 +653,14 @@ function AtlasLoot_FixText(text) text = gsub(text, "#z5#", AL["UBRS"]); --Currency Icons - text = gsub(text, "#gold#", "Interface\\AddOns\\AtlasLoot\\Images\\gold"); - text = gsub(text, "#silver#", "Interface\\AddOns\\AtlasLoot\\Images\\silver"); - text = gsub(text, "#copper#", "Interface\\AddOns\\AtlasLoot\\Images\\bronze"); - text = gsub(text, "#wsg#", "Interface\\Icons\\INV_Misc_Rune_07"); - text = gsub(text, "#ab#", "Interface\\Icons\\INV_Jewelry_Amulet_07"); - text = gsub(text, "#av#", "Interface\\Icons\\INV_Jewelry_Necklace_21"); - text = gsub(text, "#horde#", "Interface\\AddOns\\AtlasLoot\\Images\\Horde"); - text = gsub(text, "#alliance#", "Interface\\AddOns\\AtlasLoot\\Images\\Alliance"); + -- text = gsub(text, "#gold#", "Interface\\AddOns\\AtlasLoot\\Images\\gold"); + -- text = gsub(text, "#silver#", "Interface\\AddOns\\AtlasLoot\\Images\\silver"); + -- text = gsub(text, "#copper#", "Interface\\AddOns\\AtlasLoot\\Images\\bronze"); + -- text = gsub(text, "#wsg#", "Interface\\Icons\\INV_Misc_Rune_07"); + -- text = gsub(text, "#ab#", "Interface\\Icons\\INV_Jewelry_Amulet_07"); + -- text = gsub(text, "#av#", "Interface\\Icons\\INV_Jewelry_Necklace_21"); + -- text = gsub(text, "#horde#", "Interface\\AddOns\\AtlasLoot\\Images\\Horde"); + -- text = gsub(text, "#alliance#", "Interface\\AddOns\\AtlasLoot\\Images\\Alliance"); text = gsub(text, "#darkmoon#", "Interface\\Icons\\INV_Misc_Ticket_Darkmoon_01"); text = gsub(text, "#ccombat#", "Interface\\Icons\\INV_Jewelry_Talisman_06"); text = gsub(text, "#ctactical#", "Interface\\Icons\\INV_Jewelry_Amulet_02"); diff --git a/Core/WishList.lua b/Core/WishList.lua index 375f6aa..7a34302 100644 --- a/Core/WishList.lua +++ b/Core/WishList.lua @@ -26,14 +26,14 @@ end AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, lootPage, sourcePage) Looks for an empty slot in the wishlist and slots the item in ]] -function AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, lootPage, sourcePage) +function AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, extraText, sourcePage) for _, v in ipairs(AtlasLootCharDB["WishList"]) do if v[1] == itemID then DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..RED..AL[" already in the WishList!"]); return; end end - table.insert(AtlasLootCharDB["WishList"], { itemID, itemTexture, itemName, lootPage, sourcePage }); + table.insert(AtlasLootCharDB["WishList"], { itemID, itemTexture, itemName, extraText, sourcePage }); DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..GREY..AL[" added to the WishList."]); AtlasLoot_WishList = AtlasLoot_CategorizeWishList(AtlasLootCharDB["WishList"]); end @@ -174,7 +174,9 @@ function AtlasLoot_GetWishListSubheading(dataID) end function AtlasLoot_GetWishListSubheadingBoss(dataID) - if not AtlasLoot_TableNames then return end + if not AtlasLoot_TableNamesBoss then + return + end local zoneID ; for i, v in pairs(AtlasLoot_TableNamesBoss) do for j,k in pairs(v) do @@ -217,7 +219,7 @@ function AtlasLoot_CategorizeWishList(wlTable) for _, v in pairs(wlTable) do if v[5] and v[5] ~= "" then - local dataID = strsplit("|", v[5]); + local dataID = AtlasLoot_Strsplit("|", v[5]); -- Build subheading table if not subheadings[dataID] then subheadings[dataID] = AtlasLoot_GetWishListSubheadingBoss(dataID); @@ -245,7 +247,7 @@ function AtlasLoot_CategorizeWishList(wlTable) -- some debug code that I've used to fix WishList errors before due to people adding drops to AtlasLoot incorrectly. local box = k or "Unknown" local cat = categories[k][1][5] or "Unknown" - local parent = GetLootTableParent(strsplit("|", cat)) or "Unknown" + local parent = GetLootTableParent(AtlasLoot_Strsplit("|", cat)) or "Unknown" --print("box: "..box.." - cat: "..cat) table.insert(result, { 0, "INV_Box_01", "=q6="..box, "=q0="..parent }); diff --git a/Images/druid.tga b/Images/druid.tga new file mode 100644 index 0000000..6de3d7a Binary files /dev/null and b/Images/druid.tga differ diff --git a/Images/hunter.tga b/Images/hunter.tga new file mode 100644 index 0000000..45fd1d7 Binary files /dev/null and b/Images/hunter.tga differ diff --git a/Images/mage.tga b/Images/mage.tga new file mode 100644 index 0000000..34c61c5 Binary files /dev/null and b/Images/mage.tga differ diff --git a/Images/paladin.tga b/Images/paladin.tga new file mode 100644 index 0000000..dfe547b Binary files /dev/null and b/Images/paladin.tga differ diff --git a/Images/priest.tga b/Images/priest.tga new file mode 100644 index 0000000..29822bb Binary files /dev/null and b/Images/priest.tga differ diff --git a/Images/rogue.tga b/Images/rogue.tga new file mode 100644 index 0000000..31891ea Binary files /dev/null and b/Images/rogue.tga differ diff --git a/Images/shaman.tga b/Images/shaman.tga new file mode 100644 index 0000000..1a0756c Binary files /dev/null and b/Images/shaman.tga differ diff --git a/Images/warlock.tga b/Images/warlock.tga new file mode 100644 index 0000000..c420227 Binary files /dev/null and b/Images/warlock.tga differ diff --git a/Images/warrior.tga b/Images/warrior.tga new file mode 100644 index 0000000..669509c Binary files /dev/null and b/Images/warrior.tga differ diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 7600395..a4826da 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -1395,39 +1395,39 @@ AtlasLoot_Data["AtlasLootItems"] = { { 19352, "INV_Sword_51", "=q4=Chromatically Tempered Sword", "=ds=#h1#, #w10#", "10%" }, }; BWLNefarian = { --https://database.turtle-wow.org/?npc=11583 - { 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s1#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s5#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47208,"=ds=#s5#, #a1# =q7=#db24#"}, }, }, }, - { 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s1#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s5#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47088,"=ds=#s5#, #a1# =q7=#db24#"}, }, }, }, - { 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s1#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s5#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47286,"=ds=#s5#, #a1# =q7=#db24#"}, }, }, }, - { 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s1#, #a2# =q12=#c6#", "11%" }, - { 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s1#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s5#, #a2# =q12=#c6#", "11%" }, + { 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s5#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47348,"=ds=#s5#, #a2# =q7=#db24#"},{47356,"=ds=#s5#, #a2# =q7=#db24#"}, }, }, }, - { 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s1#, #a3# =q14=#c2#", "11%" }, - { 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s1#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s5#, #a3# =q14=#c2#", "11%" }, + { 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s5#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47138,"=ds=#s5#, #a3# =q7=#db24#"},{47146,"=ds=#s5#, #a3# =q7=#db24#"}, }, }, }, - { 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s1#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s5#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47018,"=ds=#s5#, #a4# =q7=#db24#"},{47026,"=ds=#s5#, #a4# =q7=#db24#"}, }, }, }, - { 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s1#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{ + { 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s5#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{ {47250,"=ds=#s5#, #a4# =q7=#db24#"}, }, }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index f880ad2..be4b7e3 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1609,5 +1609,7 @@ AL:RegisterTranslations("enUS", function() return { ["Tier 3.5"] = true, ["Karazhan Sets"] = true, ["Cla'ckora"] = true, - } + ["Hinterlands"] = true, + ["Duskwood"] = true, + } end) diff --git a/Sets/sets.lua b/Sets/sets.lua index 7fc0d0e..cfb11df 100644 --- a/Sets/sets.lua +++ b/Sets/sets.lua @@ -1729,7 +1729,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Mage = { { 0, "", "", "" }, - { 0, "Spell_Frost_IceStorm", "=q10=#t0s3#", "" }, + { 0, "CLASSmage", "=q10=#t0s3#", "" }, { 0, "", "", "" }, { 16686, "INV_Crown_02", "=q3=Magister's Crown", "=ds=#s1#, #a1# =q7=#db33#" }, { 16689, "INV_Shoulder_23", "=q3=Magister's Mantle", "=ds=#s3#, #a1# =q7=#db36#" }, @@ -1744,7 +1744,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_Frost_IceStorm", "=q10=#t05s3#", "" }, + { 0, "CLASSmage", "=q10=#t05s3#", "" }, { 0, "", "", "" }, { 22065, "INV_Crown_02", "=q4=Sorcerer's Crown", "=ds=#s1#, #a1#" }, { 22068, "INV_Shoulder_23", "=q3=Sorcerer's Mantle", "=ds=#s3#, #a1#" }, @@ -1765,7 +1765,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Priest = { { 0, "", "", "" }, - { 0, "Spell_Holy_PowerWordShield", "=q9=#t0s5#", "" }, + { 0, "CLASSpriest", "=q9=#t0s5#", "" }, { 0, "", "", "" }, { 16693, "INV_Crown_01", "=q3=Devout Crown", "=ds=#s1#, #a1# =q7=#db33#" }, { 16695, "INV_Shoulder_02", "=q3=Devout Mantle", "=ds=#s3#, #a1# =q7=#db39#" }, @@ -1780,7 +1780,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_Holy_PowerWordShield", "=q9=#t05s5#", "" }, + { 0, "CLASSpriest", "=q9=#t05s5#", "" }, { 0, "", "", "" }, { 22080, "INV_Crown_01", "=q4=Virtuous Crown", "=ds=#s1#, #a1#" }, { 22082, "INV_Shoulder_02", "=q3=Virtuous Mantle", "=ds=#s3#, #a1#" }, @@ -1801,7 +1801,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Warlock = { { 0, "", "", "" }, - { 0, "Spell_Shadow_CurseOfTounges", "=q11=#t0s8#", "" }, + { 0, "CLASSwarlock", "=q11=#t0s8#", "" }, { 0, "", "", "" }, { 16698, "INV_Helmet_29", "=q3=Dreadmist Mask", "=ds=#s1#, #a1# =q7=#db33#" }, { 16701, "INV_Misc_Bone_TaurenSkull_01", "=q3=Dreadmist Mantle", "=ds=#s3#, #a1# =q7=#db42#" }, @@ -1816,7 +1816,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_Shadow_CurseOfTounges", "=q11=#t05s8#", "" }, + { 0, "CLASSwarlock", "=q11=#t05s8#", "" }, { 0, "", "", "" }, { 22074, "INV_Helmet_29", "=q4=Deathmist Mask", "=ds=#s1#, #a1#" }, { 22073, "INV_Misc_Bone_TaurenSkull_01", "=q3=Deathmist Mantle", "=ds=#s3#, #a1#" }, @@ -1837,7 +1837,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Rogue = { { 0, "", "", "" }, - { 0, "Ability_BackStab", "=q12=#t0s6#", "" }, + { 0, "CLASSrogue", "=q12=#t0s6#", "" }, { 0, "", "", "" }, { 16707, "INV_Helmet_41", "=q3=Shadowcraft Cap", "=ds=#s1#, #a2# =q7=#db33#" }, { 16708, "INV_Shoulder_07", "=q3=Shadowcraft Spaulders", "=ds=#s3#, #a2# =q7=#db45#" }, @@ -1852,7 +1852,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Ability_BackStab", "=q12=#t05s6#", "" }, + { 0, "CLASSrogue", "=q12=#t05s6#", "" }, { 0, "", "", "" }, { 22005, "INV_Helmet_41", "=q4=Darkmantle Cap", "=ds=#s1#, #a2#" }, { 22008, "INV_Shoulder_07", "=q3=Darkmantle Spaulders", "=ds=#s3#, #a2#" }, @@ -1873,7 +1873,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Druid = { { 0, "", "", "" }, - { 0, "Spell_Nature_Regeneration", "=q13=#t0s1#", "" }, + { 0, "CLASSdruid", "=q13=#t0s1#", "" }, { 0, "", "", "" }, { 16720, "INV_Helmet_27", "=q3=Wildheart Cowl", "=ds=#s1#, #a2# =q7=#db33#" }, { 16718, "INV_Shoulder_01", "=q3=Wildheart Spaulders", "=ds=#s3#, #a2# =q7=#db49#" }, @@ -1888,7 +1888,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_Nature_Regeneration", "=q13=#t05s1#", "" }, + { 0, "CLASSdruid", "=q13=#t05s1#", "" }, { 0, "", "", "" }, { 22109, "INV_Helmet_27", "=q4=Feralheart Cowl", "=ds=#s1#, #a2#" }, { 22112, "INV_Shoulder_01", "=q3=Feralheart Spaulders", "=ds=#s3#, #a2#" }, @@ -1909,7 +1909,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Hunter = { { 0, "", "", "" }, - { 0, "Ability_Hunter_RunningShot", "=q14=#t0s2#", "" }, + { 0, "CLASShunter", "=q14=#t0s2#", "" }, { 0, "", "", "" }, { 16677, "INV_Helmet_24", "=q3=Beaststalker's Cap", "=ds=#s1#, #a3# =q7=#db33#" }, { 16679, "INV_Shoulder_10", "=q3=Beaststalker's Mantle", "=ds=#s3#, #a3# =q7=#db53#" }, @@ -1924,7 +1924,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Ability_Hunter_RunningShot", "=q14=#t05s2#", "" }, + { 0, "CLASShunter", "=q14=#t05s2#", "" }, { 0, "", "", "" }, { 22013, "INV_Helmet_24", "=q4=Beastmaster's Cap", "=ds=#s1#, #a3#" }, { 22016, "INV_Shoulder_10", "=q3=Beastmaster's Mantle", "=ds=#s3#, #a3#" }, @@ -1945,7 +1945,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Shaman = { { 0, "", "", "" }, - { 0, "Spell_FireResistanceTotem_01", "=q15=#t0s7#", "" }, + { 0, "CLASSshaman", "=q15=#t0s7#", "" }, { 0, "", "", "" }, { 16667, "INV_Helmet_04", "=q3=Coif of Elements", "=ds=#s1#, #a3# =q7=#db33#" }, { 16669,"INV_Shoulder_29","=q3=Pauldrons of Elements", "=ds=#s3#, #a3# =q7=#db56#" }, @@ -1960,7 +1960,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_FireResistanceTotem_01", "=q15=#t05s7#", "" }, + { 0, "CLASSshaman", "=q15=#t05s7#", "" }, { 0, "", "", "" }, { 22097, "INV_Helmet_04", "=q4=Coif of The Five Thunders", "=ds=#s1#, #a3#" }, { 22101,"INV_Shoulder_29","=q3=Pauldrons of The Five Thunders","=ds=#s3#, #a3#" }, @@ -1981,7 +1981,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Warrior = { { 0, "", "", "" }, - { 0, "INV_Shield_05", "=q17=#t0s9#", "" }, + { 0, "CLASSwarrior", "=q17=#t0s9#", "" }, { 0, "", "", "" }, { 16731, "INV_Helmet_02", "=q3=Helm of Valor", "=ds=#s1#, #a4# =q7=#db33#" }, { 16733,"INV_Shoulder_30","=q3=Spaulders of Valor", "=ds=#s3#, #a4# =q7=#db59#" }, @@ -1996,7 +1996,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "INV_Shield_05", "=q17=#t05s9#", "" }, + { 0, "CLASSwarrior", "=q17=#t05s9#", "" }, { 0, "", "", "" }, { 21999, "INV_Helmet_02", "=q4=Helm of Heroism", "=ds=#s1#, #a4#" }, { 22001,"INV_Shoulder_30","=q3=Spaulders of Heroism","=ds=#s3#, #a4#" }, @@ -2017,7 +2017,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, T0Paladin = { { 0, "", "", "" }, - { 0, "Spell_Holy_SealOfMight", "=q16=#t0s4#", "" }, + { 0, "CLASSpaladin", "=q16=#t0s4#", "" }, { 0, "", "", "" }, { 16727, "INV_Helmet_08", "=q3=Lightforge Helm", "=ds=#s1#, #a4# =q7=#db33#" }, { 16729,"INV_Shoulder_10","=q3=Lightforge Spaulders", "=ds=#s3#, #a4# =q7=#db62#" }, @@ -2032,7 +2032,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 0, "Spell_Holy_SealOfMight", "=q16=#t05s4#", "" }, + { 0, "CLASSpaladin", "=q16=#t05s4#", "" }, { 0, "", "", "" }, { 22091, "INV_Helmet_08", "=q4=Soulforge Helm", "=ds=#s1#, #a4#" }, { 22093, "INV_Shoulder_10","=q3=Soulforge Spaulders", "=ds=#s3#, #a4#" }, @@ -2053,7 +2053,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGMage = { { 0, "", "", "" }, - { 0,"Spell_Frost_IceStorm", "=q10=#zgs3#","" }, + { 0,"CLASSmage", "=q10=#zgs3#","" }, { 0, "", "", "" }, { 19959, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Magic", "=ds=#s14#" }, { 19601, "INV_Jewelry_Necklace_26", "=q4=Jewel of Kajaro", "=ds=#r5#" }, @@ -2071,7 +2071,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGWarlock = { { 0, "", "", "" }, - { 0,"Spell_Shadow_CurseOfTounges", "=q11=#zgs8#","" }, + { 0,"CLASSwarlock", "=q11=#zgs8#","" }, { 0, "", "", "" }, { 19957, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Destruction", "=ds=#s14#" }, { 19605, "INV_Jewelry_Necklace_26", "=q4=Kezan's Unstoppable Taint", "=ds=#r5#" }, @@ -2089,7 +2089,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGPriest = { { 0, "", "", "" }, - { 0,"Spell_Holy_PowerWordShield", "=q9=#zgs5#","" }, + { 0,"CLASSpriest", "=q9=#zgs5#","" }, { 0, "", "", "" }, { 19958, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Healing", "=ds=#s14#" }, { 19594, "INV_Jewelry_Necklace_26", "=q4=The All-Seeing Eye of Zuldazar", "=ds=#r5#" }, @@ -2107,7 +2107,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGRogue = { { 0, "", "", "" }, - { 0,"Ability_BackStab", "=q12=#zgs6#","" }, + { 0,"CLASSrogue", "=q12=#zgs6#","" }, { 0, "", "", "" }, { 19954, "INV_Jewelry_Necklace_19", "=q4=Renataki's Charm of Trickery", "=ds=#s14#" }, { 19617, "INV_Jewelry_Necklace_26", "=q4=Zandalarian Shadow Mastery Talisman", "=ds=#r5#" }, @@ -2125,7 +2125,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGDruid = { { 0, "", "", "" }, - { 0,"Spell_Nature_Regeneration", "=q13=#zgs1#","" }, + { 0,"CLASSdruid", "=q13=#zgs1#","" }, { 0, "", "", "" }, { 19955, "INV_Jewelry_Necklace_19", "=q4=Wushoolay's Charm of Nature", "=ds=#s14#" }, { 19613, "INV_Jewelry_Necklace_26", "=q4=Pristine Enchanted South Seas Kelp", "=ds=#r5#" }, @@ -2143,7 +2143,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGHunter = { { 0, "", "", "" }, - { 0,"Ability_Hunter_RunningShot", "=q14=#zgs2#","" }, + { 0,"CLASShunter", "=q14=#zgs2#","" }, { 0, "", "", "" }, { 19953, "INV_Jewelry_Necklace_19", "=q4=Renataki's Charm of Beasts", "=ds=#s14#" }, { 19621, "INV_Jewelry_Necklace_26", "=q4=Maelstrom's Wrath", "=ds=#r5#" }, @@ -2161,7 +2161,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGShaman = { { 0, "", "", "" }, - { 0,"Spell_FireResistanceTotem_01", "=q15=#zgs7#","" }, + { 0,"CLASSshaman", "=q15=#zgs7#","" }, { 0, "", "", "" }, { 19956, "INV_Jewelry_Necklace_19", "=q4=Wushoolay's Charm of Spirits", "=ds=#s14#" }, { 19609, "INV_Jewelry_Necklace_26", "=q4=Unmarred Vision of Voodress", "=ds=#r5#" }, @@ -2179,7 +2179,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, ZGWarrior = { { 0, "", "", "" }, - { 0,"INV_Shield_05", "=q17=#zgs9#","" }, + { 0,"CLASSwarrior", "=q17=#zgs9#","" }, { 19951, "INV_Jewelry_Necklace_19", "=q4=Gri'lek's Charm of Might", "=ds=#s14#" }, { 19577, "INV_Jewelry_Necklace_26", "=q4=Rage of Mugamba", "=ds=#r5#" }, { 19822, "INV_Chest_Plate07", "=q4=Zandalar Vindicator's Breastplate", "=q4=#x10#=ds=, #r4#" }, @@ -2195,7 +2195,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { } }, ZGPaladin = { - { 0,"Spell_Holy_SealOfMight", "=q16=#zgs4#","" }, + { 0,"CLASSpaladin", "=q16=#zgs4#","" }, { 0, "", "", "" }, { 19952, "INV_Jewelry_Necklace_19", "=q4=Gri'lek's Charm of Valor", "=ds=#s14#" }, { 19588, "INV_Jewelry_Necklace_26", "=q4=Hero's Brand", "=ds=#r5#" }, @@ -2213,7 +2213,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Mage = { { 0, "", "", "" }, - { 0,"Spell_Frost_IceStorm", "=q10=#aq20s3#","" }, + { 0,"CLASSmage", "=q10=#aq20s3#","" }, { 0, "", "", "" }, { 21413, "INV_Sword_57", "=q4=Blade of Vaulted Secrets", "=q4=#x19#=ds=, #r5#" }, { 21415, "INV_Misc_Cape_19", "=q4=Drape of Vaulted Secrets", "=q3=#x20#=ds=, #r4#" }, @@ -2227,7 +2227,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Warlock = { { 0, "", "", "" }, - { 0,"Spell_Shadow_CurseOfTounges", "=q11=#aq20s8#","" }, + { 0,"CLASSwarlock", "=q11=#aq20s8#","" }, { 0, "", "", "" }, { 21416, "INV_Weapon_ShortBlade_27", "=q4=Kris of Unspoken Names", "=q4=#x19#=ds=, #r5#" }, { 21418, "INV_Misc_Cape_20", "=q4=Shroud of Unspoken Names", "=q3=#x23#=ds=, #r4#" }, @@ -2241,7 +2241,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Priest = { { 0, "", "", "" }, - { 0,"Spell_Holy_PowerWordShield", "=q9=#aq20s5#","" }, + { 0,"CLASSpriest", "=q9=#aq20s5#","" }, { 0, "", "", "" }, { 21410, "INV_Mace22", "=q4=Gavel of Infinite Wisdom", "=q4=#x19#=ds=, #r5#" }, { 21412, "INV_Misc_Cape_16", "=q4=Shroud of Infinite Wisdom", "=q3=#x20#=ds=, #r4#" }, @@ -2255,7 +2255,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Rogue = { { 0, "", "", "" }, - { 0,"Ability_BackStab", "=q12=#aq20s6#","" }, + { 0,"CLASSrogue", "=q12=#aq20s6#","" }, { 0, "", "", "" }, { 21404, "INV_Weapon_ShortBlade_27", "=q4=Dagger of Veiled Shadows", "=q4=#x24#=ds=, #r5#" }, { 21406, "INV_Misc_Cape_19", "=q4=Cloak of Veiled Shadows", "=q3=#x20#=ds=, #r4#" }, @@ -2269,7 +2269,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Druid = { { 0, "", "", "" }, - { 0,"Spell_Nature_Regeneration", "=q13=#aq20s1#","" }, + { 0,"CLASSdruid", "=q13=#aq20s1#","" }, { 0, "", "", "" }, { 21407, "INV_Mace22", "=q4=Mace of Unending Life", "=q4=#x19#=ds=, #r5#" }, { 21409, "INV_Misc_Cape_15", "=q4=Cloak of Unending Life", "=q3=#x23#=ds=, #r4#" }, @@ -2283,7 +2283,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Hunter = { { 0, "", "", "" }, - { 0,"Ability_Hunter_RunningShot", "=q14=#aq20s2#","" }, + { 0,"CLASShunter", "=q14=#aq20s2#","" }, { 0, "", "", "" }, { 21401, "INV_Axe_15", "=q4=Scythe of the Unseen Path", "=q4=#x24#=ds=, #r5#" }, { 21403, "INV_Misc_Cape_15", "=q4=Cloak of the Unseen Path", "=q3=#x23#=ds=, #r4#" }, @@ -2297,7 +2297,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Paladin = { { 0, "", "", "" }, - { 0,"Spell_Holy_SealOfMight", "=q16=#aq20s4#","" }, + { 0,"CLASSpaladin", "=q16=#aq20s4#","" }, { 0, "", "", "" }, { 21395, "INV_Sword_57", "=q4=Blade of Eternal Justice", "=q4=#x24#=ds=, #r5#" }, { 21397, "INV_Misc_Cape_14", "=q4=Cape of Eternal Justice", "=q3=#x23#=ds=, #r4#" }, @@ -2311,7 +2311,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Shaman = { { 0, "", "", "" }, - { 0,"Spell_FireResistanceTotem_01", "=q15=#aq20s7#","" }, + { 0,"CLASSshaman", "=q15=#aq20s7#","" }, { 0, "", "", "" }, { 21398, "INV_Mace22", "=q4=Hammer of the Gathering Storm", "=q4=#x24#=ds=, #r5#" }, { 21400, "INV_Misc_Cape_16", "=q4=Cloak of the Gathering Storm", "=q3=#x23#=ds=, #r4#" }, @@ -2325,7 +2325,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }, AQ20Warrior = { { 0, "", "", "" }, - { 0,"INV_Shield_05", "=q17=#aq20s9#","" }, + { 0,"CLASSwarrior", "=q17=#aq20s9#","" }, { 0, "", "", "" }, { 21392, "INV_Axe_15", "=q4=Sickle of Unyielding Strength", "=q4=#x24#=ds=, #r5#" }, { 21394, "INV_Misc_Cape_20", "=q4=Drape of Unyielding Strength", "=q3=#x20#=ds=, #r4#" }, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 509fdd5..9b47f21 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -506,11 +506,9 @@ AtlasLoot_TableNames = { ["LKHMoroes"] = { AL["Lower Karazhan Halls"].." - "..AL["Moroes"], "AtlasLootItems" }, ["LKHTrash"] = { AL["Lower Karazhan Halls"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, ["LKHEnchants"] = { AL["Lower Karazhan Halls"].." - ".."Enchants", "AtlasLootItems" }, - ------------ --- Sets --- ------------ - --Vanilla WoW Sets ["DEADMINES"] = { AL["The Deadmines"], "AtlasLootSetItems" }, ["WAILING"] = { AL["Wailing Caverns"], "AtlasLootSetItems" }, @@ -652,39 +650,31 @@ AtlasLoot_TableNames = { ------------------------ --- Misc Collections --- ------------------------ - ["CraftedWeapons1"] = { AL["Crafted Epic Weapons"], "AtlasLootCrafting" }, ["WorldEpics1"] = { AL["World Epics"] .. " - " .. AL["Level 30-39"], "AtlasLootSetItems" }, ["WorldEpics2"] = { AL["World Epics"] .. " - " .. AL["Level 40-49"], "AtlasLootSetItems" }, ["WorldEpics3"] = { AL["World Epics"] .. " - " .. AL["Level 50-60"], "AtlasLootSetItems" }, - -------------------- --- World Bosses --- -------------------- - - --Azuregos - ["AAzuregos"] = { AL["Azuregos"], "AtlasLootWBItems" }, - ["ASpiritA"] = { AL["Spirit of Azuregos"], "AtlasLootWBItems" }, + ["AAzuregos"] = { AL["Azshara"].. " - " ..AL["Azuregos"], "AtlasLootWBItems" }, + ["ASpiritA"] = { AL["Azshara"].. " - " ..AL["Spirit of Azuregos"], "AtlasLootWBItems" }, --["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" }, - ["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" }, - ["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" }, - ["Ostarius"] = { "Ostarius", "AtlasLootWBItems" }, - ["Concavius"] = { "Concavius", "AtlasLootWBItems" }, - ["CowKing"] = { "Moo", "AtlasLootWBItems" }, - --Doom Lord Kazzak - ["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" }, - --Emrald Dragons - ["DEmeriss"] = { AL["Emeriss"], "AtlasLootWBItems" }, - ["DLethon"] = { AL["Lethon"], "AtlasLootWBItems" }, - ["DTaerar"] = { AL["Taerar"], "AtlasLootWBItems" }, - ["DYsondre"] = { AL["Ysondre"], "AtlasLootWBItems" }, - ["DTrash"] = { AL["Emerald Dragons"].." - "..AL["Trash Mobs"], "AtlasLootWBItems" }, - ["Clackora"] = { "Cla'ckora", "AtlasLootWBItems" }, - - - -------------------------- - --- Rare Spawns (1.16) --- - -------------------------- + ["Nerubian"] = { AL["Eastern Plaguelands"].. " - " ..AL["Nerubian Overseer"], "AtlasLootWBItems" }, + ["Reaver"] = { AL["Deadwind Pass"].. " - " ..AL["Dark Reaver of Karazhan"], "AtlasLootWBItems" }, + ["Ostarius"] = { AL["Tanaris"].. " - " ..AL["Ostarius"], "AtlasLootWBItems" }, + ["Concavius"] = { AL["Desolace"].. " - " ..AL["Concavius"], "AtlasLootWBItems" }, + ["CowKing"] = { AL["Moomoo Grove"].. " - " ..AL["Moo"], "AtlasLootWBItems" }, + ["KKazzak"] = { AL["Blasted Lands"].. " - " ..AL["Lord Kazzak"], "AtlasLootWBItems" }, + ["DEmeriss"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Emeriss"], "AtlasLootWBItems" }, + ["DLethon"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Lethon"], "AtlasLootWBItems" }, + ["DTaerar"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Taerar"], "AtlasLootWBItems" }, + ["DYsondre"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Ysondre"], "AtlasLootWBItems" }, + ["DTrash"] = { AL["Emerald Dragons"].. " - " ..AL["Trash Mobs"], "AtlasLootWBItems" }, + ["Clackora"] = { AL["Azshara"].. " - " ..AL["Cla'ckora"], "AtlasLootWBItems" }, + ------------------- + --- Rare Spawns --- + ------------------- ["Tarangos"] = { "Tarangos The Dampener", "AtlasLootWBItems" }, ["Kargron"] = { "Blademaster Kargron", "AtlasLootWBItems" }, ["Xalvic"] = { "Xalvic Blackclaw", "AtlasLootWBItems" }, @@ -696,10 +686,6 @@ AtlasLoot_TableNames = { ["Jalakar"] = { "Jal'akar Dire Troll", "AtlasLootWBItems" }, ["Ashbeard"] = { "Explorer Ashbeard", "AtlasLootWBItems" }, ["AdmiralBareanWestwind"] = { "Admiral Barean Westwind", "AtlasLootWBItems" }, - - -------------------------- - --- Rare Spawns (1.17) --- - -------------------------- ["EarthcallerRezengal"] = { "Earthcaller Rezengal", "AtlasLootWBItems" }, ["ShadeMage"] = { "Shade Mage", "AtlasLootWBItems" }, ["GraypawAlpha"] = { "Graypaw Alpha", "AtlasLootWBItems" }, @@ -725,21 +711,13 @@ AtlasLoot_TableNames = { ["M0L1Y"] = { "M-0L1Y", "AtlasLootWBItems" }, ["WidowoftheWoods"] = { "Widow of the Woods", "AtlasLootWBItems" }, ["KinTozo"] = { "Kin'Tozo", "AtlasLootWBItems" }, - - ---------------------------- - --- Rare Spawns (1.17.1) --- - ---------------------------- ["ProfessorLysander"] = { "Professor Lysander", "AtlasLootWBItems" }, - -------------- --- Events --- -------------- - - --Abyssal Council ["AbyssalTemplars"] = { "Abyssal Council - Templars", "AtlasLootWorldEvents" }, ["AbyssalDukes"] = { "Abyssal Council - Dukes", "AtlasLootWorldEvents" }, ["AbyssalLords"] = { "Abyssal Council - Lords", "AtlasLootWorldEvents" }, - --Seasonal ["ChildrensWeek"] = { AL["Children's Week"], "AtlasLootWorldEvents" }, ["Halloween1"] = { AL["Hallow's End"], "AtlasLootWorldEvents" }, ["Halloween2"] = { AL["Hallow's End"], "AtlasLootWorldEvents" }, @@ -752,60 +730,40 @@ AtlasLoot_TableNames = { ["Winterviel"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, ["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, ["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, - --Other ["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" }, ["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" }, ["GurubashiArena"] = { AL["Gurubashi Arena"], "AtlasLootWorldEvents" }, ["ScourgeInvasionEvent1"] = { AL["Scourge Invasion"], "AtlasLootWorldEvents" }, ["ScourgeInvasionEvent2"] = { AL["Scourge Invasion Bosses"], "AtlasLootWorldEvents" }, - ------------------------ --- Classic Factions --- ------------------------ - --Argent Dawn ["Argent1"] = { AL["Argent Dawn"] .. " - Token Hand-ins", "AtlasLootRepItems" }, ["Argent2"] = { AL["Argent Dawn"], "AtlasLootRepItems" }, ["Argent3"] = { AL["Argent Dawn"], "AtlasLootRepItems" }, - --Bloodsail Buccaneers ["Bloodsail1"] = { AL["Bloodsail Buccaneers"], "AtlasLootRepItems" }, - --Brood of Nozdormu ["AQBroodRings"] = { AL["Brood of Nozdormu"], "AtlasLootRepItems" }, - --Cenarion Circle ["Cenarion1"] = { AL["Cenarion Circle"] .. " - " .. AL["Friendly"], "AtlasLootRepItems" }, ["Cenarion2"] = { AL["Cenarion Circle"] .. " - " .. AL["Honored"], "AtlasLootRepItems" }, ["Cenarion3"] = { AL["Cenarion Circle"] .. " - " .. AL["Revered"], "AtlasLootRepItems" }, ["Cenarion4"] = { AL["Cenarion Circle"] .. " - " .. AL["Exalted"], "AtlasLootRepItems" }, - --The Darkmoon Faire ["Darkmoon"] = { AL["Darkmoon Faire"], "AtlasLootRepItems" }, - --The Defilers ["Defilers"] = { AL["The Defilers"], "AtlasLootRepItems" }, - --Frostwolf Clan ["Frostwolf1"] = { AL["Frostwolf Clan"], "AtlasLootRepItems" }, - --Hydraxian Waterlords ["WaterLords1"] = { AL["Hydraxian Waterlords"], "AtlasLootRepItems" }, - --Gelkis Clan Centaur ["GelkisClan1"] = { AL["Gelkis Clan Centaur"], "AtlasLootRepItems" }, - --The League of Arathor ["LeagueofArathor"] = { AL["The League of Arathor"], "AtlasLootRepItems" }, - --Magram Clan Centaur ["MagramClan1"] = { AL["Magram Clan Centaur"], "AtlasLootRepItems" }, - --Stormpike Guard ["Stormpike1"] = { AL["Stormpike Guard"], "AtlasLootRepItems" }, - --Thorium Brotherhood ["Thorium1"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" }, ["Thorium2"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" }, - --Timbermaw Hold ["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" }, - --Wardens of Time ["Wardens1"] = { AL["Wardens of Time"] .. " - " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" }, ["Wardens2"] = { AL["Wardens of Time"] .. " - " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" }, - --Wintersaber Trainers ["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" }, - --Zandalar Tribe ["Zandalar1"] = { AL["Zandalar Tribe"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" }, ["Zandalar2"] = { AL["Zandalar Tribe"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" }, - ["Helf"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" }, ["Helf2"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" }, ["Helf3"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" }, @@ -823,11 +781,9 @@ AtlasLoot_TableNames = { ["ThunderBluff"] = { AL["Thunder Bluff"], "AtlasLootRepItems" }, ["Dalaran"] = { AL["Dalaran"], "AtlasLootRepItems" }, ["Wildhammer"] = { AL["Wildhammer Clan"], "AtlasLootRepItems" }, - -------------- --- Trades --- -------------- - --Alchemy ["AlchemyApprentice1"] = { AL["Alchemy"] .. ": " .. AL["Apprentice"], "AtlasLootCrafting" }, ["AlchemyJourneyman1"] = { AL["Alchemy"] .. ": " .. AL["Journeyman"], "AtlasLootCrafting" }, @@ -999,13 +955,9 @@ AtlasLoot_TableNames = { ["Survival2"] = { AL["Gardening"], "AtlasLootCrafting" }, --Poisons ["Poisons1"] = { AL["Rogue"] .. " - " .. AL["Poisons"], "AtlasLootCrafting" }, - - ----------- --- PvP --- ----------- - - --Battlegrounds --Blood Ring ["BRRepFriendly"] = { AL["Blood Ring"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" }, ["BRRepHonored"] = { AL["Blood Ring"] .. " - " .. AL["Honored"], "AtlasLootBGItems" }, @@ -1062,11 +1014,9 @@ AtlasLoot_TableNames = { ["PVPShaman"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" }, ["PVPWarlock"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" }, ["PVPWarrior"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" }, - ------------- --- Other --- ------------- - --Menus, the entry does nothing, but makes the generalised loot table code less complex ["DUNGEONSMENU1"] = { "dummy", "dummy" }, ["DUNGEONSMENU2"] = { "dummy", "dummy" }, @@ -1076,22 +1026,21 @@ AtlasLoot_TableNames = { ["ABRepMenu"] = { "dummy", "dummy" }, ["WSGRepMenu"] = { "dummy", "dummy" }, ["BRRepMenu"] = { "dummy", "dummy" }, - ["AQ40SET"] = { "dummy", "dummy" }, - ["AQ20SET"] = { "dummy", "dummy" }, - ["ZGSET"] = { "dummy", "dummy" }, ["PRE60SET"] = { "dummy", "dummy" }, - ["T3SET"] = { "dummy", "dummy" }, - ["T2SET"] = { "dummy", "dummy" }, - ["T1SET"] = { "dummy", "dummy" }, + ["ZGSET"] = { "dummy", "dummy" }, + ["AQ20SET"] = { "dummy", "dummy" }, + ["AQ40SET"] = { "dummy", "dummy" }, + ["KARASET"] = { "dummy", "dummy" }, ["T0SET"] = { "dummy", "dummy" }, + ["T1SET"] = { "dummy", "dummy" }, + ["T2SET"] = { "dummy", "dummy" }, + ["T3SET"] = { "dummy", "dummy" }, ["REPMENU"] = { "dummy", "dummy" }, ["SETMENU"] = { "dummy", "dummy" }, ["WORLDEPICS"] = { "dummy", "dummy" }, ["WORLDEVENTMENU"] = { "dummy", "dummy" }, - ["AbyssalCouncil"] = { "dummy", "dummy" }, ["ALCHEMYMENU"] = { "dummy", "dummy" }, ["CRAFTSET"] = { "dummy", "dummy" }, - ["HONORMENU"] = { "dummy", "dummy" }, ["CRAFTINGMENU"] = { "dummy", "dummy" }, ["SMITHINGMENU"] = { "dummy", "dummy" }, ["ENCHANTINGMENU"] = { "dummy", "dummy" }, @@ -1102,11 +1051,9 @@ AtlasLoot_TableNames = { ["FIRSTAIDMENU"] = { "dummy", "dummy" }, ["WORLDBOSSMENU"] = { "dummy", "dummy" }, ["JEWELCRAFTMENU"] = { "dummy", "dummy" }, - ["KARASET"] = { "dummy", "dummy" }, ["WishList"] = { AL["WishList"], "AtlasLootCharDB" }, --If all else fails! ["EmptyInstance"] = { "AtlasLoot", "AtlasLootFallback" }, - }; AtlasLoot_TableNamesBoss = { @@ -1423,6 +1370,7 @@ AtlasLoot_TableNamesBoss = { ["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" }, ["AQ20ClassBooks"] = { "AQ Class Books", "AtlasLootItems" }, ["AQ20Enchants"] = { "AQ Enchants", "AtlasLootItems" }, + ["AQ20SET"] = { AL["Ruins of Ahn'Qiraj Sets"], "AtlasLootSetItems"}, }, ["Scarlet Monestery - Armory"] = { ["SMHerod"] = { AL["Herod"], "AtlasLootItems" }, @@ -1640,6 +1588,7 @@ AtlasLoot_TableNamesBoss = { ["ZGTrash1"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" }, ["ZGTrash2"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" }, ["ZGEnchants"] = { "ZG Enchants", "AtlasLootItems" }, + ["ZGSET"] = { AL["Zul'Gurub Sets"], "AtlasLootSetItems"} }, ["Emerald Sanctum"] = { ["ESErennius"] = { AL["Erennius"], "AtlasLootItems" }, @@ -1841,7 +1790,7 @@ AtlasLoot_TableNamesBoss = { ["DTaerar"] = { AL["Taerar"], "AtlasLootWBItems" }, ["DYsondre"] = { AL["Ysondre"], "AtlasLootWBItems" }, ["DTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Emerald Dragons"] .. ")", "AtlasLootWBItems" }, - ["Clackora"] = { "Cla'ckora", "AtlasLootWBItems" }, + ["Clackora"] = { AL["Cla'ckora"], "AtlasLootWBItems" }, }, -------------------