diff --git a/doors.lua b/doors.lua index 7dd7ed7..173bb52 100644 --- a/doors.lua +++ b/doors.lua @@ -17,13 +17,14 @@ -- This table now uses named parameters and more convenient variables names local doors = { -- DOOM door {closed, closed top, opened, opened top, texture number, main ingredient, sound} - {base_name = "Doom", tex_number = "1", base_ingredient = "doors:door_obsidian_glass", sound = "scifi_nodes_door_mechanic"}, + {base_name = "Doom", base_ingredient = "doors:door_obsidian_glass", sound = "scifi_nodes_door_mechanic"}, -- Black door - {base_name = "black", tex_number = "2", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_mechanic"}, + {base_name = "black", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_mechanic"}, -- White door - {base_name = "white", tex_number = "3", base_ingredient = "doors:door_glass", sound = "scifi_nodes_door_normal"}, + {base_name = "white", base_ingredient = "doors:door_glass", sound = "scifi_nodes_door_normal"}, -- Green door - {base_name = "green", tex_number = "4", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_mechanic"}, + {base_name = "green", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_mechanic"}, + {base_name = "blue", base_ingredient = "default:steel_block", sound = "scifi_nodes_door_normal"} } @@ -33,15 +34,15 @@ function get_doors_list() end -for i in ipairs (doors) do +for _, current_door in ipairs(doors) do -local closed = "scifi_nodes:"..doors[i].base_name.."_door_closed" -local closed_top = "scifi_nodes:"..doors[i].base_name.."_door_closed_top" -local opened = "scifi_nodes:"..doors[i].base_name.."_door_opened" -local opened_top = "scifi_nodes:"..doors[i].base_name.."_door_opened_top" -local tex_number = doors[i].tex_number -local base_ingredient = doors[i].base_ingredient -local sound = doors[i].sound +local closed = "scifi_nodes:"..current_door.base_name.."_door_closed" +local closed_top = "scifi_nodes:"..current_door.base_name.."_door_closed_top" +local opened = "scifi_nodes:"..current_door.base_name.."_door_opened" +local opened_top = "scifi_nodes:"..current_door.base_name.."_door_opened_top" +local base_name = current_door.base_name +local base_ingredient = current_door.base_ingredient +local sound = current_door.sound minetest.register_craft({ output = closed .. " 2", @@ -222,16 +223,16 @@ function ontimer(pos, elapsed) end minetest.register_node(closed, { - description = doors[i].base_name.." sliding door", - inventory_image = "scifi_nodes_door"..tex_number.."a_inv.png", - wield_image = "scifi_nodes_door"..tex_number.."a_inv.png", + 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", tiles = { - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_rbottom.png", - "scifi_nodes_door"..tex_number.."a_bottom.png" + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_rbottom.png", + "scifi_nodes_door_"..base_name.."_bottom.png" }, drawtype = "nodebox", paramtype = "light", @@ -249,6 +250,18 @@ minetest.register_node(closed, { {-0.5, -0.5, -0.0625, 0.5, 1.5, 0.0625} } }, + mesecon = { + effector = { + action_on = function (pos, node) + minetest.sound_play(sound, { + max_hear_distance = 16, + pos = pos, + gain = 1.0 + }) + end, + rules = mesecon.rules.pplate + }, + }, on_place = onplace, @@ -259,12 +272,12 @@ on_rightclick = rightclick, minetest.register_node(closed_top, { tiles = { - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_rtop.png", - "scifi_nodes_door"..tex_number.."a_top.png" + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_rtop.png", + "scifi_nodes_door_"..base_name.."_top.png" }, drawtype = "nodebox", paramtype = "light", @@ -286,12 +299,12 @@ minetest.register_node(closed_top, { minetest.register_node(opened, { tiles = { - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_rbottom0.png", - "scifi_nodes_door"..tex_number.."a_bottom0.png" + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_rbottom0.png", + "scifi_nodes_door_"..base_name.."_bottom0.png" }, drawtype = "nodebox", paramtype = "light", @@ -317,12 +330,12 @@ on_timer = ontimer, minetest.register_node(opened_top, { tiles = { - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_edge.png", - "scifi_nodes_door"..tex_number.."a_rtopo.png", - "scifi_nodes_door"..tex_number.."a_topo.png" + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_edge.png", + "scifi_nodes_door_"..base_name.."_rtopo.png", + "scifi_nodes_door_"..base_name.."_topo.png" }, drawtype = "nodebox", paramtype = "light", diff --git a/textures/scifi_nodes_door1a_bottom.png b/textures/scifi_nodes_door_Doom_bottom.png similarity index 100% rename from textures/scifi_nodes_door1a_bottom.png rename to textures/scifi_nodes_door_Doom_bottom.png diff --git a/textures/scifi_nodes_door1a_bottom0.png b/textures/scifi_nodes_door_Doom_bottom0.png similarity index 100% rename from textures/scifi_nodes_door1a_bottom0.png rename to textures/scifi_nodes_door_Doom_bottom0.png diff --git a/textures/scifi_nodes_door1a_edge.png b/textures/scifi_nodes_door_Doom_edge.png similarity index 100% rename from textures/scifi_nodes_door1a_edge.png rename to textures/scifi_nodes_door_Doom_edge.png diff --git a/textures/scifi_nodes_door1a_inv.png b/textures/scifi_nodes_door_Doom_inv.png similarity index 100% rename from textures/scifi_nodes_door1a_inv.png rename to textures/scifi_nodes_door_Doom_inv.png diff --git a/textures/scifi_nodes_door1a_rbottom.png b/textures/scifi_nodes_door_Doom_rbottom.png similarity index 100% rename from textures/scifi_nodes_door1a_rbottom.png rename to textures/scifi_nodes_door_Doom_rbottom.png diff --git a/textures/scifi_nodes_door1a_rbottom0.png b/textures/scifi_nodes_door_Doom_rbottom0.png similarity index 100% rename from textures/scifi_nodes_door1a_rbottom0.png rename to textures/scifi_nodes_door_Doom_rbottom0.png diff --git a/textures/scifi_nodes_door1a_rtop.png b/textures/scifi_nodes_door_Doom_rtop.png similarity index 100% rename from textures/scifi_nodes_door1a_rtop.png rename to textures/scifi_nodes_door_Doom_rtop.png diff --git a/textures/scifi_nodes_door1a_rtopo.png b/textures/scifi_nodes_door_Doom_rtopo.png similarity index 100% rename from textures/scifi_nodes_door1a_rtopo.png rename to textures/scifi_nodes_door_Doom_rtopo.png diff --git a/textures/scifi_nodes_door1a_top.png b/textures/scifi_nodes_door_Doom_top.png similarity index 100% rename from textures/scifi_nodes_door1a_top.png rename to textures/scifi_nodes_door_Doom_top.png diff --git a/textures/scifi_nodes_door1a_topo.png b/textures/scifi_nodes_door_Doom_topo.png similarity index 100% rename from textures/scifi_nodes_door1a_topo.png rename to textures/scifi_nodes_door_Doom_topo.png diff --git a/textures/scifi_nodes_door2a_bottom.png b/textures/scifi_nodes_door_black_bottom.png similarity index 100% rename from textures/scifi_nodes_door2a_bottom.png rename to textures/scifi_nodes_door_black_bottom.png diff --git a/textures/scifi_nodes_door2a_bottom0.png b/textures/scifi_nodes_door_black_bottom0.png similarity index 100% rename from textures/scifi_nodes_door2a_bottom0.png rename to textures/scifi_nodes_door_black_bottom0.png diff --git a/textures/scifi_nodes_door2a_edge.png b/textures/scifi_nodes_door_black_edge.png similarity index 100% rename from textures/scifi_nodes_door2a_edge.png rename to textures/scifi_nodes_door_black_edge.png diff --git a/textures/scifi_nodes_door2a_inv.png b/textures/scifi_nodes_door_black_inv.png similarity index 100% rename from textures/scifi_nodes_door2a_inv.png rename to textures/scifi_nodes_door_black_inv.png diff --git a/textures/scifi_nodes_door2a_rbottom.png b/textures/scifi_nodes_door_black_rbottom.png similarity index 100% rename from textures/scifi_nodes_door2a_rbottom.png rename to textures/scifi_nodes_door_black_rbottom.png diff --git a/textures/scifi_nodes_door2a_rbottom0.png b/textures/scifi_nodes_door_black_rbottom0.png similarity index 100% rename from textures/scifi_nodes_door2a_rbottom0.png rename to textures/scifi_nodes_door_black_rbottom0.png diff --git a/textures/scifi_nodes_door2a_rtop.png b/textures/scifi_nodes_door_black_rtop.png similarity index 100% rename from textures/scifi_nodes_door2a_rtop.png rename to textures/scifi_nodes_door_black_rtop.png diff --git a/textures/scifi_nodes_door2a_rtopo.png b/textures/scifi_nodes_door_black_rtopo.png similarity index 100% rename from textures/scifi_nodes_door2a_rtopo.png rename to textures/scifi_nodes_door_black_rtopo.png diff --git a/textures/scifi_nodes_door2a_top.png b/textures/scifi_nodes_door_black_top.png similarity index 100% rename from textures/scifi_nodes_door2a_top.png rename to textures/scifi_nodes_door_black_top.png diff --git a/textures/scifi_nodes_door2a_topo.png b/textures/scifi_nodes_door_black_topo.png similarity index 100% rename from textures/scifi_nodes_door2a_topo.png rename to textures/scifi_nodes_door_black_topo.png diff --git a/textures/scifi_nodes_door_blue_bottom.png b/textures/scifi_nodes_door_blue_bottom.png new file mode 100644 index 0000000..04a45e0 Binary files /dev/null and b/textures/scifi_nodes_door_blue_bottom.png differ diff --git a/textures/scifi_nodes_door_blue_bottom0.png b/textures/scifi_nodes_door_blue_bottom0.png new file mode 100644 index 0000000..f640255 Binary files /dev/null and b/textures/scifi_nodes_door_blue_bottom0.png differ diff --git a/textures/scifi_nodes_door_blue_edge.png b/textures/scifi_nodes_door_blue_edge.png new file mode 100644 index 0000000..2d560db Binary files /dev/null and b/textures/scifi_nodes_door_blue_edge.png differ diff --git a/textures/scifi_nodes_door_blue_inv.png b/textures/scifi_nodes_door_blue_inv.png new file mode 100644 index 0000000..83285bf Binary files /dev/null and b/textures/scifi_nodes_door_blue_inv.png differ diff --git a/textures/scifi_nodes_door_blue_rbottom.png b/textures/scifi_nodes_door_blue_rbottom.png new file mode 100644 index 0000000..1920318 Binary files /dev/null and b/textures/scifi_nodes_door_blue_rbottom.png differ diff --git a/textures/scifi_nodes_door_blue_rbottom0.png b/textures/scifi_nodes_door_blue_rbottom0.png new file mode 100644 index 0000000..8bc4b07 Binary files /dev/null and b/textures/scifi_nodes_door_blue_rbottom0.png differ diff --git a/textures/scifi_nodes_door_blue_rtop.png b/textures/scifi_nodes_door_blue_rtop.png new file mode 100644 index 0000000..b8b778c Binary files /dev/null and b/textures/scifi_nodes_door_blue_rtop.png differ diff --git a/textures/scifi_nodes_door_blue_rtopo.png b/textures/scifi_nodes_door_blue_rtopo.png new file mode 100644 index 0000000..4651bc6 Binary files /dev/null and b/textures/scifi_nodes_door_blue_rtopo.png differ diff --git a/textures/scifi_nodes_door_blue_top.png b/textures/scifi_nodes_door_blue_top.png new file mode 100644 index 0000000..0f007f5 Binary files /dev/null and b/textures/scifi_nodes_door_blue_top.png differ diff --git a/textures/scifi_nodes_door_blue_topo.png b/textures/scifi_nodes_door_blue_topo.png new file mode 100644 index 0000000..07f951d Binary files /dev/null and b/textures/scifi_nodes_door_blue_topo.png differ diff --git a/textures/scifi_nodes_door4a_bottom.png b/textures/scifi_nodes_door_green_bottom.png similarity index 100% rename from textures/scifi_nodes_door4a_bottom.png rename to textures/scifi_nodes_door_green_bottom.png diff --git a/textures/scifi_nodes_door4a_bottom0.png b/textures/scifi_nodes_door_green_bottom0.png similarity index 100% rename from textures/scifi_nodes_door4a_bottom0.png rename to textures/scifi_nodes_door_green_bottom0.png diff --git a/textures/scifi_nodes_door4a_edge.png b/textures/scifi_nodes_door_green_edge.png similarity index 100% rename from textures/scifi_nodes_door4a_edge.png rename to textures/scifi_nodes_door_green_edge.png diff --git a/textures/scifi_nodes_door4a_inv.png b/textures/scifi_nodes_door_green_inv.png similarity index 100% rename from textures/scifi_nodes_door4a_inv.png rename to textures/scifi_nodes_door_green_inv.png diff --git a/textures/scifi_nodes_door4a_rbottom.png b/textures/scifi_nodes_door_green_rbottom.png similarity index 100% rename from textures/scifi_nodes_door4a_rbottom.png rename to textures/scifi_nodes_door_green_rbottom.png diff --git a/textures/scifi_nodes_door4a_rbottom0.png b/textures/scifi_nodes_door_green_rbottom0.png similarity index 100% rename from textures/scifi_nodes_door4a_rbottom0.png rename to textures/scifi_nodes_door_green_rbottom0.png diff --git a/textures/scifi_nodes_door4a_top.png b/textures/scifi_nodes_door_green_rtop.png similarity index 100% rename from textures/scifi_nodes_door4a_top.png rename to textures/scifi_nodes_door_green_rtop.png diff --git a/textures/scifi_nodes_door4a_rtopo.png b/textures/scifi_nodes_door_green_rtopo.png similarity index 100% rename from textures/scifi_nodes_door4a_rtopo.png rename to textures/scifi_nodes_door_green_rtopo.png diff --git a/textures/scifi_nodes_door4a_rtop.png b/textures/scifi_nodes_door_green_top.png similarity index 100% rename from textures/scifi_nodes_door4a_rtop.png rename to textures/scifi_nodes_door_green_top.png diff --git a/textures/scifi_nodes_door4a_topo.png b/textures/scifi_nodes_door_green_topo.png similarity index 100% rename from textures/scifi_nodes_door4a_topo.png rename to textures/scifi_nodes_door_green_topo.png diff --git a/textures/scifi_nodes_door3a_bottom.png b/textures/scifi_nodes_door_white_bottom.png similarity index 100% rename from textures/scifi_nodes_door3a_bottom.png rename to textures/scifi_nodes_door_white_bottom.png diff --git a/textures/scifi_nodes_door3a_bottom0.png b/textures/scifi_nodes_door_white_bottom0.png similarity index 100% rename from textures/scifi_nodes_door3a_bottom0.png rename to textures/scifi_nodes_door_white_bottom0.png diff --git a/textures/scifi_nodes_door3a_edge.png b/textures/scifi_nodes_door_white_edge.png similarity index 100% rename from textures/scifi_nodes_door3a_edge.png rename to textures/scifi_nodes_door_white_edge.png diff --git a/textures/scifi_nodes_door3a_inv.png b/textures/scifi_nodes_door_white_inv.png similarity index 100% rename from textures/scifi_nodes_door3a_inv.png rename to textures/scifi_nodes_door_white_inv.png diff --git a/textures/scifi_nodes_door3a_rbottom.png b/textures/scifi_nodes_door_white_rbottom.png similarity index 100% rename from textures/scifi_nodes_door3a_rbottom.png rename to textures/scifi_nodes_door_white_rbottom.png diff --git a/textures/scifi_nodes_door3a_rbottom0.png b/textures/scifi_nodes_door_white_rbottom0.png similarity index 100% rename from textures/scifi_nodes_door3a_rbottom0.png rename to textures/scifi_nodes_door_white_rbottom0.png diff --git a/textures/scifi_nodes_door3a_rtop.png b/textures/scifi_nodes_door_white_rtop.png similarity index 100% rename from textures/scifi_nodes_door3a_rtop.png rename to textures/scifi_nodes_door_white_rtop.png diff --git a/textures/scifi_nodes_door3a_rtopo.png b/textures/scifi_nodes_door_white_rtopo.png similarity index 100% rename from textures/scifi_nodes_door3a_rtopo.png rename to textures/scifi_nodes_door_white_rtopo.png diff --git a/textures/scifi_nodes_door3a_top.png b/textures/scifi_nodes_door_white_top.png similarity index 100% rename from textures/scifi_nodes_door3a_top.png rename to textures/scifi_nodes_door_white_top.png diff --git a/textures/scifi_nodes_door3a_topo.png b/textures/scifi_nodes_door_white_topo.png similarity index 100% rename from textures/scifi_nodes_door3a_topo.png rename to textures/scifi_nodes_door_white_topo.png