From: paramat <mat.gregory@virginmedia.com>
Date: Thu, 23 Jun 2016 02:06:57 +0000 (+0100)
Subject: Doors: Add dedicated sounds for glass doors
X-Git-Tag: 0.4.15~161
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f796194c6959ca4e560bfcb03f173e06a94755de;p=oweals%2Fminetest_game.git

Doors: Add dedicated sounds for glass doors

Changed node sounds for steel door/trapdoor to stone
defaults instead of wood defaults
---

diff --git a/mods/doors/README.txt b/mods/doors/README.txt
index b1c1363e..6c036782 100644
--- a/mods/doors/README.txt
+++ b/mods/doors/README.txt
@@ -75,7 +75,9 @@ fencegate_open.ogg:
 fencegate_close.ogg:
   http://www.freesound.org/people/BarkersPinhead/sounds/274807/ - CC-BY-3.0
   http://www.freesound.org/people/rivernile7/sounds/249573/ - CC-BY-3.0
-Steel door sounds (open & close (CC-BY-3.0) by HazMatt
+Steel door sounds open & close (CC-BY-3.0) by HazMatt
   - http://www.freesound.org/people/HazMattt/sounds/187283/
   doors_steel_door_open.ogg
   doors_steel_door_close.ogg
+doors_glass_door_open.ogg, doors_glass_door_close.ogg:
+  https://www.freesound.org/people/SkeetMasterFunk69/sounds/235546/ (CC0 1.0)
diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index a3ecd384..8d3e8472 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -434,6 +434,7 @@ doors.register("door_steel", {
 		inventory_image = "doors_item_steel.png",
 		protected = true,
 		groups = { snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2 },
+		sounds = default.node_sound_stone_defaults(),
 		sound_open = "doors_steel_door_open",
 		sound_close = "doors_steel_door_close",
 		recipe = {
@@ -449,6 +450,8 @@ doors.register("door_glass", {
 		inventory_image = "doors_item_glass.png",
 		groups = { snappy=1, cracky=1, oddly_breakable_by_hand=3 },
 		sounds = default.node_sound_glass_defaults(),
+		sound_open = "doors_glass_door_open",
+		sound_close = "doors_glass_door_close",
 		recipe = {
 			{"default:glass", "default:glass"},
 			{"default:glass", "default:glass"},
@@ -462,6 +465,8 @@ doors.register("door_obsidian_glass", {
 		inventory_image = "doors_item_obsidian_glass.png",
 		groups = { snappy=1, cracky=1, oddly_breakable_by_hand=3 },
 		sounds = default.node_sound_glass_defaults(),
+		sound_open = "doors_glass_door_open",
+		sound_close = "doors_glass_door_close",
 		recipe = {
 			{"default:obsidian_glass", "default:obsidian_glass"},
 			{"default:obsidian_glass", "default:obsidian_glass"},
@@ -626,6 +631,7 @@ doors.register_trapdoor("doors:trapdoor_steel", {
 	tile_front = "doors_trapdoor_steel.png",
 	tile_side = "doors_trapdoor_steel_side.png",
 	protected = true,
+	sounds = default.node_sound_stone_defaults(),
 	sound_open = "doors_steel_door_open",
 	sound_close = "doors_steel_door_close",
 	groups = {snappy=1, bendy=2, cracky=1, melty=2, level=2, door=1},
diff --git a/mods/doors/sounds/doors_glass_door_close.ogg b/mods/doors/sounds/doors_glass_door_close.ogg
new file mode 100644
index 00000000..b3c13559
Binary files /dev/null and b/mods/doors/sounds/doors_glass_door_close.ogg differ
diff --git a/mods/doors/sounds/doors_glass_door_open.ogg b/mods/doors/sounds/doors_glass_door_open.ogg
new file mode 100644
index 00000000..66e6812d
Binary files /dev/null and b/mods/doors/sounds/doors_glass_door_open.ogg differ