Quantcast

Merge remote branch 'origin/master'

mike [02-08-11 - 17:33]
Merge remote branch 'origin/master'
Filename
Constants.lua
Database/Tailoring.lua
core.lua
diff --git a/Constants.lua b/Constants.lua
index 28f2c52..b956ef7 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -359,6 +359,7 @@ private.acquire_types = {
 	["WORLD_DROP"]	= 7,
 	["ACHIEVEMENT"]	= 8,
 	["CUSTOM"]	= 9,
+	["RETIRED"]	= 10,
 }

 private.acquire_strings = {
@@ -371,6 +372,7 @@ private.acquire_strings = {
 	[7]	= "WORLD_DROP",
 	[8]	= "ACHIEVEMENT",
 	[9]	= "CUSTOM",
+	[10]	= "RETIRED",
 }

 private.acquire_names = {
@@ -383,6 +385,7 @@ private.acquire_names = {
 	[7]	= L["World Drop"],
 	[8]	= _G.ACHIEVEMENTS,
 	[9]	= _G.MISCELLANEOUS,
+	[10]	= L["Retired"],
 }

 -------------------------------------------------------------------------------
diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index 4c48a73..79222fb 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -706,7 +706,8 @@ function addon:InitTailoring()
 	-- Shadoweave Mask -- 12086
 	AddRecipe(12086, 245, 10025, Q.UNCOMMON, V.ORIG, 245, 260, 275, 290)
 	self:AddRecipeFlags(12086, F.ALLIANCE, F.HORDE, F.QUEST, F.RETIRED, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
-	self:AddRecipeAcquire(12086, A.CUSTOM, 48)
+	--self:AddRecipeAcquire(12086, A.CUSTOM, 48)
+	self:AddRecipeRetired(12086)

 	-- Cindercloth Boots -- 12088
 	AddRecipe(12088, 245, 10044, Q.COMMON, V.ORIG, 245, 260, 275, 290)
diff --git a/core.lua b/core.lua
index cb10a11..a737513 100644
--- a/core.lua
+++ b/core.lua
@@ -1359,6 +1359,10 @@ do
 		GenericAddRecipeAcquire(spell_id, A.ACHIEVEMENT, "Achievement", nil, ...)
 	end

+	function addon:AddRecipeRetired(spell_id, ...)
+		GenericAddRecipeAcquire(spell_id, A.RETIRED, nil, nil, ...)
+	end
+
 	-- This function can NOT use GenericAddRecipeAcquire() - reputation vendors are more complicated than the other acquire types.
 	function addon:AddRecipeRepVendor(spell_id, faction_id, rep_level, ...)
 		local num_vars = select('#', ...)