From 9c4bda21ab4d217cd01d731f4a7b7bdde3fbbd49 Mon Sep 17 00:00:00 2001 From: ackis Date: Mon, 27 Apr 2009 18:14:41 +0000 Subject: [PATCH] Implement the auto-populate of the database for trade skill stuff. Fix the naxx entries being flagged wrong. Added a few missing trainers to the localization and to the database. --- ARLDatamine.lua | 41 +++++++++++++++++++++++++++++++++++++++-- AckisRecipeList.lua | 4 +++- Locals/testenUS.lua | 4 ++++ RecipeDB/ARL-Custom.lua | 2 +- RecipeDB/ARL-Trainer.lua | 2 ++ 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ARLDatamine.lua b/ARLDatamine.lua index 84af9e3..959b7a4 100644 --- a/ARLDatamine.lua +++ b/ARLDatamine.lua @@ -89,10 +89,47 @@ end function addon:ScanTrainerData() local recipelist = addon:GetRecipeTable() + local dbloaded if (not recipelist) then - self:Print(L["DATAMINER_NODB_ERROR"]) - return + if (addon.db.profile.autoloaddb) then + dbloaded, recipelist = self:InitRecipeData() + if (not dbloaded) then + return + else + self:AddRecipeData(GetSpellInfo(51304)) + self:AddRecipeData(GetSpellInfo(2018)) + self:AddRecipeData(GetSpellInfo(51296)) + self:AddRecipeData(GetSpellInfo(7411)) + self:AddRecipeData(GetSpellInfo(51306)) + self:AddRecipeData(GetSpellInfo(45542)) + self:AddRecipeData(GetSpellInfo(51302)) + self:AddRecipeData(GetSpellInfo(2575)) + self:AddRecipeData(GetSpellInfo(3908)) + self:AddRecipeData(GetSpellInfo(25229)) + self:AddRecipeData(GetSpellInfo(45357)) + self:AddRecipeData(GetSpellInfo(53428)) + end + else + self:Print(L["DATAMINER_NODB_ERROR"]) + return + end + else + -- Recipe DB exists, we just need to populate it now + if (addon.db.profile.autoloaddb) then + self:AddRecipeData(GetSpellInfo(51304)) + self:AddRecipeData(GetSpellInfo(2018)) + self:AddRecipeData(GetSpellInfo(51296)) + self:AddRecipeData(GetSpellInfo(7411)) + self:AddRecipeData(GetSpellInfo(51306)) + self:AddRecipeData(GetSpellInfo(45542)) + self:AddRecipeData(GetSpellInfo(51302)) + self:AddRecipeData(GetSpellInfo(2575)) + self:AddRecipeData(GetSpellInfo(3908)) + self:AddRecipeData(GetSpellInfo(25229)) + self:AddRecipeData(GetSpellInfo(45357)) + self:AddRecipeData(GetSpellInfo(53428)) + end end -- Make sure the target exists and is a NPC diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index 1ce9271..6378431 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -164,6 +164,7 @@ function addon:OnInitialize() worldmap = true, autoscanmap = false, scantrainers = false, + autoloaddb = false, -- Recipe Exclusion exclusionlist = {}, @@ -1589,6 +1590,7 @@ do --@debug@ if (not TrainerList[recipeacquire[i]["ID"]]) then self:Print("Missing trainer in database: " .. recipeacquire[i]["ID"]) + return end --@end-debug@ local location = TrainerList[recipeacquire[i]["ID"]]["Location"] @@ -1901,7 +1903,7 @@ do --- Initialize the recipe database with a specific profession. -- @name AckisRecipeList:AddRecipeData - -- @usage AckisRecipeList:AddRecipeData(51304) + -- @usage AckisRecipeList:AddRecipeData(GetSpellInfo(51304)) -- @param profession Spell ID of the profession which you want to populate the database with. -- @return Boolean indicating if the operation was successful. The recipe database will be populated with appropriate data. function addon:AddRecipeData(profession) diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua index 4c285cb..376ba0d 100644 --- a/Locals/testenUS.lua +++ b/Locals/testenUS.lua @@ -1742,3 +1742,7 @@ L["Namha Moonwater"] = true L["Custom41"] = "Removed from the game when Naxx 40 was taken out." L["AUTOLOAD_DB_DESC"] = "Automatically loads all of the ARL recipe databases when doing a datamining scan." L["Auto Load Recipe Database"] = true +L["Orland Schaeffer"] = true +L["Imindril Spearsong"] = true + + diff --git a/RecipeDB/ARL-Custom.lua b/RecipeDB/ARL-Custom.lua index 86f8c79..fb69593 100644 --- a/RecipeDB/ARL-Custom.lua +++ b/RecipeDB/ARL-Custom.lua @@ -70,7 +70,7 @@ function addon:InitCustom(CustomDB) self:addLookupList(CustomDB,38,L["Custom38"],"N/A") self:addLookupList(CustomDB,39,L["Custom39"],"N/A") self:addLookupList(CustomDB,40,L["Custom40"],"N/A") - self:addLookupList(CustomDB,41,L["Custom40"],"N/A") + self:addLookupList(CustomDB,41,L["Custom41"],"N/A") end diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua index 5bcdec1..a94f8a3 100644 --- a/RecipeDB/ARL-Trainer.lua +++ b/RecipeDB/ARL-Trainer.lua @@ -398,6 +398,8 @@ function addon:InitTrainer(TrainerDB) self:addLookupList(TrainerDB,29195,L["Lady Alistra"],BZONE["Eastern Plaguelands"],83.69,43.89,0) self:addLookupList(TrainerDB,29196,L["Lord Thorval"],BZONE["Eastern Plaguelands"],80.99,48.09,0) self:addLookupList(TrainerDB,29233,L["Nurse Applewood"],BZONE["Borean Tundra"],42.08,54.59,2) + self:addLookupList(TrainerDB,29505,L["Imindril Spearsong"],BZONE["Dalaran"],45.5,28.6,0) + self:addLookupList(TrainerDB,29506,L["Orland Schaeffer"],BZONE["Dalaran"],45.0,28.40,0) self:addLookupList(TrainerDB,29507,L["Manfred Staller"],BZONE["Dalaran"],34.20,29.50,0) self:addLookupList(TrainerDB,29508,L["Andellion"],BZONE["Dalaran"],34.40,27.30,0) self:addLookupList(TrainerDB,29509,L["Namha Moonwater"],BZONE["Dalaran"],36.25,29.65,0) -- 1.7.9.5