From 83b5ee4bae923883adad8dc5bef0f3971b1d2899 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sun, 29 Jan 2012 13:19:14 -0500 Subject: Add missing forward slash (was causing plugs and sockets to fail). --- jeija/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeija/init.lua b/jeija/init.lua index 067575d..b9482f5 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -862,7 +862,7 @@ dofile(minetest.get_modpath("jeija").."/switch.lua") dofile(minetest.get_modpath("jeija").."/pistons.lua") --TEMPEREST's STUFF if ENABLE_TEMPEREST==1 then - dofile(minetest.get_modpath("jeija").."temperest.lua") + dofile(minetest.get_modpath("jeija").."/temperest.lua") end --INIT -- cgit v1.2.3 From 15c9988a4581dd3d4bd18eeb0874ab010b54915e Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sun, 29 Jan 2012 13:19:40 -0500 Subject: Make variables local. --- jeija/temperest.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jeija/temperest.lua b/jeija/temperest.lua index d54da73..4843212 100644 --- a/jeija/temperest.lua +++ b/jeija/temperest.lua @@ -16,7 +16,7 @@ minetest.register_node("jeija:mesecon_plug", { mesecon:register_on_signal_on(function(pos, node) if node.name=="jeija:mesecon_plug" then local set_node_on = function(pos) - node = minetest.env:get_node(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) @@ -28,16 +28,16 @@ mesecon:register_on_signal_on(function(pos, node) end end - lnode = minetest.env:get_node({x=pos.x-1, y=pos.y, z=pos.z}) --a node between this node and the one two nodes away + local lnode = minetest.env:get_node({x=pos.x-1, y=pos.y, z=pos.z}) --a node between this node and the one two nodes away if lnode.name=="air" then set_node_on({x=pos.x-2, y=pos.y, z=pos.z}) end - lnode = minetest.env:get_node({x=pos.x+1, y=pos.y, z=pos.z}) --a node between this node and the one two nodes away + local lnode = minetest.env:get_node({x=pos.x+1, y=pos.y, z=pos.z}) --a node between this node and the one two nodes away if lnode.name=="air" then set_node_on({x=pos.x+2, y=pos.y, z=pos.z}) end - lnode = minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z-1}) --a node between this node and the one two nodes away + local lnode = minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z-1}) --a node between this node and the one two nodes away if lnode.name=="air" then set_node_on({x=pos.x, y=pos.y, z=pos.z-2}) end - lnode = minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z+1}) --a node between this node and the one two nodes away + local lnode = minetest.env:get_node({x=pos.x, y=pos.y, z=pos.z+1}) --a node between this node and the one two nodes away if lnode.name=="air" then set_node_on({x=pos.x, y=pos.y, z=pos.z+2}) end end end) @@ -136,7 +136,7 @@ minetest.register_node("jeija:mesecon_socket_on", { selection_box = { type = "fixed", }, - dug_item='node "jeija:mesecon_socket_off" 1', + drop='node "jeija:mesecon_socket_off" 1', }) minetest.register_on_dignode( @@ -185,7 +185,7 @@ minetest.register_node("jeija:mesecon_inverter_on", { selection_box = { type = "fixed", }, - dug_item='node "jeija:mesecon_inverter_off" 1', + drop='node "jeija:mesecon_inverter_off" 1', }) minetest.register_on_dignode( -- cgit v1.2.3 From 1289cefee05bcac5121563a948dd9d7e9f0c4d77 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sun, 29 Jan 2012 14:16:28 -0500 Subject: Descriptions for plugs and sockets. --- jeija/temperest.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jeija/temperest.lua b/jeija/temperest.lua index 4843212..7fa61e3 100644 --- a/jeija/temperest.lua +++ b/jeija/temperest.lua @@ -1,6 +1,7 @@ --TEMPEREST-PLUG minetest.register_node("jeija:mesecon_plug", { + description = "Plug", drawtype = "raillike", paramtype = "light", is_ground_content = true, @@ -113,6 +114,7 @@ minetest.register_craft({ --TEMPEREST-SOCKET minetest.register_node("jeija:mesecon_socket_off", { + description = "Socket", drawtype = "raillike", paramtype = "light", is_ground_content = true, @@ -162,6 +164,7 @@ minetest.register_craft({ --TEMPEREST-INVERTER minetest.register_node("jeija:mesecon_inverter_off", { + description = "Inverter", drawtype = "raillike", paramtype = "light", is_ground_content = true, -- cgit v1.2.3 From dbd9b4e6b75bd996ae8529516861407bb942bfe4 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Mon, 30 Jan 2012 13:10:03 -0500 Subject: Add aliases for plugs, sockets, inverters, and buttons. --- jeija/alias.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jeija/alias.lua b/jeija/alias.lua index 90ed87b..079bb8d 100644 --- a/jeija/alias.lua +++ b/jeija/alias.lua @@ -7,9 +7,15 @@ minetest.register_alias("jeija:wireless_inverter", "jeija:wireless_inverter_on") minetest.register_alias("jeija:wireless_receiver", "jeija:wireless_receiver_off") minetest.register_alias("jeija:wireless_transmitter", "jeija:wireless_transmitter_off") minetest.register_alias("jeija:switch", "jeija:mesecon_switch_off") +minetest.register_alias("jeija:wall_button", "jeija:wall_button_off") minetest.register_alias("jeija:piston", "jeija:piston_normal") minetest.register_alias("jeija:blinky_plant", "jeija:blinky_plant_off") minetest.register_alias("jeija:mesecon_torch", "jeija:mesecon_torch_on") minetest.register_alias("jeija:hydro_turbine", "jeija:hydro_turbine_off") minetest.register_alias("jeija:pressure_plate_stone", "jeija:pressure_plate_stone_off") minetest.register_alias("jeija:pressure_plate_wood", "jeija:pressure_plate_wood_off") + +if ENABLE_TEMPEREST==1 then + minetest.register_alias("jeija:mesecon_socket", "jeija:mesecon_socket_off") + minetest.register_alias("jeija:mesecon_inverter", "jeija:mesecon_inverter_off") +end \ No newline at end of file -- cgit v1.2.3