diff options
Diffstat (limited to 'mesecons_torch')
| -rw-r--r-- | mesecons_torch/init.lua | 55 | 
1 files changed, 27 insertions, 28 deletions
| diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua index ba3ac65..cfdac11 100644 --- a/mesecons_torch/init.lua +++ b/mesecons_torch/init.lua @@ -50,30 +50,24 @@ minetest.register_abm({      chance = 1,      action = function(pos, node, active_object_count, active_object_count_wider)          local pa = {x=0, y=0, z=0} -	    --pa.y = 1 -	    local rules=mesecon:get_rules("mesecontorch") +	local rules=mesecon.torch_get_rules(minetest.env:get_node(pos).param2) -	    if node.param2 == 4 then +	if node.param2 == 4 then  		pa.z = -2 -		rules=mesecon:rotate_rules_right(rules) -	    elseif node.param2 == 2 then +	elseif node.param2 == 2 then  		pa.x = -2 -		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules)) --180 degrees -	    elseif node.param2 == 5 then +	elseif node.param2 == 5 then  		pa.z = 2 -		rules=mesecon:rotate_rules_left(rules) -	    elseif node.param2 == 3 then +	elseif node.param2 == 3 then  		 pa.x = 2 -	    elseif node.param2 == 1 then +	elseif node.param2 == 1 then  		pa.y = 2 -		rules=mesecon:rotate_rules_down(rules) -        elseif node.param2 == 0 then +	elseif node.param2 == 0 then  		pa.y = -2 -		rules=mesecon:rotate_rules_up(rules)          end          local postc = {x=pos.x-pa.x, y=pos.y-pa.y, z=pos.z-pa.z} -        if mesecon:is_power_on(postc,0,0,0)==1 then +        if mesecon:is_power_on(postc)==1 then              if node.name ~= "mesecons_torch:mesecon_torch_off" then                  minetest.env:add_node(pos, {name="mesecons_torch:mesecon_torch_off",param2=node.param2})                  mesecon:receptor_off(pos, rules_string) @@ -97,22 +91,27 @@ minetest.register_on_dignode(  minetest.register_on_placenode(function(pos, node, placer)  	if node.name == "mesecons_torch:mesecon_torch_on" then -		local rules=mesecon:get_rules("mesecontorch") -		if node.param2 == 4 then -			rules=mesecon:rotate_rules_right(rules) -		elseif node.param2 == 2 then -			rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules)) --180 degrees -		elseif node.param2 == 5 then -			rules=mesecon:rotate_rules_left(rules) -		elseif node.param2 == 1 then -			rules=mesecon:rotate_rules_down(rules) -		elseif node.param2 == 0 then -			rules=mesecon:rotate_rules_up(rules) -		end +		local rules=mesecon.torch_get_rules(minetest.env:get_node(pos).param2)  		mesecon:receptor_on(pos, rules)  	end  end) +mesecon.torch_get_rules = function(param2) +	local rules=mesecon:get_rules("mesecontorch") +	if param2 == 5 then +		rules=mesecon:rotate_rules_right(rules) +	elseif param2 == 2 then +		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules)) --180 degrees +	elseif param2 == 4 then +		rules=mesecon:rotate_rules_left(rules) +	elseif param2 == 1 then +		rules=mesecon:rotate_rules_down(rules) +	elseif param2 == 0 then +		rules=mesecon:rotate_rules_up(rules) +	end +	return rules +end +  mesecon:add_rules("mesecontorch",   {{x=1,  y=0,  z=0},  {x=0,  y=0,  z=1}, @@ -120,8 +119,8 @@ mesecon:add_rules("mesecontorch",  {x=0,  y=1,  z=0},  {x=0,  y=-1,  z=0}}) -mesecon:add_receptor_node("mesecons_torch:mesecon_torch_on") -mesecon:add_receptor_node_off("mesecons_torch:mesecon_torch_off") +mesecon:add_receptor_node("mesecons_torch:mesecon_torch_on", nil, mesecon.torch_get_rules) +mesecon:add_receptor_node_off("mesecons_torch:mesecon_torch_off", nil, mesecon.torch_get_rules)  -- Param2 Table (Block Attached To)  -- 5 = z-1 | 
