Dungeons menu + minor fixes

Core/AtlasLoot.lua

@@ -69,7 +69,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
 --Establish version number and compatible version of Atlas
 local VERSION_MAJOR = "1";
 local VERSION_MINOR = "2";
-local VERSION_BOSSES = "4";
+local VERSION_BOSSES = "5";
 ATLASLOOT_VERSION = "|cffFF8400AtlasLoot TW Edition v"..VERSION_MAJOR.."."..VERSION_MINOR.."."..VERSION_BOSSES.."|r";
 ATLASLOOT_CURRENT_ATLAS = "1.12.0";
 ATLASLOOT_PREVIEW_ATLAS = "1.12.1";
@@ -166,6 +166,8 @@ local DefaultAtlasLootOptions = {
 };
 
 AtlasLoot_MenuList = {
+	"DUNGEONSMENU1",
+	"DUNGEONSMENU2",
 	"PVPMENU",
 	"ABRepMenu",
 	"AVRepMenu",
@@ -184,7 +186,6 @@ AtlasLoot_MenuList = {
 	"WORLDEPICS",
 	"REPMENU",
 	"WORLDEVENTMENU",
-	--"AbyssalCouncil",
 	"ALCHEMYMENU",
 	"CRAFTINGMENU",
 	"SMITHINGMENU",
@@ -195,8 +196,8 @@ AtlasLoot_MenuList = {
 	"TAILORINGMENU",
 	"CRAFTSET",
 	"COOKINGMENU",
-	"SURVIVALMENU",
 	"WORLDBOSSMENU"
+	--"AbyssalCouncil",
 };
 
 --entrance maps to instance maps NOT NEEDED FOR ATLAS 1.12
@@ -290,6 +291,7 @@ function AtlasLoot_OnVariablesLoaded()
 	if not AtlasLootCharDB["SearchResult"] then AtlasLootCharDB["SearchResult"] = {} end
 	--Add the loot browser to the special frames tables to enable closing wih the ESC key
 	tinsert(UISpecialFrames, "AtlasLootDefaultFrame");
+	tinsert(UISpecialFrames, "AtlasLootOptionsFrame")
 	--Set up options frame
 	AtlasLootOptions_OnLoad();
 	--Legacy code for those using the ultimately failed attempt at making Atlas load on demand
@@ -418,15 +420,16 @@ function AtlasLoot_OnVariablesLoaded()
 	--Position relevant UI objects for loot browser and set up menu
 	AtlasLootDefaultFrame_SelectedCategory:SetPoint("TOP", "AtlasLootDefaultFrame_Menu", "BOTTOM", 0, -4);
 	AtlasLootDefaultFrame_SelectedTable:SetPoint("TOP", "AtlasLootDefaultFrame_SubMenu", "BOTTOM", 0, -4);
-	AtlasLootDefaultFrame_SelectedCategory:SetText(AL["Choose Table ..."]);
+	AtlasLootDefaultFrame_SelectedCategory:SetText(AtlasLootCharDB.LastBossText);
 	AtlasLootDefaultFrame_SelectedTable:SetText("");
 	AtlasLootDefaultFrame_SelectedCategory:Show();
 	AtlasLootDefaultFrame_SelectedTable:Show();
 	AtlasLootDefaultFrame_SubMenu:Disable();
 	--Load the last loaded sebmenu
-	if AtlasLootCharDB["LastMenu"] then
+	--[[if AtlasLootCharDB["LastMenu"] then
+		AtlasLoot_ShowBossLoot(AtlasLootCharDB.LastBoss, AtlasLootCharDB.LastBossText, pFrame)
 		AtlasLoot_HewdropClick(AtlasLootCharDB["LastMenu"][1],AtlasLootCharDB["LastMenu"][2],AtlasLootCharDB["LastMenu"][3])
-	end
+	end]]
 end
 
 --[[
@@ -1185,10 +1188,12 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 		AtlasLoot_TailoringMenu();
 	elseif(dataID=="COOKINGMENU") then
 		AtlasLoot_CookingMenu();
-	elseif(dataID=="SURVIVALMENU") then
-		AtlasLoot_SurvivalMenu();
 	elseif(dataID=="WORLDBOSSMENU") then
 		AtlasLoot_WorldBossMenu();
+	elseif(dataID=="DUNGEONSMENU1") then
+		AtlasLoot_DungeonsMenu1();
+	elseif(dataID=="DUNGEONSMENU2") then
+		AtlasLoot_DungeonsMenu2();
 	else
 		--Iterate through each item object and set its properties
 		for i = 1, 30, 1 do
@@ -1822,6 +1827,10 @@ function AtlasLoot_OpenMenu(menu_name)
 	AtlasLoot_QuickLooks:Hide();
 	AtlasLootQuickLooksButton:Hide();
 	AtlasLootServerQueryButton:Hide();
+	AtlasLootDefaultFrame_SelectedCategory:SetText(menu_name)
+	AtlasLootDefaultFrame_SubMenu:Disable();
+	AtlasLootDefaultFrame_SelectedTable:SetText("");
+	AtlasLootDefaultFrame_SelectedTable:Show();
 	AtlasLootCharDB.LastBoss = this.lootpage;
 	AtlasLootCharDB.LastBossText = menu_name;
 	if menu_name == "Crafting" then
@@ -1842,12 +1851,10 @@ function AtlasLoot_OpenMenu(menu_name)
 	elseif menu_name == "World Bosses" then
 		AtlasLoot_WorldBossMenu()
 		CloseDropDownMenus()
+	elseif menu_name == "Dungeons & Raids" then
+		AtlasLoot_DungeonsMenu1()
+		CloseDropDownMenus()
 	end
-	AtlasLootDefaultFrame_SelectedCategory:SetText(menu_name)
-	AtlasLootDefaultFrame_SubMenu:Disable();
-	AtlasLootDefaultFrame_SelectedTable:SetText("");
-	AtlasLootDefaultFrame_SelectedTable:Show();
-
 end
 
 --[[
@@ -1879,27 +1886,33 @@ Requests the relevant loot page from a menu screen
 function AtlasLootMenuItem_OnClick()
 	if this.isheader == nil or this.isheader == false then
 		local pagename = getglobal(this:GetName().."_Name"):GetText()
-		--[[
 		for k,v in ipairs(AtlasLoot_HewdropDown) do
 			if not (type(v[1]) == "table") then
 				for k2, v2 in pairs(v) do
 					for k3, v3 in pairs(v2) do
 						for k4, v4 in pairs(v3) do
 							if not (type(v4[1]) == "table") then
-								if v4[1] == pagename then
+								if v4[1] == pagename and v4[3] ~= "Table" then
 									AtlasLoot_HewdropClick(v4[2],v4[1],v4[3])
 								end
+							else
+								for k5,v5 in pairs(v4) do
+									if v5[1] == pagename then
+										AtlasLoot_HewdropClick(v5[2],v5[1],v5[3])
+									end
+								end
 							end
 						end
 					end
 				end
 			end
 		end
-		]]
 		CloseDropDownMenus()
 		AtlasLootCharDB.LastBoss = this.lootpage;
 		AtlasLootCharDB.LastBossText = pagename;
 		AtlasLoot_ShowBossLoot(this.lootpage, pagename, AtlasLoot_AnchorFrame);
+		AtlasLootDefaultFrame_SelectedCategory:SetText(pagename);
+		AtlasLootDefaultFrame_SelectedCategory:Show();
 	end
 end
 
@@ -1908,6 +1921,15 @@ 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 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]);
@@ -1917,6 +1939,11 @@ function AtlasLoot_NavButton_OnClick()
 			AtlasLootCharDB.LastBoss = this.lootpage;
 			AtlasLootCharDB.LastBossText = this.title;
 			AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title, AtlasLootItemsFrame.refresh[4]);
+			if AtlasLootDefaultFrame_SelectedTable:GetText()~=nil then 
+				AtlasLootDefaultFrame_SelectedTable:SetText(AtlasLoot_BossName:GetText())
+			else
+				AtlasLootDefaultFrame_SelectedCategory:SetText(AtlasLoot_BossName:GetText())
+			end
 		end
 	elseif AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[2] then
 		AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title, AtlasFrame);
@@ -1924,6 +1951,13 @@ function AtlasLoot_NavButton_OnClick()
 		--Fallback for if the requested loot page is a menu and does not have a .refresh instance
 		AtlasLoot_ShowItemsFrame(this.lootpage, "dummy", this.title, AtlasFrame);
 	end
+	for k,v in pairs(AtlasLoot_MenuList) do
+		if this.lootpage == v then
+			AtlasLootDefaultFrame_SubMenu:Disable();
+			AtlasLootDefaultFrame_SelectedCategory:SetText(AtlasLootCharDB.LastBossText)
+			AtlasLootDefaultFrame_SelectedTable:SetText()
+		end
+	end
 end
 
 --[[
@@ -2164,8 +2198,8 @@ function AtlasLootOptions_DefaultSettings()
 	AtlasLootCharDB.AtlasLootVersion = VERSION_MAJOR..VERSION_MINOR..VERSION_BOSSES;
 	AtlasLootCharDB.AutoQuery = false;
 	AtlasLootCharDB.PartialMatching = true;
-	AtlasLootCharDB.LastBoss = "RFCTaragaman";
+	AtlasLootCharDB.LastBoss = "DUNGEONSMENU1";
-	AtlasLootCharDB.LastBossText = AL["Taragaman the Hungerer"];
+	AtlasLootCharDB.LastBossText = AL["Dungeons & Raids"];
 	AtlasLootDefaultFrame:ClearAllPoints();
 	AtlasLootDefaultFrame:SetPoint("TOP", "UIParent", "TOP", 0, -30);
 	AtlasLootOptionsFrame:ClearAllPoints();
@@ -2368,7 +2402,7 @@ AtlasLoot_HewdropDown = {
 			[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"], "Winterviel", "Table" },},
+			[4] = {{ AL["Feast of Winter Veil"], "Winterviel1", "Table" },},
 			[5] = {{ AL["Gurubashi Arena Booty Run"], "GurubashiArena", "Table" },},
 			[6] = {{ AL["Hallow's End"], "Halloween1", "Table" },},
 			[7] = {{ AL["Harvest Festival"], "HarvestFestival", "Table" },},
@@ -2827,7 +2861,7 @@ AtlasLoot_HewdropDown_SubTables = {
 		{ AL["Ossirian the Unscarred"], "AQ20Ossirian" },
 		{ AL["Trash Mobs"], "AQ20Trash" },
 		{ AL["Class Books"], "AQ20ClassBooks" },
-		{ AL["AQ Enchants"], "AQEnchants" },
+		{ AL["AQ Enchants"], "AQ20Enchants" },
 	},
 	["TempleofAQ"] = {
 		{ AL["The Prophet Skeram"], "AQ40Skeram" },
@@ -2890,11 +2924,11 @@ AtlasLoot_HewdropDown_SubTables = {
 		{ AL["Ysondre"], "DYsondre" },
 		{ AL["Lord Kazzak"], "KKazzak"},
 		--{ "Turtlhu, the Black Turtle of Doom", "Turtlhu" },
-		{ "Nerubian Overseer", "Nerubian" },
+		{ AL["Nerubian Overseer"], "Nerubian" },
-		{ "Dark Reaver of Karazhan", "Reaver" },
+		{ AL["Dark Reaver of Karazhan"], "Reaver" },
-		{ "Ostarius", "Ostarius" },
+		{ AL["Ostarius"], "Ostarius" },
-		{ "Concavius", "Concavius" },
+		{ AL["Concavius"], "Concavius" },
-		{ "There Is No Cow Level", "CowKing" },
+		{ AL["There Is No Cow Level"], "CowKing" },
 	},
 	["RareSpawns"] = {
 		{ "|cffffffff[17]|cffffd200 Earthcaller Rezengal |cffffffff(Stonetalon)", "EarthcallerRezengal" },

Core/AtlasLoot.xml

@@ -12,6 +12,7 @@
 	<Script file="WishList.lua"/>
 	<Script file="Search.lua"/>
 	<Script file="WorldBoss.lua"/>
+	<Script file="Dungeons.lua"/>
 
 	<Button name="AtlasLootDefaultFrameButtonTemplate" inherits="OptionsButtonTemplate" virtual="true">
 		<Size>
@@ -213,7 +214,6 @@
 							pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
 							AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][1][1], AtlasLootCharDB["QuickLooks"][1][2], AtlasLootCharDB["QuickLooks"][1][3], pFrame);
 						end
-						CloseDropDownMenus();
 					</OnClick>
 					<OnShow>
 						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
@@ -259,7 +259,6 @@
 							pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
 							AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][2][1], AtlasLootCharDB["QuickLooks"][2][2], AtlasLootCharDB["QuickLooks"][2][3], pFrame);
 						end
-						CloseDropDownMenus();
 					</OnClick>
 					<OnShow>
 						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
@@ -305,7 +304,6 @@
 							pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
 							AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][3][1], AtlasLootCharDB["QuickLooks"][3][2], AtlasLootCharDB["QuickLooks"][3][3], pFrame);
 						end
-						CloseDropDownMenus();
 					</OnClick>
 					<OnShow>
 						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
@@ -352,7 +350,6 @@
 							pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
 							AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][4][1], AtlasLootCharDB["QuickLooks"][4][2], AtlasLootCharDB["QuickLooks"][4][3], pFrame);
 						end
