Quantcast

Dataminer updates

Ackis [11-19-08 - 19:00]
Dataminer updates
Filename
ARLDataminer.rb
RecipeDB/ARL-Alchemy.lua
RecipeDB/ARL-Enchant.lua
diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index 3747fc6..22d0d70 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -331,7 +331,6 @@ EOF
 				if details[:learned] == 1

 					flags << 1 << 2
-					proflua.puts("\t-- Default profession that you learn when picking up a profession, no reason to get acquire information for it.")

 				else

@@ -534,6 +533,7 @@ EOF
 							acquire << {"type" => 3, "id" => npc[:id]}
 							$monsters[npc[:id]] = {:name => npc[:name]}

+							# The NPC has a location mined
 							if npc[:locs]

 								npc[:locs].each do |loc|
@@ -558,9 +558,57 @@ EOF

 								end

+							# There was no NPC location mined
 							else

-								proflua.puts "\t-- No location information"
+								# The NPC has been manually added to our list
+								if $bosszonemap[npc[:name]]
+
+									found = false
+
+									# Go through all the dungeons
+									$dungeons.each_pair do |id,dname|
+
+										if dname == $bosszonemap[npc[:name]]
+
+											flags << 5
+											proflua.puts "\t-- Instance: #{dname}"
+											found = true
+											$instancemobs << npc[:name]
+
+										end
+
+									end
+
+									if not found
+
+										# Go through all the raids
+										$raids.each_pair do |id,dname|
+
+											if dname == $bosszonemap[npc[:name]]
+
+												flags << 6
+												proflua.puts "\t-- Raid: #{dname}"
+												found = true
+												$instancemobs << npc[:name]
+
+											end
+
+										end
+
+									end
+
+									if not found
+
+										flags << 11
+
+									end
+
+								else
+
+									proflua.puts "\t-- No location information"
+
+								end

 							end

@@ -1264,15 +1312,17 @@ EOF

 						lookup_lua.print("1)")

+					elsif $factionmap[k]
+
+						lookup_lua.print("#{$factionmap[k]})")
+
 					else

 						lookup_lua.print("0)")
+						$unknownfaction << "#{v[:name]} - #{locs.keys[0]}"

 					end

-					$unknownfaction << "#{v[:name]} - #{locs.keys[0]}"
-					#$unknownfaction << v[:name]
-
 				end

 				lookup_lua.print("\n")
@@ -2031,23 +2081,48 @@ $bosszonemap = {
 	"Zulian Tiger" => "Zul'Gurub",
 }

+# Alliance = 1
+# Horde = 2
+$factionmap = {
+	"Wild Hearts" => "2",
+}
+
 $hordefactionlist = ["Thunder Bluff","Orgrimmar","Durotar","Undercity","Mulgore"]

 $alliancefactionlist = ["Stormwind City","Darnassus","Ironforge","Westfall"]

-$debug = false
+$debug = true

 if $debug

 	create_custom_db()
 	create_faction_db()

