add protected switch variant

fix inventory image parameter value

.github/workflows/luacheck.yml

@@ -1,6 +1,6 @@
 name: luacheck
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

README.md

@@ -2,6 +2,8 @@
 
 # scifi_nodes
 
+![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
+
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 
 # Changes log
@@ -27,15 +29,17 @@ Minetest mod that adds scifi themed blocks, doors, materials, plants and other a
 
 # Attributions
 
-CC BY-NC 3.0
+CC BY 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
 * scifi_nodes_palm_scanner.ogg https://freesound.org/people/THE_bizniss/sounds/39313/
 * scifi_nodes_access_granted https://freesound.org/people/TheBuilder15/sounds/415762/
 * scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
 
+CC0
+* scifi_nodes_digicode.ogg https://freesound.org/people/benjaminharveydesign/sounds/315921/
+
+
 # Contributors:
 
 * tanmayameher https://github.com/tanmayameher
@@ -43,3 +47,4 @@ CC BY-NC 3.0
 * acmgit https://github.com/acmgit
 * catz85 https://github.com/catz85
 * coil0 https://github.com/coil0
+* Grossam https://github.com/Grossam

doors.lua

@@ -40,10 +40,10 @@ minetest.register_alias("scifi_nodes:door4d","scifi_nodes:green_door_opened_top"
 
 -- This table now uses named parameters and more convenient variables names
 local doors = {
-	{base_name = "Doom", base_ingredient =  "doors:door_obsidian_glass", sound = "scifi_nodes_door_mechanic"},
+	{base_name = "Doom", base_ingredient =  "doors:door_obsidian_glass", sound = "scifi_nodes_door_normal"},
-	{base_name = "black", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_mechanic"},
+	{base_name = "black", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_normal"},
 	{base_name = "white", base_ingredient = "doors:door_glass", sound = "scifi_nodes_door_normal"},
-	{base_name = "green", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_mechanic"},
+	{base_name = "green", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_normal"},
 	{base_name = "blue", base_ingredient = "default:steelblock", sound = "scifi_nodes_door_normal"}
 }
 
@@ -124,6 +124,37 @@ for _, current_door in ipairs(doors) do
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name="air"})
 	end
 
+	local function change_adjacent(target, pos, node)
+		local target_opposite, target_top
+		if target == opened then
+			target_top = opened_top
+			target_opposite = closed
+		else
+			target_top = closed_top
+			target_opposite = opened
+		end
+
+		for offset = -1,1,2 do
+			local x = pos.x
+			local y = pos.y
+			local z = pos.z
+
+			-- match param2=0 or param2=2
+			if node.param2 % 2 == 0 then
+				x = x + offset
+			else
+				z = z + offset
+			end
+
+			local adjacent = minetest.get_node({x=x, y=y, z=z})
+			if adjacent.name == target_opposite then
+				minetest.set_node({x=x, y=y, z=z}, {name=target, param2 = adjacent.param2})
+				minetest.set_node({x=x, y=y+1, z=z}, {name=target_top, param2 = adjacent.param2})
+			end
+		end
+
+	end
+
 	local function open_door(pos, node, player, itemstack, pointed_thing)
 		-- play sound
 		minetest.sound_play(sound,{
@@ -133,52 +164,13 @@ for _, current_door in ipairs(doors) do
 		})
 
 		local timer = minetest.get_node_timer(pos)
-		local a = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1})
-		local b = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
-		local c = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z})
-		local d = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z})
-		local e = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z-1})
-		local f = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z-1})
-		local g = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z+1})
-		local h = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z+1})
 
+		minetest.set_node(pos, {name=opened, param2=node.param2})
+		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
 
-			minetest.set_node(pos, {name=opened, param2=node.param2})
+		change_adjacent(opened, pos, node)
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
 
-			 if a.name == closed then
+		timer:start(3)
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z-1}, {name=opened, param2=a.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z-1}, {name=opened_top, param2=a.param2})
-			end
-			 if b.name == closed then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z+1}, {name=opened, param2=b.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z+1}, {name=opened_top, param2=b.param2})
-			end
-			 if c.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z}, {name=opened, param2=c.param2})
-			minetest.set_node({x=pos.x+1,y=pos.y+1,z=pos.z}, {name=opened_top, param2=c.param2})
-			end
-			 if d.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z}, {name=opened, param2=d.param2})
-			minetest.set_node({x=pos.x-1,y=pos.y+1,z=pos.z}, {name=opened_top, param2=d.param2})
-			end
-			 if e.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z-1}, {name=opened, param2=e.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z-1}, {name=opened_top, param2=e.param2})
-			end
-			 if f.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z-1}, {name=opened, param2=f.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z-1}, {name=opened_top, param2=f.param2})
-			end
-			 if g.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z+1}, {name=opened, param2=g.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z+1}, {name=opened_top, param2=g.param2})
-			end
-			 if h.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z+1}, {name=opened, param2=h.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z+1}, {name=opened_top, param2=h.param2})
-			end
-			timer:start(3)
 	end
 
 	local function afterplace(pos, placer, itemstack, pointed_thing)
@@ -195,50 +187,11 @@ for _, current_door in ipairs(doors) do
 		})
 
 		local node = minetest.get_node(pos)
-		local a = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1})
-		local b = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
-		local c = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z})
-		local d = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z})
-		local e = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z-1})
-		local f = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z-1})
-		local g = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z+1})
-		local h = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z+1})
 
 		minetest.set_node(pos, {name=closed, param2=node.param2})
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=closed_top, param2=node.param2})
 
