Merge branch 'master' of Grossam/scifi_nodes into master

README.md

@@ -10,3 +10,5 @@ Minetest mod that adds scifi themed nodes
 CC BY-NC 3.0
 * scifi_nodes_door_normal.ogg tlwmdbt https://freesound.org/people/tlwmdbt/sounds/165862/
 * scifi_nodes_door_mechanic.ogg primeval_polypod https://freesound.org/people/primeval_polypod/sounds/156507/
+* scifi_nodes_digicode.ogg https://freesound.org/people/Robinhood76/sounds/94933/
+* scifi_nodes_switch.ogg http://soundbible.com/1950-Button-Push.html

doors.lua

@@ -27,33 +27,26 @@ local doors = {
 	{base_name = "blue", base_ingredient = "default:steel_block", sound = "scifi_nodes_door_normal"}
 }
 
-
--- Maybe useful later with mesecons_doors.meseconify_door()
-function get_doors_list()
-	return doors
-end
-
-
 for _, current_door in ipairs(doors) do
 
-local closed = "scifi_nodes:"..current_door.base_name.."_door_closed"
+	local closed = "scifi_nodes:"..current_door.base_name.."_door_closed"
-local closed_top = "scifi_nodes:"..current_door.base_name.."_door_closed_top"
+	local closed_top = "scifi_nodes:"..current_door.base_name.."_door_closed_top"
-local opened = "scifi_nodes:"..current_door.base_name.."_door_opened"
+	local opened = "scifi_nodes:"..current_door.base_name.."_door_opened"
-local opened_top = "scifi_nodes:"..current_door.base_name.."_door_opened_top"
+	local opened_top = "scifi_nodes:"..current_door.base_name.."_door_opened_top"
-local base_name = current_door.base_name
+	local base_name = current_door.base_name
-local base_ingredient = current_door.base_ingredient
+	local base_ingredient = current_door.base_ingredient
-local sound = current_door.sound
+	local sound = current_door.sound
 
-minetest.register_craft({
+	minetest.register_craft({
 		output = closed .. " 2",
 		recipe = {
 			{"scifi_nodes:white2", base_ingredient, "scifi_nodes:white2"},
 			{"scifi_nodes:black", base_ingredient, "scifi_nodes:black"}
 		}
-})
+	})
 
 
-function onplace(itemstack, placer, pointed_thing)
+	function onplace(itemstack, placer, pointed_thing)
 		local pos1 = pointed_thing.above
 		local pos2 = {x=pos1.x, y=pos1.y, z=pos1.z}
 			  pos2.y = pos2.y+1
@@ -96,13 +89,13 @@ function onplace(itemstack, placer, pointed_thing)
 		itemstack:take_item(1)
 
 		return itemstack;
-end
+	end
 
-function afterdestruct(pos, oldnode)
+	function afterdestruct(pos, oldnode)
 		   minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name="air"})
-end
+	end
 
-function rightclick(pos, node, player, itemstack, pointed_thing)
+	function rightclick(pos, node, player, itemstack, pointed_thing)
 		-- play sound
 		minetest.sound_play(sound,{
 			max_hear_distance = 16,
@@ -159,13 +152,13 @@ function rightclick(pos, node, player, itemstack, pointed_thing)
 
 			timer:start(3)
 
-end
+	end
 
-function afterplace(pos, placer, itemstack, pointed_thing)
+	function afterplace(pos, placer, itemstack, pointed_thing)
 		   minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name=opened_top,param2=nodeu.param2})
-end
+	end
 
-function ontimer(pos, elapsed)
+	function ontimer(pos, elapsed)
 		-- play sound
 		minetest.sound_play(sound,{
 			max_hear_distance = 16,
@@ -220,9 +213,50 @@ function ontimer(pos, elapsed)
 			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z+1}, {name=closed_top, param2=h.param2})
 			end
 
