From d0efa15b983f7a0a96e1a7abcdad713715dfeeeb Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 18 Aug 2014 16:14:15 +0200
Subject: [PATCH] In quarry, skip past undiggable nodes

---
 technic/tools/mining_lasers.lua |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua
index c6ba57f..a6c8682 100644
--- a/technic/tools/mining_lasers.lua
+++ b/technic/tools/mining_lasers.lua
@@ -16,25 +16,25 @@
 minetest.register_craft({
 	output = 'technic:laser_mk1',
 	recipe = {
-		{'default:diamond', 'default:steel_ingot', 'technic:red_energy_crystal'},
-		{'',                'default:steel_ingot', 'default:steel_ingot'},
-		{'',                '',                    'default:copper_ingot'},
+		{'default:diamond', 'technic:brass_ingot',        'default:obsidian_glass'},
+		{'',                'technic:brass_ingot',        'technic:red_energy_crystal'},
+		{'',                '',                           'default:copper_ingot'},
 	}
 })
 minetest.register_craft({
 	output = 'technic:laser_mk2',
 	recipe = {
-		{'default:diamond', 'default:steel_ingot', 'technic:laser_mk1'},
-		{'',                'default:steel_ingot', 'technic:green_energy_crystal'},
-		{'',                '',                    'default:copper_ingot'},
+		{'default:diamond', 'technic:carbon_steel_ingot', 'technic:laser_mk1'},
+		{'',                'technic:carbon_steel_ingot', 'technic:green_energy_crystal'},
+		{'',                '',                           'default:copper_ingot'},
 	}
 })
 minetest.register_craft({
 	output = 'technic:laser_mk3',
 	recipe = {
-		{'default:diamond', 'default:steel_ingot', 'technic:laser_mk2'},
-		{'',                'default:steel_ingot', 'technic:blue_energy_crystal'},
-		{'',                '',                    'default:copper_ingot'},
+		{'default:diamond', 'technic:carbon_steel_ingot', 'technic:laser_mk2'},
+		{'',                'technic:carbon_steel_ingot', 'technic:blue_energy_crystal'},
+		{'',                '',                           'default:copper_ingot'},
 	}
 })
 
@@ -75,15 +75,15 @@
 end
 
 local function laser_node(pos, player)
-	if minetest.is_protected(pos, player:get_player_name()) then
-		minetest.record_protection_violation(pos, player:get_player_name())
-		return
-	end
 	local node = minetest.get_node(pos)
 	if node.name == "air"
 	or node.name == "ignore"
 	or node.name == "default:lava_source"
 	or node.name == "default:lava_flowing" then
+		return
+	end
+	if minetest.is_protected(pos, player:get_player_name()) then
+		minetest.record_protection_violation(pos, player:get_player_name())
 		return
 	end
 	if node.name == "default:water_source"
@@ -107,9 +107,9 @@
 	local t_dir = get_used_dir(dir)
 	local dir_typ = t_dir[1]
 	if t_dir[3] == "+" then
-		f_tab = {0, range}
+		f_tab = {1, range}
 	else
-		f_tab = {-range,0}
+		f_tab = {-range, -1}
 	end
 	local d_ch = t_dir[2]
 	if dir_typ == "x" then
@@ -169,6 +169,7 @@
 		inventory_image = "technic_mining_laser_mk"..m[1]..".png",
 		stack_max = 1,
 		wear_represents = "technic_RE_charge",
+		on_refill = technic.refill_RE_charge,
 		on_use = function(itemstack, user)
 			local meta = minetest.deserialize(itemstack:get_metadata())
 			if not meta or not meta.charge then

--
Gitblit v1.8.0