-	runeforging = recipes.get_runeforging_list
-	runeforgingspecaillist = {
+	alchemy = recipes.get_alchemy_list
+	alchspeciallist = {
+		28580 => {:id => 12, :type => [3]},
+		28581 => {:id => 12, :type => [3]},
+		28582 => {:id => 12, :type => [3]},
+		28583 => {:id => 12, :type => [3]},
+		28584 => {:id => 12, :type => [3]},
+		28585 => {:id => 12, :type => [3]},
+		28586 => {:id => 12, :type => [2]},
+		28587 => {:id => 12, :type => [1]},
+		28588 => {:id => 12, :type => [1]},
+		28589 => {:id => 12, :type => [1]},
+		28590 => {:id => 12, :type => [1]},
+		28591 => {:id => 12, :type => [1]},
+		41458 => {:id => 12, :type => [4]},
+		41500 => {:id => 12, :type => [4]},
+		41501 => {:id => 12, :type => [4]},
+		41502 => {:id => 12, :type => [4]},
+		41503 => {:id => 12, :type => [4]},
+		21923 => {:id => 7, :type => 1},
+		47050 => {:id => "meleedps"},
 		}
-	runeforgingmanual=<<EOF
+	alchmanual=<<EOF
 EOF
-	create_profession_db("./RecipeDB/ARL-Runeforge.lua","Runeforging",recipes,maps,"InitRuneforging",runeforging,[],runeforgingspecaillist,runeforgingmanual)
+	create_profession_db("./RecipeDB/ARL-Alchemy.lua","Alchemy",recipes,maps,"InitAlchemy",alchemy,[2336,6619,11447,17579,22430],alchspeciallist,alchmanual)

 	#create_stats_list()

@@ -2066,6 +2141,9 @@ else

 	alchemy = recipes.get_alchemy_list
 	alchspeciallist = {
+		2329 => {:id => "Trainer"},
+		2330 => {:id => "Trainer"},
+		2333 => {:id => "Trainer"},
 		28580 => {:id => 12, :type => [3]},
 		28581 => {:id => 12, :type => [3]},
 		28582 => {:id => 12, :type => [3]},
@@ -2092,6 +2170,9 @@ EOF

 	blacksmithing = recipes.get_blacksmithing_list
 	bsspeciallist = {
+		2660 => {:id => "Trainer"},
+		2663 => {:id => "Trainer"},
+		3115 => {:id => "Trainer"},
 		21913 => {:id => 7, :type => 1},
 		}
 	bsmanual=<<EOF
@@ -2115,6 +2196,9 @@ EOF

 	cooking = recipes.get_cooking_list
 	cookingspeciallist = {
+		2538 => {:id => "Trainer"},
+		2540 => {:id => "Trainer"},
+		8604 => {:id => "Trainer"},
 		21143 => {:id => 7, :type => 1},
 		21144 => {:id => 7, :type => 1},
 		45022 => {:id => 7, :type => 1},
@@ -2136,19 +2220,13 @@ EOF
 		46578 => {:id => 7, :type => 4}
 		}
 	enchantmanual=<<EOF
-	-- Enchant Chest - Major Health -- 20026
-	-- Trainer
-	-- Flags: All classes, Item BoE, Recipe BoE,
-	-- Item Stats:
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB, 20026, 255, nil, 1, 7411)
-	self:addTradeFlags(RecipeDB, 20026, 1,2,4,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB, 20026, 2, 11189)
 EOF
 	create_profession_db("./RecipeDB/ARL-Enchant.lua","Enchanting",recipes,maps,"InitEnchanting",enchanting,[22434,28021],enchantingspeciallist,enchantmanual)

 	eng = recipes.get_engineering_list
 	engspecaillist = {
+		3918 => {:id => "Trainer"},
+		3919 => {:id => "Trainer"},
 		21940 => {:id => 7, :type => 1},
 		26416 => {:id => 7, :type => 2},
 		26417 => {:id => 7, :type => 2},
@@ -2203,7 +2281,6 @@ EOF
 		30570 => {:id => "specialty", :type => 20219},
 		}
 	engmanual=<<EOF
-
 EOF
 	create_profession_db("./RecipeDB/ARL-Engineer.lua","Engineering",recipes,maps,"InitEngineering",eng,[30343,30342,30349,30561,30549,12722,12720,12900,12719,12904],engspecaillist,engmanual)

@@ -2233,27 +2310,18 @@ EOF

 	leatherworking = recipes.get_leatherworking_list
 	lwspecaillist = {
+		2149 => {:id => "Trainer"},
+		2152 => {:id => "Trainer"},
 		21943 => {:id => 7, :type => 1},
 		44953 => {:id => 7, :type => 1}
 		}
 	lwmanual=<<EOF
-	-- Bracers of Shackled Souls -- 52733
-	-- Ashtongue Deathsworn - Friendly
-	-- Raid: 3959 - Black Temple
-	-- Vendor
-	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
-	-- Item Stats:
-	-- Item Stats: val30id3val400id6val40id36
-	recipecount = recipecount + 1
-	self:addTradeSkill(RecipeDB, 52733, 375, 32399, 1, 2108)
-	self:addTradeFlags(RecipeDB, 52733, 1,2,4,6,21,22,23,24,25,26,27,28,29,30,36,41,47,58,102)
-	self:addTradeAcquire(RecipeDB, 52733, 6, 1012, 1, 23159)
-
 EOF
 	create_profession_db("./RecipeDB/ARL-Leatherwork.lua","Leatherworking",recipes,maps,"InitLeatherworking",leatherworking,[8195,15141,10550,19106,40000],lwspecaillist,lwmanual)

 	smelting = recipes.get_mining_list
 	smeltingspecaillist = {
+		2657 => {:id => "Trainer"},
 		}
 	smeltmanual=<<EOF
 EOF
@@ -2261,6 +2329,8 @@ EOF

 	tailoring = recipes.get_tailoring_list
 	tailoringspecaillist = {
+		2385 => {:id => "Trainer"},
+		2387 => {:id => "Trainer"},
 		}
 	tailoringmanual=<<EOF
 EOF
diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua
index 81a0938..322c56e 100644
--- a/RecipeDB/ARL-Alchemy.lua
+++ b/RecipeDB/ARL-Alchemy.lua
@@ -287,7 +287,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Item Stats:
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB, 4508,50,4596,2,2259)
-	self:addTradeFlags(RecipeDB, 4508,8,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB, 4508,2,8,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB, 4508,4, 429)

 	-- Lesser Stoneshield Potion -- 4942
