3.0.7

AtlasLoot.toc

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

Core/AtlasLoot.xml

@@ -546,6 +546,10 @@
 					<OnClick>
 						AtlasLoot_ShowWishList();
 						CloseDropDownMenus();
+						AtlasLootDefaultFrame_SubMenu:Disable()
+						AtlasLootDefaultFrame_SelectedTable:Hide()
+						AtlasLootQuickLooksButton:Hide()
+						AtlasLoot_QuickLooks:Hide()
 					</OnClick>
 					<OnShow>
 						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");

Core/PvP.lua

@@ -336,55 +336,55 @@ function AtlasLootPVPSetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff"..AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest")
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest")
 	AtlasLootMenuItem_3.lootpage="PVPPriest";
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef"..AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage="PVPMage";
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9"..AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage="PVPWarlock";
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468"..AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue")
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue")
 	AtlasLootMenuItem_6.lootpage="PVPRogue";
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a"..AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid")
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid")
 	AtlasLootMenuItem_7.lootpage="PVPDruid";
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372"..AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter")
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter")
 	AtlasLootMenuItem_18.lootpage="PVPHunter";
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff"..AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage="PVPShaman";
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba"..AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin")
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin")
 	AtlasLootMenuItem_20.lootpage="PVPPaladin";
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d"..AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior")
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior")
 	AtlasLootMenuItem_21.lootpage="PVPWarrior";
 	AtlasLootMenuItem_21:Show();
 end

Core/Sets.lua

@@ -3,21 +3,20 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
 local ORANGE = "|cffFF8400";
 local data = AtlasLoot_Data["AtlasLootSetItems"]
 
-local classCoords = {
+function AtlasLoot_GetDataSource(dataID)
-	["warrior"] = { 0, 0.25, 0, 0.25 },
+	local source = nil
-	["mage"] = { 0.25, 0.5, 0, 0.25 },
+	for k in pairs(AtlasLoot_Data) do
-	["rogue"] = { 0.5, 0.745, 0, 0.25 },
+		if source then
-	["druid"] = { 0.75, 0.99, 0, 0.25 },
+			break
-	["hunter"] = { 0, 0.25, 0.25, 0.5 },
+		end
-	["shaman"] = { 0.25, 0.50, 0.25, 0.5 },
+		for i in pairs(AtlasLoot_Data[k]) do
-	["priest"] = { 0.50, 0.75, 0.25, 0.5 },
+			if i == dataID then
-	["warlock"] = { 0.75, 0.99, 0.25, 0.5 },
+				source = k
-	["paladin"] = { 0, 0.25, 0.5, 0.75 },
+				break
-}
+			end
-
+		end
-function AtlasLoot_SetClassIcon(object, class)
+	end
-	object:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes")
+	return source
-	object:SetTexCoord(unpack(classCoords[class]))
 end
 
 function AtlasLoot_PrepMenu(backPage, title)
@@ -26,10 +25,12 @@ function AtlasLoot_PrepMenu(backPage, title)
 		getglobal("AtlasLootItem_" .. i.."Border"):Hide()
 	end
 	for i = 1, 30, 1 do
+		local button = getglobal("AtlasLootMenuItem_" .. i)
 		getglobal("AtlasLootMenuItem_" .. i.."Border"):Hide()
-		getglobal("AtlasLootMenuItem_" .. i):Hide();
+		button:Hide();
-		getglobal("AtlasLootMenuItem_" .. i).isheader = false;
+		button.isheader = false;
-		getglobal("AtlasLootMenuItem_" .. i).container = nil
+		button.container = nil
+		button.dataSource = nil
 		getglobal("AtlasLootMenuItem_" .. i .. "_Icon"):SetTexCoord(0, 1, 0, 1)
 	end
 	if backPage then
@@ -279,7 +280,9 @@ function AtlasLootPRE60SetMenu()
 	AtlasLootMenuItem_23.container = data.SpiritofEskhandarC
 	AtlasLootMenuItem_23:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -290,63 +293,63 @@ function AtlasLootZGSetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest")
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest")
 	AtlasLootMenuItem_3.lootpage = "ZGPriest";
 	AtlasLootMenuItem_3.container = data.ZGPriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "ZGMage";
 	AtlasLootMenuItem_4.container = data.ZGMageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "ZGWarlock";
 	AtlasLootMenuItem_5.container = data.ZGWarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue")
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue")
 	AtlasLootMenuItem_6.lootpage = "ZGRogue";
 	AtlasLootMenuItem_6.container = data.ZGRogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid")
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid")
 	AtlasLootMenuItem_7.lootpage = "ZGDruid";
 	AtlasLootMenuItem_7.container = data.ZGDruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter")
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter")
 	AtlasLootMenuItem_18.lootpage = "ZGHunter";
 	AtlasLootMenuItem_18.container = data.ZGHunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "ZGShaman";
 	AtlasLootMenuItem_19.container = data.ZGShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin")
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin")
 	AtlasLootMenuItem_20.lootpage = "ZGPaladin";
 	AtlasLootMenuItem_20.container = data.ZGPaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior")
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior")
 	AtlasLootMenuItem_21.lootpage = "ZGWarrior";
 	AtlasLootMenuItem_21.container = data.ZGWarriorC
 	AtlasLootMenuItem_21:Show();
