Quantcast

converted some more databases to the new format.

pompachomp [10-10-09 - 09:23]
converted some more databases to the new format.
Filename
RecipeDB/ARL-Cook.lua
RecipeDB/ARL-FirstAid.lua
RecipeDB/ARL-Runeforge.lua
diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua
index 79dc040..31f0f47 100644
--- a/RecipeDB/ARL-Cook.lua
+++ b/RecipeDB/ARL-Cook.lua
@@ -41,33 +41,11 @@ local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69,
 local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80

 --------------------------------------------------------------------------------------------------------------------
--- Reputation Filter flags
---------------------------------------------------------------------------------------------------------------------
-local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
-local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
-local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
-local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
-local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
-local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
-local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
-
---------------------------------------------------------------------------------------------------------------------
 -- Acquire types
 --------------------------------------------------------------------------------------------------------------------
 local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8

---------------------------------------------------------------------------------------------------------------------
--- Reputation Acquire Flags
---------------------------------------------------------------------------------------------------------------------
-local R_WINTERSPRING = 589
-
---------------------------------------------------------------------------------------------------------------------
--- Reputation Levels
---------------------------------------------------------------------------------------------------------------------
-local FRIENDLY = 1
-local HONORED = 2
-local REVERED = 3
-local EXALTED = 4
+-- Reputation flags not retained as they are not used in this file.

 local initialized = false
 local num_recipes = 0