@@ -589,9 +589,8 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 11467,1, 1386, 1, 7948, 1, 16588, 1, 18802, 1, 19052)

 	-- Elixir of Dream Vision -- 11468
-	-- Instance: 1477 - type1maxlevel55category3territory1nameThe Temple of Atal'Hakkarminlevel50id1477
+	-- Instance: 1477 - The Temple of Atal'Hakkar
 	-- Raid: 2159 - Onyxia's Lair
-	-- No location information
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -764,7 +763,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17559,6, 529, 2, 10856, 6, 529, 2, 10857, 6, 529, 2, 11536)

 	-- Transmute: Fire to Earth -- 17560
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -793,7 +792,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17562,2, 11278)

 	-- Transmute: Undeath to Water -- 17563
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -812,7 +811,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17564,3, 6518)

 	-- Transmute: Life to Earth -- 17565
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -868,8 +867,8 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17573,1, 1386, 1, 7948, 1, 16588, 1, 18802, 1, 19052)

 	-- Greater Fire Protection Potion -- 17574
-	-- Instance: 1583 - type1maxlevel60category3territory1nameBlackrock Spireminlevel58id1583
-	-- Instance: 1583 - type1maxlevel60category3territory1nameBlackrock Spireminlevel58id1583
+	-- Instance: 1583 - Blackrock Spire
+	-- Instance: 1583 - Blackrock Spire
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -924,7 +923,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- No acquire information

 	-- Major Mana Potion -- 17580
-	-- Instance: 2057 - type1maxlevel60category3territory1nameScholomanceminlevel58id2057
+	-- Instance: 2057 - Scholomance
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
@@ -1075,7 +1074,7 @@ function addon:InitAlchemy(RecipeDB)

 	-- Transmute: Elemental Fire -- 25146
 	-- Thorium Brotherhood - Friendly
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1310,8 +1309,8 @@ function addon:InitAlchemy(RecipeDB)
 	-- No acquire information

 	-- Major Fire Protection Potion -- 28571
-	-- Instance: 3849 - type5category3territory1expansion1nameTempest Keep: The Mechanarminlevel70id3849
-	-- Instance: 3849 - type5category3territory1expansion1nameTempest Keep: The Mechanarminlevel70id3849
+	-- Instance: 3849 - Tempest Keep: The Mechanar
+	-- Instance: 3849 - Tempest Keep: The Mechanar
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1321,7 +1320,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 28571,3, 19168, 3, 19221)

 	-- Major Frost Protection Potion -- 28572
-	-- Instance: 3792 - type5maxlevel66category3territory1expansion1nameAuchindoun: Mana-Tombsminlevel64id3792
+	-- Instance: 3792 - Auchindoun: Mana-Tombs
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1377,7 +1376,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- No acquire information

 	-- Ironshield Potion -- 28579
-	-- Instance: 2367 - type5maxlevel68category3territory1expansion1nameCaverns of Time: Old Hillsbrad Foothillsminlevel66id2367
+	-- Instance: 2367 - Caverns of Time: Old Hillsbrad Foothills
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index c36db1d..6863f66 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -565,7 +565,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 13687,7, 2)

 	-- Enchant Shield - Lesser Block -- 13689
-	-- Instance: 796 - type1maxlevel45category3territory4nameScarlet Monasteryminlevel34id796
+	-- Instance: 796 - Scarlet Monastery
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -738,8 +738,8 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 13890,1, 11072, 1, 11073, 1, 11074, 1, 19250, 1, 19251)

 	-- Enchant Weapon - Fiery Weapon -- 13898
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
+	-- Instance: 1584 - Blackrock Depths
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -786,7 +786,6 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Shield - Frost Resistance -- 13933
 	-- Raid: 2159 - Onyxia's Lair
