Merge remote-tracking branch 'upstream/master'

And optimize textures with optipng

crafts.lua

@@ -767,6 +767,16 @@ minetest.register_craft({
     }
 })
 
+-- 4 green light bar from 4 green metal, 2 green dye, 1 lightbar
+minetest.register_craft({
+    output = "scifi_nodes:greenbar_animated 4",
+    recipe = {
+        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"},
+        {"", "mesecons:wire_00000000_off", ""},
+        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"}
+    }
+})
+
 -- 4 green metal block from 4 green metal
 minetest.register_craft({
     output = "scifi_nodes:green_square 4",
@@ -1282,10 +1292,13 @@ minetest.register_craft({
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
+-- with modified recipe
 minetest.register_craft({
-    output = 'scifi_nodes:windowpanel 4',
+    output = 'scifi_nodes:windowpanel',
     recipe = {
-        {"scifi_nodes:glass","",""}
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"","",""}
     }
 })
 

digicode.lua

@@ -122,7 +122,7 @@ minetest.register_node("scifi_nodes:digicode_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	drop = {items = {"scifi_nodes:digicode_off"}},
+	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)

init.lua

@@ -20,5 +20,6 @@ dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
-dofile(MP.."/crafts.lua")
 dofile(MP.."/octagon_panes.lua")
+dofile(MP.."/crafts.lua")
+minetest.log("action", "[scifi_nodes] loaded.")

models.lua

@@ -29,6 +29,7 @@ minetest.register_node("scifi_nodes:slope_"..name, {
 		},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	light_source = light,
 	groups = {cracky=1},
 	on_place = minetest.rotate_node
@@ -69,106 +70,104 @@ scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_l
 local node = {}
 
 node.types = {
-	{"blue",      "blue lines",        "blue"},
+	{"blue",      "blue lines"},
-	{"holes",       "metal with holes","holes"},
+	{"holes",       "metal with holes"},
-	{"white2",      "plastic",         "white2"},
+	{"white2",      "plastic",},
-    {"super_white",      "Super Plastic",         "super_white", 11},
+	{"super_white",      "Super Plastic", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"ultra_white",      "Ultra Plastic", default.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
-	{"wall",      "metal wall",        "wall"},
+	{"wall",      "metal wall"},
-	{"white",      "plastic wall",     "white"},
+	{"white",      "plastic wall"},
-	{"stripes2top",     "dirty metal block","metal2"},
+	{"stripes2top",     "dirty metal block"},
-	{"rough",      "rough metal",      "rough"},
+	{"rough",      "rough metal"},
-	{"lighttop",      "metal block",      "metal"},
+	{"lighttop",      "metal block"},
-	{"red",      "red lines",          "red"},
+	{"red",      "red lines"},
-	{"green",      "green lines",      "green"},
+	{"green",      "green lines"},
-	{"vent2",      "vent",              "vent"},
+	{"vent2",      "vent"},
-	{"stripes",      "hazard stripes", "stripes"},
+	{"stripes",      "hazard stripes"},
-	{"rust",      "rusty metal",       "rust"},
+	{"rust",      "rusty metal"},
-	{"mesh",      "metal mesh",       "mesh"},
+	{"mesh",      "metal mesh"},
-	{"black",      "black wall",       "black"},
+	{"black",      "black wall"},
-	{"blackoct",      "black octagon",       "blackoct"},
+	{"blackoct",      "black octagon"},
-	{"blackpipe",      "black pipe",       "blackpipe"},
+	{"blackpipe",      "black pipe"},
-	{"blacktile",      "black tile",       "blktl"},
+	{"blacktile",      "black tile"},
-	{"blacktile2",      "black tile 2",       "blktl2"},
+	{"blacktile2",      "black tile 2"},
-	{"blackvent",      "black vent",       "blkvnt"},
+	{"blackvent",      "black vent"},
-	{"bluebars",      "blue bars",       "bluebars"},
+	{"bluebars",      "blue bars"},
-	{"bluemetal",      "blue metal",       "blumtl"},
+	{"bluemetal",      "blue metal"},
-	{"bluetile",      "blue tile",       "blutl"},
+	{"bluetile",      "blue tile"},
-	{"greytile",      "grey tile",       "grytl"},
+	{"greytile",      "grey tile"},
-	{"mesh2",      "metal floormesh",       "mesh2"},
+	{"mesh2",      "metal floormesh"},
-	{"white",      "plastic wall",       "white"},
+	{"pipe",      "wall pipe"},
-	{"pipe",      "wall pipe",       "pipe2"},
+	{"pipeside",      "side pipe"},
-	{"pipeside",      "side pipe",       "pipe3"},
+	{"tile",      "white tile"},
-	{"tile",      "white tile",       "tile"},
+	{"whiteoct",      "white octagon"},
-	{"whiteoct",      "white octagon",       "whiteoct"},
+	{"whitetile",      "white tile2"},
-	{"whitetile",      "white tile2",       "whttl"},
+	{"black_detail",      "black detail"},
-	{"black_detail",      "black detail",       "blckdtl"},
+	{"green_square",      "green metal block"},
-	{"green_square",      "green metal block",       "grnblck"},
+	{"red_square",      "red metal block"},
-	{"red_square",      "red metal block",       "redblck"},
+	{"grey_square",      "grey metal block"},
-	{"grey_square",      "grey metal block",       "greyblck"},
+	{"blue_square",      "blue metal block"},
-	{"blue_square",      "blue metal block",       "blublck"},
+	{"black_mesh",      "black vent block"},
-	{"black_mesh",      "black vent block",       "blckmsh"},
+	{"dent",      "dented metal block"},
-	{"dent",      "dented metal block",       "dent"},
+	{"greenmetal",      "green metal wall"},
-	{"greenmetal",      "green metal wall",       "grnmetl"},
+	{"greenmetal2",      "green metal wall2"},
-	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
+	{"greenlights",      "green wall lights",       10},
-	{"greenlights",      "green wall lights",       "grnlt", 10},
+	{"greenlights2",      "green wall lights2",     10},
-	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
+	{"greenbar",      "green light bar",            10},
-	{"greenbar",      "green light bar",       "grnlghtbr", 10},
+	{"green2",      "green wall panel"},
-	{"green2",      "green wall panel",       "grn2"},
+	{"greentubes",      "green pipes"},
-	{"greentubes",      "green pipes",       "grntubes"},
+	{"grey",      "grey wall"},
-	{"grey",      "grey wall",       "gry"},
+	{"greybolts",      "grey wall bolts"},
-	{"greybolts",      "grey wall bolts",       "gryblts"},
+	{"greybars",      "grey bars"},
-	{"greybars",      "grey bars",       "grybrs"},
+	{"greydots",      "grey wall dots"},
-	{"greydots",      "grey wall dots",       "grydts"},
+	{"greygreenbar",      "gray power pipe",        10},
-	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
+	{"octofloor",      "Doom floor"},
-	{"octofloor",      "Doom floor",       "octofloor"},
+	{"octofloor2",      "Brown Doom floor"},
-	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
+	{"doomwall1",      "Doom wall 1"},
-	{"doomwall1",      "Doom wall 1",       "doomwall1"},
+	{"doomwall2",      "Doom wall 2"},
-	{"doomwall2",      "Doom wall 2",       "doomwall2"},
+	{"doomwall3",      "Doom wall 3"},
-	{"doomwall3",      "Doom wall 3",       "doomwall3"},
+	{"doomwall4",      "Doom wall 4"},
-	{"doomwall4",      "Doom wall 4",       "doomwall4"},
+	{"doomwall41",      "Doom wall 4.1"},
-	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
+	{"doomwall42",      "Doom wall 4.2"},
-	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
+	{"doomwall43",      "Doom wall 4.3"},
-	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
+	{"doomwall431",      "Doom wall 4.3.1"},
-	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
+	{"doomwall44",      "Doom wall 4.4"},
-	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
+	{"blackdmg",      "Damaged black wall"},
-	{"blackdmg",      "Damaged black wall",       "blckdmg"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)"},
-	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
+	{"doomengine",      "Doom engine wall"},
-	{"doomengine",      "Doom engine wall",       "doomengine"},
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
-	{"screen3",      "Wall monitor",       "screen3"},
+	{"screen3",      "Wall monitor"},
-	{"doomlight",      "Doom light",       "doomlight", 12},
+	{"doomlight",      "Doom light",       12},
-	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", default.LIGHT_MAX},
-	{"bluegrid",      "Blue Grid", "bluegrid", 5},
+	{"bluegrid",      "Blue Grid", 5},
-	{"fan",      "Fan",       "fan"},
+	{"fan",      "Fan"},
-	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", default.LIGHT_MAX},
-	{"pplwll",      "Purple wall", "", 0},
+	{"pplwll",      "Purple wall"},
-	{"pplwll2",      "Purple wall2", "", 0},
+	{"pplwll2",      "Purple wall2"},
-	{"pplwll3",      "Purple wall3", "", 0},
+	{"pplwll3",      "Purple wall3"},
-	{"pplwll4",      "Purple wall4", "", 0},
+	{"pplwll4",      "Purple wall4"},
-	{"pplblk",      "Purple tile", "", 0},
+	{"pplblk",      "Purple tile"},
-	{"purple",      "Purple node", "", 0},
+	{"purple",      "Purple node"},
-	{"rock",      "Moonstone", "", 0},
+	{"rock",      "Moonstone"},
-	{"rock2",      "Moonstone2", "", 0},
+	{"rock2",      "Moonstone2"},
-	{"blackvnt",      "Black vent", "", 0},
+	{"blackvnt",      "Black vent"},
-	{"blackplate",      "Black plate", "", 0},
+	{"blackplate",      "Black plate"},
 }
 
 if minetest.global_exists("stairsplus") then
-
 	for _, row in ipairs(node.types) do
 		local name = row[1]
-		local desc = row[2]
+
-		local light = row[4]
 		-- Node Definition
-		stairsplus:register_all("scifi_nodes", row[1], "scifi_nodes:"..name, {
+		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
-			description = desc,
+			description = row[2],
 			tiles = {"scifi_nodes_"..name..".png"},
+			use_texture_alpha = "clip",
 			groups = {cracky=1},
 			paramtype = "light",
 			paramtype2 = "facedir",
-			light_source = light,
+			light_source = row[3],
 		})
 	end
 end

nodeboxes.lua

@@ -281,7 +281,7 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	groups = {cracky=3},
 	sounds = default.node_sound_glass_defaults(),
 	node_box = {
@@ -308,7 +308,7 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
-	use_texture_alpha =  true,
+	use_texture_alpha = "blend",
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -335,7 +335,7 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
 	wield_image = "scifi_nodes_pod_inv.png",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky=1, not_in_creative_inventory=1},
@@ -475,6 +475,12 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		type = "wallmounted",
 		fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
 	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
+		}
+	},
 	paramtype2 = "wallmounted",
 	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
@@ -523,7 +529,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
@@ -544,7 +550,7 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -564,7 +570,7 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -848,7 +854,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -879,7 +885,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -906,7 +912,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -937,7 +943,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -964,7 +970,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -994,7 +1000,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1024,7 +1030,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1080,10 +1086,9 @@ minetest.register_node("scifi_nodes:itemholder", {
 		local meta = minetest.get_meta(pos)
 		if name == meta:get_string("owner") or
 				minetest.check_player_privs(name, "protection_bypass") then
-			local wield_item = clicker:get_wielded_item():get_name()
 			local taken = item:take_item()
 			if taken and not taken:is_empty() then
-				minetest.add_item(pos, wield_item)
+				minetest.add_item(pos, taken:to_string())
 				return item
 			end
 		end
@@ -1113,7 +1118,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1199,7 +1204,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {

nodes.lua

@@ -182,6 +182,23 @@ minetest.register_node("scifi_nodes:disc", {
 	groups = {cracky=1}
 })
 
+minetest.register_node("scifi_nodes:greenbar_animated", {
+	description = "animated green light bar",
+	sunlight_propagates = false,
+	tiles = {
+		"scifi_nodes_greenbar.png",
+		"scifi_nodes_greenbar.png", {
+			name="scifi_nodes_greenbar_animated.png",
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.00},
+		}
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=1},
+	light_source = 10,
+	sounds = default.node_sound_glass_defaults(),
+	on_place = minetest.rotate_node
+})
 
 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",
@@ -329,7 +346,7 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -344,7 +361,7 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -359,7 +376,7 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -374,7 +391,7 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -474,7 +491,7 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	groups = {cracky=1},
 	sounds = default.node_sound_glass_defaults()

octagon_panes.lua

@@ -26,7 +26,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })
 
@@ -51,7 +51,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })
 
@@ -76,7 +76,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })
 

palm_scanner.lua

@@ -22,6 +22,8 @@ local function activate_palm_scanner(pos, node, player)
 
 	-- check protection
 	minetest.after(2, function()
+		if minetest.get_node(pos).name ~= node.name then return end
+
 		if minetest.is_protected(pos, name or "") then
 			-- clicker has no access to area
 			minetest.chat_send_player(name, "Access denied !")
@@ -36,6 +38,7 @@ local function activate_palm_scanner(pos, node, player)
 
 		-- reset state
 		minetest.after(1, function()
+			if minetest.get_node(pos).name ~= node.name then return end
 			node.name = "scifi_nodes:palm_scanner_off"
 			minetest.swap_node(pos, node)
 			mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))