making digtron nodes diggable by hand. Also extracting controller code in prep for an autonomous controller

4 files changed, 244 insertions, 239 deletions

diff --git a/node_builders.lua b/node_builders.lua
index 7a8cd00..cabb8f7 100644
--- a/node_builders.lua
+++ b/node_builders.lua
@@ -3,7 +3,7 @@
 -- Builds objects in the targeted node. This is a complicated beastie.
 minetest.register_node("digtron:builder", {
 	description = "Builder Unit",
-	groups = {cracky = 3, stone = 1, digtron = 4},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 4},
 	drop = "digtron:builder",
 	sounds = default.node_sound_metal_defaults(),
 	paramtype2= 'facedir',
diff --git a/node_controllers.lua b/node_controllers.lua
index 899bb12..0ac65ac 100644
--- a/node_controllers.lua
+++ b/node_controllers.lua
@@ -1,3 +1,234 @@
+digtron.execute_cycle = function(pos, node, clicker)
+	local meta = minetest.get_meta(pos)
+	if meta:get_string("waiting") == "true" then
+		-- Been too soon since last time the digtron did a cycle.
+		return pos, nil
+	end
+
+	local layout = digtron.get_all_digtron_neighbours(pos, clicker)
+	if layout.all == nil then
+		-- get_all_digtron_neighbours returns nil if the digtron array touches unloaded nodes, too dangerous to do anything in that situation. Abort.
+		minetest.sound_play("buzzer", {gain=0.5, pos=pos})
+		return pos, "Digtron is adjacent to unloaded nodes."
+	end
+	
+	if layout.traction * digtron.traction_factor < table.getn(layout.all) then
+		-- digtrons can't fly
+		minetest.sound_play("squeal", {gain=1.0, pos=pos})
+		return pos, string.format("Digtron has %d nodes but only enough traction to move %d nodes.", table.getn(layout.all), layout.traction * digtron.traction_factor)
+	end
+
+	local facing = minetest.get_node(pos).param2
+	local controlling_coordinate = digtron.get_controlling_coordinate(pos, facing)
+	
+	----------------------------------------------------------------------------------------------------------------------
+	
+	local nodes_dug = Pointset.create()
+	local items_dropped = {}
+	local digging_fuel_cost = 0
+	
+	-- execute the execute_dig method on all digtron components that have one
+	-- This builds a set of nodes that will be dug and returns a list of products that will be generated
+	-- but doesn't actually dig the nodes yet. That comes later.
+	-- If we dug them now, sand would fall and some digtron nodes would die.
+	for k, location in pairs(layout.diggers) do
+		local target = minetest.get_node(location)
+		local targetdef = minetest.registered_nodes[target.name]
+		if targetdef.execute_dig ~= nil then
+			local fuel_cost, dropped = targetdef.execute_dig(location, layout.protected, nodes_dug, controlling_coordinate)
+			if dropped ~= nil then
+				for _, itemname in pairs(dropped) do
+					table.insert(items_dropped, itemname)
+				end
+			end
+			digging_fuel_cost = digging_fuel_cost + fuel_cost
+		else
+			minetest.log(string.format("%s has digger group but is missing execute_dig method! This is an error in mod programming, file a bug.", targetdef.name))
+		end
+	end
+	
+	----------------------------------------------------------------------------------------------------------------------
+	
+	-- test if any digtrons are obstructed by non-digtron nodes that haven't been marked
+	-- as having been dug.
+	local can_move = true
+	for _, location in pairs(layout.all) do
+		local newpos = digtron.find_new_pos(location, facing)
+		if not digtron.can_move_to(newpos, layout.protected, nodes_dug) then
+			can_move = false
+		end
+	end
+	
+	if not can_move then
+		-- mark this node as waiting, will clear this flag in digtron.cycle_time seconds
+		minetest.get_meta(pos):set_string("waiting", "true")
+		minetest.after(digtron.cycle_time,
+			function (pos)
+				minetest.get_meta(pos):set_string("waiting", nil)
+			end, pos
+		)
+		minetest.sound_play("squeal", {gain=1.0, pos=pos})
+		minetest.sound_play("buzzer", {gain=0.5, pos=pos})
+		return pos, "Digtron is obstructed." --Abort, don't dig and don't build.
+	end
+
+	----------------------------------------------------------------------------------------------------------------------
+	
+	-- ask each builder node if it can get what it needs from inventory to build this cycle.
+	-- This is a complicated test because each builder needs to actually *take* the item it'll
+	-- need from inventory, and then we put it all back afterward.
+	-- Note that this test may overestimate the amount of work that will actually need to be done so don't treat its fuel cost as authoritative.
+	local can_build = true
+	local test_build_return_code = nil
+	local test_build_return_item = nil
+	local test_items = {}
+	local test_fuel_items = {}
+	local test_build_fuel_cost = 0		
+	for k, location in pairs(layout.builders) do
+		local target = minetest.get_node(location)
+		local targetdef = minetest.registered_nodes[target.name]
+		local test_location = digtron.find_new_pos(location, facing)
+		if targetdef.test_build ~= nil then
+			test_build_return_code, test_build_return_item = targetdef.test_build(location, test_location, layout.inventories, layout.protected, nodes_dug, controlling_coordinate, layout.controller)
+			if test_build_return_code > 1 then
+				can_build = false
+				break
+			end
+			if test_build_return_code == 1 then
+				table.insert(test_items, test_build_return_item)
+				test_build_fuel_cost = test_build_fuel_cost + digtron.build_cost
+			end
+		else
+			minetest.log(string.format("%s has builder group but is missing test_build method! This is an error in mod programming, file a bug.", targetdef.name))
+		end
+	end
+	
+	local fuel_burning = meta:get_float("fuel_burning") -- get amount of burned fuel left over from last cycle
+	local test_fuel_needed = test_build_fuel_cost + digging_fuel_cost - fuel_burning
+	local test_fuel_burned = 0
+	if test_fuel_needed > 0 then
+		test_fuel_burned = digtron.burn(layout.fuelstores, test_fuel_needed, true)
+	end
+	
+	--Put everything back where it came from
+	for k, item_return in pairs(test_items) do
+		digtron.place_in_specific_inventory(item_return.item, item_return.location, layout.inventories, layout.controller)
+	end
+	
+	if test_fuel_needed > fuel_burning + test_fuel_burned then
+		minetest.sound_play("buzzer", {gain=0.5, pos=pos})
+		return pos, "Digtron needs more fuel" -- abort, don't dig and don't build.
+	end
+	
+	if not can_build then
+		minetest.get_meta(pos):set_string("waiting", "true")
+		minetest.after(digtron.cycle_time,
+			function (pos)
+				minetest.get_meta(pos):set_string("waiting", nil)
+			end, pos
+		)
+		local return_string = nil
+		if test_build_return_code == 3 then
+			minetest.sound_play("honk", {gain=0.5, pos=pos}) -- A builder is not configured
+			return_string = "Digtron connected to at least one builder node that hasn't had an output material assigned."
+		elseif test_build_return_code == 2 then
+			minetest.sound_play("dingding", {gain=1.0, pos=pos}) -- Insufficient inventory
+			return_string = string.format("Digtron has insufficient materials in inventory to execute all build operations.\nNeeded: %s",
+				test_build_return_item:get_name())
+		end
+		return pos, return_string --Abort, don't dig and don't build.
+	end	
+
+	----------------------------------------------------------------------------------------------------------------------
+	
+	-- All tests passed, ready to go for real!
+	minetest.sound_play("construction", {gain=1.0, pos=pos})
+
+	-- store or drop the products of the digger heads
+	for _, itemname in pairs(items_dropped) do
+		digtron.place_in_inventory(itemname, layout.inventories, pos)
+	end
+
+	-- if the player is standing within the array or next to it, move him too.
+	local player_pos = clicker:getpos()
+	local move_player = false
+	if player_pos.x >= layout.extents.min_x - 1 and player_pos.x <= layout.extents.max_x + 1 and
+	   player_pos.y >= layout.extents.min_y - 1 and player_pos.y <= layout.extents.max_y + 1 and
+	   player_pos.z >= layout.extents.min_z - 1 and player_pos.z <= layout.extents.max_z + 1 then
+		move_player = true
+	end
+		
+	--move the array
+	digtron.move_digtron(facing, layout.all, layout.extents, nodes_dug)
+	local oldpos = {x=pos.x, y=pos.y, z=pos.z}
+	pos = digtron.find_new_pos(pos, facing)
+	meta = minetest.get_meta(pos)
+	if move_player then
+		clicker:moveto(digtron.find_new_pos(player_pos, facing), true)
+	end
+	
+	-- Start the delay before digtron can run again. Do this after moving the array or pos will be wrong.
+	minetest.get_meta(pos):set_string("waiting", "true")
+	minetest.after(digtron.cycle_time,
+		function (pos)
+			minetest.get_meta(pos):set_string("waiting", nil)
+		end, pos
+	)
+	
+	local building_fuel_cost = 0
+	local strange_failure = false
+	-- execute_build on all digtron components that have one
+	for k, location in pairs(layout.builders) do
+		local target = minetest.get_node(location)
+		local targetdef = minetest.registered_nodes[target.name]
+		if targetdef.execute_build ~= nil then
+			--using the old location of the controller as fallback so that any leftovers land with the rest of the digger output. Not that there should be any.
+			local build_return = targetdef.execute_build(location, clicker, layout.inventories, layout.protected, nodes_dug, controlling_coordinate, oldpos)
+			if build_return == false then
+				-- This happens if there's insufficient inventory, but we should have confirmed there was sufficient inventory during test phase.
+				-- So this should never happen. However, "should never happens" happen sometimes. So
+				-- don't interrupt the build cycle as a whole, we've already moved so might as well try to complete as much as possible.
+				strange_failure = true
+			elseif build_return == true then
+				building_fuel_cost = building_fuel_cost + digtron.build_cost
+			end
+		else
+			minetest.log(string.format("%s has builder group but is missing execute_build method! This is an error in mod programming, file a bug.", targetdef.name))
+		end
+	end
+	
+	local status_text = ""
+	if strange_failure then
+		-- We weren't able to detect this build failure ahead of time, so make a big noise now. This is strange, shouldn't happen.
+		minetest.sound_play("dingding", {gain=1.0, pos=pos})
+		minetest.sound_play("buzzer", {gain=0.5, pos=pos})
+		status_text = "Digtron unexpectedly failed to execute one or more build operations, likely due to an inventory error.\n"
+	end
+	
+	-- acutally burn the fuel needed
+	fuel_burning = fuel_burning - (digging_fuel_cost + building_fuel_cost)
+	if fuel_burning < 0 then
+		fuel_burning = fuel_burning + digtron.burn(layout.fuelstores, -fuel_burning, false)
+	end
+	meta:set_float("fuel_burning", fuel_burning)
+	status_text = status_text .. string.format("Heat remaining in controller furnace: %d", fuel_burning)
+	
+	-- finally, dig out any nodes remaining to be dug. Some of these will have had their flag revoked because
+	-- a builder put something there or because they're another digtron node.
+	local node_to_dig, whether_to_dig = nodes_dug:pop()
+	while node_to_dig ~= nil do
+		if whether_to_dig == true then
+			minetest.remove_node(node_to_dig)
+		end
+		-- all of the digtron's nodes wind up in nodes_dug, so this is an ideal place to stick
+		-- a check to make sand fall after the digtron has passed.
+		minetest.check_for_falling({x=node_to_dig.x, y=node_to_dig.y+1, z=node_to_dig.z})
+		node_to_dig, whether_to_dig = nodes_dug:pop()
+	end
+	return pos, status_text
+end
+
+
 local controller_nodebox ={
 	{-0.3125, -0.3125, -0.3125, 0.3125, 0.3125, 0.3125}, -- Core
 	{-0.1875, 0.3125, -0.1875, 0.1875, 0.5, 0.1875}, -- +y_connector
@@ -14,7 +245,7 @@ local controller_nodebox ={
 -- Master controller. Most complicated part of the whole system. Determines which direction a digtron moves and triggers all of its component parts.
 minetest.register_node("digtron:controller", {
 	description = "Digtron Control Unit",
-	groups = {cracky = 3, stone = 1, digtron = 1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, digtron = 1},
 	drop = 'digtron:controller',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype2= 'facedir',
@@ -42,236 +273,10 @@ minetest.register_node("digtron:controller", {
 	end,
 	
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		local meta = minetest.get_meta(pos)
-		if meta:get_string("waiting") == "true" then
-			-- Been too soon since last time the digtron did a cycle.
-			return
-		end
-
-		local layout = digtron.get_all_digtron_neighbours(pos, clicker)
-		if layout.all == nil then
-			-- get_all_digtron_neighbours returns nil if the digtron array touches unloaded nodes, too dangerous to do anything in that situation. Abort.
-			minetest.sound_play("buzzer", {gain=0.5, pos=pos})
-			meta:set_string("infotext", "Digtron is adjacent to unloaded nodes.")
-			return
-		end
-		
-		if layout.traction * digtron.traction_factor < table.getn(layout.all) then
-			-- digtrons can't fly
-			minetest.sound_play("squeal", {gain=1.0, pos=pos})
-			meta:set_string("infotext", string.format("Digtron has %d nodes but only enough traction to move %d nodes.", table.getn(layout.all), layout.traction * digtron.traction_factor))
-			return
-		end
-
-		local facing = minetest.get_node(pos).param2
-		local controlling_coordinate = digtron.get_controlling_coordinate(pos, facing)
-		
-		----------------------------------------------------------------------------------------------------------------------
-		
-		local nodes_dug = Pointset.create()
-		local items_dropped = {}
-		local digging_fuel_cost = 0
-		
-		-- execute the execute_dig method on all digtron components that have one
-		-- This builds a set of nodes that will be dug and returns a list of products that will be generated
-		-- but doesn't actually dig the nodes yet. That comes later.
-		-- If we dug them now, sand would fall and some digtron nodes would die.
-		for k, location in pairs(layout.diggers) do
-			local target = minetest.get_node(location)
-			local targetdef = minetest.registered_nodes[target.name]
-			if targetdef.execute_dig ~= nil then
-				local fuel_cost, dropped = targetdef.execute_dig(location, layout.protected, nodes_dug, controlling_coordinate)
-				if dropped ~= nil then
-					for _, itemname in pairs(dropped) do
-						table.insert(items_dropped, itemname)
-					end
-				end
-				digging_fuel_cost = digging_fuel_cost + fuel_cost
-			else
-				minetest.log(string.format("%s has digger group but is missing execute_dig method! This is an error in mod programming, file a bug.", targetdef.name))
-			end
-		end
-		
-		----------------------------------------------------------------------------------------------------------------------
-		
-		-- test if any digtrons are obstructed by non-digtron nodes that haven't been marked
-		-- as having been dug.
-		local can_move = true
-		for _, location in pairs(layout.all) do
-			local newpos = digtron.find_new_pos(location, facing)
-			if not digtron.can_move_to(newpos, layout.protected, nodes_dug) then
-				can_move = false
-			end
-		end
-		
-		if not can_move then
-			-- mark this node as waiting, will clear this flag in digtron.cycle_time seconds
-			minetest.get_meta(pos):set_string("waiting", "true")
-			minetest.after(digtron.cycle_time,
-				function (pos)
-					minetest.get_meta(pos):set_string("waiting", nil)
-				end, pos
-			)
-			minetest.sound_play("squeal", {gain=1.0, pos=pos})
-			minetest.sound_play("buzzer", {gain=0.5, pos=pos})
-			meta:set_string("infotext", "Digtron is obstructed.")
-			return --Abort, don't dig and don't build.
-		end
-
-		----------------------------------------------------------------------------------------------------------------------
-		
-		-- ask each builder node if it can get what it needs from inventory to build this cycle.
-		-- This is a complicated test because each builder needs to actually *take* the item it'll
-		-- need from inventory, and then we put it all back afterward.
-		-- Note that this test may overestimate the amount of work that will actually need to be done so don't treat its fuel cost as authoritative.
-		local can_build = true
-		local test_build_return_code = nil
-		local test_build_return_item = nil
-		local test_items = {}
-		local test_fuel_items = {}
-		local test_build_fuel_cost = 0		
-		for k, location in pairs(layout.builders) do
-			local target = minetest.get_node(location)
-			local targetdef = minetest.registered_nodes[target.name]
-			local test_location = digtron.find_new_pos(location, facing)
-			if targetdef.test_build ~= nil then
-				test_build_return_code, test_build_return_item = targetdef.test_build(location, test_location, layout.inventories, layout.protected, nodes_dug, controlling_coordinate, layout.controller)
-				if test_build_return_code > 1 then
-					can_build = false
-					break
-				end
-				if test_build_return_code == 1 then
-					table.insert(test_items, test_build_return_item)
-					test_build_fuel_cost = test_build_fuel_cost + digtron.build_cost
-				end
-			else
-				minetest.log(string.format("%s has builder group but is missing test_build method! This is an error in mod programming, file a bug.", targetdef.name))
-			end
-		end
-		
-		local fuel_burning = meta:get_float("fuel_burning") -- get amount of burned fuel left over from last cycle
-		local test_fuel_needed = test_build_fuel_cost + digging_fuel_cost - fuel_burning
-		local test_fuel_burned = 0
-		if test_fuel_needed > 0 then
-			test_fuel_burned = digtron.burn(layout.fuelstores, test_fuel_needed, true)
-		end
-		
-		--Put everything back where it came from
-		for k, item_return in pairs(test_items) do
-			digtron.place_in_specific_inventory(item_return.item, item_return.location, layout.inventories, layout.controller)
-		end
-		
-		if test_fuel_needed > fuel_burning + test_fuel_burned then
-			minetest.sound_play("buzzer", {gain=0.5, pos=pos})
-			meta:set_string("infotext", "Digtron needs more fuel")
-			return -- abort, don't dig and don't build.
-		end
-		
-		if not can_build then
-			minetest.get_meta(pos):set_string("waiting", "true")
-			minetest.after(digtron.cycle_time,
-				function (pos)
-					minetest.get_meta(pos):set_string("waiting", nil)
-				end, pos
-			)
-			if test_build_return_code == 3 then
-				minetest.sound_play("honk", {gain=0.5, pos=pos}) -- A builder is not configured
-				meta:set_string("infotext", "Digtron connected to at least one builder node that hasn't had an output material assigned.")
-			elseif test_build_return_code == 2 then
-				minetest.sound_play("dingding", {gain=1.0, pos=pos}) -- Insufficient inventory
-				meta:set_string("infotext", string.format("Digtron has insufficient materials in inventory to execute all build operations.\nNeeded: %s",
-					test_build_return_item:get_name()))
-			end
-			return --Abort, don't dig and don't build.
-		end	
-
-		----------------------------------------------------------------------------------------------------------------------
-		
-		-- All tests passed, ready to go for real!
-		minetest.sound_play("construction", {gain=1.0, pos=pos})
-	
-		-- store or drop the products of the digger heads
-		for _, itemname in pairs(items_dropped) do
-			digtron.place_in_inventory(itemname, layout.inventories, pos)
-		end
-
-		-- if the player is standing within the array or next to it, move him too.
-		local player_pos = clicker:getpos()
-		local move_player = false
-		if player_pos.x >= layout.extents.min_x - 1 and player_pos.x <= layout.extents.max_x + 1 and
-		   player_pos.y >= layout.extents.min_y - 1 and player_pos.y <= layout.extents.max_y + 1 and
-		   player_pos.z >= layout.extents.min_z - 1 and player_pos.z <= layout.extents.max_z + 1 then
-			move_player = true
-		end
-			
-		--move the array
-		digtron.move_digtron(facing, layout.all, layout.extents, nodes_dug)
-		local oldpos = {x=pos.x, y=pos.y, z=pos.z}
-		pos = digtron.find_new_pos(pos, facing)
-		meta = minetest.get_meta(pos)
-		if move_player then
-			clicker:moveto(digtron.find_new_pos(player_pos, facing), true)
-		end
-		
-		-- Start the delay before digtron can run again. Do this after moving the array or pos will be wrong.
-		minetest.get_meta(pos):set_string("waiting", "true")
-		minetest.after(digtron.cycle_time,
-			function (pos)
-				minetest.get_meta(pos):set_string("waiting", nil)
-			end, pos
-		)
-		
-		local building_fuel_cost = 0
-		local strange_failure = false
-		-- execute_build on all digtron components that have one
-		for k, location in pairs(layout.builders) do
-			local target = minetest.get_node(location)
-			local targetdef = minetest.registered_nodes[target.name]
-			if targetdef.execute_build ~= nil then
-				--using the old location of the controller as fallback so that any leftovers land with the rest of the digger output. Not that there should be any.
-				local build_return = targetdef.execute_build(location, clicker, layout.inventories, layout.protected, nodes_dug, controlling_coordinate, oldpos)
-				if build_return == false then
-					-- This happens if there's insufficient inventory, but we should have confirmed there was sufficient inventory during test phase.
-					-- So this should never happen. However, "should never happens" happen sometimes. So
-					-- don't interrupt the build cycle as a whole, we've already moved so might as well try to complete as much as possible.
-					strange_failure = true
-				elseif build_return == true then
-					building_fuel_cost = building_fuel_cost + digtron.build_cost
-				end
-			else
-				minetest.log(string.format("%s has builder group but is missing execute_build method! This is an error in mod programming, file a bug.", targetdef.name))
-			end
-		end
-		
-		local status_text = ""
-		if strange_failure then
-			-- We weren't able to detect this build failure ahead of time, so make a big noise now. This is strange, shouldn't happen.
-			minetest.sound_play("dingding", {gain=1.0, pos=pos})
-			minetest.sound_play("buzzer", {gain=0.5, pos=pos})
-			status_text = "Digtron unexpectedly failed to execute one or more build operations, likely due to an inventory error.\n"
-		end
-		
-		-- acutally burn the fuel needed
-		fuel_burning = fuel_burning - (digging_fuel_cost + building_fuel_cost)
-		if fuel_burning < 0 then
-			fuel_burning = fuel_burning + digtron.burn(layout.fuelstores, -fuel_burning, false)
-		end
-		meta:set_float("fuel_burning", fuel_burning)
-		if not strange_failure then
-			meta:set_string("infotext", status_text .. string.format("Heat remaining in controller furnace: %d", fuel_burning))
-		end
-		
-		-- finally, dig out any nodes remaining to be dug. Some of these will have had their flag revoked because
-		-- a builder put something there or because they're another digtron node.
-		local node_to_dig, whether_to_dig = nodes_dug:pop()
-		while node_to_dig ~= nil do
-			if whether_to_dig == true then
-				minetest.remove_node(node_to_dig)
-			end
-			-- all of the digtron's nodes wind up in nodes_dug, so this is an ideal place to stick
-			-- a check to make sand fall after the digtron has passed.
-			minetest.check_for_falling({x=node_to_dig.x, y=node_to_dig.y+1, z=node_to_dig.z})
-			node_to_dig, whether_to_dig = nodes_dug:pop()
+		newpos, status = digtron.execute_cycle(pos, node, clicker)
+		if status ~= nil then
+			local meta = minetest.get_meta(newpos)
+			meta:set_string("infotext", status)
 		end
 	end,
 })
@@ -280,7 +285,7 @@ minetest.register_node("digtron:controller", {
 -- Handy for shoving a digtron to the side if it's been built a bit off.
 minetest.register_node("digtron:pusher", {
 	description = "Digtron Pusher Unit",
-	groups = {cracky = 3, stone = 1, digtron = 1},
+	groups = {cracky = 3, oddly_breakable_by_hand=3, digtron = 1},
 	drop = 'digtron:pusher',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype2= 'facedir',
diff --git a/node_diggers.lua b/node_diggers.lua
index 28073a6..f5162d8 100644
--- a/node_diggers.lua
+++ b/node_diggers.lua
@@ -12,7 +12,7 @@ local digger_nodebox = {
 -- Digs out nodes that are "in front" of the digger head.
 minetest.register_node("digtron:digger", {
 	description = "Digger Head",
-	groups = {cracky = 3, stone = 1, digtron = 3},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 3},
 	drop = 'digtron:digger',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype = "light",
@@ -96,7 +96,7 @@ minetest.register_node("digtron:digger", {
 -- A special-purpose digger to deal with stuff like sand and gravel in the ceiling. It always digs (no periodicity or offset), but it only digs falling_block nodes
 minetest.register_node("digtron:soft_digger", {
 	description = "Soft Material Digger Head",
-	groups = {cracky = 3, stone = 1, digtron = 3},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 3},
 	drop = 'digtron:soft_digger',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype = "light",
diff --git a/node_misc.lua b/node_misc.lua
index 08a044a..c2c1bfb 100644
--- a/node_misc.lua
+++ b/node_misc.lua
@@ -1,7 +1,7 @@
 -- A do-nothing "structural" node, to ensure all digtron nodes that are supposed to be connected to each other can be connected to each other.
 minetest.register_node("digtron:structure", {
 	description = "Digger Structure",
-	groups = {cracky = 3, stone = 1, digtron = 1},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 1},
 	drop = 'digtron:structure',
 	tiles = {"digtron_plate.png"},
 	drawtype = "nodebox",
@@ -31,7 +31,7 @@ minetest.register_node("digtron:structure", {
 -- A modest light source that will move with the digtron, handy for working in a tunnel you aren't bothering to install permanent lights in.
 minetest.register_node("digtron:light", {
 	description = "Digger Light",
-	groups = {cracky = 3, stone = 1, digtron = 1},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 1},
 	drop = 'digtron:light',
 	tiles = {"digtron_light.png"},
 	drawtype = "nodebox",
@@ -52,7 +52,7 @@ minetest.register_node("digtron:light", {
 minetest.register_node("digtron:inventory",
 {
 	description = "Digtron Inventory Hopper",
-	groups = {cracky = 3, stone = 1, digtron = 2},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 2},
 	drop = 'digtron:inventory',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype2= 'facedir',
@@ -89,7 +89,7 @@ minetest.register_node("digtron:inventory",
 minetest.register_node("digtron:fuelstore",
 {
 	description = "Digtron Fuel Hopper",
-	groups = {cracky = 3, stone = 1, digtron = 5},
+	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 5},
 	drop = 'digtron:fuelstore',
 	sounds = default.node_sound_metal_defaults(),
 	paramtype2= 'facedir',