summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Zhang <azhang9@gmail.com>2012-01-26 16:33:11 -0500
committerAnthony Zhang <azhang9@gmail.com>2012-01-26 16:33:11 -0500
commitcbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6 (patch)
tree112610e8bb0018990d7cb3faad292d055130ed2b
parent688f65947f8bbaa2b260238f050602d4d40815e8 (diff)
downloadmesecons-cbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6.tar
mesecons-cbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6.tar.gz
mesecons-cbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6.tar.bz2
mesecons-cbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6.tar.xz
mesecons-cbe6b4f7bef4ae930afafe3f8cc667a256b3c2e6.zip
Update param2 as per kahrl's suggestions.
-rw-r--r--jeija/button.lua16
-rw-r--r--jeija/torches.lua54
2 files changed, 28 insertions, 42 deletions
diff --git a/jeija/button.lua b/jeija/button.lua
index d77a5b8..1d210f9 100644
--- a/jeija/button.lua
+++ b/jeija/button.lua
@@ -36,16 +36,16 @@ minetest.register_on_punchnode(function(pos, node, puncher)
if node.name == "jeija:wall_button_off" then
minetest.env:add_node(pos, {name="jeija:wall_button_on",param2=node.param2})
local rules_string=""
- if node.param2 == 32 then
+ if node.param2 == 5 then
rules_string="button_z+"
end
- if node.param2 == 2 then
+ if node.param2 == 3 then
rules_string="button_x+"
end
- if node.param2 == 16 then
+ if node.param2 == 4 then
rules_string="button_z-"
end
- if node.param2 == 1 then
+ if node.param2 == 2 then
rules_string="button_x-"
end
mesecon:receptor_on(pos, rules_string)
@@ -59,16 +59,16 @@ minetest.register_abm({
minetest.env:add_node(pos, {name="jeija:wall_button_off",param2=node.param2})
local rules_string=""
- if node.param2 == 32 then
+ if node.param2 == 5 then
rules_string="button_z+"
end
- if node.param2 == 2 then
+ if node.param2 == 3 then
rules_string="button_x+"
end
- if node.param2 == 16 then
+ if node.param2 == 4 then
rules_string="button_z-"
end
- if node.param2 == 1 then
+ if node.param2 == 2 then
rules_string="button_x-"
end
mesecon:receptor_off(pos, rules_string)
diff --git a/jeija/torches.lua b/jeija/torches.lua
index 205e9ce..b5c650d 100644
--- a/jeija/torches.lua
+++ b/jeija/torches.lua
@@ -48,33 +48,24 @@ minetest.register_abm({
pa.y = 1
local rules_string=""
- if node.param2 == 32 then
+ if node.param2 == 5 then
pa.z = -1
rules_string="mesecontorch_z+"
- end
- if node.param2 == 2 then
+ elseif node.param2 == 3 then
pa.x = -1
rules_string="mesecontorch_x+"
- end
- if node.param2 == 16 then
+ elseif node.param2 == 4 then
pa.z = 1
rules_string="mesecontorch_z-"
- end
- if node.param2 == 1 then
+ elseif node.param2 == 2 then
pa.x = 1
rules_string="mesecontorch_x-"
- end
- if node.param2 == 4 then
- rules_string="mesecontorch_y-"
+ elseif node.param2 == 0 then
pa.y = 1
- pa.z=0
- pa.x=0
- end
- if node.param2 == 8 then
- rules_string="mesecontorch_y+"
+ rules_string="mesecontorch_y-"
+ elseif node.param2 == 1 then
pa.y = -1
- pa.z=0
- pa.x=0
+ rules_string="mesecontorch_y+"
end
if mesecon:is_power_on({x=pos.x, y=pos.y, z=pos.z}, pa.x, pa.y, pa.z)==1 then
@@ -103,22 +94,17 @@ minetest.register_on_placenode(function(pos, node, placer)
if node.name == "jeija:mesecon_torch_on" then
local rules_string=""
- if node.param2 == 32 then
+ if node.param2 == 5 then
rules_string="mesecontorch_z+"
- end
- if node.param2 == 2 then
+ elseif node.param2 == 3 then
rules_string="mesecontorch_x+"
- end
- if node.param2 == 16 then
+ elseif node.param2 == 4 then
rules_string="mesecontorch_z-"
- end
- if node.param2 == 1 then
+ elseif node.param2 == 2 then
rules_string="mesecontorch_x-"
- end
- if node.param2 == 4 then
+ elseif node.param2 == 0 then
rules_string="mesecontorch_y-"
- end
- if node.param2 == 8 then
+ elseif node.param2 == 1 then
rules_string="mesecontorch_y+"
end
@@ -130,9 +116,9 @@ mesecon:add_receptor_node("jeija:mesecon_torch_on")
mesecon:add_receptor_node_off("jeija:mesecon_torch_off")
-- Param2 Table (Block Attached To)
--- 32 = z-1
--- 2 = x-1
--- 16 = z+1
--- 1 = x+1
--- 4 = y+1
--- 8 = y-1
+-- 5 = z-1
+-- 3 = x-1
+-- 4 = z+1
+-- 2 = x+1
+-- 0 = y+1
+-- 1 = y-1