From f5041784212a5045538983f41e1fc73bf79277a8 Mon Sep 17 00:00:00 2001 From: Zefram <zefram@fysh.org> Date: Sun, 27 Apr 2014 20:43:00 +0200 Subject: [PATCH] Fix drops for active machines --- technic/machines/register/grinder.lua | 147 ++++++++++++++++++++---------------------------- 1 files changed, 61 insertions(+), 86 deletions(-) diff --git a/technic/machines/register/grinder.lua b/technic/machines/register/grinder.lua index 66af191..02a79c3 100644 --- a/technic/machines/register/grinder.lua +++ b/technic/machines/register/grinder.lua @@ -1,114 +1,90 @@ +local S = technic.getter + +local tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:add_item("src", stack) + end, + can_insert = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:room_for_item("src", stack) + end, + connect_sides = {left=1, right=1, back=1, top=1, bottom=1}, +} + function technic.register_grinder(data) local tier = data.tier local ltier = string.lower(tier) - local tube = { - insert_object = function(pos, node, stack, direction) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - return inv:add_item("src", stack) - end, - can_insert = function(pos, node, stack, direction) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - return inv:room_for_item("src", stack) - end, - connect_sides = {left=1, right=1, back=1, top=1, bottom=1}, - } + + local groups = {cracky=2} + local active_groups = {cracky=2, not_in_creative_inventory=1} + if data.tube then + groups.tubedevice = 1 + groups.tubedevice_receiver = 1 + active_groups.tubedevice = 1 + active_groups.tubedevice_receiver = 1 + end + local formspec = "invsize[8,10;]".. "list[current_name;src;3,1;1,1;]".. "list[current_name;dst;5,1;2,2;]".. "list[current_player;main;0,6;8,4;]".. - "label[0,0;"..tier.." Grinder]" + "label[0,0;"..S("%s Grinder"):format(tier).."]" if data.upgrade then formspec = formspec.. "list[current_name;upgrade1;1,4;1,1;]".. "list[current_name;upgrade2;2,4;1,1;]".. - "label[1,5;Upgrade Slots]" + "label[1,5;"..S("Upgrade Slots").."]" end - data.formspec = formspec minetest.register_node("technic:"..ltier.."_grinder", { - description = tier.." Grinder", + description = S("%s Grinder"):format(tier), tiles = {"technic_"..ltier.."_grinder_top.png", "technic_"..ltier.."_grinder_bottom.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_front.png"}, paramtype2 = "facedir", - groups = {cracky=2, tubedevice=1, tubedevice_receiver=1}, - technic = data, - tube = tube, + groups = groups, + tube = data.tube and tube or nil, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) - local data = minetest.registered_nodes[node.name].technic - meta:set_string("infotext", data.tier.." Grinder") + meta:set_string("infotext", S("%s Grinder"):format(tier)) meta:set_int("tube_time", 0) - meta:set_string("formspec", data.formspec) + meta:set_string("formspec", formspec) local inv = meta:get_inventory() inv:set_size("src", 1) inv:set_size("dst", 4) inv:set_size("upgrade1", 1) inv:set_size("upgrade2", 1) end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local inv = meta:get_inventory() - if not inv:is_empty("src") or not inv:is_empty("dst") or - not inv:is_empty("upgrade1") or not inv:is_empty("upgrade2") then - minetest.chat_send_player(player:get_player_name(), - "Machine cannot be removed because it is not empty"); - return false - else - return true - end - end, + can_dig = technic.machine_can_dig, + 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:"..ltier.."_grinder_active",{ - description = tier.." Grinder", + description = S("%s Grinder"):format(tier), tiles = {"technic_"..ltier.."_grinder_top.png", "technic_"..ltier.."_grinder_bottom.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_side.png", "technic_"..ltier.."_grinder_front_active.png"}, paramtype2 = "facedir", - groups = {cracky=2, tubedevice=1, tubedevice_receiver=1, not_in_creative_inventory=1}, + drop = "technic:"..ltier.."_grinder", + groups = active_groups, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), - technic = data, - tube = tube, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - if not inv:is_empty("src") or not inv:is_empty("dst") or - not inv:is_empty("upgrade1") or not inv:is_empty("upgrade2") then - minetest.chat_send_player(player:get_player_name(), - "Machine cannot be removed because it is not empty"); - return false - else - return true - end - end, - -- These three makes sure upgrades are not moved in or out while the grinder is active. - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - if listname == "src" or listname == "dst" then - return stack:get_stack_max() - else - return 0 -- Disallow the move - end - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - if listname == "src" or listname == "dst" then - return stack:get_stack_max() - else - return 0 -- Disallow the move - end - end, - allow_metadata_inventory_move = function(pos, from_list, to_list, to_list, to_index, count, player) - return 0 - end, + tube = data.tube and tube or nil, + can_dig = technic.machine_can_dig, + 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_abm({ @@ -116,24 +92,23 @@ interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local data = minetest.registered_nodes[node.name].technic - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - local eu_input = meta:get_int(data.tier.."_EU_input") + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local eu_input = meta:get_int(tier.."_EU_input") - local machine_name = data.tier.." Grinder" - local machine_node = "technic:"..string.lower(data.tier).."_grinder" + local machine_name = S("%s Grinder"):format(tier) + local machine_node = "technic:"..ltier.."_grinder" local machine_demand = data.demand -- Setup meta data if it does not exist. if not eu_input then - meta:set_int(data.tier.."_EU_demand", machine_demand[1]) - meta:set_int(data.tier.."_EU_input", 0) + meta:set_int(tier.."_EU_demand", machine_demand[1]) + meta:set_int(tier.."_EU_input", 0) return end -- Power off automatically if no longer connected to a switching station - technic.switching_station_timeout_count(pos, data.tier) + technic.switching_station_timeout_count(pos, tier) local EU_upgrade, tube_upgrade = 0, 0 if data.upgrade then @@ -146,20 +121,20 @@ local result = technic.get_grinder_recipe(inv:get_stack("src", 1)) if not result then - hacky_swap_node(pos, machine_node) - meta:set_string("infotext", machine_name.." Idle") - meta:set_int(data.tier.."_EU_demand", 0) + technic.swap_node(pos, machine_node) + meta:set_string("infotext", S("%s Idle"):format(machine_name)) + meta:set_int(tier.."_EU_demand", 0) return end if eu_input < machine_demand[EU_upgrade+1] then -- Unpowered - go idle - hacky_swap_node(pos, machine_node) - meta:set_string("infotext", machine_name.." Unpowered") + technic.swap_node(pos, machine_node) + meta:set_string("infotext", S("%s Unpowered"):format(machine_name)) elseif eu_input >= machine_demand[EU_upgrade+1] then -- Powered - hacky_swap_node(pos, machine_node.."_active") - meta:set_string("infotext", machine_name.." Active") + technic.swap_node(pos, machine_node.."_active") + meta:set_string("infotext", S("%s Active"):format(machine_name)) meta:set_int("src_time", meta:get_int("src_time") + 1) if meta:get_int("src_time") >= result.time / data.speed then @@ -173,7 +148,7 @@ end end end - meta:set_int(data.tier.."_EU_demand", machine_demand[EU_upgrade+1]) + meta:set_int(tier.."_EU_demand", machine_demand[EU_upgrade+1]) end }) -- Gitblit v1.8.0