From: paramat <mat.gregory@virginmedia.com>
Date: Sat, 10 Dec 2016 01:05:16 +0000 (+0000)
Subject: Default: Add missing 'default_dig_snappy' sound
X-Git-Tag: 0.4.15~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=55a16cd2c6c56e2b15b495fc5311e8cdc4ef8e47;p=oweals%2Fminetest_game.git

Default: Add missing 'default_dig_snappy' sound

Some nodes with the snappy group (wool, glass pane, seeds) were missing
sound when dug with a sword.
Adding the sound causes it to be used for glass pane, so define a 'dig'
sound in the 'node sound glass defaults' table, use the footstep sound.
Adding the sound also causes it to be used for seeds which deliberately
have no dig sound, so add an empty sound override for seed dig.

Reduce the gain of the glass footstep sound which was excessively loud.

Add some freesound members to license.txt.
---

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 9dde0eba..d261b6b5 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -252,10 +252,13 @@ Metal sounds:
 Tool breaking sounds added by sofar: CC-BY-3.0
   default_tool_breaks.* - http://www.freesound.org/people/HerbertBoland/sounds/33206/
 
-AGFX
-https://www.freesound.org/people/AGFX/
-(CC BY 3.0):
+AGFX (CC BY 3.0)
+https://www.freesound.org/people/AGFX/packs/1253/
   default_water_footstep.1.ogg
   default_water_footstep.2.ogg
   default_water_footstep.3.ogg
 (default_water_footstep.4.ogg is silent)
+
+blukotek (CC0 1.0)
+https://www.freesound.org/people/blukotek/sounds/251660/
+  default_dig_snappy.ogg
diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index ed373ed7..a8e3355f 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -88,7 +88,9 @@ end
 function default.node_sound_glass_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_glass_footstep", gain = 0.5}
+			{name = "default_glass_footstep", gain = 0.25}
+	table.dig = table.dig or
+			{name = "default_glass_footstep", gain = 0.45}
 	table.dug = table.dug or
 			{name = "default_break_glass", gain = 1.0}
 	default.node_sound_defaults(table)
diff --git a/mods/default/license.txt b/mods/default/license.txt
index 137923c8..e9267366 100644
--- a/mods/default/license.txt
+++ b/mods/default/license.txt
@@ -144,6 +144,9 @@ Copyright (C) 2009 cmusounddesign
 Copyright (C) 2010 Tomlija
 Copyright (C) 2010 lsprice
 Copyright (C) 2014 sonictechtonic
+Copyright (C) 2015 yadronoff
+Copyright (C) 2007 HerbertBoland
+Copyright (C) 2006 AGFX
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.
diff --git a/mods/default/sounds/default_dig_snappy.ogg b/mods/default/sounds/default_dig_snappy.ogg
new file mode 100644
index 00000000..3686fcdd
Binary files /dev/null and b/mods/default/sounds/default_dig_snappy.ogg differ
diff --git a/mods/farming/api.lua b/mods/farming/api.lua
index 3ff182e9..182e1b20 100644
--- a/mods/farming/api.lua
+++ b/mods/farming/api.lua
@@ -307,6 +307,7 @@ farming.register_plant = function(name, def)
 		},
 		fertility = def.fertility,
 		sounds = default.node_sound_dirt_defaults({
+			dig = {name = "", gain = 0},
 			dug = {name = "default_grass_footstep", gain = 0.2},
 			place = {name = "default_place_node", gain = 0.25},
 		}),