Improve node number recycling

basis/command.lua

@@ -217,17 +217,26 @@ function techage.add_node(pos, name, is_ta2)
 		return "-"
 	end
 	local key = minetest.hash_node_position(pos)
-	return NumbersToBeRecycled[key] or get_number(pos, true)
+	local num = NumbersToBeRecycled[key]
+	if num then
+		backend.set_nodepos(num, pos)
+		NumbersToBeRecycled[key] = nil
+		return num
+	end
+	return get_number(pos, true)
 end
 
 -- Function removes the node from the techage lists.
 function techage.remove_node(pos, oldnode, oldmetadata)
-	local number = oldmetadata and oldmetadata.fields and oldmetadata.fields.node_number
+	local number = oldmetadata and oldmetadata.fields and oldmetadata.fields.node_number or oldmetadata.fields.number
+	print("number1", dump(oldmetadata))
 	number = number or get_number(pos)
+	print("number2", number)
 	if number and tonumber(number) then
 		local key = minetest.hash_node_position(pos)
 		NumbersToBeRecycled[key] = number
 		NodeInfoCache[number] = nil
+		print("number3", number)
 	end
 	if oldnode and item_handling_node(oldnode.name) then
 		Tube:after_dig_node(pos)

icta_controller/controller.lua

@@ -385,13 +385,9 @@ minetest.register_node("techage:ta4_icta_controller", {
 
 	on_receive_fields = on_receive_fields,
 	
-	on_dig = function(pos, node, puncher, pointed_thing)
+	after_dig_node = function(pos, oldnode, oldmetadata)
-		if minetest.is_protected(pos, puncher:get_player_name()) then
+		techage.remove_node(pos, oldnode, oldmetadata)
-			return
+		techage.del_mem(pos)
-		end
-		
-		techage.remove_node(pos)
-		minetest.node_dig(pos, node, puncher, pointed_thing)
 	end,
 	
 	on_timer = on_timer,

logic/sequencer.lua

@@ -222,16 +222,17 @@ minetest.register_node("techage:ta3_sequencer", {
 
 	on_receive_fields = on_receive_fields,
 	
-	on_dig = function(pos, node, puncher, pointed_thing)
+	can_dig = function(pos, puncher)
 		if minetest.is_protected(pos, puncher:get_player_name()) then
-			return
+			return false
 		end
 		local nvm = techage.get_nvm(pos)
-		if not nvm.running then
+		return not nvm.running
-			techage.remove_node(pos)
+	end,
-			minetest.node_dig(pos, node, puncher, pointed_thing)
+		
+	after_dig_node = function(pos, oldnode, oldmetadata)
+		techage.remove_node(pos, oldnode, oldmetadata)
 		techage.del_mem(pos)
-		end
 	end,
 	
 	on_timer = check_rules,

lua_controller/controller.lua

@@ -541,13 +541,9 @@ minetest.register_node("techage:ta4_lua_controller", {
 		end
 	end,
 	
-	on_dig = function(pos, node, puncher, pointed_thing)
+	after_dig_node = function(pos, oldnode, oldmetadata)
-		if minetest.is_protected(pos, puncher:get_player_name()) then
+		techage.remove_node(pos, oldnode, oldmetadata)
-			return
+		techage.del_mem(pos)
-		end
-		
-		techage.remove_node(pos)
-		minetest.node_dig(pos, node, puncher, pointed_thing)
 	end,
 	
 	on_timer = on_timer,

lua_controller/server.lua

@@ -86,10 +86,13 @@ minetest.register_node("techage:ta4_server", {
 			return
 		end
 		techage.del_mem(pos)
-		techage.remove_node(pos)
 		minetest.node_dig(pos, node, puncher, pointed_thing)
 	end,
 		
+	after_dig_node = function(pos, oldnode, oldmetadata)
+		techage.remove_node(pos, oldnode, oldmetadata)
+	end,
+
 on_timer = function(pos, elasped)
 		local meta = M(pos)
 		local nvm = techage.get_nvm(pos)

manuals/markdown2formspec.py

@@ -106,7 +106,7 @@ class MyRenderer(mistune.Renderer):
     ##
     def block_code(self, code, lang):
         text = formspec_escape(code.strip())
-        lines = text.split("\n")
+        lines = text.split("\\n")
         lines = ["    " + item for item in lines]
         self.TextChunck.extend(lines)
         self.TextChunck.append("")

manuals/ta4_lua_controller_EN.md

@@ -347,13 +347,15 @@ In addition to Lua standard function the Lua Controller provides the following f
 ### Techage Command Functions
 
 With the `$send_cmnd(num, ident, add_data)` function, you can send commands to and retrieve data from another block with the given number _num_.
-The possible commands can be classified in two groups: Commands for reading data and commands for causing an action.
+The possible commands can be classified in two groups: Commands for reading data and commands for triggering an action.
 Please note, that this is not a technical distinction, only a logical.
 
-* Reading data  
+**Reading data**
-  _ident_ specifies the data to be read.  
+
-  _add_data_ is for additional data and normally not needed.  
+- _ident_ specifies the data to be read. 
-  The result is block dependent (see table below):
+-  _add_data_ is for additional data and normally not needed. 
+-  The result is block dependent (see table below)
+
 
 | ident        | returned data                                                | comment                                                      |
 | ------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
@@ -373,11 +375,11 @@ Please note, that this is not a technical distinction, only a logical.
 
 
 
+**Trigger an action**
 
-* Causing an action  
+- _num_ is the number of the remote block, like "1234"
-   _num_ is the number of the remote block, like "1234".  
+- _cmnd_ is the command
-   _cmnd_ is the command,  
+- _data_ is additional data (see table below)
-   _data_ is additional data (see table below):
 
 | cmnd                             | data         | comment                                                      |
 | -------------------------------- | ------------ | ------------------------------------------------------------ |