From 704a410fa1391318766927c8baa8a93b0731e7d0 Mon Sep 17 00:00:00 2001 From: RealBadAngel <mk@realbadangel.pl> Date: Sun, 27 Jan 2013 13:34:10 +0100 Subject: [PATCH] Cleaned all chests code --- technic/technic/iron_chest.lua | 120 ++++++++---------------------------------------------------- 1 files changed, 16 insertions(+), 104 deletions(-) diff --git a/technic/technic/iron_chest.lua b/technic/technic/iron_chest.lua index 36105d1..6f278fe 100644 --- a/technic/technic/iron_chest.lua +++ b/technic/technic/iron_chest.lua @@ -41,18 +41,8 @@ tiles = {"technic_iron_chest_top.png", "technic_iron_chest_top.png", "technic_iron_chest_side.png", "technic_iron_chest_side.png", "technic_iron_chest_side.png", "technic_iron_chest_front.png"}, paramtype2 = "facedir", - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1}, - tube={insert_object=function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:add_item("main",stack) - end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:room_for_item("main",stack) - end, - input_inventory="main"}, + groups = chest_groups1, + tube = tubes_properties, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) @@ -65,54 +55,19 @@ local inv = meta:get_inventory() inv:set_size("main", 9*4) end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - end, - on_metadata_inventory_move = function(pos, from_list, from_index, - to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in chest at "..minetest.pos_to_string(pos)) - return minetest.node_metadata_inventory_move_allow_all( - pos, from_list, from_index, to_list, to_index, count, player) - end, - on_metadata_inventory_offer = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to chest at "..minetest.pos_to_string(pos)) - return minetest.node_metadata_inventory_offer_allow_all( - pos, listname, index, stack, player) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from chest at "..minetest.pos_to_string(pos)) - end, + can_dig = chest_can_dig, + on_metadata_inventory_move = def_on_metadata_inventory_move, + on_metadata_inventory_put = def_on_metadata_inventory_put, + on_metadata_inventory_take = def_on_metadata_inventory_take }) - -local function has_locked_chest_privilege(meta, player) - if player:get_player_name() ~= meta:get_string("owner") then - return false - end - return true -end minetest.register_node("technic:iron_locked_chest", { description = "Iron Locked Chest", tiles = {"technic_iron_chest_top.png", "technic_iron_chest_top.png", "technic_iron_chest_side.png", "technic_iron_chest_side.png", "technic_iron_chest_side.png", "technic_iron_chest_locked.png"}, paramtype2 = "facedir", - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1}, - tube={insert_object=function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:add_item("main",stack) - end, - can_insert=function(pos,node,stack,direction) - local meta=minetest.env:get_meta(pos) - local inv=meta:get_inventory() - return inv:room_for_item("main",stack) - end, - input_inventory="main"}, + groups = chest_groups1, + tube = tubes_properties, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer) @@ -121,7 +76,7 @@ meta:set_string("infotext", "Locked Iron Chest (owned by ".. meta:get_string("owner")..")") end, -on_construct = function(pos) + on_construct = function(pos) local meta = minetest.env:get_meta(pos) meta:set_string("formspec", "invsize[9,9;]".. @@ -132,54 +87,11 @@ local inv = meta:get_inventory() inv:set_size("main", 9*4) end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - end, - allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return count - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return stack:get_count() - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta(pos) - if not has_locked_chest_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a locked chest belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) - return 0 - end - return stack:get_count() - end, - on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in locked chest at "..minetest.pos_to_string(pos)) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to locked chest at "..minetest.pos_to_string(pos)) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from locked chest at "..minetest.pos_to_string(pos)) - end, + can_dig = chest_can_dig, + allow_metadata_inventory_move = def_allow_metadata_inventory_move, + allow_metadata_inventory_put = def_allow_metadata_inventory_put, + allow_metadata_inventory_take = def_allow_metadata_inventory_take, + on_metadata_inventory_move = def_on_metadata_inventory_move, + on_metadata_inventory_put = def_on_metadata_inventory_put, + on_metadata_inventory_take = def_on_metadata_inventory_take }) -- Gitblit v1.8.0