+	end
+
+-- allow doors opening on mesecon signal
+-- from a pressure plate
+local mesecons_door_def
+--local mesecons_door_top_def
+local mesecons_door_rules
+--local mesecons_door_top_rules
+if minetest.get_modpath("mesecons") then
+	mesecons_door_rules = {
+		-- get signal from pressure plate
+		{x=1, y=0, z=0},
+		{x=-1, y=0, z=0},
+		{x=0, y=0, z=1},
+		{x=0, y=0, z=-1},
+		-- get signal from wall mounted button
+		{x=1, y=1, z=1},
+		{x=-1, y=1, z=1},
+		{x=1, y=1, z=-1},
+		{x=-1, y=1, z=-1},
+	}
+	mesecons_door_def = {
+		effector = {
+			action_on = rightclick,
+			rules = mesecons_door_rules
+		},
+	}
+--	mesecons_door_top_rules = {
+--		-- get signal switch or digicode
+--		{x=1, y=0, z=1},
+--		{x=-1, y=0, z=1},
+--		{x=1, y=0, z=1},
+--		{x=-1, y=0, z=-1},
+--		-- get signal from door_bottom
+--		{x=0, y=-1, z=0},
+--	}
+--	mesecons_door_top_def = {
+--		conductor = {
+--			rules = mesecons_door_top_rules
+--		}
+--	}
 end
 
