diff data.lua @ 93:c369a2e16ab6

Added prospecting and common data
author contrebasse
date Thu, 19 May 2011 20:25:41 +0200
parents 996aaa818d04
children b980c00affcd
line wrap: on
line diff
--- a/data.lua	Tue May 17 18:35:24 2011 +0200
+++ b/data.lua	Thu May 19 20:25:41 2011 +0200
@@ -3,7 +3,7 @@
 -- @todo: enchants, elementals, prospecting
 -- @todo improve scanning
 
-A.data = {}
+A.data = A.CommonData
 
 do
 	-- lua functions
@@ -70,11 +70,15 @@
 				-- item ID
 				local itemID = A.link2ID(GetTradeSkillItemLink(i))
 
-				-- reagent ID, valid only if there's only one reagent as we take only the first one
-				local reagentID = A.link2ID(GetTradeSkillReagentItemLink(i, 1))
+				local numReagents = GetTradeSkillNumReagents(i)
+				local reagentID, reagentCount
+				if numReagents==1 then
+					-- reagent ID
+					reagentID = A.link2ID(GetTradeSkillReagentItemLink(i, 1))
 
-				-- reagent number needed
-				local _, _, reagentCount, _ = GetTradeSkillReagentInfo(i, 1)
+					-- reagent number needed
+					reagentCount = select(3,GetTradeSkillReagentInfo(i, 1))
+				end
 
 				-- number of reagent created by the recipe
 				local minMade, maxMade = GetTradeSkillNumMade(i)
@@ -83,7 +87,7 @@
 				local recipeLink = GetTradeSkillRecipeLink(i)
 
 				-- error checking
-				if itemID and reagentID and reagentCount and minMade and maxMade and recipeLink then
+				if itemID and (numReagents ~= 1 or (reagentID and reagentCount)) and minMade and maxMade and recipeLink then
 					-- remove unneeded minMade/maxMade
 					if maxMade==minMade then
 						maxMade = nil
@@ -111,7 +115,6 @@
 						spell.spellName = tradeskillName
 						spell.spellLink = recipeLink
 						spell.header = lastHeader
-						spell.manyReagents = GetTradeSkillNumReagents(i)>1
 						tinsert(A.data[itemID],spell)
 					end