MTSR/xdecor-libre
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Work Table : fix output's taking in some particular swaps

Browse Source
This commit is contained in:
jp 2015-12-27 17:26:06 +01:00
parent 573c6e7dec
commit c7b8f43066
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worktable.lua
View File

@ -355,16 +355,16 @@ function worktable.put(_, listname, _, stack, _)
end end
function worktable.take(pos, listname, _, stack, player) function worktable.take(pos, listname, _, stack, player)
if listname == "forms" then
local inv = minetest.get_meta(pos):get_inventory() local inv = minetest.get_meta(pos):get_inventory()
local user_inv = player:get_inventory() local user_inv = player:get_inventory()
local inputstack = inv:get_stack("input", 1):get_name() local inputstack = inv:get_stack("input", 1):get_name()
local mod, node = inputstack:match("([%w_]+):([%w_]+)")
if listname == "forms" then if inputstack == stack:get_name():match("^([%w_:]+)%_%w+$") and
if worktable.contains(nodes[mod], node) and
user_inv:room_for_item("main", stack:get_name()) then user_inv:room_for_item("main", stack:get_name()) then
return -1 return -1
end end
return 0 return 0
elseif listname == "inv_items_list" or listname == "item_craft_input" or elseif listname == "inv_items_list" or listname == "item_craft_input" or
listname == "craft_output_recipe" then listname == "craft_output_recipe" then
@ -406,14 +406,15 @@ local function update_inventory(inv, inputstack)
local output = {} local output = {}
for _, n in pairs(def) do for _, n in pairs(def) do
local mat = inputstack:get_name()
local input = inv:get_stack("input", 1) local input = inv:get_stack("input", 1)
local mod, node = mat:match("([%w_]+):([%w_]+)") local count = math.min(n[2] * input:get_count(), input:get_stack_max())
local count = math.min(n[2] * input:get_count(), inputstack:get_stack_max()) local mat = inputstack:get_name()
local out = inv:get_stack("forms", 1):get_name()
if not worktable.contains(nodes[mod], node) then if out ~= "" and mat ~= out:match("^([%w_:]+)%_%w+$") then
return return
end end
output[#output+1] = mat.."_"..n[1].." "..count output[#output+1] = mat.."_"..n[1].." "..count
end end