@@ -372,7 +375,9 @@ function AtlasLootZGSetMenu()
 	AtlasLootMenuItem_25.container = data.HakkariBladesC
 	AtlasLootMenuItem_25:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -383,68 +388,70 @@ function AtlasLootAQ40SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest")
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest")
 	AtlasLootMenuItem_3.lootpage = "AQ40Priest";
 	AtlasLootMenuItem_3.container = data.AQ40PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "AQ40Mage";
 	AtlasLootMenuItem_4.container = data.AQ40MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "AQ40Warlock";
 	AtlasLootMenuItem_5.container = data.AQ40WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "AQ40Rogue";
 	AtlasLootMenuItem_6.container = data.AQ40RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "AQ40Druid";
 	AtlasLootMenuItem_7.container = data.AQ40DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "AQ40Hunter";
 	AtlasLootMenuItem_18.container = data.AQ40HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "AQ40Shaman";
 	AtlasLootMenuItem_19.container = data.AQ40ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "AQ40Paladin";
 	AtlasLootMenuItem_20.container = data.AQ40PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "AQ40Warrior";
 	AtlasLootMenuItem_21.container = data.AQ40WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -455,68 +462,70 @@ function AtlasLootAQ20SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "AQ20Priest";
 	AtlasLootMenuItem_3.container = data.AQ20PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "AQ20Mage";
 	AtlasLootMenuItem_4.container = data.AQ20MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "AQ20Warlock";
 	AtlasLootMenuItem_5.container = data.AQ20WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "AQ20Rogue";
 	AtlasLootMenuItem_6.container = data.AQ20RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "AQ20Druid";
 	AtlasLootMenuItem_7.container = data.AQ20DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "AQ20Hunter";
 	AtlasLootMenuItem_18.container = data.AQ20HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "AQ20Shaman";
 	AtlasLootMenuItem_19.container = data.AQ20ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "AQ20Paladin";
 	AtlasLootMenuItem_20.container = data.AQ20PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "AQ20Warrior";
 	AtlasLootMenuItem_21.container = data.AQ20WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -527,68 +536,70 @@ function AtlasLootT0SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "T0Priest";
 	AtlasLootMenuItem_3.container = data.T0PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage");
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage");
 	AtlasLootMenuItem_4.lootpage = "T0Mage";
 	AtlasLootMenuItem_4.container = data.T0MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "T0Warlock";
 	AtlasLootMenuItem_5.container = data.T0WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue")
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue")
 	AtlasLootMenuItem_6.lootpage = "T0Rogue";
 	AtlasLootMenuItem_6.container = data.T0RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid")
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid")
 	AtlasLootMenuItem_7.lootpage = "T0Druid";
 	AtlasLootMenuItem_7.container = data.T0DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter")
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter")
 	AtlasLootMenuItem_18.lootpage = "T0Hunter";
 	AtlasLootMenuItem_18.container = data.T0HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "T0Shaman";
 	AtlasLootMenuItem_19.container = data.T0ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin")
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin")
 	AtlasLootMenuItem_20.lootpage = "T0Paladin";
 	AtlasLootMenuItem_20.container = data.T0PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior")
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior")
 	AtlasLootMenuItem_21.lootpage = "T0Warrior";
 	AtlasLootMenuItem_21.container = data.T0WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -599,68 +610,70 @@ function AtlasLootT1SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "T1Priest";
 	AtlasLootMenuItem_3.container = data.T1PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "T1Mage";
 	AtlasLootMenuItem_4.container = data.T1MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "T1Warlock";
 	AtlasLootMenuItem_5.container = data.T1WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "T1Rogue";
 	AtlasLootMenuItem_6.container = data.T1RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "T1Druid";
 	AtlasLootMenuItem_7.container = data.T1DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "T1Hunter";
 	AtlasLootMenuItem_18.container = data.T1HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "T1Shaman";
 	AtlasLootMenuItem_19.container = data.T1ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "T1Paladin";
 	AtlasLootMenuItem_20.container = data.T1PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "T1Warrior";
 	AtlasLootMenuItem_21.container = data.T1WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -671,68 +684,70 @@ function AtlasLootT2SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "T2Priest";
 	AtlasLootMenuItem_3.container = data.T2PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "T2Mage";
 	AtlasLootMenuItem_4.container = data.T2MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "T2Warlock";
 	AtlasLootMenuItem_5.container = data.T2WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "T2Rogue";
 	AtlasLootMenuItem_6.container = data.T2RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "T2Druid";
 	AtlasLootMenuItem_7.container = data.T2DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "T2Hunter";
 	AtlasLootMenuItem_18.container = data.T2HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "T2Shaman";
 	AtlasLootMenuItem_19.container = data.T2ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "T2Paladin";
 	AtlasLootMenuItem_20.container = data.T2PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "T2Warrior";
 	AtlasLootMenuItem_21.container = data.T2WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -743,68 +758,70 @@ function AtlasLootT3SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "T3Priest";
 	AtlasLootMenuItem_3.container = data.T3PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "T3Mage";
 	AtlasLootMenuItem_4.container = data.T3MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "T3Warlock";
 	AtlasLootMenuItem_5.container = data.T3WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "T3Rogue";
 	AtlasLootMenuItem_6.container = data.T3RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "T3Druid";
 	AtlasLootMenuItem_7.container = data.T3DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "T3Hunter";
 	AtlasLootMenuItem_18.container = data.T3HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "T3Shaman";
 	AtlasLootMenuItem_19.container = data.T3ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "T3Paladin";
 	AtlasLootMenuItem_20.container = data.T3PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "T3Warrior";
 	AtlasLootMenuItem_21.container = data.T3WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end
@@ -815,68 +832,70 @@ function AtlasLoot_Kara40SetMenu()
 	--Priest
 	AtlasLootMenuItem_3_Name:SetText("|cffffffff" .. AL["Priest"]);
 	AtlasLootMenuItem_3_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest");
+	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\priest");
 	AtlasLootMenuItem_3.lootpage = "T35Priest";
 	AtlasLootMenuItem_3.container = data.T35PriestC
 	AtlasLootMenuItem_3:Show();
 	--Mage
 	AtlasLootMenuItem_4_Name:SetText("|cff68ccef" .. AL["Mage"]);
 	AtlasLootMenuItem_4_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
+	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\mage")
 	AtlasLootMenuItem_4.lootpage = "T35Mage";
 	AtlasLootMenuItem_4.container = data.T35MageC
 	AtlasLootMenuItem_4:Show();
 	--Warlock
 	AtlasLootMenuItem_5_Name:SetText("|cff9382c9" .. AL["Warlock"]);
 	AtlasLootMenuItem_5_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
+	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warlock")
 	AtlasLootMenuItem_5.lootpage = "T35Warlock";
 	AtlasLootMenuItem_5.container = data.T35WarlockC
 	AtlasLootMenuItem_5:Show();
 	--Rogue
 	AtlasLootMenuItem_6_Name:SetText("|cfffff468" .. AL["Rogue"]);
 	AtlasLootMenuItem_6_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue");
+	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\rogue");
 	AtlasLootMenuItem_6.lootpage = "T35Rogue";
 	AtlasLootMenuItem_6.container = data.T35RogueC
 	AtlasLootMenuItem_6:Show();
 	--Druid
 	AtlasLootMenuItem_7_Name:SetText("|cffff7c0a" .. AL["Druid"]);
 	AtlasLootMenuItem_7_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid");
+	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\druid");
 	AtlasLootMenuItem_7.lootpage = "T35Druid";
 	AtlasLootMenuItem_7.container = data.T35DruidC
 	AtlasLootMenuItem_7:Show();
 	--Hunter
 	AtlasLootMenuItem_18_Name:SetText("|cffaad372" .. AL["Hunter"]);
 	AtlasLootMenuItem_18_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter");
+	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\hunter");
 	AtlasLootMenuItem_18.lootpage = "T35Hunter";
 	AtlasLootMenuItem_18.container = data.T35HunterC
 	AtlasLootMenuItem_18:Show();
 	--Shaman
 	AtlasLootMenuItem_19_Name:SetText("|cff2773ff" .. AL["Shaman"]);
 	AtlasLootMenuItem_19_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
+	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\shaman")
 	AtlasLootMenuItem_19.lootpage = "T35Shaman";
 	AtlasLootMenuItem_19.container = data.T35ShamanC
 	AtlasLootMenuItem_19:Show();
 	--Paladin
 	AtlasLootMenuItem_20_Name:SetText("|cfff48cba" .. AL["Paladin"]);
 	AtlasLootMenuItem_20_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin");
+	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\paladin");
 	AtlasLootMenuItem_20.lootpage = "T35Paladin";
 	AtlasLootMenuItem_20.container = data.T35PaladinC
 	AtlasLootMenuItem_20:Show();
 	--Warrior
 	AtlasLootMenuItem_21_Name:SetText("|cffc69b6d" .. AL["Warrior"]);
 	AtlasLootMenuItem_21_Extra:SetText("");
-	AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior");
+	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\AddOns\\AtlasLoot\\Images\\warrior");
 	AtlasLootMenuItem_21.lootpage = "T35Warrior";
 	AtlasLootMenuItem_21.container = data.T35WarriorC
 	AtlasLootMenuItem_21:Show();
 	for i = 1, 30 do
-		if getglobal("AtlasLootMenuItem_"..i).container then
+		local button = getglobal("AtlasLootMenuItem_" .. i)
+		button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
+		if button.container then
 			getglobal("AtlasLootMenuItem_"..i.."Border"):Show()
 		end
 	end

