diff --git a/Altoholic-Addon/Altoholic/LootTableSetup.lua b/Altoholic-Addon/Altoholic/LootTableSetup.lua index d0de4f0..5ce572c 100644 --- a/Altoholic-Addon/Altoholic/LootTableSetup.lua +++ b/Altoholic-Addon/Altoholic/LootTableSetup.lua @@ -1074,7 +1074,7 @@ db.lootTable = { -- misc boe stuff [ BZ["Azeroth"] ] = { - [ L["Merchant"] ] = { + [ L["Vendor"] ] = { 6270, -- Tailoring-Pattern: Blue Linen Vest 6272, -- Tailoring-Pattern: Blue Linen Robe 6274, -- Tailoring-Pattern: Blue Overalls @@ -1096,7 +1096,7 @@ db.lootTable = { }, }, [ BZ["Dire Maul"] ] = { - [ L["Knot Thimblejack"] ] = { + [ BB["Knot Thimblejack's Cache"] ] = { 18414, -- Tailoring-Pattern: Belt of the Archmage }, [ L["Shen'dralar Provisioner"] ] = { @@ -1116,10 +1116,10 @@ db.lootTable = { }, }, [ BZ["Moonglade"] ] = { - [ format("%s: %s", L["Merchant"], "Darnall") ] = { + [ format("%s: %s", L["Vendor"], L["Darnall"]) ] = { 14469, -- Tailoring-Pattern: Runecloth Robe }, - [ format("%s: %s", L["Merchant"], "Lorelae Wintersong") ] = { + [ format("%s: %s", L["Vendor"], L["Lorelae Wintersong"]) ] = { 14483, -- Tailoring-Pattern: Felcloth Pants }, }, @@ -1138,35 +1138,35 @@ db.lootTable = { 20547, -- Tailoring-Pattern: Runed Stygian Boots 20548, -- Tailoring-Pattern: Runed Stygian Belt }, - [ format("%s: %s", L["Merchant"], "Kania") ] = { + [ format("%s: %s", L["Vendor"], L["Kania"]) ] = { 22308, -- Tailoring-Pattern: Enchanted Runecloth Bag }, }, [ BZ["Stranglethorn Vale"] ] = { - [ format("%s: %s", L["Merchant"], "Xizk Goodstitch") ] = { + [ format("%s: %s", L["Vendor"], L["Xizk Goodstitch"]) ] = { 7087, -- Tailoring-Pattern: Crimson Silk Cloak 14630, -- Tailoring-Pattern: Enchanter's Cowl }, - [ format("%s: %s", L["Merchant"], "Narkk") ] = { + [ format("%s: %s", L["Vendor"], L["Narkk"]) ] = { 10728, -- Tailoring-Pattern: Black Swashbuckler's Shirt }, - [ format("%s: %s", L["Merchant"], "Cowardly Crosby") ] = { + [ format("%s: %s", L["Vendor"], L["Cowardly Crosby"]) ] = { 10318, -- Tailoring-Pattern: Admiral's Hat }, }, [ BZ["Tanaris"] ] = { - [ format("%s: %s", L["Merchant"], "Vizzklick") ] = { + [ format("%s: %s", L["Vendor"], L["Vizzklick"]) ] = { 7088, -- Tailoring-Pattern: Crimson Silk Robe 21358, -- Tailoring-Pattern: Soul Pouch }, - [ format("%s: %s", L["Merchant"], "Haughty Modiste") ] = { + [ format("%s: %s", L["Vendor"], L["Haughty Modiste"]) ] = { 37915, -- Tailoring-Pattern: Dress Shoes 38327, -- Tailoring-Pattern: Haliscan Jacket 38328, -- Tailoring-Pattern: Haliscan Pantaloons }, }, [ BZ["Winterspring"] ] = { - [ format("%s: %s", L["Merchant"], "Qia ") ] = { + [ format("%s: %s", L["Vendor"], L["Qia"]) ] = { 14468, -- Tailoring-Pattern: Runecloth Bag 14526, -- Tailoring-Pattern: Mooncloth }, @@ -1174,41 +1174,41 @@ db.lootTable = { -- [ BZ["Outland"] ] = { - -- [ L["Merchant"] ] = { + -- [ L["Vendor"] ] = { -- }, -- }, -- [ BZ["Nagrand"] ] = { - -- [ L["Merchant"] ] = { + -- [ L["Vendor"] ] = { -- }, -- }, [ BZ["Shadowmoon Valley"] ] = { - [ format("%s: %s (%s)", L["Merchant"], "Arrond", BF["The Scryers"]) ] = { + [ format("%s: %s (%s)", L["Vendor"], L["Arrond"], BF["The Scryers"]) ] = { 21900, -- Tailoring-Pattern: Imbued Netherweave Robe 21901, -- Tailoring-Pattern: Imbued Netherweave Tunic }, }, [ BZ["Shattrath City"] ] = { - [ format("%s: %s", L["Merchant"], "Eiin") ] = { + [ format("%s: %s", L["Vendor"], L["Eiin"]) ] = { 21892, -- Tailoring-Pattern: Bolt of Imbued Netherweave 21893, -- Tailoring-Pattern: Imbued Netherweave Bag 21896, -- Tailoring-Pattern: Netherweave Robe 21897, -- Tailoring-Pattern: Netherweave Tunic }, - [ format("%s: %s", L["Merchant"], "Nasmara Moonsong") ] = { + [ format("%s: %s", L["Vendor"], L["Nasmara Moonsong"]) ] = { 21895, -- Tailoring-Pattern: Primal Mooncloth }, - [ format("%s: %s", L["Merchant"], "Gidge Spellweaver") ] = { + [ format("%s: %s", L["Vendor"], L["Gidge Spellweaver"]) ] = { 24316, -- Tailoring-Pattern: Spellcloth }, - [ format("%s: %s", L["Merchant"], "Andrion Darkspinner") ] = { + [ format("%s: %s", L["Vendor"], L["Andrion Darkspinner"]) ] = { 30483, -- Tailoring-Pattern: Shadowcloth }, - [ format("%s: %s", L["Merchant"], "Madame Ruby") ] = { + [ format("%s: %s", L["Vendor"], L["Madame Ruby"]) ] = { 22307, -- Tailoring-Pattern: Enchanted Mageweave Pouch }, }, -- [ BZ["Zangarmarsh"] ] = { - -- [ L["Merchant"] ] = { + -- [ L["Vendor"] ] = { -- }, -- }, @@ -4199,6 +4199,10 @@ db.lootTable = { } +local npcList = { + -- [66] = {L["Tharynn Bouden"], BZ["Elwynn Forest"]}, +} + local trainersName = TUTORIAL_TITLE14 local rep_Hated = FACTION_STANDING_LABEL1 local rep_Hostile = FACTION_STANDING_LABEL2 @@ -4214,21 +4218,21 @@ local recipeTable = { { 4597, BZ["Silverpine Forest"], format("%s (%s)", L["Quest rewards"], FACTION_HORDE) }, -- Alchemy-Recipe: Discolored Healing Potion (Horde only) { 4624, BZ["Badlands"], L["Quest rewards"] }, -- Alchemy-Recipe: Lesser Stoneshield Potion - { 5640, BZ["Westfall"], format("%s: %s", L["Merchant"], "Defias Profiteer") }, -- Alchemy-Recipe: Rage Potion - { 5640, BZ["The Barrens"], format("%s: %s", L["Merchant"], "Ranik") }, -- Alchemy-Recipe: Rage Potion + { 5640, BZ["Westfall"], format("%s: %s", L["Vendor"], L["Defias Profiteer"]) }, -- Alchemy-Recipe: Rage Potion + { 5640, BZ["The Barrens"], format("%s: %s", L["Vendor"], L["Ranik"]) }, -- Alchemy-Recipe: Rage Potion - { 6053, BZ["Duskwood"], format("%s: %s", L["Merchant"], "Kzixx") }, -- Alchemy-Recipe: Holy Protection Potion - { 6056, BZ["Stranglethorn Vale"], format("%s: %s", L["Merchant"], "Glyx Brewright") }, -- Alchemy-Recipe: Frost Protection Potion + { 6053, BZ["Duskwood"], format("%s: %s", L["Vendor"], L["Kzixx"]) }, -- Alchemy-Recipe: Holy Protection Potion + { 6056, BZ["Stranglethorn Vale"], format("%s: %s", L["Vendor"], L["Glyx Brewright"]) }, -- Alchemy-Recipe: Frost Protection Potion - { 6057, BZ["Stranglethorn Vale"], format("%s: %s", L["Merchant"], "Glyx Brewright") }, -- Alchemy-Recipe: Nature Protection Potion - { 6057, BZ["Tanaris"], format("%s: %s", L["Merchant"], "Alchemist Pestlezugg") }, -- Alchemy-Recipe: Nature Protection Potion + { 6057, BZ["Stranglethorn Vale"], format("%s: %s", L["Vendor"], L["Glyx Brewright"]) }, -- Alchemy-Recipe: Nature Protection Potion + { 6057, BZ["Tanaris"], format("%s: %s", L["Vendor"], L["Alchemist Pestlezugg"]) }, -- Alchemy-Recipe: Nature Protection Potion - { 6068, BZ["Duskwood"], format("%s: %s", L["Merchant"], "Bliztik") }, -- Alchemy-Recipe: Shadow Oil + { 6068, BZ["Duskwood"], format("%s: %s", L["Vendor"], L["Bliztik"]) }, -- Alchemy-Recipe: Shadow Oil - { 9296, BZ["Western Plaguelands"], "Skeletal Flayer" }, -- Alchemy-Recipe: Gift of Arthas - { 9296, BZ["Western Plaguelands"], "Slavering Ghoul" }, -- Alchemy-Recipe: Gift of Arthas + { 9296, BZ["Western Plaguelands"], L["Skeletal Flayer"] }, -- Alchemy-Recipe: Gift of Arthas + { 9296, BZ["Western Plaguelands"], L["Slavering Ghoul"] }, -- Alchemy-Recipe: Gift of Arthas - { 9303, BZ["Tanaris"], format("%s: %s", L["Merchant"], "Alchemist Pestlezugg") }, -- Alchemy-Recipe: Philosopher's Stone + { 9303, BZ["Tanaris"], format("%s: %s", L["Vendor"], L["Alchemist Pestlezugg"]) }, -- Alchemy-Recipe: Philosopher's Stone { 10644, BI["Engineering"], "205" }, -- Alchemy-Recipe: Goblin Rocket Fuel { 13476, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Mighty Rage Potion { 13477, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Superior Mana Potion @@ -4236,24 +4240,24 @@ local recipeTable = { { 13480, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Major Healing Potion { 13481, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Elixir of Brute Force - { 13491, BZ["Felwood"], "Jadefire Rogue" }, -- Alchemy-Recipe: Elixir of the Mongoose - { 13491, BZ["Azshara"], "Legashi Rogue" }, -- Alchemy-Recipe: Elixir of the Mongoose + { 13491, BZ["Felwood"], L["Jadefire Rogue"] }, -- Alchemy-Recipe: Elixir of the Mongoose + { 13491, BZ["Azshara"], L["Legashi Rogue"] }, -- Alchemy-Recipe: Elixir of the Mongoose { 13492, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Purification Potion { 13493, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Greater Arcane Elixir - { 13494, BZ["Blackrock Spire"], "Firebrand Invoker" }, -- Alchemy-Recipe: Greater Fire Protection Potion - { 13494, BZ["Blackrock Spire"], "Firebrand Pyromancer" }, -- Alchemy-Recipe: Greater Fire Protection Potion + { 13494, BZ["Blackrock Spire"], L["Firebrand Invoker"] }, -- Alchemy-Recipe: Greater Fire Protection Potion + { 13494, BZ["Blackrock Spire"], L["Firebrand Pyromancer"] }, -- Alchemy-Recipe: Greater Fire Protection Potion - { 13495, BZ["Winterspring"], "Frostmaul Giant" }, -- Alchemy-Recipe: Greater Frost Protection Potion - { 13496, BZ["Western Plaguelands"], "Rotting Behemoth" }, -- Alchemy-Recipe: Greater Nature Protection Potion - { 13497, BZ["Winterspring"], "Cobalt Mageweaver" }, -- Alchemy-Recipe: Greater Arcane Protection Potion + { 13495, BZ["Winterspring"], L["Frostmaul Giant"] }, -- Alchemy-Recipe: Greater Frost Protection Potion + { 13496, BZ["Western Plaguelands"], L["Rotting Behemoth"] }, -- Alchemy-Recipe: Greater Nature Protection Potion + { 13497, BZ["Winterspring"], L["Cobalt Mageweaver"] }, -- Alchemy-Recipe: Greater Arcane Protection Potion - { 13499, BZ["Eastern Plaguelands"], "Dark Adept" }, -- Alchemy-Recipe: Greater Shadow Protection Potion - { 13499, BZ["Eastern Plaguelands"], "Shadowmage" }, -- Alchemy-Recipe: Greater Shadow Protection Potion + { 13499, BZ["Eastern Plaguelands"], L["Dark Adept"] }, -- Alchemy-Recipe: Greater Shadow Protection Potion + { 13499, BZ["Eastern Plaguelands"], L["Shadowmage"] }, -- Alchemy-Recipe: Greater Shadow Protection Potion - { 13501, BZ["Western Plaguelands"], format("%s: %s", L["Merchant"], "Magnus Frostwake") }, -- Alchemy-Recipe: Major Mana Potion { 13501, BZ["Western Plaguelands"], BB["Darkmaster Gandling"] }, -- Alchemy-Recipe: Major Mana Potion + { 13501, BZ["Western Plaguelands"], format("%s: %s", L["Vendor"], L["Magnus Frostwake"]) }, -- Alchemy-Recipe: Major Mana Potion -- { 13517, BF["The Sha'tar"], rep_Revered }, -- Alchemy-Recipe: Alchemist's Stone @@ -4266,7 +4270,7 @@ local recipeTable = { { 13522, BZ["Upper Blackrock Spire"], BB["Gyth"] }, -- Alchemy-Recipe: Flask of Chromatic Resistance { 31357, BF["Lower City"], rep_Exalted }, -- Alchemy-Recipe: Flask of Chromatic Resistance - { 14634, BZ["Alterac Mountains"], format("%s: %s", L["Merchant"], "Bro'kin") }, -- Alchemy-Recipe: Frost Oil + { 14634, BZ["Alterac Mountains"], format("%s: %s", L["Vendor"], L["Bro'kin"]) }, -- Alchemy-Recipe: Frost Oil { 18257, BZ["Molten Core"], L["Random Boss"] }, -- Alchemy-Recipe: Major Rejuvenation Potion @@ -4275,9 +4279,9 @@ local recipeTable = { -- { 20013, BF["Zandalar Tribe"], rep_Exalted }, -- Alchemy-Recipe: Living Action Potion -- { 20014, BF["Zandalar Tribe"], rep_Honored }, -- Alchemy-Recipe: Mighty Troll's Blood Elixir - { 21547, BZ["Searing Gorge"], "Dark Iron Slaver" }, -- Alchemy-Recipe: Elixir of Greater Firepower - { 21547, BZ["Searing Gorge"], "Dark Iron Taskmaster" }, -- Alchemy-Recipe: Elixir of Greater Firepower - { 21547, BZ["Searing Gorge"], "Dark Iron Watchman" }, -- Alchemy-Recipe: Elixir of Greater Firepower + { 21547, BZ["Searing Gorge"], L["Dark Iron Slaver"] }, -- Alchemy-Recipe: Elixir of Greater Firepower + { 21547, BZ["Searing Gorge"], L["Dark Iron Taskmaster"] }, -- Alchemy-Recipe: Elixir of Greater Firepower + { 21547, BZ["Searing Gorge"], L["Dark Iron Watchman"] }, -- Alchemy-Recipe: Elixir of Greater Firepower -- { 22905, BF["Honor Hold"], rep_Honored }, -- Alchemy-Recipe: Elixir of Major Agility -- { 24001, BF["Thrallmar"], rep_Honored }, -- Alchemy-Recipe: Elixir of Major Agility @@ -4291,18 +4295,23 @@ local recipeTable = { { 22920, BZ["The Mechanar"], BB["Nethermancer Sepethrea"] }, -- Alchemy-Recipe: Major Fire Protection Potion { 22921, BZ["Mana-Tombs"], BB["Nexus-Prince Shaffar"] }, -- Alchemy-Recipe: Major Frost Protection Potion -- { 22922, BF["Cenarion Expedition"], rep_Exalted }, -- Alchemy-Recipe: Major Nature Protection Potion - { 22923, BZ["Nagrand"], "Vir'aani Arcanist" }, -- Alchemy-Recipe: Major Frost Protection Potion - { 22924, BZ["Shadowmoon Valley"], "Shadow Council Warlock" }, -- Alchemy-Recipe: Major Shadow Protection Potion - { 22925, BZ["Blade's Edge Mountains"], "Abyssal Flamebringer" }, -- Alchemy-Recipe: Major Holy Protection Potion + { 22923, BZ["Nagrand"], L["Vir'aani Arcanist"] }, -- Alchemy-Recipe: Major Frost Protection Potion + { 22924, BZ["Shadowmoon Valley"], L["Shadow Council Warlock"] }, -- Alchemy-Recipe: Major Shadow Protection Potion + { 22925, BZ["Blade's Edge Mountains"], L["Abyssal Flamebringer"] }, -- Alchemy-Recipe: Major Holy Protection Potion { 22927, BZ["Old Hillsbrad Foothills"], BB["Captain Skarloc"] }, -- Alchemy-Recipe: Ironshield Potion - { 31680, BZ["Shadowmoon Valley"], "Mo'arg Weaponsmith" }, -- Alchemy-Recipe: Fel Strength Elixir - { 31680, BZ["Shadowmoon Valley"], "Shadow Council Warlock" }, -- Alchemy-Recipe: Fel Strength Elixir - { 31680, BZ["Shadowmoon Valley"], "Terrormaster" }, -- Alchemy-Recipe: Fel Strength Elixir - { 31680, BZ["Shadowmoon Valley"], "Wrathwalker" }, -- Alchemy-Recipe: Fel Strength Elixir + { 31680, BZ["Shadowmoon Valley"], L["Mo'arg Weaponsmith"] }, -- Alchemy-Recipe: Fel Strength Elixir + { 31680, BZ["Shadowmoon Valley"], L["Shadow Council Warlock"] }, -- Alchemy-Recipe: Fel Strength Elixir + { 31680, BZ["Shadowmoon Valley"], L["Terrormaster"] }, -- Alchemy-Recipe: Fel Strength Elixir + { 31680, BZ["Shadowmoon Valley"], L["Wrathwalker"] }, -- Alchemy-Recipe: Fel Strength Elixir + + { 31681, BZ["Shadowmoon Valley"], L["Deathforge Guardian"] }, -- Alchemy-Recipe: Fel Regeneration Potion + { 31681, BZ["Shadowmoon Valley"], L["Deathforge Imp"] }, -- Alchemy-Recipe: Fel Regeneration Potion + { 31681, BZ["Shadowmoon Valley"], L["Deathforge Smith"] }, -- Alchemy-Recipe: Fel Regeneration Potion + { 31681, BZ["Shadowmoon Valley"], L["Deathforge Tinkerer"] }, -- Alchemy-Recipe: Fel Regeneration Potion + + { 31682, BZ["Shadowmoon Valley"], L["Eclipsion NPCs"] }, -- Alchemy-Recipe: Fel Mana Potion - { 31681, BZ["Shadowmoon Valley"], "Deathforge NPCs" }, -- Alchemy-Recipe: Fel Regeneration Potion - { 31682, BZ["Shadowmoon Valley"], "Eclipsion NPCs" }, -- Alchemy-Recipe: Fel Mana Potion -- { 32070, BF["Cenarion Expedition"], rep_Honored }, -- Alchemy-Recipe: Earthen Elixir -- { 33209, BF["The Violet Eye"], rep_Honored }, -- Alchemy-Recipe: Flask of Chromatic Wonder @@ -4311,104 +4320,105 @@ local recipeTable = { -- { 35754, BF["Shattered Sun Offensive"], rep_Exalted }, -- Alchemy-Recipe: Redeemer's Alchemist Stone -- { 35755, BF["Shattered Sun Offensive"], rep_Exalted }, -- Alchemy-Recipe: Assassin's Alchemist Stone - { 44564, BZ["Icecrown"], "Cult Researcher" }, -- Alchemy-Recipe: Mighty Arcane Protection Potion - { 44565, BZ["Icecrown"], "Skeletal Runesmith" }, -- Alchemy-Recipe: Mighty Shadow Protection Potion - { 44566, BZ["Icecrown"], "Damned Apothecary" }, -- Alchemy-Recipe: Mighty Frost Protection Potion - { 44567, BZ["Icecrown"], "Cult Alchemist" }, -- Alchemy-Recipe: Mighty Nature Protection Potion - { 44568, BZ["Icecrown"], "Cultist Shard Watcher" }, -- Alchemy-Recipe: Mighty Shadow Protection Potion + { 44564, BZ["Icecrown"], L["Cult Researcher"] }, -- Alchemy-Recipe: Mighty Arcane Protection Potion + { 44565, BZ["Icecrown"], L["Skeletal Runesmith"] }, -- Alchemy-Recipe: Mighty Shadow Protection Potion + { 44566, BZ["Icecrown"], L["Damned Apothecary"] }, -- Alchemy-Recipe: Mighty Frost Protection Potion + { 44567, BZ["Icecrown"], L["Cult Alchemist"] }, -- Alchemy-Recipe: Mighty Nature Protection Potion + { 44568, BZ["Icecrown"], L["Cultist Shard Watcher"] }, -- Alchemy-Recipe: Mighty Shadow Protection Potion { 47507, trainersName, BI["Alchemy"] }, -- Alchemy-Recipe: Flask of the North + + + { 14627, BZ["Duskwood"], format("%s: %s (%s)", L["Vendor"], L["Danielle Zipstitch"], FACTION_ALLIANCE) }, -- Tailoring-Pattern: Bright Yellow Shirt (Alliance only) } local recipeFactionDuplicates = { Alliance = { - { 4355, BZ["Hillsbrad Foothills"], format("%s: %s", L["Merchant"], "Micha Yance") }, -- Tailoring-Pattern: Icy Cloak - { 6401, BZ["Duskwood"], format("%s: %s", L["Merchant"], "Sheri Zipstitch") }, -- Tailoring-Pattern: Dark Silk Shirt - { 7089, BZ["Feralas"], format("%s: %s", L["Merchant"], "Brienna Starglow") }, -- Tailoring-Pattern: Azure Silk Cloak - { 7114, BZ["Wetlands"], format("%s: %s", L["Merchant"], "Wenna Silkbeard") }, -- Tailoring-Pattern: Azure Silk Gloves - { 10311, BZ["Darnassus"], format("%s: %s", L["Merchant"], "Elynna") }, -- Tailoring-Pattern: Orange Martial Shirt - { 10314, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Outfitter Eric") }, -- Tailoring-Pattern: Lavender Mageweave Shirt - { 10317, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Outfitter Eric") }, -- Tailoring-Pattern: Pink Mageweave Shirt - { 10321, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Outfitter Eric") }, -- Tailoring-Pattern: Tuxedo Shirt - { 10323, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Outfitter Eric") }, -- Tailoring-Pattern: Tuxedo Pants - { 10325, BZ["Stormwind City"], format("%s: %s", L["Merchant"], "Alexandra Bolero") }, -- Tailoring-Pattern: White Wedding Dress - { 10326, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Outfitter Eric") }, -- Tailoring-Pattern: Tuxedo Jacket - { 14627, BZ["Duskwood"], format("%s: %s", L["Merchant"], "Danielle Zipstitch") }, -- Tailoring-Pattern: Bright Yellow Shirt (Alliance only) - { 21894, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Borto") }, -- Tailoring-Pattern: Bolt of Soulcloth - { 21902, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Borto") }, -- Tailoring-Pattern: Soulcloth Gloves - { 21898, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Muheru the Weaver") }, -- Tailoring-Pattern: Imbued Netherweave Pants - { 21899, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Muheru the Weaver") }, -- Tailoring-Pattern: Imbued Netherweave Boots + { 4355, BZ["Hillsbrad Foothills"], format("%s: %s", L["Vendor"], L["Micha Yance"]) }, -- Tailoring-Pattern: Icy Cloak + { 6401, BZ["Duskwood"], format("%s: %s", L["Vendor"], L["Sheri Zipstitch"]) }, -- Tailoring-Pattern: Dark Silk Shirt + { 7089, BZ["Feralas"], format("%s: %s", L["Vendor"], L["Brienna Starglow"]) }, -- Tailoring-Pattern: Azure Silk Cloak + { 7114, BZ["Wetlands"], format("%s: %s", L["Vendor"], L["Wenna Silkbeard"]) }, -- Tailoring-Pattern: Azure Silk Gloves + { 10311, BZ["Darnassus"], format("%s: %s", L["Vendor"], L["Elynna"]) }, -- Tailoring-Pattern: Orange Martial Shirt + { 10314, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Outfitter Eric"]) }, -- Tailoring-Pattern: Lavender Mageweave Shirt + { 10317, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Outfitter Eric"]) }, -- Tailoring-Pattern: Pink Mageweave Shirt + { 10321, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Outfitter Eric"]) }, -- Tailoring-Pattern: Tuxedo Shirt + { 10323, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Outfitter Eric"]) }, -- Tailoring-Pattern: Tuxedo Pants + { 10325, BZ["Stormwind City"], format("%s: %s", L["Vendor"], L["Alexandra Bolero"]) }, -- Tailoring-Pattern: White Wedding Dress + { 10326, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Outfitter Eric"]) }, -- Tailoring-Pattern: Tuxedo Jacket + { 21894, BZ["Nagrand"], format("%s: %s", L["Vendor"], L["Borto"]) }, -- Tailoring-Pattern: Bolt of Soulcloth + { 21902, BZ["Nagrand"], format("%s: %s", L["Vendor"], L["Borto"]) }, -- Tailoring-Pattern: Soulcloth Gloves + { 21898, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Muheru the Weaver"]) }, -- Tailoring-Pattern: Imbued Netherweave Pants + { 21899, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Muheru the Weaver"]) }, -- Tailoring-Pattern: Imbued Netherweave Boots - { 6056, BZ["Arathi Highlands"], format("%s: %s", L["Merchant"], "Drovnar Strongbrew") }, -- Alchemy-Recipe: Frost Protection Potion - { 6057, BZ["Feralas"], format("%s: %s", L["Merchant"], "Logannas") }, -- Alchemy-Recipe: Nature Protection Potion + { 6056, BZ["Arathi Highlands"], format("%s: %s", L["Vendor"], L["Drovnar Strongbrew"]) }, -- Alchemy-Recipe: Frost Protection Potion + { 6057, BZ["Feralas"], format("%s: %s", L["Vendor"], L["Logannas"]) }, -- Alchemy-Recipe: Nature Protection Potion - { 5640, BZ["Loch Modan"], format("%s: %s", L["Merchant"], "Xandar Goodbeard") }, -- Alchemy-Recipe: Rage Potion + { 5640, BZ["Loch Modan"], format("%s: %s", L["Vendor"], L["Xandar Goodbeard"]) }, -- Alchemy-Recipe: Rage Potion - { 5643, BZ["Darnassus"], format("%s: %s", L["Merchant"], "Ulthir") }, -- Alchemy-Recipe: Great Rage Potion + { 5643, BZ["Darnassus"], format("%s: %s", L["Vendor"], L["Ulthir"]) }, -- Alchemy-Recipe: Great Rage Potion - { 5642, BZ["Darnassus"], format("%s: %s", L["Merchant"], "Ulthir") }, -- Alchemy-Recipe: Free Action Potion - { 5642, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Soolie Berryfizz") }, -- Alchemy-Recipe: Free Action Potion + { 5642, BZ["Darnassus"], format("%s: %s", L["Vendor"], L["Ulthir"]) }, -- Alchemy-Recipe: Free Action Potion + { 5642, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Soolie Berryfizz"]) }, -- Alchemy-Recipe: Free Action Potion - { 6053, BZ["Loch Modan"], format("%s: %s", L["Merchant"], "Xandar Goodbeard") }, -- Alchemy-Recipe: Holy Protection Potion - { 6054, BZ["Ashenvale"], format("%s: %s", L["Merchant"], "Harklan Moongrove") }, -- Alchemy-Recipe: Shadow Protection Potion - { 6055, BZ["Hillsbrad Foothills"], format("%s: %s", L["Merchant"], "Nandar Branson") }, -- Alchemy-Recipe: Fire Protection Potion - { 9302, BZ["Feralas"], format("%s: %s", L["Merchant"], "Logannas") }, -- Alchemy-Recipe: Ghost Dye - { 9301, BZ["Stormwind City"], format("%s: %s", L["Merchant"], "Maria Lumere") }, -- Alchemy-Recipe: Elixir of Shadow Power - { 9300, BZ["Blasted Lands"], format("%s: %s", L["Merchant"], "Nina Lightbrew") }, -- Alchemy-Recipe: Elixir of Demonslaying - { 13478, BZ["Ironforge"], format("%s: %s", L["Merchant"], "Soolie Berryfizz") }, -- Alchemy-Recipe: Elixir of Superior Defense + { 6053, BZ["Loch Modan"], format("%s: %s", L["Vendor"], L["Xandar Goodbeard"]) }, -- Alchemy-Recipe: Holy Protection Potion + { 6054, BZ["Ashenvale"], format("%s: %s", L["Vendor"], L["Harklan Moongrove"]) }, -- Alchemy-Recipe: Shadow Protection Potion + { 6055, BZ["Hillsbrad Foothills"], format("%s: %s", L["Vendor"], "Nandar Branson") }, -- Alchemy-Recipe: Fire Protection Potion + { 9302, BZ["Feralas"], format("%s: %s", L["Vendor"], L["Logannas"]) }, -- Alchemy-Recipe: Ghost Dye + { 9301, BZ["Stormwind City"], format("%s: %s", L["Vendor"], L["Maria Lumere"]) }, -- Alchemy-Recipe: Elixir of Shadow Power + { 9300, BZ["Blasted Lands"], format("%s: %s", L["Vendor"], L["Nina Lightbrew"]) }, -- Alchemy-Recipe: Elixir of Demonslaying + { 13478, BZ["Ironforge"], format("%s: %s", L["Vendor"], L["Soolie Berryfizz"]) }, -- Alchemy-Recipe: Elixir of Superior Defense - { 22900, BZ["The Exodar"], format("%s: %s", L["Merchant"], "Altaa") }, -- Alchemy-Recipe: Elixir of Camouflage - { 22900, BZ["Hellfire Peninsula"], format("%s: %s", L["Merchant"], "Alchemist Gribble") }, -- Alchemy-Recipe: Elixir of Camouflage + { 22900, BZ["The Exodar"], format("%s: %s", L["Vendor"], L["Altaa"]) }, -- Alchemy-Recipe: Elixir of Camouflage + { 22900, BZ["Hellfire Peninsula"], format("%s: %s", L["Vendor"], L["Alchemist Gribble"]) }, -- Alchemy-Recipe: Elixir of Camouflage - { 22901, BZ["Terokkar Forest"], format("%s: %s", L["Merchant"], "Leeli Longhaggle") }, -- Alchemy-Recipe: Sneaking Potion - { 22902, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Haalrun") }, -- Alchemy-Recipe: Elixir of Major Frost Power - { 22907, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Haalrun") }, -- Alchemy-Recipe: Super Mana Potion - { 22909, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Haalrun") }, -- Alchemy-Recipe: Elixir of Major Defense - { 22911, BZ["Terokkar Forest"], format("%s: %s", L["Merchant"], "Leeli Longhaggle") }, -- Alchemy-Recipe: Major Dreamless Sleep Potion + { 22901, BZ["Terokkar Forest"], format("%s: %s", L["Vendor"], L["Leeli Longhaggle"]) }, -- Alchemy-Recipe: Sneaking Potion + { 22902, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Haalrun"]) }, -- Alchemy-Recipe: Elixir of Major Frost Power + { 22907, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Haalrun"]) }, -- Alchemy-Recipe: Super Mana Potion + { 22909, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Haalrun"]) }, -- Alchemy-Recipe: Elixir of Major Defense + { 22911, BZ["Terokkar Forest"], format("%s: %s", L["Vendor"], L["Leeli Longhaggle"]) }, -- Alchemy-Recipe: Major Dreamless Sleep Potion - -- { 32071, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Quartermaster Davian Vaclav") }, -- Alchemy-Recipe: Elixir of Ironskin + -- { 32071, BZ["Nagrand"], format("%s: %s", L["Vendor"], "Quartermaster Davian Vaclav") }, -- Alchemy-Recipe: Elixir of Ironskin }, Horde = { - { 4355, BZ["Dustwallow Marsh"], format("%s: %s", L["Merchant"], "Ghok'kah") }, -- Tailoring-Pattern: Icy Cloak - { 6401, BZ["Hillsbrad Foothills"], format("%s: %s", L["Merchant"], "Mallen Swain") }, -- Tailoring-Pattern: Dark Silk Shirt - { 7089, BZ["Arathi Highlands"], format("%s: %s", L["Merchant"], "Jun'ha") }, -- Tailoring-Pattern: Azure Silk Cloak - { 7114, BZ["Desolace"], format("%s: %s", L["Merchant"], "Kireena") }, -- Tailoring-Pattern: Azure Silk Gloves - { 10311, BZ["Thunder Bluff"], format("%s: %s", L["Merchant"], "Mahu") }, -- Tailoring-Pattern: Orange Martial Shirt - { 10314, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Borya") }, -- Tailoring-Pattern: Lavender Mageweave Shirt - { 10317, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Borya") }, -- Tailoring-Pattern: Pink Mageweave Shirt - { 10321, BZ["Undercity"], format("%s: %s", L["Merchant"], "Millie Gregorian") }, -- Tailoring-Pattern: Tuxedo Shirt - { 10323, BZ["Undercity"], format("%s: %s", L["Merchant"], "Millie Gregorian") }, -- Tailoring-Pattern: Tuxedo Pants - { 10325, BZ["Thunder Bluff"], format("%s: %s", L["Merchant"], "Mahu") }, -- Tailoring-Pattern: White Wedding Dress - { 10326, BZ["Undercity"], format("%s: %s", L["Merchant"], "Millie Gregorian") }, -- Tailoring-Pattern: Tuxedo Jacket - { 14627, BZ["Duskwood"], format("%s: %s (%s)", L["Merchant"], "Danielle Zipstitch", FACTION_ALLIANCE) }, -- Tailoring-Pattern: Bright Yellow Shirt (Alliance only) - { 21894, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Mathar G'ochar") }, -- Tailoring-Pattern: Bolt of Soulcloth - { 21902, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Mathar G'ochar") }, -- Tailoring-Pattern: Soulcloth Gloves - { 21898, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Zurai") }, -- Tailoring-Pattern: Imbued Netherweave Pants - { 21899, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Zurai") }, -- Tailoring-Pattern: Imbued Netherweave Boots + { 4355, BZ["Dustwallow Marsh"], format("%s: %s", L["Vendor"], L["Ghok'kah"]) }, -- Tailoring-Pattern: Icy Cloak + { 6401, BZ["Hillsbrad Foothills"], format("%s: %s", L["Vendor"], L["Mallen Swain"]) }, -- Tailoring-Pattern: Dark Silk Shirt + { 7089, BZ["Arathi Highlands"], format("%s: %s", L["Vendor"], L["Jun'ha"]) }, -- Tailoring-Pattern: Azure Silk Cloak + { 7114, BZ["Desolace"], format("%s: %s", L["Vendor"], L["Kireena"]) }, -- Tailoring-Pattern: Azure Silk Gloves + { 10311, BZ["Thunder Bluff"], format("%s: %s", L["Vendor"], L["Mahu"]) }, -- Tailoring-Pattern: Orange Martial Shirt + { 10314, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Borya"]) }, -- Tailoring-Pattern: Lavender Mageweave Shirt + { 10317, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Borya"]) }, -- Tailoring-Pattern: Pink Mageweave Shirt + { 10321, BZ["Undercity"], format("%s: %s", L["Vendor"], L["Millie Gregorian"]) }, -- Tailoring-Pattern: Tuxedo Shirt + { 10323, BZ["Undercity"], format("%s: %s", L["Vendor"], L["Millie Gregorian"]) }, -- Tailoring-Pattern: Tuxedo Pants + { 10325, BZ["Thunder Bluff"], format("%s: %s", L["Vendor"], L["Mahu"]) }, -- Tailoring-Pattern: White Wedding Dress + { 10326, BZ["Undercity"], format("%s: %s", L["Vendor"], L["Millie Gregorian"]) }, -- Tailoring-Pattern: Tuxedo Jacket + { 21894, BZ["Nagrand"], format("%s: %s", L["Vendor"], L["Mathar G'ochar"]) }, -- Tailoring-Pattern: Bolt of Soulcloth + { 21902, BZ["Nagrand"], format("%s: %s", L["Vendor"], L["Mathar G'ochar"]) }, -- Tailoring-Pattern: Soulcloth Gloves + { 21898, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Zurai"]) }, -- Tailoring-Pattern: Imbued Netherweave Pants + { 21899, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Zurai"]) }, -- Tailoring-Pattern: Imbued Netherweave Boots - { 6057, BZ["Feralas"], format("%s: %s", L["Merchant"], "Bronk") }, -- Alchemy-Recipe: Nature Protection Potion - { 6068, BZ["Thousand Needles"], format("%s: %s", L["Merchant"], "Montarr") }, -- Alchemy-Recipe: Shadow Oil + { 6057, BZ["Feralas"], format("%s: %s", L["Vendor"], L["Bronk"]) }, -- Alchemy-Recipe: Nature Protection Potion + { 6068, BZ["Thousand Needles"], format("%s: %s", L["Vendor"], L["Montarr"]) }, -- Alchemy-Recipe: Shadow Oil - { 5640, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Hagrus") }, -- Alchemy-Recipe: Rage Potion - { 5643, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Hagrus") }, -- Alchemy-Recipe: Great Rage Potion - { 5642, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Kor'geld") }, -- Alchemy-Recipe: Free Action Potion - { 6053, BZ["The Barrens"], format("%s: %s", L["Merchant"], "Hula'mahi") }, -- Alchemy-Recipe: Holy Protection Potion - { 6054, BZ["Hillsbrad Foothills"], format("%s: %s", L["Merchant"], "Christoph Jeffcoat") }, -- Alchemy-Recipe: Shadow Protection Potion - { 6055, BZ["Stonetalon Mountains"], format("%s: %s", L["Merchant"], "Jeeda") }, -- Alchemy-Recipe: Fire Protection Potion - { 9302, BZ["Feralas"], format("%s: %s", L["Merchant"], "Bronk") }, -- Alchemy-Recipe: Ghost Dye - { 9301, BZ["Undercity"], format("%s: %s", L["Merchant"], "Algernon") }, -- Alchemy-Recipe: Elixir of Shadow Power - { 9300, BZ["Swamp of Sorrows"], format("%s: %s", L["Merchant"], "Rartar") }, -- Alchemy-Recipe: Elixir of Demonslaying - { 13478, BZ["Orgrimmar"], format("%s: %s", L["Merchant"], "Kor'geld") }, -- Alchemy-Recipe: Elixir of Superior Defense + { 5640, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Hagrus"]) }, -- Alchemy-Recipe: Rage Potion + { 5643, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Hagrus"]) }, -- Alchemy-Recipe: Great Rage Potion + { 5642, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Kor'geld"]) }, -- Alchemy-Recipe: Free Action Potion + { 6053, BZ["The Barrens"], format("%s: %s", L["Vendor"], L["Hula'mahi"]) }, -- Alchemy-Recipe: Holy Protection Potion + { 6054, BZ["Hillsbrad Foothills"], format("%s: %s", L["Vendor"], L["Christoph Jeffcoat"]) }, -- Alchemy-Recipe: Shadow Protection Potion + { 6055, BZ["Stonetalon Mountains"], format("%s: %s", L["Vendor"], L["Jeeda"]) }, -- Alchemy-Recipe: Fire Protection Potion + { 9302, BZ["Feralas"], format("%s: %s", L["Vendor"], L["Bronk"]) }, -- Alchemy-Recipe: Ghost Dye + { 9301, BZ["Undercity"], format("%s: %s", L["Vendor"], L["Algernon"]) }, -- Alchemy-Recipe: Elixir of Shadow Power + { 9300, BZ["Swamp of Sorrows"], format("%s: %s", L["Vendor"], L["Rartar"]) }, -- Alchemy-Recipe: Elixir of Demonslaying + { 13478, BZ["Orgrimmar"], format("%s: %s", L["Vendor"], L["Kor'geld"]) }, -- Alchemy-Recipe: Elixir of Superior Defense - { 22900, BZ["Silvermoon City"], format("%s: %s", L["Merchant"], "Melaris") }, -- Alchemy-Recipe: Elixir of Camouflage - { 22900, BZ["Hellfire Peninsula"], format("%s: %s", L["Merchant"], "Apothecary Antonivich") }, -- Alchemy-Recipe: Elixir of Camouflage + { 22900, BZ["Silvermoon City"], format("%s: %s", L["Vendor"], L["Melaris"]) }, -- Alchemy-Recipe: Elixir of Camouflage + { 22900, BZ["Hellfire Peninsula"], format("%s: %s", L["Vendor"], L["Apothecary Antonivich"]) }, -- Alchemy-Recipe: Elixir of Camouflage - { 22901, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Seer Janidi") }, -- Alchemy-Recipe: Sneaking Potion - { 22902, BZ["Zangarmarsh"], format("%s: %s", L["Merchant"], "Seer Janidi") }, -- Alchemy-Recipe: Elixir of Major Frost Power - { 22907, BZ["Blade's Edge Mountains"], format("%s: %s", L["Merchant"], "Daga Ramba") }, -- Alchemy-Recipe: Super Mana Potion - { 22909, BZ["Blade's Edge Mountains"], format("%s: %s", L["Merchant"], "Daga Ramba") }, -- Alchemy-Recipe: Elixir of Major Defense - { 22911, BZ["Blade's Edge Mountains"], format("%s: %s", L["Merchant"], "Daga Ramba") }, -- Alchemy-Recipe: Major Dreamless Sleep Potion + { 22901, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Seer Janidi"]) }, -- Alchemy-Recipe: Sneaking Potion + { 22902, BZ["Zangarmarsh"], format("%s: %s", L["Vendor"], L["Seer Janidi"]) }, -- Alchemy-Recipe: Elixir of Major Frost Power + { 22907, BZ["Blade's Edge Mountains"], format("%s: %s", L["Vendor"], L["Daga Ramba"]) }, -- Alchemy-Recipe: Super Mana Potion + { 22909, BZ["Blade's Edge Mountains"], format("%s: %s", L["Vendor"], L["Daga Ramba"]) }, -- Alchemy-Recipe: Elixir of Major Defense + { 22911, BZ["Blade's Edge Mountains"], format("%s: %s", L["Vendor"], L["Daga Ramba"]) }, -- Alchemy-Recipe: Major Dreamless Sleep Potion - -- { 32071, BZ["Nagrand"], format("%s: %s", L["Merchant"], "Quartermaster Jaffrey Noreliqe") }, -- Alchemy-Recipe: Elixir of Ironskin + -- { 32071, BZ["Nagrand"], format("%s: %s", L["Vendor"], L["Quartermaster Jaffrey Noreliqe"]) }, -- Alchemy-Recipe: Elixir of Ironskin }, } @@ -4443,3 +4453,4 @@ end wipe(recipeTable) wipe(recipeFactionDuplicates) +wipe(npcList) diff --git a/Altoholic-Addon/Altoholic/Loots.lua b/Altoholic-Addon/Altoholic/Loots.lua index 9c9c434..27c5731 100644 --- a/Altoholic-Addon/Altoholic/Loots.lua +++ b/Altoholic-Addon/Altoholic/Loots.lua @@ -11,7 +11,7 @@ local GREEN = "|cFF00FF00" local lootTable, lootTableRev_Single, lootTableRev_Multi local LootSourceTooltipDB = {} -local LootSourceTooltip_VERSION = 7 +local LootSourceTooltip_VERSION = 8 local DataProviders