-	-- No location information
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -850,8 +849,8 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 13945,7, 2)

 	-- Enchant Gloves - Riding Skill -- 13947
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
+	-- Instance: 1584 - Blackrock Depths
 	-- Raid: 2159 - Onyxia's Lair
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
@@ -911,8 +910,8 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 14810,1, 11072, 1, 11073, 1, 11074, 1, 19250, 1, 19251)

 	-- Smoking Heart of the Mountain -- 15596
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
+	-- Instance: 1584 - Blackrock Depths
 	-- Mob Drop
 	-- Flags: All classes, Item BoP, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -1022,13 +1021,13 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20016,1, 11073, 1, 19251)

 	-- Enchant Shield - Greater Stamina -- 20017
-	-- Trainer
+	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB, 20017,265,nil, 1,7411)
-	self:addTradeFlags(RecipeDB, 20017,3,21,22,23,24,25,26,27,28,29,30,36,41)
-	-- No acquire information
+	self:addTradeFlags(RecipeDB, 20017,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41)
+	self:addTradeAcquire(RecipeDB, 20017,2, 4229)

 	-- Enchant Boots - Greater Stamina -- 20020
 	-- World Drop
@@ -1095,8 +1094,8 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20029,3, 7444, 3, 7448, 3, 7524)

 	-- Enchant 2H Weapon - Superior Impact -- 20030
-	-- Instance: 1583 - type1maxlevel60category3territory1nameBlackrock Spireminlevel58id1583
-	-- Instance: 1583 - type1maxlevel60category3territory1nameBlackrock Spireminlevel58id1583
+	-- Instance: 1583 - Blackrock Spire
+	-- Instance: 1583 - Blackrock Spire
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1106,7 +1105,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20030,3, 10317, 3, 10366)

 	-- Enchant Weapon - Superior Striking -- 20031
-	-- Instance: 1583 - type1maxlevel60category3territory1nameBlackrock Spireminlevel58id1583
+	-- Instance: 1583 - Blackrock Spire
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1116,7 +1115,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20031,3, 9216)

 	-- Enchant Weapon - Lifestealing -- 20032
-	-- Instance: 2057 - type1maxlevel60category3territory1nameScholomanceminlevel58id2057
+	-- Instance: 2057 - Scholomance
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1126,7 +1125,6 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20032,3, 10499)

 	-- Enchant Weapon - Unholy Weapon -- 20033
-	-- No location information
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1145,8 +1143,8 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20034,3, 4494, 3, 9451)

 	-- Enchant 2H Weapon - Major Spirit -- 20035
-	-- Instance: 2057 - type1maxlevel60category3territory1nameScholomanceminlevel58id2057
-	-- Instance: 2057 - type1maxlevel60category3territory1nameScholomanceminlevel58id2057
+	-- Instance: 2057 - Scholomance
+	-- Instance: 2057 - Scholomance
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1156,13 +1154,12 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20035,3, 10469, 3, 10477)

 	-- Enchant 2H Weapon - Major Intellect -- 20036
-	-- No location information
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB, 20036,300,nil, 2,7411)
-	self:addTradeFlags(RecipeDB, 20036,1,2,21,22,23,24,25,26,27,28,29,30,36,40)
+	self:addTradeFlags(RecipeDB, 20036,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
 	self:addTradeAcquire(RecipeDB, 20036,3, 10422)

 	-- Runed Arcanite Rod -- 20051
@@ -1216,7 +1213,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22750,3, 11982, 3, 11988, 3, 12056, 3, 12057, 3, 12118, 3, 12259, 3, 12264)

 	-- Enchant Weapon - Strength -- 23799
-	-- Instance: 1584 - type1maxlevel60category3territory1nameBlackrock Depthsminlevel55id1584
+	-- Instance: 1584 - Blackrock Depths
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1286,7 +1283,6 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Gloves - Shadow Power -- 25073
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1302,8 +1298,6 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Gloves - Frost Power -- 25074
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1321,10 +1315,6 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Gloves - Fire Power -- 25078
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
-	-- No location information
-	-- No location information
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1355,10 +1345,6 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Gloves - Superior Agility -- 25080
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
-	-- No location information
-	-- No location information
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1393,8 +1379,6 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Cloak - Stealth -- 25083
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1421,8 +1405,6 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Cloak - Dodge -- 25086
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
-	-- No location information
-	-- No location information
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Raid: 3428 - Ahn'Qiraj
@@ -1557,7 +1539,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27913,7, 2)

 	-- Enchant Bracer - Fortitude -- 27914
