Merge server to github

minetestforfun_game/mods/doors/init.lua

@@ -13,11 +13,21 @@ doors = {}
 --    node_box_top
 --    selection_box_bottom
 --    selection_box_top
---    only_placer_can_open: if true only the player who placed the door can
---                          open it
+--    only_placer_can_open: if true only the player who placed the door can open it
 
+local function is_right(pos) 
+	local r1 = minetest.get_node({x = pos.x-1, y = pos.y, z = pos.z})
+	local r2 = minetest.get_node({x = pos.x, y = pos.y, z = pos.z-1})
+	if string.find(r1.name, "door_") or string.find(r2.name, "door_") then
+		if string.find(r1.name, "_1") or string.find(r2.name, "_1") then
+			return true
+		else
+			return false
+		end
+	end
+end
 
-function doors.register_door(name, def)
+function doors:register_door(name, def)
 	def.groups.not_in_creative_inventory = 1
 
 	local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5+1.5/16}}
@@ -35,14 +45,6 @@ function doors.register_door(name, def)
 		def.selection_box_top = box
 	end
 
-	if not def.sound_close_door then
-		def.sound_close_door = "door_close"
-	end
-	if not def.sound_open_door then
-		def.sound_open_door = "door_open"
-	end
-	
-	
 	minetest.register_craftitem(name, {
 		description = def.description,
 		inventory_image = def.inventory_image,
@@ -59,7 +61,7 @@ function doors.register_door(name, def)
 			end
 
 			local pt = pointed_thing.above
-			local pt2 = {x=pt.x, y=pt.y, z=pt.z}
+			local pt2 = {x = pt.x, y = pt.y, z = pt.z}
 			pt2.y = pt2.y+1
 			if
 				not minetest.registered_nodes[minetest.get_node(pt).name].buildable_to or
@@ -77,7 +79,7 @@ function doors.register_door(name, def)
 			end
 
 			local p2 = minetest.dir_to_facedir(placer:get_look_dir())
-			local pt3 = {x=pt.x, y=pt.y, z=pt.z}
+			local pt3 = {x = pt.x, y = pt.y, z = pt.z}
 			if p2 == 0 then
 				pt3.x = pt3.x-1
 			elseif p2 == 1 then
@@ -87,14 +89,12 @@ function doors.register_door(name, def)
 			elseif p2 == 3 then
 				pt3.z = pt3.z-1
 			end
-			if minetest.get_item_group(minetest.get_node(pt3).name, "door") == 0 then
-				minetest.set_node(pt, {name=name.."_b_1", param2=p2})
-				minetest.set_node(pt2, {name=name.."_t_1", param2=p2})
+			if not string.find(minetest.get_node(pt3).name, name.."_b_") then
+				minetest.set_node(pt, {name =name.."_b_1", param2 = p2})
+				minetest.set_node(pt2, {name =name.."_t_1", param2 = p2})
 			else
-				minetest.set_node(pt, {name=name.."_b_2", param2=p2})
-				minetest.set_node(pt2, {name=name.."_t_2", param2=p2})
-				minetest.get_meta(pt):set_int("right", 1)
-				minetest.get_meta(pt2):set_int("right", 1)
+				minetest.set_node(pt, {name =name.."_b_2", param2 = p2})
+				minetest.set_node(pt2, {name =name.."_t_2", param2 = p2})
 			end
 
 			if def.only_placer_can_open then
@@ -132,22 +132,22 @@ function doors.register_door(name, def)
 		local p2 = minetest.get_node(pos).param2
 		p2 = params[p2+1]
 		
-		minetest.swap_node(pos, {name=replace_dir, param2=p2})
+		minetest.swap_node(pos, {name =replace_dir, param2 = p2})
 		
 		pos.y = pos.y-dir
-		minetest.swap_node(pos, {name=replace, param2=p2})
+		minetest.swap_node(pos, {name =replace, param2 = p2})
 
-		local snd_1 = def.sound_close_door
-		local snd_2 = def.sound_open_door 
+		local snd_1 = "_close"
+		local snd_2 = "_open"
 		if params[1] == 3 then
-			snd_1 = def.sound_open_door 
-			snd_2 = def.sound_close_door
+			snd_1 = "_open"
+			snd_2 = "_close"
 		end
 
-		if minetest.get_meta(pos):get_int("right") ~= 0 then
-			minetest.sound_play(snd_1, {pos = pos, gain = 0.3, max_hear_distance = 10})
+		if is_right(pos) then
+			minetest.sound_play("door"..snd_1, {pos = pos, gain = 0.175, max_hear_distance = 16})
 		else
-			minetest.sound_play(snd_2, {pos = pos, gain = 0.3, max_hear_distance = 10})
+			minetest.sound_play("door"..snd_2, {pos = pos, gain = 0.175, max_hear_distance = 16})
 		end
 	end
 
@@ -164,6 +164,7 @@ function doors.register_door(name, def)
 		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		sunlight_propagates = true,
 		drop = name,
 		drawtype = "nodebox",
 		node_box = {
@@ -196,6 +197,7 @@ function doors.register_door(name, def)
 		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1].."^[transformfx"},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		sunlight_propagates = true,
 		drop = "",
 		drawtype = "nodebox",
 		node_box = {
@@ -228,6 +230,7 @@ function doors.register_door(name, def)
 		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		sunlight_propagates = true,
 		drop = name,
 		drawtype = "nodebox",
 		node_box = {
@@ -260,6 +263,7 @@ function doors.register_door(name, def)
 		tiles = {tt[2], tt[2], tt[2], tt[2], tt[1].."^[transformfx", tt[1]},
 		paramtype = "light",
 		paramtype2 = "facedir",
+		sunlight_propagates = true,
 		drop = "",
 		drawtype = "nodebox",
 		node_box = {
@@ -290,10 +294,10 @@ function doors.register_door(name, def)
 
 end
 
-doors.register_door("doors:door_wood", {
+doors:register_door("doors:door_wood", {
 	description = "Wooden Door",
 	inventory_image = "door_wood.png",
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
+	groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door= 1},
 	tiles_bottom = {"door_wood_b.png", "door_brown.png"},
 	tiles_top = {"door_wood_a.png", "door_brown.png"},
 	sounds = default.node_sound_wood_defaults(),
@@ -301,7 +305,7 @@ doors.register_door("doors:door_wood", {
 })
 
 minetest.register_craft({
-	output = "doors:door_wood",
+	output = "doors:door_wood 3",
 	recipe = {
 		{"group:wood", "group:wood"},
 		{"group:wood", "group:wood"},
@@ -309,10 +313,10 @@ minetest.register_craft({
 	}
 })
 
-doors.register_door("doors:door_steel", {
+doors:register_door("doors:door_steel", {
 	description = "Steel Door",
 	inventory_image = "door_steel.png",
-	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
+	groups = {snappy = 1,bendy = 2, cracky = 1,melty = 2,level= 2, door= 1},
 	tiles_bottom = {"door_steel_b.png", "door_grey.png"},
 	tiles_top = {"door_steel_a.png", "door_grey.png"},
 	only_placer_can_open = true,
@@ -321,7 +325,7 @@ doors.register_door("doors:door_steel", {
 })
 
 minetest.register_craft({
-	output = "doors:door_steel",
+	output = "doors:door_steel 3",
 	recipe = {
 		{"default:steel_ingot", "default:steel_ingot"},
 		{"default:steel_ingot", "default:steel_ingot"},
@@ -329,10 +333,10 @@ minetest.register_craft({
 	}
 })
 
-doors.register_door("doors:door_glass", {
+doors:register_door("doors:door_glass", {
 	description = "Glass Door",
 	inventory_image = "door_glass.png",
-	groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},
+	groups = {snappy = 1, cracky = 1, oddly_breakable_by_hand = 3, door= 1},
 	tiles_bottom = {"door_glass_b.png", "door_glass_side.png"},
 	tiles_top = {"door_glass_a.png", "door_glass_side.png"},
 	sounds = default.node_sound_glass_defaults(),
@@ -340,7 +344,7 @@ doors.register_door("doors:door_glass", {
 })
 
 minetest.register_craft({
-	output = "doors:door_glass",
+	output = "doors:door_glass 3",
 	recipe = {
 		{"default:glass", "default:glass"},
 		{"default:glass", "default:glass"},
@@ -348,10 +352,10 @@ minetest.register_craft({
 	}
 })
 
-doors.register_door("doors:door_obsidian_glass", {
+doors:register_door("doors:door_obsidian_glass", {
 	description = "Obsidian Glass Door",
 	inventory_image = "door_obsidian_glass.png",
-	groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},
+	groups = {snappy = 1, cracky = 1, oddly_breakable_by_hand = 3, door= 1},
 	tiles_bottom = {"door_obsidian_glass_b.png", "door_obsidian_glass_side.png"},
 	tiles_top = {"door_obsidian_glass_b.png", "door_obsidian_glass_side.png"},
 	sounds = default.node_sound_glass_defaults(),
@@ -359,7 +363,7 @@ doors.register_door("doors:door_obsidian_glass", {
 })
 
 minetest.register_craft({
-	output = "doors:door_obsidian_glass",
+	output = "doors:door_obsidian_glass 3",
 	recipe = {
 		{"default:obsidian_glass", "default:obsidian_glass"},
 		{"default:obsidian_glass", "default:obsidian_glass"},
@@ -368,7 +372,7 @@ minetest.register_craft({
 })
 
 
-----trapdoor----
+---- Trapdoors ----
 
 local function update_door(pos, node) 
 	minetest.set_node(pos, node)
@@ -380,17 +384,18 @@ local function punch(pos)
 	local me = minetest.get_node(pos)
 	local tmp_node
 	local tmp_node2
-	if state == 1 then
-		state = 0
-		minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
-		tmp_node = {name="doors:trapdoor", param1=me.param1, param2=me.param2}
-	else
-		state = 1
-		minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
-		tmp_node = {name="doors:trapdoor_open", param1=me.param1, param2=me.param2}
-	end
-	update_door(pos, tmp_node)
-	meta:set_int("state", state)
+	oben = {x = pos.x, y = pos.y+1, z = pos.z}
+		if state == 1 then
+			state = 0
+			minetest.sound_play("door_close", {pos = pos, gain = 0.175, max_hear_distance = 16})
+			tmp_node = {name = "doors:trapdoor", param1 = me.param1, param2 = me.param2}
+		else
+			state = 1
+			minetest.sound_play("door_open", {pos = pos, gain = 0.175, max_hear_distance = 16})
+			tmp_node = {name = "doors:trapdoor_open", param1 = me.param1, param2 = me.param2}
+		end
+		update_door(pos, tmp_node)
+		meta:set_int("state", state)
 end
 
 minetest.register_node("doors:trapdoor", {
@@ -400,7 +405,8 @@ minetest.register_node("doors:trapdoor", {
 	tiles = {"door_trapdoor.png", "door_trapdoor.png",  "door_trapdoor_side.png",  "door_trapdoor_side.png", "door_trapdoor_side.png", "door_trapdoor_side.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
+	sunlight_propagates = true,
+	groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door= 1},
 	sounds = default.node_sound_wood_defaults(),
 	drop = "doors:trapdoor",
 	node_box = {
@@ -424,10 +430,9 @@ minetest.register_node("doors:trapdoor_open", {
 	tiles = {"door_trapdoor_side.png", "door_trapdoor_side.png",  "door_trapdoor_side.png",  "door_trapdoor_side.png", "door_trapdoor.png", "door_trapdoor.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	pointable = true,
-	stack_max = 0,
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
+	sunlight_propagates = true,
 	climbable = true,
+	groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door= 1},
 	sounds = default.node_sound_wood_defaults(),
 	drop = "doors:trapdoor",
 	node_box = {
@@ -444,10 +449,14 @@ minetest.register_node("doors:trapdoor_open", {
 })
 
 minetest.register_craft({
-	output = 'doors:trapdoor 2',
+	output = "doors:trapdoor 6",
 	recipe = {
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'', '', ''},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"", "", ""},
 	}
 })
+
+if minetest.setting_getbool("log_mods") then
+	minetest.log("action", "Carbone: [doors] loaded.")
+end