Quantcast

Merge branch 'master' of git.wowace.com:wow/arl/mainline

pompachomp [03-28-10 - 04:22]
Merge branch 'master' of git.wowace.com:wow/arl/mainline
Filename
ARL.lua
Database/Blacksmithing.lua
Database/Leatherworking.lua
Database/Tailoring.lua
Frame.lua
Locales/devel-enUS.lua
diff --git a/ARL.lua b/ARL.lua
index 6948e11..6567dbe 100644
--- a/ARL.lua
+++ b/ARL.lua
@@ -252,6 +252,7 @@ function addon:OnInitialize()
 					skill = true,
 					known = false,
 					unknown = true,
+					retired = false,
 				},
 				-------------------------------------------------------------------------------
 				-- Obtain Filters
@@ -1294,6 +1295,11 @@ do
 				return false
 			end
 		end
+
+		-- Display retired recipes?
+		if not general_filters.retired and recipe_flags[F.RETIRED] then
+			return false
+		end
 		local obtain_filters = filter_db.obtain
 		local game_version = recipe.genesis
 		local V = private.game_versions
diff --git a/Database/Blacksmithing.lua b/Database/Blacksmithing.lua
index 6c7781f..91da5f9 100644
--- a/Database/Blacksmithing.lua
+++ b/Database/Blacksmithing.lua
@@ -1231,19 +1231,19 @@ function addon:InitBlacksmithing()

 	-- Icebane Breastplate -- 28242
 	AddRecipe(28242, 300, 22669, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28242, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
+	self:AddRecipeFlags(28242, F.ALLIANCE, F.HORDE, F.RETIRED, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28242, FAC.ARGENTDAWN, REP.EXALTED, 16365)
 	self:AddRecipeAcquire(28242, A.CUSTOM, 41)

 	-- Icebane Gauntlets -- 28243
 	AddRecipe(28243, 300, 22670, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28243, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
+	self:AddRecipeFlags(28243, F.ALLIANCE, F.HORDE, F.RETIRED, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28243, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28243, A.CUSTOM, 41)

 	-- Icebane Bracers -- 28244
 	AddRecipe(28244, 300, 22671, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28244, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
+	self:AddRecipeFlags(28244, F.ALLIANCE, F.HORDE, F.RETIRED, F.TRAINER, F.IBOE, F.RBOP, F.TANK, F.PLATE, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28244, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28244, A.CUSTOM, 41)

diff --git a/Database/Leatherworking.lua b/Database/Leatherworking.lua
index daf061f..104e572 100644
--- a/Database/Leatherworking.lua
+++ b/Database/Leatherworking.lua
@@ -1178,37 +1178,37 @@ function addon:InitLeatherworking()

 	-- Polar Tunic -- 28219
 	AddRecipe(28219, 300, 22661, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28219, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
+	self:AddRecipeFlags(28219, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
 	self:AddRecipeRepVendor(28219, FAC.ARGENTDAWN, REP.EXALTED, 16365)
 	self:AddRecipeAcquire(28219, A.CUSTOM, 41)

 	-- Polar Gloves -- 28220
 	AddRecipe(28220, 300, 22662, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28220, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
+	self:AddRecipeFlags(28220, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
 	self:AddRecipeRepVendor(28220, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28220, A.CUSTOM, 41)

 	-- Polar Bracers -- 28221
 	AddRecipe(28221, 300, 22663, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28221, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
+	self:AddRecipeFlags(28221, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.LEATHER)
 	self:AddRecipeRepVendor(28221, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28221, A.CUSTOM, 41)

 	-- Icy Scale Breastplate -- 28222
 	AddRecipe(28222, 300, 22664, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28222, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
+	self:AddRecipeFlags(28222, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
 	self:AddRecipeRepVendor(28222, FAC.ARGENTDAWN, REP.EXALTED, 16365)
 	self:AddRecipeAcquire(28222, A.CUSTOM, 41)

 	-- Icy Scale Gauntlets -- 28223
 	AddRecipe(28223, 300, 22666, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28223, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
+	self:AddRecipeFlags(28223, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
 	self:AddRecipeRepVendor(28223, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28223, A.CUSTOM, 41)

 	-- Icy Scale Bracers -- 28224
 	AddRecipe(28224, 300, 22665, Q.EPIC, V.ORIG, 300, 320, 330, 340)
-	self:AddRecipeFlags(28224, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
+	self:AddRecipeFlags(28224, F.ALLIANCE, F.HORDE, F.RETIRED, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.DPS, F.MAIL)
 	self:AddRecipeRepVendor(28224, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28224, A.CUSTOM, 41)

diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index d52b75c..9b82f71 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -1331,25 +1331,25 @@ function addon:InitTailoring()

 	-- Glacial Gloves -- 28205
 	AddRecipe(28205, 300, 22654, Q.EPIC, V.ORIG, 300, 315, 330, 345)
-	self:AddRecipeFlags(28205, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
+	self:AddRecipeFlags(28205, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28205, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28205, A.CUSTOM, 41)

 	-- Glacial Vest -- 28207
 	AddRecipe(28207, 300, 22652, Q.EPIC, V.ORIG, 300, 315, 330, 345)
-	self:AddRecipeFlags(28207, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
+	self:AddRecipeFlags(28207, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28207, FAC.ARGENTDAWN, REP.EXALTED, 16365)
 	self:AddRecipeAcquire(28207, A.CUSTOM, 41)

 	-- Glacial Cloak -- 28208
 	AddRecipe(28208, 300, 22658, Q.EPIC, V.ORIG, 300, 315, 330, 345)
-	self:AddRecipeFlags(28208, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.CLOAK, F.ARGENTDAWN)
+	self:AddRecipeFlags(28208, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.RAID, F.IBOE, F.RBOP, F.CLOAK, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28208, FAC.ARGENTDAWN, REP.HONORED, 16365)
 	self:AddRecipeAcquire(28208, A.CUSTOM, 41)

 	-- Glacial Wrists -- 28209
 	AddRecipe(28209, 300, 22655, Q.EPIC, V.ORIG, 300, 315, 330, 345)
-	self:AddRecipeFlags(28209, F.ALLIANCE, F.HORDE, F.VENDOR, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
+	self:AddRecipeFlags(28209, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH, F.ARGENTDAWN)
 	self:AddRecipeRepVendor(28209, FAC.ARGENTDAWN, REP.REVERED, 16365)
 	self:AddRecipeAcquire(28209, A.CUSTOM, 41)

diff --git a/Frame.lua b/Frame.lua
index c8df626..87cb835 100644
--- a/Frame.lua
+++ b/Frame.lua
@@ -1855,7 +1855,11 @@ MainPanel.filter_menu.general.known.text:SetText(L["Show Known"])

 MainPanel.filter_menu.general.unknown = CreateFrame("CheckButton", nil, MainPanel.filter_menu.general)
 InitializeCheckButton(MainPanel.filter_menu.general.unknown, MainPanel.filter_menu.general, L["UNKNOWN_DESC"], "unknown", 3, 1, 0)
-MainPanel.filter_menu.general.unknown.text:SetText(L["Show Unknown"])
+MainPanel.filter_menu.general.unknown.text:SetText(_G.UNKNOWN)
+
+MainPanel.filter_menu.general.retired = CreateFrame("CheckButton", nil, MainPanel.filter_menu.general)
+InitializeCheckButton(MainPanel.filter_menu.general.retired, MainPanel.filter_menu.general, L["RETIRED_DESC"], "retired", 3, 2, 0)
+MainPanel.filter_menu.general.retired.text:SetText(L["Retired"])

 -------------------------------------------------------------------------------
 -- Create the Class toggle and CheckButtons for MainPanel.filter_menu.general
@@ -3996,6 +4000,7 @@ function addon:InitializeFrame()
 		["faction"]		= { cb = filter_menu.general.faction,			svroot = filterdb.general },
 		["known"]		= { cb = filter_menu.general.known,			svroot = filterdb.general },
 		["unknown"]		= { cb = filter_menu.general.unknown,			svroot = filterdb.general },
+		["retired"]		= { cb = filter_menu.general.retired,			svroot = filterdb.general },
 		------------------------------------------------------------------------------------------------
 		-- Classes
 		------------------------------------------------------------------------------------------------
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index 2c9a07f..86b5a12 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -231,10 +231,11 @@ Right-click here to select your own class.]]
 L["Specialties"]			= true
 L["SPECIALTY_DESC"]			= "Include all trade-skill specialties in the scan."
 L["SKILL_DESC"]				= "Include all recipes in the scan, regardless of your current skill level."
-L["Show Known"]				= true
+L["Show Known"]				= "Known"
 L["KNOWN_DESC"]				= "Include all known recipes in the scan."
-L["Show Unknown"]			= true
 L["UNKNOWN_DESC"]			= "Include all unknown recipes in the scan."
+L["RETIRED_DESC"]			= "Include recipes which can no longer be acquired."
+L["Retired"]				= true

 -- Obtain Filter UI Elements and their associated descriptions
 L["INSTANCE_DESC"]			= "Recipes obtained from (5 man) instances should be included in the scan."