Core/TextParsing.lua

@@ -4,6 +4,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
 -- Text replacement function
 --------------------------------------------------------------------------------
 function AtlasLoot_FixText(text)
+	local gsub = string.gsub
 	--Armour class
 	text = gsub(text, "#a1#", AL["Cloth"]);
 	text = gsub(text, "#a2#", AL["Leather"]);
@@ -151,7 +152,6 @@ function AtlasLoot_FixText(text)
 	text = gsub(text, "#st5#", AL["Zolo"]);
 	text = gsub(text, "#st6#", AL["Zul'Lor"]);
 
-
 	-- Misc phrases and mod specific stuff
 	text = gsub(text, "#m1#", AL["Classes"]);
 	text = gsub(text, "#m2#", AL["This Item Begins a Quest"]);
@@ -653,14 +653,14 @@ function AtlasLoot_FixText(text)
 	text = gsub(text, "#z5#", AL["UBRS"]);
 	
 	--Currency Icons
-	text = gsub(text, "#gold#", "Interface\\AddOns\\AtlasLoot\\Images\\gold");
+	-- text = gsub(text, "#gold#", "Interface\\AddOns\\AtlasLoot\\Images\\gold");
-	text = gsub(text, "#silver#", "Interface\\AddOns\\AtlasLoot\\Images\\silver");
+	-- text = gsub(text, "#silver#", "Interface\\AddOns\\AtlasLoot\\Images\\silver");
-	text = gsub(text, "#copper#", "Interface\\AddOns\\AtlasLoot\\Images\\bronze");
+	-- text = gsub(text, "#copper#", "Interface\\AddOns\\AtlasLoot\\Images\\bronze");
-	text = gsub(text, "#wsg#", "Interface\\Icons\\INV_Misc_Rune_07");
+	-- text = gsub(text, "#wsg#", "Interface\\Icons\\INV_Misc_Rune_07");
-	text = gsub(text, "#ab#", "Interface\\Icons\\INV_Jewelry_Amulet_07");
+	-- text = gsub(text, "#ab#", "Interface\\Icons\\INV_Jewelry_Amulet_07");
-	text = gsub(text, "#av#", "Interface\\Icons\\INV_Jewelry_Necklace_21");
+	-- text = gsub(text, "#av#", "Interface\\Icons\\INV_Jewelry_Necklace_21");
-	text = gsub(text, "#horde#", "Interface\\AddOns\\AtlasLoot\\Images\\Horde");
+	-- text = gsub(text, "#horde#", "Interface\\AddOns\\AtlasLoot\\Images\\Horde");
-	text = gsub(text, "#alliance#", "Interface\\AddOns\\AtlasLoot\\Images\\Alliance");
+	-- text = gsub(text, "#alliance#", "Interface\\AddOns\\AtlasLoot\\Images\\Alliance");
 	text = gsub(text, "#darkmoon#", "Interface\\Icons\\INV_Misc_Ticket_Darkmoon_01");
 	text = gsub(text, "#ccombat#", "Interface\\Icons\\INV_Jewelry_Talisman_06");
 	text = gsub(text, "#ctactical#", "Interface\\Icons\\INV_Jewelry_Amulet_02");

Core/WishList.lua

@@ -26,14 +26,14 @@ end
 AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, lootPage, sourcePage)
 Looks for an empty slot in the wishlist and slots the item in
 ]]
-function AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, lootPage, sourcePage)
+function AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, extraText, sourcePage)
 	for _, v in ipairs(AtlasLootCharDB["WishList"]) do
 		if v[1] == itemID then
 			DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..RED..AL[" already in the WishList!"]);
 			return;
 		end
 	end
-	table.insert(AtlasLootCharDB["WishList"], { itemID, itemTexture, itemName, lootPage, sourcePage });
+	table.insert(AtlasLootCharDB["WishList"], { itemID, itemTexture, itemName, extraText, sourcePage });
 	DEFAULT_CHAT_FRAME:AddMessage(BLUE..AL["AtlasLoot"]..": "..AtlasLoot_FixText(itemName)..GREY..AL[" added to the WishList."]);
 	AtlasLoot_WishList = AtlasLoot_CategorizeWishList(AtlasLootCharDB["WishList"]);
 end
@@ -174,7 +174,9 @@ function AtlasLoot_GetWishListSubheading(dataID)
 end
 
 function AtlasLoot_GetWishListSubheadingBoss(dataID)
-	if not AtlasLoot_TableNames then return end
+	if not AtlasLoot_TableNamesBoss then
+		return
+	end
 	local zoneID ;
 	for i, v in pairs(AtlasLoot_TableNamesBoss) do
 		for j,k in pairs(v) do
@@ -217,7 +219,7 @@ function AtlasLoot_CategorizeWishList(wlTable)
 
 	for _, v in pairs(wlTable) do
 		if v[5] and v[5] ~= "" then
-			local dataID = strsplit("|", v[5]);
+			local dataID = AtlasLoot_Strsplit("|", v[5]);
 			-- Build subheading table
 			if not subheadings[dataID] then
 				subheadings[dataID] = AtlasLoot_GetWishListSubheadingBoss(dataID);
@@ -245,7 +247,7 @@ function AtlasLoot_CategorizeWishList(wlTable)
 		-- some debug code that I've used to fix WishList errors before due to people adding drops to AtlasLoot incorrectly.
 		local box = k or "Unknown"
 		local cat = categories[k][1][5] or "Unknown"
-		local parent = GetLootTableParent(strsplit("|", cat)) or "Unknown"
+		local parent = GetLootTableParent(AtlasLoot_Strsplit("|", cat)) or "Unknown"
 		--print("box: "..box.." - cat: "..cat)
 		table.insert(result, { 0, "INV_Box_01", "=q6="..box, "=q0="..parent });
 		

Instances/instances.en.lua

@@ -1395,39 +1395,39 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 19352, "INV_Sword_51", "=q4=Chromatically Tempered Sword", "=ds=#h1#, #w10#", "10%" },
 	};
 	BWLNefarian = { --https://database.turtle-wow.org/?npc=11583
-		{ 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s1#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16923, "INV_Chest_Cloth_03", "=q4=Robes of Transcendence", "=ds=#s5#, #a1# =q9=#c5#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47208,"=ds=#s5#, #a1# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s1#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16916, "INV_Chest_Cloth_03", "=q4=Netherwind Robes", "=ds=#s5#, #a1# =q10=#c3#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47088,"=ds=#s5#, #a1# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s1#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16931, "INV_Chest_Leather_01", "=q4=Nemesis Robes", "=ds=#s5#, #a1# =q11=#c8#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47286,"=ds=#s5#, #a1# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s1#, #a2# =q12=#c6#", "11%" },
+		{ 16905, "INV_Chest_Cloth_07", "=q4=Bloodfang Chestpiece", "=ds=#s5#, #a2# =q12=#c6#", "11%" },
-		{ 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s1#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16897, "INV_Chest_Chain_16", "=q4=Stormrage Chestguard", "=ds=#s5#, #a2# =q13=#c1#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47348,"=ds=#s5#, #a2# =q7=#db24#"},{47356,"=ds=#s5#, #a2# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s1#, #a3# =q14=#c2#", "11%" },
+		{ 16942, "INV_Chest_Chain_03", "=q4=Dragonstalker's Breastplate", "=ds=#s5#, #a3# =q14=#c2#", "11%" },
-		{ 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s1#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16950, "INV_Chest_Chain_11", "=q4=Breastplate of Ten Storms", "=ds=#s5#, #a3# =q15=#c7#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47138,"=ds=#s5#, #a3# =q7=#db24#"},{47146,"=ds=#s5#, #a3# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s1#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16958, "INV_Chest_Plate03", "=q4=Judgement Breastplate", "=ds=#s5#, #a4# =q16=#c4#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47018,"=ds=#s5#, #a4# =q7=#db24#"},{47026,"=ds=#s5#, #a4# =q7=#db24#"},
 				},
 			},
 		},
-		{ 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s1#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{
+		{ 16966, "INV_Chest_Plate16", "=q4=Breastplate of Wrath", "=ds=#s5#, #a4# =q17=#c9#", "11%", "", "", "", "", "", "", "", "", "", "", {{
 					{47250,"=ds=#s5#, #a4# =q7=#db24#"},
 				},
 			},

Locale/locale.en.lua

@@ -1609,5 +1609,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Tier 3.5"] = true,
 	["Karazhan Sets"] = true,
 	["Cla'ckora"] = true,
-	} 
+	["Hinterlands"] = true,
+	["Duskwood"] = true,
+	}
 end)

