refactor menu list slightly

AtlasLoot.toc

@@ -3,7 +3,7 @@
 ## Notes: Shows possible loot from dungeon bosses and other sources.
 ## Author: Otari (overhaul/revamp, menu changes, bugfixes/updates), Lexie (Turtle WoW fixes/updates), Pepopo, MarcelineVQ (Kara40 loot), Shagu
 ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons)
-## Version: 3.2.5
+## Version: 3.2.6
 ## SavedVariablesPerCharacter: AtlasLootCharDB
 ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare
 

Core/AtlasLoot.lua

@@ -80,37 +80,36 @@ AtlasLoot_Data["AtlasLootFallback"] = {
 };
 
 AtlasLoot_MenuList = {
-	"DUNGEONSMENU1",
+	["DUNGEONSMENU1"] = "AtlasLoot_DungeonsMenu1",
-	"DUNGEONSMENU2",
+	["DUNGEONSMENU2"] = "AtlasLoot_DungeonsMenu2",
-	"PVPMENU",
+	["PVPMENU"] = "AtlasLootPvPMenu",
-	"ABRepMenu",
+	["ABRepMenu"] = "AtlasLootABRepMenu",
-	"AVRepMenu",
+	["AVRepMenu"] = "AtlasLootAVRepMenu",
-	"WSGRepMenu",
+	["WSGRepMenu"] = "AtlasLootWSGRepMenu",
-	"BRRepMenu",
+	["BRRepMenu"] = "AtlasLootBRRepMenu",
-	"PVPSET",
+	["PVPSET"] = "AtlasLootPVPSetMenu",
-	"SETMENU",
+	["SETMENU"] = "AtlasLootSetMenu",
-	"AQ20SET",
+	["AQ20SET"] = "AtlasLootAQ20SetMenu",
-	"AQ40SET",
+	["AQ40SET"] = "AtlasLootAQ40SetMenu",
-	"KARASET",
+	["KARASET"] = "AtlasLoot_Kara40SetMenu",
-	"PRE60SET",
+	["PRE60SET"] = "AtlasLootPRE60SetMenu",
-	"ZGSET",
+	["ZGSET"] = "AtlasLootZGSetMenu",
-	"T3SET",
+	["T3SET"] = "AtlasLootT3SetMenu",
-	"T2SET",
+	["T2SET"] = "AtlasLootT2SetMenu",
-	"T1SET",
+	["T1SET"] = "AtlasLootT1SetMenu",
-	"T0SET",
+	["T0SET"] = "AtlasLootT0SetMenu",
-	"REPMENU",
+	["REPMENU"] = "AtlasLootRepMenu",
-	"WORLDEVENTMENU",
+	["WORLDEVENTMENU"] = "AtlasLootWorldEventMenu",
-	"ALCHEMYMENU",
+	["ALCHEMYMENU"] = "AtlasLoot_AlchemyMenu",
-	"CRAFTINGMENU",
+	["CRAFTINGMENU"] = "AtlasLoot_CraftingMenu",
-	"SMITHINGMENU",
+	["SMITHINGMENU"] = "AtlasLoot_SmithingMenu",
-	"ENCHANTINGMENU",
+	["ENCHANTINGMENU"] = "AtlasLoot_EnchantingMenu",
-	"ENGINEERINGMENU",
+	["ENGINEERINGMENU"] = "AtlasLoot_EngineeringMenu",
-	"LEATHERWORKINGMENU",
+	["LEATHERWORKINGMENU"] = "AtlasLoot_LeatherworkingMenu",
-	"TAILORINGMENU",
+	["TAILORINGMENU"] = "AtlasLoot_TailoringMenu",
-	"CRAFTSET",
+	["JEWELCRAFTMENU"] = "AtlasLoot_JewelcraftingMenu",
-	"COOKINGMENU",
+	["CRAFTSET"] = "AtlasLootCraftedSetMenu",
-	"WORLDBOSSMENU",
+	["WORLDBOSSMENU"] = "AtlasLoot_WorldBossMenu",
-	"JEWELCRAFTMENU"
 };
 
 --[[
@@ -1040,70 +1039,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 	AtlasLootItemsFrame.refresh = { dataID, dataSource_backup, boss, pFrame };
 	-- Escape out of this function if creating a menu, this function only handles loot tables.
 	-- Inserting escapes in this way allows consistant calling of data whether it is a loot table or a menu.
-	if ( dataID == "PRE60SET" ) then
+	if ( AtlasLoot_MenuList[dataID] ) then
-		AtlasLootPRE60SetMenu();
+		_G[AtlasLoot_MenuList[dataID]]()
-	elseif ( dataID == "ZGSET" ) then
-		AtlasLootZGSetMenu();
-	elseif ( dataID == "AQ40SET" ) then
-		AtlasLootAQ40SetMenu();
-	elseif ( dataID == "AQ20SET" ) then
-		AtlasLootAQ20SetMenu();
-	elseif ( dataID == "KARASET" ) then
-		AtlasLoot_Kara40SetMenu();
-	elseif ( dataID == "T3SET" ) then
-		AtlasLootT3SetMenu();
-	elseif ( dataID == "T2SET" ) then
-		AtlasLootT2SetMenu();
-	elseif ( dataID == "T1SET" ) then
-		AtlasLootT1SetMenu();
-	elseif ( dataID == "T0SET" ) then
-		AtlasLootT0SetMenu();
-	elseif ( dataID == "PVPMENU" ) then
-		AtlasLootPvPMenu();
-	elseif ( dataID == "BRRepMenu" ) then
-		AtlasLootBRRepMenu();
-	elseif ( dataID == "WSGRepMenu" ) then
-		AtlasLootWSGRepMenu();
-	elseif ( dataID == "ABRepMenu" ) then
-		AtlasLootABRepMenu();
-	elseif ( dataID == "AVRepMenu" ) then
-		AtlasLootAVRepMenu();
-	elseif ( dataID == "PVPSET" ) then
-		AtlasLootPVPSetMenu();
-	elseif ( dataID == "REPMENU" ) then
-		AtlasLootRepMenu();
-	elseif ( dataID == "SETMENU" ) then
-		AtlasLootSetMenu();
-	elseif ( dataID == "WORLDEVENTMENU" ) then
-		AtlasLootWorldEventMenu();
-	elseif ( dataID == "CRAFTINGMENU" ) then
-		AtlasLoot_CraftingMenu();
-	elseif ( dataID == "CRAFTSET" ) then
-		AtlasLootCraftedSetMenu();
-	elseif ( dataID == "ALCHEMYMENU" ) then
-		AtlasLoot_AlchemyMenu();
-	elseif ( dataID == "SMITHINGMENU" ) then
-		AtlasLoot_SmithingMenu();
-	elseif ( dataID == "ENCHANTINGMENU" ) then
-		AtlasLoot_EnchantingMenu();
-	elseif ( dataID == "ENGINEERINGMENU" ) then
-		AtlasLoot_EngineeringMenu();
-	elseif ( dataID == "LEATHERWORKINGMENU" ) then
-		AtlasLoot_LeatherworkingMenu();
-	elseif ( dataID == "TAILORINGMENU" ) then
-		AtlasLoot_TailoringMenu();
-	elseif ( dataID == "COOKINGMENU" ) then
-		AtlasLoot_CookingMenu();
-	elseif ( dataID == "WORLDBOSSMENU" ) then
-		AtlasLoot_WorldBossMenu();
-	elseif ( dataID == "DUNGEONSMENU1" ) then
-		AtlasLoot_DungeonsMenu1();
-	elseif ( dataID == "DUNGEONSMENU2" ) then
-		AtlasLoot_DungeonsMenu2();
-	elseif ( dataID == "JEWELCRAFTMENU" ) then
-		AtlasLoot_JewelcraftingMenu();
 	else
-		-- AtlasLoot_QueryLootPage()
 		-- Iterate through each item object and set its properties
 		for i = 1, 30, 1 do
 			-- Check for a valid object (that it exists, and that it has a name)
@@ -1859,8 +1797,8 @@ 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, AtlasLoot_AnchorPoint);
 	end
-	for k,v in pairs(AtlasLoot_MenuList) do
+	for k in pairs(AtlasLoot_MenuList) do
-		if ( this.lootpage == v ) then
+		if ( this.lootpage == k ) then
 			AtlasLootDefaultFrame_SubMenu:Disable();
 			AtlasLootDefaultFrame_SelectedCategory:SetText(AtlasLootCharDB.LastBossText)
 			AtlasLootDefaultFrame_SelectedTable:SetText()
@@ -1878,8 +1816,8 @@ function AtlasLoot_IsLootTableAvailable(dataID)
 
 	local menu_check = false;
 
-	for k,v in pairs(AtlasLoot_MenuList) do
+	for k in pairs(AtlasLoot_MenuList) do
-		if ( v == dataID ) then
+		if ( k == dataID ) then
 			menu_check = true;
 		end
 	end
@@ -2285,19 +2223,19 @@ AtlasLoot_HewdropDown = {
 		},
 	{[AL["Crafting"]] = {
 			{ { AL["Alchemy"], "ALCHEMYMENU", "Table" }, },
-			{ { (AL["Blacksmithing"]), "SMITHINGMENU", "Table" }, },
+			{ { AL["Blacksmithing"], "SMITHINGMENU", "Table" }, },
-			{ { (AL["Enchanting"]), "ENCHANTINGMENU", "Table" }, },
+			{ { AL["Enchanting"], "ENCHANTINGMENU", "Table" }, },
-			{ { (AL["Engineering"]), "ENGINEERINGMENU", "Table" }, },
+			{ { AL["Engineering"], "ENGINEERINGMENU", "Table" }, },
-			{ { (AL["Herbalism"]), "Herbalism1", "Table" }, },
+			{ { AL["Herbalism"], "Herbalism1", "Table" }, },
-			{ { (AL["Leatherworking"]), "LEATHERWORKINGMENU", "Table" }, },
+			{ { AL["Leatherworking"], "LEATHERWORKINGMENU", "Table" }, },
-			{ { (AL["Jewelcrafting"]), "JEWELCRAFTMENU", "Table" }, },
+			{ { AL["Jewelcrafting"], "JEWELCRAFTMENU", "Table" }, },
-			{ { (AL["Mining"]), "Mining1", "Table" }, },
+			{ { AL["Mining"], "Mining1", "Table" }, },
-			{ { (AL["Tailoring"]), "TAILORINGMENU", "Table" }, },
+			{ { AL["Tailoring"], "TAILORINGMENU", "Table" }, },
-			{ { (AL["Cooking"]), "COOKINGMENU", "Table" }, },
+			{ { AL["Cooking"], "CookingApprentice1", "Table" }, },
-			{ { (AL["First Aid"]), "FirstAid1", "Table" }, },
+			{ { AL["First Aid"], "FirstAid1", "Table" }, },
-			{ { (AL["Survival"]), "Survival1", "Table" }, },
+			{ { AL["Survival"], "Survival1", "Table" }, },
-			{ { (AL["Gardening"]), "Survival2", "Table" }, },
+			{ { AL["Gardening"], "Survival2", "Table" }, },
-			{ { (AL["Poisons"]), "Poisons1", "Table" }, },
+			{ { AL["Poisons"], "Poisons1", "Table" }, },
 			{ { AL["Crafted Sets"], "CRAFTSET", "Table" },},
 			{ { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, },
 		},

Core/ButtonRegistry.lua

@@ -1,15 +1,16 @@
 local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
 
 AtlasLoot_ButtonRegistry = {
-	--WoW Instances
+	-- Dungeons & Raids
 	["DUNGEONSMENU1"] = {
 		Title = AL["Dungeons & Raids"];
-		Next_Page = "DUNGEONSMENU1";
+		Next_Page = "DUNGEONSMENU2";
 	};
 	["DUNGEONSMENU2"] = {
 		Title = AL["Dungeons & Raids"];
 		Prev_Page = "DUNGEONSMENU1";
 	};
+
 	-- Dragonmaw Retreat
 	["DMRGowlfang"] = {
 		Title = AL["Gowlfang"],
@@ -75,6 +76,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "DMRZuluhed",
 		Back_Page = "DUNGEONSMENU1",
 	};
+
 	-- Stormwrought Ruins
 	["SWROronok"] = {
 		Title = AL["Oronok Torn-Heart"],
@@ -152,6 +154,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SWRMergothid",
 		Back_Page = "DUNGEONSMENU1",
 	};
+
 	-- Hateforge Quarry
 	["HQHighForemanBargulBlackhammer"] = {
 		Title = AL["High Foreman Bargul Blackhammer"];
@@ -187,6 +190,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "HQHargeshDoomcaller";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Karazhan Crypt
 	["KCMarrowspike"] = {
 		Title = AL["Marrowspike"];
@@ -240,6 +244,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "KCTreasure";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Caverns of Time: Black Morass
 	["COTBMChronar"] = {
 		Title = AL["Chronar"];
@@ -287,6 +292,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "COTBMAntnormi";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Stormwind Vault
 	["SWVAszoshGrimflame"] = {
 		Title = AL["Aszosh Grimflame"];
@@ -328,6 +334,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SWVVaultArmoryEquipment";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- The Crescent Grove
 	["TCGGrovetenderEngryss"] = {
 		Title = AL["Grovetender Engryss"];
@@ -363,6 +370,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "TCGMasterRaxxieth";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Upper Karazhan Halls
     ["UKHGnarlmoon"] = {
 		Title = AL["Keeper Gnarlmoon"];
@@ -422,6 +430,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "UKHMephistroth";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Gilneas City
 	["GCMatthiasHoltz"] = {
 		Title = AL["Matthias Holtz"];
@@ -475,6 +484,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "GCGennGreymane";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Blackrock Depths
 	["BRDLordRoccor"] = {
 		Title = AL["Lord Roccor"];
@@ -636,6 +646,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "BRDEmperorDagranThaurissan";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Lower Blackrock Spire
 	["LBRSSpirestoneButcher"] = {
 		Title = AL["Spirestone Butcher"].." ("..AL["Rare"]..")";
@@ -743,6 +754,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "LBRSWyrmthalak";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Upper Blackrock Spire
 	["UBRSEmberseer"] = {
 		Title = AL["Pyroguard Emberseer"];
@@ -808,6 +820,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "UBRSDrakkisath";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Blackwing Lair
 	["BWLRazorgore"] = {
 		Title = AL["Razorgore the Untamed"];
@@ -861,6 +874,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "BWLNefarian";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- The Deadmines
     ["DMJaredVoss"] = {
 		Title = AL["Jared Voss"];
@@ -932,6 +946,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "DMVanCleef";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Gnomeregan
 	["GnGrubbis"] = {
 		Title = AL["Grubbis"];
@@ -973,6 +988,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "GnMekgineerThermaplugg";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Molten Core
 	["MCIncindis"] = {
 		Title = AL["Incindis"];
@@ -991,6 +1007,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "MCLucifron";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- ["MCGehennas"] = {
 	-- 	Title = AL["Gehennas"];
 	-- 	Next_Page = "MCGarr";
@@ -1063,6 +1080,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "MCTrashMobs";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Naxxramas
 	["NAXPatchwerk"] = {
 		Title = AL["Patchwerk"];
@@ -1158,6 +1176,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "NAXKelThuzard";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Scarlet Monastery
 	["SMVishas"] = {
 		Title = AL["Interrogator Vishas"];
@@ -1265,6 +1284,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SMWhitemane";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Scholomance
 	["SCHOLOBlood"] = {
 		Title = AL["Blood Steward of Kirtonos"];
@@ -1372,6 +1392,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SCHOLODarkmasterGandling";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Shadowfang Keep
 	["SFKRethilgore"] = {
 		Title = AL["Rethilgore"];
@@ -1455,6 +1476,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SFKPrelate";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- The Stockade
 	["SWStTargorr"] = {
 		Title = AL["Targorr the Dread"];
@@ -1496,6 +1518,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "SWStBruegalIronknuckle";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Stratholme
 	["STRATSkull"] = {
 		Title = AL["Skul"].." ("..AL["Rare"]..")";
@@ -1645,6 +1668,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "STRATBaronRivendare";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Sunken Temple
 	["STBalconyMinibosses"] = {
 		Title = AL["Balcony Minibosses"];
@@ -1716,6 +1740,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "STEranikus";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Uldaman
 	["UldBaelog"] = {
 		Title = AL["Baelog"];
@@ -1775,6 +1800,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "UldArchaedas";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Zul'Gurub
 	["ZGJeklik"] = {
 		Title = AL["High Priestess Jeklik"];
@@ -1877,6 +1903,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "ZGTrash2";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Blackfathom Deeps
 	["BFDGhamoora"] = {
 		Title = AL["Ghamoo-ra"];
@@ -1930,6 +1957,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "BFDAkumai";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Dire Maul East
 	["DMEPusillin"] = {
 		Title = AL["Pusillin"];
@@ -1983,6 +2011,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "DMETrash";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Dire Maul West
 	["DMWTendrisWarpwood"] = {
 		Title = AL["Tendris Warpwood"];
@@ -2042,6 +2071,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "DMWTrash";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Dire Maul North
 	["DMNGuardMoldar"] = {
 		Title = AL["Guard Mol'dar"];
@@ -2107,6 +2137,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "DMNTrash";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Maraudon
 	["MaraNoxxion"] = {
 		Title = AL["Noxxion"];
@@ -2166,6 +2197,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "MaraPrincessTheradras";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Ragefire Chasm
 	["RFCTaragaman"] = {
 		Title = AL["Taragaman the Hungerer"];
@@ -2189,6 +2221,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "RFCJergosh";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Razorfen Downs
 	["RFDTutenkash"] = {
 		Title = AL["Tuten'kash"];
@@ -2242,6 +2275,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "RFDAmnennar";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Razorfen Kraul
 	["RFKAggem"] = {
 		Title = AL["Aggem Thorncurse"];
@@ -2301,6 +2335,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "RFKRotthorn";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Ruins of Ahn'Qiraj
 	["AQ20Kurinnaxx"] = {
 		Title = AL["Kurinnaxx"];
@@ -2366,6 +2401,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "AQ20ClassBooks";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Temple of Ahn'Qiraj
 	["AQ40Skeram"] = {
 		Title = AL["The Prophet Skeram"];
@@ -2443,6 +2479,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "AQEnchants";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Wailing Caverns
 	["WCLordCobrahn"] = {
 		Title = AL["Lord Cobrahn"];
@@ -2514,6 +2551,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "WCMutanus";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Zul'Farrak
 	["ZFAntusul"] = {
 		Title = AL["Antu'sul"];
@@ -2573,6 +2611,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "ZFChampion";
 		Back_Page = "DUNGEONSMENU1";
 	};
+
 	-- Emerald Sanctum
 	["ESErennius"] = {
 		Title = AL["Erennius"];
@@ -2596,6 +2635,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "ESHardMode";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Lower Karazhan Halls
 	["LKHRolfen"] = {
 		Title = AL["Master Blacksmith Rolfen"];
@@ -2643,11 +2683,13 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "LKHTrash";
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- Onyxia's Lair
 	["Onyxia"] = {
 		Title = AL["Onyxia's Lair"];
 		Back_Page = "DUNGEONSMENU2";
 	};
+
 	-- World Bosses
 	["AAzuregos"] = {
 		Title = AL["Azuregos"];
@@ -2719,6 +2761,7 @@ AtlasLoot_ButtonRegistry = {
 		Prev_Page = "CowKing";
 		Back_Page = "WORLDBOSSMENU",
 	};
+
 	-- Rare Spawns
 	["EarthcallerRezengal"] = {
 		Title = AL["Earthcaller Rezengal"];
@@ -2898,6 +2941,7 @@ AtlasLoot_ButtonRegistry = {
 		Title = AL["M-0L1Y"];
 		Prev_Page = "WidowoftheWoods";
 	};
+
 	-- Factions
 	["Argent1"] = {
 		Title = AL["Argent Dawn"] .. ": " .. AL["Token Hand-Ins"];
@@ -3941,6 +3985,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "WORLDEVENTMENU";
 		Prev_Page = "AbyssalDukes";
 	};
+
+	-- Alchemy
 	["AlchemyApprentice1"] = {
 		Title = AL["Alchemy"] .. ": " .. AL["Apprentice"];
 		Back_Page = "ALCHEMYMENU";
@@ -4023,6 +4069,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "ALCHEMYMENU";
 		Prev_Page = "AlchemyOffensive2";
 	},
+
+	-- Blacksmithing
 	["SmithingApprentice1"] = {
 		Title = AL["Blacksmithing"] .. ": " .. AL["Apprentice"];
 		Back_Page = "SMITHINGMENU";
@@ -4213,6 +4261,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "SMITHINGMENU";
 		Prev_Page = "Hammersmith1";
 	};
+
+	-- Enchanting
 	["EnchantingApprentice1"] = {
 		Title = AL["Enchanting"] .. ": " .. AL["Apprentice"];
 		Back_Page = "ENCHANTINGMENU";
@@ -4313,6 +4363,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "ENCHANTINGMENU";
 		Prev_Page = "EnchantingShield1";
 	};
+
+	-- Engineering
 	["EngineeringApprentice1"] = {
 		Title = AL["Engineering"] .. ": " .. AL["Apprentice"];
 		Back_Page = "ENGINEERINGMENU";
@@ -4413,6 +4465,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "ENGINEERINGMENU";
 		Prev_Page = "Gnomish1";
 	};
+
+	-- Leatherworking
 	["LeatherApprentice1"] = {
 		Title = AL["Leatherworking"] .. ": " .. AL["Apprentice"];
 		Back_Page = "LEATHERWORKINGMENU";
@@ -4567,6 +4621,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "LEATHERWORKINGMENU";
 		Prev_Page = "Elemental1";
 	};
+
+	-- Jewelcrafting
 	["JewelcraftingApprentice1"] = {
 		Title = AL["Jewelcrafting"] .. ": " .. AL["Apprentice"];
 		Back_Page = "JEWELCRAFTMENU";
@@ -4685,6 +4741,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "JEWELCRAFTMENU";
 		Prev_Page = "JewelcraftingGemology1";
 	};
+
+	-- Herbalism
 	["Herbalism1"] = {
 		Title = AL["Herbalism"];
 		Back_Page = "CRAFTINGMENU";
@@ -4695,6 +4753,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "CRAFTINGMENU";
 		Prev_Page = "Herbalism1";
 	};
+
+	-- Mining
 	["Mining1"] = {
 		Title = AL["Mining"];
 		Back_Page = "CRAFTINGMENU";
@@ -4705,6 +4765,8 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "CRAFTINGMENU";
 		Prev_Page = "Mining1";
 	};
+
+	-- Tailoring
 	["TailoringApprentice1"] = {
 		Title = AL["Tailoring"] .. ": " .. AL["Apprentice"];
 		Back_Page = "TAILORINGMENU";
@@ -4859,40 +4921,50 @@ AtlasLoot_ButtonRegistry = {
 		Back_Page = "TAILORINGMENU";
 		Prev_Page = "TailoringBags1";
 	};
+
+	-- Cooking
 	["CookingApprentice1"] = {
 		Title = AL["Cooking"] .. ": " .. AL["Apprentice"];
-		Back_Page = "COOKINGMENU";
+		Back_Page = "CRAFTINGMENU";
 		Next_Page = "CookingJourneyman1";
 	};
 	["CookingJourneyman1"] = {
 		Title = AL["Cooking"] .. ": " .. AL["Journeyman"];
-		Back_Page = "COOKINGMENU";
+		Back_Page = "CRAFTINGMENU";
 		Prev_Page = "CookingApprentice1";
 		Next_Page = "CookingExpert1";
 	};
 	["CookingExpert1"] = {
 		Title = AL["Cooking"] .. ": " .. AL["Expert"];
-		Back_Page = "COOKINGMENU";
+		Back_Page = "CRAFTINGMENU";
 		Prev_Page = "CookingJourneyman1";
 		Next_Page = "CookingArtisan1";
 	};
 	["CookingArtisan1"] = {
 		Title = AL["Cooking"] .. ": " .. AL["Artisan"];
-		Back_Page = "COOKINGMENU";
+		Back_Page = "CRAFTINGMENU";
 		Prev_Page = "CookingExpert1";
 	};
+
+	-- First Aid
 	["FirstAid1"] = {
 		Title = AL["First Aid"];
 		Back_Page = "CRAFTINGMENU";
 	};
+
+	-- Survival
 	["Survival1"] = {
 		Title = AL["Survival"];
 		Back_Page = "CRAFTINGMENU";
 	};
+
+	-- Gardening
 	["Survival2"] = {
 		Title = AL["Gardening"];
 		Back_Page = "CRAFTINGMENU";
 	};
+
+	-- Poisons
 	["Poisons1"] = {
 		Title = AL["Poisons"];
 		Back_Page = "CRAFTINGMENU";

Core/Crafting.lua

@@ -66,7 +66,7 @@ function AtlasLoot_CraftingMenu()
 	AtlasLootMenuItem_11_Name:SetText(AL["Cooking"]);
 	AtlasLootMenuItem_11_Extra:SetText("");
 	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
-	AtlasLootMenuItem_11.lootpage="COOKINGMENU";
+	AtlasLootMenuItem_11.lootpage="CookingApprentice1";
 	AtlasLootMenuItem_11:Show();
 	--First Aid
 	AtlasLootMenuItem_12_Name:SetText(AL["First Aid"]);
@@ -862,34 +862,6 @@ function AtlasLoot_TailoringMenu()
 	AtlasLootMenuItem_19:Show();
 end
 
-function AtlasLoot_CookingMenu()
-	AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Cooking"])
-	--Apprentice
-	AtlasLootMenuItem_2_Name:SetText(AL["Cooking"]..": "..AL["Apprentice"]);
-	AtlasLootMenuItem_2_Extra:SetText("");
-	AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
-	AtlasLootMenuItem_2.lootpage = "CookingApprentice1";
-	AtlasLootMenuItem_2:Show();
-	--Journeyman
-	AtlasLootMenuItem_3_Name:SetText(AL["Cooking"]..": "..AL["Journeyman"]);
-	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
-	AtlasLootMenuItem_3.lootpage = "CookingJourneyman1";
-	AtlasLootMenuItem_3:Show();
-	--Expert
-	AtlasLootMenuItem_4_Name:SetText(AL["Cooking"]..": "..AL["Expert"]);
-	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
-	AtlasLootMenuItem_4.lootpage="CookingExpert1";
-	AtlasLootMenuItem_4:Show();
-	--Artisan
-	AtlasLootMenuItem_5_Name:SetText(AL["Cooking"]..": "..AL["Artisan"]);
-	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
-	AtlasLootMenuItem_5.lootpage="CookingArtisan1";
-	AtlasLootMenuItem_5:Show();
-end
-
 function AtlasLoot_JewelcraftingMenu()
 	AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Jewelcrafting"])
 	--Apprentice

Database/TableRegister.lua

@@ -1094,7 +1094,6 @@ AtlasLoot_TableNames = {
 	["ENGINEERINGMENU"] = { "dummy", "dummy" },
 	["LEATHERWORKINGMENU"] = { "dummy", "dummy" },
 	["TAILORINGMENU"] = { "dummy", "dummy" },
-	["COOKINGMENU"] = { "dummy", "dummy" },
 	["FIRSTAIDMENU"] = { "dummy", "dummy" },
 	["WORLDBOSSMENU"] = { "dummy", "dummy" },
 	["JEWELCRAFTMENU"] = { "dummy", "dummy" },