Clean up constructor
authorShadowNinja <shadowninja@minetest.net>
Mon, 21 Jul 2014 05:52:13 +0000 (01:52 -0400)
committerShadowNinja <shadowninja@minetest.net>
Mon, 21 Jul 2014 05:52:13 +0000 (01:52 -0400)
technic/machines/other/constructor.lua

index 52feef8b0a58c7207b35bddba07d64453642b0a7..3396ac76835f26f9819543ee6a3f471965cb362d 100644 (file)
@@ -1,75 +1,67 @@
 
 local S = technic.getter
 
-local function deploy_node(inv, slot_name, pos1, node1, node)
-       if node1.name == "air" then 
-               if not inv:is_empty(slot_name) then
-                       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}
-                               minetest.set_node(pos1,node_to_be_placed)
-                               stack1[1]:take_item()
-                               inv:set_stack(slot_name, 1, stack1[1])
-                       elseif def.type == "craft" then
-                               if def.on_place then
-                                       -- print("deploy_node: item has on_place. trying...")
-                                       local ok, stk = pcall(def.on_place, stack1[1], nil, {
-                                               -- Fake pointed_thing
-                                               type = "node",
-                                               above = pos1,
-                                               under = { x=pos1.x, y=pos1.y-1, z=pos1.z },
-                                       })
-                                       if ok then
-                                               -- print("deploy_node: on_place succeeded!")
-                                               inv:set_stack(slot_name, 1, stk or stack1[1])
-                                               return
-                                       -- else
-                                               -- print("deploy_node: WARNING: error while running on_place: "..tostring(stk))
-                                       end
-                               end
-                               minetest.item_place_object(stack1[1], nil, {
-                                       -- Fake pointed_thing
-                                       type = "node",
-                                       above = pos1,
-                                       under = pos1,
-                               })
-                               inv:set_stack(slot_name, 1, nil)
+local function deploy_node(inv, slot_name, pos, node, machine_node)
+       if node.name ~= "air" then
+               if node.name == "ignore" or
+                  node.name == "default:lava_source" or
+                  node.name == "default:lava_flowing" or
+                  node.name == "default:water_source" or
+                  node.name == "default:water_flowing" then
+                       return
+               end
+               local drops = minetest.get_node_drops(node.name, "")
+               local remove_to = false
+               for i, item in ipairs(drops) do
+                       if not inv:room_for_item(slot_name, item) then
+                               remove_to = i - 1
+                               break
+                       end
+                       inv:add_item(slot_name, item)
+               end
+               if remove_to then
+                       for i = 1, remove_to do
+                               inv:remove_item(drops[i])
                        end
+               else
+                       minetest.remove_node(pos)
                end
-               return 
+               return
        end
-       if node1.name == "ignore" or
-          node1.name == "default:lava_source" or
-          node1.name == "default:lava_flowing" or
-          node1.name == "default:water_source" or
-          node1.name == "default:water_flowing" 
-          then return end
-       if inv:room_for_item(slot_name,node1) then
-               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
+       if not inv:is_empty(slot_name) then
+               local stack = inv:get_list(slot_name)[1]
+               local def = stack:get_definition()
+               if def.type == "node" then
+                       minetest.set_node(pos, {
+                               name = stack:get_name(),
+                               param2 = machine_node.param2
+                       })
+                       stack:take_item()
+                       inv:set_stack(slot_name, 1, stack)
+               elseif def.type == "craft" then
+                       if def.on_place then
+                               -- Use pcall to avoid nil placer errors.
+                               -- TODO: Do without pcall.
+                               local ok, stk = pcall(def.on_place, stack, nil, {
+                                       -- Fake pointed_thing
+                                       type = "node",
+                                       above = pos,
+                                       under = {x=pos.x, y=pos.y-1, z=pos.z},
+                               })
+                               if ok then
+                                       inv:set_stack(slot_name, 1, stk or stack)
+                                       return
                                end
-                               loop = loop + 1
                        end
