Merge pull request #32 from kaeza/master

Constructor now digs node drops instead of actual nodes.
This commit is contained in:
Jordan Snelling 2013-06-18 06:52:34 -07:00
commit e718c73b36

View File

@ -276,11 +276,21 @@ deploy_node =function (inv, slot_name, pos1, node1, node)
if node1.name == "air" then if node1.name == "air" then
if not inv:is_empty(slot_name) then if not inv:is_empty(slot_name) then
stack1=inv:get_list(slot_name) stack1=inv:get_list(slot_name)
local def = stack1[1]:get_definition()
if def.type == "node" then
node_to_be_placed={name=stack1[1]:get_name(), param1=0, param2=node.param2} node_to_be_placed={name=stack1[1]:get_name(), param1=0, param2=node.param2}
minetest.env:set_node(pos1,node_to_be_placed) minetest.env:set_node(pos1,node_to_be_placed)
stack1[1]:take_item() stack1[1]:take_item()
inv:set_stack(slot_name, 1, stack1[1]) inv:set_stack(slot_name, 1, stack1[1])
return elseif def.type == "craft" then
minetest.item_place_object(stack1[1], nil, {
-- Fake pointed_thing
type = "node",
above = pos1,
under = pos1,
})
inv:set_stack(slot_name, 1, nil)
end
end end
return return
end end
@ -291,8 +301,28 @@ if node1.name == "air" then
node1.name == "default:water_flowing" node1.name == "default:water_flowing"
then return end then return end
if inv:room_for_item(slot_name,node1) then if inv:room_for_item(slot_name,node1) then
inv:add_item(slot_name,node1) local def = minetest.registered_nodes[node1.name]
if not def then return end
local drop = def.drop or node1.name
if type(drop) == "table" then
local pr = PseudoRandom(math.random())
local c = 0
local loop = 0 -- Prevent infinite loop
while (c < (drop.max_items or 1)) and (loop < 1000) do
local i = math.floor(pr:next(1, #drop.items))
if pr:next(1, drop.items[i].rarity or 1) == 1 then
for _,item in ipairs(drop.items[i].items) do
inv:add_item(slot_name,item)
end
c = c + 1
end
loop = loop + 1
end
minetest.env:remove_node(pos1) minetest.env:remove_node(pos1)
elseif type(drop) == "string" then
inv:add_item(slot_name,drop)
minetest.env:remove_node(pos1)
end
end end
end end