From 0c930e9dbbd04aaf8a4e3133a5f98ad72dee02c8 Mon Sep 17 00:00:00 2001 From: merstrax Date: Fri, 11 Mar 2022 11:37:25 -0500 Subject: [PATCH] -Fixed Search Bar -Fixed Searching for spells -Simplified setting current expac -Added dropdown selection for expac tables --- AtlasLoot/Core/AtlasDifficulty.lua | 31 +++++- AtlasLoot/Core/AtlasLoot.lua | 103 ++++++++++-------- AtlasLoot/Core/ExtraText.lua | 4 +- AtlasLoot/Core/Search.lua | 9 +- .../DefaultFrame/AtlaslootDefaultFrame.lua | 72 ++++++------ AtlasLoot/Locales/constants.en.lua | 3 + AtlasLoot/Menus/PvPMenus.lua | 62 +++++------ AtlasLoot/Menus/RepMenus.lua | 103 +++++++++--------- AtlasLoot/Menus/SetMenus.lua | 80 +++++++------- AtlasLoot/TableRegister/loottables.en.lua | 18 +-- 10 files changed, 260 insertions(+), 225 deletions(-) diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua index d4afb5a..a50efb3 100644 --- a/AtlasLoot/Core/AtlasDifficulty.lua +++ b/AtlasLoot/Core/AtlasDifficulty.lua @@ -189,18 +189,39 @@ AtlasLoot_Difficulty = { }, }; + ["Expansion"] = { + [1] = { + {"Classic", "=ex=CLASSIC", [4] = "Submenu"} + }, + [2] = { + {"Burning Crusade", "=ex=TBC", [4] = "Submenu"} + }, + [3] ={ + {"Wrath of the Lich King", "=ex=WRATH", [4] = "Submenu"} + } + }, - ["Search"] = {"Bloodforged", "Normal", "Heroic", "Mythic", "Mythic 1", "Mythic 2","Mythic 3","Mythic 4","Mythic 5", "Mythic 6","Mythic 7", - "Mythic 8","Mythic 9", "Mythic 10", "Mythic 11", "Mythic 12","Mythic 13","Mythic 14","Mythic 15", "Mythic 16","Mythic 17","Mythic 18", - "Mythic 19", "Mythic 20", [99] = "Ascended"}; + + ["Search"] = {"Bloodforged", "Normal", "Heroic", "Mythic", + "Mythic 1", "Mythic 2","Mythic 3","Mythic 4","Mythic 5", "Mythic 6","Mythic 7", "Mythic 8","Mythic 9", "Mythic 10", + "Mythic 11", "Mythic 12","Mythic 13","Mythic 14","Mythic 15", "Mythic 16","Mythic 17","Mythic 18", "Mythic 19", "Mythic 20", + "Mythic 21", "Mythic 22","Mythic 23","Mythic 24","Mythic 25", "Mythic 26","Mythic 27", "Mythic 28","Mythic 29", "Mythic 30", + "Mythic 31", "Mythic 32","Mythic 33","Mythic 34","Mythic 35", "Mythic 36","Mythic 37","Mythic 38", "Mythic 39", "Mythic 40", + [99] = "Ascended"}; --Enums for comparisons in code Bloodforged = 1; Normal = 2; Heroic = 3; - Mythic = 4; --Use for Ascended as well + Mythic = 4; + Ascended = 4; - MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34}; --Usage AtlasLoot_Difficulty.MythicPlus[1-30]; + MythicPlus = { + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 + }; --Usage AtlasLoot_Difficulty.MythicPlus[1-40]; DIF_SEARCH = 16; DUPLICATE = 17; diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index ef24baf..4d01884 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -74,6 +74,9 @@ local ATLAS_LOOT_BOSS_LINES = 25; --Flag so that error messages do not spam local ATLASLOOT_POPUPSHOWN = false; +--Set constants for expansions +local ATLAS_EXPANSION = {"CLASSIC", "TBC", "WRATH"}; + --Set the default anchor for the loot frame to the Atlas frame AtlasLoot_AnchorFrame = AtlasFrame; @@ -91,7 +94,7 @@ SearchPrevData = {"", "", "", ""}; AtlasLootCharDB={}; -local AtlasLootDBDefaults = { +local AtlasLootDBDefaults = { profile = { SavedTooltips = {}, SafeLinks = true, @@ -247,7 +250,7 @@ function AtlasLoot_OnVariablesLoaded() AtlasScrollBar_Update = AtlasLoot_AtlasScrollBar_Update; if( not AtlasLoot.db.profile.LootBrowserStyle ) then AtlasLoot.db.profile.LootBrowserStyle = 1; - end + end --Set visual style for the loot browser if( not AtlasLoot.db.profile.CraftingLink ) then AtlasLoot.db.profile.CraftingLink = 1; @@ -389,7 +392,7 @@ function AtlasLoot_OnVariablesLoaded() InterfaceOptions_AddCategory(panel); if LibStub:GetLibrary("LibAboutPanel", true) then LibStub("LibAboutPanel").new(AL["AtlasLoot"], "AtlasLoot"); - end + end AtlasLoot_UpdateLootBrowserScale(); end @@ -437,7 +440,7 @@ function AtlasLoot_Reset(data) end DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..RED..AL["Reset complete!"]); end - + --[[ AtlasLoot_SlashCommand(msg): @@ -489,17 +492,16 @@ function AtlasLoot_OnLoad() SlashCmdList["ATLASLOOT"] = function(msg) AtlasLoot_SlashCommand(msg); end - AtlasLoot_SetExpac(); -end -function AtlasLoot_SetExpac() - if GetAccountExpansionLevel() == 0 then - AtlasLoot_Expac = "CLASSIC" - elseif GetAccountExpansionLevel() == 1 then - AtlasLoot_Expac = "TBC" - elseif GetAccountExpansionLevel() == 2 then - AtlasLoot_Expac = "WRATH" - end + --Set defualt to classic as that seems to be where most players are. + local function getExpacByLevel() + if UnitLevel("player") > 60 then + return "TBC" + else + return "CLASSIC" + end + end + AtlasLoot_Expac = ATLAS_EXPANSION[GetAccountExpansionLevel()] or getExpacByLevel(); end --[[ @@ -594,25 +596,26 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if DewDrop2Enable or not dataID == nil or lastReference then dataID = gsub(dataID, lastReference, ""); -- removes old table reference before adding a new 1 if needed end - + if dataID:match("MENU") and ATLASLOOT_FILTER_ENABLE then AtlasLootFilterCheck:SetChecked(false); ATLASLOOT_FILTER_ENABLE = false end + if (AtlasLootItemsFrame:GetParent() == AlphaMapAlphaMapFrame or AtlasLootItemsFrame:GetParent() == AtlasFrame) then - AtlasMapMenu = true; + AtlasMapMenu = true; else AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); AtlasMapMenu = false; end - if Type == nil and ATLASLOOT_FILTER_ENABLE == false or dataID:match("MENU") or ATLASLOOT_FILTER_ENABLE and dataSource[AtlasLoot_CurrentBoss].Type == nil then -- disable difficulty menu + if Type == nil and ATLASLOOT_FILTER_ENABLE == false or ATLASLOOT_FILTER_ENABLE and dataSource[AtlasLoot_CurrentBoss].Type == nil then -- disable difficulty menu AtlasLoot_DifficultyDisable() AtlasLoot_CurrentBoss = dataID; elseif ATLASLOOT_FILTER_ENABLE then AtlasLoot_DifficultyEnable(AtlasLoot_CurrentBoss, dataSource) - elseif Type ~= nil then-- enable difficulty menu + elseif Type ~= nil then-- enable difficulty menu AtlasLoot_DifficultyEnable(dataID, dataSource) AtlasLoot_CurrentBoss = dataID end @@ -625,10 +628,21 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) dataID = dataID .. tableReference; DewDrop2Enable = true; lastReference = tableReference; + elseif isTableExpansion then + local function cleanTableName(tid) + for i = 1, #ATLAS_EXPANSION do + tid = gsub(tid, ATLAS_EXPANSION[i], ""); + end + return tid; + end + dataID = cleanTableName(dataID); + dataID = dataID..tableReference; + lastReference = ""; + DewDrop2Enable = true; else DewDrop2Enable = false; end - + --Hide UI objects so that only needed ones are shown for i = 1, 30, 1 do getglobal("AtlasLootItem_"..i.."_Unsafe"):Hide(); @@ -640,6 +654,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if AtlasLoot_TableNames[dataID] ~= nil and AtlasLoot_TableNames[dataID][2] == "Menu" then AtlasLoot_GenerateAtlasMenu(dataID, pFrame); + lastType = dataSource[dataID].Type return; end @@ -670,12 +685,12 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) else isItem = true; end - + if isItem then if ItemindexID == "Bloodforged" then IDfound = "60"..dataSource[dataID][i][2]; else - --Sets ItemindexID to normal(2) if it is nil for min/max difficulties. + --Sets ItemindexID to normal(2) if it is nil for min/max difficulties. if not tonumber(ItemindexID) then ItemindexID = AtlasLoot_Difficulty.Normal end; --Checks if an item has a Maximum difficulty, this is to correct some items that have an entry for higher difficulties then they really do @@ -697,7 +712,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end end end - + itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture = GetItemInfo(IDfound); --If the client has the name of the item in cache, use that instead. --This is poor man's localisation, English is replaced be whatever is needed @@ -729,7 +744,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if dataID ~= "FilterList" then AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, boss, pFrame} end - + --Insert the item description if dataSource[dataID][i][6] and dataSource[dataID][i][6] ~= "" then extra = dataSource[dataID][i][6]; @@ -771,7 +786,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end itemButton.name = text; itemButton.extra = extra; - + --Highlight items in the wishlist if IDfound ~= "" and IDfound ~= 0 and dataID ~= "WishList" and AtlasLootWishList["Options"][UnitName("player")]["Mark"] == true then local xitemexistwish, itemwishicons = AtlasLoot_WishListCheck(IDfound, true) @@ -790,8 +805,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) elseif ((string.sub(IDfound, 1, 1) == "s") and notPattern == true and (tonumber(dataSource[dataID][i][3]))) then itemButton.itemID = dataSource[dataID][i][3]; itemButton.spellitemID = dataSource[dataID][i][3]; - else - itemButton.itemID = IDfound; + else + itemButton.itemID = IDfound; if tonumber(dataSource[dataID][i][3]) then itemButton.spellitemID = dataSource[dataID][i][3]; @@ -847,7 +862,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) itemButton.i = 1; itemButton:Show(); - + if IDfound == 0 then getglobal("AtlasLootItem_"..i.."_Unsafe"):Hide(); end end @@ -867,7 +882,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if dataID ~= "FilterList" then AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, boss, pFrame} end - + --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 --((dataSource[dataID][i][2] ~= 0) and (not GetItemInfo(dataSource[dataID][i][2])) @@ -883,7 +898,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) getglobal("AtlasLootItem_"..i.."_Unsafe"):Hide(); end end - + --This is a valid QuickLook, so show the UI objects AtlasLoot_QuickLooks:Show(); AtlasLootQuickLooksButton:Show(); @@ -901,11 +916,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if AtlasLoot_Data[dataID].Dif ~= nil then local d = AtlasLoot_Data[dataID].Type or "Dungeon" affix = " ("..AtlasLoot_Difficulty[d][GetDifficultyTier()]..")" - end + end AtlasLoot_BossName:SetText(AtlasLoot_TableNames[dataID][1]..affix); else AtlasLoot_BossName:SetText(boss); - end + end --Consult the button registry to determine what nav buttons are required if dataID == "SearchResult" or dataID == "WishList" then @@ -972,10 +987,10 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) text = AtlasLoot_Data[dataID][i][4]; text = AtlasLoot_FixText(text); - + --Store data about the state of the items frame to allow minor tweaks or a recall of the current loot page AtlasLootItemsFrame.refresh = {dataID, "", "", pFrame}; - + --Insert the item description if AtlasLoot_Data[dataID][i][5] then extra = AtlasLoot_Data[dataID][i][5]; @@ -1004,7 +1019,7 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) itemButton.extra = extra; --Store where we want the menu button to link to itemButton.lootpage = AtlasLoot_Data[dataID][i][2]; - + --Set the name and description of the item nameFrame:SetText(text); extraFrame:SetText(extra); @@ -1012,24 +1027,24 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) itemButton.i = 1; itemButton:Show(); - + end - + end - - + + AtlasLoot_BossName:SetText(AtlasLoot_TableNames[dataID][1]); - + --This is not a valid QuickLook, so hide the UI objects AtlasLoot_QuickLooks:Hide(); AtlasLootQuickLooksButton:Hide(); AtlasLootFilterCheck:Hide(); - + --Hide navigation buttons by default, only show what we need getglobal("AtlasLootItemsFrame_BACK"):Hide(); getglobal("AtlasLootItemsFrame_NEXT"):Hide(); getglobal("AtlasLootItemsFrame_PREV"):Hide(); - + local tablebase = AtlasLoot_Data[dataID]; if tablebase.Next then getglobal("AtlasLootItemsFrame_NEXT"):Show(); @@ -1043,7 +1058,7 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) getglobal("AtlasLootItemsFrame_BACK"):Show(); getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back; end - + --For Alphamap and Atlas integration, show a 'close' button to hide the loot table and restore the map view if (AtlasLootItemsFrame:GetParent() == AlphaMapAlphaMapFrame or AtlasLootItemsFrame:GetParent() == AtlasFrame) then AtlasLootItemsFrame_CloseButton:Show(); @@ -1053,7 +1068,7 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) --Anchor the item frame where it is supposed to be AtlasLoot_SetItemInfoFrame(pFrame); - + end --[[ @@ -1356,7 +1371,7 @@ function AtlasLoot_QueryLootPage() while i<31 do now = GetTime(); if now - querytime > 0.01 then - querytime = GetTime(); + querytime = GetTime(); button = getglobal("AtlasLootItem_"..i); queryitem = button.itemID; if (queryitem) and (queryitem ~= nil) and (queryitem ~= "") and (queryitem ~= 0) and (string.sub(queryitem, 1, 1) ~= "s") then diff --git a/AtlasLoot/Core/ExtraText.lua b/AtlasLoot/Core/ExtraText.lua index c0b5676..bfb0e77 100644 --- a/AtlasLoot/Core/ExtraText.lua +++ b/AtlasLoot/Core/ExtraText.lua @@ -87,7 +87,7 @@ AtlasLoot_ExtraText = { BlackwingLair = { ""; GREY..INDENT..AL["Trash Mobs"]; - GREY..INDENT..AL["Tier 1/2 Sets"]; + GREY..INDENT..AL["Tier 2 Sets"]; }; CFRTheSteamvault = { ""; @@ -196,7 +196,7 @@ AtlasLoot_ExtraText = { }; MoltenCore = { ""; - GREY..INDENT..AL["Tier 1/2 Sets"]; + GREY..INDENT..AL["Tier 1 Sets"]; GREY..INDENT..AL["Random Boss Loot"]; GREY..INDENT..AL["Trash Mobs"]; }; diff --git a/AtlasLoot/Core/Search.lua b/AtlasLoot/Core/Search.lua index 0aad8f3..7f75e39 100644 --- a/AtlasLoot/Core/Search.lua +++ b/AtlasLoot/Core/Search.lua @@ -548,10 +548,11 @@ local function DoSearch(searchText) for _, v in ipairs(data) do local _, itemId, itemType, atlasName = unpack(v) - itemId = AL_FindId(string.sub(atlasName, 5), difficulty); - - itemId = tonumber(itemId); - + if (string.sub(itemId, 1, 1) ~= "s") then + itemId = AL_FindId(string.sub(atlasName, 5), difficulty) or itemId; + itemId = tonumber(itemId); + end + if type(itemId) == "number" and itemId > 0 then local itemName, itemQuality, itemLvl, minLvl, itemEquipLoc, itemSubType, stats = GetItemDetails(itemId, atlasName); if IsItemEquipableMatch(itemEquipLoc) and ItemMatchesAllTerms(searchTerms, itemName, stats, itemLvl, minLvl, itemQuality, itemEquipLoc, itemSubType) then diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index 4dc1477..7dd9815 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -57,7 +57,7 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype) AtlasLootDefaultFrame_SelectedTable:SetText(""); AtlasLootDefaultFrame_SelectedTable:Show(); SelectedTableTextSet = false; - else + else --Enable the submenu button AtlasLootDefaultFrame_SubMenu:Enable(); AtlasLoot_Lastboss = AtlasLoot_DewDropDown_SubTables[tablename][1][2]; @@ -81,7 +81,7 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype) AtlasLootDefaultFrame_SelectedCategory:SetText(text); AtlasLootDefaultFrame_SelectedCategory:Show(); AtlasLoot_Dewdrop:Close(1); -end +end --[[ AtlasLoot_DewDropSubMenuClick(tablename, text): @@ -111,7 +111,7 @@ AtlasLootDefaultFrame_OnShow: Called whenever the loot browser is shown and sets up buttons and loot tables ]] function AtlasLootDefaultFrame_OnShow() - --Definition of where I want the loot table to be shown + --Definition of where I want the loot table to be shown pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" }; --Having the Atlas and loot browser frames shown at the same time would --cause conflicts, so I hide the Atlas frame when the loot browser appears @@ -141,7 +141,7 @@ function AtlasLootDefaultFrame_OnHide() end AtlasLoot_Dewdrop:Close(1); AtlasLoot_DewdropSubMenu:Close(1); -end +end function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID, itemColour) if ATLASLOOT_FILTER_ENABLE == true then --used to refresh loottable when filter is enabled @@ -151,7 +151,11 @@ function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID, itemColour) -- gets itemID reference AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour) --Show the select loot table - AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]); + if type(itemID) ~= "number" and itemID:match("=ex=") then + AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]); + else + AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]); + end --Set text for difficulty AtlasLootDefaultFrame_SelectedTable2:SetText(DropTablename); AtlasLootDefaultFrame_SelectedTable2:Show(); @@ -181,6 +185,7 @@ end function AtlasLoot_DifficultyDisable() --Disables Difficulty Menu isTablereference = false notPattern = false + isTableExpansion = false; AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); AtlasLoot_DifficultyAtlas:Unregister(AtlasLootItemsFrame_DifficultyAtlasButton); @@ -204,38 +209,39 @@ function AtlasLoot_DifficultyEnable(dataID, dataSource) --Enables Difficulty Men AtlasLootItemsFrame_DifficultyAtlasButton:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1]) end SelectedTable2TextSet = true - else + else AtlasLootDefaultFrame_SubMenu2:Enable(); AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2); AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]); - if SelectedTable2TextSet == false then + if SelectedTable2TextSet == false then AtlasLootDefaultFrame_SelectedTable2:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1]) end AtlasLootDefaultFrame_SelectedTable2:Show(); SelectedTable2TextSet = true end - + end function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour) + isTablereference = false; + notPattern = false; + isTableExpansion = false; + if tonumber(itemID) or itemID:match("Bloodforged") then --used in itemID search feature for itemID database ItemindexID = itemID; - isTablereference = false; - notPattern = false; itemDefaultColour = itemColour; elseif itemID:match("=s=") then -- =s= infront of a table reference will make it show a normal crafting item instead of a crafting pattern - newID = gsub(itemID, "=s=",""); -- removes =s= before passing the extra table addition - newID = gsub(newID, "Normal",""); - tableReference = newID; + tableReference = gsub(gsub(itemID, "=s=",""), "Normal",""); isTablereference = true; notPattern = true; ItemindexID = ""; + elseif itemID:match("=ex=") then + tableReference = gsub(itemID, "=ex=", ""); + isTableExpansion = true; + ItemindexID = ""; else - newID = gsub(itemID, "=s=",""); - newID = gsub(newID, "Normal",""); - tableReference = newID; + tableReference = gsub(gsub(itemID, "=s=",""), "Normal",""); isTablereference = true; - notPattern = false; ItemindexID = ""; end DropTablename = raidtablename; @@ -561,7 +567,7 @@ function AtlasLoot_DewdropSubMenuRegister(loottable) 'arg2', v[1], 'notCheckable', true ) - + else AtlasLoot_DewdropSubMenu:AddLine( 'text', v[1], @@ -845,13 +851,13 @@ function AtlasLoot_SetNewStyle(style) "AtlasLootDefaultFrameWishListButton", "AtlasLootDefaultFrameAdvancedSearchButton", } - + if style == "new" then AtlasLootDefaultFrame_LootBackground:SetBackdrop({bgFile = "Interface/AchievementFrame/UI-Achievement-StatsBackground"}); AtlasLootDefaultFrame_LootBackground:SetBackdropColor(1,1,1,0.5) - AtlasLootDefaultFrame:SetBackdrop({bgFile = "Interface/AchievementFrame/UI-Achievement-AchievementBackground", - edgeFile = "Interface/Tooltips/UI-Tooltip-Border", - edgeSize = 16, + AtlasLootDefaultFrame:SetBackdrop({bgFile = "Interface/AchievementFrame/UI-Achievement-AchievementBackground", + edgeFile = "Interface/Tooltips/UI-Tooltip-Border", + edgeSize = 16, insets = { left = 4, right = 4, top = 4, bottom = 4 }}); AtlasLootDefaultFrame:SetBackdropColor(1,1,1,0.5) AtlasLootDefaultFrame:SetBackdropBorderColor(1,0.675,0.125,1) @@ -874,7 +880,7 @@ function AtlasLoot_SetNewStyle(style) local tex = getglobal(path):GetNormalTexture(); tex:SetTexCoord(0, 0.6640625, 0, 0.8); tex:SetHeight(32) - + local tex2 = getglobal(path):GetPushedTexture(); tex2:SetTexCoord(0, 0.6640625, 0, 0.8); tex2:SetHeight(32) @@ -884,18 +890,18 @@ function AtlasLoot_SetNewStyle(style) SetButtons(v) end elseif style == "old" then - + AtlasLootDefaultFrame_LootBackground:SetBackdrop({bgFile = ""}); - AtlasLootDefaultFrame_LootBackground:SetBackdropColor(0,0,0.5,0.5) - - AtlasLootDefaultFrame:SetBackdrop({bgFile = "Interface/DialogFrame/UI-DialogBox-Background", - edgeFile = "Interface/DialogFrame/UI-DialogBox-Border", - edgeSize = 32, + AtlasLootDefaultFrame_LootBackground:SetBackdropColor(0,0,0.5,0.5) + + AtlasLootDefaultFrame:SetBackdrop({bgFile = "Interface/DialogFrame/UI-DialogBox-Background", + edgeFile = "Interface/DialogFrame/UI-DialogBox-Border", + edgeSize = 32, insets = { left = 11, right = 12, top = 12, bottom = 11 }}); AtlasLootDefaultFrame:SetBackdropColor(1,1,1,1) AtlasLootDefaultFrame:SetBackdropBorderColor(1,1,1,1) - - + + AtlasLootDefaultFrameHeader:SetTexture("Interface/DialogFrame/UI-DialogBox-Header") AtlasLootDefaultFrameHeader:SetTexCoord(0,1,0,1) AtlasLootDefaultFrameHeader:SetWidth(425) @@ -915,7 +921,7 @@ function AtlasLoot_SetNewStyle(style) local tex = getglobal(path):GetNormalTexture(); tex:SetTexCoord(0, 0.625, 0, 0.6875); tex:SetHeight(20) - + local tex2 = getglobal(path):GetPushedTexture(); tex2:SetTexCoord(0, 0.625, 0, 0.6875); tex2:SetHeight(20) @@ -924,6 +930,6 @@ function AtlasLoot_SetNewStyle(style) for k,v in pairs(buttons) do SetButtons(v) end - + end end diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index f32a292..12f30e9 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -445,6 +445,9 @@ if AL then AL["PVP - Original WoW"] = true; AL["PVP - Burning Crusade"] = true; AL["PVP - Wrath of the Lich King"] = true; + AL["Collections - Original WoW"] = true; + AL["Collections - Burning Crusade"] = true; + AL["Collections - Wrath of the Lich King"] = true; -- Labels for loot table sections AL["Additional Heroic Loot"] = true; diff --git a/AtlasLoot/Menus/PvPMenus.lua b/AtlasLoot/Menus/PvPMenus.lua index 5dc1d67..411e9fa 100644 --- a/AtlasLoot/Menus/PvPMenus.lua +++ b/AtlasLoot/Menus/PvPMenus.lua @@ -4,46 +4,40 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0") local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["PVPMENUCLASSIC"] = { - { 1, "PVPMENUTBC", "INV_Helmet_66", "=ds="..AL["PVP - Burning Crusade"], ""}; - { 16, "PVPMENUWRATH", "INV_Misc_Ribbon_01", "=ds="..AL["PVP - Wrath of the Lich King"], ""}; - { 3, "PvP60Accessories1_A", "inv_jewelry_trinketpvp_01", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 60"]}; - { 4, "PVPSET", "INV_Axe_02", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 60"]}; - { 6, "PVPMENU2", "INV_Jewelry_Necklace_21", "=ds="..AL["BG PvP Rewards"], ""}; - { 18, "PVPWeapons_A", "INV_Weapon_Bow_08", "=ds="..AL["PvP Weapons"], "=q5="..AL["Level 60"]}; - { 19, "PvP60Ench", "INV_Scroll_06", "=ds="..AL["PvP Enchants"], "=q5="..AL["Level 60"]}; - Back = "PVPMENU"..AtlasLoot_Expac; + { 1, "PvP60Accessories1_A", "inv_jewelry_trinketpvp_01", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 60"]}; + { 2, "PVPSET", "INV_Axe_02", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 60"]}; + { 4, "PVPMENU2", "INV_Jewelry_Necklace_21", "=ds="..AL["BG PvP Rewards"], ""}; + { 16, "PVPWeapons_A", "INV_Weapon_Bow_08", "=ds="..AL["PvP Weapons"], "=q5="..AL["Level 60"]}; + { 17, "PvP60Ench", "INV_Scroll_06", "=ds="..AL["PvP Enchants"], "=q5="..AL["Level 60"]}; + Type = "Expansion" }; AtlasLoot_Data["PVPMENUTBC"] = { - { 1, "PVPMENUCLASSIC", "INV_Helmet_66", "=ds="..AL["PVP - Original WoW"], ""}; - { 16, "PVPMENUWRATH", "INV_Misc_Ribbon_01", "=ds="..AL["PVP - Wrath of the Lich King"], ""}; - { 3, "PvP70Accessories1_A", "inv_jewelry_ring_60", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 70"]}; - { 4, "PVP70RepSET", "INV_Axe_02", "=ds="..AL["PvP Reputation Sets"], "=q5="..AL["Level 70"]}; - { 5, "ARENASET", "inv_gauntlets_29", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 70"]}; - { 6, "PvP70NonSet1", "inv_belt_13", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 70"]}; - { 8, "Hellfire", "INV_Misc_Token_HonorHold", "=ds="..BabbleZone["Hellfire Peninsula"], "=q5="..AL["Hellfire Fortifications"]}; - { 9, "Zangarmarsh", "Spell_Nature_ElementalPrecision_1", "=ds="..BabbleZone["Zangarmarsh"], "=q5="..AL["Twin Spire Ruins"]}; - { 10, "Terokkar", "INV_Jewelry_FrostwolfTrinket_04", "=ds="..BabbleZone["Terokkar Forest"], "=q5="..AL["Spirit Towers"]}; - { 11, "Nagrand1", "INV_Misc_Rune_09", "=ds="..BabbleZone["Nagrand"], "=q5="..AL["Halaa"]}; - { 18, "Arena0Weapons1_A", "INV_Weapon_Crossbow_09", "=ds="..AL["Arena Season 0 Weapons"], "=q5="..AL["Level 70"]}; - { 19, "Arena1Weapons1", "INV_Weapon_Crossbow_10", "=ds="..AL["Arena Season 1 Weapons"], "=q5="..AL["Level 70"]}; - { 20, "Arena2Weapons1", "INV_Weapon_Crossbow_11", "=ds="..AL["Arena Season 2 Weapons"], "=q5="..AL["Level 70"]}; - { 21, "Arena3Weapons1", "INV_Weapon_Crossbow_12", "=ds="..AL["Arena Season 3 Weapons"], "=q5="..AL["Level 70"]}; - { 22, "Arena4Weapons1", "inv_weapon_crossbow_26", "=ds="..AL["Arena Season 4 Weapons"], "=q5="..AL["Level 70"]}; - Back = "PVPMENU"..AtlasLoot_Expac; + { 1, "PvP70Accessories1_A", "inv_jewelry_ring_60", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 70"]}; + { 2, "PVP70RepSET", "INV_Axe_02", "=ds="..AL["PvP Reputation Sets"], "=q5="..AL["Level 70"]}; + { 3, "ARENASET", "inv_gauntlets_29", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 70"]}; + { 4, "PvP70NonSet1", "inv_belt_13", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 70"]}; + { 6, "Hellfire", "INV_Misc_Token_HonorHold", "=ds="..BabbleZone["Hellfire Peninsula"], "=q5="..AL["Hellfire Fortifications"]}; + { 7, "Zangarmarsh", "Spell_Nature_ElementalPrecision_1", "=ds="..BabbleZone["Zangarmarsh"], "=q5="..AL["Twin Spire Ruins"]}; + { 8, "Terokkar", "INV_Jewelry_FrostwolfTrinket_04", "=ds="..BabbleZone["Terokkar Forest"], "=q5="..AL["Spirit Towers"]}; + { 9, "Nagrand1", "INV_Misc_Rune_09", "=ds="..BabbleZone["Nagrand"], "=q5="..AL["Halaa"]}; + { 16, "Arena0Weapons1_A", "INV_Weapon_Crossbow_09", "=ds="..AL["Arena Season 0 Weapons"], "=q5="..AL["Level 70"]}; + { 17, "Arena1Weapons1", "INV_Weapon_Crossbow_10", "=ds="..AL["Arena Season 1 Weapons"], "=q5="..AL["Level 70"]}; + { 18, "Arena2Weapons1", "INV_Weapon_Crossbow_11", "=ds="..AL["Arena Season 2 Weapons"], "=q5="..AL["Level 70"]}; + { 19, "Arena3Weapons1", "INV_Weapon_Crossbow_12", "=ds="..AL["Arena Season 3 Weapons"], "=q5="..AL["Level 70"]}; + { 20, "Arena4Weapons1", "inv_weapon_crossbow_26", "=ds="..AL["Arena Season 4 Weapons"], "=q5="..AL["Level 70"]}; + Type = "Expansion" }; AtlasLoot_Data["PVPMENUWRATH"] = { - { 1, "PVPMENUCLASSIC", "INV_Helmet_66", "=ds="..AL["PVP - Original WoW"], ""}; - { 16, "PVPMENUTBC", "INV_Misc_Ribbon_01", "=ds="..AL["PVP - Burning Crusade"], ""}; - { 3, "PvP80NonSet1", "INV_Jewelry_Necklace_36", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 80"]}; - { 4, "PvP80Misc", "INV_Scroll_06", "=ds="..AL["PvP Misc"], "=q5="..AL["Level 80"]}; - { 5, "LEVEL80PVPSETS", "INV_Boots_01", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 80"], "" }; - { 6, "WINTERGRASPMENU", "INV_Misc_Platnumdisks", "=ds="..BabbleZone["Wintergrasp"], ""}; - { 8, "VentureBay1", "INV_Misc_Coin_16", "=ds="..BabbleZone["Grizzly Hills"], "=q5="..AL["Venture Bay"]}; - { 18, "PVP80NONSETEPICS", "inv_bracer_51", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 80"]}; - { 19, "WrathfulGladiatorWeapons1", "INV_Sword_86", "=ds="..AL["Wrathful Gladiator\'s Weapons"], "=q5="..AL["Level 80"] }; - Back = "PVPMENU"..AtlasLoot_Expac; + { 1, "PvP80NonSet1", "INV_Jewelry_Necklace_36", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 80"]}; + { 2, "PvP80Misc", "INV_Scroll_06", "=ds="..AL["PvP Misc"], "=q5="..AL["Level 80"]}; + { 3, "LEVEL80PVPSETS", "INV_Boots_01", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 80"], "" }; + { 4, "WINTERGRASPMENU", "INV_Misc_Platnumdisks", "=ds="..BabbleZone["Wintergrasp"], ""}; + { 6, "VentureBay1", "INV_Misc_Coin_16", "=ds="..BabbleZone["Grizzly Hills"], "=q5="..AL["Venture Bay"]}; + { 16, "PVP80NONSETEPICS", "inv_bracer_51", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 80"]}; + { 17, "WrathfulGladiatorWeapons1", "INV_Sword_86", "=ds="..AL["Wrathful Gladiator\'s Weapons"], "=q5="..AL["Level 80"] }; + Type = "Expansion" }; AtlasLoot_Data["PVPMENU2"] = { diff --git a/AtlasLoot/Menus/RepMenus.lua b/AtlasLoot/Menus/RepMenus.lua index 0188d22..cc1dbf7 100644 --- a/AtlasLoot/Menus/RepMenus.lua +++ b/AtlasLoot/Menus/RepMenus.lua @@ -5,65 +5,62 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["REPMENUTBC"] = { - { 2, "REPMENU_ORIGINALWOW", "INV_Helmet_66", "=ds="..AL["Factions - Original WoW"], ""}; - { 17, "REPMENU_WOTLK", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Wrath of the Lich King"], ""}; - { 4, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; - { 5, "CExpedition1", "INV_Misc_Ammo_Arrow_02", "=ds="..BabbleFaction["Cenarion Expedition"], "=q5="..BabbleZone["Zangarmarsh"]}; - { 6, "HonorHold1", "INV_BannerPVP_02", "=ds="..BabbleFaction["Honor Hold"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Hellfire Peninsula"]}; - { 7, "Kurenai1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["Kurenai"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Nagrand"]}; - { 8, "Maghar1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Mag'har"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Nagrand"]}; - { 9, "Ogrila1", "inv_misc_apexis_crystal", "=ds="..BabbleFaction["Ogri'la"], "=q5="..BabbleZone["Blade's Edge Mountains"]}; - { 10, "Scryer1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Scryers"], ""}; - { 11, "Skyguard1", "INV_Misc_Ribbon_01", "=ds="..BabbleFaction["Sha'tari Skyguard"], "=q5="..BabbleZone["Terokkar Forest"].." / "..BabbleZone["Blade's Edge Mountains"]}; - { 12, "Sporeggar1", "inv_mushroom_11", "=ds="..BabbleFaction["Sporeggar"], "=q5="..BabbleZone["Zangarmarsh"]}; - { 13, "Tranquillien1", "INV_Misc_Bandana_03", "=ds="..BabbleFaction["Tranquillien"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Ghostlands"]}; - { 19, "Ashtongue1", "achievement_reputation_ashtonguedeathsworn", "=ds="..BabbleFaction["Ashtongue Deathsworn"], "=q5="..BabbleZone["Shadowmoon Valley"].." / "..BabbleZone["Black Temple"]}; - { 20, "Consortium1", "INV_Weapon_Shortblade_31", "=ds="..BabbleFaction["The Consortium"], ""}; - { 21, "KeepersofTime1", "Ability_Warrior_VictoryRush", "=ds="..BabbleFaction["Keepers of Time"], "=q5="..BabbleZone["Caverns of Time"]}; - { 22, "LowerCity1", "Spell_Holy_ChampionsBond", "=ds="..BabbleFaction["Lower City"], ""}; - { 23, "Netherwing1", "Ability_Mount_Netherdrakepurple", "=ds="..BabbleFaction["Netherwing"], "=q5="..BabbleZone["Shadowmoon Valley"]}; - { 24, "ScaleSands1", "INV_Misc_MonsterScales_13", "=ds="..BabbleFaction["The Scale of the Sands"], "=q5="..BabbleZone["Hyjal Summit"]}; - { 25, "Shatar1", "Ability_Warrior_ShieldMastery", "=ds="..BabbleFaction["The Sha'tar"], ""}; - { 26, "SunOffensive1", "inv_shield_48", "=ds="..BabbleFaction["Shattered Sun Offensive"], "=q5="..BabbleZone["Isle of Quel'Danas"]}; - { 27, "Thrallmar1", "INV_BannerPVP_01", "=ds="..BabbleFaction["Thrallmar"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Hellfire Peninsula"]}; - { 28, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; + { 1, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; + { 2, "CExpedition1", "INV_Misc_Ammo_Arrow_02", "=ds="..BabbleFaction["Cenarion Expedition"], "=q5="..BabbleZone["Zangarmarsh"]}; + { 3, "HonorHold1", "INV_BannerPVP_02", "=ds="..BabbleFaction["Honor Hold"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Hellfire Peninsula"]}; + { 4, "Kurenai1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["Kurenai"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Nagrand"]}; + { 5, "Maghar1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Mag'har"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Nagrand"]}; + { 6, "Ogrila1", "inv_misc_apexis_crystal", "=ds="..BabbleFaction["Ogri'la"], "=q5="..BabbleZone["Blade's Edge Mountains"]}; + { 7, "Scryer1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Scryers"], ""}; + { 8, "Skyguard1", "INV_Misc_Ribbon_01", "=ds="..BabbleFaction["Sha'tari Skyguard"], "=q5="..BabbleZone["Terokkar Forest"].." / "..BabbleZone["Blade's Edge Mountains"]}; + { 9, "Sporeggar1", "inv_mushroom_11", "=ds="..BabbleFaction["Sporeggar"], "=q5="..BabbleZone["Zangarmarsh"]}; + { 10, "Tranquillien1", "INV_Misc_Bandana_03", "=ds="..BabbleFaction["Tranquillien"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Ghostlands"]}; + { 16, "Ashtongue1", "achievement_reputation_ashtonguedeathsworn", "=ds="..BabbleFaction["Ashtongue Deathsworn"], "=q5="..BabbleZone["Shadowmoon Valley"].." / "..BabbleZone["Black Temple"]}; + { 17, "Consortium1", "INV_Weapon_Shortblade_31", "=ds="..BabbleFaction["The Consortium"], ""}; + { 18, "KeepersofTime1", "Ability_Warrior_VictoryRush", "=ds="..BabbleFaction["Keepers of Time"], "=q5="..BabbleZone["Caverns of Time"]}; + { 19, "LowerCity1", "Spell_Holy_ChampionsBond", "=ds="..BabbleFaction["Lower City"], ""}; + { 20, "Netherwing1", "Ability_Mount_Netherdrakepurple", "=ds="..BabbleFaction["Netherwing"], "=q5="..BabbleZone["Shadowmoon Valley"]}; + { 21, "ScaleSands1", "INV_Misc_MonsterScales_13", "=ds="..BabbleFaction["The Scale of the Sands"], "=q5="..BabbleZone["Hyjal Summit"]}; + { 22, "Shatar1", "Ability_Warrior_ShieldMastery", "=ds="..BabbleFaction["The Sha'tar"], ""}; + { 23, "SunOffensive1", "inv_shield_48", "=ds="..BabbleFaction["Shattered Sun Offensive"], "=q5="..BabbleZone["Isle of Quel'Danas"]}; + { 24, "Thrallmar1", "INV_BannerPVP_01", "=ds="..BabbleFaction["Thrallmar"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Hellfire Peninsula"]}; + { 25, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; + Type = "Expansion" }; AtlasLoot_Data["REPMENUCLASSIC"] = { - { 2, "REPMENU_BURNINGCRUSADE", "INV_Helmet_66", "=ds="..AL["Factions - Burning Crusade"], ""}; - { 17, "REPMENU_WOTLK", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Wrath of the Lich King"], ""}; - { 4, "Argent1", "inv_jewelry_talisman_07", "=ds="..BabbleFaction["Argent Dawn"], "=q5="..BabbleZone["Eastern Plaguelands"]}; - { 5, "AQBroodRings", "inv_misc_head_dragon_bronze", "=ds="..BabbleFaction["Brood of Nozdormu"], "=q5="..BabbleZone["Temple of Ahn'Qiraj"].." / "..BabbleZone["Caverns of Time"]}; - { 6, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The Defilers"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Arathi Basin"]}; - { 7, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Gelkis Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; - { 8, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The League of Arathor"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Arathi Basin"]}; - { 9, "AlteracFactions", "INV_Jewelry_StormPikeTrinket_01", "=ds="..BabbleFaction["Stormpike Guard"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Alterac Valley"]}; - { 10, "Timbermaw", "achievement_reputation_timbermaw", "=ds="..BabbleFaction["Timbermaw Hold"], ""}; - { 11, "Zandalar1", "inv_bijou_green", "=ds="..BabbleFaction["Zandalar Tribe"], "=q5="..BabbleZone["Zul'Gurub"]}; - { 19, "BloodsailHydraxian", "INV_Helmet_66", "=ds="..BabbleFaction["Bloodsail Buccaneers"], "=q5="..BabbleZone["Stranglethorn Vale"]}; - { 20, "Cenarion1", "ability_racial_ultravision", "=ds="..BabbleFaction["Cenarion Circle"], ""}; - { 21, "AlteracFactions", "INV_Jewelry_FrostwolfTrinket_01", "=ds="..BabbleFaction["Frostwolf Clan"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Alterac Valley"]}; - { 22, "BloodsailHydraxian", "Spell_Frost_SummonWaterElemental_2", "=ds="..BabbleFaction["Hydraxian Waterlords"], "=q5="..BabbleZone["Molten Core"]}; - { 23, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Magram Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; - { 24, "Thorium1", "INV_Ingot_Mithril", "=ds="..BabbleFaction["Thorium Brotherhood"], "=q5="..BabbleZone["Searing Gorge"]}; - { 25, "MiscFactions", "Ability_Mount_PinkTiger", "=ds="..BabbleFaction["Wintersaber Trainers"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Winterspring"]}; + { 1, "Argent1", "inv_jewelry_talisman_07", "=ds="..BabbleFaction["Argent Dawn"], "=q5="..BabbleZone["Eastern Plaguelands"]}; + { 2, "AQBroodRings", "inv_misc_head_dragon_bronze", "=ds="..BabbleFaction["Brood of Nozdormu"], "=q5="..BabbleZone["Temple of Ahn'Qiraj"].." / "..BabbleZone["Caverns of Time"]}; + { 3, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The Defilers"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Arathi Basin"]}; + { 4, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Gelkis Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; + { 5, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The League of Arathor"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Arathi Basin"]}; + { 6, "AlteracFactions", "INV_Jewelry_StormPikeTrinket_01", "=ds="..BabbleFaction["Stormpike Guard"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Alterac Valley"]}; + { 7, "Timbermaw", "achievement_reputation_timbermaw", "=ds="..BabbleFaction["Timbermaw Hold"], ""}; + { 8, "Zandalar1", "inv_bijou_green", "=ds="..BabbleFaction["Zandalar Tribe"], "=q5="..BabbleZone["Zul'Gurub"]}; + { 16, "BloodsailHydraxian", "INV_Helmet_66", "=ds="..BabbleFaction["Bloodsail Buccaneers"], "=q5="..BabbleZone["Stranglethorn Vale"]}; + { 17, "Cenarion1", "ability_racial_ultravision", "=ds="..BabbleFaction["Cenarion Circle"], ""}; + { 18, "AlteracFactions", "INV_Jewelry_FrostwolfTrinket_01", "=ds="..BabbleFaction["Frostwolf Clan"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Alterac Valley"]}; + { 19, "BloodsailHydraxian", "Spell_Frost_SummonWaterElemental_2", "=ds="..BabbleFaction["Hydraxian Waterlords"], "=q5="..BabbleZone["Molten Core"]}; + { 20, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Magram Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; + { 21, "Thorium1", "INV_Ingot_Mithril", "=ds="..BabbleFaction["Thorium Brotherhood"], "=q5="..BabbleZone["Searing Gorge"]}; + { 22, "MiscFactions", "Ability_Mount_PinkTiger", "=ds="..BabbleFaction["Wintersaber Trainers"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Winterspring"]}; + Type = "Expansion" }; AtlasLoot_Data["REPMENUWRATH"] = { - { 2, "REPMENU_ORIGINALWOW", "INV_Helmet_66", "=ds="..AL["Factions - Original WoW"], ""}; - { 17, "REPMENU_BURNINGCRUSADE", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Burning Crusade"], ""}; - { 4, "AllianceVanguard1", "spell_misc_hellifrepvphonorholdfavor", "=ds="..BabbleFaction["Alliance Vanguard"], "=q5="..BabbleFaction["Alliance"]}; - { 5, "WinterfinRetreat", "INV_Misc_Shell_04", "=ds="..BabbleFaction["Winterfin Retreat"], "=q5="..BabbleZone["Borean Tundra"]}; - { 6, "TheWyrmrestAccord", "achievement_reputation_wyrmresttemple", "=ds="..BabbleFaction["The Wyrmrest Accord"], "=q5="..BabbleZone["Dragonblight"]}; - { 7, "KnightsoftheEbonBlade", "achievement_reputation_knightsoftheebonblade", "=ds="..BabbleFaction["Knights of the Ebon Blade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; - { 8, "TheOracles", "inv_misc_head_murloc_01", "=ds="..BabbleFaction["The Oracles"], "=q5="..BabbleZone["Sholazar Basin"]}; - { 9, "TheSonsofHodir1", "Spell_Holy_DivinePurpose", "=ds="..BabbleFaction["The Sons of Hodir"], "=q5="..BabbleZone["The Storm Peaks"]}; - { 10, "HordeExpedition1", "spell_misc_hellifrepvpthrallmarfavor", "=ds="..BabbleFaction["Horde Expedition"], "=q5="..BabbleFaction["Horde"]}; - { 19, "TheKaluak", "INV_Fishingpole_03", "=ds="..BabbleFaction["The Kalu'ak"], "" }; - { 20, "KirinTor", "achievement_reputation_kirintor", "=ds="..BabbleFaction["Kirin Tor"], "=q5="..BabbleZone["Borean Tundra"].." / "..BabbleZone["Dalaran"]}; - { 21, "ArgentCrusade", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["Argent Crusade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; - { 22, "FrenzyheartTribe", "ability_mount_whitedirewolf", "=ds="..BabbleFaction["Frenzyheart Tribe"], "=q5="..BabbleZone["Sholazar Basin"]}; - { 23, "AshenVerdict", "INV_Jewelry_Ring_85", "=ds="..BabbleFaction["The Ashen Verdict"], "=q5="..BabbleZone["Icecrown"]}; + { 1, "AllianceVanguard1", "spell_misc_hellifrepvphonorholdfavor", "=ds="..BabbleFaction["Alliance Vanguard"], "=q5="..BabbleFaction["Alliance"]}; + { 2, "WinterfinRetreat", "INV_Misc_Shell_04", "=ds="..BabbleFaction["Winterfin Retreat"], "=q5="..BabbleZone["Borean Tundra"]}; + { 3, "TheWyrmrestAccord", "achievement_reputation_wyrmresttemple", "=ds="..BabbleFaction["The Wyrmrest Accord"], "=q5="..BabbleZone["Dragonblight"]}; + { 4, "KnightsoftheEbonBlade", "achievement_reputation_knightsoftheebonblade", "=ds="..BabbleFaction["Knights of the Ebon Blade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 5, "TheOracles", "inv_misc_head_murloc_01", "=ds="..BabbleFaction["The Oracles"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 6, "TheSonsofHodir1", "Spell_Holy_DivinePurpose", "=ds="..BabbleFaction["The Sons of Hodir"], "=q5="..BabbleZone["The Storm Peaks"]}; + { 7, "HordeExpedition1", "spell_misc_hellifrepvpthrallmarfavor", "=ds="..BabbleFaction["Horde Expedition"], "=q5="..BabbleFaction["Horde"]}; + { 16, "TheKaluak", "INV_Fishingpole_03", "=ds="..BabbleFaction["The Kalu'ak"], "" }; + { 17, "KirinTor", "achievement_reputation_kirintor", "=ds="..BabbleFaction["Kirin Tor"], "=q5="..BabbleZone["Borean Tundra"].." / "..BabbleZone["Dalaran"]}; + { 18, "ArgentCrusade", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["Argent Crusade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 19, "FrenzyheartTribe", "ability_mount_whitedirewolf", "=ds="..BabbleFaction["Frenzyheart Tribe"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 20, "AshenVerdict", "INV_Jewelry_Ring_85", "=ds="..BabbleFaction["The Ashen Verdict"], "=q5="..BabbleZone["Icecrown"]}; + Type = "Expansion" }; AtlasLoot_Data["REPMENU_ORIGINALWOW"] = { diff --git a/AtlasLoot/Menus/SetMenus.lua b/AtlasLoot/Menus/SetMenus.lua index d3e8e91..e1bf6d6 100644 --- a/AtlasLoot/Menus/SetMenus.lua +++ b/AtlasLoot/Menus/SetMenus.lua @@ -10,56 +10,54 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") -- { #, "PVPMENU", "INV_Axe_02", "=ds="..AL["PvP Rewards"], ""}; AtlasLoot_Data["SETMENUCLASSIC"] = { - { 1, "SETMENUTBC", "INV_Helmet_66", "=ds="..AL["Sets - Burning Crusade"], ""}; - { 16, "SETMENUWRATH", "INV_Misc_Ribbon_01", "=ds="..AL["Sets - Wrath of the Lich King"], ""}; - { 3, "SETSCLASSIC", "INV_Sword_43", "=ds="..AL["Classic Sets"], ""}; - { 5, 0, "INV_Box_01", "=q6="..AL["BoE World Epics"], ""}; - { 6, "WorldEpics1", "INV_Jewelry_Ring_15", "=ds="..AL["Level 30-39"], ""}; - { 7, "WorldEpics2", "INV_Staff_29", "=ds="..AL["Level 40-49"], ""}; - { 8, "WorldEpics3", "INV_Jewelry_Amulet_01", "=ds="..AL["Level 50-60"], ""}; - { 10, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; - { 11, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; - { 18, "T0SET", "INV_Chest_Chain_03", "=ds="..AL["Dungeon 1/2 Sets"], ""}; - { 19, "ZGSets1", "INV_Misc_MonsterClaw_04", "=ds="..AL["Zul'Gurub Sets"], ""}; - { 20, "AQ20Sets1", "INV_Jewelry_Ring_AhnQiraj_03", "=ds="..AL["Ruins of Ahn'Qiraj Sets"], ""}; - { 21, "AQ40Sets1", "INV_Sword_59", "=ds="..AL["Temple of Ahn'Qiraj Sets"], ""}; - { 23, "T1SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1 Sets"], ""}; - { 24, "T2SET", "INV_Pants_Mail_26", "=ds="..AL["Tier 2 Sets"], ""}; - { 25, "T3SET", "INV_Pants_Mail_38v3", "=ds="..AL["Tier 3 Sets"], ""}; + + { 1, "SETSCLASSIC", "INV_Sword_43", "=ds="..AL["Classic Sets"], ""}; + { 3, 0, "INV_Box_01", "=q6="..AL["BoE World Epics"], ""}; + { 4, "WorldEpics1", "INV_Jewelry_Ring_15", "=ds="..AL["Level 30-39"], ""}; + { 5, "WorldEpics2", "INV_Staff_29", "=ds="..AL["Level 40-49"], ""}; + { 6, "WorldEpics3", "INV_Jewelry_Amulet_01", "=ds="..AL["Level 50-60"], ""}; + { 8, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; + { 9, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; + { 16, "T0SET", "INV_Chest_Chain_03", "=ds="..AL["Dungeon 1/2 Sets"], ""}; + { 17, "ZGSets1", "INV_Misc_MonsterClaw_04", "=ds="..AL["Zul'Gurub Sets"], ""}; + { 18, "AQ20Sets1", "INV_Jewelry_Ring_AhnQiraj_03", "=ds="..AL["Ruins of Ahn'Qiraj Sets"], ""}; + { 19, "AQ40Sets1", "INV_Sword_59", "=ds="..AL["Temple of Ahn'Qiraj Sets"], ""}; + { 21, "T1SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1 Sets"], ""}; + { 22, "T2SET", "INV_Pants_Mail_26", "=ds="..AL["Tier 2 Sets"], ""}; + { 23, "T3SET", "INV_Pants_Mail_38v3", "=ds="..AL["Tier 3 Sets"], ""}; Back = "SETMENU"..AtlasLoot_Expac; + Type = "Expansion" }; AtlasLoot_Data["SETMENUTBC"] = { - { 1, "SETMENUCLASSIC", "INV_Helmet_66", "=ds="..AL["Sets - Original WoW"], ""}; - { 16, "SETMENUWRATH", "INV_Misc_Ribbon_01", "=ds="..AL["Sets - Wrath of the Lich King"], ""}; - { 3, "70TOKENMENU", "Spell_Holy_ChampionsBond", "=ds="..AL["Badge of Justice Rewards"], "=q5="..AL["Burning Crusade"]}; - { 5, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; - { 6, "WorldEpics4", "INV_Sword_76", "=ds=".."World Epics", ""}; - { 7, "TBCSets", "INV_Weapon_Glave_01", "=ds="..AL["Burning Crusade Misc Sets"], ""}; - { 8, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; - { 18, "DS3SET", "INV_Helmet_15", "=ds="..AL["Dungeon 3 Sets"], ""}; - { 20, "T4SET", "inv_helmet_58", "=ds="..AL["Tier 4 Sets"], ""}; - { 21, "T5SET", "inv_helmet_92", "=ds="..AL["Tier 5 Sets"], ""}; - { 22, "T6SET", "inv_helmet_98", "=ds="..AL["Tier 6 Sets"], ""}; + { 1, "70TOKENMENU", "Spell_Holy_ChampionsBond", "=ds="..AL["Badge of Justice Rewards"], "=q5="..AL["Burning Crusade"]}; + { 3, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; + { 4, "WorldEpics4", "INV_Sword_76", "=ds=".."World Epics", ""}; + { 5, "TBCSets", "INV_Weapon_Glave_01", "=ds="..AL["Burning Crusade Misc Sets"], ""}; + { 7, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; + { 16, "DS3SET", "INV_Helmet_15", "=ds="..AL["Dungeon 3 Sets"], ""}; + { 18, "T4SET", "inv_helmet_58", "=ds="..AL["Tier 4 Sets"], ""}; + { 19, "T5SET", "inv_helmet_92", "=ds="..AL["Tier 5 Sets"], ""}; + { 20, "T6SET", "inv_helmet_98", "=ds="..AL["Tier 6 Sets"], ""}; Back = "SETMENU"..AtlasLoot_Expac; + Type = "Expansion" }; AtlasLoot_Data["SETMENUWRATH"] = { - { 1, "SETMENUCLASSIC", "INV_Helmet_66", "=ds="..AL["Sets - Original WoW"], ""}; - { 16, "SETMENUTBC", "INV_Misc_Ribbon_01", "=ds="..AL["Sets - Burning Crusade"], ""}; - { 3, "EMBLEMOFFROSTMENU", "inv_misc_frostemblem_01", "=ds="..AL["Emblem of Frost Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 4, "EMBLEMOFTRIUMPHMENU", "spell_holy_summonchampion", "=ds="..AL["Emblem of Triumph Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 5, "EMBLEMOFCONQUESTMENU", "Spell_Holy_ChampionsGrace", "=ds="..AL["Emblem of Conquest Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 6, "EMBLEMOFVALORMENU", "Spell_Holy_ProclaimChampion_02", "=ds="..AL["Emblem of Valor Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 7, "EMBLEMOFHEROISMMENU", "Spell_Holy_ProclaimChampion", "=ds="..AL["Emblem of Heroism Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 9, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; - { 10, "WorldEpicsWrath1", "INV_Sword_109", "=ds=".."World Epics", ""}; - { 11, "SETSWRATHOFLICHKING", "inv_misc_monsterscales_15", "=ds="..AL["Wrath of the Lich King Sets"], ""}; - { 12, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; - { 18, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; - { 19, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; - { 20, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; + { 1, "EMBLEMOFFROSTMENU", "inv_misc_frostemblem_01", "=ds="..AL["Emblem of Frost Rewards"], "=q5="..AL["Wrath of the Lich King"]}; + { 2, "EMBLEMOFTRIUMPHMENU", "spell_holy_summonchampion", "=ds="..AL["Emblem of Triumph Rewards"], "=q5="..AL["Wrath of the Lich King"]}; + { 3, "EMBLEMOFCONQUESTMENU", "Spell_Holy_ChampionsGrace", "=ds="..AL["Emblem of Conquest Rewards"], "=q5="..AL["Wrath of the Lich King"]}; + { 4, "EMBLEMOFVALORMENU", "Spell_Holy_ProclaimChampion_02", "=ds="..AL["Emblem of Valor Rewards"], "=q5="..AL["Wrath of the Lich King"]}; + { 5, "EMBLEMOFHEROISMMENU", "Spell_Holy_ProclaimChampion", "=ds="..AL["Emblem of Heroism Rewards"], "=q5="..AL["Wrath of the Lich King"]}; + { 7, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; + { 8, "WorldEpicsWrath1", "INV_Sword_109", "=ds=".."World Epics", ""}; + { 9, "SETSWRATHOFLICHKING", "inv_misc_monsterscales_15", "=ds="..AL["Wrath of the Lich King Sets"], ""}; + { 10, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; + { 16, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; + { 17, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; + { 18, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; Back = "SETMENU"..AtlasLoot_Expac; + Type = "Expansion" }; AtlasLoot_Data["70TOKENMENU"] = { diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index 59ea094..b045d07 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1969,19 +1969,19 @@ end AtlasLoot_TableNames["REPMENU_ORIGINALWOW"] = { AL["Factions - Original WoW"], "Menu" }; AtlasLoot_TableNames["REPMENU_BURNINGCRUSADE"] = { AL["Factions - Burning Crusade"], "Menu" }; AtlasLoot_TableNames["REPMENU_WOTLK"] = { AL["Factions - Wrath of the Lich King"], "Menu" }; - AtlasLoot_TableNames["REPMENUCLASSIC"] = { AL["Factions"], "Menu" }; - AtlasLoot_TableNames["REPMENUTBC"] = { AL["Factions"], "Menu" }; - AtlasLoot_TableNames["REPMENUWRATH"] = { AL["Factions"], "Menu" }; - AtlasLoot_TableNames["SETMENUCLASSIC"] = { AL["Collections"], "Menu" }; - AtlasLoot_TableNames["SETMENUTBC"] = { AL["Collections"], "Menu" }; - AtlasLoot_TableNames["SETMENUWRATH"] = { AL["Collections"], "Menu" }; + AtlasLoot_TableNames["REPMENUCLASSIC"] = { AL["Factions - Original WoW"], "Menu" }; + AtlasLoot_TableNames["REPMENUTBC"] = { AL["Factions - Burning Crusade"], "Menu" }; + AtlasLoot_TableNames["REPMENUWRATH"] = { AL["Factions - Wrath of the Lich King"], "Menu" }; + AtlasLoot_TableNames["SETMENUCLASSIC"] = { AL["Collections - Original WoW"], "Menu" }; + AtlasLoot_TableNames["SETMENUTBC"] = { AL["Collections - Burning Crusade"], "Menu" }; + AtlasLoot_TableNames["SETMENUWRATH"] = { AL["Collections - Wrath of the Lich King"], "Menu" }; AtlasLoot_TableNames["MOUNTMENU"] = { AL["Mounts"], "Menu" }; AtlasLoot_TableNames["PETMENU"] = { AL["Vanity Pets"], "Menu" }; AtlasLoot_TableNames["PVPSET"] = { AL["PvP Armor Sets"]..": "..AL["Level 60"], "Menu" }; - AtlasLoot_TableNames["PVPMENUCLASSIC"] = { AL["PvP Rewards"], "Menu" }; - AtlasLoot_TableNames["PVPMENUTBC"] = { AL["PvP Rewards"], "Menu" }; - AtlasLoot_TableNames["PVPMENUWRATH"] = { AL["PvP Rewards"], "Menu" }; + AtlasLoot_TableNames["PVPMENUCLASSIC"] = { AL["PVP - Original WoW"], "Menu" }; + AtlasLoot_TableNames["PVPMENUTBC"] = { AL["PVP - Burning Crusade"], "Menu" }; + AtlasLoot_TableNames["PVPMENUWRATH"] = { AL["PVP - Wrath of the Lich King"], "Menu" }; AtlasLoot_TableNames["PVPMENU2"] = { AL["PvP Rewards"], "Menu" }; AtlasLoot_TableNames["WINTERGRASPMENU"] = { BabbleZone["Wintergrasp"], "Menu" }; AtlasLoot_TableNames["PVP70RepSET"] = { AL["PvP Reputation Sets"]..": "..AL["Level 70"], "Menu" };