-		if a.name == opened then
+		change_adjacent(closed, pos, node)
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z-1}, {name=closed, param2=a.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z-1}, {name=closed_top, param2=a.param2})
-		end
-		if b.name == opened then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z+1}, {name=closed, param2=b.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z+1}, {name=closed_top, param2=b.param2})
-		end
-		if c.name == opened then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z}, {name=closed, param2=c.param2})
-			minetest.set_node({x=pos.x+1,y=pos.y+1,z=pos.z}, {name=closed_top, param2=c.param2})
-		end
-		if d.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z}, {name=closed, param2=d.param2})
-			minetest.set_node({x=pos.x-1,y=pos.y+1,z=pos.z}, {name=closed_top, param2=d.param2})
-		end
-		if e.name == opened then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z-1}, {name=closed, param2=e.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z-1}, {name=closed_top, param2=e.param2})
-		end
-		if f.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z-1}, {name=closed, param2=f.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z-1}, {name=closed_top, param2=f.param2})
-		end
-		if g.name == opened then
-		minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z+1}, {name=closed, param2=g.param2})
-		minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z+1}, {name=closed_top, param2=g.param2})
-			end
-		if h.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z+1}, {name=closed, param2=h.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z+1}, {name=closed_top, param2=h.param2})
-		end
 	end
 
 	local mesecons_doors_rules = {
@@ -265,6 +218,10 @@ for _, current_door in ipairs(doors) do
 		},
 	}
 
+	local function nodig(pos, digger)
+		return false
+	end
+
 	local doors_rightclick = nil -- Crashes serv if empty table !
 	if not scifi_nodes.doors_open_with_mesecon_only then doors_rightclick = open_door end
 
@@ -327,6 +284,7 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
 	})
 
 	minetest.register_node(opened, {
@@ -355,9 +313,9 @@ for _, current_door in ipairs(doors) do
 				{-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, {
@@ -385,5 +343,6 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
 	})
 end     -- end of doors table browsing

init.lua

@@ -14,7 +14,8 @@ dofile(MP.."/chest.lua")
 dofile(MP.."/plants.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
-dofile(MP.."/switches.lua")
+dofile(MP.."/switch.lua")
+dofile(MP.."/protected_switch.lua")
 dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")

plants.lua

@@ -29,7 +29,7 @@ for _, row in ipairs(plants) do
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
 		drawtype = "plantlike",
-		inventory_image = {"scifi_nodes_"..name..".png"},
+		inventory_image = "scifi_nodes_"..name..".png",
 		groups = {snappy=1, oddly_breakable_by_hand=1, dig_immediate=3, flora=1},
 		paramtype = "light",
 		visual_scale = size,

protected_switch.lua

@@ -0,0 +1,89 @@
+
+--------------
+-- Switches --
+--------------
+
+local has_mesecons = minetest.get_modpath("mesecons")
+
+local function toggle_switch(pos, _, player)
+	local node = minetest.get_node(pos)
+	local name = node.name
+	if name == "scifi_nodes:protected_switch_on" then
+		-- toggle off
+		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
+		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_off", param2 = node.param2})
+		mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
+	elseif name == "scifi_nodes:protected_switch_off" then
+		-- toggle on, check protection first
+		if player and minetest.is_protected(pos, player:get_player_name()) then
+			-- position is protected, abort
+			minetest.sound_play("scifi_nodes_scanner_refused", {max_hear_distance = 8, pos = pos})
+			return
+		end
+		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
+		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_on", param2 = node.param2})
+		mesecon.receptor_on(pos, scifi_nodes.get_switch_rules(node.param2))
+		minetest.get_node_timer(pos):start(2)
+	end
+end
+
+minetest.register_node("scifi_nodes:protected_switch_on", {
+	description = "Protected wall switch",
+	sunlight_propagates = true,
+	buildable_to = false,
+	tiles = {"scifi_nodes_switch_on.png",},
+	inventory_image = "scifi_nodes_switch_on.png",
+	wield_image = "scifi_nodes_switch_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 = {
+		receptor = {
+			state = (has_mesecons and mesecon.state.on)
+		}
+	},
+	sounds = default.node_sound_glass_defaults(),
+	on_rightclick = (has_mesecons and toggle_switch),
+	on_timer = (has_mesecons and toggle_switch)
+})
+
+minetest.register_node("scifi_nodes:protected_switch_off", {
+	description = "Protected 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,
+	buildable_to = false,
+	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 = {
+		receptor = {
+			state = (has_mesecons and mesecon.state.off)
+		}
+	},
+	sounds = default.node_sound_glass_defaults(),
+	on_rightclick = (has_mesecons and toggle_switch)
+})
+
+minetest.register_craft({
+	output = "scifi_nodes:protected_switch_off 2",
+	type = "shapeless",
+	recipe = {"scifi_nodes:switch_off", "default:steel_ingot"}
+})

switch.lua

@@ -33,7 +33,12 @@ minetest.register_node("scifi_nodes:switch_on", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	light_source = 5,
-	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
+	groups = {
+		cracky=1,
+		oddly_breakable_by_hand = 1,
+		not_in_creative_inventory = 1,
+		mesecon_needs_receiver = 1
+	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
@@ -56,7 +61,11 @@ minetest.register_node("scifi_nodes:switch_off", {
 	selection_box = {type = "wallmounted",},
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
+	groups = {
+		cracky = 1,
+		oddly_breakable_by_hand = 1,
+		mesecon_needs_receiver = 1
+	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)