Sets/sets.lua

@@ -1729,7 +1729,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Mage = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_Frost_IceStorm", "=q10=#t0s3#", "" },
+		{ 0, "CLASSmage", "=q10=#t0s3#", "" },
 		{ 0, "", "", "" },
 		{ 16686, "INV_Crown_02", "=q3=Magister's Crown", "=ds=#s1#, #a1# =q7=#db33#" },
 		{ 16689, "INV_Shoulder_23", "=q3=Magister's Mantle", "=ds=#s3#, #a1# =q7=#db36#" },
@@ -1744,7 +1744,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_Frost_IceStorm", "=q10=#t05s3#", "" },
+		{ 0, "CLASSmage", "=q10=#t05s3#", "" },
 		{ 0, "", "", "" },
 		{ 22065, "INV_Crown_02", "=q4=Sorcerer's Crown", "=ds=#s1#, #a1#" },
 		{ 22068, "INV_Shoulder_23", "=q3=Sorcerer's Mantle", "=ds=#s3#, #a1#" },
@@ -1765,7 +1765,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Priest = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_Holy_PowerWordShield", "=q9=#t0s5#", "" },
+		{ 0, "CLASSpriest", "=q9=#t0s5#", "" },
 		{ 0, "", "", "" },
 		{ 16693, "INV_Crown_01", "=q3=Devout Crown", "=ds=#s1#, #a1# =q7=#db33#" },
 		{ 16695, "INV_Shoulder_02", "=q3=Devout Mantle", "=ds=#s3#, #a1# =q7=#db39#" },
@@ -1780,7 +1780,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_Holy_PowerWordShield", "=q9=#t05s5#", "" },
+		{ 0, "CLASSpriest", "=q9=#t05s5#", "" },
 		{ 0, "", "", "" },
 		{ 22080, "INV_Crown_01", "=q4=Virtuous Crown", "=ds=#s1#, #a1#" },
 		{ 22082, "INV_Shoulder_02", "=q3=Virtuous Mantle", "=ds=#s3#, #a1#" },
@@ -1801,7 +1801,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Warlock = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_Shadow_CurseOfTounges", "=q11=#t0s8#", "" },
+		{ 0, "CLASSwarlock", "=q11=#t0s8#", "" },
 		{ 0, "", "", "" },
 		{ 16698, "INV_Helmet_29", "=q3=Dreadmist Mask", "=ds=#s1#, #a1# =q7=#db33#" },
 		{ 16701, "INV_Misc_Bone_TaurenSkull_01", "=q3=Dreadmist Mantle", "=ds=#s3#, #a1# =q7=#db42#" },
@@ -1816,7 +1816,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_Shadow_CurseOfTounges", "=q11=#t05s8#", "" },
+		{ 0, "CLASSwarlock", "=q11=#t05s8#", "" },
 		{ 0, "", "", "" },
 		{ 22074, "INV_Helmet_29", "=q4=Deathmist Mask", "=ds=#s1#, #a1#" },
 		{ 22073, "INV_Misc_Bone_TaurenSkull_01", "=q3=Deathmist Mantle", "=ds=#s3#, #a1#" },