-						CloseDropDownMenus();
 					</OnClick>
 					<OnShow>
 						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
@@ -1261,7 +1258,6 @@
 					</OnShow>
 					<OnClick>
 						AtlasLoot_ShowQuickLooks(this);
-						CloseDropDownMenus();
 					</OnClick>
 				</Scripts>
 			</Button>

Core/Crafting.lua

@@ -12,6 +12,8 @@ function AtlasLoot_CraftingMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "CRAFTINGMENU"
+	AtlasLootCharDB.LastBossText = "Crafting"
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();

Core/Dungeons.lua

@@ -0,0 +1,288 @@
+local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
+
+local RED = "|cffff0000";
+local ORANGE = "|cffFF8400";
+local WHITE = "|cffFFFFFF";
+
+function AtlasLoot_DungeonsMenu1()
+	for i = 1, 30, 1 do
+		getglobal("AtlasLootItem_"..i):Hide();
+	end
+	for i = 1, 30, 1 do
+		getglobal("AtlasLootMenuItem_"..i):Hide();
+		getglobal("AtlasLootMenuItem_"..i).isheader = false;
+	end
+	AtlasLootCharDB.LastBoss = "DUNGEONSMENU1"
+	AtlasLootCharDB.LastBossText = AL["Dungeons & Raids"]
+	getglobal("AtlasLootItemsFrame_BACK"):Hide();
+	getglobal("AtlasLootItemsFrame_NEXT"):Show();
+	getglobal("AtlasLootItemsFrame_PREV"):Hide();
+	getglobal("AtlasLootServerQueryButton"):Hide();
+    --RFC
+    AtlasLootMenuItem_1_Name:SetText(AL["Ragefire Chasm"]);
+	AtlasLootMenuItem_1_Extra:SetText(AL["Orgrimmar"]);
+	AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_1.lootpage="RFCTaragaman";
+	AtlasLootMenuItem_1:Show();
+    --WC
+    AtlasLootMenuItem_2_Name:SetText(AL["Wailing Caverns"]);
+	AtlasLootMenuItem_2_Extra:SetText(AL["Barrens"]);
+	AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_2.lootpage="WCLordCobrahn";
+	AtlasLootMenuItem_2:Show();
+	--DM
+	AtlasLootMenuItem_3_Name:SetText(AL["The Deadmines"]);
+	AtlasLootMenuItem_3_Extra:SetText(AL["Westfall"]);
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_3.lootpage="DMRhahkZor";
+	AtlasLootMenuItem_3:Show();
+	--SFK
+	AtlasLootMenuItem_4_Name:SetText(AL["Shadowfang Keep"]);
+	AtlasLootMenuItem_4_Extra:SetText(AL["Silverpine Forest"]);
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_4.lootpage="SFKRethilgore";
+	AtlasLootMenuItem_4:Show();
+	--BFD
+	AtlasLootMenuItem_5_Name:SetText(AL["Blackfathom Deeps"]);
+	AtlasLootMenuItem_5_Extra:SetText(AL["Ashenvale"]);
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_5.lootpage="BFDGhamoora";
+	AtlasLootMenuItem_5:Show();
+	--Stockades
+	AtlasLootMenuItem_6_Name:SetText(AL["The Stockade"]);
+	AtlasLootMenuItem_6_Extra:SetText(AL["Stormwind"]);
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_6.lootpage="SWStTargorr";
+	AtlasLootMenuItem_6:Show();
+	--Gnomer
+	AtlasLootMenuItem_7_Name:SetText(AL["Gnomeregan"]);
+	AtlasLootMenuItem_7_Extra:SetText(AL["Dun Morogh"]);
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_7.lootpage="GnGrubbis";
+	AtlasLootMenuItem_7:Show();
+	--RFK
+	AtlasLootMenuItem_8_Name:SetText(AL["Razorfen Kraul"]);
+	AtlasLootMenuItem_8_Extra:SetText(AL["Barrens"]);
+	AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_8.lootpage="RFKAggem";
+	AtlasLootMenuItem_8:Show();
+	--Crescent Grove
+	AtlasLootMenuItem_9_Name:SetText(AL["The Crescent Grove"]);
+	AtlasLootMenuItem_9_Extra:SetText(AL["Ashenvale"]);
+	AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_9.lootpage="TCGGrovetenderEngryss";
+	AtlasLootMenuItem_9:Show();
+	--SM GY
+	AtlasLootMenuItem_10_Name:SetText(AL["Scarlet Monastery (Graveyard)"]);
+	AtlasLootMenuItem_10_Extra:SetText(AL["Silverpine Forest"]);
+	AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_10.lootpage="SMVishas";
+	AtlasLootMenuItem_10:Show();
+	--SM Library
+	AtlasLootMenuItem_11_Name:SetText(AL["Scarlet Monastery (Library)"]);
+	AtlasLootMenuItem_11_Extra:SetText(AL["Silverpine Forest"]);
+	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_11.lootpage="SMHoundmasterLoksey";
+	AtlasLootMenuItem_11:Show();
+	--SM Armory
+	AtlasLootMenuItem_12_Name:SetText(AL["Scarlet Monastery (Armory)"]);
+	AtlasLootMenuItem_12_Extra:SetText(AL["Silverpine Forest"]);
+	AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_12.lootpage="SMHerod";
+	AtlasLootMenuItem_12:Show();
+	--SM Cathedral
+	AtlasLootMenuItem_13_Name:SetText(AL["Scarlet Monastery (Cathedral)"]);
+	AtlasLootMenuItem_13_Extra:SetText(AL["Silverpine Forest"]);
+	AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_13.lootpage="SMFairbanks";
+	AtlasLootMenuItem_13:Show();
+	--RFD
+	AtlasLootMenuItem_14_Name:SetText(AL["Razorfen Downs"]);
+	AtlasLootMenuItem_14_Extra:SetText(AL["Barrens"]);
+	AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_14.lootpage="RFDTutenkash";
+	AtlasLootMenuItem_14:Show();
+	--Uldaman
+	AtlasLootMenuItem_15_Name:SetText(AL["Uldaman"]);
+	AtlasLootMenuItem_15_Extra:SetText(AL["Badlands"]);
+	AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_15.lootpage="UldBaelog";
+	AtlasLootMenuItem_15:Show();
+	--Gilneas
+	AtlasLootMenuItem_16_Name:SetText(AL["Gilneas City"]);
+	AtlasLootMenuItem_16_Extra:SetText(AL["Gilneas"]);
+	AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_16.lootpage="GCMatthiasHoltz";
+	AtlasLootMenuItem_16:Show();
+	--Mara
+	AtlasLootMenuItem_17_Name:SetText(AL["Maraudon"]);
+	AtlasLootMenuItem_17_Extra:SetText(AL["Desolace"]);
+	AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_17.lootpage="MaraNoxxion";
+	AtlasLootMenuItem_17:Show();
+	--ZF
+	AtlasLootMenuItem_18_Name:SetText(AL["Zul'Farrak"]);
+	AtlasLootMenuItem_18_Extra:SetText(AL["Tanaris"]);
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_18.lootpage="ZFAntusul";
+	AtlasLootMenuItem_18:Show();
+	--ST
+	AtlasLootMenuItem_19_Name:SetText(AL["The Sunken Temple"]);
+	AtlasLootMenuItem_19_Extra:SetText(AL["Swamp of Sorrows"]);
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_19.lootpage="STBalconyMinibosses";
+	AtlasLootMenuItem_19:Show();
+	--HFQ
+	AtlasLootMenuItem_20_Name:SetText(AL["Hateforge Quarry"]);
+	AtlasLootMenuItem_20_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_20.lootpage="HQHighForemanBargulBlackhammer";
+	AtlasLootMenuItem_20:Show();
+	--BRD
+	AtlasLootMenuItem_21_Name:SetText(AL["Blackrock Depths"]);
+	AtlasLootMenuItem_21_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_21.lootpage="BRDLordRoccor";
+	AtlasLootMenuItem_21:Show();
+	--DME
+	AtlasLootMenuItem_22_Name:SetText(AL["Dire Maul (East)"]);
+	AtlasLootMenuItem_22_Extra:SetText(AL["Feralas"]);
+	AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_22.lootpage="DMEPusillin";
+	AtlasLootMenuItem_22:Show();
+	--DMW
+	AtlasLootMenuItem_23_Name:SetText(AL["Dire Maul (West)"]);
+	AtlasLootMenuItem_23_Extra:SetText(AL["Feralas"]);
+	AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_23.lootpage="DMWTendrisWarpwood";
+	AtlasLootMenuItem_23:Show();
+	--DMN
+	AtlasLootMenuItem_24_Name:SetText(AL["Dire Maul (North)"]);
+	AtlasLootMenuItem_24_Extra:SetText(AL["Feralas"]);
+	AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_24.lootpage="DMNGuardMoldar";
+	AtlasLootMenuItem_24:Show();
+	--Scholo
+	AtlasLootMenuItem_25_Name:SetText(AL["Scholomance"]);
+	AtlasLootMenuItem_25_Extra:SetText(AL["Western Plaguelands"]);
+	AtlasLootMenuItem_25_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_25.lootpage="SCHOLOBlood";
+	AtlasLootMenuItem_25:Show();
+	--Strat
+	AtlasLootMenuItem_26_Name:SetText(AL["Stratholme"]);
+	AtlasLootMenuItem_26_Extra:SetText(AL["Eastern Plaguelands"]);
+	AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_26.lootpage="STRATSkull";
+	AtlasLootMenuItem_26:Show();
+	--LBRS
+	AtlasLootMenuItem_27_Name:SetText(AL["Lower Blackrock Spire"]);
+	AtlasLootMenuItem_27_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_27_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_27.lootpage="LBRSSpirestoneButcher";
+	AtlasLootMenuItem_27:Show();
+	--UBRS
+	AtlasLootMenuItem_28_Name:SetText(AL["Upper Blackrock Spire"]);
+	AtlasLootMenuItem_28_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_28.lootpage="UBRSEmberseer";
+	AtlasLootMenuItem_28:Show();
+	--Kara crypt
+	AtlasLootMenuItem_29_Name:SetText(AL["Karazhan Crypt"]);
+	AtlasLootMenuItem_29_Extra:SetText(AL["Deadwind Pass"]);
+	AtlasLootMenuItem_29_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_29.lootpage="KCMarrowspike";
+	AtlasLootMenuItem_29:Show()
+	--CoT:BM
+	AtlasLootMenuItem_30_Name:SetText(AL["Caverns of Time: Black Morass"]);
+	AtlasLootMenuItem_30_Extra:SetText(AL["Caverns of Time"]);
+	AtlasLootMenuItem_30_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_30.lootpage="COTBMChronar";
+	AtlasLootMenuItem_30:Show()
+
+    for i = 1, 30, 1 do
+		getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
+	end
+	AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Dungeons & Raids"]);
+	AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
+end
+
+function AtlasLoot_DungeonsMenu2()
+	for i = 1, 30, 1 do
+		getglobal("AtlasLootItem_"..i):Hide();
+	end
+	for i = 1, 30, 1 do
+		getglobal("AtlasLootMenuItem_"..i):Hide();
+		getglobal("AtlasLootMenuItem_"..i).isheader = false;
+	end
+	AtlasLootCharDB.LastBoss = "DUNGEONSMENU2"
+	AtlasLootCharDB.LastBossText = AL["Dungeons & Raids"]
+	getglobal("AtlasLootItemsFrame_BACK"):Hide();
+	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
+	getglobal("AtlasLootItemsFrame_PREV"):Show();
+	getglobal("AtlasLootServerQueryButton"):Hide();
+	--SWV
+    AtlasLootMenuItem_1_Name:SetText(AL["Stormwind Vault"]);
+	AtlasLootMenuItem_1_Extra:SetText(AL["Stormwind"]);
+	AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
+	AtlasLootMenuItem_1.lootpage="SWVAszoshGrimflame";
+	AtlasLootMenuItem_1:Show();
+	--ZG
+    AtlasLootMenuItem_3_Name:SetText(AL["Zul'Gurub"]);
+	AtlasLootMenuItem_3_Extra:SetText(AL["Stranglethorn Vale"]);
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_3.lootpage="ZGJeklik";
+	AtlasLootMenuItem_3:Show();
+	--AQ20
+	AtlasLootMenuItem_4_Name:SetText(AL["Ruins of Ahn'Qiraj"]);
+	AtlasLootMenuItem_4_Extra:SetText(AL["Silithus"]);
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_4.lootpage="AQ20Kurinnaxx";
+	AtlasLootMenuItem_4:Show();
+	--MC
+	AtlasLootMenuItem_5_Name:SetText(AL["Molten Core"]);
+	AtlasLootMenuItem_5_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_5.lootpage="MCLucifron";
+	AtlasLootMenuItem_5:Show();
+	--Ony
+	AtlasLootMenuItem_6_Name:SetText(AL["Onyxia's Lair"]);
+	AtlasLootMenuItem_6_Extra:SetText(AL["Dustwallow Marsh"]);
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_6.lootpage="Onyxia";
+	AtlasLootMenuItem_6:Show();
+	--LKH
+	AtlasLootMenuItem_7_Name:SetText(AL["Lower Karazhan Halls"]);
+	AtlasLootMenuItem_7_Extra:SetText(AL["Deadwind Pass"]);
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_7.lootpage="LKHRolfen";
+	AtlasLootMenuItem_7:Show();
+	--BWL
+	AtlasLootMenuItem_8_Name:SetText(AL["Blackwing Lair"]);
+	AtlasLootMenuItem_8_Extra:SetText(AL["Burning Steppes"]);
+	AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_8.lootpage="BWLRazorgore";
+	AtlasLootMenuItem_8:Show();
+	--ES
+	AtlasLootMenuItem_9_Name:SetText(AL["Emerald Sanctum"]);
+	AtlasLootMenuItem_9_Extra:SetText(AL["Hyjal"]);
+	AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_9.lootpage="ESErennius";
+	AtlasLootMenuItem_9:Show();
+	--AQ40
+	AtlasLootMenuItem_10_Name:SetText(AL["Temple of Ahn'Qiraj"]);
+	AtlasLootMenuItem_10_Extra:SetText(AL["Silithus"]);
+	AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_10.lootpage="AQ40Skeram";
+	AtlasLootMenuItem_10:Show();
+	--Naxx
+	AtlasLootMenuItem_11_Name:SetText(AL["Naxxramas"]);
+	AtlasLootMenuItem_11_Extra:SetText(AL["Eastern Plaguelands"]);
+	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
+	AtlasLootMenuItem_11.lootpage="NAXPatchwerk";
+	AtlasLootMenuItem_11:Show();
+    for i = 1, 30, 1 do
+		getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
+	end
+	AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Dungeons & Raids"]);
+	AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
+end

