Rules + Receptor system rework

1 files changed, 26 insertions, 36 deletions

diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index 3b76bbb..e0191f7 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -30,52 +30,40 @@ minetest.register_node("mesecons_button:button_on", {
 minetest.register_on_dignode(
     function(pos, oldnode, digger)
         if oldnode.name == "mesecons_button:button_on" then
-            mesecon:receptor_off(pos)
+            mesecon:receptor_off(pos, mesecon.button_get_rules(oldnode.param2))
         end    
     end
 )
 minetest.register_on_punchnode(function(pos, node, puncher)
 	if node.name == "mesecons_button:button_off" then
 		minetest.env:add_node(pos, {name="mesecons_button:button_on",param2=node.param2})
-
-		local rules=mesecon:get_rules("button")
-		if node.param2 == 5 then
-			rules=mesecon:rotate_rules_left(rules)
-		end
-		if node.param2 == 3 then
-			rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
-		end
-		if node.param2 == 4 then
-			rules=mesecon:rotate_rules_right(rules)
-		end
+		local rules=mesecon.button_get_rules(node.param2)
         	mesecon:receptor_on(pos, rules)
+		minetest.after(1, mesecon.button_turnoff, {pos=pos, param2=node.param2})
 	end
 end)
 
-minetest.register_abm({
-	nodenames = {"mesecons_button:button_on"},
-	interval = 1,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		minetest.env:add_node(pos, {name="mesecons_button:button_off",param2=node.param2})
+mesecon.button_turnoff = function (params)
+	if minetest.env:get_node(params.pos).name=="mesecons_button:button_on" then
+		minetest.env:add_node(params.pos, {name="mesecons_button:button_off", param2=params.param2})
+		local rules=mesecon.button_get_rules(param2)
+        	mesecon:receptor_off(params.pos, rules)
+	end
+end
 
-		local rules=mesecon:get_rules("button")
-		print (rules[1].x)
-		if node.param2 == 5 then
-			rules=mesecon:rotate_rules_left(rules)
-		end
-		print (rules[1].x)
-		if node.param2 == 3 then
-			rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
-		end
-		print (rules[1].x)
-		if node.param2 == 4 then
-			rules=mesecon:rotate_rules_right(rules)
-		end
-		print (rules[1].x)
-        	mesecon:receptor_off(pos, rules)
+mesecon.button_get_rules = function(param2)
+	local rules=mesecon:get_rules("button")
+	if param2 == 5 then
+		rules=mesecon:rotate_rules_left(rules)
 	end
-})
+	if param2 == 3 then
+		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
+	end
+	if param2 == 4 then
+		rules=mesecon:rotate_rules_right(rules)
+	end
+	return rules
+end
 
 minetest.register_craft({
 	output = '"mesecons_button:button_off" 2',
@@ -95,9 +83,11 @@ mesecon:add_rules("button", {
 {x=0,  y=1,  z=1},
 {x=0,  y=-1, z=1},
 {x=0,  y=1,  z=-1},
+{x=0,  y=0,  z=-1},
 {x=0,  y=-1, z=-1},
 {x=0,  y=-1, z=0},
 {x=2,  y=0,  z=0}})
 
-mesecon:add_receptor_node("mesecons_button:button")
-mesecon:add_receptor_node_off("mesecons_button:button_off")
+mesecon:add_receptor_node_off("mesecons_button:button_off", nil, mesecon.button_get_rules)
+mesecon:add_receptor_node("mesecons_button:button_on", nil, mesecon.button_get_rules)
+