From 03c8045a2b1ff1fc4ae0427182e363402a74e9a5 Mon Sep 17 00:00:00 2001 From: mike Date: Sun, 4 Apr 2010 00:44:40 -0400 Subject: [PATCH 1/4] Trim trailing space --- ARL.lua | 2 +- Datamine.lua | 8 ++++---- Frame.lua | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ARL.lua b/ARL.lua index bc5f820..96bbcc4 100644 --- a/ARL.lua +++ b/ARL.lua @@ -826,7 +826,7 @@ end do local SF = private.recipe_state_flags - + ------------------------------------------------------------------------------- -- Recipe member functions for bit flags. ------------------------------------------------------------------------------- diff --git a/Datamine.lua b/Datamine.lua index 16452a4..28f826d 100644 --- a/Datamine.lua +++ b/Datamine.lua @@ -1652,9 +1652,9 @@ do local targetname = UnitName("target") -- Get its name local targetID = tonumber(string.sub(UnitGUID("target"), -12, -7), 16) -- Get the NPC ID local added = false - + twipe(output) - + tinsert(output, "Vendor Name: "..targetname.." NPC ID: "..targetID) -- Parse all the items on the merchant for i = 1, GetMerchantNumItems(), 1 do @@ -1810,7 +1810,7 @@ do ------------------------------------------------------------------------------- [32441] = true, [32443] = true, [12687] = true, [12714] = true, [12688 ] = true, [35211] = true, [35209] = true, [35210] = true, [12706] = true, [7982] = true, - [12718] = true, [23621] = true, [35208] = true, [12716] = true, [23632] = true, + [12718] = true, [23621] = true, [35208] = true, [12716] = true, [23632] = true, [23633] = true, [30324] = true, [23637] = true, [31393] = true,[22221] = true, [12690] = true, [31394] = true,[31395] = true,[23630] = true,[23629] = true,[7978] = true, [41120] = true, [12717] = true,[22219] = true,[23627] = true, @@ -1821,7 +1821,7 @@ do [35196] = true, [21734] = true, [18292] = true, [21727] = true, [21735] = true, [16053] = true, [21729] = true, [16047] = true,[21730] = true,[21731] = true,[21732] = true,[4411] = true, [21733] = true, [21728] = true, [35186] = true, [18655] = true, - + ------------------------------------------------------------------------------- --Enchanting ------------------------------------------------------------------------------- diff --git a/Frame.lua b/Frame.lua index fd141dc..b496285 100644 --- a/Frame.lua +++ b/Frame.lua @@ -2595,7 +2595,7 @@ do ScrollBar:SetValue(cur_val) end end - + ScrollUpButton:SetScript("OnClick", function(self, button, down) ScrollBar_Scroll(1) @@ -3215,7 +3215,7 @@ do local function ExpandTrainerData(entry_index, entry_type, parent_entry, id_num, recipe_id, hide_location, hide_type) local trainer = private.trainer_list[id_num] - + if not CanDisplayFaction(trainer.faction) then return entry_index end @@ -3518,7 +3518,7 @@ do local expand = false local type = "subheader" local t = AcquireTable() - + -- Add World Drop entries as normal entries. if affiliation == "world_drop" then expand = true -- 1.7.9.5 From 8b3a66c0294bf78594b3152b64bd8d3ce81aa388 Mon Sep 17 00:00:00 2001 From: mike Date: Sun, 4 Apr 2010 01:15:37 -0400 Subject: [PATCH 2/4] Added Mera Mistrunner to the Vendor database. --- Database/Vendor.lua | 1 + Locales/devel-enUS.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/Database/Vendor.lua b/Database/Vendor.lua index 429ba14..06ab69c 100644 --- a/Database/Vendor.lua +++ b/Database/Vendor.lua @@ -377,6 +377,7 @@ function addon:InitVendor(DB) self:addLookupList(DB, 32763, L["Sairuk"], BZ["Dragonblight"], 48.5, 75.7, 0) self:addLookupList(DB, 32773, L["Logistics Officer Brighton"], BZ["Howling Fjord"], 59.7, 63.9, 1) self:addLookupList(DB, 32774, L["Sebastian Crane"], BZ["Howling Fjord"], 79.6, 30.7, 2) + self:addLookupList(DB, 33595, L["Mera Mistrunner"], BZ["Icecrown"], 72.4, 20.9, 0) self:addLookupList(DB, 33602, L["Anuur"], BZ["Icecrown"], 71.4, 20.8, 0) self:addLookupList(DB, 33637, L["Kirembri Silvermane"], BZ["Shattrath City"], 58.1, 75.0, 0) self:addLookupList(DB, 33680, L["Nemiha"], BZ["Shattrath City"], 36.1, 47.7, 0) diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua index 09fbffc..956fd49 100644 --- a/Locales/devel-enUS.lua +++ b/Locales/devel-enUS.lua @@ -1034,6 +1034,7 @@ L["Mazk Snipeshot"] = true L["Me'lynn"] = true L["Meilosh"] = true L["Melaris"] = true +L["Mera Mistrunner"] = true L["Miall"] = true L["Miao'zan"] = true L["Micha Yance"] = true -- 1.7.9.5 From e38e332bb9de92e81349f6e02ffa6180d0a9beb7 Mon Sep 17 00:00:00 2001 From: mike Date: Sun, 4 Apr 2010 01:22:40 -0400 Subject: [PATCH 3/4] Added a missing vendor entry to a bunch of Cooking recipes --- Database/Cooking.lua | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Database/Cooking.lua b/Database/Cooking.lua index 2310622..54b07e4 100644 --- a/Database/Cooking.lua +++ b/Database/Cooking.lua @@ -680,27 +680,27 @@ function addon:InitCooking() -- Mega Mammoth Meal -- 45555 AddRecipe(45555, 400, 34754, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45555, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(45555, 31031, 31032) + self:AddRecipeVendor(45555, 31031, 31032, 33595) -- Tender Shoveltusk Steak -- 45556 AddRecipe(45556, 400, 34755, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45556, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(45556, 31031, 31032) + self:AddRecipeVendor(45556, 31031, 31032, 33595) -- Spiced Worm Burger -- 45557 AddRecipe(45557, 400, 34756, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45557, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(45557, 31031, 31032) + self:AddRecipeVendor(45557, 31031, 31032, 33595) -- Very Burnt Worg -- 45558 AddRecipe(45558, 400, 34757, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45558, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(45558, 31031, 31032) + self:AddRecipeVendor(45558, 31031, 31032, 33595) -- Mighty Rhino Dogs -- 45559 AddRecipe(45559, 400, 34758, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45559, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(45559, 31031, 31032) + self:AddRecipeVendor(45559, 31031, 31032, 33595) -- Smoked Rockfin -- 45560 AddRecipe(45560, 350, 34759, Q.COMMON, V.WOTLK, 350, 350, 365, 380) @@ -740,12 +740,12 @@ function addon:InitCooking() -- Poached Northern Sculpin -- 45567 AddRecipe(45567, 400, 34766, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45567, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(45567, 31031, 31032) + self:AddRecipeVendor(45567, 31031, 31032, 33595) -- Firecracker Salmon -- 45568 AddRecipe(45568, 400, 34767, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45568, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(45568, 31031, 31032) + self:AddRecipeVendor(45568, 31031, 31032, 33595) -- Baked Manta Ray -- 45569 AddRecipe(45569, 350, 42942, Q.COMMON, V.WOTLK, 350, 350, 382, 415) @@ -760,7 +760,7 @@ function addon:InitCooking() -- Spicy Blue Nettlefish -- 45571 AddRecipe(45571, 400, 34768, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45571, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(45571, 31031, 31032) + self:AddRecipeVendor(45571, 31031, 31032, 33595) -- Captain Rumsey's Lager -- 45695 AddRecipe(45695, 100, 34832, Q.UNCOMMON, V.WOTLK, 100, 100, 105, 110) @@ -792,7 +792,7 @@ function addon:InitCooking() -- Fish Feast -- 57423 AddRecipe(57423, 450, 43015, Q.UNCOMMON, V.WOTLK, 450, 455, 460, 465) self:AddRecipeFlags(57423, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(57423, 31031, 31032) + self:AddRecipeVendor(57423, 31031, 31032, 33595) -- Spicy Fried Herring -- 57433 AddRecipe(57433, 400, 42993, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) @@ -802,52 +802,52 @@ function addon:InitCooking() -- Rhinolicious Wormsteak -- 57434 AddRecipe(57434, 400, 42994, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57434, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS, F.TANK) - self:AddRecipeVendor(57434, 31031, 31032) + self:AddRecipeVendor(57434, 31031, 31032, 33595) -- Critter Bites -- 57435 AddRecipe(57435, 400, 43004, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57435, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(57435, 31031, 31032) + self:AddRecipeVendor(57435, 31031, 31032, 33595) -- Hearty Rhino -- 57436 AddRecipe(57436, 400, 42995, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57436, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(57436, 31031, 31032) + self:AddRecipeVendor(57436, 31031, 31032, 33595) -- Snapper Extreme -- 57437 AddRecipe(57437, 400, 42996, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57437, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(57437, 31031, 31032) + self:AddRecipeVendor(57437, 31031, 31032, 33595) -- Blackened Worg Steak -- 57438 AddRecipe(57438, 400, 42997, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57438, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(57438, 31031, 31032) + self:AddRecipeVendor(57438, 31031, 31032, 33595) -- Cuttlesteak -- 57439 AddRecipe(57439, 400, 42998, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57439, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(57439, 31031, 31032) + self:AddRecipeVendor(57439, 31031, 31032, 33595) -- Spiced Mammoth Treats -- 57440 AddRecipe(57440, 400, 43005, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57440, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(57440, 31031, 31032) + self:AddRecipeVendor(57440, 31031, 31032, 33595) -- Blackened Dragonfin -- 57441 AddRecipe(57441, 400, 42999, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57441, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(57441, 31031, 31032) + self:AddRecipeVendor(57441, 31031, 31032, 33595) -- Dragonfin Filet -- 57442 AddRecipe(57442, 400, 43000, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57442, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.DPS) - self:AddRecipeVendor(57442, 31031, 31032) + self:AddRecipeVendor(57442, 31031, 31032, 33595) -- Tracker Snacks -- 57443 AddRecipe(57443, 400, 43001, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57443, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(57443, 31031, 31032) + self:AddRecipeVendor(57443, 31031, 31032, 33595) -- Dalaran Clam Chowder -- 58065 AddRecipe(58065, 350, 43268, Q.COMMON, V.WOTLK, 350, 350, 382, 415) @@ -877,17 +877,17 @@ function addon:InitCooking() -- Gigantic Feast -- 58527 AddRecipe(58527, 425, 43478, Q.UNCOMMON, V.WOTLK, 425, 435, 455, 475) self:AddRecipeFlags(58527, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(58527, 31031, 31032) + self:AddRecipeVendor(58527, 31031, 31032, 33595) -- Small Feast -- 58528 AddRecipe(58528, 425, 43480, Q.UNCOMMON, V.WOTLK, 425, 435, 455, 475) self:AddRecipeFlags(58528, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(58528, 31031, 31032) + self:AddRecipeVendor(58528, 31031, 31032, 33595) -- Worg Tartare -- 62350 AddRecipe(62350, 400, 44953, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(62350, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(62350, 31031, 31032) + self:AddRecipeVendor(62350, 31031, 31032, 33595) -- Clamlette Magnifique -- 64054 AddRecipe(64054, 250, 33004, Q.COMMON, V.WOTLK, 250, 250, 275, 300) -- 1.7.9.5 From 1574eba9a2beae896efc5039e8ec082f76e318a7 Mon Sep 17 00:00:00 2001 From: mike Date: Sun, 4 Apr 2010 01:31:28 -0400 Subject: [PATCH 4/4] oops forget to add the vendor id added in last commit to 2 Cooking recipes --- Database/Cooking.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Database/Cooking.lua b/Database/Cooking.lua index 54b07e4..c7e84ed 100644 --- a/Database/Cooking.lua +++ b/Database/Cooking.lua @@ -755,7 +755,7 @@ function addon:InitCooking() -- Imperial Manta Steak -- 45570 AddRecipe(45570, 400, 34769, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(45570, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP) - self:AddRecipeVendor(45570, 31031, 31032) + self:AddRecipeVendor(45570, 31031, 31032, 33595) -- Spicy Blue Nettlefish -- 45571 AddRecipe(45571, 400, 34768, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) @@ -797,7 +797,7 @@ function addon:InitCooking() -- Spicy Fried Herring -- 57433 AddRecipe(57433, 400, 42993, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) self:AddRecipeFlags(57433, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOP, F.HEALER, F.CASTER) - self:AddRecipeVendor(57433, 31031, 31032) + self:AddRecipeVendor(57433, 31031, 31032, 33595) -- Rhinolicious Wormsteak -- 57434 AddRecipe(57434, 400, 42994, Q.UNCOMMON, V.WOTLK, 400, 400, 420, 460) -- 1.7.9.5