Core/Factions.lua

@@ -10,6 +10,8 @@ function AtlasLootRepMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "REPMENU"
+	AtlasLootCharDB.LastBossText = "Factions"
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();

Core/PvP.lua

@@ -11,6 +11,8 @@ function AtlasLootPvPMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "PVPMENU"
+	AtlasLootCharDB.LastBossText = "PvP Rewards"
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();

Core/Sets.lua

@@ -10,6 +10,8 @@ function AtlasLootSetMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "SETMENU"
+	AtlasLootCharDB.LastBossText = "Collections"
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();

Core/WorldBoss.lua

@@ -8,6 +8,8 @@ function AtlasLoot_WorldBossMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "WORLDBOSSMENU"
+	AtlasLootCharDB.LastBossText = "World Bosses"
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();

Core/WorldEvents.lua

@@ -10,6 +10,8 @@ function AtlasLootWorldEventMenu()
 		getglobal("AtlasLootMenuItem_"..i):Hide();
 		getglobal("AtlasLootMenuItem_"..i).isheader = false;
 	end
+	AtlasLootCharDB.LastBoss = "WORLDEVENTMENU"
+	AtlasLootCharDB.LastBossText = "World Events"
 	getglobal("AtlasLootItemsFrame_NEXT"):Hide();
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();
 	getglobal("AtlasLootItemsFrame_BACK"):Hide();

