Quantcast

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

John Pasula [02-01-11 - 16:14]
Merge branch 'master' of git.wowace.com:wow/arl/mainline
Filename
Database/Blacksmithing.lua
Database/FirstAid.lua
Database/Leatherworking.lua
Database/Tailoring.lua
Database/Trainer.lua
Locales/devel-enUS.lua
diff --git a/Database/Blacksmithing.lua b/Database/Blacksmithing.lua
index f07261d..3b5be86 100644
--- a/Database/Blacksmithing.lua
+++ b/Database/Blacksmithing.lua
@@ -2867,7 +2867,7 @@ function addon:InitBlacksmithing()
 	self:AddRecipeVendor(94732, 50382, 50375)

 	-- Bloodied Pyrium Shoulders -- 76461
-	AddRecipe(76461, 520, nil, Q.COMMON, V.CATA, 525, 530, 532, 535)
+	AddRecipe(76461, 520, nil, Q.COMMON, V.CATA, 520, 530, 532, 535)
 	self:AddRecipeFlags(76461, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP)
 	self:AddRecipeVendor(76461, 50382, 50375)

diff --git a/Database/FirstAid.lua b/Database/FirstAid.lua
index 553e65f..9e9789e 100644
--- a/Database/FirstAid.lua
+++ b/Database/FirstAid.lua
@@ -134,7 +134,7 @@ function addon:InitFirstAid()
 	AddRecipe(45546, 400, 34722, Q.UNCOMMON, V.WOTLK, 400, 400, 430, 470)
 	self:AddRecipeFlags(45546, F.ALLIANCE, F.HORDE, F.TRAINER, F.WORLD_DROP, F.IBOE, F.RBOP)
 	self:AddRecipeWorldDrop(45546, "Northrend")
-	self:AddRecipeTrainer(74556, 28706, 45540)
+	self:AddRecipeTrainer(45546, 28706, 45540)

 	-- Embersilk Bandage -- 74556
 	AddRecipe(74556, 425, 34722, Q.COMMON, V.CATA, 425, 450, 467, 485)
diff --git a/Database/Leatherworking.lua b/Database/Leatherworking.lua
index 3e98dcb..3a66ccd 100644
--- a/Database/Leatherworking.lua
+++ b/Database/Leatherworking.lua
@@ -301,7 +301,7 @@ function addon:InitLeatherworking()
 	AddRecipe(6704, 170, 5782, Q.UNCOMMON, V.ORIG, 170, 190, 200, 210)
 	self:AddRecipeFlags(6704, F.ALLIANCE, F.HORDE, F.VENDOR, F.MOB_DROP, F.IBOE, F.RBOE, F.DPS, F.LEATHER)
 	self:AddRecipeMobDrop(6704, 938, 1160)
-	self:AddRecipeLimitedVendor(6704, 2381, 1, 2393, 1, 2846, 1)
+	self:AddRecipeLimitedVendor(6704, 2393, 1, 2846, 1)

 	-- Murloc Scale Bracers -- 6705
 	AddRecipe(6705, 190, 5783, Q.UNCOMMON, V.ORIG, 190, 210, 220, 230)
diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index 40a273d..ab8568a 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -263,7 +263,7 @@ function addon:InitTailoring()
 	-- Icy Cloak -- 3862
 	AddRecipe(3862, 200, 4327, Q.COMMON, V.ORIG, 200, 220, 235, 250)
 	self:AddRecipeFlags(3862, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOAK)
-	self:AddRecipeLimitedVendor(3862, 2381, 1, 6567, 1)
+	self:AddRecipeLimitedVendor(3862, 6567, 1)

 	-- Spider Belt -- 3863
 	AddRecipe(3863, 180, 4328, Q.UNCOMMON, V.ORIG, 180, 200, 215, 230)
diff --git a/Database/Trainer.lua b/Database/Trainer.lua
index 184970b..480eed2 100644
--- a/Database/Trainer.lua
+++ b/Database/Trainer.lua
@@ -371,9 +371,12 @@ function addon:InitTrainer(DB)
 	self:addLookupList(DB, 33681, L["Korim"], BZ["Shattrath City"], 37.6, 28.0, 0)
 	self:addLookupList(DB, 33682, L["Fono"], BZ["Shattrath City"], 36.0, 48.5, 0)
 	self:addLookupList(DB, 33684, L["Weaver Aoa"], BZ["Shattrath City"], 37.6, 27.2, 0)
+	self:addLookupList(DB, 37072, L["Rogg"], BZ["Orgrimmar"], 44.5, 78.0, 2)    -- UPDATED
 	self:addLookupList(DB, 44582, L["Theresa Denman"], BZ["Stormwind City"], 63.5, 61.6, 1)
+	self:addLookupList(DB, 44781, L["Opuno Ironhorn"], BZ["Orgrimmar"], 40.6, 49.4, 2)   -- UPDATED
 	self:addLookupList(DB, 44783, L["Hiwahi Three-Feathers"], BZ["Orgrimmar"], 38.8, 50.5, 2)
 	self:addLookupList(DB, 45540, L["Krenk Choplimb"], BZ["Orgrimmar"], 37.5, 87.3, 2)
+	self:addLookupList(DB, 45548, L["Kark Helmbreaker"], BZ["Orgrimmar"], 36.0, 83.0, 2)  -- UPDATED
 	self:addLookupList(DB, 45559, L["Nivi Weavewell"], BZ["Orgrimmar"], 41.1, 79.7, 2)
 	self:addLookupList(DB, 46675, L["Lugrah"], BZ["Orgrimmar"], 72.5, 34.5, 2)
 	self:addLookupList(DB, 46709, L["Arugi"], BZ["Orgrimmar"], 56.5, 61.5, 2)
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index c9870bf..80b147d 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -977,6 +977,7 @@ L["Kalinda"] = true
 L["Kanaria"] = true
 L["Kania"] = true
 L["Karaaz"] = true
+L["Kark Helmbreaker"] = true
 L["Karn Stonehoof"] = true
 L["Karolek"] = true
 L["Katherine Lee"] = true
@@ -1162,6 +1163,7 @@ L["Oluros"] = true
 L["Onodo"] = true
 L["Onslaught Mason"] = true
 L["Ontuvo"] = true
+L["Opuno Ironhorn"] = true
 L["Orland Schaeffer"] = true
 L["Orn Tenderhoof"] = true
 L["Otho Moji'ko"] = true
@@ -1210,6 +1212,7 @@ L["Ribbly's Crony"] = true
 L["Rift Keeper"] = true
 L["Rift Lord"] = true
 L["Rikqiz"] = true
+L["Rogg"] = true
 L["Rogvar"] = true
 L["Rohok"] = true
 L["Rollick MacKreel"] = true