Quantcast

More cleanup.

pompachomp [07-26-09 - 09:21]
More cleanup.
(Please don't file tickets about missing locale entries.)
Filename
Locals/testenUS.lua
RecipeDB/ARL-Alchemy.lua
RecipeDB/ARL-Blacksmith.lua
RecipeDB/ARL-Enchant.lua
RecipeDB/ARL-Jewelcraft.lua
RecipeDB/ARL-Leatherwork.lua
RecipeDB/ARL-Mob.lua
RecipeDB/ARL-Tailor.lua
diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua
index 816fa30..0127931 100644
--- a/Locals/testenUS.lua
+++ b/Locals/testenUS.lua
@@ -510,7 +510,6 @@ L["Andrew Hilbert"] = true
 L["Andrion Darkspinner"] = true
 L["Androd Fadran"] = true
 L["Anger Guard"] = true
-L["Angerclaw Grizzly"] = true
 L["Anguished Dead"] = true
 L["Anguished Highborne"] = true
 L["Annora"] = true
@@ -518,7 +517,6 @@ L["Anub'ar Guardian"] = true
 L["Anub'ar Prime Guard"] = true
 L["Anub'ar Venomancer"] = true
 L["Anvilrage Captain"] = true
-L["Anvilrage Enforcer"] = true
 L["Anvilrage Marshal"] = true
 L["Apothecary Antonivich"] = true
 L["Apothecary Bressa"] = true
@@ -637,7 +635,6 @@ L["Carter Tiffens"] = true
 L["Caryssia Moonhunter"] = true
 L["Catarina Stanford"] = true
 L["Catherine Leland"] = true
-L["Cave Yeti"] = true
 L["Celie Steelwing"] = true
 L["Centipaar Sandreaver"] = true
 L["Charles Worth"] = true
@@ -683,6 +680,7 @@ L["Corruption"] = true
 L["Costly Menace"] = true
 L["Crazed Ancient"] = true
 L["Crazed Murkblood Foreman"] = true
+L["Crazed Murkblood Miner"] = true
 L["Crazk Sparks"] = true
 L["Crimson Inquisitor"] = true
 L["Crimson Sorcerer"] = true
@@ -725,14 +723,11 @@ L["Dark Iron Tunneler"] = true
 L["Dark Iron Watchman"] = true
 L["Dark Screecher"] = true
 L["Dark Strand Voidcaller"] = true
-L["Darkspine Myrmidon"] = true
-L["Darkspine Siren"] = true
 L["Darkwater Crocolisk"] = true
 L["Darmari"] = true
 L["Darnall"] = true
 L["Daryl Riknussun"] = true
 L["Daryl Stack"] = true
-L["Dawnblade Marksman"] = true
 L["Deadwind Warlock"] = true
 L["Deadwood Shaman"] = true
 L["Dealer Malij"] = true
@@ -795,7 +790,6 @@ L["Eclipsion Blood Knight"] = true
 L["Eclipsion Bloodwarder"] = true
 L["Eclipsion Cavalier"] = true
 L["Eclipsion Centurion"] = true
-L["Eclipsion Dragonhawk"] = true
 L["Eclipsion Soldier"] = true
 L["Eclipsion Spellbinder"] = true
 L["Edna Mullby"] = true
@@ -824,7 +818,6 @@ L["Enchanter Salias"] = true
 L["Enchantress Metura"] = true
 L["Enchantress Volali"] = true
 L["Engineer Sinbei"] = true
-L["Enraged Crusher"] = true
 L["Enraged Mammoth"] = true
 L["Eorain Dawnstrike"] = true
 L["Eredar Deathbringer"] = true
@@ -835,6 +828,7 @@ L["Erin Kelly"] = true
 L["Ethereal Priest"] = true
 L["Ethereal Spellbinder"] = true
 L["Ethereal Thief"] = true
+L["Ethereum Jailor"] = true
 L["Ethereum Nullifier"] = true
 L["Ethereum Smuggler"] = true
 L["Eunice Burch"] = true
@@ -851,10 +845,8 @@ L["Felannia"] = true
 L["Felguard Annihilator"] = true
 L["Felicia Doan"] = true
 L["Felika"] = true
-L["Felpaw Ravager"] = true
 L["Fendrig Redbeard"] = true
 L["Fera Palerunner"] = true
-L["Ferocious Yeti"] = true
 L["Feruul"] = true
 L["Festive Recipes"] = true
 L["Feyden Darkin"] = true
@@ -973,7 +965,6 @@ L["Himmik"] = true
 L["Homunculus"] = true
 L["Horns of Frenzy"] = true
 L["Hotoppik Copperpinch"] = true
-L["Hulking Mountain Lion"] = true
 L["Humphry"] = true
 L["Hurnak Grimmord"] = true
 L["Ice Thistle Matriarch"] = true
@@ -982,7 +973,6 @@ L["Ice Thistle Yeti"] = true
 L["Icemane Yeti"] = true
 L["Ildine Sorrowspear"] = true
 L["Illidari Defiler"] = true
-L["Illidari Shocktrooper"] = true
 L["Illidari Watcher"] = true
 L["Imperial Plate Belt"] = true
 L["Imperial Plate Boots"] = true
@@ -991,7 +981,6 @@ L["Imperial Plate Chest"] = true
 L["Imperial Plate Helm"] = true
 L["Imperial Plate Leggings"] = true
 L["Imperial Plate Shoulders"] = true
-L["Incendosaur"] = true
 L["Indormi"] = true
 L["Innkeeper Biribi"] = true
 L["Innkeeper Fizzgrimble"] = true
@@ -1004,7 +993,6 @@ L["Ironwool Mammoth"] = true
 L["Jabbey"] = true
 L["Jack Trapper"] = true
 L["Jadefire Rogue"] = true
-L["Jaedenar Warlock"] = true
 L["Jalane Ayrole"] = true
 L["James Van Brunt"] = true
 L["Jamesina Watterly"] = true
@@ -1197,9 +1185,7 @@ L["Mukdrak"] = true
 L["Mumman"] = true
 L["Murk Spitter"] = true
 L["Murk Worm"] = true
-L["Murkblood Putrifier"] = true
 L["Murkblood Raider"] = true
-L["Mutant Horror"] = true
 L["Muuran"] = true
 L["Mycah"] = true
 L["Mythrin'dir"] = true
@@ -1301,7 +1287,6 @@ L["Recipe of the Kaldorei"] = true
 L["Redridge Goulash"] = true
 L["Refik"] = true
 L["Rhiannon Davis"] = true
-L["Rhonsus"] = true
 L["Ribbly's Crony"] = true
 L["Rift Keeper"] = true
 L["Rift Lord"] = true
@@ -1398,7 +1383,6 @@ L["Skettis Soulcaller"] = true
 L["Skreah"] = true
 L["Skullsplitter Mystic"] = true
 L["Slagg"] = true
-L["Slave Worker"] = true
 L["Slavering Ghoul"] = true
 L["Smelt On, Smelt Off"] = true
 L["Smith Argus"] = true
@@ -1481,7 +1465,6 @@ L["Tatiana"] = true
 L["Teg Dawnstrider"] = true
 L["Tel'Athir"] = true
 L["Telonis"] = true
-L["Tempered War Golem"] = true
 L["Tepa"] = true
 L["Terrormaster"] = true
 L["Thaddeus Webb"] = true
@@ -1539,10 +1522,8 @@ L["Trixie Quikswitch"] = true
 L["True Believers"] = true
 L["Truk Wildbeard"] = true
 L["Tunkk"] = true
-L["Twilight Dark Shaman"] = true
 L["Twilight Emissary"] = true
 L["Twilight Fire Guard"] = true
-L["Twilight Geomancer"] = true
 L["Ug'thok"] = true
 L["Ulthaan"] = true
 L["Ulthir"] = true
@@ -1583,7 +1564,6 @@ L["Voidwalker Minion"] = true
 L["Volchan"] = true
 L["Vosur Brakthel"] = true
 L["Waldor"] = true
-L["Warmaul Shaman"] = true
 L["Warped Peon"] = true
 L["Wastewander Assassin"] = true
 L["Wastewander Bandit"] = true
@@ -1617,8 +1597,6 @@ L["Wolgren Jinglepocket"] = true
 L["Wrahk"] = true
 L["Wrath Hammer Construct"] = true
 L["Wrathwalker"] = true
-L["Wretched Devourer"] = true
-L["Wretched Fiend"] = true
 L["Wulan"] = true
 L["Wulmort Jinglepocket"] = true
 L["Wunna Darkmane"] = true
diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua
index 7069972..e455b88 100644
--- a/RecipeDB/ARL-Alchemy.lua
+++ b/RecipeDB/ARL-Alchemy.lua
@@ -604,7 +604,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Elixir of Greater Firepower -- 26277
 	self:addTradeSkill(RecipeDB,26277,250,21546,2,51304,nil,0,250,265,285,305)
 	self:addTradeFlags(RecipeDB,26277,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,26277,3,5843,3,5844,3,5846,3,8637,3,9318)
+	self:addTradeAcquire(RecipeDB,26277,3,5844,3,5846,3,8637)

 	-- Elixir of Camouflage -- 28543
 	self:addTradeSkill(RecipeDB,28543,305,22823,1,51304,nil,1,305,320,327,335)
@@ -874,7 +874,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- Fel Mana Potion -- 38961
 	self:addTradeSkill(RecipeDB,38961,360,31677,3,51304,nil,1,360,375,377,380)
 	self:addTradeFlags(RecipeDB,38961,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41)
-	self:addTradeAcquire(RecipeDB,38961,3,19792,3,19795,3,19796,3,19806,3,20502,3,22016,3,22017,3,22018,3,22076,3,22093)
+	self:addTradeAcquire(RecipeDB,38961,3,19792,3,19795,3,19796,3,19806,3,22016,3,22017,3,22018,3,22076,3,22093)

 	-- Fel Regeneration Potion -- 38962
 	self:addTradeSkill(RecipeDB,38962,345,31676,3,51304,nil,1,345,360,367,375)
diff --git a/RecipeDB/ARL-Blacksmith.lua b/RecipeDB/ARL-Blacksmith.lua
index 980acd4..8b588d8 100644
--- a/RecipeDB/ARL-Blacksmith.lua
+++ b/RecipeDB/ARL-Blacksmith.lua
@@ -1478,7 +1478,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Ragesteel Gloves -- 29642
 	self:addTradeSkill(RecipeDB,29642,365,23520,3,2018,nil,1)
 	self:addTradeFlags(RecipeDB,29642,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
-	self:addTradeAcquire(RecipeDB,29642,3,17136,3,18062)
+	self:addTradeAcquire(RecipeDB,29642,3,17136)

 	-- Ragesteel Helm -- 29643
 	self:addTradeSkill(RecipeDB,29643,365,23521,3,2018,nil,1)
@@ -1488,7 +1488,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Ragesteel Breastplate -- 29645
 	self:addTradeSkill(RecipeDB,29645,370,23522,3,2018,nil,1)
 	self:addTradeFlags(RecipeDB,29645,1,2,11,21,22,23,24,25,26,27,28,29,30,36,41,59)
-	self:addTradeAcquire(RecipeDB,29645,3,21454,3,23305)
+	self:addTradeAcquire(RecipeDB,29645,3,21454,3,23305,3,23324)

 	-- Swiftsteel Gloves -- 29648
 	self:addTradeSkill(RecipeDB,29648,370,23526,3,2018,nil,1)
@@ -1558,7 +1558,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Felsteel Longblade -- 29692
 	self:addTradeSkill(RecipeDB,29692,365,23540,4,2018,nil,1)
 	self:addTradeFlags(RecipeDB,29692,1,2,6,11,21,22,23,24,25,26,27,28,29,30,36,40,69)
-	self:addTradeAcquire(RecipeDB,29692,3,16492,3,16524,3,25060,3,25073)
+	self:addTradeAcquire(RecipeDB,29692,7,2)

 	-- Khorium Champion -- 29693
 	self:addTradeSkill(RecipeDB,29693,365,23541,4,2018,nil,1)
@@ -1578,7 +1578,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Runic Hammer -- 29696
 	self:addTradeSkill(RecipeDB,29696,365,23544,4,2018,nil,1)
 	self:addTradeFlags(RecipeDB,29696,1,2,5,6,11,21,22,23,24,25,26,27,28,29,30,36,40,63,70)
-	self:addTradeAcquire(RecipeDB,29696,3,16409,3,16539,3,17957,3,25060)
+	self:addTradeAcquire(RecipeDB,29696,7,2)

 	-- Fel Hardened Maul -- 29697
 	self:addTradeSkill(RecipeDB,29697,365,23546,4,2018,nil,1)
@@ -1593,7 +1593,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Dirge -- 29699
 	self:addTradeSkill(RecipeDB,29699,365,23555,4,2018,nil,1)
 	self:addTradeFlags(RecipeDB,29699,1,2,5,6,11,21,22,23,24,25,26,27,28,29,30,36,40,63,72)
-	self:addTradeAcquire(RecipeDB,29699,3,16544,3,17840,3,21305)
+	self:addTradeAcquire(RecipeDB,29699,7,2)

 	-- Hand of Eternity -- 29700
 	self:addTradeSkill(RecipeDB,29700,365,23556,4,2018,nil,1)
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index 4c2e135..a39578b 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -803,7 +803,7 @@ function addon:InitEnchanting(RecipeDB)
 	-- Enchant Bracer - Major Defense -- 27906
 	self:addTradeSkill(RecipeDB,27906,320,nil,1,7411,nil,1,320,330,345,360)
 	self:addTradeFlags(RecipeDB,27906,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40)
-	self:addTradeAcquire(RecipeDB,27906,3,22822)
+	self:addTradeAcquire(RecipeDB,27906,3,22822,3,23008)

 	-- Enchant Bracer - Superior Healing -- 27911
 	self:addTradeSkill(RecipeDB,27911,325,nil,1,7411,nil,1,325,335,350,365)
diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua
index 81b5389..8355222 100644
--- a/RecipeDB/ARL-Jewelcraft.lua
+++ b/RecipeDB/ARL-Jewelcraft.lua
@@ -1828,7 +1828,7 @@ function addon:InitJewelcrafting(RecipeDB)

 	-- Guardian's Twilight Opal -- 53974
 	self:addTradeSkill(RecipeDB,53974,390,40034,3,25229,nil,2)
-	self:addTradeFlags(RecipeDB,53974,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41,115)
+	self:addTradeFlags(RecipeDB,53974,1,2,4,21,22,23,24,25,26,27,28,29,30,36,41,51,115)
 	self:addTradeAcquire(RecipeDB,53974,6,1106,3,30431)

 	-- Inscribed Monarch Topaz -- 53975
diff --git a/RecipeDB/ARL-Leatherwork.lua b/RecipeDB/ARL-Leatherwork.lua
index f4b68c6..3e60c5b 100644
--- a/RecipeDB/ARL-Leatherwork.lua
+++ b/RecipeDB/ARL-Leatherwork.lua
@@ -587,7 +587,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Comfortable Leather Hat -- 10490
 	self:addTradeSkill(RecipeDB,10490,200,8174,3,2108,nil,0)
 	self:addTradeFlags(RecipeDB,10490,1,2,5,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
-	self:addTradeAcquire(RecipeDB,10490,3,2249,3,4852)
+	self:addTradeAcquire(RecipeDB,10490,7,2)

 	-- Nightscape Tunic -- 10499
 	self:addTradeSkill(RecipeDB,10499,205,8175,1,2108,nil,0)
@@ -930,7 +930,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Living Leggings -- 19078
 	self:addTradeSkill(RecipeDB,19078,285,15060,3,2108,nil,0)
 	self:addTradeFlags(RecipeDB,19078,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
-	self:addTradeAcquire(RecipeDB,19078,3,7158,3,8957,3,8961)
+	self:addTradeAcquire(RecipeDB,19078,3,7158)

 	-- Stormshroud Armor -- 19079
 	self:addTradeSkill(RecipeDB,19079,285,15056,3,2108,nil,0)
@@ -979,7 +979,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- Frostsaber Gloves -- 19087
 	self:addTradeSkill(RecipeDB,19087,295,15070,2,2108,nil,0)
 	self:addTradeFlags(RecipeDB,19087,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,57)
-	self:addTradeAcquire(RecipeDB,19087,3,7441,3,7444,3,7447,3,7457)
+	self:addTradeAcquire(RecipeDB,19087,3,7441)

 	-- Heavy Scorpid Helm -- 19088
 	self:addTradeSkill(RecipeDB,19088,295,15080,1,2108,nil,0)
diff --git a/RecipeDB/ARL-Mob.lua b/RecipeDB/ARL-Mob.lua
index 67f4c2b..41a311b 100644
--- a/RecipeDB/ARL-Mob.lua
+++ b/RecipeDB/ARL-Mob.lua
@@ -18,7 +18,8 @@ Project version: @project-version@
 Format:

 	self:addLookupList(MobDB,NPC ID, NPC Name, NPC Location, X Coord, Y Coord, Faction)
-
+	the "Faction" parameter isn't used in this specific database
+
 ************************************************************************

 Please see http://www.wowace.com/projects/arl/for more information.
@@ -112,92 +113,69 @@ function addon:InitMob(MobDB)
 	self:addLookupList(MobDB,32290,L["Cult Alchemist"],BZONE["Icecrown"],49.5,33.1)
 	self:addLookupList(MobDB,32297,L["Cult Researcher"],BZONE["Icecrown"],50.7,30.9)
 	self:addLookupList(MobDB,32349,L["Cultist Shard Watcher"],BZONE["Icecrown"],48.1,67.9)
-	-- Isle of Quel'Danas
-	self:addLookupList(MobDB,24960,L["Wretched Devourer"],BZONE["Isle of Quel'Danas"],39.25,35.24)      -- START HERE NEXT TIME
-	self:addLookupList(MobDB,24966,L["Wretched Fiend"],BZONE["Isle of Quel'Danas"],40.24,35.45)
-	self:addLookupList(MobDB,24979,L["Dawnblade Marksman"],BZONE["Isle of Quel'Danas"],41.31,39.07)
-	self:addLookupList(MobDB,25060,L["Darkspine Myrmidon"],BZONE["Isle of Quel'Danas"],61.68,55.13)
-	self:addLookupList(MobDB,25073,L["Darkspine Siren"],BZONE["Isle of Quel'Danas"],61.57,56.10)
 	-- Felwood
 	self:addLookupList(MobDB,7106,L["Jadefire Rogue"],BZONE["Felwood"],37.5,66.5)
-	self:addLookupList(MobDB,7120,L["Jaedenar Warlock"],BZONE["Felwood"],37.66,53.05)
-	self:addLookupList(MobDB,7158,L["Deadwood Shaman"],BZONE["Felwood"],62.72,9.527)
-	self:addLookupList(MobDB,7441,L["Winterfall Totemic"],BZONE["Felwood"],45.41,3.633)
-	self:addLookupList(MobDB,8957,L["Angerclaw Grizzly"],BZONE["Felwood"],56.73,18.08)
-	self:addLookupList(MobDB,8961,L["Felpaw Ravager"],BZONE["Felwood"],57.97,19.05)
+	self:addLookupList(MobDB,7158,L["Deadwood Shaman"],BZONE["Felwood"],62.5,10.3)
+	self:addLookupList(MobDB,7441,L["Winterfall Totemic"],BZONE["Felwood"],41.5,42.7)
 	-- Hillsbrad Foothills
-	self:addLookupList(MobDB,2248,L["Cave Yeti"],BZONE["Hillsbrad Foothills"],45.86,31.21)
-	self:addLookupList(MobDB,2249,L["Ferocious Yeti"],BZONE["Hillsbrad Foothills"],44.35,29.88)
-	self:addLookupList(MobDB,2264,L["Hillsbrad Tailor"],BZONE["Hillsbrad Foothills"],36.31,44.23)
-	self:addLookupList(MobDB,2374,L["Torn Fin Muckdweller"],BZONE["Hillsbrad Foothills"],28.97,70.18)
-	self:addLookupList(MobDB,2375,L["Torn Fin Coastrunner"],BZONE["Hillsbrad Foothills"],30.36,70.82)
-	self:addLookupList(MobDB,2376,L["Torn Fin Oracle"],BZONE["Hillsbrad Foothills"],43.83,67.11)
-	self:addLookupList(MobDB,2377,L["Torn Fin Tidehunter"],BZONE["Hillsbrad Foothills"],44.22,66.96)
-	self:addLookupList(MobDB,2407,L["Hulking Mountain Lion"],BZONE["Hillsbrad Foothills"],39.61,23.08)
-	self:addLookupList(MobDB,14276,L["Scargil"],BZONE["Hillsbrad Foothills"],26.79,70.01)
+	self:addLookupList(MobDB,2264,L["Hillsbrad Tailor"],BZONE["Hillsbrad Foothills"],36.6,44.4)
+	self:addLookupList(MobDB,2374,L["Torn Fin Muckdweller"],BZONE["Hillsbrad Foothills"],31.5,72.1)
+	self:addLookupList(MobDB,2375,L["Torn Fin Coastrunner"],BZONE["Hillsbrad Foothills"],25.1,70.5)
+	self:addLookupList(MobDB,2376,L["Torn Fin Oracle"],BZONE["Hillsbrad Foothills"],42.0,68.0)
+	self:addLookupList(MobDB,2377,L["Torn Fin Tidehunter"],BZONE["Hillsbrad Foothills"],39.0,69.0)
+	self:addLookupList(MobDB,14276,L["Scargil"],BZONE["Hillsbrad Foothills"],26.6,71.2)
 	-- Nagrand
-	self:addLookupList(MobDB,17136,L["Boulderfist Warrior"],BZONE["Nagrand"],44.60,42.20)
-	self:addLookupList(MobDB,17150,L["Vir'aani Arcanist"],BZONE["Nagrand"],36.63,67.87)
-	self:addLookupList(MobDB,18062,L["Enraged Crusher"],BZONE["Nagrand"],50.07,41.26)
-	self:addLookupList(MobDB,18064,L["Warmaul Shaman"],BZONE["Nagrand"],46.18,22.58)
-	self:addLookupList(MobDB,18202,L["Murkblood Putrifier"],BZONE["Nagrand"],32.68,44.54)
-	self:addLookupList(MobDB,18203,L["Murkblood Raider"],BZONE["Nagrand"],32.35,43.26)
+	self:addLookupList(MobDB,17136,L["Boulderfist Warrior"],BZONE["Nagrand"],51.0,57.0)
+	self:addLookupList(MobDB,17150,L["Vir'aani Arcanist"],BZONE["Nagrand"],40.5,69.6)
+	self:addLookupList(MobDB,18203,L["Murkblood Raider"],BZONE["Nagrand"],31.5,43.5)
 	-- Netherstorm
-	self:addLookupList(MobDB,18853,L["Sunfury Bloodwarder"],BZONE["Netherstorm"],25.84,67.81)
-	self:addLookupList(MobDB,18866,L["Mageslayer"],BZONE["Netherstorm"],56.34,88.03)
-	self:addLookupList(MobDB,18870,L["Voidshrieker"],BZONE["Netherstorm"],62.44,39.70)
-	self:addLookupList(MobDB,18872,L["Disembodied Vindicator"],BZONE["Netherstorm"],33.26,54.40)
-	self:addLookupList(MobDB,18873,L["Disembodied Protector"],BZONE["Netherstorm"],33.19,54.82)
-	self:addLookupList(MobDB,22822,L["Ethereum Nullifier"],BZONE["Netherstorm"],63.13,41.34)
-	self:addLookupList(MobDB,19707,L["Sunfury Archer"],BZONE["Netherstorm"],55.99,79.34)
-	self:addLookupList(MobDB,20134,L["Sunfury Arcanist"],BZONE["Netherstorm"],48.82,82.43)
-	self:addLookupList(MobDB,20135,L["Sunfury Arch Mage"],BZONE["Netherstorm"],49.30,83.26)
-	self:addLookupList(MobDB,20136,L["Sunfury Researcher"],BZONE["Netherstorm"],51.06,83.49)
-	self:addLookupList(MobDB,20207,L["Sunfury Bowman"],BZONE["Netherstorm"],58.61,65.00)
-	self:addLookupList(MobDB,20410,L["Rhonsus"],BZONE["Netherstorm"],61.18,85.38)
+	self:addLookupList(MobDB,18853,L["Sunfury Bloodwarder"],BZONE["Netherstorm"],27.0,72.0)
+	self:addLookupList(MobDB,18866,L["Mageslayer"],BZONE["Netherstorm"],55.5,85.5)
+	self:addLookupList(MobDB,18870,L["Voidshrieker"],BZONE["Netherstorm"],60.0,39.0)
+	self:addLookupList(MobDB,18872,L["Disembodied Vindicator"],BZONE["Netherstorm"],36.0,55.5)
+	self:addLookupList(MobDB,18873,L["Disembodied Protector"],BZONE["Netherstorm"],31.8,52.7)
+	self:addLookupList(MobDB,19707,L["Sunfury Archer"],BZONE["Netherstorm"],55.5,81.0)
+	self:addLookupList(MobDB,22822,L["Ethereum Nullifier"],BZONE["Netherstorm"],66.0,49.5)
+	self:addLookupList(MobDB,20134,L["Sunfury Arcanist"],BZONE["Netherstorm"],51.0,82.5)
+	self:addLookupList(MobDB,20135,L["Sunfury Arch Mage"],BZONE["Netherstorm"],46.5,81.0)
+	self:addLookupList(MobDB,20136,L["Sunfury Researcher"],BZONE["Netherstorm"],48.2,82.5)
+	self:addLookupList(MobDB,20207,L["Sunfury Bowman"],BZONE["Netherstorm"],61.5,67.5)
+	self:addLookupList(MobDB,23008,L["Ethereum Jailor"],BZONE["Netherstorm"],58.8,35.6)
 	-- Searing Gorge
-	self:addLookupList(MobDB,5843,L["Slave Worker"],BZONE["Searing Gorge"],40.97,43.80)
-	self:addLookupList(MobDB,5844,L["Dark Iron Slaver"],BZONE["Searing Gorge"],42.39,41.82)
-	self:addLookupList(MobDB,5846,L["Dark Iron Taskmaster"],BZONE["Searing Gorge"],42.11,39.87)
-	self:addLookupList(MobDB,5853,L["Tempered War Golem"],BZONE["Searing Gorge"],64.38,55.70)
-	self:addLookupList(MobDB,5860,L["Twilight Dark Shaman"],BZONE["Searing Gorge"],23.22,36.82)
-	self:addLookupList(MobDB,5861,L["Twilight Fire Guard"],BZONE["Searing Gorge"],23.41,34.50)
-	self:addLookupList(MobDB,5862,L["Twilight Geomancer"],BZONE["Searing Gorge"],24.44,29.17)
-	self:addLookupList(MobDB,8637,L["Dark Iron Watchman"],BZONE["Searing Gorge"],64.45,55.91)
-	self:addLookupList(MobDB,9318,L["Incendosaur"],BZONE["Searing Gorge"],48.76,27.80)
-	self:addLookupList(MobDB,24819,L["Anvilrage Enforcer"],BZONE["Searing Gorge"],16.65,51.04)
-	self:addLookupList(MobDB,9026,BBOSS["Overmaster Pyron"],BZONE["Searing Gorge"],22.20,56.39)
+	self:addLookupList(MobDB,5844,L["Dark Iron Slaver"],BZONE["Searing Gorge"],43.8,33.8)
+	self:addLookupList(MobDB,5846,L["Dark Iron Taskmaster"],BZONE["Searing Gorge"],44.4,41.1)
+	self:addLookupList(MobDB,5861,L["Twilight Fire Guard"],BZONE["Searing Gorge"],25.5,33.8)
+	self:addLookupList(MobDB,8637,L["Dark Iron Watchman"],BZONE["Searing Gorge"],69.3,34.8)
+	self:addLookupList(MobDB,9026,BBOSS["Overmaster Pyron"],BZONE["Searing Gorge"],26.2,74.9)
 	-- Shadowmoon Valley
-	self:addLookupList(MobDB,19740,L["Wrathwalker"],BZONE["Shadowmoon Valley"],24.26,34.55)
-	self:addLookupList(MobDB,19754,L["Deathforge Tinkerer"],BZONE["Shadowmoon Valley"],38.10,41.07)
-	self:addLookupList(MobDB,19755,L["Mo'arg Weaponsmith"],BZONE["Shadowmoon Valley"],23.97,33.58)
-	self:addLookupList(MobDB,19756,L["Deathforge Smith"],BZONE["Shadowmoon Valley"],37.44,41.91)
-	self:addLookupList(MobDB,19768,L["Coilskar Siren"],BZONE["Shadowmoon Valley"],46.42,29.39)
-	self:addLookupList(MobDB,19792,L["Eclipsion Centurion"],BZONE["Shadowmoon Valley"],47.73,65.95)
-	self:addLookupList(MobDB,19795,L["Eclipsion Blood Knight"],BZONE["Shadowmoon Valley"],51.98,61.27)
-	self:addLookupList(MobDB,19796,L["Eclipsion Archmage"],BZONE["Shadowmoon Valley"],47.56,66.23)
-	self:addLookupList(MobDB,19802,L["Illidari Shocktrooper"],BZONE["Shadowmoon Valley"],31.59,50.15)
-	self:addLookupList(MobDB,19806,L["Eclipsion Bloodwarder"],BZONE["Shadowmoon Valley"],47.68,65.21)
-	self:addLookupList(MobDB,19826,L["Dark Conclave Shadowmancer"],BZONE["Shadowmoon Valley"],37.37,31.76)
-	self:addLookupList(MobDB,20502,L["Eclipsion Dragonhawk"],BZONE["Shadowmoon Valley"],48.11,64.68)
-	self:addLookupList(MobDB,20878,L["Deathforge Guardian"],BZONE["Shadowmoon Valley"],39.19,39.15)
-	self:addLookupList(MobDB,20887,L["Deathforge Imp"],BZONE["Shadowmoon Valley"],39.12,38.91)
-	self:addLookupList(MobDB,21050,L["Enraged Earth Spirit"],BZONE["Shadowmoon Valley"],45.00,45.00)
-	self:addLookupList(MobDB,21059,L["Enraged Water Spirit"],BZONE["Shadowmoon Valley"],49.00,24.00)
-	self:addLookupList(MobDB,21060,L["Enraged Air Spirit"],BZONE["Shadowmoon Valley"],61.00,61.00)
-	self:addLookupList(MobDB,21061,L["Enraged Fire Spirit"],BZONE["Shadowmoon Valley"],48.00,43.00)
-	self:addLookupList(MobDB,21302,L["Shadow Council Warlock"],BZONE["Shadowmoon Valley"],23.48,39.40)
-	self:addLookupList(MobDB,21305,L["Mutant Horror"],BZONE["Shadowmoon Valley"],26.42,40.16)
-	self:addLookupList(MobDB,21314,L["Terrormaster"],BZONE["Shadowmoon Valley"],23.95,37.67)
-	self:addLookupList(MobDB,21454,L["Ashtongue Warrior"],BZONE["Shadowmoon Valley"],58.52,35.67)
-	self:addLookupList(MobDB,22016,L["Eclipsion Soldier"],BZONE["Shadowmoon Valley"],52.41,62.55)
-	self:addLookupList(MobDB,22017,L["Eclipsion Spellbinder"],BZONE["Shadowmoon Valley"],52.50,62.47)
-	self:addLookupList(MobDB,22018,L["Eclipsion Cavalier"],BZONE["Shadowmoon Valley"],52.51,64.64)
-	self:addLookupList(MobDB,22076,L["Torloth the Magnificent"],BZONE["Shadowmoon Valley"],51.94,73.90)
-	self:addLookupList(MobDB,22093,L["Illidari Watcher"],BZONE["Shadowmoon Valley"],52.70,72.06)
-	self:addLookupList(MobDB,23305,L["Crazed Murkblood Foreman"],BZONE["Shadowmoon Valley"],73.57,88.92)
+	self:addLookupList(MobDB,19740,L["Wrathwalker"],BZONE["Shadowmoon Valley"],25.5,33.0)
+	self:addLookupList(MobDB,19754,L["Deathforge Tinkerer"],BZONE["Shadowmoon Valley"],39.0,38.7)
+	self:addLookupList(MobDB,19755,L["Mo'arg Weaponsmith"],BZONE["Shadowmoon Valley"],25.5,31.5)
+	self:addLookupList(MobDB,19756,L["Deathforge Smith"],BZONE["Shadowmoon Valley"],37.5,42.0)
+	self:addLookupList(MobDB,19768,L["Coilskar Siren"],BZONE["Shadowmoon Valley"],46.5,30.0)
+	self:addLookupList(MobDB,19792,L["Eclipsion Centurion"],BZONE["Shadowmoon Valley"],48.0,61.8)
+	self:addLookupList(MobDB,19795,L["Eclipsion Blood Knight"],BZONE["Shadowmoon Valley"],52.7,63.2)
+	self:addLookupList(MobDB,19796,L["Eclipsion Archmage"],BZONE["Shadowmoon Valley"],49.5,58.5)
+	self:addLookupList(MobDB,19806,L["Eclipsion Bloodwarder"],BZONE["Shadowmoon Valley"],46.5,66.0)
+	self:addLookupList(MobDB,19826,L["Dark Conclave Shadowmancer"],BZONE["Shadowmoon Valley"],37.5,29.0)
+	self:addLookupList(MobDB,20878,L["Deathforge Guardian"],BZONE["Shadowmoon Valley"],39.0,47.0)
+	self:addLookupList(MobDB,20887,L["Deathforge Imp"],BZONE["Shadowmoon Valley"],40.5,39.1)
+	self:addLookupList(MobDB,21050,L["Enraged Earth Spirit"],BZONE["Shadowmoon Valley"],46.5,45.0)
+	self:addLookupList(MobDB,21059,L["Enraged Water Spirit"],BZONE["Shadowmoon Valley"],51.0,25.5)
+	self:addLookupList(MobDB,21060,L["Enraged Air Spirit"],BZONE["Shadowmoon Valley"],70.5,28.5)
+	self:addLookupList(MobDB,21061,L["Enraged Fire Spirit"],BZONE["Shadowmoon Valley"],48.0,43.5)
+	self:addLookupList(MobDB,21302,L["Shadow Council Warlock"],BZONE["Shadowmoon Valley"],22.9,38.2)
+	self:addLookupList(MobDB,21314,L["Terrormaster"],BZONE["Shadowmoon Valley"],24.0,45.0)
+	self:addLookupList(MobDB,21454,L["Ashtongue Warrior"],BZONE["Shadowmoon Valley"],57.0,36.0)
+	self:addLookupList(MobDB,22016,L["Eclipsion Soldier"],BZONE["Shadowmoon Valley"],52.8,66.5)
+	self:addLookupList(MobDB,22017,L["Eclipsion Spellbinder"],BZONE["Shadowmoon Valley"],52.7,63.4)
+	self:addLookupList(MobDB,22018,L["Eclipsion Cavalier"],BZONE["Shadowmoon Valley"],52.7,61.1)
+	self:addLookupList(MobDB,22076,L["Torloth the Magnificent"],BZONE["Shadowmoon Valley"],51.2,72.5)
+	self:addLookupList(MobDB,22093,L["Illidari Watcher"],BZONE["Shadowmoon Valley"],52.5,72.0)
+	self:addLookupList(MobDB,23305,L["Crazed Murkblood Foreman"],BZONE["Shadowmoon Valley"],72.3,90.0)
+	self:addLookupList(MobDB,23324,L["Crazed Murkblood Miner"],BZONE["Shadowmoon Valley"],73.5,88.5)
 	-- Sholazar Basin
-	self:addLookupList(MobDB,28123,L["Venture Co. Excavator"],BZONE["Sholazar Basin"],34.83,47.51)
+	self:addLookupList(MobDB,28123,L["Venture Co. Excavator"],BZONE["Sholazar Basin"],34.83,47.51)      -- START HERE NEXT TIME
 	self:addLookupList(MobDB,28378,L["Primordial Drake"],BZONE["Sholazar Basin"],46.71,26.72)
 	self:addLookupList(MobDB,28379,L["Shattertusk Mammoth"],BZONE["Sholazar Basin"],53.5,24.4)
 	self:addLookupList(MobDB,28380,L["Shattertusk Bull"],BZONE["Sholazar Basin"],53.00,30.19)
diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua
index f8892e2..a5778b2 100644
--- a/RecipeDB/ARL-Tailor.lua
+++ b/RecipeDB/ARL-Tailor.lua
@@ -804,7 +804,7 @@ function addon:InitTailoring(RecipeDB)
 	-- Cindercloth Vest -- 18408
 	self:addTradeSkill(RecipeDB,18408,260,14042,2,3908,nil,0)
 	self:addTradeFlags(RecipeDB,18408,1,2,11,21,22,23,24,25,26,27,28,29,30,36,40,53,54,56)
-	self:addTradeAcquire(RecipeDB,18408,3,5860,3,5861,3,5862)
+	self:addTradeAcquire(RecipeDB,18408,3,5861)

 	-- Runecloth Cloak -- 18409
 	self:addTradeSkill(RecipeDB,18409,265,13860,1,3908,nil,0)
@@ -874,7 +874,7 @@ function addon:InitTailoring(RecipeDB)
 	-- Cloak of Fire -- 18422
 	self:addTradeSkill(RecipeDB,18422,275,14134,3,3908,nil,0)
 	self:addTradeFlags(RecipeDB,18422,1,2,5,11,21,22,23,24,25,26,27,28,29,30,36,41,60)
-	self:addTradeAcquire(RecipeDB,18422,3,8921,3,9026,3,24819)
+	self:addTradeAcquire(RecipeDB,18422,3,9026)

 	-- Runecloth Boots -- 18423
 	self:addTradeSkill(RecipeDB,18423,280,13864,1,3908,nil,0)