Change the ENABLE_TEMPEREST flag to affect only the inclusion of the inverter socket, since that is the only element that can lead to a crash.

This commit is contained in:
Anthony Zhang 2012-02-23 19:43:03 -05:00
parent cbd77d8f3d
commit 8bdb2e86ad
2 changed files with 96 additions and 75 deletions

View File

@ -877,10 +877,7 @@ dofile(minetest.get_modpath("jeija").."/switch.lua")
dofile(minetest.get_modpath("jeija").."/pistons.lua") dofile(minetest.get_modpath("jeija").."/pistons.lua")
dofile(minetest.get_modpath("jeija").."/lightstone.lua") dofile(minetest.get_modpath("jeija").."/lightstone.lua")
dofile(minetest.get_modpath("jeija").."/lever.lua") dofile(minetest.get_modpath("jeija").."/lever.lua")
--TEMPEREST's STUFF dofile(minetest.get_modpath("jeija").."/temperest.lua")
if ENABLE_TEMPEREST==1 then
dofile(minetest.get_modpath("jeija").."/temperest.lua")
end
--INIT --INIT
mesecon:read_wlre_from_file() mesecon:read_wlre_from_file()

View File

@ -15,29 +15,52 @@ minetest.register_node("jeija:mesecon_plug", {
description = "Plug", description = "Plug",
}) })
local set_node_on = function(pos) local set_node_on
local node = minetest.env:get_node(pos) local set_node_off
if node.name=="jeija:mesecon_socket_off" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"})
nodeupdate(pos)
mesecon:receptor_on(pos)
elseif node.name=="jeija:mesecon_inverter_on" then
minetest.env:add_node(pos, {name="jeija:mesecon_inverter_off"})
nodeupdate(pos)
mesecon:receptor_off(pos)
end
end
local set_node_off = function(pos) if ENABLE_TEMPEREST==1 then
node = minetest.env:get_node(pos) set_node_on = function(pos)
if node.name=="jeija:mesecon_socket_on" then local node = minetest.env:get_node(pos)
minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"}) if node.name=="jeija:mesecon_socket_off" then
nodeupdate(pos) minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"})
mesecon:receptor_off(pos) nodeupdate(pos)
elseif node.name=="jeija:mesecon_inverter_off" then mesecon:receptor_on(pos)
minetest.env:add_node(pos, {name="jeija:mesecon_inverter_on"}) elseif node.name=="jeija:mesecon_inverter_on" then
nodeupdate(pos) minetest.env:add_node(pos, {name="jeija:mesecon_inverter_off"})
mesecon:receptor_on(pos) nodeupdate(pos)
mesecon:receptor_off(pos)
end
end
set_node_off = function(pos)
node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_on" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"})
nodeupdate(pos)
mesecon:receptor_off(pos)
elseif node.name=="jeija:mesecon_inverter_off" then
minetest.env:add_node(pos, {name="jeija:mesecon_inverter_on"})
nodeupdate(pos)
mesecon:receptor_on(pos)
end
end
else
set_node_on = function(pos)
local node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_off" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"})
nodeupdate(pos)
mesecon:receptor_on(pos)
end
end
set_node_off = function(pos)
node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_on" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"})
nodeupdate(pos)
mesecon:receptor_off(pos)
end
end end
end end
@ -139,58 +162,59 @@ minetest.register_craft({
}) })
--TEMPEREST-INVERTER --TEMPEREST-INVERTER
if ENABLE_TEMPEREST==1 then
minetest.register_node("jeija:mesecon_inverter_off", {
drawtype = "raillike",
paramtype = "light",
is_ground_content = true,
tile_images = {"jeija_mesecon_inverter_off.png"},
material = minetest.digprop_constanttime(0.1),
walkable = false,
selection_box = {
type = "fixed",
},
drop='"jeija:mesecon_inverter_on" 1',
})
minetest.register_node("jeija:mesecon_inverter_off", { minetest.register_node("jeija:mesecon_inverter_on", {
drawtype = "raillike", description = "Inverter",
paramtype = "light", drawtype = "raillike",
is_ground_content = true, paramtype = "light",
tile_images = {"jeija_mesecon_inverter_off.png"}, is_ground_content = true,
material = minetest.digprop_constanttime(0.1), tile_images = {"jeija_mesecon_inverter_on.png"},
walkable = false, inventory_image = "jeija_mesecon_inverter_on.png",
selection_box = { wield_image = "jeija_mesecon_inverter_on.png",
type = "fixed", material = minetest.digprop_constanttime(0.1),
}, walkable = false,
drop='"jeija:mesecon_inverter_on" 1', selection_box = {
}) type = "fixed",
},
})
minetest.register_node("jeija:mesecon_inverter_on", { minetest.register_on_placenode(function(pos, node)
description = "Inverter", if node.name=="jeija:mesecon_inverter" then
drawtype = "raillike", mesecon:receptor_on(pos)
paramtype = "light",
is_ground_content = true,
tile_images = {"jeija_mesecon_inverter_on.png"},
inventory_image = "jeija_mesecon_inverter_on.png",
wield_image = "jeija_mesecon_inverter_on.png",
material = minetest.digprop_constanttime(0.1),
walkable = false,
selection_box = {
type = "fixed",
},
})
minetest.register_on_placenode(function(pos, node)
if node.name=="jeija:mesecon_inverter" then
mesecon:receptor_on(pos)
end
end
)
minetest.register_on_dignode(
function(pos, oldnode, digger)
if oldnode.name == "jeija:mesecon_inverter_on" then
mesecon:receptor_off(pos)
end end
end end
) )
mesecon:add_receptor_node("jeija:mesecon_inverter_on") minetest.register_on_dignode(
mesecon:add_receptor_node_off("jeija:mesecon_inverter_off") function(pos, oldnode, digger)
if oldnode.name == "jeija:mesecon_inverter_on" then
mesecon:receptor_off(pos)
end
end
)
minetest.register_craft({ mesecon:add_receptor_node("jeija:mesecon_inverter_on")
output = 'node "jeija:mesecon_inverter_on" 2', mesecon:add_receptor_node_off("jeija:mesecon_inverter_off")
recipe = {
{'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'}, minetest.register_craft({
{'craft "default:steel_ingot"', '', 'craft "default:steel_ingot"'}, output = 'node "jeija:mesecon_inverter_on" 2',
{'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'}, recipe = {
} {'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'},
}) {'craft "default:steel_ingot"', '', 'craft "default:steel_ingot"'},
{'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'},
}
})
end