@@ -1837,7 +1837,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Rogue = {
 		{ 0, "", "", "" },
-		{ 0, "Ability_BackStab", "=q12=#t0s6#", "" },
+		{ 0, "CLASSrogue", "=q12=#t0s6#", "" },
 		{ 0, "", "", "" },
 		{ 16707, "INV_Helmet_41", "=q3=Shadowcraft Cap", "=ds=#s1#, #a2# =q7=#db33#" },
 		{ 16708, "INV_Shoulder_07", "=q3=Shadowcraft Spaulders", "=ds=#s3#, #a2# =q7=#db45#" },
@@ -1852,7 +1852,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Ability_BackStab", "=q12=#t05s6#", "" },
+		{ 0, "CLASSrogue", "=q12=#t05s6#", "" },
 		{ 0, "", "", "" },
 		{ 22005, "INV_Helmet_41", "=q4=Darkmantle Cap", "=ds=#s1#, #a2#" },
 		{ 22008, "INV_Shoulder_07", "=q3=Darkmantle Spaulders", "=ds=#s3#, #a2#" },
@@ -1873,7 +1873,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Druid = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_Nature_Regeneration", "=q13=#t0s1#", "" },
+		{ 0, "CLASSdruid", "=q13=#t0s1#", "" },
 		{ 0, "", "", "" },
 		{ 16720, "INV_Helmet_27", "=q3=Wildheart Cowl", "=ds=#s1#, #a2# =q7=#db33#" },
 		{ 16718, "INV_Shoulder_01", "=q3=Wildheart Spaulders", "=ds=#s3#, #a2# =q7=#db49#" },
@@ -1888,7 +1888,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_Nature_Regeneration", "=q13=#t05s1#", "" },
+		{ 0, "CLASSdruid", "=q13=#t05s1#", "" },
 		{ 0, "", "", "" },
 		{ 22109, "INV_Helmet_27", "=q4=Feralheart Cowl", "=ds=#s1#, #a2#" },
 		{ 22112, "INV_Shoulder_01", "=q3=Feralheart Spaulders",  "=ds=#s3#, #a2#" },
@@ -1909,7 +1909,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Hunter = {
 		{ 0, "", "", "" },
-		{ 0, "Ability_Hunter_RunningShot", "=q14=#t0s2#", "" },
+		{ 0, "CLASShunter", "=q14=#t0s2#", "" },
 		{ 0, "", "", "" },
 		{ 16677, "INV_Helmet_24", "=q3=Beaststalker's Cap", "=ds=#s1#, #a3# =q7=#db33#" },
 		{ 16679, "INV_Shoulder_10", "=q3=Beaststalker's Mantle", "=ds=#s3#, #a3# =q7=#db53#" },
@@ -1924,7 +1924,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Ability_Hunter_RunningShot", "=q14=#t05s2#", "" },
+		{ 0, "CLASShunter", "=q14=#t05s2#", "" },
 		{ 0, "", "", "" },
 		{ 22013, "INV_Helmet_24", "=q4=Beastmaster's Cap", "=ds=#s1#, #a3#" },
 		{ 22016, "INV_Shoulder_10", "=q3=Beastmaster's Mantle", "=ds=#s3#, #a3#" },
@@ -1945,7 +1945,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Shaman = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_FireResistanceTotem_01", "=q15=#t0s7#", "" },
+		{ 0, "CLASSshaman", "=q15=#t0s7#", "" },
 		{ 0, "", "", "" },
 		{ 16667, "INV_Helmet_04", "=q3=Coif of Elements", "=ds=#s1#, #a3# =q7=#db33#" },
 		{ 16669,"INV_Shoulder_29","=q3=Pauldrons of Elements", "=ds=#s3#, #a3# =q7=#db56#" },
@@ -1960,7 +1960,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_FireResistanceTotem_01", "=q15=#t05s7#", "" },
+		{ 0, "CLASSshaman", "=q15=#t05s7#", "" },
 		{ 0, "", "", "" },
 		{ 22097, "INV_Helmet_04", "=q4=Coif of The Five Thunders", "=ds=#s1#, #a3#" },
 		{ 22101,"INV_Shoulder_29","=q3=Pauldrons of The Five Thunders","=ds=#s3#, #a3#" },
@@ -1981,7 +1981,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Warrior = {
 		{ 0, "", "", "" },
-		{ 0, "INV_Shield_05", "=q17=#t0s9#", "" },
+		{ 0, "CLASSwarrior", "=q17=#t0s9#", "" },
 		{ 0, "", "", "" },
 		{ 16731, "INV_Helmet_02", "=q3=Helm of Valor", "=ds=#s1#, #a4# =q7=#db33#" },
 		{ 16733,"INV_Shoulder_30","=q3=Spaulders of Valor", "=ds=#s3#, #a4# =q7=#db59#" },
@@ -1996,7 +1996,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "INV_Shield_05", "=q17=#t05s9#", "" },
+		{ 0, "CLASSwarrior", "=q17=#t05s9#", "" },
 		{ 0, "", "", "" },
 		{ 21999, "INV_Helmet_02", "=q4=Helm of Heroism", "=ds=#s1#, #a4#" },
 		{ 22001,"INV_Shoulder_30","=q3=Spaulders of Heroism","=ds=#s3#, #a4#" },
@@ -2017,7 +2017,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	T0Paladin = {
 		{ 0, "", "", "" },
-		{ 0, "Spell_Holy_SealOfMight", "=q16=#t0s4#", "" },
+		{ 0, "CLASSpaladin", "=q16=#t0s4#", "" },
 		{ 0, "", "", "" },
 		{ 16727, "INV_Helmet_08", "=q3=Lightforge Helm", "=ds=#s1#, #a4# =q7=#db33#" },
 		{ 16729,"INV_Shoulder_10","=q3=Lightforge Spaulders", "=ds=#s3#, #a4# =q7=#db62#" },
@@ -2032,7 +2032,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
-		{ 0, "Spell_Holy_SealOfMight", "=q16=#t05s4#", "" },
+		{ 0, "CLASSpaladin", "=q16=#t05s4#", "" },
 		{ 0, "", "", "" },
 		{ 22091, "INV_Helmet_08", "=q4=Soulforge Helm", "=ds=#s1#, #a4#" },
 		{ 22093, "INV_Shoulder_10","=q3=Soulforge Spaulders", "=ds=#s3#, #a4#" },
@@ -2053,7 +2053,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGMage = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Frost_IceStorm", "=q10=#zgs3#","" },
+		{ 0,"CLASSmage", "=q10=#zgs3#","" },
 		{ 0, "", "", "" },
 		{ 19959, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Magic", "=ds=#s14#" },
 		{ 19601, "INV_Jewelry_Necklace_26", "=q4=Jewel of Kajaro", "=ds=#r5#" },
@@ -2071,7 +2071,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGWarlock = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Shadow_CurseOfTounges", "=q11=#zgs8#","" },
+		{ 0,"CLASSwarlock", "=q11=#zgs8#","" },
 		{ 0, "", "", "" },
 		{ 19957, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Destruction", "=ds=#s14#" },
 		{ 19605, "INV_Jewelry_Necklace_26", "=q4=Kezan's Unstoppable Taint", "=ds=#r5#" },
@@ -2089,7 +2089,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGPriest = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Holy_PowerWordShield", "=q9=#zgs5#","" },
+		{ 0,"CLASSpriest", "=q9=#zgs5#","" },
 		{ 0, "", "", "" },
 		{ 19958, "INV_Jewelry_Necklace_19", "=q4=Hazza'rah's Charm of Healing", "=ds=#s14#" },
 		{ 19594, "INV_Jewelry_Necklace_26", "=q4=The All-Seeing Eye of Zuldazar", "=ds=#r5#" },
@@ -2107,7 +2107,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGRogue = {
 		{ 0, "", "", "" },
-		{ 0,"Ability_BackStab", "=q12=#zgs6#","" },
+		{ 0,"CLASSrogue", "=q12=#zgs6#","" },
 		{ 0, "", "", "" },
 		{ 19954, "INV_Jewelry_Necklace_19", "=q4=Renataki's Charm of Trickery", "=ds=#s14#" },
 		{ 19617, "INV_Jewelry_Necklace_26", "=q4=Zandalarian Shadow Mastery Talisman", "=ds=#r5#" },
@@ -2125,7 +2125,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGDruid = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Nature_Regeneration", "=q13=#zgs1#","" },
+		{ 0,"CLASSdruid", "=q13=#zgs1#","" },
 		{ 0, "", "", "" },
 		{ 19955, "INV_Jewelry_Necklace_19", "=q4=Wushoolay's Charm of Nature", "=ds=#s14#" },
 		{ 19613, "INV_Jewelry_Necklace_26", "=q4=Pristine Enchanted South Seas Kelp", "=ds=#r5#" },
@@ -2143,7 +2143,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGHunter = {
 		{ 0, "", "", "" },
-		{ 0,"Ability_Hunter_RunningShot", "=q14=#zgs2#","" },
+		{ 0,"CLASShunter", "=q14=#zgs2#","" },
 		{ 0, "", "", "" },
 		{ 19953, "INV_Jewelry_Necklace_19", "=q4=Renataki's Charm of Beasts", "=ds=#s14#" },
 		{ 19621, "INV_Jewelry_Necklace_26", "=q4=Maelstrom's Wrath", "=ds=#r5#" },
@@ -2161,7 +2161,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGShaman = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_FireResistanceTotem_01", "=q15=#zgs7#","" },
+		{ 0,"CLASSshaman", "=q15=#zgs7#","" },
 		{ 0, "", "", "" },
 		{ 19956, "INV_Jewelry_Necklace_19", "=q4=Wushoolay's Charm of Spirits", "=ds=#s14#" },
 		{ 19609, "INV_Jewelry_Necklace_26", "=q4=Unmarred Vision of Voodress", "=ds=#r5#" },
@@ -2179,7 +2179,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	ZGWarrior = {
 		{ 0, "", "", "" },
-		{ 0,"INV_Shield_05", "=q17=#zgs9#","" },
+		{ 0,"CLASSwarrior", "=q17=#zgs9#","" },
 		{ 19951, "INV_Jewelry_Necklace_19", "=q4=Gri'lek's Charm of Might", "=ds=#s14#" },
 		{ 19577, "INV_Jewelry_Necklace_26", "=q4=Rage of Mugamba", "=ds=#r5#" },
 		{ 19822, "INV_Chest_Plate07", "=q4=Zandalar Vindicator's Breastplate", "=q4=#x10#=ds=, #r4#" },
@@ -2195,7 +2195,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		}
 	},
 	ZGPaladin = {
-		{ 0,"Spell_Holy_SealOfMight", "=q16=#zgs4#","" },
+		{ 0,"CLASSpaladin", "=q16=#zgs4#","" },
 		{ 0, "", "", "" },
 		{ 19952, "INV_Jewelry_Necklace_19", "=q4=Gri'lek's Charm of Valor", "=ds=#s14#" },
 		{ 19588, "INV_Jewelry_Necklace_26", "=q4=Hero's Brand", "=ds=#r5#" },
@@ -2213,7 +2213,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Mage = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Frost_IceStorm", "=q10=#aq20s3#","" },
+		{ 0,"CLASSmage", "=q10=#aq20s3#","" },
 		{ 0, "", "", "" },
 		{ 21413, "INV_Sword_57", "=q4=Blade of Vaulted Secrets", "=q4=#x19#=ds=, #r5#" },
 		{ 21415, "INV_Misc_Cape_19", "=q4=Drape of Vaulted Secrets", "=q3=#x20#=ds=, #r4#" },
@@ -2227,7 +2227,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Warlock = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Shadow_CurseOfTounges", "=q11=#aq20s8#","" },
+		{ 0,"CLASSwarlock", "=q11=#aq20s8#","" },
 		{ 0, "", "", "" },
 		{ 21416, "INV_Weapon_ShortBlade_27", "=q4=Kris of Unspoken Names", "=q4=#x19#=ds=, #r5#" },
 		{ 21418, "INV_Misc_Cape_20", "=q4=Shroud of Unspoken Names", "=q3=#x23#=ds=, #r4#" },
@@ -2241,7 +2241,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Priest = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Holy_PowerWordShield", "=q9=#aq20s5#","" },
+		{ 0,"CLASSpriest", "=q9=#aq20s5#","" },
 		{ 0, "", "", "" },
 		{ 21410, "INV_Mace22", "=q4=Gavel of Infinite Wisdom", "=q4=#x19#=ds=, #r5#" },
 		{ 21412, "INV_Misc_Cape_16", "=q4=Shroud of Infinite Wisdom", "=q3=#x20#=ds=, #r4#" },
@@ -2255,7 +2255,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Rogue = {
 		{ 0, "", "", "" },
-		{ 0,"Ability_BackStab", "=q12=#aq20s6#","" },
+		{ 0,"CLASSrogue", "=q12=#aq20s6#","" },
 		{ 0, "", "", "" },
 		{ 21404, "INV_Weapon_ShortBlade_27", "=q4=Dagger of Veiled Shadows", "=q4=#x24#=ds=, #r5#" },
 		{ 21406, "INV_Misc_Cape_19", "=q4=Cloak of Veiled Shadows", "=q3=#x20#=ds=, #r4#" },
@@ -2269,7 +2269,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Druid = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Nature_Regeneration", "=q13=#aq20s1#","" },
+		{ 0,"CLASSdruid", "=q13=#aq20s1#","" },
 		{ 0, "", "", "" },
 		{ 21407, "INV_Mace22", "=q4=Mace of Unending Life", "=q4=#x19#=ds=, #r5#" },
 		{ 21409, "INV_Misc_Cape_15", "=q4=Cloak of Unending Life", "=q3=#x23#=ds=, #r4#" },
@@ -2283,7 +2283,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Hunter = {
 		{ 0, "", "", "" },
-		{ 0,"Ability_Hunter_RunningShot", "=q14=#aq20s2#","" },
+		{ 0,"CLASShunter", "=q14=#aq20s2#","" },
 		{ 0, "", "", "" },
 		{ 21401, "INV_Axe_15", "=q4=Scythe of the Unseen Path", "=q4=#x24#=ds=, #r5#" },
 		{ 21403, "INV_Misc_Cape_15", "=q4=Cloak of the Unseen Path", "=q3=#x23#=ds=, #r4#" },
@@ -2297,7 +2297,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Paladin = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_Holy_SealOfMight", "=q16=#aq20s4#","" },
+		{ 0,"CLASSpaladin", "=q16=#aq20s4#","" },
 		{ 0, "", "", "" },
 		{ 21395, "INV_Sword_57", "=q4=Blade of Eternal Justice", "=q4=#x24#=ds=, #r5#" },
 		{ 21397, "INV_Misc_Cape_14", "=q4=Cape of Eternal Justice", "=q3=#x23#=ds=, #r4#" },
@@ -2311,7 +2311,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Shaman = {
 		{ 0, "", "", "" },
-		{ 0,"Spell_FireResistanceTotem_01", "=q15=#aq20s7#","" },
+		{ 0,"CLASSshaman", "=q15=#aq20s7#","" },
 		{ 0, "", "", "" },
 		{ 21398, "INV_Mace22", "=q4=Hammer of the Gathering Storm", "=q4=#x24#=ds=, #r5#" },
 		{ 21400, "INV_Misc_Cape_16", "=q4=Cloak of the Gathering Storm", "=q3=#x23#=ds=, #r4#" },
@@ -2325,7 +2325,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 	},
 	AQ20Warrior = {
 		{ 0, "", "", "" },
-		{ 0,"INV_Shield_05", "=q17=#aq20s9#","" },
+		{ 0,"CLASSwarrior", "=q17=#aq20s9#","" },
 		{ 0, "", "", "" },
 		{ 21392, "INV_Axe_15", "=q4=Sickle of Unyielding Strength", "=q4=#x24#=ds=, #r5#" },
 		{ 21394, "INV_Misc_Cape_20", "=q4=Drape of Unyielding Strength", "=q3=#x20#=ds=, #r4#" },

TableRegister/loottables.en.lua

@@ -506,11 +506,9 @@ AtlasLoot_TableNames = {
 	["LKHMoroes"] = { AL["Lower Karazhan Halls"].." - "..AL["Moroes"], "AtlasLootItems" },
 	["LKHTrash"] = { AL["Lower Karazhan Halls"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	["LKHEnchants"] = { AL["Lower Karazhan Halls"].." - ".."Enchants", "AtlasLootItems" },
-
 	------------
 	--- Sets ---
 	------------
-
 	--Vanilla WoW Sets
 	["DEADMINES"] = { AL["The Deadmines"], "AtlasLootSetItems" },
 	["WAILING"] = { AL["Wailing Caverns"], "AtlasLootSetItems" },
@@ -652,39 +650,31 @@ AtlasLoot_TableNames = {
 	------------------------
 	--- Misc Collections ---
 	------------------------
-
 	["CraftedWeapons1"] = { AL["Crafted Epic Weapons"], "AtlasLootCrafting" },
 	["WorldEpics1"] = { AL["World Epics"] .. " - " .. AL["Level 30-39"], "AtlasLootSetItems" },
 	["WorldEpics2"] = { AL["World Epics"] .. " - " .. AL["Level 40-49"], "AtlasLootSetItems" },
 	["WorldEpics3"] = { AL["World Epics"] .. " - " .. AL["Level 50-60"], "AtlasLootSetItems" },
-
 	--------------------
 	--- World Bosses ---
 	--------------------
-
+	["AAzuregos"] = { AL["Azshara"].. " - " ..AL["Azuregos"], "AtlasLootWBItems" },
-	--Azuregos
+	["ASpiritA"] = { AL["Azshara"].. " - " ..AL["Spirit of Azuregos"], "AtlasLootWBItems" },
-	["AAzuregos"] = { AL["Azuregos"], "AtlasLootWBItems" },
-	["ASpiritA"] = { AL["Spirit of Azuregos"], "AtlasLootWBItems" },
 	--["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" },
-	["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" },
+	["Nerubian"] = { AL["Eastern Plaguelands"].. " - " ..AL["Nerubian Overseer"], "AtlasLootWBItems" },
-	["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" },
+	["Reaver"] = { AL["Deadwind Pass"].. " - " ..AL["Dark Reaver of Karazhan"], "AtlasLootWBItems" },
-	["Ostarius"] = { "Ostarius", "AtlasLootWBItems" },
+	["Ostarius"] = { AL["Tanaris"].. " - " ..AL["Ostarius"], "AtlasLootWBItems" },
-	["Concavius"] = { "Concavius", "AtlasLootWBItems" },
+	["Concavius"] = { AL["Desolace"].. " - " ..AL["Concavius"], "AtlasLootWBItems" },
-	["CowKing"] = { "Moo", "AtlasLootWBItems" },
+	["CowKing"] = { AL["Moomoo Grove"].. " - " ..AL["Moo"], "AtlasLootWBItems" },
-	--Doom Lord Kazzak
+	["KKazzak"] = { AL["Blasted Lands"].. " - " ..AL["Lord Kazzak"], "AtlasLootWBItems" },
-	["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" },
+	["DEmeriss"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Emeriss"], "AtlasLootWBItems" },
-	--Emrald Dragons
+	["DLethon"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Lethon"], "AtlasLootWBItems" },
-	["DEmeriss"] = { AL["Emeriss"], "AtlasLootWBItems" },
+	["DTaerar"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Taerar"], "AtlasLootWBItems" },
-	["DLethon"] = { AL["Lethon"], "AtlasLootWBItems" },
+	["DYsondre"] = { AL["Ashenvale"].."/"..AL["Duskwood"].."/"..AL["Feralas"].."/"..AL["Hinterlands"].. " - " ..AL["Ysondre"], "AtlasLootWBItems" },
-	["DTaerar"] = { AL["Taerar"], "AtlasLootWBItems" },
+	["DTrash"] = { AL["Emerald Dragons"].. " - " ..AL["Trash Mobs"], "AtlasLootWBItems" },
-	["DYsondre"] = { AL["Ysondre"], "AtlasLootWBItems" },
+	["Clackora"] = { AL["Azshara"].. " - " ..AL["Cla'ckora"], "AtlasLootWBItems" },
-	["DTrash"] = { AL["Emerald Dragons"].." - "..AL["Trash Mobs"], "AtlasLootWBItems" },
+	-------------------
-	["Clackora"] = { "Cla'ckora", "AtlasLootWBItems" },
+	--- Rare Spawns ---
-
+	-------------------
-
-	--------------------------
-	--- Rare Spawns (1.16) ---
-	--------------------------
 	["Tarangos"] = { "Tarangos The Dampener", "AtlasLootWBItems" },
 	["Kargron"] = { "Blademaster Kargron", "AtlasLootWBItems" },
 	["Xalvic"] = { "Xalvic Blackclaw", "AtlasLootWBItems" },
@@ -696,10 +686,6 @@ AtlasLoot_TableNames = {
 	["Jalakar"] = { "Jal'akar Dire Troll", "AtlasLootWBItems" },
 	["Ashbeard"] = { "Explorer Ashbeard", "AtlasLootWBItems" },
 	["AdmiralBareanWestwind"] = { "Admiral Barean Westwind", "AtlasLootWBItems" },
-	
-	--------------------------
-	--- Rare Spawns (1.17) ---
-	--------------------------
 	["EarthcallerRezengal"] = { "Earthcaller Rezengal", "AtlasLootWBItems" },
 	["ShadeMage"] = { "Shade Mage", "AtlasLootWBItems" },
 	["GraypawAlpha"] = { "Graypaw Alpha", "AtlasLootWBItems" },
@@ -725,21 +711,13 @@ AtlasLoot_TableNames = {
 	["M0L1Y"] = { "M-0L1Y", "AtlasLootWBItems" },
 	["WidowoftheWoods"] = { "Widow of the Woods", "AtlasLootWBItems" },
 	["KinTozo"] = { "Kin'Tozo", "AtlasLootWBItems" },
-	
-	----------------------------
-	--- Rare Spawns (1.17.1) ---
-	----------------------------
 	["ProfessorLysander"] = { "Professor Lysander", "AtlasLootWBItems" },
-
 	--------------
 	--- Events ---
 	--------------
-
-	--Abyssal Council
 	["AbyssalTemplars"] = { "Abyssal Council - Templars", "AtlasLootWorldEvents" },
 	["AbyssalDukes"] = { "Abyssal Council - Dukes", "AtlasLootWorldEvents" },
 	["AbyssalLords"] = { "Abyssal Council - Lords", "AtlasLootWorldEvents" },
-	--Seasonal
 	["ChildrensWeek"] = { AL["Children's Week"], "AtlasLootWorldEvents" },
 	["Halloween1"] = { AL["Hallow's End"], "AtlasLootWorldEvents" },
 	["Halloween2"] = { AL["Hallow's End"], "AtlasLootWorldEvents" },
@@ -752,60 +730,40 @@ AtlasLoot_TableNames = {
 	["Winterviel"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
 	["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
 	["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
-	--Other
 	["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" },
 	["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" },
 	["GurubashiArena"] = { AL["Gurubashi Arena"], "AtlasLootWorldEvents" },
 	["ScourgeInvasionEvent1"] = { AL["Scourge Invasion"], "AtlasLootWorldEvents" },
 	["ScourgeInvasionEvent2"] = { AL["Scourge Invasion Bosses"], "AtlasLootWorldEvents" },
-
 	------------------------
 	--- Classic Factions ---
 	------------------------
-
 	--Argent Dawn
 	["Argent1"] = { AL["Argent Dawn"] .. " - Token Hand-ins", "AtlasLootRepItems" },
 	["Argent2"] = { AL["Argent Dawn"], "AtlasLootRepItems" },
 	["Argent3"] = { AL["Argent Dawn"], "AtlasLootRepItems" },
-	--Bloodsail Buccaneers
 	["Bloodsail1"] = { AL["Bloodsail Buccaneers"], "AtlasLootRepItems" },
-	--Brood of Nozdormu
 	["AQBroodRings"] = { AL["Brood of Nozdormu"], "AtlasLootRepItems" },
-	--Cenarion Circle
 	["Cenarion1"] = { AL["Cenarion Circle"] .. " - " .. AL["Friendly"], "AtlasLootRepItems" },
 	["Cenarion2"] = { AL["Cenarion Circle"] .. " - " .. AL["Honored"], "AtlasLootRepItems" },
 	["Cenarion3"] = { AL["Cenarion Circle"] .. " - " .. AL["Revered"], "AtlasLootRepItems" },
 	["Cenarion4"] = { AL["Cenarion Circle"] .. " - " .. AL["Exalted"], "AtlasLootRepItems" },
-	--The Darkmoon Faire
 	["Darkmoon"] = { AL["Darkmoon Faire"], "AtlasLootRepItems" },
-	--The Defilers
 	["Defilers"] = { AL["The Defilers"], "AtlasLootRepItems" },
-	--Frostwolf Clan
 	["Frostwolf1"] = { AL["Frostwolf Clan"], "AtlasLootRepItems" },
-	--Hydraxian Waterlords
 	["WaterLords1"] = { AL["Hydraxian Waterlords"], "AtlasLootRepItems" },
-	--Gelkis Clan Centaur
 	["GelkisClan1"] = { AL["Gelkis Clan Centaur"], "AtlasLootRepItems" },
-	--The League of Arathor
 	["LeagueofArathor"] = { AL["The League of Arathor"], "AtlasLootRepItems" },
-	--Magram Clan Centaur
 	["MagramClan1"] = { AL["Magram Clan Centaur"], "AtlasLootRepItems" },
-	--Stormpike Guard
 	["Stormpike1"] = { AL["Stormpike Guard"], "AtlasLootRepItems" },
-	--Thorium Brotherhood
 	["Thorium1"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
 	["Thorium2"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
-	--Timbermaw Hold
 	["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" },
-	--Wardens of Time
 	["Wardens1"] = { AL["Wardens of Time"] .. " - " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" },
 	["Wardens2"] = { AL["Wardens of Time"] .. " - " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" },
-	--Wintersaber Trainers
 	["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" },
-	--Zandalar Tribe
 	["Zandalar1"] = { AL["Zandalar Tribe"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
 	["Zandalar2"] = { AL["Zandalar Tribe"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
-
 	["Helf"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
 	["Helf2"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
 	["Helf3"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
@@ -823,11 +781,9 @@ AtlasLoot_TableNames = {
 	["ThunderBluff"] = { AL["Thunder Bluff"], "AtlasLootRepItems" },
 	["Dalaran"] = { AL["Dalaran"], "AtlasLootRepItems" },
 	["Wildhammer"] = { AL["Wildhammer Clan"], "AtlasLootRepItems" },
-
 	--------------
 	--- Trades ---
 	--------------
-
 	--Alchemy
 	["AlchemyApprentice1"] = { AL["Alchemy"] .. ": " .. AL["Apprentice"], "AtlasLootCrafting" },
 	["AlchemyJourneyman1"] = { AL["Alchemy"] .. ": " .. AL["Journeyman"], "AtlasLootCrafting" },
@@ -999,13 +955,9 @@ AtlasLoot_TableNames = {
 	["Survival2"] = { AL["Gardening"], "AtlasLootCrafting" },
 	--Poisons
 	["Poisons1"] = { AL["Rogue"] .. " - " .. AL["Poisons"], "AtlasLootCrafting" },
-	
-
 	-----------
 	--- PvP ---
 	-----------
-
-	--Battlegrounds
 	--Blood Ring
 	["BRRepFriendly"] = { AL["Blood Ring"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" },
 	["BRRepHonored"] = { AL["Blood Ring"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
@@ -1062,11 +1014,9 @@ AtlasLoot_TableNames = {
 	["PVPShaman"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
 	["PVPWarlock"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
 	["PVPWarrior"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
-
 	-------------
 	--- Other ---
 	-------------
-
 	--Menus, the entry does nothing, but makes the generalised loot table code less complex
 	["DUNGEONSMENU1"] = { "dummy", "dummy" },
 	["DUNGEONSMENU2"] = { "dummy", "dummy" },
@@ -1076,22 +1026,21 @@ AtlasLoot_TableNames = {
 	["ABRepMenu"] = { "dummy", "dummy" },
 	["WSGRepMenu"] = { "dummy", "dummy" },
 	["BRRepMenu"] = { "dummy", "dummy" },
-	["AQ40SET"] = { "dummy", "dummy" },
-	["AQ20SET"] = { "dummy", "dummy" },
-	["ZGSET"] = { "dummy", "dummy" },
 	["PRE60SET"] = { "dummy", "dummy" },
-	["T3SET"] = { "dummy", "dummy" },
+	["ZGSET"] = { "dummy", "dummy" },
-	["T2SET"] = { "dummy", "dummy" },
+	["AQ20SET"] = { "dummy", "dummy" },
-	["T1SET"] = { "dummy", "dummy" },
+	["AQ40SET"] = { "dummy", "dummy" },
+	["KARASET"] = { "dummy", "dummy" },
 	["T0SET"] = { "dummy", "dummy" },
+	["T1SET"] = { "dummy", "dummy" },
+	["T2SET"] = { "dummy", "dummy" },
+	["T3SET"] = { "dummy", "dummy" },
 	["REPMENU"] = { "dummy", "dummy" },
 	["SETMENU"] = { "dummy", "dummy" },
 	["WORLDEPICS"] = { "dummy", "dummy" },
 	["WORLDEVENTMENU"] = { "dummy", "dummy" },
-	["AbyssalCouncil"] = { "dummy", "dummy" },
 	["ALCHEMYMENU"] = { "dummy", "dummy" },
 	["CRAFTSET"] = { "dummy", "dummy" },
-	["HONORMENU"] = { "dummy", "dummy" },
 	["CRAFTINGMENU"] = { "dummy", "dummy" },
 	["SMITHINGMENU"] = { "dummy", "dummy" },
 	["ENCHANTINGMENU"] = { "dummy", "dummy" },
@@ -1102,11 +1051,9 @@ AtlasLoot_TableNames = {
 	["FIRSTAIDMENU"] = { "dummy", "dummy" },
 	["WORLDBOSSMENU"] = { "dummy", "dummy" },
 	["JEWELCRAFTMENU"] = { "dummy", "dummy" },
-	["KARASET"] = { "dummy", "dummy" },
 	["WishList"] = { AL["WishList"], "AtlasLootCharDB" },
 	--If all else fails!
 	["EmptyInstance"] = { "AtlasLoot", "AtlasLootFallback" },
-
 };
 
 AtlasLoot_TableNamesBoss = {
@@ -1423,6 +1370,7 @@ AtlasLoot_TableNamesBoss = {
 		["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" },
 		["AQ20ClassBooks"] = { "AQ Class Books", "AtlasLootItems" },
 		["AQ20Enchants"] = { "AQ Enchants", "AtlasLootItems" },
+		["AQ20SET"] = { AL["Ruins of Ahn'Qiraj Sets"], "AtlasLootSetItems"},
 	},
 	["Scarlet Monestery - Armory"] = {
 		["SMHerod"] = { AL["Herod"], "AtlasLootItems" },
@@ -1640,6 +1588,7 @@ AtlasLoot_TableNamesBoss = {
 		["ZGTrash1"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" },
 		["ZGTrash2"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" },
 		["ZGEnchants"] = { "ZG Enchants", "AtlasLootItems" },
+		["ZGSET"] = { AL["Zul'Gurub Sets"], "AtlasLootSetItems"}
 	},
 	["Emerald Sanctum"] = {
 		["ESErennius"] = { AL["Erennius"], "AtlasLootItems" },
@@ -1841,7 +1790,7 @@ AtlasLoot_TableNamesBoss = {
 		["DTaerar"] = { AL["Taerar"], "AtlasLootWBItems" },
 		["DYsondre"] = { AL["Ysondre"], "AtlasLootWBItems" },
 		["DTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Emerald Dragons"] .. ")", "AtlasLootWBItems" },
-		["Clackora"] = { "Cla'ckora", "AtlasLootWBItems" },
+		["Clackora"] = { AL["Cla'ckora"], "AtlasLootWBItems" },
 	},
 	
 	-------------------