From 7305042eaf38ab73a7635cdcf4484cab2bb83fcc Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 21 Mar 2010 21:25:22 -0400 Subject: [PATCH 1/5] More work on ticket 946, fixing some incorrect Blacksmithing recipe flags. --- Database/Blacksmithing.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Database/Blacksmithing.lua b/Database/Blacksmithing.lua index 9df29f2..e75b8a1 100644 --- a/Database/Blacksmithing.lua +++ b/Database/Blacksmithing.lua @@ -825,14 +825,14 @@ function addon:InitBlacksmithing() self:AddRecipeFlags(16659, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL) self:AddRecipeAcquire(16659, A.WORLD_DROP, 2) - -- Dawnbringer Shoulders -- 16660 + -- Dawnbringer Shoulders -- 16660 SPECIAL WORLD DROP AddRecipe(16660, 290, 12625, Q.RARE, V.ORIG, 290, 310, 320, 330) - self:AddRecipeFlags(16660, F.ALLIANCE, F.HORDE, F.RAID, F.MOB_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.PLATE) + self:AddRecipeFlags(16660, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.PLATE) self:AddRecipeAcquire(16660, A.WORLD_DROP, 2) - -- Storm Gauntlets -- 16661 + -- Storm Gauntlets -- 16661 SPECIAL WORLD DROP AddRecipe(16661, 295, 12632, Q.RARE, V.ORIG, 295, 315, 325, 335) - self:AddRecipeFlags(16661, F.ALLIANCE, F.HORDE, F.VENDOR, F.INSTANCE, F.RAID, F.MOB_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL) + self:AddRecipeFlags(16661, F.ALLIANCE, F.HORDE, F.VENDOR, F.WORLD_DROP, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.MAIL) self:AddRecipeAcquire(16661, A.WORLD_DROP, 2, A.VENDOR, 11278) -- Thorium Leggings -- 16662 @@ -1400,9 +1400,9 @@ function addon:InitBlacksmithing() self:AddRecipeFlags(29621, F.ALLIANCE, F.HORDE, F.INSTANCE, F.MOB_DROP, F.IBOE, F.RBOP, F.TANK, F.PLATE) self:AddRecipeAcquire(29621, A.MOB, 18830) - -- Gauntlets of the Iron Tower -- 29622 + -- Gauntlets of the Iron Tower -- 29622 SPECIAL WORLD DROP AddRecipe(29622, 365, 23532, Q.EPIC, V.TBC, 365, 375, 385, 395) - self:AddRecipeFlags(29622, F.ALLIANCE, F.HORDE, F.RAID, F.IBOE, F.RBOE, F.TANK, F.PLATE) + self:AddRecipeFlags(29622, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE) self:AddRecipeAcquire(29622, A.WORLD_DROP, 4) -- Khorium Belt -- 29628 @@ -1475,9 +1475,9 @@ function addon:InitBlacksmithing() self:AddRecipeFlags(29663, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.DPS, F.MAIL) self:AddRecipeAcquire(29663, A.WORLD_DROP, 4) - -- Helm of the Stalwart Defender -- 29664 + -- Helm of the Stalwart Defender -- 29664 SPECIAL WORLD DROP AddRecipe(29664, 365, 23535, Q.EPIC, V.TBC, 365, 375, 385, 395) - self:AddRecipeFlags(29664, F.ALLIANCE, F.HORDE, F.INSTANCE, F.RAID, F.IBOE, F.RBOE, F.TANK, F.PLATE) + self:AddRecipeFlags(29664, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.IBOE, F.RBOE, F.TANK, F.PLATE) self:AddRecipeAcquire(29664, A.WORLD_DROP, 4) -- Oathkeeper's Helm -- 29668 SPECIAL WORLD DROP -- 1.7.9.5 From 1cd7432462b8725d9e4ed084add787cec0a84b55 Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 21 Mar 2010 22:24:26 -0400 Subject: [PATCH 2/5] Added 4 npcs to the trainer database that teach an engineer the transporter recipes. --- Database/Trainer.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Database/Trainer.lua b/Database/Trainer.lua index 06f78bb..5ef8aeb 100644 --- a/Database/Trainer.lua +++ b/Database/Trainer.lua @@ -171,6 +171,8 @@ function addon:InitTrainer(DB) self:addLookupList(DB, 11557, L["Meilosh"], BZ["Felwood"], 65.7, 2.9, 2) self:addLookupList(DB, 12920, L["Doctor Gregory Victor"], BZ["Arathi Highlands"], 73.4, 36.8, 2) -----IS HE REAALLY THERE TEACHING? self:addLookupList(DB, 12939, L["Doctor Gustaf VanHowzen"], BZ["Dustwallow Marsh"], 68.18, 47.94, 1) -----IS HE REAALLY THERE TEACHING? + self:addLookupList(DB, 14742, L["Zap Farflinger"], BZ["Winterspring"], 61.2, 37.6, 0) + self:addLookupList(DB, 14743, L["Jhordy Lapforge"], BZ["Tanaris"], 52.3, 26.9, 0) self:addLookupList(DB, 15400, L["Arathel Sunforge"], BZ["Eversong Woods"], 59.6, 62.6, 2) self:addLookupList(DB, 15501, L["Aleinia"], BZ["Eversong Woods"], 48.5, 47.5, 2) self:addLookupList(DB, 16160, L["Magistrix Eredania"], BZ["Eversong Woods"], 38.2, 72.6, 2) @@ -250,6 +252,8 @@ function addon:InitTrainer(DB) self:addLookupList(DB, 20124, L["Kradu Grimblade"], BZ["Shattrath City"], 69.2, 44.8, 0) self:addLookupList(DB, 20125, L["Zula Slagfury"], BZ["Shattrath City"], 70.1, 42.0, 0) self:addLookupList(DB, 21087, L["Grikka"], BZ["Blade's Edge Mountains"], 76.8, 65.5, 2) + self:addLookupList(DB, 21493, L["Kablamm Farflinger"], BZ["Netherstorm"], 32.9, 63.7, 0) + self:addLookupList(DB, 21494, L["Smiles O'Byron"], BZ["Blade's Edge Mountains"], 60.3,65.2, 0) self:addLookupList(DB, 22477, L["Anchorite Ensham"], BZ["Terokkar Forest"], 30.8, 75.9, 0) self:addLookupList(DB, 23734, L["Anchorite Yazmina"], BZ["Howling Fjord"], 59.5, 62.3, 1) self:addLookupList(DB, 24868, L["Niobe Whizzlespark"], BZ["Shadowmoon Valley"], 36.7, 54.8, 1) -- 1.7.9.5 From e0ab256b6f2e52363782ee6edabd8666984d5bbe Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 21 Mar 2010 22:24:48 -0400 Subject: [PATCH 3/5] Fixed skill levels for Smelt Fel Iron --- Database/Smelting.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Database/Smelting.lua b/Database/Smelting.lua index 52209eb..b085a59 100644 --- a/Database/Smelting.lua +++ b/Database/Smelting.lua @@ -127,7 +127,7 @@ function addon:InitSmelting() self:AddRecipeAcquire(22967, A.MOB, 14401) -- Smelt Fel Iron -- 29356 - AddRecipe(29356, 300, 23445, 1, 1, 0, 300, 307, 315) + AddRecipe(29356, 275, 23445, 1, 1, 275, 275, 300, 325) self:AddRecipeFlags(29356, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP) self:AddRecipeAcquire(29356, A.TRAINER, 18747, A.TRAINER, 18779, A.TRAINER, 26999, A.TRAINER, 33617, A.TRAINER, 28698, A.TRAINER, 26962, A.TRAINER, 26976, A.TRAINER, 33682, A.TRAINER, 26912) -- 1.7.9.5 From 24f0bc2371f3a66350f06b7195445fb81e459f4f Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 21 Mar 2010 22:26:19 -0400 Subject: [PATCH 4/5] Changed the acquire for the transporter recipes to show the trainer that teaches it --- Database/Engineering.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Database/Engineering.lua b/Database/Engineering.lua index a92e16d..0491eb7 100644 --- a/Database/Engineering.lua +++ b/Database/Engineering.lua @@ -768,12 +768,12 @@ function addon:InitEngineering() -- Dimensional Ripper - Everlook -- 23486 AddRecipe(23486, 260, 18984, Q.UNCOMMON, V.ORIG, 260, 285, 295, 305, 20222) self:AddRecipeFlags(23486, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP) - self:AddRecipeAcquire(23486, A.CUSTOM, 20) + self:AddRecipeAcquire(23486, A.TRAINER, 14742) -- Ultrasafe Transporter - Gadgetzan -- 23489 AddRecipe(23489, 260, 18986, Q.UNCOMMON, V.ORIG, 260, 285, 295, 305, 20219) self:AddRecipeFlags(23489, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP) - self:AddRecipeAcquire(23489, A.CUSTOM, 20) + self:AddRecipeAcquire(23489, A.TRAINER, 14743) -- Snake Burst Firework -- 23507 AddRecipe(23507, 250, 19026, Q.COMMON, V.ORIG, 250, 250, 260, 270) @@ -1088,12 +1088,12 @@ function addon:InitEngineering() -- Dimensional Ripper - Area 52 -- 36954 AddRecipe(36954, 350, 30542, Q.UNCOMMON, V.TBC, 350, 350, 360, 370, 20222) self:AddRecipeFlags(36954, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP) - self:AddRecipeAcquire(36954, A.CUSTOM, 20) + self:AddRecipeAcquire(36954, A.TRAINER, 21493) -- Ultrasafe Transporter - Toshley's Station -- 36955 AddRecipe(36955, 350, 30544, Q.UNCOMMON, V.TBC, 350, 350, 360, 370, 20219) self:AddRecipeFlags(36955, F.ALLIANCE, F.HORDE, F.TRAINER, F.IBOE, F.RBOP) - self:AddRecipeAcquire(36955, A.CUSTOM, 21) + self:AddRecipeAcquire(36955, A.TRAINER, 21494) -- Fused Wiring -- 39895 AddRecipe(39895, 275, 7191, Q.COMMON, V.TBC, 275, 275, 280, 285) -- 1.7.9.5 From 08f20692668e2a345e360b47dbb4cf5e71ce2365 Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 21 Mar 2010 22:27:35 -0400 Subject: [PATCH 5/5] Removed GOBLIN_ENG and GNOMISH_ENG phrases and added the the names to the 4 trainers to the localization app --- Database/Custom.lua | 4 ---- Locales/devel-enUS.lua | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Database/Custom.lua b/Database/Custom.lua index edb0320..f5f16a3 100644 --- a/Database/Custom.lua +++ b/Database/Custom.lua @@ -44,8 +44,6 @@ function addon:InitCustom(DB) -- Engineering Related self:addLookupList(DB, 16, L["ENG_GNOMER"], BZ["Gnomeregan"], 0, 0) self:addLookupList(DB, 17, L["ENG_FLOOR_ITEM_BRD"], BZ["Blackrock Depths"], 0, 0) - self:addLookupList(DB, 20, L["GOBLIN_ENG"], "N/A") - self:addLookupList(DB, 21, L["GNOMISH_ENG"], "N/A") -- Default self:addLookupList(DB, 8, L["DEFAULT_RECIPE"], "N/A") -- Crafted by other professions @@ -80,8 +78,6 @@ function addon:InitCustom(DB) --self:addLookupList(DB, 28, L["BT_HYJAL_RANDOM"], "N/A") --[[ -L["Custom20"] = "Goblin transport." -- Update -L["Custom21"] = "Gnome transport." -- Update L["Custom35"] = "Drops from dragons in Ogri'la and Blade's Edge Mountains Summon Bosses" L["Custom36"] = "From a NPC in Dalaran sewers after doing The Taste Test" -- Update L["Custom38"] = "Randomly obtained by completing the cooking daily quest in Dalaran." diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua index 94b2718..8e5349f 100644 --- a/Locales/devel-enUS.lua +++ b/Locales/devel-enUS.lua @@ -432,8 +432,6 @@ L["DAILY_COOKING_DAL"] = "Randomly obtained by completing the cooking daily ques -- Engineering Related L["ENG_GNOMER"] = "Dropped from mobs in Gnomeregan." L["ENG_FLOOR_ITEM_BRD"] = "The schematic can be found on the floor near Golem Lord Argelmach in Blackrock Depths. Only engineers with 300 skill may learn the schematic after clicking on it." -L["GOBLIN_ENG"] = "You need to be a Goblin Engineer to obtain and use this item." -L["GNOMISH_ENG"] = "You need to be a Gnomish Engineer to obtain and use this item." -- Default L["DEFAULT_RECIPE"] = "Learned by default when learning the profession." -- Crafted by other professions @@ -893,6 +891,7 @@ L["Jeeda"] = true L["Jenna Lemkenilli"] = true L["Jennabink Powerseam"] = true L["Jessara Cordell"] = true +L["Jhordy Lapforge"] = true L["Jim Saltit"] = true L["Jinky Twizzlefixxit"] = true L["Jo'mah"] = true @@ -912,6 +911,7 @@ L["Juno Dufrain"] = true L["Timofey Oshenko"] = true L["Jutak"] = true L["K. Lee Smallfry"] = true +L["Kablamm Farflinger"] = true L["Kaita Deepforge"] = true L["Kalaen"] = true L["Kalinda"] = true @@ -1212,6 +1212,7 @@ L["Skeletal Runesmith"] = true L["Skreah"] = true L["Slagg"] = true L["Slavering Ghoul"] = true +L["Smiles O'Byron"] = true L["Smith Argus"] = true L["Smudge Thunderwood"] = true L["Son of Arkkoroc"] = true @@ -1372,6 +1373,7 @@ L["Zan Shivsproket"] = true L["Zannok Hidepiercer"] = true L["Zansoa"] = true L["Zantasia"] = true +L["Zap Farflinger"] = true L["Zaralda"] = true L["Zarena Cromwind"] = true L["Zargh"] = true -- 1.7.9.5