From 12d0c6522bbca906910aae0321cbaa7eb48db8c2 Mon Sep 17 00:00:00 2001 From: Zefram <zefram@fysh.org> Date: Wed, 30 Jul 2014 21:28:30 +0200 Subject: [PATCH] Correct breakability of sandstone CNC nodes --- technic/tools/sonic_screwdriver.lua | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 32f29d6..7d8957f 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -7,26 +7,32 @@ minetest.register_tool("technic:sonic_screwdriver", { description = S("Sonic Screwdriver"), inventory_image = "technic_sonic_screwdriver.png", + wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, on_use = function(itemstack, user, pointed_thing) -- Must be pointing to facedir applicable node if pointed_thing.type ~= "node" then return end - local pos = minetest.get_pointed_thing_position(pointed_thing, above) + local pos = pointed_thing.under + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, user:get_player_name()) + return + end local node = minetest.get_node(pos) local node_name = node.name if minetest.registered_nodes[node_name].paramtype2 ~= "facedir" and minetest.registered_nodes[node_name].paramtype2 ~= "wallmounted" then - return itemstack + return end if node.param2 == nil then return end - local meta1 = get_item_meta(itemstack:get_metadata()) + local meta1 = minetest.deserialize(itemstack:get_metadata()) if not meta1 or not meta1.charge then return end - if meta1.charge - 100 > 0 then + if meta1.charge >= 100 then minetest.sound_play("technic_sonic_screwdriver", {pos = pos, gain = 0.3, max_hear_distance = 10}) local p = node.param2 @@ -44,15 +50,11 @@ if minetest.is_protected(pos, user:get_player_name()) then minetest.record_protection_violation(pos, user:get_player_name()) else - local meta = minetest.get_meta(pos) - local meta0 = meta:to_table() node.param2 = p - minetest.set_node(pos, node) - meta = minetest.get_meta(pos) - meta:from_table(meta0) + minetest.swap_node(pos, node) meta1.charge = meta1.charge - 100 - itemstack:set_metadata(set_item_meta(meta1)) + itemstack:set_metadata(minetest.serialize(meta1)) technic.set_RE_wear(itemstack, meta1.charge, sonic_screwdriver_max_charge) end end @@ -63,8 +65,9 @@ minetest.register_craft({ output = "technic:sonic_screwdriver", recipe = { - {"default:diamond"}, - {"technic:battery"}, - {"technic:stainless_steel_ingot"} - } + {"", "default:diamond", ""}, + {"mesecons_materials:fiber", "technic:battery", "mesecons_materials:fiber"}, + {"mesecons_materials:fiber", "moreores:mithril_ingot", "mesecons_materials:fiber"} + } }) + -- Gitblit v1.8.0