MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1.7.10 compatibility

Browse Source
This commit is contained in:
kepler155c
2018-02-18 12:29:03 -05:00
parent ebad012099
commit 74fb1d0fbc
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apis/turtle/craft.lua
View File

@@ -163,10 +163,10 @@ end
-- determine the full list of ingredients needed to craft -- determine the full list of ingredients needed to craft
-- a quantity of a recipe. -- a quantity of a recipe.
function Craft.getResourceList(recipe, items, inCount) function Craft.getResourceList(inRecipe, items, inCount)
local summed = { } local summed = { }
local function sumItems(key, count) local function sumItems(recipe, key, count)
local item = itemDB:splitKey(key) local item = itemDB:splitKey(key)
local summedItem = summed[key] local summedItem = summed[key]
if not summedItem then if not summedItem then
@@ -183,17 +183,15 @@ function Craft.getResourceList(recipe, items, inCount)
local used = math.min(summedItem.count, total) local used = math.min(summedItem.count, total)
local need = total - used local need = total - used
if summedItem.recipe and summedItem.recipe.craftingTools and summedItem.recipe.craftingTools[key] then if recipe.craftingTools and recipe.craftingTools[key] then
summedItem.total = 1 summedItem.total = 1
if summedItem.count > 0 then if summedItem.count > 0 then
summedItem.used = 1 summedItem.used = 1
summedItem.need = 0 summedItem.need = 0
need = 0 need = 0
else elseif not summedItem.recipe then
if not summedItem.recipe then summedItem.need = 1
summedItem.need = 1 need = 1
need = 1
end
end end
else else
summedItem.total = summedItem.total + total summedItem.total = summedItem.total + total
@@ -207,13 +205,13 @@ function Craft.getResourceList(recipe, items, inCount)
if need > 0 and summedItem.recipe then if need > 0 and summedItem.recipe then
need = math.ceil(need / summedItem.recipe.count) need = math.ceil(need / summedItem.recipe.count)
for ikey,iqty in pairs(Craft.sumIngredients(summedItem.recipe)) do for ikey,iqty in pairs(Craft.sumIngredients(summedItem.recipe)) do
sumItems(ikey, math.ceil(need * iqty)) sumItems(summedItem.recipe, ikey, math.ceil(need * iqty))
end end
end end
end end
inCount = math.ceil(inCount / recipe.count) inCount = math.ceil(inCount / inRecipe.count)
for ikey,iqty in pairs(Craft.sumIngredients(recipe)) do for ikey,iqty in pairs(Craft.sumIngredients(inRecipe)) do
sumItems(ikey, math.ceil(inCount * iqty)) sumItems(ikey, math.ceil(inCount * iqty))
end end