-                       minetest.remove_node(pos1)
-               elseif type(drop) == "string" then
-                       inv:add_item(slot_name,drop)
-                       minetest.remove_node(pos1)
+                       minetest.item_place_object(stack, nil, {
+                               -- Fake pointed_thing
+                               type = "node",
+                               above = pos,
+                               under = pos,
+                       })
+                       inv:set_stack(slot_name, 1, nil)
                end
        end
-
 end
 
 minetest.register_craft({
@@ -92,273 +84,106 @@ minetest.register_craft({
 
 })
 
-local function mk1_on(pos, node)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       local pos1={}
-       pos1.x=pos.x
-       pos1.y=pos.y
-       pos1.z=pos.z
-       if node.param2==3 then pos1.x=pos1.x+1 end
-       if node.param2==2 then pos1.z=pos1.z+1 end
-       if node.param2==1 then pos1.x=pos1.x-1 end
-       if node.param2==0 then pos1.z=pos1.z-1 end
-
-       if node.name == "technic:constructor_mk1_off" then
-               technic.swap_node(pos,"technic:constructor_mk1_on")
-               nodeupdate(pos)
-               local node1=minetest.get_node(pos1)
-               deploy_node (inv,"slot1",pos1,node1,node)
-       end
-end
-
-local function mk1_off(pos, node)
-       if node.name == "technic:constructor_mk1_on" then
-               technic.swap_node(pos,"technic:constructor_mk1_off")
-               nodeupdate(pos)
-       end
-end
-
-
-minetest.register_node("technic:constructor_mk1_off", {
-       description = S("Constructor Mk%d"):format(1),
-       tile_images = {"technic_constructor_mk1_top_off.png","technic_constructor_mk1_bottom_off.png","technic_constructor_mk1_side2_off.png","technic_constructor_mk1_side1_off.png",
-                       "technic_constructor_back.png","technic_constructor_front_off.png"},
-       is_ground_content = true,
-       paramtype2 = "facedir",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon_receptor_off = 1, mesecon_effector_off = 1, mesecon = 2},
-       mesecons= {effector={action_on=mk1_on}},
-       sounds = default.node_sound_stone_defaults(),
-       on_construct = function(pos)
-       local meta = minetest.get_meta(pos)
-       meta:set_string("formspec",
-                               "invsize[8,9;]"..
-                               "label[0,0;"..S("Constructor Mk%d"):format(1).."]"..
-                               "label[5,0;"..S("Slot %d"):format(1).."]"..
-                               "list[current_name;slot1;6,0;1,1;]"..
-                               "list[current_player;main;0,5;8,4;]")
-               meta:set_string("infotext", S("Constructor Mk%d"):format(1))
-               local inv = meta:get_inventory()
-               inv:set_size("slot1", 1)
-       end,
-
-       can_dig = function(pos,player)
+local function make_on(mark, length)
+       return function(pos, node)
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
-               return inv:is_empty("slot1")
-       end,    
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
-
-minetest.register_node("technic:constructor_mk1_on", {
-       description = S("Constructor Mk%d"):format(1),
-       tile_images = {"technic_constructor_mk1_top_on.png","technic_constructor_mk1_bottom_on.png","technic_constructor_mk1_side2_on.png","technic_constructor_mk1_side1_on.png",
-                       "technic_constructor_back.png","technic_constructor_front_on.png"},
-       paramtype2 = "facedir",
-       drop = "technic:constructor_mk1_off",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,mesecon = 2,not_in_creative_inventory=1},
-       mesecons= {effector={action_off=mk1_off}},
-       sounds = default.node_sound_stone_defaults(),
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
-
-
---Constructor Mk2
-
-local function mk2_on(pos, node)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       local pos1={}
-       local pos2={}
-       pos1.x=pos.x
-       pos1.y=pos.y
-       pos1.z=pos.z
-       pos2.x=pos.x
-       pos2.y=pos.y
-       pos2.z=pos.z
-       if node.param2==3 then pos1.x=pos1.x+1 pos2.x=pos2.x+2 end
-       if node.param2==2 then pos1.z=pos1.z+1 pos2.z=pos2.z+2 end
-       if node.param2==1 then pos1.x=pos1.x-1 pos2.x=pos2.x-2 end
-       if node.param2==0 then pos1.z=pos1.z-1 pos2.z=pos2.z-2 end
-
-       if node.name == "technic:constructor_mk2_off" then
-               technic.swap_node(pos,"technic:constructor_mk2_on")
-               nodeupdate(pos)
-               local node1=minetest.get_node(pos1)
-               deploy_node (inv,"slot1",pos1,node1,node)
-               local node1=minetest.get_node(pos2)     
-               deploy_node (inv,"slot2",pos2,node1,node)
+               local dir = vector.new()
+               if node.param2 == 3 then dir.x = 1 end
+               if node.param2 == 2 then dir.z = 1 end
+               if node.param2 == 1 then dir.x = -1 end
+               if node.param2 == 0 then dir.z = -1 end
+
+               local place_pos = vector.new(pos)
+
+               if node.name == "technic:constructor_mk"..mark.."_off" then
+                       technic.swap_node(pos, "technic:constructor_mk"..mark.."_on")
+                       nodeupdate(pos)
+                       for i = 1, length do
+                               place_pos = vector.add(place_pos, dir)
+                               local place_node = minetest.get_node(place_pos)
+                               deploy_node(inv, "slot"..i, place_pos, place_node, node)
+                       end
+               end
        end
 end
 
-local function mk2_off(pos, node)
-       if node.name == "technic:constructor_mk2_on" then
-               technic.swap_node(pos,"technic:constructor_mk2_off")
-               nodeupdate(pos)
+local function make_off(mark)
+       return function(pos, node)
+               if node.name == "technic:constructor_mk"..mark.."_on" then
+                       technic.swap_node(pos,"technic:constructor_mk"..mark.."_off")
+                       nodeupdate(pos)
+               end
        end
 end
 
-minetest.register_node("technic:constructor_mk2_off", {
-       description = S("Constructor Mk%d"):format(2),
-       tile_images = {"technic_constructor_mk2_top_off.png","technic_constructor_mk2_bottom_off.png","technic_constructor_mk2_side2_off.png","technic_constructor_mk2_side1_off.png",
-                       "technic_constructor_back.png","technic_constructor_front_off.png"},
-       is_ground_content = true,
-       paramtype2 = "facedir",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2},
-       mesecons= {effector={action_on=mk2_on}},
-       sounds = default.node_sound_stone_defaults(),
-       on_construct = function(pos)
-       local meta = minetest.get_meta(pos)
-       meta:set_string("formspec",
-                               "invsize[8,9;]"..
-                               "label[0,0;"..S("Constructor Mk%d"):format(2).."]"..
-                               "label[5,0;"..S("Slot %d"):format(1).."]"..
-                               "list[current_name;slot1;6,0;1,1;]"..
-                               "label[5,1;"..S("Slot %d"):format(2).."]"..
-                               "list[current_name;slot2;6,1;1,1;]"..
-                               "list[current_player;main;0,5;8,4;]")
-               meta:set_string("infotext", S("Constructor Mk%d"):format(2))
-               local inv = meta:get_inventory()
-               inv:set_size("slot1", 1)
-               inv:set_size("slot2", 1)
-       end,
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
-               if inv:is_empty("slot1")==false or inv:is_empty("slot2")==false then return false end
-               return true
-       end,
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
-
-minetest.register_node("technic:constructor_mk2_on", {
-       description = S("Constructor Mk%d"):format(2),
-       tile_images = {"technic_constructor_mk2_top_on.png","technic_constructor_mk2_bottom_on.png","technic_constructor_mk2_side2_on.png","technic_constructor_mk2_side1_on.png",
-                       "technic_constructor_back.png","technic_constructor_front_on.png"},
-       is_ground_content = true,
-       paramtype2 = "facedir",
-       drop = "technic:constructor_mk2_off",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2, not_in_creative_inventory=1},
-       mesecons = {effector={action_off=mk2_off}},
-       sounds = default.node_sound_stone_defaults(),
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
-
-
--- Constructor Mk3
-local function mk3_on(pos, node)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       
-       local pos1={}
-       local pos2={}
-       local pos3={}
-       local pos4={}
-       
-       pos1.x=pos.x
-       pos1.y=pos.y
-       pos1.z=pos.z
-       
-       pos2.x=pos.x
-       pos2.y=pos.y
-       pos2.z=pos.z
-       
-       pos3.x=pos.x
-       pos3.y=pos.y
-       pos3.z=pos.z
-
-       pos4.x=pos.x
-       pos4.y=pos.y
-       pos4.z=pos.z
-
-       if node.param2==3 then pos1.x=pos1.x+1 pos2.x=pos2.x+2 pos3.x=pos3.x+3 pos4.x=pos4.x+4 end
-       if node.param2==2 then pos1.z=pos1.z+1 pos2.z=pos2.z+2 pos3.z=pos3.z+3 pos4.z=pos4.z+4 end
-       if node.param2==1 then pos1.x=pos1.x-1 pos2.x=pos2.x-2 pos3.x=pos3.x-3 pos4.x=pos4.x-4 end
-       if node.param2==0 then pos1.z=pos1.z-1 pos2.z=pos2.z-2 pos3.z=pos3.z-3 pos4.z=pos4.z-4 end
-
-       if node.name == "technic:constructor_mk3_off" then
-               technic.swap_node(pos,"technic:constructor_mk3_on")
-               nodeupdate(pos)
-               local node1=minetest.get_node(pos1)
-               deploy_node (inv,"slot1",pos1,node1,node)
-               local node1=minetest.get_node(pos2)     
-               deploy_node (inv,"slot2",pos2,node1,node)
-               local node1=minetest.get_node(pos3)     
-               deploy_node (inv,"slot3",pos3,node1,node)
-               local node1=minetest.get_node(pos4)     
-               deploy_node (inv,"slot4",pos4,node1,node)
-       end
-end
 
-local function mk3_off(pos, node)
-       if node.name == "technic:constructor_mk3_on" then
-               technic.swap_node(pos,"technic:constructor_mk3_off")
-               nodeupdate(pos)
-       end
+local function make_constructor(mark, length)
+       minetest.register_node("technic:constructor_mk"..mark.."_off", {
+               description = S("Constructor Mk%d"):format(mark),
+               tiles = {"technic_constructor_mk"..mark.."_top_off.png",
+                       "technic_constructor_mk"..mark.."_bottom_off.png",
+                       "technic_constructor_mk"..mark.."_side2_off.png",
+                       "technic_constructor_mk"..mark.."_side1_off.png",
+                       "technic_constructor_back.png",
+                       "technic_constructor_front_off.png"},
+               paramtype2 = "facedir",
+               groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon = 2},
+               mesecons = {effector = {action_on = make_on(mark, length)}},
+               sounds = default.node_sound_stone_defaults(),
+               on_construct = function(pos)
+                       local meta = minetest.get_meta(pos)
+                       local formspec = "size[8,9;]"..
+                               "label[0,0;"..S("Constructor Mk%d"):format(mark).."]"..
+                               "list[current_player;main;0,5;8,4;]"
+                       for i = 1, length do
+                               formspec = formspec
+                                       .."label[5,"..(i - 1)..";"..S("Slot %d"):format(i).."]"
+                                       .."list[current_name;slot"..i
+                                               ..";6,"..(i - 1)..";1,1;]"
+                       end
+                       meta:set_string("formspec", formspec)
+                       meta:set_string("infotext", S("Constructor Mk%d"):format(mark))
+                       local inv = meta:get_inventory()
+                       for i = 1, length do
+                               inv:set_size("slot"..i, 1)
+                       end
+               end,
+               can_dig = function(pos, player)
+                       local meta = minetest.get_meta(pos)
+                       local inv = meta:get_inventory()
+                       for i = 1, length do
+                               if not inv:is_empty("slot"..i) then
+                                       return false
+                               end
+                       end
+                       return true
+               end,
+               allow_metadata_inventory_put = technic.machine_inventory_put,
+               allow_metadata_inventory_take = technic.machine_inventory_take,
+               allow_metadata_inventory_move = technic.machine_inventory_move,
+       })
+
+       minetest.register_node("technic:constructor_mk"..mark.."_on", {
+               tiles = {"technic_constructor_mk"..mark.."_top_on.png",
+                       "technic_constructor_mk"..mark.."_bottom_on.png",
+                       "technic_constructor_mk"..mark.."_side2_on.png",
+                       "technic_constructor_mk"..mark.."_side1_on.png",
+                       "technic_constructor_back.png",
+                       "technic_constructor_front_on.png"},
+               paramtype2 = "facedir",
+               drop = "technic:constructor_mk"..mark.."_off",
+               groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+                       mesecon=2, not_in_creative_inventory=1},
+               mesecons= {effector = {action_off = make_off(mark)}},
+               sounds = default.node_sound_stone_defaults(),
+               allow_metadata_inventory_put = technic.machine_inventory_put,
+               allow_metadata_inventory_take = technic.machine_inventory_take,
+               allow_metadata_inventory_move = technic.machine_inventory_move,
+       })
 end
 
-minetest.register_node("technic:constructor_mk3_off", {
-       description = S("Constructor Mk%d"):format(3),
-       tile_images = {"technic_constructor_mk3_top_off.png","technic_constructor_mk3_bottom_off.png","technic_constructor_mk3_side2_off.png","technic_constructor_mk3_side1_off.png",
-                       "technic_constructor_back.png","technic_constructor_front_off.png"},
-       paramtype2 = "facedir",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2},
-       mesecons = {effector={action_on=mk3_on}},
-       sounds = default.node_sound_stone_defaults(),
-       on_construct = function(pos)
-       local meta = minetest.get_meta(pos)
-       meta:set_string("formspec",
-                               "invsize[8,9;]"..
-                               "label[0,0;"..S("Constructor Mk%d"):format(3).."]"..
-                               "label[5,0;"..S("Slot %d"):format(1).."]"..
-                               "list[current_name;slot1;6,0;1,1;]"..
-                               "label[5,1;"..S("Slot %d"):format(2).."]"..
-                               "list[current_name;slot2;6,1;1,1;]"..
-                               "label[5,2;"..S("Slot %d"):format(3).."]"..
-                               "list[current_name;slot3;6,2;1,1;]"..
-                               "label[5,3;"..S("Slot %d"):format(4).."]"..
-                               "list[current_name;slot4;6,3;1,1;]"..
-                               "list[current_player;main;0,5;8,4;]")
-               meta:set_string("infotext", S("Constructor Mk%d"):format(3))
-               local inv = meta:get_inventory()
-               inv:set_size("slot1", 1)
-               inv:set_size("slot2", 1)
-               inv:set_size("slot3", 1)
-               inv:set_size("slot4", 1)
-
-       end,
-
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
-               if inv:is_empty("slot1")==false or inv:is_empty("slot2")==false or inv:is_empty("slot3")==false or inv:is_empty("slot4")==false then return false end
-               return true
-       end,    
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
-
-minetest.register_node("technic:constructor_mk3_on", {
-       description = S("Constructor Mk%d"):format(3),
-       tile_images = {"technic_constructor_mk3_top_on.png","technic_constructor_mk3_bottom_on.png","technic_constructor_mk3_side2_on.png","technic_constructor_mk3_side1_on.png",
-                       "technic_constructor_back.png","technic_constructor_front_on.png"},
-       is_ground_content = true,
-       paramtype2 = "facedir",
-       drop = "technic:constructor_mk3_off",
-       groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,not_in_creative_inventory=1},
-       mesecons = {effector={action_off=mk3_off}},
-       sounds = default.node_sound_stone_defaults(),
-       allow_metadata_inventory_put = technic.machine_inventory_put,
-       allow_metadata_inventory_take = technic.machine_inventory_take,
-       allow_metadata_inventory_move = technic.machine_inventory_move,
-})
+make_constructor(1, 1)
+make_constructor(2, 2)
+make_constructor(3, 4)