mesecons_rules must be global. made so, confined to pipeworks.{} table.

diff --git a/devices.lua b/devices.lua
index 46ed873f87fcbcf68e40640f141241a41e9f564e..4b321b6c81412f46e96b906d76cdd8d6d92a07a8 100644 (file)
--- a/devices.lua
+++ b/devices.lua
@@ -7,14 +7,14 @@ if mesecon then
        pipereceptor_on = {
                receptor = {
                        state = mesecon.state.on,
-                       rules = mesecons_rules
+                       rules = pipeworks.mesecons_rules
                }
        }
 
        pipereceptor_off = {
                receptor = {
                        state = mesecon.state.off,
-                       rules = mesecons_rules
+                       rules = pipeworks.mesecons_rules
                }
        }
 end

diff --git a/init.lua b/init.lua
index aa854a4cda946e9cf77db8d600df44277a685483..6964abcf01672a5d83407c214dda78da902c3209 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -30,6 +30,13 @@ end
 
 pipeworks.meseadjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}}
 
+pipeworks.rules_all = {{x=0, y=0, z=1},{x=0, y=0, z=-1},{x=1, y=0, z=0},{x=-1, y=0, z=0},
+               {x=0, y=1, z=1},{x=0, y=1, z=-1},{x=1, y=1, z=0},{x=-1, y=1, z=0},
+               {x=0, y=-1, z=1},{x=0, y=-1, z=-1},{x=1, y=-1, z=0},{x=-1, y=-1, z=0},
+               {x=0, y=1, z=0}, {x=0, y=-1, z=0}}
+
+pipeworks.mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
+
 pipeworks.liquid_texture = "default_water.png"
 
 -- Helper functions
@@ -107,10 +114,6 @@ dofile(pipeworks.modpath.."/flowing_logic.lua")
 dofile(pipeworks.modpath.."/crafts.lua")
 dofile(pipeworks.modpath.."/tubes.lua")
 
-pipeworks.rules_all = {{x=0, y=0, z=1},{x=0, y=0, z=-1},{x=1, y=0, z=0},{x=-1, y=0, z=0},
-               {x=0, y=1, z=1},{x=0, y=1, z=-1},{x=1, y=1, z=0},{x=-1, y=1, z=0},
-               {x=0, y=-1, z=1},{x=0, y=-1, z=-1},{x=1, y=-1, z=0},{x=-1, y=-1, z=0},
-               {x=0, y=1, z=0}, {x=0, y=-1, z=0}}
 if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
 if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
 if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end

diff --git a/tubes.lua b/tubes.lua
index 9f2bf14350e29a39fe15f652a9078e3e0318d08f..7e65d5b1a165fc50af729d778b0e704b43bc4888 100644 (file)
--- a/tubes.lua
+++ b/tubes.lua
@@ -324,9 +324,6 @@ if pipeworks.enable_mese_tube then
        })
 end
 
-       local mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
-
-
 if pipeworks.enable_detector_tube then
 
        local detector_plain_textures={"pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png",
@@ -346,14 +343,14 @@ if pipeworks.enable_detector_tube then
                groups={mesecon=2,not_in_creative_inventory=1},
                drop="pipeworks:detector_tube_off_000000",
                mesecons={receptor={state="on",
-                                       rules=mesecons_rules}},
+                                       rules=pipeworks.mesecons_rules}},
                item_exit = function(pos)
                        local meta = minetest.get_meta(pos)
                        local nitems=meta:get_int("nitems")-1
                        local name = minetest.get_node(pos).name
                        if nitems==0 then
                                minetest.set_node(pos,{name=string.gsub(name,"on","off")})
-                               mesecon:receptor_off(pos,mesecons_rules)
+                               mesecon:receptor_off(pos,pipeworks.mesecons_rules)
                        else
                                meta:set_int("nitems", nitems)
                        end
@@ -370,12 +367,12 @@ if pipeworks.enable_detector_tube then
                {tube={can_go=function(pos,node,velocity,stack)
                        local name = minetest.get_node(pos).name
                        minetest.set_node(pos,{name=string.gsub(name,"off","on")})
-                       mesecon:receptor_on(pos,mesecons_rules)
+                       mesecon:receptor_on(pos,pipeworks.mesecons_rules)
                        return pipeworks.notvel(pipeworks.meseadjlist,velocity)
                end},
                groups={mesecon=2},
                mesecons={receptor={state="off",
-                                       rules=mesecons_rules}}
+                                       rules=pipeworks.mesecons_rules}}
        })
 end
 
@@ -400,7 +397,7 @@ if pipeworks.enable_conductor_tube then
                conductor_end_textures,conductor_short_texture,conductor_inv_texture,
                {groups={mesecon=2},
                mesecons={conductor={state="off",
-                                       rules=mesecons_rules,
+                                       rules=pipeworks.mesecons_rules,
                                        onstate="pipeworks:conductor_tube_on_#id"}}
        })
 
@@ -409,7 +406,7 @@ if pipeworks.enable_conductor_tube then
                {groups={mesecon=2,not_in_creative_inventory=1},
                drop="pipeworks:conductor_tube_off_000000",
                mesecons={conductor={state="on",
-                                       rules=mesecons_rules,
+                                       rules=pipeworks.mesecons_rules,
                                        offstate="pipeworks:conductor_tube_off_#id"}}
        })
 end