-	-- Instance: 3715 - type5category3territory1expansion1nameCoilfang Reservoir: The Steamvaultminlevel70id3715
+	-- Instance: 3715 - Coilfang Reservoir: The Steamvault
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1629,7 +1611,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27944,1, 18753, 1, 18773, 1, 19252, 1, 19540)

 	-- Enchant Shield - Intellect -- 27945
-	-- Instance: 2367 - type5maxlevel68category3territory1expansion1nameCaverns of Time: Old Hillsbrad Foothillsminlevel66id2367
+	-- Instance: 2367 - Caverns of Time: Old Hillsbrad Foothills
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1666,7 +1648,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27948,7, 2)

 	-- Enchant Boots - Fortitude -- 27950
-	-- Instance: 3792 - type5maxlevel66category3territory1expansion1nameAuchindoun: Mana-Tombsminlevel64id3792
+	-- Instance: 3792 - Auchindoun: Mana-Tombs
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1676,7 +1658,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27950,3, 18317)

 	-- Enchant Boots - Dexterity -- 27951
-	-- Instance: 3790 - type5maxlevel67category3territory1expansion1nameAuchindoun: Auchenai Cryptsminlevel65id3790
+	-- Instance: 3790 - Auchindoun: Auchenai Crypts
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1761,7 +1743,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27968,3, 20136)

 	-- Enchant 2H Weapon - Savagery -- 27971
-	-- Instance: 3714 - type5category3territory1expansion1nameHellfire Citadel: The Shattered Hallsminlevel70id3714
+	-- Instance: 3714 - Hellfire Citadel: The Shattered Halls
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1789,7 +1771,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27975,3, 22242, 3, 23385)

 	-- Enchant 2H Weapon - Major Agility -- 27977
-	-- Instance: 3848 - type5category3territory1expansion1nameTempest Keep: The Arcatrazminlevel70id3848
+	-- Instance: 3848 - Tempest Keep: The Arcatraz
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1832,10 +1814,9 @@ function addon:InitEnchanting(RecipeDB)
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3717 - type5maxlevel64category3territory1expansion1nameCoilfang Reservoir: The Slave Pensminlevel62id3717
-	-- Instance: 3789 - type5category3territory1expansion1nameAuchindoun: Shadow Labrynthminlevel70id3789
-	-- Instance: 3789 - type5category3territory1expansion1nameAuchindoun: Shadow Labrynthminlevel70id3789
-	-- No location information
+	-- Instance: 3717 - Coilfang Reservoir: The Slave Pens
+	-- Instance: 3789 - Auchindoun: Shadow Labrynth
+	-- Instance: 3789 - Auchindoun: Shadow Labrynth
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1846,8 +1827,8 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Weapon - Battlemaster -- 28004
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3562 - type5maxlevel62category3territory1expansion1nameHellfire Citadel: Hellfire Rampartsminlevel60id3562
-	-- Instance: 3791 - type5maxlevel69category3territory1expansion1nameAuchindoun: Sethekk Hallsminlevel67id3791
+	-- Instance: 3562 - Hellfire Citadel: Hellfire Ramparts
+	-- Instance: 3791 - Auchindoun: Sethekk Halls
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -2090,7 +2071,7 @@ function addon:InitEnchanting(RecipeDB)
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3847 - type5category3territory1expansion1nameTempest Keep: The Botanicaminlevel70id3847
+	-- Instance: 3847 - Tempest Keep: The Botanica
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -2102,8 +2083,8 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Boots - Boar's Speed -- 34008
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3716 - type5maxlevel65category3territory1expansion1nameCoilfang Reservoir: The Underbogminlevel63id3716
-	-- Instance: 3849 - type5category3territory1expansion1nameTempest Keep: The Mechanarminlevel70id3849
+	-- Instance: 3716 - Coilfang Reservoir: The Underbog
+	-- Instance: 3849 - Tempest Keep: The Mechanar
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -2595,13 +2576,12 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 46594,6, 1077, 2, 25032)

 	-- Enchant Cloak - Steelweave -- 47051
-	-- No location information
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
 	recipecount = recipecount + 1
 	self:addTradeSkill(RecipeDB, 47051,375,nil, 3,7411)
-	self:addTradeFlags(RecipeDB, 47051,1,2,21,22,23,24,25,26,27,28,29,30,36,41,47,63)
+	self:addTradeFlags(RecipeDB, 47051,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,47,63)
 	self:addTradeAcquire(RecipeDB, 47051,3, 24560)

 	-- Enchant Cloak - Mighty Armor -- 47672