From 85bf7bf6f5b9896c792cdbb378fc29cef921f458 Mon Sep 17 00:00:00 2001
From: ackis <ackis@dummy.example.com>
Date: Sun, 7 Dec 2008 20:48:41 +0000
Subject: [PATCH] Make vendor, trainer, etc info be based off of babble boss,
 etc

---
 ARLDataminer.rb         |   82 ++++++++++++++++-------------------------------
 RecipeDB/ARL-Vendor.lua |    2 +-
 2 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index e661edc..1dcdbd9 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -1031,63 +1031,39 @@ EOF
 			x = x.to_s[0..4]
 			y = y.to_s[0..4]
 
-			# Don't care about faction information for Monsters
-			if type == "Monster"
-
-				# Assumption that ID and Name will always be around
-				lookup_lua.print("self:addLookupList(#{db},#{k},")
-
-				if $bosslist.include?(v[:name])
-					lookup_lua.print("BBOSS[\"#{v[:name]}\"],")
-					$localstring.delete(v[:name])
-				else
+			# Assumption that ID and Name will always be around
+			lookup_lua.print("self:addLookupList(#{db},#{k},")
 
-					lookup_lua.print("L[\"#{v[:name]}\"],")
-					# Add the name to the list of localization strings
-					$localstring << v[:name]
-				end
-
-				if locs.keys[0]
-					lookup_lua.print("BZONE[\"#{locs.keys[0]}\"],")
-				else
-					if $bosszonemap[v[:name]]
-						lookup_lua.print("BZONE[\"#{$bosszonemap[v[:name]]}\"],")
-					else
-						lookup_lua.print("L[\"Unknown Zone\"],")
-						$unknownzone << v[:name]
-					end
-				end
-
-				if x and y
-					lookup_lua.print("#{x},#{y})")
-				else
-					lookup_lua.print("0,0)")
-				end
-				lookup_lua.print("\n")
+			if $bosslist.include?(v[:name])
+				lookup_lua.print("BBOSS[\"#{v[:name]}\"],")
+				$localstring.delete(v[:name])
 			else
+				lookup_lua.print("L[\"#{v[:name]}\"],")
+				# Add the name to the list of localization strings
+				$localstring << v[:name]
+			end
 
-				# Assumption that ID and Name will always be around
-				lookup_lua.print("self:addLookupList(#{db},#{k},L[\"#{v[:name]}\"],")
-
-				if locs.keys[0]
-					lookup_lua.print("BZONE[\"#{locs.keys[0]}\"],")
+			if locs.keys[0]
+				lookup_lua.print("BZONE[\"#{locs.keys[0]}\"],")
+			else
+				if $bosszonemap[v[:name]]
+					lookup_lua.print("BZONE[\"#{$bosszonemap[v[:name]]}\"],")
 				else
-					if $bosszonemap[v[:name]]
-						lookup_lua.print("BZONE[\"#{$bosszonemap[v[:name]]}\"],")
-						locs.keys[0] = $bosszonemap[v[:name]]
-					else
-						lookup_lua.print("L[\"Unknown Zone\"],")
-						locs.keys[0] = "Unknown Zone"
-						$unknownzone << v[:name]
-					end
+					lookup_lua.print("L[\"Unknown Zone\"],")
+					$unknownzone << v[:name]
 				end
+			end
 
-				if x and y
-					lookup_lua.print("#{x},#{y},")
-				else
-					lookup_lua.print("0,0,")
-				end
+			if x and y
+				lookup_lua.print("#{x},#{y})")
+			else
+				lookup_lua.print("0,0")
+			end
 
+			# Don't care about faction information for Monsters
+			if type == "Monster"
+				lookup_lua.print(")")
+			else
 				if v[:faction]
 					lookup_lua.print("#{v[:faction]})")
 				else
@@ -1098,14 +1074,10 @@ EOF
 						$unknownfaction << "#{v[:name]} - #{locs.keys[0]}"
 					end
 				end
-
-				lookup_lua.print("\n")
-
 				# Add the name to the list of localization strings
 				$localstring << v[:name]
-
 			end
-
+			lookup_lua.print("\n")
 		end
 
 	end
diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua
index 2f3f337..14beff8 100644
--- a/RecipeDB/ARL-Vendor.lua
+++ b/RecipeDB/ARL-Vendor.lua
@@ -198,7 +198,7 @@ function addon:InitVendor(VendorDB)
 	self:addLookupList(VendorDB,8679,L["Knaz Blunderflame"],BZONE["Stranglethorn Vale"],50.78,34.87,0)
 	self:addLookupList(VendorDB,8681,L["Outfitter Eric"],BZONE["Ironforge"],43.62,29.74,1)
 	self:addLookupList(VendorDB,8878,L["Muuran"],BZONE["Desolace"],55.95,57.00,2)
-	self:addLookupList(VendorDB,9499,L["Plugger Spazzring"],BZONE["Blackrock Depths"],0,0,0)
+	self:addLookupList(VendorDB,9499,BBOSS["Plugger Spazzring"],BZONE["Blackrock Depths"],0,0,0)
 	self:addLookupList(VendorDB,9544,L["Yuka Screwspigot"],BZONE["Burning Steppes"],65.80,22.21,0)
 	self:addLookupList(VendorDB,9636,L["Kireena"],BZONE["Desolace"],50.98,53.56,2)
 	self:addLookupList(VendorDB,10118,L["Nessa Shadowsong"],BZONE["Teldrassil"],56.91,92.33,1)
-- 
1.7.9.5