Instances/instances.en.lua

@@ -216,7 +216,7 @@ AtlasLootBossButtons = {
 		"DMTome";
 		"";
 		"DMETrash";
-		"DMBooks";
+		"DMEBooks";
 		"IRONWEAVE";
 	};
 	DireMaulNorth = {
@@ -245,7 +245,7 @@ AtlasLootBossButtons = {
 		"DMTome";
 		"";
 		"DMNTrash";
-		"DMBooks";
+		"DMNBooks";
 		"DMNTRIBUTERUN";
 	};
 	DireMaulWest = {
@@ -277,7 +277,7 @@ AtlasLootBossButtons = {
 		"DMTome";
 		"";
 		"DMWTrash";
-		"DMBooks";
+		"DMWBooks";
 	};
 	DireMaulEnt = {
 		"";
@@ -723,7 +723,7 @@ AtlasLootBossButtons = {
 		"";
 		"AQ20Trash";
 		"AQ20ClassBooks";
-		"AQEnchants";
+		"AQ20Enchants";
 		"AQ20SET";
 	};
 	TheStockade = {
@@ -2512,6 +2512,15 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 20730, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Healing Power", "=ds=#p4# #m14#", "1%" },
 		{ 20727, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Shadow Power", "=ds=#p4# #m14#", "1%" },
 	};
+	AQ20Enchants = {
+		{ 20728, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Frost Power", "=ds=#p4# #m14#", "1%" },
+		{ 20731, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Superior Agility", "=ds=#p4# #m14#", "1%" },
+		{ 20734, "INV_Misc_Note_01", "=q3=Formula: Enchant Cloak - Stealth", "=ds=#p4# #m14#", "1%" },
+		{ 20729, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Fire Power", "=ds=#p4# #m14#", "1%" },
+		{ 20736, "INV_Misc_Note_01", "=q3=Formula: Enchant Cloak - Dodge", "=ds=#p4# #m14#", "1%" },
+		{ 20730, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Healing Power", "=ds=#p4# #m14#", "1%" },
+		{ 20727, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Shadow Power", "=ds=#p4# #m14#", "1%" },
+	};
 	AQOpening = {
 		{ 21138, "INV_Misc_Gem_Ruby_03", "=q1=Red Scepter Shard", "=ds=#m3#" },
 		{ 21529, "INV_Jewelry_Necklace_17", "=q4=Amulet of Shadow Shielding", "=ds=#s2#" },
@@ -4933,7 +4942,65 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#", "1-2%" },
 		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#", "1-2%" },
 	};
-	DMBooks = {
+	DMNBooks = {
+		{ 18401,"INV_Misc_Book_11","=q4=Foror's Compendium of Dragon Slaying","=ds=#e20# =q17=#c9#=ds=, =q16=#c4#" },
+		{ 0,"","","" },
+		{ 18362, "INV_Misc_Book_08", "=q3=Holy Bologna: What the Light Won't Tell You", "=ds=#e20# =q9=#c5#" },
+		{ 18358, "INV_Misc_Book_01", "=q3=The Arcanist's Cookbook", "=ds=#e20# =q10=#c3#" },
+		{ 18360, "INV_Misc_Book_05", "=q3=Harnessing Shadows", "=ds=#e20# =q11=#c8#" },
+		{ 18356, "INV_Misc_Book_06", "=q3=Garona: A Study on Stealth and Treachery", "=ds=#e20# =q12=#c6#" },
+		{ 18364, "INV_Misc_Book_10", "=q3=The Emerald Dream", "=ds=#e20# =q13=#c1#" },
+		{ 18361, "INV_Misc_Book_02", "=q3=The Greatest Race of Hunters", "=ds=#e20# =q14=#c2#" },
+		{ 18363, "INV_Misc_Book_04", "=q3=Frost Shock and You", "=ds=#e20# =q15=#c7#" },
+		{ 18359, "INV_Misc_Book_11", "=q3=The Light and How to Swing It", "=ds=#e20# =q16=#c4#" },
+		{ 18357, "INV_Misc_Book_07", "=q3=Codex of Defense", "=ds=#e20# =q17=#c9#" },
+		{ 0,"","","" },
+		{ 18333,"INV_Misc_Book_04","=q2=Libram of Focus","=ds=#e20#" },
+		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#" },
+		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#" },
+		{ 18348,"INV_Sword_01","=q4=Quel'Serrar","=q1=#m4# =ds=#h3#, #w10#" },
+		{ 0,"","","" },
+		{ 18469, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q9=#c5#" },
+		{ 18468, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q10=#c3#" },
+		{ 18467, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q11=#c8#" },
+		{ 18465, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q12=#c6#" },
+		{ 18470, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q13=#c1#" },
+		{ 18473, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q14=#c2#" },
+		{ 18471, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q15=#c7#" },
+		{ 18472, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q16=#c4#" },
+		{ 18466, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q17=#c9#" },
+		{ 0,"","","" },
+	};
+	DMEBooks = {
+		{ 18401,"INV_Misc_Book_11","=q4=Foror's Compendium of Dragon Slaying","=ds=#e20# =q17=#c9#=ds=, =q16=#c4#" },
+		{ 0,"","","" },
+		{ 18362, "INV_Misc_Book_08", "=q3=Holy Bologna: What the Light Won't Tell You", "=ds=#e20# =q9=#c5#" },
+		{ 18358, "INV_Misc_Book_01", "=q3=The Arcanist's Cookbook", "=ds=#e20# =q10=#c3#" },
+		{ 18360, "INV_Misc_Book_05", "=q3=Harnessing Shadows", "=ds=#e20# =q11=#c8#" },
+		{ 18356, "INV_Misc_Book_06", "=q3=Garona: A Study on Stealth and Treachery", "=ds=#e20# =q12=#c6#" },
+		{ 18364, "INV_Misc_Book_10", "=q3=The Emerald Dream", "=ds=#e20# =q13=#c1#" },
+		{ 18361, "INV_Misc_Book_02", "=q3=The Greatest Race of Hunters", "=ds=#e20# =q14=#c2#" },
+		{ 18363, "INV_Misc_Book_04", "=q3=Frost Shock and You", "=ds=#e20# =q15=#c7#" },
+		{ 18359, "INV_Misc_Book_11", "=q3=The Light and How to Swing It", "=ds=#e20# =q16=#c4#" },
+		{ 18357, "INV_Misc_Book_07", "=q3=Codex of Defense", "=ds=#e20# =q17=#c9#" },
+		{ 0,"","","" },
+		{ 18333,"INV_Misc_Book_04","=q2=Libram of Focus","=ds=#e20#" },
+		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#" },
+		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#" },
+		{ 18348,"INV_Sword_01","=q4=Quel'Serrar","=q1=#m4# =ds=#h3#, #w10#" },
+		{ 0,"","","" },
+		{ 18469, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q9=#c5#" },
+		{ 18468, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q10=#c3#" },
+		{ 18467, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q11=#c8#" },
+		{ 18465, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q12=#c6#" },
+		{ 18470, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q13=#c1#" },
+		{ 18473, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q14=#c2#" },
+		{ 18471, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q15=#c7#" },
+		{ 18472, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q16=#c4#" },
+		{ 18466, "INV_Jewelry_Talisman_10", "=q3=Royal Seal of Eldre'Thalas", "=ds=#s14# =q17=#c9#" },
+		{ 0,"","","" },
+	};
+	DMWBooks = {
 		{ 18401,"INV_Misc_Book_11","=q4=Foror's Compendium of Dragon Slaying","=ds=#e20# =q17=#c9#=ds=, =q16=#c4#" },
 		{ 0,"","","" },
 		{ 18362, "INV_Misc_Book_08", "=q3=Holy Bologna: What the Light Won't Tell You", "=ds=#e20# =q9=#c5#" },

Locale/locale.en.lua

@@ -1236,7 +1236,6 @@ AL:RegisterTranslations("enUS", function() return {
 	["Lethon"] = true,
 	["Taerar"] = true,
 	["Ysondre"] = true,
-	["The Cow King"] = true,
 	["There Is No Cow Level"] = true,
 	["Nerubian Overseer"] = true,
 	["Turtlhu, the Black Turtle of Doom"] = true,
@@ -1377,7 +1376,6 @@ AL:RegisterTranslations("enUS", function() return {
 	["Plate"] = true,
 	["Dire Maul"] = "|cffffffff[55-60]|cffffd200 Dire Maul",
 	["Auchindoun"] = true,
-	["Caverns of Time"] = true,
 	["Coilfang Reservoir"] = true,
 	["Hellfire Citadel"] = true,
 	["Tempest Keep"] = true,
@@ -1438,7 +1436,6 @@ AL:RegisterTranslations("enUS", function() return {
 	["40-49 Exalted Rewards"] = true,
 	["50-59 Exalted Rewards"] = true,
 	["60 Exalted Rewards"] = true,
-	["PvP Trinkets"] = true,
 	["Cooking Fire"] = true,
 	["Moonwell"] = true,
 	["Alchemy Lab"] = true,
@@ -1469,6 +1466,11 @@ AL:RegisterTranslations("enUS", function() return {
 	["Wildhammer Clan"] = true,
 	["Undercity"] = true,
 	["Orgrimmar"] = true,
+	["Barrens"] = true,
+	["Westfall"] = true,
+	["Tirisfal Glades"] = true,
+	["Silverpine Forest"] = true,
+	["Ashenvale"] = true,
 	["Thunder Bluff"] = true,
 	["Lower Karazhan Halls"] = "|cffff0000[RAID]|cffffd200 Lower Karazhan Halls",
 	["Emerald Sanctum"] = "|cffff0000[RAID]|cffffd200 Emerald Sanctum",
@@ -1532,5 +1534,15 @@ AL:RegisterTranslations("enUS", function() return {
 	["Rank 2-9"] = true,
 	["Donation Rewards"] = true,
 	["Fashion"] = true,
+	["Dun Morogh"] = true,
+	["Badlands"] = true,
+	["Gilneas"] = true,
+	["Swamp of Sorrows"] = true,
+	["Burning Steppes"] = true,
+	["Feralas"] = true,
+	["Western Plaguelands"] = true,
+	["Caverns of Time"] = true,
+	["Hyjal"] = true,
+	["Dustwallow Marsh"] = true,
 	} 
 end)

TableRegister/loottables.en.lua

@@ -124,7 +124,7 @@ AtlasLoot_TableNames = {
 	["DMETrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (East)"] .. ")", "AtlasLootItems" },
 	["DMEShard"] = { AL["Felvine Shard"], "AtlasLootItems" },
 	["DMTome"] = { AL["A Dusty Tome"], "AtlasLootItems" },
-	["DMBooks"] = { "Dire Maul Books", "AtlasLootItems" },
+	["DMEBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	--Dire Maul North
 	["DMNGuardMoldar"] = { AL["Guard Mol'dar"], "AtlasLootItems" },
 	["DMNStomperKreeg"] = { AL["Stomper Kreeg"], "AtlasLootItems" },
@@ -136,6 +136,7 @@ AtlasLoot_TableNames = {
 	["DMNKingGordok"] = { AL["King Gordok"], "AtlasLootItems" },
 	["DMNTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (North)"] .. ")", "AtlasLootItems" },
 	["DMNTRIBUTERUN"] = { AL["DM North Tribute Chest"], "AtlasLootItems" },
+	["DMNBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	--Dire Maul West
 	["DMWTendrisWarpwood"] = { AL["Tendris Warpwood"], "AtlasLootItems" },
 	["DMWIllyannaRavenoak"] = { AL["Illyanna Ravenoak"], "AtlasLootItems" },
@@ -147,6 +148,7 @@ AtlasLoot_TableNames = {
 	["DMWPrinceTortheldrin"] = { AL["Prince Tortheldrin"], "AtlasLootItems" },
 	["DMWShendralarProvisioner"] = { AL["Shen'dralar Provisioner"], "AtlasLootItems" },
 	["DMWTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (West)"] .. ")", "AtlasLootItems" },
+	["DMWBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	--Gnomeregan
 	["GnNamdoBizzfizzle"] = { AL["Namdo Bizzfizzle"], "AtlasLootItems" },
 	["GnTechbot"] = { AL["Techbot"], "AtlasLootItems" },
@@ -248,7 +250,7 @@ AtlasLoot_TableNames = {
 	["AQ20Ossirian"] = { AL["Ossirian the Unscarred"], "AtlasLootItems" },
 	["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" },
 	["AQ20ClassBooks"] = { "AQ Class Books", "AtlasLootItems" },
-	["AQEnchants"] = { "AQ Enchants", "AtlasLootItems" },
+	["AQ20Enchants"] = { "AQ Enchants", "AtlasLootItems" },
 	--Scarlet Monestery - Armory
 	["SMHerod"] = { AL["Herod"], "AtlasLootItems" },
 	["SMATrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Armory)"] .. ")", "AtlasLootItems" },
@@ -409,6 +411,7 @@ AtlasLoot_TableNames = {
 	["AQ40Trash1"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
 	["AQ40Trash2"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
 	["AQOpening"] = { "AQ Opening Quest Line", "AtlasLootItems" },
+	["AQEnchants"] = { "AQ Enchants", "AtlasLootItems" },
 	--Uldaman
 	["UldMagreganDeepshadow"] = { AL["Magregan Deepshadow"], "AtlasLootItems" },
 	["UldTabletofRyuneh"] = { "Tablet of Ryun'eh", "AtlasLootItems" },
@@ -1012,8 +1015,8 @@ AtlasLoot_TableNames = {
 	["PvP60Accessories1"] = { AL["PvP Accessories"], "AtlasLootGeneralPvPItems" },
 	["PvP60Accessories2"] = { AL["PvP Accessories - Alliance"], "AtlasLootGeneralPvPItems" },
 	["PvP60Accessories3"] = { AL["PvP Accessories - Horde"], "AtlasLootGeneralPvPItems" },
-	["PVPWeapons1"] = { AL["Rank 14 Weapons"], "AtlasLootGeneralPvPItems" },
+	["PVPWeapons1"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
-	["PVPWeapons2"] = { AL["Rank 14 Weapons"], "AtlasLootGeneralPvPItems" },
+	["PVPWeapons2"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
 	["PvPMountsPvP"] = { AL["PvP Mounts"], "AtlasLootGeneralPvPItems" },
 	--Level 60 PvP Sets
 	["PVPDruid"] = { AL["Druid"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
@@ -1031,6 +1034,8 @@ AtlasLoot_TableNames = {
 	-------------
 
 	--Menus, the entry does nothing, but makes the generalised loot table code less complex
+	["DUNGEONSMENU1"] = { "dummy", "dummy" },
+	["DUNGEONSMENU2"] = { "dummy", "dummy" },
 	["PVPMENU"] = { "dummy", "dummy" },
 	["PVPSET"] = { "dummy", "dummy" },
 	["AVRepMenu"] = { "dummy", "dummy" },
@@ -1062,7 +1067,6 @@ AtlasLoot_TableNames = {
 	["TAILORINGMENU"] = { "dummy", "dummy" },
 	["COOKINGMENU"] = { "dummy", "dummy" },
 	["FIRSTAIDMENU"] = { "dummy", "dummy" },
-	["SURVIVALMENU"] = { "dummy", "dummy" },
 	["WORLDBOSSMENU"] = { "dummy", "dummy" },
 	["WishList"] = { AL["WishList"], "AtlasLootCharDB" },
 	--If all else fails!
@@ -1242,7 +1246,7 @@ AtlasLoot_TableNamesBoss = {
 		["DMETrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (East)"] .. ")", "AtlasLootItems" },
 		["DMEShard"] = { AL["Felvine Shard"], "AtlasLootItems" },
 		["DMTome"] = { AL["A Dusty Tome"], "AtlasLootItems" },
-		["DMBooks"] = { "Dire Maul Books", "AtlasLootItems" },
+		["DMEBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	},
 	["Dire Maul North"] = {
 		["DMNGuardMoldar"] = { AL["Guard Mol'dar"], "AtlasLootItems" },
@@ -1255,6 +1259,7 @@ AtlasLoot_TableNamesBoss = {
 		["DMNKingGordok"] = { AL["King Gordok"], "AtlasLootItems" },
 		["DMNTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (North)"] .. ")", "AtlasLootItems" },
 		["DMNTRIBUTERUN"] = { AL["DM North Tribute Chest"], "AtlasLootItems" },
+		["DMNBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	},
 	["Dire Maul West"] = {
 		["DMWTendrisWarpwood"] = { AL["Tendris Warpwood"], "AtlasLootItems" },
@@ -1267,6 +1272,7 @@ AtlasLoot_TableNamesBoss = {
 		["DMWPrinceTortheldrin"] = { AL["Prince Tortheldrin"], "AtlasLootItems" },
 		["DMWShendralarProvisioner"] = { AL["Shen'dralar Provisioner"], "AtlasLootItems" },
 		["DMWTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (West)"] .. ")", "AtlasLootItems" },
+		["DMWBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	},
 	["Gnomeregan Entrance"] = {
 		["GnNamdoBizzfizzle"] = { AL["Namdo Bizzfizzle"], "AtlasLootItems" },
@@ -1381,7 +1387,7 @@ AtlasLoot_TableNamesBoss = {
 		["AQ20Ossirian"] = { AL["Ossirian the Unscarred"], "AtlasLootItems" },
 		["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" },
 		["AQ20ClassBooks"] = { "AQ Class Books", "AtlasLootItems" },
-		["AQEnchants"] = { "AQ Enchants", "AtlasLootItems" },
+		["AQ20Enchants"] = { "AQ Enchants", "AtlasLootItems" },
 	},
 	["Scarlet Monestery - Armory"] = {
 		["SMHerod"] = { AL["Herod"], "AtlasLootItems" },
@@ -1510,6 +1516,7 @@ AtlasLoot_TableNamesBoss = {
 		["AQ40Trash1"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
 		["AQ40Trash2"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
 		["AQOpening"] = { "AQ Opening Quest Line", "AtlasLootItems" },
+		["AQEnchants"] = { "AQ Enchants", "AtlasLootItems" },
 	},
 	["Uldaman Entrance"] = {
 		["UldMagreganDeepshadow"] = { AL["Magregan Deepshadow"], "AtlasLootItems" },
@@ -2134,8 +2141,8 @@ AtlasLoot_TableNamesBoss = {
 		["PvP60Accessories1"] = { AL["PvP Accessories"], "AtlasLootGeneralPvPItems" },
 		["PvP60Accessories2"] = { AL["PvP Accessories - Alliance"], "AtlasLootGeneralPvPItems" },
 		["PvP60Accessories3"] = { AL["PvP Accessories - Horde"], "AtlasLootGeneralPvPItems" },
-		["PVPWeapons1"] = { AL["Rank 14 Weapons"], "AtlasLootGeneralPvPItems" },
+		["PVPWeapons1"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
-		["PVPWeapons2"] = { AL["Rank 14 Weapons"], "AtlasLootGeneralPvPItems" },
+		["PVPWeapons2"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
 		["PvPMountsPvP"] = { AL["PvP Mounts"], "AtlasLootGeneralPvPItems" },
 		--Level 60 PvP Sets
 		["PVPDruid"] = { AL["Druid"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },