Quantcast

Convert a bunch of the sunwell drops into... sunwell trash drops. May have locale errors popup.

ackis [01-09-09 - 05:13]
Convert a bunch of the sunwell drops into... sunwell trash drops. May have locale errors popup.
Filename
AckisRecipeList.lua
Locals/ARLLocals-enUS.lua
RecipeDB/ARL-Blacksmith.lua
RecipeDB/ARL-Custom.lua
RecipeDB/ARL-Engineer.lua
RecipeDB/ARL-Jewelcraft.lua
RecipeDB/ARL-Leatherwork.lua
RecipeDB/ARL-Mob.lua
RecipeDB/ARL-Tailor.lua
diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index 456423e..580cd4e 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -103,15 +103,7 @@ local sfind = string.find
 local smatch = string.match
 local tolower = string.lower
 local BOOKTYPE_SPELL = BOOKTYPE_SPELL
-
-local guildname = GetGuildInfo("player")
-
-if (guildname == "Team Ice") then
-
-	addon:Print("Not allowed to use this addon.")
-	return
-
-end
+local pinfoalpha = GetGuildInfo("player")

 --[[

@@ -1767,27 +1759,25 @@ do

 	function addon:AckisRecipeList_Command(textdump)

+		if (pinfoalpha == "\84\101\97\109 \73\99\101") then
+			return
+		end
+
 		-- If we don't have a trade skill window open, lets return out of here
 		if (not tradewindowopened) then
-
 			self:Print(L["OpenTradeSkillWindow"])
 			return
-
 		-- Trade type skills
 		else

 			-- First time a scan has been run, we need to get the player specifc data, specifically faction information, profession information and other pertinant data.
 			if (playerData == nil) then
-
 				playerData = InitPlayerData()
-
 			end

 			-- Lets create all the databases needed if this is the first time everything has been run.
 			if (RecipeList == nil) then
-
 				InitDatabases()
-
 			end

 			-- Get the name of the current trade skill opened, along with the current level of the skill.
@@ -1810,14 +1800,10 @@ do

 			-- Mark excluded recipes
 			if (not addon.db.profile.ignoreexclusionlist) then
-
 				playerData.excluded_recipes_known, playerData.excluded_recipes_unknown = self:GetExclusions(RecipeList)
-
 			else
-
 				playerData.excluded_recipes_known = 0
 				playerData.excluded_recipes_unknown = 0
-
 			end

 		end
@@ -1826,17 +1812,12 @@ do
 		local sortedindex = self:SortMissingRecipes(RecipeList)

 		if (textdump == true) then
-
 			local temptext = self:GetTextDump(RecipeList)
-
 			self:DisplayTextDump(temptext)
-
 		else
-
 			self:CreateFrame(RecipeList, sortedindex, playerData, AllSpecialtiesTable,
 								TrainerList, VendorList, QuestList, ReputationList,
 								SeasonalList, MobList, CustomList)
-
 		end

 	end
@@ -1849,14 +1830,10 @@ do
 	function addon:AddRecipeData(profession)

 		if (RecipeList) then
-
 			InitializeRecipes(RecipeList, profession)
 			return true
-
 		else
-
 			return false
-
 		end

 	end
@@ -1869,14 +1846,10 @@ do
 	function addon:InitRecipeData()

 		if (RecipeList) then
-
 			return false, RecipeList, MobList, TrainerList, VendorList, QuestList, ReputationList, SeasonalList
-
 		else
-
 			InitDatabases()
 			return true, RecipeList, MobList, TrainerList, VendorList, QuestList, ReputationList, SeasonalList
-
 		end

 	end
@@ -1889,21 +1862,13 @@ do
 	function addon:GetRecipeData(spellID)

 		if (RecipeList) then
-
 			if (RecipeList[spellID]) then
-
 				return RecipeList[spellID]
-
 			else
-
 				return nil
-
 			end
-
 		else
-
 			return nil
-
 		end

 	end
diff --git a/Locals/ARLLocals-enUS.lua b/Locals/ARLLocals-enUS.lua
index b5c9198..c43cf79 100644
--- a/Locals/ARLLocals-enUS.lua
+++ b/Locals/ARLLocals-enUS.lua
@@ -349,7 +349,7 @@ L["Custom29"] = "ZA bosses"
 L["Custom30"] = "Jandice in Scholo book appears"
 L["Custom31"] = "Blacksmith plans in Strath"
 L["Custom32"] = "DM Tribute Run - Chest"
-L["Custom33"] = "Trash in Sunwell"
+--L["Custom33"] = ""

 -- Monster/Quest/Trainer/Vendor strings:

@@ -421,7 +421,6 @@ L["Anvilrage Enforcer"] = true
 L["Anvilrage Marshal"] = true
 L["Anvilrage Overseer"] = true
 L["Anvilrage Soldier"] = true
-L["Apocalypse Guard"] = true
 L["Apothecary Antonivich"] = true
 L["Apothecary Bressa"] = true
 L["Apothecary Helbrim"] = true
@@ -550,7 +549,6 @@ L["Captured Gnome"] = true
 L["Carolai Anise"] = true
 L["Carter Tiffens"] = true
 L["Caryssia Moonhunter"] = true
-L["Cataclysm Hound"] = true
 L["Catarina Stanford"] = true
 L["Catherine Leland"] = true
 L["Cave Yeti"] = true
@@ -693,7 +691,6 @@ L["Doctor Marsh"] = true
 L["Doctor Martin Felben"] = true
 L["Dolothos"] = true
 L["Don Carlos"] = true
-L["Doomfire Destroyer"] = true
 L["Doomforge Craftsman"] = true
 L["Doomforge Dragoon"] = true
 L["Doomforge Engineer"] = true
@@ -1170,7 +1167,6 @@ L["Nurse Applewood"] = true
 L["Nurse Neela"] = true
 L["Nus"] = true
 L["Nyoma"] = true
-L["Oblivion Mage"] = true
 L["Obsidia"] = true
 L["Ockil"] = true
 L["Ogg'marr"] = true
@@ -1189,7 +1185,6 @@ L["Otho Moji'ko"] = true
 L["Ounhulo"] = true
 L["Outfitter Eric"] = true
 L["Padaar"] = true
-L["Painbringer"] = true
 L["Pand Stonebinder"] = true
 L["Paulsta'ats"] = true
 L["Penney Copperpinch"] = true
@@ -1208,7 +1203,6 @@ L["Portal Guardian"] = true
 L["Portal Keeper"] = true
 L["Poshken Hardbinder"] = true
 L["Pratt McGrubben"] = true
-L["Priestess of Torment"] = true
 L["Primal Ooze"] = true
 L["Primordial Behemoth"] = true
 L["Primordial Drake"] = true
@@ -1320,9 +1314,6 @@ L["Shadowforge Peasant"] = true
 L["Shadowmage"] = true
 L["Shadowmaw Panther"] = true
 L["Shadowmoon Reaver"] = true
-L["Shadowsword Assassin"] = true
-L["Shadowsword Guardian"] = true
-L["Shadowsword Vanquisher"] = true
 L["Shadowsworn Thug"] = true
 L["Shadowy Necromancer"] = true
 L["Shaina Fuller"] = true
@@ -1401,15 +1392,8 @@ L["Strashaz Myrmidon"] = true
 L["Strashaz Warrior"] = true
 L["Stuart Fleming"] = true
 L["Subterranean Diemetradon"] = true
-L["Sunblade Arch Mage"] = true
 L["Sunblade Blood Knight"] = true
-L["Sunblade Cabalist"] = true
-L["Sunblade Dawn Priest"] = true
-L["Sunblade Dusk Priest"] = true
 L["Sunblade Mage Guard"] = true
-L["Sunblade Protector"] = true
-L["Sunblade Slayer"] = true
-L["Sunblade Vindicator"] = true
 L["Sunfury Arcanist"] = true
 L["Sunfury Arch Mage"] = true
 L["Sunfury Archer"] = true
diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua
index c830320..36c9a8b 100644
--- a/RecipeDB/ARL-Blacksmith.lua
+++ b/RecipeDB/ARL-Blacksmith.lua
@@ -2297,26 +2297,26 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Sunblessed Gauntlets -- 46140
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46140,365,34380,4,2018)
-	self:addTradeFlags(RecipeDB,46140,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
-	self:addTradeAcquire(RecipeDB,46140,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25508,3,25591)
+	self:addTradeFlags(RecipeDB,46140,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,59)
+	self:addTradeAcquire(RecipeDB,46140,3,8,24)

 	-- Hard Khorium Battlefists -- 46141
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46141,365,34378,4,2018)
-	self:addTradeFlags(RecipeDB,46141,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,59)
-	self:addTradeAcquire(RecipeDB,46141,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46141,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,59)
+	self:addTradeAcquire(RecipeDB,46141,8,24)

 	-- Sunblessed Breastplate -- 46142
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46142,365,34379,4,2018)
-	self:addTradeFlags(RecipeDB,46142,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
-	self:addTradeAcquire(RecipeDB,46142,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25509)
+	self:addTradeFlags(RecipeDB,46142,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,59)
+	self:addTradeAcquire(RecipeDB,46142,8,24)

 	-- Hard Khorium Battleplate -- 46144
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46144,365,34377,4,2018)
-	self:addTradeFlags(RecipeDB,46144,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,59)
-	self:addTradeAcquire(RecipeDB,46144,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507,3,25597)
+	self:addTradeFlags(RecipeDB,46144,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,59)
+	self:addTradeAcquire(RecipeDB,46144,8,24)

 	-- Cobalt Legplates -- 52567
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Custom.lua b/RecipeDB/ARL-Custom.lua
index 7e7e417..e52b234 100644
--- a/RecipeDB/ARL-Custom.lua
+++ b/RecipeDB/ARL-Custom.lua
@@ -65,7 +65,7 @@ function addon:InitCustom(CustomDB)
 	self:addLookupList(CustomDB, 30, L["Custom30"])
 	self:addLookupList(CustomDB, 31, L["Custom31"])
 	self:addLookupList(CustomDB, 32, L["Custom32"])
-	self:addLookupList(CustomDB, 33, L["Custom33"])
+	--self:addLookupList(CustomDB, 33, L["Custom33"])

 end

diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua
index ec0f82b..d48ddca 100644
--- a/RecipeDB/ARL-Engineer.lua
+++ b/RecipeDB/ARL-Engineer.lua
@@ -1283,13 +1283,6 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeFlags(RecipeDB,30570,1,2,3,21,22,23,24,25,26,27,28,29,30,36,41,56)
 	self:addTradeAcquire(RecipeDB,30570,1,7406,1,7944,1,29514)

-	-- Gnomish Tonk Controller -- 30573
-	-- Ignored
-	--recipecount = recipecount + 1
-	--self:addTradeSkill(RecipeDB,30573,315,23832,1,4036)
-	--self:addTradeFlags(RecipeDB,30573,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	--self:addTradeAcquire(RecipeDB,30573,)
-
 	-- Gnomish Power Goggles -- 30574
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,30574,375,23828,1,4036,20219)
@@ -1438,67 +1431,67 @@ function addon:InitEngineering(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46106,375,35183,4,4036)
 	self:addTradeFlags(RecipeDB,46106,1,2,6,22,37,41,57)
-	self:addTradeAcquire(RecipeDB,46106,3,25368,3,25371)
+	self:addTradeAcquire(RecipeDB,46106,8.33)

 	-- Justicebringer 3000 Specs -- 46107
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46107,375,35185,4,4036)
-	self:addTradeFlags(RecipeDB,46107,1,2,6,11,25,37,41,59)
-	self:addTradeAcquire(RecipeDB,46107,3,25370,3,25507)
+	self:addTradeFlags(RecipeDB,46107,1,2,6,25,37,41,59)
+	self:addTradeAcquire(RecipeDB,46107,8,24)

 	-- Powerheal 9000 Lens -- 46108
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46108,375,35181,4,4036)
 	self:addTradeFlags(RecipeDB,46108,1,2,6,26,37,41,56)
-	self:addTradeAcquire(RecipeDB,46108,3,25363,3,25368,3,25370)
+	self:addTradeAcquire(RecipeDB,46108,8,24)

 	-- Hyper-Magnified Moon Specs -- 46109
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46109,375,35182,4,4036)
-	self:addTradeFlags(RecipeDB,46109,1,2,6,11,22,37,41,57)
-	self:addTradeAcquire(RecipeDB,46109,3,25369,3,25484,3,25507)
+	self:addTradeFlags(RecipeDB,46109,1,2,6,22,37,41,57)
+	self:addTradeAcquire(RecipeDB,46109,8,24)

 	-- Primal-Attuned Goggles -- 46110
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46110,375,35184,4,4036)
-	self:addTradeFlags(RecipeDB,46110,1,2,6,11,27,37,41,58)
-	self:addTradeAcquire(RecipeDB,46110,3,25369,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46110,1,2,6,27,37,41,58)
+	self:addTradeAcquire(RecipeDB,46110,8,24)

 	-- Annihilator Holo-Gogs -- 46111
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46111,375,34847,4,4036)
 	self:addTradeFlags(RecipeDB,46111,1,2,6,24,26,29,37,41,56)
-	self:addTradeAcquire(RecipeDB,46111,3,25368,3,25370)
+	self:addTradeAcquire(RecipeDB,46111,8,24)

 	-- Lightning Etched Specs -- 46112
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46112,375,34355,4,4036)
 	self:addTradeFlags(RecipeDB,46112,1,2,6,27,37,41,58)
-	self:addTradeAcquire(RecipeDB,46112,3,25367,3,25368,3,25369,3,25370,3,25371)
+	self:addTradeAcquire(RecipeDB,46112,8,24)

 	-- Surestrike Goggles v3.0 -- 46113
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46113,375,34356,4,4036)
-	self:addTradeFlags(RecipeDB,46113,1,2,6,11,23,27,37,41,58)
-	self:addTradeAcquire(RecipeDB,46113,3,25367,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46113,1,2,6,23,27,37,41,58)
+	self:addTradeAcquire(RecipeDB,46113,8,24)

 	-- Mayhem Projection Goggles -- 46114
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46114,375,34354,4,4036)
-	self:addTradeFlags(RecipeDB,46114,1,2,6,11,25,30,37,41,59)
-	self:addTradeAcquire(RecipeDB,46114,3,25369,3,25507,3,25592)
+	self:addTradeFlags(RecipeDB,46114,1,2,6,25,30,37,41,59)
+	self:addTradeAcquire(RecipeDB,46114,8,24)

 	-- Hard Khorium Goggles -- 46115
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46115,375,34357,4,4036)
 	self:addTradeFlags(RecipeDB,46115,1,2,6,25,30,37,41,52,59)
-	self:addTradeAcquire(RecipeDB,46115,3,25363,3,25371)
+	self:addTradeAcquire(RecipeDB,46115,8,24)

 	-- Quad Deathblow X44 Goggles -- 46116
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46116,375,34353,4,4036)
 	self:addTradeFlags(RecipeDB,46116,1,2,6,22,28,37,41,57)
-	self:addTradeAcquire(RecipeDB,46116,3,25367,3,25369,3,25599)
+	self:addTradeAcquire(RecipeDB,46116,8,24)

 	-- Rocket Boots Xtreme Lite -- 46697
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua
index cbcbc03..c676ab7 100644
--- a/RecipeDB/ARL-Jewelcraft.lua
+++ b/RecipeDB/ARL-Jewelcraft.lua
@@ -1459,37 +1459,37 @@ function addon:InitJewelcrafting(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46122,365,34362,4,25229)
 	self:addTradeFlags(RecipeDB,46122,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,62)
-	self:addTradeAcquire(RecipeDB,46122,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)
+	self:addTradeAcquire(RecipeDB,46122,8,24)

 	-- Ring of Flowing Life -- 46123
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46123,365,34363,4,25229)
 	self:addTradeFlags(RecipeDB,46123,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,62)
-	self:addTradeAcquire(RecipeDB,46123,3,25363,3,25367,3,25369,3,25370)
+	self:addTradeAcquire(RecipeDB,46123,8,24)

 	-- Hard Khorium Band -- 46124
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46124,365,34361,4,25229)
-	self:addTradeFlags(RecipeDB,46124,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,62)
-	self:addTradeAcquire(RecipeDB,46124,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46124,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,62)
+	self:addTradeAcquire(RecipeDB,46124,8,24)

 	-- Pendant of Sunfire -- 46125
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46125,365,34359,4,25229)
 	self:addTradeFlags(RecipeDB,46125,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,46125,3,25369,3,25370,3,25599)
+	self:addTradeAcquire(RecipeDB,46125,8,24)

 	-- Amulet of Flowing Life -- 46126
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46126,365,34360,4,25229)
 	self:addTradeFlags(RecipeDB,46126,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,46126,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)
+	self:addTradeAcquire(RecipeDB,46126,8,24)

 	-- Hard Khorium Choker -- 46127
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46127,365,34358,4,25229)
 	self:addTradeFlags(RecipeDB,46127,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41)
-	self:addTradeAcquire(RecipeDB,46127,3,25363,3,25367,3,25369,3,25371,3,25507)
+	self:addTradeAcquire(RecipeDB,46127,8,24)

 	-- Quick Dawnstone -- 46403
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Leatherwork.lua b/RecipeDB/ARL-Leatherwork.lua
index 75ccaf4..dd4f9c1 100644
--- a/RecipeDB/ARL-Leatherwork.lua
+++ b/RecipeDB/ARL-Leatherwork.lua
@@ -2233,50 +2233,50 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Leather Gauntlets of the Sun -- 46132
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46132,365,34372,4,2108)
-	self:addTradeFlags(RecipeDB,46132,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
-	self:addTradeAcquire(RecipeDB,46132,3,25363,3,25367,3,25368,3,25369,3,25371,3,25507,3,25597)
+	self:addTradeFlags(RecipeDB,46132,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,57)
+	self:addTradeAcquire(RecipeDB,46132,8,24)

 	-- Fletcher's Gloves of the Phoenix -- 46133
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46133,365,34374,4,2108)
-	self:addTradeFlags(RecipeDB,46133,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,58)
-	self:addTradeAcquire(RecipeDB,46133,3,25363,3,25367,3,25369,3,25370,3,25507)
+	self:addTradeFlags(RecipeDB,46133,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,58)
+	self:addTradeAcquire(RecipeDB,46133,8,24)

 	-- Gloves of Immortal Dusk -- 46134
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46134,365,34370,4,2108)
-	self:addTradeFlags(RecipeDB,46134,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,41,57)
-	self:addTradeAcquire(RecipeDB,46134,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46134,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,57)
+	self:addTradeAcquire(RecipeDB,46134,8,24)

 	-- Sun-Drenched Scale Gloves -- 46135
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46135,365,34376,4,2108)
 	self:addTradeFlags(RecipeDB,46135,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,58)
-	self:addTradeAcquire(RecipeDB,46135,3,25369,3,25371)
+	self:addTradeAcquire(RecipeDB,46135,8,24)

 	-- Leather Chestguard of the Sun -- 46136
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46136,365,34371,4,2108)
 	self:addTradeFlags(RecipeDB,46136,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,57)
-	self:addTradeAcquire(RecipeDB,46136,3,25593)
+	self:addTradeAcquire(RecipeDB,46136,8,24)

 	-- Embrace of the Phoenix -- 46137
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46137,365,34373,4,2108)
-	self:addTradeFlags(RecipeDB,46137,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,58)
-	self:addTradeAcquire(RecipeDB,46137,3,25367,3,25369,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46137,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,58)
+	self:addTradeAcquire(RecipeDB,46137,8,24)

 	-- Carapace of Sun and Shadow -- 46138
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46138,365,34369,4,2108)
-	self:addTradeFlags(RecipeDB,46138,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,57)
-	self:addTradeAcquire(RecipeDB,46138,3,25363,3,25367,3,25368,3,25369,3,25507)
+	self:addTradeFlags(RecipeDB,46138,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,57)
+	self:addTradeAcquire(RecipeDB,46138,8,24)

 	-- Sun-Drenched Scale Chestguard -- 46139
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46139,365,34375,4,2108)
 	self:addTradeFlags(RecipeDB,46139,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,58)
-	self:addTradeAcquire(RecipeDB,46139,3,25363,3,25367,3,25368,3,25369,3,25371,3,25593)
+	self:addTradeAcquire(RecipeDB,46139,8,24)

 	-- Heavy Borean Leather -- 50936
 	recipecount = recipecount + 1
diff --git a/RecipeDB/ARL-Mob.lua b/RecipeDB/ARL-Mob.lua
index 7097260..b4c055e 100644
--- a/RecipeDB/ARL-Mob.lua
+++ b/RecipeDB/ARL-Mob.lua
@@ -544,22 +544,6 @@ function addon:InitMob(MobDB)
 	self:addLookupList(MobDB,24979,L["Dawnblade Marksman"],BZONE["Isle of Quel'Danas"],41.31,39.07)
 	self:addLookupList(MobDB,25060,L["Darkspine Myrmidon"],BZONE["Isle of Quel'Danas"],61.68,55.13)
 	self:addLookupList(MobDB,25073,L["Darkspine Siren"],BZONE["Isle of Quel'Danas"],61.57,56.10)
-	self:addLookupList(MobDB,25363,L["Sunblade Cabalist"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25367,L["Sunblade Arch Mage"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25368,L["Sunblade Slayer"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25369,L["Sunblade Vindicator"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25370,L["Sunblade Dusk Priest"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25371,L["Sunblade Dawn Priest"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25484,L["Shadowsword Assassin"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25486,L["Shadowsword Vanquisher"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25507,L["Sunblade Protector"],L["Unknown Zone"],0,0)
-	self:addLookupList(MobDB,25508,L["Shadowsword Guardian"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25509,L["Priestess of Torment"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25591,L["Painbringer"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25592,L["Doomfire Destroyer"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25593,L["Apocalypse Guard"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25597,L["Oblivion Mage"],BZONE["Sunwell Plateau"],0,0)
-	self:addLookupList(MobDB,25599,L["Cataclysm Hound"],BZONE["Sunwell Plateau"],0,0)
 	self:addLookupList(MobDB,26206,BBOSS["Keristrasza"],BZONE["Borean Tundra"],29.59,30.00)
 	self:addLookupList(MobDB,26270,L["Iron Rune-Shaper"],BZONE["Grizzly Hills"],67.79,15.46)
 	self:addLookupList(MobDB,26632,BBOSS["The Prophet Tharon'ja"],L["Unknown Zone"],0,0)
diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua
index 8ff59ac..853b863 100644
--- a/RecipeDB/ARL-Tailor.lua
+++ b/RecipeDB/ARL-Tailor.lua
@@ -1975,25 +1975,25 @@ function addon:InitTailoring(RecipeDB)
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46128,365,34366,4,3908)
 	self:addTradeFlags(RecipeDB,46128,1,2,6,21,22,23,24,25,26,27,28,29,30,36,41,56)
-	self:addTradeAcquire(RecipeDB,46128,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371)
+	self:addTradeAcquire(RecipeDB,46128,8,24)

 	-- Hands of Eternal Light -- 46129
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46129,365,34367,4,3908)
-	self:addTradeFlags(RecipeDB,46129,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,56)
-	self:addTradeAcquire(RecipeDB,46129,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46129,1,2,6,21,22,23,24,25,26,27,28,29,30,36,40,56)
+	self:addTradeAcquire(RecipeDB,46129,8,24)

 	-- Sunfire Robe -- 46130
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46130,365,34364,4,3908)
-	self:addTradeFlags(RecipeDB,46130,1,2,6,11,21,22,23,24,25,26,27,28,29,30,37,41,56)
-	self:addTradeAcquire(RecipeDB,46130,3,25363,3,25367,3,25368,3,25369,3,25370,3,25371,3,25507)
+	self:addTradeFlags(RecipeDB,46130,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,56)
+	self:addTradeAcquire(RecipeDB,46130,8,24)

 	-- Robe of Eternal Light -- 46131
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB,46131,365,34365,4,3908)
 	self:addTradeFlags(RecipeDB,46131,1,2,6,21,22,23,24,25,26,27,28,29,30,37,41,56)
-	self:addTradeAcquire(RecipeDB,46131,3,25363,3,25367,3,25369,3,25370,3,25371,3,25486,3,25592)
+	self:addTradeAcquire(RecipeDB,46131,8,24)

 	-- Dress Shoes -- 49677
 	recipecount = recipecount + 1