From 413d20d6c83a218c63fcb4fbf840010d1d380f86 Mon Sep 17 00:00:00 2001 From: Emon <emon@openmailbox.org> Date: Wed, 18 May 2016 15:22:20 +0200 Subject: [PATCH] Updated Italian locale --- technic/tools/mining_drill.lua | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index 2a7cfe7..8a25abe 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -6,9 +6,9 @@ minetest.register_craft({ output = 'technic:mining_drill', recipe = { - {'technic:stainless_steel_ingot', 'technic:diamond_drill_head', 'technic:stainless_steel_ingot'}, + {'moreores:tin_ingot', 'technic:diamond_drill_head', 'moreores:tin_ingot'}, {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, - {'', 'technic:red_energy_crystal', 'moreores:copper_ingot'}, + {'', 'technic:red_energy_crystal', 'default:copper_ingot'}, } }) minetest.register_craft({ @@ -51,12 +51,12 @@ minetest.record_protection_violation(pos, player:get_player_name()) return end - local node=minetest.env:get_node(pos) + local node=minetest.get_node(pos) if node.name == "air" or node.name == "ignore" then return end if node.name == "default:lava_source" then return end if node.name == "default:lava_flowing" then return end - if node.name == "default:water_source" then minetest.env:remove_node(pos) return end - if node.name == "default:water_flowing" then minetest.env:remove_node(pos) return end + if node.name == "default:water_source" then minetest.remove_node(pos) return end + if node.name == "default:water_flowing" then minetest.remove_node(pos) return end minetest.node_dig(pos,node,player) end @@ -229,6 +229,12 @@ minetest.sound_play("mining_drill", {pos = pos, gain = 1.0, max_hear_distance = 10,}) end +local function pos_is_pointable(pos) + local node = minetest.get_node(pos) + local nodedef = minetest.registered_nodes[node.name] + return nodedef and nodedef.pointable +end + local function mining_drill_mk2_setmode(user,itemstack) local player_name=user:get_player_name() local item=itemstack:to_table() @@ -285,16 +291,18 @@ if not meta or not meta.mode or keys.sneak then return mining_drill_mk2_setmode(user, itemstack) end - if pointed_thing.type ~= "node" or not meta.charge then + if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) or not meta.charge then return end local charge_to_take = cost_to_use(2, meta.mode) if meta.charge >= charge_to_take then local pos = minetest.get_pointed_thing_position(pointed_thing, above) drill_dig_it(pos, user, meta.mode) - meta.charge = meta.charge - charge_to_take - itemstack:set_metadata(minetest.serialize(meta)) - technic.set_RE_wear(itemstack, meta.charge, max_charge[2]) + if not technic.creative_mode then + meta.charge = meta.charge - charge_to_take + itemstack:set_metadata(minetest.serialize(meta)) + technic.set_RE_wear(itemstack, meta.charge, max_charge[2]) + end end return itemstack end @@ -306,16 +314,18 @@ if not meta or not meta.mode or keys.sneak then return mining_drill_mk3_setmode(user, itemstack) end - if pointed_thing.type ~= "node" or not meta.charge then + if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) or not meta.charge then return end local charge_to_take = cost_to_use(3, meta.mode) if meta.charge >= charge_to_take then local pos = minetest.get_pointed_thing_position(pointed_thing, above) drill_dig_it(pos, user, meta.mode) - meta.charge = meta.charge - charge_to_take - itemstack:set_metadata(minetest.serialize(meta)) - technic.set_RE_wear(itemstack, meta.charge, max_charge[3]) + if not technic.creative_mode then + meta.charge = meta.charge - charge_to_take + itemstack:set_metadata(minetest.serialize(meta)) + technic.set_RE_wear(itemstack, meta.charge, max_charge[3]) + end end return itemstack end @@ -327,8 +337,9 @@ inventory_image = "technic_mining_drill.png", stack_max = 1, wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, on_use = function(itemstack, user, pointed_thing) - if pointed_thing.type ~= "node" then + if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) then return itemstack end local meta = minetest.deserialize(itemstack:get_metadata()) @@ -339,9 +350,11 @@ if meta.charge >= charge_to_take then local pos = minetest.get_pointed_thing_position(pointed_thing, above) drill_dig_it(pos, user, 1) - meta.charge = meta.charge - charge_to_take - itemstack:set_metadata(minetest.serialize(meta)) - technic.set_RE_wear(itemstack, meta.charge, max_charge[1]) + if not technic.creative_mode then + meta.charge = meta.charge - charge_to_take + itemstack:set_metadata(minetest.serialize(meta)) + technic.set_RE_wear(itemstack, meta.charge, max_charge[1]) + end end return itemstack end, @@ -351,6 +364,7 @@ description = S("Mining Drill Mk%d"):format(2), inventory_image = "technic_mining_drill_mk2.png", wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, on_use = function(itemstack, user, pointed_thing) mining_drill_mk2_handler(itemstack, user, pointed_thing) return itemstack @@ -366,6 +380,7 @@ inventory_image = "technic_mining_drill_mk2.png^technic_tool_mode"..i..".png", wield_image = "technic_mining_drill_mk2.png", wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, groups = {not_in_creative_inventory=1}, on_use = function(itemstack, user, pointed_thing) mining_drill_mk2_handler(itemstack, user, pointed_thing) @@ -378,6 +393,7 @@ description = S("Mining Drill Mk%d"):format(3), inventory_image = "technic_mining_drill_mk3.png", wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, on_use = function(itemstack, user, pointed_thing) mining_drill_mk3_handler(itemstack,user,pointed_thing) return itemstack @@ -393,6 +409,7 @@ inventory_image = "technic_mining_drill_mk3.png^technic_tool_mode"..i..".png", wield_image = "technic_mining_drill_mk3.png", wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, groups = {not_in_creative_inventory=1}, on_use = function(itemstack, user, pointed_thing) mining_drill_mk3_handler(itemstack,user,pointed_thing) -- Gitblit v1.8.0