@@ -96,11 +74,7 @@ function addon:InitCooking(RecipeDB)
 	-- Spiced Wolf Meat -- 2539
 	AddRecipe(2539, 10, 2680, R_COMMON, GAME_ORIG, 10, 50, 70, 90)
 	self:addTradeFlags(RecipeDB, 2539, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2539, A_TRAINER, 1355, A_TRAINER, 1382, A_TRAINER, 1430, A_TRAINER,
-	1699, A_TRAINER, 3026, A_TRAINER, 3067, A_TRAINER,3087, A_TRAINER, 3399, A_TRAINER, 4210, A_TRAINER, 4552,
-	A_TRAINER, 5159, A_TRAINER, 5482, A_TRAINER, 6286, A_TRAINER, 8306, A_TRAINER, 16253, A_TRAINER, 16277,
-	A_TRAINER, 16676, A_TRAINER,16719, A_TRAINER, 17246, A_TRAINER, 18987, A_TRAINER, 18988, A_TRAINER, 18993,
-	A_TRAINER, 19185, A_TRAINER, 19369)
+	self:addTradeAcquire(RecipeDB, 2539, A_TRAINER, 1355, A_TRAINER, 1382, A_TRAINER, 1430, A_TRAINER, 1699, A_TRAINER, 3026, A_TRAINER, 3067, A_TRAINER,3087, A_TRAINER, 3399, A_TRAINER, 4210, A_TRAINER, 4552, A_TRAINER, 5159, A_TRAINER, 5482, A_TRAINER, 6286, A_TRAINER, 8306, A_TRAINER, 16253, A_TRAINER, 16277, A_TRAINER, 16676, A_TRAINER,16719, A_TRAINER, 17246, A_TRAINER, 18987, A_TRAINER, 18988, A_TRAINER, 18993, A_TRAINER, 19185, A_TRAINER, 19369)

 	-- Roasted Boar Meat -- 2540
 	AddRecipe(2540, 1, 2681, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
@@ -110,98 +84,92 @@ function addon:InitCooking(RecipeDB)
 	-- Coyote Steak -- 2541
 	AddRecipe(2541, 50, 2684, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 2541, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2541,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,
-	3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 2541,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Goretusk Liver Pie -- 2542
 	AddRecipe(2542, 50, 724, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 2542, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2542, A_QUEST, 22,2,340)
+	self:addTradeAcquire(RecipeDB, 2542, A_QUEST, 22, A_VENDOR, 340)

 	-- Westfall Stew -- 2543
 	AddRecipe(2543, 75, 733, R_COMMON, GAME_ORIG, 75, 115, 135, 155)
 	self:addTradeFlags(RecipeDB, 2543, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 2543, A_QUEST, 38,2,340)
+	self:addTradeAcquire(RecipeDB, 2543, A_QUEST, 38, A_VENDOR, 340)

 	-- Crab Cake -- 2544
 	AddRecipe(2544, 75, 2683, R_COMMON, GAME_ORIG, 75, 115, 135, 155)
 	self:addTradeFlags(RecipeDB, 2544, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2544,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,
-	3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 2544,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Cooked Crab Claw -- 2545
 	AddRecipe(2545, 85, 2682, R_COMMON, GAME_ORIG, 85, 125, 145, 165)
 	self:addTradeFlags(RecipeDB, 2545, F_ALLIANCE, F_HORDE, F_VENDOR, F_WORLD_DROP, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 2545,7,1,2,340)
+	self:addTradeAcquire(RecipeDB, 2545, A_WORLD_DROP, R_COMMON, A_VENDOR, 340)

 	-- Dry Pork Ribs -- 2546
 	AddRecipe(2546, 80, 2687, R_COMMON, GAME_ORIG, 80, 120, 140, 160)
 	self:addTradeFlags(RecipeDB, 2546, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2546,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,
-	3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 2546,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Redridge Goulash -- 2547
 	AddRecipe(2547, 100, 1082, R_COMMON, GAME_ORIG, 100, 135, 155, 175)
 	self:addTradeFlags(RecipeDB, 2547, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2547, A_QUEST, 92,2,340)
+	self:addTradeAcquire(RecipeDB, 2547, A_QUEST, 92, A_VENDOR, 340)

 	-- Succulent Pork Ribs -- 2548
 	AddRecipe(2548, 110, 2685, R_COMMON, GAME_ORIG, 110, 130, 150, 170)
 	self:addTradeFlags(RecipeDB, 2548, F_ALLIANCE, F_HORDE, F_VENDOR, F_WORLD_DROP, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 2548,7,1,2,340)
+	self:addTradeAcquire(RecipeDB, 2548, A_WORLD_DROP, R_COMMON, A_VENDOR, 340)

 	-- Seasoned Wolf Kabob -- 2549
 	AddRecipe(2549, 100, 1017, R_COMMON, GAME_ORIG, 100, 140, 160, 180)
 	self:addTradeFlags(RecipeDB, 2549, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2549, A_QUEST, 90,2,340)
+	self:addTradeAcquire(RecipeDB, 2549, A_QUEST, 90, A_VENDOR, 340)

 	-- Beer Basted Boar Ribs -- 2795
 	AddRecipe(2795, 10, 2888, R_COMMON, GAME_ORIG, 10, 60, 80, 100)
 	self:addTradeFlags(RecipeDB, 2795, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 2795, A_QUEST, 384,2,340)
+	self:addTradeAcquire(RecipeDB, 2795, A_QUEST, 384, A_VENDOR, 340)

 	-- Crocolisk Steak -- 3370
 	AddRecipe(3370, 80, 3662, R_COMMON, GAME_ORIG, 80, 120, 140, 160)
 	self:addTradeFlags(RecipeDB, 3370, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3370, A_QUEST, 385,2,340)
+	self:addTradeAcquire(RecipeDB, 3370, A_QUEST, 385, A_VENDOR, 340)

 	-- Blood Sausage -- 3371
 	AddRecipe(3371, 60, 3220, R_COMMON, GAME_ORIG, 60, 100, 120, 140)
 	self:addTradeFlags(RecipeDB, 3371, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3371, A_QUEST, 418,2,340)
+	self:addTradeAcquire(RecipeDB, 3371, A_QUEST, 418, A_VENDOR, 340)

 	-- Murloc Fin Soup -- 3372
 	AddRecipe(3372, 90, 3663, R_COMMON, GAME_ORIG, 90, 130, 150, 170)
 	self:addTradeFlags(RecipeDB, 3372, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3372, A_QUEST, 127,2,340)
+	self:addTradeAcquire(RecipeDB, 3372, A_QUEST, 127, A_VENDOR, 340)

 	-- Crocolisk Gumbo -- 3373
 	AddRecipe(3373, 120, 3664, R_COMMON, GAME_ORIG, 120, 160, 180, 200)
 	self:addTradeFlags(RecipeDB, 3373, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3373, A_QUEST, 471,2,340)
+	self:addTradeAcquire(RecipeDB, 3373, A_QUEST, 471, A_VENDOR, 340)

 	-- Curiously Tasty Omelet -- 3376
 	AddRecipe(3376, 130, 3665, R_COMMON, GAME_ORIG, 130, 170, 190, 210)
 	self:addTradeFlags(RecipeDB, 3376, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3376, A_QUEST, 296,2,340,2,1148,2,2821)
+	self:addTradeAcquire(RecipeDB, 3376, A_QUEST, 296, A_VENDOR, 340, A_VENDOR, 1148, A_VENDOR, 2821)

 	-- Gooey Spider Cake -- 3377
 	AddRecipe(3377, 110, 3666, R_COMMON, GAME_ORIG, 110, 150, 170, 190)
 	self:addTradeFlags(RecipeDB, 3377, F_ALLIANCE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3377, A_QUEST, 93,2,340)
+	self:addTradeAcquire(RecipeDB, 3377, A_QUEST, 93, A_VENDOR, 340)

 	-- Big Bear Steak -- 3397
 	AddRecipe(3397, 110, 3726, R_COMMON, GAME_ORIG, 10, 150, 170, 190)
 	self:addTradeFlags(RecipeDB, 3397, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3397, A_QUEST, 498,2,3960,2,12246)
+	self:addTradeAcquire(RecipeDB, 3397, A_QUEST, 498, A_VENDOR, 3960, A_VENDOR, 12246)

 	-- Hot Lion Chops -- 3398
 	AddRecipe(3398, 125, 3727, R_COMMON, GAME_ORIG, 125, 175, 195, 215)
 	self:addTradeFlags(RecipeDB, 3398, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 3398, A_QUEST, 501,2,3489,2,12245)
+	self:addTradeAcquire(RecipeDB, 3398, A_QUEST, 501, A_VENDOR, 3489, A_VENDOR, 12245)

 	-- Tasty Lion Steak -- 3399
 	AddRecipe(3399, 150, 3728, R_COMMON, GAME_ORIG, 150, 190, 210, 230)
@@ -216,7 +184,7 @@ function addon:InitCooking(RecipeDB)
 	-- Barbecued Buzzard Wing -- 4094
 	AddRecipe(4094, 175, 4457, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 4094, F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 4094, A_QUEST, 703,1,2818,2,2814,2,12246)
+	self:addTradeAcquire(RecipeDB, 4094, A_QUEST, 703,1,2818, A_VENDOR, 2814, A_VENDOR, 12246)

 	-- Kaldorei Spider Kabob -- 6412
 	AddRecipe(6412, 10, 5472, R_COMMON, GAME_ORIG, 10, 50, 70, 90)
@@ -226,101 +194,92 @@ function addon:InitCooking(RecipeDB)
 	-- Scorpid Surprise -- 6413
 	AddRecipe(6413, 20, 5473, R_COMMON, GAME_ORIG, 20, 60, 80, 100)
 	self:addTradeFlags(RecipeDB, 6413, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 6413,2,3881)
+	self:addTradeAcquire(RecipeDB, 6413, A_VENDOR, 3881)

 	-- Roasted Kodo Meat -- 6414
 	AddRecipe(6414, 35, 5474, R_COMMON, GAME_ORIG, 35, 75, 95, 115)
 	self:addTradeFlags(RecipeDB, 6414, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6414,2,3081)
+	self:addTradeAcquire(RecipeDB, 6414, A_VENDOR, 3081)

 	-- Fillet of Frenzy -- 6415
 	AddRecipe(6415, 50, 5476, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 6415, F_ALLIANCE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6415,2,4200)
+	self:addTradeAcquire(RecipeDB, 6415, A_VENDOR, 4200)

 	-- Strider Stew -- 6416
 	AddRecipe(6416, 50, 5477, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 6416, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6416, A_QUEST, 2178,2,3482)
+	self:addTradeAcquire(RecipeDB, 6416, A_QUEST, 2178, A_VENDOR, 3482)

 	-- Crispy Lizard Tail -- 6418
 	AddRecipe(6418, 100, 5479, R_COMMON, GAME_ORIG, 100, 140, 160, 180)
 	self:addTradeFlags(RecipeDB, 6418, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6418,2,3482)
+	self:addTradeAcquire(RecipeDB, 6418, A_VENDOR, 3482)

 	-- Lean Venison -- 6419
 	AddRecipe(6419, 110, 5480, R_COMMON, GAME_ORIG, 110, 150, 170, 190)
 	self:addTradeFlags(RecipeDB, 6419, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6419,2,3960,2,12245)
+	self:addTradeAcquire(RecipeDB, 6419, A_VENDOR, 3960, A_VENDOR, 12245)

 	-- Boiled Clams -- 6499
 	AddRecipe(6499, 50, 5525, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 6499, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6499,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,
-	3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 6499,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Goblin Deviled Clams -- 6500
 	AddRecipe(6500, 125, 5527, R_COMMON, GAME_ORIG, 125, 165, 185, 205)
 	self:addTradeFlags(RecipeDB, 6500, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 6500,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,
-	3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 6500,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Clam Chowder -- 6501
 	AddRecipe(6501, 90, 5526, R_COMMON, GAME_ORIG, 90, 130, 150, 170)
 	self:addTradeFlags(RecipeDB, 6501, F_ALLIANCE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 6501,2,4305,2,4307)
+	self:addTradeAcquire(RecipeDB, 6501, A_VENDOR, 4305, A_VENDOR, 4307)

 	-- Giant Clam Scorcho -- 7213
 	AddRecipe(7213, 175, 6038, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 7213, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 7213,2,2664)
+	self:addTradeAcquire(RecipeDB, 7213, A_VENDOR, 2664)

 	-- Brilliant Smallfish -- 7751
 	AddRecipe(7751, 1, 6290, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
 	self:addTradeFlags(RecipeDB, 7751, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7751,2,66,2,1684,2,3029,2,3550,2,4265,2,4574,2,
-	5494,2,5940,2,8508)
+	self:addTradeAcquire(RecipeDB, 7751, A_VENDOR, 66, A_VENDOR, 1684, A_VENDOR, 3029, A_VENDOR, 3550, A_VENDOR, 4265, A_VENDOR, 4574, A_VENDOR, 5494, A_VENDOR, 5940, A_VENDOR, 8508)

 	-- Slitherskin Mackerel -- 7752
 	AddRecipe(7752, 1, 787, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
 	self:addTradeFlags(RecipeDB, 7752, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7752,2,3550,2,4305,2,5162,2,5942,2,10118)
+	self:addTradeAcquire(RecipeDB, 7752, A_VENDOR, 3550, A_VENDOR, 4305, A_VENDOR, 5162, A_VENDOR, 5942, A_VENDOR, 10118)

 	-- Longjaw Mud Snapper -- 7753
 	AddRecipe(7753, 50, 4592, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 7753, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7753,2,66,2,1684,2,3027,2,4265,2,4574,2,5162,2,
-	5748,2,5940)
+	self:addTradeAcquire(RecipeDB, 7753, A_VENDOR, 66, A_VENDOR, 1684, A_VENDOR, 3027, A_VENDOR, 4265, A_VENDOR, 4574, A_VENDOR, 5162, A_VENDOR, 5748, A_VENDOR, 5940)

 	-- Loch Frenzy Delight -- 7754
 	AddRecipe(7754, 50, 6316, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 7754, F_ALLIANCE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7754,2,1684)
+	self:addTradeAcquire(RecipeDB, 7754, A_VENDOR, 1684)

 	-- Bristle Whisker Catfish -- 7755
 	AddRecipe(7755, 100, 4593, R_COMMON, GAME_ORIG, 100, 140, 160, 180)
 	self:addTradeFlags(RecipeDB, 7755, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7755,2,2383,2,2397,2,3027,2,3029,2,3497,2,4553,2,
-	5494)
+	self:addTradeAcquire(RecipeDB, 7755, A_VENDOR, 2383, A_VENDOR, 2397, A_VENDOR, 3027, A_VENDOR, 3029, A_VENDOR, 3497, A_VENDOR, 4553, A_VENDOR, 5494)

 	-- Rainbow Fin Albacore -- 7827
 	AddRecipe(7827, 50, 5095, R_COMMON, GAME_ORIG, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 7827, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7827,2,3178,2,3333,2,3497,2,4305,2,4307,2,4553,2,
-	5494,2,5748,2,5942,2,10118)
+	self:addTradeAcquire(RecipeDB, 7827, A_VENDOR, 3178, A_VENDOR, 3333, A_VENDOR, 3497, A_VENDOR, 4305, A_VENDOR, 4307, A_VENDOR, 4553, A_VENDOR, 5494, A_VENDOR, 5748, A_VENDOR, 5942, A_VENDOR, 10118)

 	-- Rockscale Cod -- 7828
 	AddRecipe(7828, 175, 4594, R_COMMON, GAME_ORIG, 175, 190, 210, 230)
 	self:addTradeFlags(RecipeDB, 7828, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 7828,2,2383,2,2664,2,3178,2,3333,2,4307,2,4574,2,
-	5162,2,12033,2,12962)
+	self:addTradeAcquire(RecipeDB, 7828, A_VENDOR, 2383, A_VENDOR, 2664, A_VENDOR, 3178, A_VENDOR, 3333, A_VENDOR, 4307, A_VENDOR, 4574, A_VENDOR, 5162, A_VENDOR, 12033, A_VENDOR, 12962)

 	-- Savory Deviate Delight -- 8238
 	AddRecipe(8238, 85, 6657, R_UNCOMMON, GAME_ORIG, 85, 125, 145, 165)
 	self:addTradeFlags(RecipeDB, 8238, F_ALLIANCE, F_HORDE, 10, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 8238,7,2)
+	self:addTradeAcquire(RecipeDB, 8238, A_WORLD_DROP, R_UNCOMMON)

 	-- Herb Baked Egg -- 8604
 	AddRecipe(8604, 1, 6888, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
@@ -330,12 +289,12 @@ function addon:InitCooking(RecipeDB)
 	-- Smoked Bear Meat -- 8607
 	AddRecipe(8607, F_RBOE,6890,1,GAME_ORIG, F_RBOE,80,100,120)
 	self:addTradeFlags(RecipeDB, 8607, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 8607,2,1465,2,3556)
+	self:addTradeAcquire(RecipeDB, 8607, A_VENDOR, 1465, A_VENDOR, 3556)

 	-- Thistle Tea -- 9513
 	AddRecipe(9513, 60, 7676, R_UNCOMMON, GAME_ORIG, 60, 100, 120, 140)
 	self:addTradeFlags(RecipeDB, 9513, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_ROGUE, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 9513, A_QUEST, 2359, A_QUEST, 2478,2,6779)
+	self:addTradeAcquire(RecipeDB, 9513, A_QUEST, 2359, A_QUEST, 2478, A_VENDOR, 6779)

 	-- Goldthorn Tea -- 13028
 	AddRecipe(13028, 175, 10841, R_COMMON, GAME_ORIG, 175, 175, 190, 205)
@@ -345,131 +304,127 @@ function addon:InitCooking(RecipeDB)
 	-- Lean Wolf Steak -- 15853
 	AddRecipe(15853, 125, 12209, R_COMMON, GAME_ORIG, 125, 165, 185, 205)
 	self:addTradeFlags(RecipeDB, 15853, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15853,2,12246)
+	self:addTradeAcquire(RecipeDB, 15853, A_VENDOR, 12246)

 	-- Roast Raptor -- 15855
 	AddRecipe(15855, 175, 12210, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 15855, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15855,2,734,2,1148,2,2810,2,2821,2,4879,2,4897,2,
-	12245)
+	self:addTradeAcquire(RecipeDB, 15855, A_VENDOR, 734, A_VENDOR, 1148, A_VENDOR, 2810, A_VENDOR, 2821, A_VENDOR, 4879, A_VENDOR, 4897, A_VENDOR, 12245)

 	-- Hot Wolf Ribs -- 15856
 	AddRecipe(15856, 175, 13851, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 15856, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15856,2,7947,2,8145,2,12246)
+	self:addTradeAcquire(RecipeDB, 15856, A_VENDOR, 7947, A_VENDOR, 8145, A_VENDOR, 12246)

 	-- Jungle Stew -- 15861
 	AddRecipe(15861, 175, 12212, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 15861, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15861,2,734,2,1148,2,12245)
+	self:addTradeAcquire(RecipeDB, 15861, A_VENDOR, 734, A_VENDOR, 1148, A_VENDOR, 12245)

 	-- Carrion Surprise -- 15863
 	AddRecipe(15863, 175, 12213, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 15863, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15863,2,989,2,4879,2,9636,2,12245)
+	self:addTradeAcquire(RecipeDB, 15863, A_VENDOR, 989, A_VENDOR, 4879, A_VENDOR, 9636, A_VENDOR, 12245)

 	-- Mystery Stew -- 15865
 	AddRecipe(15865, 175, 12214, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 15865, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15865,2,4897,2,8150,2,12246)
+	self:addTradeAcquire(RecipeDB, 15865, A_VENDOR, 4897, A_VENDOR, 8150, A_VENDOR, 12246)

 	-- Dragonbreath Chili -- 15906
 	AddRecipe(15906, 200, 12217, R_COMMON, GAME_ORIG, 200, 225, 237, 250)
 	self:addTradeFlags(RecipeDB, 15906, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 15906,2,4879,2,4897,2,12246)
+	self:addTradeAcquire(RecipeDB, 15906, A_VENDOR, 4879, A_VENDOR, 4897, A_VENDOR, 12246)

 	-- Heavy Kodo Stew -- 15910
 	AddRecipe(15910, 200, 12215, R_COMMON, GAME_ORIG, 200, 225, 237, 250)
 	self:addTradeFlags(RecipeDB, 15910, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15910,2,8150,2,9636,2,12245)
+	self:addTradeAcquire(RecipeDB, 15910, A_VENDOR, 8150, A_VENDOR, 9636, A_VENDOR, 12245)

 	-- Spiced Chili Crab -- 15915
 	AddRecipe(15915, 225, 12216, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 15915, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15915,2,989,2,1149,2,4305)
+	self:addTradeAcquire(RecipeDB, 15915, A_VENDOR, 989, A_VENDOR, 1149, A_VENDOR, 4305)

 	-- Monster Omelet -- 15933
 	AddRecipe(15933, 225, 12218, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 15933, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15933,2,2803,2,2806,2,11187)
+	self:addTradeAcquire(RecipeDB, 15933, A_VENDOR, 2803, A_VENDOR, 2806, A_VENDOR, 11187)

 	-- Crispy Bat Wing -- 15935
 	AddRecipe(15935, 1, 12224, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
 	self:addTradeFlags(RecipeDB, 15935, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 15935,2,2118)
+	self:addTradeAcquire(RecipeDB, 15935, A_VENDOR, 2118)

 	-- Spotted Yellowtail -- 18238
 	AddRecipe(18238, 225, 6887, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 18238, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18238,2,8137)
+	self:addTradeAcquire(RecipeDB, 18238, A_VENDOR, 8137)

 	-- Cooked Glossy Mightfish -- 18239
 	AddRecipe(18239, 225, 13927, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 18239, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18239,2,2664)
+	self:addTradeAcquire(RecipeDB, 18239, A_VENDOR, 2664)

 	-- Grilled Squid -- 18240
 	AddRecipe(18240, 240, 13928, R_COMMON, GAME_ORIG, 240, 265, 277, 290)
 	self:addTradeFlags(RecipeDB, 18240, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_DPS)
-	self:addTradeAcquire(RecipeDB, 18240,2,8137)
+	self:addTradeAcquire(RecipeDB, 18240, A_VENDOR, 8137)

 	-- Filet of Redgill -- 18241
 	AddRecipe(18241, 225, 13930, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 18241, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18241,2,2664)
+	self:addTradeAcquire(RecipeDB, 18241, A_VENDOR, 2664)

 	-- Hot Smoked Bass -- 18242
 	AddRecipe(18242, 240, 13929, R_COMMON, GAME_ORIG, 240, 265, 277, 290)
 	self:addTradeFlags(RecipeDB, 18242, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 18242,2,2664)
+	self:addTradeAcquire(RecipeDB, 18242, A_VENDOR, 2664)

 	-- Nightfin Soup -- 18243
 	AddRecipe(18243, 250, 13931, R_COMMON, GAME_ORIG, 250, 275, 285, 295)
 	self:addTradeFlags(RecipeDB, 18243, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 18243,2,8137)
+	self:addTradeAcquire(RecipeDB, 18243, A_VENDOR, 8137)

 	-- Poached Sunscale Salmon -- 18244
 	AddRecipe(18244, 250, 13932, R_COMMON, GAME_ORIG, 250, 275, 285, 295)
 	self:addTradeFlags(RecipeDB, 18244, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18244,2,8137)
+	self:addTradeAcquire(RecipeDB, 18244, A_VENDOR, 8137)

 	-- Lobster Stew -- 18245
 	AddRecipe(18245, 275, 13933, R_COMMON, GAME_ORIG, 275, 300, 312, 325)
 	self:addTradeFlags(RecipeDB, 18245, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18245,2,7947,2,8145)
+	self:addTradeAcquire(RecipeDB, 18245, A_VENDOR, 7947, A_VENDOR, 8145)

 	-- Mightfish Steak -- 18246
 	AddRecipe(18246, 275, 13934, R_COMMON, GAME_ORIG, 275, 300, 312, 325)
 	self:addTradeFlags(RecipeDB, 18246, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18246,2,7947,2,8145)
+	self:addTradeAcquire(RecipeDB, 18246, A_VENDOR, 7947, A_VENDOR, 8145)

 	-- Baked Salmon -- 18247
 	AddRecipe(18247, 275, 13935, R_COMMON, GAME_ORIG, 275, 300, 312, 325)
 	self:addTradeFlags(RecipeDB, 18247, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 18247,2,7947,2,8145)
+	self:addTradeAcquire(RecipeDB, 18247, A_VENDOR, 7947, A_VENDOR, 8145)

 	-- Undermine Clam Chowder -- 20626
 	AddRecipe(20626, 225, 16766, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 20626, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 20626,2,8139)
+	self:addTradeAcquire(RecipeDB, 20626, A_VENDOR, 8139)

 	-- Mithril Head Trout -- 20916
 	AddRecipe(20916, 175, 8364, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 20916, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 20916,2,2383,2,2664,2,3178,2,3333,2,4307,2,4574,2
-	,5162,2,12033,2,12962)
+	self:addTradeAcquire(RecipeDB, 20916, A_VENDOR, 2383, A_VENDOR, 2664, A_VENDOR, 3178, A_VENDOR, 3333, A_VENDOR, 4307, A_VENDOR, 4574, A_VENDOR, 5162, A_VENDOR, 12033, A_VENDOR, 12962)

 	-- Gingerbread Cookie -- 21143
 	AddRecipe(21143, 1, 17197, R_COMMON, GAME_ORIG, 1, 45, 65, 85)
 	self:addTradeFlags(RecipeDB, 21143, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 21143,5,1,2,13420,2,13429,2,13432,2,13433,2,13435
-	,2,23010,2,23012,2,23064)
+	self:addTradeAcquire(RecipeDB, 21143, A_SEASONAL, 1, A_VENDOR, 13420, A_VENDOR, 13429, A_VENDOR, 13432, A_VENDOR, 13433, A_VENDOR, 13435, A_VENDOR, 23010, A_VENDOR, 23012, A_VENDOR, 23064)

 	-- Egg Nog -- 21144
 	AddRecipe(21144, 35, 17198, R_COMMON, GAME_ORIG, 35, 75, 95, 115)
 	self:addTradeFlags(RecipeDB, 21144, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 21144,5,1,2,13420,2,13429,2,13432,2,13433,2,13435
-	,2,23010,2,23012,2,23064)
+	self:addTradeAcquire(RecipeDB, 21144, A_SEASONAL, 1, A_VENDOR, 13420, A_VENDOR, 13429, A_VENDOR, 13432, A_VENDOR, 13433, A_VENDOR, 13435, A_VENDOR, 23010, A_VENDOR, 23012, A_VENDOR, 23064)

 	-- Spider Sausage -- 21175
 	AddRecipe(21175, 200, 17222, R_COMMON, GAME_ORIG, 200, 225, 237, 250)
@@ -481,7 +436,7 @@ function addon:InitCooking(RecipeDB)
 	-- Tender Wolf Steak -- 22480
 	AddRecipe(22480, 225, 18045, R_COMMON, GAME_ORIG, 225, 250, 262, 275)
 	self:addTradeFlags(RecipeDB, 22480, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 22480,2,4782,2,7733,2,8125)
+	self:addTradeAcquire(RecipeDB, 22480, A_VENDOR, 4782, A_VENDOR, 7733, A_VENDOR, 8125)

 	-- Runn Tum Tuber Surprise -- 22761
 	AddRecipe(22761, 275, 18254, R_UNCOMMON, GAME_ORIG, 275, 300, 312, 325)
@@ -491,7 +446,7 @@ function addon:InitCooking(RecipeDB)
 	-- Heavy Crocolisk Stew -- 24418
 	AddRecipe(24418, 150, 20074, R_COMMON, GAME_ORIG, 150, 160, 180, 200)
 	self:addTradeFlags(RecipeDB, 24418, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 24418,2,4879)
+	self:addTradeAcquire(RecipeDB, 24418, A_VENDOR, 4879)

 	-- Smoked Desert Dumplings -- 24801
 	AddRecipe(24801, 285, 20452, R_COMMON, GAME_ORIG, 285, 310, 322, 335)
@@ -506,26 +461,24 @@ function addon:InitCooking(RecipeDB)
 	-- Smoked Sagefish -- 25704
 	AddRecipe(25704, 80, 21072, R_COMMON, GAME_ORIG, 80, 120, 140, 160)
 	self:addTradeFlags(RecipeDB, 25704, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 25704,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2
-	,4223,2,4265,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,
-	17246,2,19195,2,26868)
+	self:addTradeAcquire(RecipeDB, 25704, A_VENDOR, 2381, A_VENDOR, 2397, A_VENDOR, 2664, A_VENDOR, 3027, A_VENDOR, 3085, A_VENDOR, 3400,2
+	,4223, A_VENDOR, 4265, A_VENDOR, 4553, A_VENDOR, 5160, A_VENDOR, 5483, A_VENDOR, 8307, A_VENDOR, 12033, A_VENDOR, 14738, A_VENDOR, 16253, A_VENDOR, 16677, A_VENDOR, 16718, A_VENDOR,
+	17246, A_VENDOR, 19195, A_VENDOR, 26868)

 	-- Sagefish Delight -- 25954
 	AddRecipe(25954, 175, 21217, R_COMMON, GAME_ORIG, 175, 215, 235, 255)
 	self:addTradeFlags(RecipeDB, 25954, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 25954,2,2381,2,2397,2,2664,2,3027,2,3085,2,3400,2
-	,4223,2,4265,2,4553,2,5160,2,5483,2,8307,2,12033,2,14738,2,16253,2,16677,2,16718,2,
-	17246,2,19195,2,26868)
+	self:addTradeAcquire(RecipeDB, 25954, A_VENDOR, 2381, A_VENDOR, 2397, A_VENDOR, 2664, A_VENDOR, 3027, A_VENDOR, 3085, A_VENDOR, 3400, A_VENDOR, 4223, A_VENDOR, 4265, A_VENDOR, 4553, A_VENDOR, 5160, A_VENDOR, 5483, A_VENDOR, 8307, A_VENDOR, 12033, A_VENDOR, 14738, A_VENDOR, 16253, A_VENDOR, 16677, A_VENDOR, 16718, A_VENDOR, 17246, A_VENDOR, 19195, A_VENDOR, 26868)

 	-- Crunchy Spider Surprise -- 28267
 	AddRecipe(28267, 60, 22645, R_COMMON, GAME_BC, 60, 100, 120, 140)
 	self:addTradeFlags(RecipeDB, 28267, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 28267, A_QUEST, 9171,2,16253,2,18427)
+	self:addTradeAcquire(RecipeDB, 28267, A_QUEST, 9171, A_VENDOR, 16253, A_VENDOR, 18427)

 	-- Lynx Steak -- 33276
 	AddRecipe(33276, 1, 27635, R_COMMON, GAME_BC, 1, 45, 65, 85)
 	self:addTradeFlags(RecipeDB, 33276, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33276,2,16262)
+	self:addTradeAcquire(RecipeDB, 33276, A_VENDOR, 16262)

 	-- Roasted Moongraze Tenderloin -- 33277
 	AddRecipe(33277, 1, 24105, R_COMMON, GAME_BC, 1, 45, 65, 85)
@@ -535,7 +488,7 @@ function addon:InitCooking(RecipeDB)
 	-- Bat Bites -- 33278
 	AddRecipe(33278, 50, 27636, R_COMMON, GAME_BC, 50, 90, 110, 130)
 	self:addTradeFlags(RecipeDB, 33278, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33278,2,16253)
+	self:addTradeAcquire(RecipeDB, 33278, A_VENDOR, 16253)

 	-- Buzzard Bites -- 33279
 	AddRecipe(33279, 300, 27651, R_COMMON, GAME_BC, 300, 320, 330, 340)
@@ -545,89 +498,87 @@ function addon:InitCooking(RecipeDB)
 	-- Ravager Dog -- 33284
 	AddRecipe(33284, 300, 27655, R_COMMON, GAME_BC, 300, 320, 330, 340)
 	self:addTradeFlags(RecipeDB, 33284, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33284,2,16585,2,16826)
+	self:addTradeAcquire(RecipeDB, 33284, A_VENDOR, 16585, A_VENDOR, 16826)

 	-- Sporeling Snack -- 33285
 	AddRecipe(33285, 310, 27656, R_COMMON, GAME_BC, 310, 330, 340, 350)
 	self:addTradeFlags(RecipeDB, 33285, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 33285,2,18382)
+	self:addTradeAcquire(RecipeDB, 33285, A_VENDOR, 18382)

 	-- Blackened Basilisk -- 33286
 	AddRecipe(33286, 315, 27657, R_COMMON, GAME_BC, 315, 335, 345, 355)
 	self:addTradeFlags(RecipeDB, 33286, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33286,2,18957,2,19038)
+	self:addTradeAcquire(RecipeDB, 33286, A_VENDOR, 18957, A_VENDOR, 19038)

 	-- Roasted Clefthoof -- 33287
 	AddRecipe(33287, 325, 27658, R_COMMON, GAME_BC, 325, 345, 355, 365)
 	self:addTradeFlags(RecipeDB, 33287, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_DPS)
-	self:addTradeAcquire(RecipeDB, 33287,2,20096,2,20097)
+	self:addTradeAcquire(RecipeDB, 33287, A_VENDOR, 20096, A_VENDOR, 20097)

 	-- Warp Burger -- 33288
 	AddRecipe(33288, 325, 27659, R_COMMON, GAME_BC, 325, 345, 355, 365)
 	self:addTradeFlags(RecipeDB, 33288, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_DPS)
-	self:addTradeAcquire(RecipeDB, 33288,2,18957,2,19038)
+	self:addTradeAcquire(RecipeDB, 33288, A_VENDOR, 18957, A_VENDOR, 19038)

 	-- Talbuk Steak -- 33289
 	AddRecipe(33289, 325, 27660, R_COMMON, GAME_BC, 325, 345, 355, 365)
 	self:addTradeFlags(RecipeDB, 33289, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33289,2,20096,2,20097)
+	self:addTradeAcquire(RecipeDB, 33289, A_VENDOR, 20096, A_VENDOR, 20097)

 	-- Blackened Trout -- 33290
 	AddRecipe(33290, 300, 27661, R_COMMON, GAME_BC, 300, 320, 330, 340)
 	self:addTradeFlags(RecipeDB, 33290, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 33290,2,18015,2,20028)
+	self:addTradeAcquire(RecipeDB, 33290, A_VENDOR, 18015, A_VENDOR, 20028)

 	-- Feltail Delight -- 33291
 	AddRecipe(33291, 300, 27662, R_COMMON, GAME_BC, 300, 320, 330, 340)
 	self:addTradeFlags(RecipeDB, 33291, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33291,2,18011,2,20028)
+	self:addTradeAcquire(RecipeDB, 33291, A_VENDOR, 18011, A_VENDOR, 20028)

 	-- Blackened Sporefish -- 33292
 	AddRecipe(33292, 310, 27663, R_COMMON, GAME_BC, 310, 330, 340, 350)
 	self:addTradeFlags(RecipeDB, 33292, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33292,2,18911)
+	self:addTradeAcquire(RecipeDB, 33292, A_VENDOR, 18911)

 	-- Grilled Mudfish -- 33293
 	AddRecipe(33293, 320, 27664, R_COMMON, GAME_BC, 320, 340, 350, 360)
 	self:addTradeFlags(RecipeDB, 33293, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_DPS)
-	self:addTradeAcquire(RecipeDB, 33293,2,20096,2,20097)
+	self:addTradeAcquire(RecipeDB, 33293, A_VENDOR, 20096, A_VENDOR, 20097)

 	-- Poached Bluefish -- 33294
 	AddRecipe(33294, 320, 27665, R_COMMON, GAME_BC, 320, 340, 350, 360)
 	self:addTradeFlags(RecipeDB, 33294, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33294,2,20096,2,20097)
+	self:addTradeAcquire(RecipeDB, 33294, A_VENDOR, 20096, A_VENDOR, 20097)

 	-- Golden Fish Sticks -- 33295
 	AddRecipe(33295, 325, 27666, R_COMMON, GAME_BC, 325, 345, 355, 365)
 	self:addTradeFlags(RecipeDB, 33295, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33295,2,18960,2,19296)
+	self:addTradeAcquire(RecipeDB, 33295, A_VENDOR, 18960, A_VENDOR, 19296)

 	-- Spicy Crawdad -- 33296
 	AddRecipe(33296, 350, 27667, R_COMMON, GAME_BC, 350, 370, 375, 380)
 	self:addTradeFlags(RecipeDB, 33296, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 33296,2,18960,2,19296)
+	self:addTradeAcquire(RecipeDB, 33296, A_VENDOR, 18960, A_VENDOR, 19296)

 	-- Clam Bar -- 36210
 	AddRecipe(36210, 300, 30155, R_COMMON, GAME_BC, 300, 320, 330, 340)
 	self:addTradeFlags(RecipeDB, 36210, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 36210,2,18382)
+	self:addTradeAcquire(RecipeDB, 36210, A_VENDOR, 18382)

 	-- Spice Bread -- 37836
 	AddRecipe(37836, 1, 30816, 1, R_COMMON, GAME_BC, 30, 35, 38)
 	self:addTradeFlags(RecipeDB, 37836, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 37836,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1
-	,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,
-	16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)
+	self:addTradeAcquire(RecipeDB, 37836,1,1355,1,1382,1,1430,1,1699,1,3026,1,3067,1,3087,1,3399,1,4210,1,4552,1,5159,1,5482,1,6286,1,8306,1,16253,1,16277,1,16676,1,16719,1,17246,1,18987,1,18988,1,18993,1,19185,1,19369)

 	-- Mok'Nathal Shortribs -- 38867
 	AddRecipe(38867, 335, 31672, R_COMMON, GAME_BC, 335, 355, 365, 375)
 	self:addTradeFlags(RecipeDB, 38867, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 38867, A_QUEST, 10860,2,20916,2,21113)
+	self:addTradeAcquire(RecipeDB, 38867, A_QUEST, 10860, A_VENDOR, 20916, A_VENDOR, 21113)

 	-- Crunchy Serpent -- 38868
 	AddRecipe(38868, 335, 31673, R_COMMON, GAME_BC, 335, 355, 365, 375)
 	self:addTradeFlags(RecipeDB, 38868, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 38868, A_QUEST, 10860,2,20916,2,21113)
+	self:addTradeAcquire(RecipeDB, 38868, A_QUEST, 10860, A_VENDOR, 20916, A_VENDOR, 21113)

 	-- Stewed Trout -- 42296
 	AddRecipe(42296, 320, 33048, R_COMMON, GAME_BC, 320, 335, 345, 355)
@@ -677,37 +628,32 @@ function addon:InitCooking(RecipeDB)
 	-- Hot Apple Cider -- 45022
 	AddRecipe(45022, 325, 34411, R_COMMON, GAME_WOTLK, 325, 325, 325, 325)
 	self:addTradeFlags(RecipeDB, 45022, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 45022,5,1,2,13420,2,13433)
+	self:addTradeAcquire(RecipeDB, 45022, A_SEASONAL, 1, A_VENDOR, 13420, A_VENDOR, 13433)

 	-- Mammoth Meal -- 45549
 	AddRecipe(45549, 350, 34748, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45549, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 45549,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45549,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Shoveltusk Steak -- 45550
 	AddRecipe(45550, 350, 34749, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45550, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 45550,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45550,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Worm Delight -- 45551
 	AddRecipe(45551, 350, 34750, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45551, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45551,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45551,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Roasted Worg -- 45552
 	AddRecipe(45552, 350, 34751, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45552, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45552,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45552,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Rhino Dogs -- 45553
 	AddRecipe(45553, 350, 34752, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45553, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45553,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45553,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Great Feast -- 45554
 	AddRecipe(45554, 375, 34753, R_COMMON, GAME_WOTLK, 375, 375, 400, 425)
@@ -717,27 +663,27 @@ function addon:InitCooking(RecipeDB)
 	-- Mega Mammoth Meal -- 45555
 	AddRecipe(45555, 400, 34754, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45555, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 45555,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45555, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Tender Shoveltusk Steak -- 45556
 	AddRecipe(45556, 400, 34755, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45556, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 45556,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45556, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Spiced Wyrm Burger -- 45557
 	AddRecipe(45557, 400, 34756, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45557, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45557,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45557, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Very Burnt Worg -- 45558
 	AddRecipe(45558, 400, 34757, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45558, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45558,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45558, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Mighty Rhino Dogs -- 45559
 	AddRecipe(45559, 400, 34758, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45559, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45559,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45559, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Smoked Rockfin -- 45560
 	AddRecipe(45560, 350, 34759, R_COMMON, GAME_WOTLK, 350, 350, 365, 380)
@@ -754,42 +700,37 @@ function addon:InitCooking(RecipeDB)
 	-- Sauteed Goby -- 45562
 	AddRecipe(45562, 350, 34761, R_COMMON, GAME_WOTLK, 350, 350, 365, 380)
 	self:addTradeFlags(RecipeDB, 45562, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45562,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45562,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Grilled Sculpin -- 45563
 	AddRecipe(45563, 350, 34762, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45563, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 45563,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45563,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Smoked Salmon -- 45564
 	AddRecipe(45564, 350, 34763, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45564, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 45564,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45564,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Poached Nettlefish -- 45565
 	AddRecipe(45565, 350, 34764, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45565, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45565,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45565,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Pickled Fangtooth -- 45566
 	AddRecipe(45566, 350, 34765, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 45566, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45566,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 45566,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Poached Northern Sculpin -- 45567
 	AddRecipe(45567, 400, 34766, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45567, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 45567,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45567, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Firecracker Salmon -- 45568
 	AddRecipe(45568, 400, 34767, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45568, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 45568,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45568, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Baked Manta Ray -- 45569
 	AddRecipe(45569, 350, 42942, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
@@ -800,12 +741,12 @@ function addon:InitCooking(RecipeDB)
 	-- Imperial Manta Steak -- 45570
 	AddRecipe(45570, 400, 34769, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45570, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45570,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45570, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Spicy Blue Nettlefish -- 45571
 	AddRecipe(45571, 400, 34768, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 45571, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 45571,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 45571, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Captain Rumsey's Lager -- 45695
 	AddRecipe(45695, 100, 34832, R_UNCOMMON, GAME_WOTLK, 100, 100, 105, 110)
@@ -815,12 +756,12 @@ function addon:InitCooking(RecipeDB)
 	-- Charred Bear Kabobs -- 46684
 	AddRecipe(46684, 250, 35563, R_COMMON, GAME_WOTLK, 250, 275, 285, 295)
 	self:addTradeFlags(RecipeDB, 46684, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_DPS)
-	self:addTradeAcquire(RecipeDB, 46684,2,2803,2,2806)
+	self:addTradeAcquire(RecipeDB, 46684, A_VENDOR, 2803, A_VENDOR, 2806)

 	-- Juicy Bear Burger -- 46688
 	AddRecipe(46688, 250, 35565, R_COMMON, GAME_WOTLK, 250, 275, 285, 295)
 	self:addTradeFlags(RecipeDB, 46688, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOE, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 46688,2,2803,2,2806)
+	self:addTradeAcquire(RecipeDB, 46688, A_VENDOR, 2803, A_VENDOR, 2806)

 	-- Kungaloosh -- 53056
 	AddRecipe(53056, 375, 39520, R_COMMON, GAME_WOTLK, 375, 375, 387, 400)
@@ -830,12 +771,12 @@ function addon:InitCooking(RecipeDB)
 	-- Fish Feast -- 57423
 	AddRecipe(57423, 450, 43015, R_COMMON, GAME_WOTLK, 450, 455, 460, 465)
 	self:addTradeFlags(RecipeDB, 57423, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 57423,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57423, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Worg Tartare -- 62350
 	AddRecipe(62350, 400, 44953, R_COMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 62350, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 62350,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 62350, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Northern Stew -- 57421
 	AddRecipe(57421, 350, 34747, R_COMMON, GAME_WOTLK, 350, 350, 362, 365)
@@ -845,104 +786,102 @@ function addon:InitCooking(RecipeDB)
 	-- Spicy Fried Herring -- 57433
 	AddRecipe(57433, 400, 42993, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57433, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 57433,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57433, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Rhinolicious Wyrmsteak -- 57434
 	AddRecipe(57434, 400, 42994, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57434, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 57434,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57434, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Critter Bites -- 57435
 	AddRecipe(57435, 400, 43004, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57435, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 57435,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57435, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Hearty Rhino -- 57436
 	AddRecipe(57436, 400, 42995, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57436, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 57436,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57436, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Snapper Extreme -- 57437
 	AddRecipe(57437, 400, 42996, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57437, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 57437,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57437, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Blackened Worg Steak -- 57438
 	AddRecipe(57438, 400, 42997, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57438, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 57438,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57438, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Cuttlesteak -- 57439
 	AddRecipe(57439, 400, 42998, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57439, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 57439,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57439, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Spiced Mammoth Treats -- 57440
 	AddRecipe(57440, 400, 43005, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57440, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 57440,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57440, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Blackened Dragonfin -- 57441
 	AddRecipe(57441, 400, 42999, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57441, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 57441,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57441, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Dragonfin Filet -- 57442
 	AddRecipe(57442, 400, 43000, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57442, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 57442,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57442, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Tracker Snacks -- 57443
 	AddRecipe(57443, 400, 43001, R_UNCOMMON, GAME_WOTLK, 400, 400, 420, 460)
 	self:addTradeFlags(RecipeDB, 57443, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 57443,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 57443, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Dalaran Clam Chowder -- 58065
 	AddRecipe(58065, 350, 43268, R_COMMON, GAME_WOTLK, 350, 350, 382, 415)
 	self:addTradeFlags(RecipeDB, 58065, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 58065,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 58065,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Tasty Cupcake -- 58512
 	AddRecipe(58512, 350, 43490, R_UNCOMMON, GAME_WOTLK, 350, 350, 357, 365)
 	self:addTradeFlags(RecipeDB, 58512, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58512,7,2)
+	self:addTradeAcquire(RecipeDB, 58512, A_WORLD_DROP, R_UNCOMMON)

 	-- Last Week's Mammoth -- 58521
 	AddRecipe(58521, 350, 43488, R_UNCOMMON, GAME_WOTLK, 350, 350, 357, 365)
 	self:addTradeFlags(RecipeDB, 58521, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58521,7,2)
+	self:addTradeAcquire(RecipeDB, 58521, A_WORLD_DROP, R_UNCOMMON)

 	-- Bad Clams -- 58523
 	AddRecipe(58523, 350, 43491, R_UNCOMMON, GAME_WOTLK, 350, 350, 357, 365)
 	self:addTradeFlags(RecipeDB, 58523, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58523,7,2)
+	self:addTradeAcquire(RecipeDB, 58523, A_WORLD_DROP, R_UNCOMMON)

 	-- Haunted Herring -- 58525
 	AddRecipe(58525, 350, 43492, R_UNCOMMON, GAME_WOTLK, 350, 350, 357, 365)
 	self:addTradeFlags(RecipeDB, 58525, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58525,7,2)
+	self:addTradeAcquire(RecipeDB, 58525, A_WORLD_DROP, R_UNCOMMON)

 	-- Gigantic Feast -- 58527
 	AddRecipe(58527, 425, 43478, R_UNCOMMON, GAME_WOTLK, 425, 425, 450, 475)
 	self:addTradeFlags(RecipeDB, 58527, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58527,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 58527, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Small Feast -- 58528
 	AddRecipe(58528, 425, 43480, R_UNCOMMON, GAME_WOTLK, 425, 425, 450, 475)
 	self:addTradeFlags(RecipeDB, 58528, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 58528,2,31031,2,31032)
+	self:addTradeAcquire(RecipeDB, 58528, A_VENDOR, 31031, A_VENDOR, 31032)

 	-- Dig Rat Stew -- 6417
 	AddRecipe(6417, 90, 44977, R_COMMON, GAME_WOTLK, 90, 130, 150, 170)
 	self:addTradeFlags(RecipeDB, 6417, F_ALLIANCE, F_HORDE, F_VENDOR, F_QUEST, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 6417, A_QUEST, 862,2,3392)
+	self:addTradeAcquire(RecipeDB, 6417, A_QUEST, 862, A_VENDOR, 3392)

 	-- Black Jelly -- 64358
 	AddRecipe(64358, 400, 45932, R_COMMON, GAME_WOTLK, 400, 400, 412, 425)
 	self:addTradeFlags(RecipeDB, 64358, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 64358,1,26905,1,26953,1,26972,1,26989,1,28705,1,
-	29631,1,33587)
+	self:addTradeAcquire(RecipeDB, 64358,1,26905,1,26953,1,26972,1,26989,1,28705,1,29631,1,33587)

 	-- Clamlette Magnifique -- 64054
 	AddRecipe(64054, 250, 33004, R_COMMON, GAME_WOTLK, 250, 250, 275, 300)
@@ -952,32 +891,32 @@ function addon:InitCooking(RecipeDB)
 	-- Pumpkin Pie -- 62044
 	AddRecipe(62044, 45, 44839, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 62044, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 62044,5,5)
+	self:addTradeAcquire(RecipeDB, 62044, A_SEASONAL, 5)

 	-- Slow-Roasted Turkey -- 62045
 	AddRecipe(62045, 45, 44839, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 62045, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP, F_DPS)
-	self:addTradeAcquire(RecipeDB, 62045,5,5)
+	self:addTradeAcquire(RecipeDB, 62045, A_SEASONAL, 5)

 	-- Cranberry Chutney -- 62049
 	AddRecipe(62049, 25, 44840, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 62049, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 62049,5,5)
+	self:addTradeAcquire(RecipeDB, 62049, A_SEASONAL, 5)

 	-- Spice Bread Stuffing -- 62050
 	AddRecipe(62050, 75, 44837, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 62050, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOE)
-	self:addTradeAcquire(RecipeDB, 62050,5,5)
+	self:addTradeAcquire(RecipeDB, 62050, A_SEASONAL, 5)

 	-- Candied Yam -- 62051
 	AddRecipe(62051, 45, 44839, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 62051, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP)
-	self:addTradeAcquire(RecipeDB, 62051,5,5)
+	self:addTradeAcquire(RecipeDB, 62051, A_SEASONAL, 5)

 	-- Bread of the Dead -- 65454
 	AddRecipe(65454, 45, 46691, R_COMMON, GAME_WOTLK)
 	self:addTradeFlags(RecipeDB, 65454, F_ALLIANCE, F_HORDE, F_SEASONAL, F_IBOE, F_RBOP, F_HEALER, F_CASTER)
-	self:addTradeAcquire(RecipeDB, 65454,5,6)
+	self:addTradeAcquire(RecipeDB, 65454, A_SEASONAL, 6)

 	return num_recipes

diff --git a/RecipeDB/ARL-FirstAid.lua b/RecipeDB/ARL-FirstAid.lua
index dc3abb5..cf80bdb 100644
--- a/RecipeDB/ARL-FirstAid.lua
+++ b/RecipeDB/ARL-FirstAid.lua
@@ -1,162 +1,208 @@
---[[
-
-************************************************************************
-
-ARL-FirstAid.lua
-
-First Aid data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
-
-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
-
-local initialized	= false
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-FirstAid.lua
+-- First Aid data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------
+
+local MODNAME = "Ackis Recipe List"
+local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+
+--------------------------------------------------------------------------------------------------------------------
+-- Item "rarity"
+--------------------------------------------------------------------------------------------------------------------
+local R_COMMON, R_UNCOMMON, R_RARE, R_EPIC, R_LEGENDARY, R_ARTIFACT = 1, 2, 3, 4, 5, 6
+
+--------------------------------------------------------------------------------------------------------------------
+-- Origin
+--------------------------------------------------------------------------------------------------------------------
+local GAME_ORIG, GAME_TBC, GAME_WOTLK = 0, 1, 2
+
+--------------------------------------------------------------------------------------------------------------------
+-- Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ALLIANCE, F_HORDE, F_TRAINER, F_VENDOR, F_INSTANCE, F_RAID = 1, 2, 3, 4, 5, 6
+local F_SEASONAL, F_QUEST, F_PVP, F_WORLD_DROP, F_MOB_DROP, F_DISC = 7, 8, 9, 10, 11, 12
+local F_DK, F_DRUID, F_HUNTER, F_MAGE, F_PALADIN, F_PRIEST, F_SHAMAN, F_ROGUE, F_WARLOCK, F_WARRIOR = 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
+local F_IBOE, F_IBOP, F_IBOA, F_RBOE, F_RBOP, F_RBOA = 36, 37, 38, 40, 41, 42
+local F_DPS, F_TANK, F_HEALER, F_CASTER = 51, 52, 53, 54
+local F_CLOTH, F_LEATHER, F_MAIL, F_PLATE, F_CLOAK, F_TRINKET, F_RING, F_NECK, F_SHIELD = 56, 57, 58, 59, 60, 61, 62, 63, 64
+local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69, 70, 71, 72
+local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80
+
+--------------------------------------------------------------------------------------------------------------------
+-- Reputation Filter flags
+--------------------------------------------------------------------------------------------------------------------
+local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
+local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
+local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
+local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
+local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
+local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
+local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
+
+--------------------------------------------------------------------------------------------------------------------
+-- Acquire types
+--------------------------------------------------------------------------------------------------------------------
+local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8
+
+--------------------------------------------------------------------------------------------------------------------
+-- Reputation Acquire Flags
+--------------------------------------------------------------------------------------------------------------------
+local R_ARGENTDAWNT = 529
+
+--------------------------------------------------------------------------------------------------------------------
+-- Reputation Levels
+--------------------------------------------------------------------------------------------------------------------
+local FRIENDLY = 1
+local HONORED = 2
+local REVERED = 3
+local EXALTED = 4
+
+local initialized = false
+local num_recipes = 0

 function addon:InitFirstAid(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID, Skill, ItemID, Rarity, Game, Orange, Yellow, Green, Gray)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, Skill, ItemID, Rarity, 45542, nil, Game, Orange, Yellow, Green, Gray)
+	end
+
 	-- Linen Bandage -- 3275
-	self:addTradeSkill(RecipeDB,3275,1,1251,1,45542,nil,GAME_ORIG,1,30,45,60)
-	self:addTradeFlags(RecipeDB,3275,1,2,3,36,41)
-	self:addTradeAcquire(RecipeDB,3275,8,8)
+	AddRecipe(3275,1,1251, R_COMMON, GAME_ORIG,1,30,45,60)
+	self:addTradeFlags(RecipeDB,3275, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
+	self:addTradeAcquire(RecipeDB,3275, A_CUSTOM, 8)

 	-- Heavy Linen Bandage -- 3276
-	self:addTradeSkill(RecipeDB,3276,40,2581,1,45542,nil,GAME_ORIG,40,50,75,100)
-	self:addTradeFlags(RecipeDB,3276,1,2,3,36,41)
+	AddRecipe(3276,40,2581, R_COMMON, GAME_ORIG,40,50,75,100)
+	self:addTradeFlags(RecipeDB,3276, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,3276,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Wool Bandage -- 3277
-	self:addTradeSkill(RecipeDB,3277,80,3530,1,45542,nil,GAME_ORIG,0,80,115,150)
-	self:addTradeFlags(RecipeDB,3277,1,2,3,36,41)
+	AddRecipe(3277,80,3530, R_COMMON, GAME_ORIG,80,80,115,150)
+	self:addTradeFlags(RecipeDB,3277, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,3277,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Heavy Wool Bandage -- 3278
-	self:addTradeSkill(RecipeDB,3278,115,3531,1,45542,nil,GAME_ORIG,0,115,150,185)
-	self:addTradeFlags(RecipeDB,3278,1,2,3,36,41)
+	AddRecipe(3278,115,3531, R_COMMON, GAME_ORIG,115,115,150,185)
+	self:addTradeFlags(RecipeDB,3278, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,3278,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Silk Bandage -- 7928
-	self:addTradeSkill(RecipeDB,7928,150,6450,1,45542,nil,GAME_ORIG,0,150,180,210)
-	self:addTradeFlags(RecipeDB,7928,1,2,3,36,41)
+	AddRecipe(7928,150,6450, R_COMMON, GAME_ORIG,150,150,180,210)
+	self:addTradeFlags(RecipeDB,7928, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,7928,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Heavy Silk Bandage -- 7929
-	self:addTradeSkill(RecipeDB,7929,180,6451,1,45542,nil,GAME_ORIG,0,180,210,240)
-	self:addTradeFlags(RecipeDB,7929,1,2,3,36,40)
+	AddRecipe(7929,180,6451, R_COMMON, GAME_ORIG,180,180,210,240)
+	self:addTradeFlags(RecipeDB,7929, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOE)
 	self:addTradeAcquire(RecipeDB,7929,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,1,4211,
 	1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,1,17424,
 	1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Anti-Venom -- 7934
-	self:addTradeSkill(RecipeDB,7934,80,6452,1,45542,nil,GAME_ORIG,0,80,115,150)
-	self:addTradeFlags(RecipeDB,7934,1,2,3,36,41)
+	AddRecipe(7934,80,6452, R_COMMON, GAME_ORIG,80,80,115,150)
+	self:addTradeFlags(RecipeDB,7934, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOE)
 	self:addTradeAcquire(RecipeDB,7934,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,1,4211,
 	1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,1,17424,
 	1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Strong Anti-Venom -- 7935
-	self:addTradeSkill(RecipeDB,7935,130,6453,2,45542,nil,GAME_ORIG,0,130,165,200)
-	self:addTradeFlags(RecipeDB,7935,1,2,10,36,40)
-	self:addTradeAcquire(RecipeDB,7935,7,2)
+	AddRecipe(7935,130,6453,2,GAME_ORIG,130,130,165,200)
+	self:addTradeFlags(RecipeDB,7935, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOE)
+	self:addTradeAcquire(RecipeDB,7935, A_WORLD_DROP, R_UNCOMMON)

 	-- Mageweave Bandage -- 10840
-	self:addTradeSkill(RecipeDB,10840,210,8544,1,45542,nil,GAME_ORIG,0,210,240,270)
-	self:addTradeFlags(RecipeDB,10840,1,2,3,36,40)
+	AddRecipe(10840,210,8544, R_COMMON, GAME_ORIG,210,210,240,270)
+	self:addTradeFlags(RecipeDB,10840, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOE)
 	self:addTradeAcquire(RecipeDB,10840,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Heavy Mageweave Bandage -- 10841
-	self:addTradeSkill(RecipeDB,10841,240,8545,1,45542,nil,GAME_ORIG,0,240,270,300)
-	self:addTradeFlags(RecipeDB,10841,1,2,3,36,41)
+	AddRecipe(10841,240,8545, R_COMMON, GAME_ORIG,240,240,270,300)
+	self:addTradeFlags(RecipeDB,10841, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,10841,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Runecloth Bandage -- 18629
-	self:addTradeSkill(RecipeDB,18629,260,14529,1,45542,nil,GAME_ORIG,0,260,290,320)
-	self:addTradeFlags(RecipeDB,18629,1,2,3,36,41)
+	AddRecipe(18629,260,14529, R_COMMON, GAME_ORIG,260,260,290,320)
+	self:addTradeFlags(RecipeDB,18629, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,18629,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Heavy Runecloth Bandage -- 18630
-	self:addTradeSkill(RecipeDB,18630,290,14530,1,45542,nil,GAME_ORIG,0,290,320,350)
-	self:addTradeFlags(RecipeDB,18630,1,2,3,36,41)
+	AddRecipe(18630,290,14530, R_COMMON, GAME_ORIG,290,290,320,350)
+	self:addTradeFlags(RecipeDB,18630, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,18630,1,2326,1,2327,1,2329,1,2798,1,3181,1,3373,
 	1,4211,1,4591,1,5150,1,5759,1,5939,1,5943,1,6094,1,16272,1,16662,1,16731,1,17214,
 	1,17424,1,19184,1,19478,1,22477,1,33589,1,28706,1,33621,1,18991,1,29233,1,18990,1,26956,
 	1,26992,1,23734)

 	-- Powerful Anti-Venom -- 23787
-	self:addTradeSkill(RecipeDB,23787,300,19440,1,45542,nil,GAME_ORIG,0,300,330,360)
-	self:addTradeFlags(RecipeDB,23787,1,2,4,36,41,96)
-	self:addTradeAcquire(RecipeDB,23787,6,529,2,10856,6,529,2,10857,6,529,2,11536)
+	AddRecipe(23787,300,19440, R_COMMON, GAME_ORIG,300,300,330,360)
+	self:addTradeFlags(RecipeDB,23787, F_ALLIANCE, F_HORDE, F_VENDOR, F_IBOE, F_RBOP, F_ARGENTDAWN)
+	self:addTradeAcquire(RecipeDB, 23787, A_REPUTATION, R_ARGENTDAWNT, HONORED, 10856, A_REPUTATION, R_ARGENTDAWNT, HONORED, 10857, A_REPUTATION, R_ARGENTDAWNT, HONORED, 11536)

 	-- Netherweave Bandage -- 27032
-	self:addTradeSkill(RecipeDB,27032,300,21990,1,45542,nil,1,GAME_ORIG,330,347,365)
-	self:addTradeFlags(RecipeDB,27032,1,2,3,36,40)
-	self:addTradeAcquire(RecipeDB,27032,1,33589,1,28706,1,18991,1,29233,1,18990,1,26956,
-	1,26992,1,23734)
+	AddRecipe(27032,300,21990, R_COMMON, GAME_BC,330,330,347,365)
+	self:addTradeFlags(RecipeDB,27032, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOE)
+	self:addTradeAcquire(RecipeDB,27032,1,33589,1,28706,1,18991,1,29233,1,18990,1,26956,1,26992,1,23734)

 	-- Heavy Netherweave Bandage -- 27033
-	self:addTradeSkill(RecipeDB,27033,330,21991,1,45542,nil,1,GAME_ORIG,360,367,375)
-	self:addTradeFlags(RecipeDB,27033,1,2,3,36,40)
-	self:addTradeAcquire(RecipeDB,27033,1,33589,1,28706,1,18991,1,29233,1,18990,1,26956,
-	1,26992,1,23734)
+	AddRecipe(27033,330,21991, R_COMMON, GAME_BC,360,360,367,375)
+	self:addTradeFlags(RecipeDB,27033, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOE)
+	self:addTradeAcquire(RecipeDB,27033,1,33589,1,28706,1,18991,1,29233,1,18990,1,26956,1,26992,1,23734)

 	-- Frostweave Bandage -- 45545
-	self:addTradeSkill(RecipeDB,45545,350,34721,1,45542,nil,2,350,375,392,410)
-	self:addTradeFlags(RecipeDB,45545,1,2,3,36,41)
+	AddRecipe(45545,350,34721, R_COMMON, GAME_WOTLK,350,375,392,410)
+	self:addTradeFlags(RecipeDB,45545, F_ALLIANCE, F_HORDE, F_TRAINER, F_IBOE, F_RBOP)
 	self:addTradeAcquire(RecipeDB,45545,1,23734,1,26956,1,26992,1,28706,1,29233,1,33589)

 	-- Heavy Frostweave Bandage -- 45546
-	self:addTradeSkill(RecipeDB,45546,400,34722,2,45542,nil,2,GAME_ORIG,400,430,470)
-	self:addTradeFlags(RecipeDB,45546,1,2,10,36,41)
-	self:addTradeAcquire(RecipeDB,45546,7,2)
+	AddRecipe(45546,400,34722, R_UNCOMMON, GAME_WOTLK,400,400,430,470)
+	self:addTradeFlags(RecipeDB,45546, F_ALLIANCE, F_HORDE, F_WORLD_DROP, F_IBOE, F_RBOP)
+	self:addTradeAcquire(RecipeDB,45546, A_WORLD_DROP, R_UNCOMMON)

-	return 17
+	return num_recipes

 end
diff --git a/RecipeDB/ARL-Runeforge.lua b/RecipeDB/ARL-Runeforge.lua
index a9a5e3c..cabb66b 100644
--- a/RecipeDB/ARL-Runeforge.lua
+++ b/RecipeDB/ARL-Runeforge.lua
@@ -1,34 +1,22 @@
---[[
-
-************************************************************************
-
-ARL-Runeforge.lua
-
-Runeforging data for all of Ackis Recipe List
-
-************************************************************************
-
-File date: @file-date-iso@
-File revision: @file-revision@
-Project revision: @project-revision@
-Project version: @project-version@
-
-************************************************************************
-
-Please see http://www.wowace.com/projects/arl/for more information.
-
-License:
-	Please see LICENSE.txt
-
-This source code is released under All Rights Reserved.
-
-************************************************************************
-
-]]--
+--------------------------------------------------------------------------------------------------------------------
+-- ARL-Runeforge.lua
+-- Runeforging data for all of Ackis Recipe List
+--------------------------------------------------------------------------------------------------------------------
+-- File date: @file-date-iso@
+-- File revision: @file-revision@
+-- Project revision: @project-revision@
+-- Project version: @project-version@
+--------------------------------------------------------------------------------------------------------------------
+-- Please see http://www.wowace.com/projects/arl/for more information.
+--------------------------------------------------------------------------------------------------------------------
+-- License:
+-- Please see LICENSE.txt
+-- This source code is released under All Rights Reserved.
+--------------------------------------------------------------------------------------------------------------------

-local MODNAME		= "Ackis Recipe List"
-local addon		= LibStub("AceAddon-3.0"):GetAddon(MODNAME)
-local L			= LibStub("AceLocale-3.0"):GetLocale(MODNAME)
+local MODNAME = "Ackis Recipe List"
+local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME)
+local L	= LibStub("AceLocale-3.0"):GetLocale(MODNAME)

 --------------------------------------------------------------------------------------------------------------------
 -- Item "rarity"
@@ -53,90 +41,74 @@ local F_1H, F_2H, F_AXE, F_SWORD, F_MACE, F_POLEARM, F_DAGGER = 66, 67, 68, 69,
 local F_STAFF, F_WAND, F_THROWN, F_BOW, F_XBOW, F_AMMO, F_FIST, F_GUN = 73, 74, 75, 76, 77, 78, 79, 80

 --------------------------------------------------------------------------------------------------------------------
--- Reputation Filter flags
---------------------------------------------------------------------------------------------------------------------
-local F_ARGENTDAWN, F_CENARION_CIRCLE, F_THORIUM_BROTHERHOOD, F_TIMBERMAW_HOLD, F_ZANDALAR = 96, 97, 98, 99, 100
-local F_ALDOR, F_ASHTONGUE, F_CENARION_EXPEDITION, F_HELLFIRE, F_CONSORTIUM = 101, 102, 103, 104, 105
-local F_KOT, F_LOWERCITY, F_NAGRAND, F_SCALE_SANDS, F_SCRYER, F_SHATAR = 106, 107, 108, 109, 110
-local F_SHATTEREDSUN, F_SPOREGGAR, F_VIOLETEYE = 111, 112, 113, 114
-local F_ARGENTCRUSADE, F_FRENZYHEART, F_EBONBLADE, F_KIRINTOR, F_HODIR = 115, 116, 117, 118, 119
-local F_KALUAK, F_ORACLES, F_WYRMREST, F_WRATHCOMMON1, F_WRATHCOMMON2 = 120, 121, 122, 123, 124
-local F_WRATHCOMMON3, F_WRATHCOMMON4, F_WRATHCOMMON5 = 125, 126, 127
-
---------------------------------------------------------------------------------------------------------------------
 -- Acquire types
 --------------------------------------------------------------------------------------------------------------------
 local A_TRAINER, A_VENDOR, A_MOB, A_QUEST, A_SEASONAL, A_REPUTATION, A_WORLD_DROP, A_CUSTOM = 1, 2, 3, 4, 5, 6, 7, 8

---------------------------------------------------------------------------------------------------------------------
--- Reputation Acquire Flags
---------------------------------------------------------------------------------------------------------------------
-local R_WINTERSPRING = 589
-
---------------------------------------------------------------------------------------------------------------------
--- Reputation Levels
---------------------------------------------------------------------------------------------------------------------
-local FRIENDLY = 1
-local HONORED = 2
-local REVERED = 3
-local EXALTED = 4
-
+local initialized = false
+local num_recipes = 0

-local initialized	= false
-
-function addon:InitRuneforging(RecipeDB)
+function addon:InitFirstAid(RecipeDB)

 	if initialized then
-		return
+		return num_recipes
 	end

 	initialized = true

+	--------------------------------------------------------------------------------------------------------------------
+	-- Counter and wrapper function
+	--------------------------------------------------------------------------------------------------------------------
+	local function AddRecipe(SpellID)
+		num_recipes = num_recipes + 1
+		self:addTradeSkill(RecipeDB, SpellID, 1, nil, R_COMMON, 53428, nil, GAME_WOTLK, 1, 1, 1, 1)
+	end
+
 	-- Rune of the Fallen Crusader - 53344
-	self:addTradeSkill(RecipeDB,53344,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53344,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53344,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53344)
+	self:addTradeFlags(RecipeDB,53344, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53344, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Swordshattering - 53323
-	self:addTradeSkill(RecipeDB,53323,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53323,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53323,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53323)
+	self:addTradeFlags(RecipeDB,53323, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53323, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Swordbreaking - 54446
-	self:addTradeSkill(RecipeDB,54446,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,54446,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,54446,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(54446)
+	self:addTradeFlags(RecipeDB,54446, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,54446, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Spellshattering - 53342
-	self:addTradeSkill(RecipeDB,53342,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53342,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53342,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53342)
+	self:addTradeFlags(RecipeDB,53342, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53342, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Spellbreaking - 54447
-	self:addTradeSkill(RecipeDB,54447,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,54447,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,54447,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(54447)
+	self:addTradeFlags(RecipeDB,54447, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,54447, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Razorice - 53343
-	self:addTradeSkill(RecipeDB,53343,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53343,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53343,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53343)
+	self:addTradeFlags(RecipeDB,53343, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53343, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Lichbane - 53331
-	self:addTradeSkill(RecipeDB,53331,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53331,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53331,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53331)
+	self:addTradeFlags(RecipeDB,53331, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53331, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of Cinderglacier - 53341
-	self:addTradeSkill(RecipeDB,53341,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,53341,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,53341,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(53341)
+	self:addTradeFlags(RecipeDB,53341, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,53341, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

 	-- Rune of the Stoneskin Gargoyle - 62158
-	self:addTradeSkill(RecipeDB,62158,1,nil,1,53428,2,1,1,1,2)
-	self:addTradeFlags(RecipeDB,62158,1,2,3,F_DK)
-	self:addTradeAcquire(RecipeDB,62158,1,29194,1,29196,1,29195,1,31084)
+	AddRecipe(62158)
+	self:addTradeFlags(RecipeDB,62158, F_ALLIANCE, F_HORDE, F_TRAINER, F_DK, F_2H, F_RBOP, F_IBOP)
+	self:addTradeAcquire(RecipeDB,62158, A_TRAINER, 29194, A_TRAINER, 29196, A_TRAINER, 29195, A_TRAINER, 31084)

-	return 9
+	return num_recipes

 end