Quantcast

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

John Pasula [02-08-11 - 18:26]
Merge branch 'master' of git.wowace.com:wow/arl/mainline
Filename
Database/Cooking.lua
Database/Inscription.lua
Database/Vendor.lua
Locales/devel-enUS.lua
diff --git a/Database/Cooking.lua b/Database/Cooking.lua
index ab725f9..b506e06 100644
--- a/Database/Cooking.lua
+++ b/Database/Cooking.lua
@@ -359,8 +359,8 @@ function addon:InitCooking()

 	-- Spotted Yellowtail -- 18238
 	AddRecipe(18238, 225, 6887, Q.COMMON, V.ORIG, 225, 250, 262, 275)
-	self:AddRecipeFlags(18238, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(18238, A.CUSTOM, 48)
+	self:AddRecipeFlags(18238, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
+	self:AddRecipeTrainer(18238, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Cooked Glossy Mightfish -- 18239
 	AddRecipe(18239, 225, 13927, Q.COMMON, V.ORIG, 225, 250, 262, 275)
@@ -369,8 +369,8 @@ function addon:InitCooking()

 	-- Grilled Squid -- 18240
 	AddRecipe(18240, 240, 13928, Q.COMMON, V.ORIG, 240, 265, 277, 290)
-	self:AddRecipeFlags(18240, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.IBOE, F.RBOE, F.DPS)
-	self:AddRecipeAcquire(18240, A.CUSTOM, 48)
+	self:AddRecipeFlags(18240, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.DPS)
+	self:AddRecipeTrainer(18240, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Filet of Redgill -- 18241
 	AddRecipe(18241, 225, 13930, Q.COMMON, V.ORIG, 225, 250, 262, 275)
@@ -384,13 +384,13 @@ function addon:InitCooking()

 	-- Nightfin Soup -- 18243
 	AddRecipe(18243, 250, 13931, Q.COMMON, V.ORIG, 250, 275, 285, 295)
-	self:AddRecipeFlags(18243, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
-	self:AddRecipeAcquire(18243, A.CUSTOM, 48)
+	self:AddRecipeFlags(18243, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE, F.HEALER, F.CASTER)
+	self:AddRecipeTrainer(18243, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Poached Sunscale Salmon -- 18244
 	AddRecipe(18244, 250, 13932, Q.COMMON, V.ORIG, 250, 275, 285, 295)
-	self:AddRecipeFlags(18244, F.ALLIANCE, F.HORDE, F.VENDOR, F.RETIRED, F.IBOE, F.RBOE)
-	self:AddRecipeAcquire(18244, A.CUSTOM, 48)
+	self:AddRecipeFlags(18244, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOE)
+	self:AddRecipeTrainer(18244, 1355, 4210, 19369, 16719, 3399, 19185, 8306, 5482, 16676, 1430, 18988, 4552, 3026, 16253, 18987, 1699, 16277, 3067, 18993, 6286, 1382, 17246, 5159, 3087)

 	-- Lobster Stew -- 18245
 	AddRecipe(18245, 275, 13933, Q.COMMON, V.ORIG, 275, 300, 312, 325)
diff --git a/Database/Inscription.lua b/Database/Inscription.lua
index 8083cec..881f370 100644
--- a/Database/Inscription.lua
+++ b/Database/Inscription.lua
@@ -2146,7 +2146,7 @@ function addon:InitInscription()
 	-- Glyph of Colossus Smash -- 89815
 	AddRecipe(89815, 430, 63481, Q.COMMON, V.CATA, 430, 430, 435, 440)
 	self:AddRecipeFlags(89815, F.VENDOR, F.RBOE, F.IBOE, F.ALLIANCE, F.HORDE, F.WARRIOR)
-	self:AddRecipeVendor(89815, 28723)
+	self:AddRecipeVendor(89815, 49703, 50248)

 	-- Vanishing Powder -- 92026
 	AddRecipe(92026, 75, 64670, Q.COMMON, V.CATA, 75, 90, 100, 110)
@@ -2378,9 +2378,9 @@ function addon:InitInscription()
 	self:AddRecipeTrainer(86615, 30713, 30717, 30715, 30706, 30711, 46716, 28702)

 	-- Glyph of Dark Succor -- 96284
-	--AddRecipe(96284, 525, 68793, Q.COMMON, V.CATA, 525, 525, 530, 535)
-	--self:AddRecipeFlags(96284, F.TRAINER, F.RBOE, F.IBOE, F.ALLIANCE, F.HORDE)
-	--self:AddRecipeTrainer(96284, 30713, 30717, 30715, 30706, 30711, 46716, 28702)
+	AddRecipe(96284, 275, 68793, Q.COMMON, V.CATA, 275, 280, 287, 295)
+	self:AddRecipeFlags(96284, F.TRAINER, F.RBOE, F.IBOE, F.ALLIANCE, F.HORDE)
+	self:AddRecipeTrainer(96284, 30713, 30717, 30715, 30706, 30711, 46716, 28702)

 	return num_recipes
 end
diff --git a/Database/Vendor.lua b/Database/Vendor.lua
index d88cb66..c48a16c 100644
--- a/Database/Vendor.lua
+++ b/Database/Vendor.lua
@@ -389,10 +389,12 @@ function addon:InitVendor(DB)
 	AddVendor(37687,	L["Alchemist Finklestein"],		BZ["Icecrown Citadel"],		   0,	 0, NEUTRAL)
 	AddVendor(40160,	L["Frozo the Renowned"],		BZ["Dalaran"],			41.0, 28.5, NEUTRAL)
 	AddVendor(49701,	L["Bario Matalli"],			BZ["Stormwind City"], 		50.9, 71.4, ALLIANCE)
+	AddVendor(49703,	L["Casandra Downs"],			BZ["Twilight Highlands"],	78.6, 76.2, ALLIANCE)
 	AddVendor(49737,	L["Shazdar"],				BZ["Orgrimmar"],		57.2, 62.0, HORDE)
 	AddVendor(50134,	L["Senthii"],				BZ["Twilight Highlands"],	78.7, 77.0, ALLIANCE)
 	AddVendor(50146,	L["Agatian Fallanos"],			BZ["Twilight Highlands"],	76.7, 49.5, HORDE)
 	AddVendor(50172,	L["Threm Blackscalp"],			BZ["Twilight Highlands"],	75.2, 50.1, HORDE)
+	AddVendor(50248,	L["Una Kobuna"],			BZ["Twilight Highlands"],	76.6, 49.4, HORDE)
 	AddVendor(50375,	L["Kuldar Steeltooth"],			BZ["Twilight Highlands"],	77.3, 53.1, HORDE)
 	AddVendor(50381,	L["Misty Merriweather"],			BZ["Twilight Highlands"],	78.8, 76.2, ALLIANCE)
 	AddVendor(50382,	L["Brundall Chiselgut"],			BZ["Twilight Highlands"],	79.1, 76.5, ALLIANCE)
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index 95dfbf2..2175b84 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -28,7 +28,7 @@ if not L then return end
 L["Profile"]			= true

 -------------------------------------------------------------------------------
--- Config Options
+-- Config Options
 -------------------------------------------------------------------------------
 L["About"]			= true
 L["Main Options"]		= true
@@ -664,6 +664,7 @@ L["Captured Gnome"] = true
 L["Carolai Anise"] = true
 L["Carter Tiffens"] = true
 L["Caryssia Moonhunter"] = true
+L["Casandra Downs"] = true
 L["Catarina Stanford"] = true
 L["Catherine Leland"] = true
 L["Celie Steelwing"] = true
@@ -1357,6 +1358,7 @@ L["Tunkk"] = true
 L["Twilight Fire Guard"] = true
 L["Ulthir"] = true
 L["Una"] = true
+L["Una Kobuna"] = true
 L["Unchained Doombringer"] = true
 L["Uriku"] = true
 L["Uthok"] = true