-minetest.register_node(closed, {
+	minetest.register_node(closed, {
 		description = current_door.base_name.." sliding door",
 		inventory_image = "scifi_nodes_door_"..base_name.."_inv.png",
 		wield_image = "scifi_nodes_door_"..base_name.."_inv.png",
@@ -250,27 +284,16 @@ minetest.register_node(closed, {
 				{-0.5, -0.5, -0.0625, 0.5, 1.5, 0.0625}
 			}
 		},
-	mesecon = {
+		mesecons = mesecons_door_def,
-		effector = {
+
-			action_on = function (pos, node)
+		on_place = onplace,
-			minetest.sound_play(sound, {
+
-				max_hear_distance = 16,
+		after_destruct = afterdestruct,
-				pos = pos,
+
-				gain = 1.0
+		on_rightclick = rightclick,
 	})
-		end,
-		rules = mesecon.rules.pplate
-		},
-	},
 
-on_place = onplace,
+	minetest.register_node(closed_top, {
-
-after_destruct = afterdestruct,
-
-on_rightclick = rightclick,
-})
-
-minetest.register_node(closed_top, {
 		tiles = {
 			"scifi_nodes_door_"..base_name.."_edge.png",
 			"scifi_nodes_door_"..base_name.."_edge.png",
@@ -295,9 +318,10 @@ minetest.register_node(closed_top, {
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
-})
+--		mesecons = mesecons_door_top_def,
+	})
 
-minetest.register_node(opened, {
+	minetest.register_node(opened, {
 		tiles = {
 			"scifi_nodes_door_"..base_name.."_edge.png",
 			"scifi_nodes_door_"..base_name.."_edge.png",
@@ -323,12 +347,12 @@ minetest.register_node(opened, {
 				{-0.5, -0.5, -0.0625, -0.25, 1.5, 0.0625},
 			}
 		},
-after_place_node = afterplace,
+	after_place_node = afterplace,
-after_destruct = afterdestruct,
+	after_destruct = afterdestruct,
-on_timer = ontimer,
+	on_timer = ontimer,
-})
+	})
 
-minetest.register_node(opened_top, {
+	minetest.register_node(opened_top, {
 		tiles = {
 			"scifi_nodes_door_"..base_name.."_edge.png",
 			"scifi_nodes_door_"..base_name.."_edge.png",
@@ -353,5 +377,5 @@ minetest.register_node(opened_top, {
 				{0, 0, 0, 0, 0, 0}, 
 			}
 		},
-})
+	})
-end
+end     -- end of doors table browsing

nodeboxes.lua

@@ -366,8 +366,6 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	sounds = default.node_sound_glass_defaults()
 })
 
-
-
 minetest.register_node("scifi_nodes:pot", {
 	description = "metal plant pot (right click for lid, shift+rightclick to plant)",
 	tiles = {
@@ -1205,34 +1203,25 @@ minetest.register_node("scifi_nodes:windowpanel", {
     sounds = default.node_sound_glass_defaults(),
 })
 
+--------------
+-- Switches --
+--------------
+local switch_rules = {}
+local mesecons_switch_on_def = {}
+local mesecons_switch_off_def = {}
+
 if  (mesecon ~= nil) and
     (mesecon.receptor_on ~= nil) and
     (mesecon.receptor_off ~= nil)           then
-   minetest.register_node("scifi_nodes:switch_off", {
+
-        description = "Wall switch",
+	switch_rules = {
-        tiles = {
+		{x=1, y=-1, z=1},
-            "scifi_nodes_switch_off.png",
+		{x=1, y=-1, z=-1},
-        },
+		{x=-1, y=-1, z=1},
-        inventory_image = "scifi_nodes_switch_on.png",
+		{x=-1, y=-1, z=-1}
-        wield_image = "scifi_nodes_switch_on.png",
+	}
-        drawtype = "signlike",
+	mesecons_switch_on_def = {receptor = {state = mesecon.state.on, rules = switch_rules}}
-        sunlight_propagates = true,
+	mesecons_switch_off_def = {receptor = {state = mesecon.state.off, rules = switch_rules}}
-        node_box = {
-            type = "wallmounted",
-        },
-        selection_box = {
-            type = "wallmounted",
-        },
-        paramtype = "light",
-        paramtype2 = "wallmounted",
-        groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
-        on_rightclick = function(pos, node, clicker, item, _)
-                minetest.set_node(pos, {name="scifi_nodes:switch_on", param2=node.param2})
-                mesecon.receptor_on(pos)
-        end,
-        sounds = default.node_sound_glass_defaults(),
-        mesecons = {receptor = { state = mesecon.state.off }}
-    })
 
     minetest.register_node("scifi_nodes:switch_on", {
         description = "Wall switch",
@@ -1253,12 +1242,35 @@ if  (mesecon ~= nil) and
         paramtype2 = "wallmounted",
         light_source = 5,
         groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
+		mesecons = mesecons_switch_on_def,
         on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:switch_off", param2=node.param2})
-                mesecon.receptor_off(pos)
+			mesecon.receptor_off(pos, switch_rules)
+			if switch_rules == {} or nil then minetest.chat_send_all("Nib !") end
+			minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos, gain = 1.0})
+        end,
+        sounds = default.node_sound_glass_defaults(),
+	})
+
+	minetest.register_node("scifi_nodes:switch_off", {
+        description = "Wall switch",
+        tiles = {"scifi_nodes_switch_off.png",},
+        inventory_image = "scifi_nodes_switch_on.png",
+        wield_image = "scifi_nodes_switch_on.png",
+        drawtype = "signlike",
+        sunlight_propagates = true,
+        node_box = {type = "wallmounted",},
+        selection_box = {type = "wallmounted",},
+        paramtype = "light",
+        paramtype2 = "wallmounted",
+        groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
+        mesecons = mesecons_switch_off_def,
+        on_rightclick = function(pos, node, clicker, item, _)
+                minetest.set_node(pos, {name="scifi_nodes:switch_on", param2=node.param2})
+                mesecon.receptor_on(pos, switch_rules)
+				minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos, gain = 1.0})
         end,
         sounds = default.node_sound_glass_defaults(),
-        mesecons = {receptor = { state = mesecon.state.on }}
     })
 
 	minetest.register_craft({
@@ -1290,6 +1302,7 @@ else
         groups = {cracky=1, oddly_breakable_by_hand=1},
         on_rightclick = function(pos, node, clicker, item, _)
                 minetest.set_node(pos, {name="scifi_nodes:switch_on", param2=node.param2})
+				minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos, gain = 1.0})
         end,
         sounds = default.node_sound_glass_defaults()
     })
@@ -1315,10 +1328,149 @@ else
         groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
         on_rightclick = function(pos, node, clicker, item, _)
                 minetest.set_node(pos, {name="scifi_nodes:switch_off", param2=node.param2})
+				minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos, gain = 1.0})
+        end,
+        sounds = default.node_sound_glass_defaults()
+    })     --end of wall switch
+end -- if(mesecon.receptor ~= on
+
+--------------
+-- Digicode --
+--------------
+local digicode_rules = {}
+local mesecons_digicode_on_def = {}
+local mesecons_digicode_off_def = {}
+
+if (mesecon ~= nil) and
+	(mesecon.receptor_on ~= nil) and
+	(mesecon.receptor_off ~= nil) then
+
+	digicode_rules = {
+		{x=1, y=-1, z=1},
+		{x=1, y=-1, z=-1},
+		{x=-1, y=-1, z=1},
+		{x=-1, y=-1, z=-1}
+	}
+	mesecons_digicode_on_def = {receptor = {state = mesecon.state.on, rules = digicode_rules}}
+	mesecons_digicode_off_def = {receptor = {state = mesecon.state.off, rules = digicode_rules}}
+
+	local function toggle_digicode(pos)
+		local node = minetest.get_node(pos)
+		local name = node.name
+		if name == "scifi_nodes:digicode_off" then
+			minetest.sound_play("scifi_nodes_digicode", {max_hear_distance = 8, pos = pos, gain = 1.0})
+			minetest.set_node(pos, {name="scifi_nodes:digicode_on", param2=node.param2})
+			mesecon.receptor_on(pos, digicode_rules)
+			minetest.get_node_timer(pos):start(2)
+		else
+			minetest.set_node(pos, {name="scifi_nodes:digicode_off", param2=node.param2})
+			mesecon.receptor_off(pos, digicode_rules)
+		end
+	end
+
+--	local function digicode_turn_off (pos)
+--		local node = minetest.get_node(pos)
+--		minetest.set_node (pos, {name = "scifi_nodes:digicode_off", param2 = node.param2})
+--		mesecon.receptor_off(pos, digicode_rules)
+--		return false
+--	end
+
+	minetest.register_node("scifi_nodes:digicode_on", {
+		description = "Wall switch",
+		sunlight_propagates = true,
+		tiles = {"scifi_nodes_digicode_on.png",},
+		inventory_image = "scifi_nodes_digicode_on.png",
+		wield_image = "scifi_nodes_digicode_on.png",
+		drawtype = "signlike",
+		node_box = {type = "wallmounted",},
+		selection_box = {type = "wallmounted",},
+		paramtype = "light",
+		paramtype2 = "wallmounted",
+		light_source = 5,
+		groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
+		mesecons = mesecons_digicode_on_def,
+		on_rightclick = toggle_digicode,
+		on_timer = toggle_digicode,
+		sounds = default.node_sound_glass_defaults(),
+	})
+
+	minetest.register_node("scifi_nodes:digicode_off", {
+		description = "Digicode",
+		tiles = {"scifi_nodes_digicode_off.png",},
+		inventory_image = "scifi_nodes_digicode_on.png",
+		wield_image = "scifi_nodes_digicode_on.png",
+		drawtype = "signlike",
+		sunlight_propagates = true,
+		node_box = {type = "wallmounted",},
+		selection_box = {type = "wallmounted",},
+		paramtype = "light",
+		paramtype2 = "wallmounted",
+		groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
+		mesecons = mesecons_digicode_off_def,
+		on_rightclick = toggle_digicode,
+		sounds = default.node_sound_glass_defaults(),
+	})
+
+
+    minetest.register_craft({
+        output = "scifi_nodes:digicode_off 2",
+        recipe = {
+            {"mesecons_switch:mesecon_switch_off", "scifi_nodes:grey", ""}
+        }
+    })
+
+-- In case mesecons mod is missing :
+else
+    minetest.register_node("scifi_nodes:digicode_off", {
+        description = "Digicode",
+        tiles = {
+            "scifi_nodes_digicode_off.png",
+        },
+        inventory_image = "scifi_nodes_digicode_on.png",
+        wield_image = "scifi_nodes_digicode_on.png",
+        drawtype = "signlike",
+        sunlight_propagates = true,
+        node_box = {
+            type = "wallmounted",
+        },
+        selection_box = {
+            type = "wallmounted",
+        },
+        paramtype = "light",
+        paramtype2 = "wallmounted",
+        groups = {cracky=1, oddly_breakable_by_hand=1},
+        on_rightclick = function(pos, node, clicker, item, _)
+				minetest.sound_play("scifi_nodes_digicode", {max_hear_distance = 8, pos = pos, gain = 1.0})
+				minetest.swap_node(pos, {name="scifi_nodes:digicode_on", param2=node.param2})
 		end,
 		sounds = default.node_sound_glass_defaults()
 	})
 
-    --end of wall switch
+    minetest.register_node("scifi_nodes:digicode_on", {
-    
+        description = "Digicode",
+        sunlight_propagates = true,
+        tiles = {
+            "scifi_nodes_switch_on.png",
+        },
+        inventory_image = "scifi_nodes_digicode_on.png",
+        wield_image = "scifi_nodes_digicode_on.png",
+        drawtype = "signlike",
+        node_box = {
+            type = "wallmounted",
+        },
+        selecion_box = {
+            type = "wallmounted",
+        },
+        paramtype = "light",
+        paramtype2 = "wallmounted",
+        light_source = 5,
+        groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+		on_rightclick = function(pos, node, clicker, item, _)
+			minetest.swap_node(pos, {name="scifi_nodes:digicode_off", param2=node.param2})
+		end,
+		on_timer = function(pos, node, clicker, item, _)
+			minetest.swap_node(pos, {name="scifi_nodes:digicode_off", param2=node.param2})
+		end,
+		sounds = default.node_sound_glass_defaults()
+	})    
 end -- if(mesecon.receptor ~= on