From e45b9e6b68c41d721abe11afe340165f04096a8f Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 31 Jul 2017 01:00:15 +0200 Subject: [PATCH] Remove useless max_hear_distance in mcl_sounds It is not part of SimpleSoundSpec --- mods/CORE/mcl_sounds/init.lua | 72 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/mods/CORE/mcl_sounds/init.lua b/mods/CORE/mcl_sounds/init.lua index aa67f14ef..be63ade25 100644 --- a/mods/CORE/mcl_sounds/init.lua +++ b/mods/CORE/mcl_sounds/init.lua @@ -4,29 +4,27 @@ mcl_sounds = {} -local mhd = 16 -- default max_hear_distance - function mcl_sounds.node_sound_defaults(table) table = table or {} table.footstep = table.footstep or {name="", gain=1.0} table.dug = table.dug or - {name="default_dug_node", gain=0.25, max_hear_distance=mhd} + {name="default_dug_node", gain=0.25} table.dig = table.dig or - {name="default_dig_oddly_breakable_by_hand", gain=1.0, max_hear_distance=mhd} + {name="default_dig_oddly_breakable_by_hand", gain=1.0} table.place = table.place or - {name="default_place_node_hard", gain=1.0, max_hear_distance=mhd} + {name="default_place_node_hard", gain=1.0} return table end function mcl_sounds.node_sound_stone_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_hard_footstep", gain=0.5, max_hear_distance=mhd} + {name="default_hard_footstep", gain=0.5} table.dug = table.dug or - {name="default_hard_footstep", gain=1.0, max_hear_distance=mhd} + {name="default_hard_footstep", gain=1.0} table.dig = table.dig or - {name="default_dig_cracky", gain=1.0, max_hear_distance=mhd} + {name="default_dig_cracky", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -34,13 +32,13 @@ end function mcl_sounds.node_sound_metal_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_metal_footstep", gain=0.5, max_hear_distance=mhd} + {name="default_metal_footstep", gain=0.5} table.dug = table.dug or - {name="default_dug_metal", gain=1.0, max_hear_distance=mhd} + {name="default_dug_metal", gain=1.0} table.dig = table.dig or - {name="default_dig_metal", gain=1.0, max_hear_distance=mhd} + {name="default_dig_metal", gain=1.0} table.place = table.place or - {name="default_place_node_metal", gain=1.0, max_hear_distance=mhd} + {name="default_place_node_metal", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -48,13 +46,13 @@ end function mcl_sounds.node_sound_dirt_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_dirt_footstep", gain=1.0, max_hear_distance=mhd} + {name="default_dirt_footstep", gain=1.0} table.dug = table.dug or - {name="default_dirt_footstep", gain=1.5, max_hear_distance=mhd} + {name="default_dirt_footstep", gain=1.5} table.dig = table.dig or - {name="default_dig_crumbly", gain=1.0, max_hear_distance=mhd} + {name="default_dig_crumbly", gain=1.0} table.place = table.place or - {name="default_place_node", gain=1.0, max_hear_distance=mhd} + {name="default_place_node", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -62,13 +60,13 @@ end function mcl_sounds.node_sound_sand_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_sand_footstep", gain=0.5, max_hear_distance=mhd} + {name="default_sand_footstep", gain=0.5} table.dug = table.dug or - {name="default_sand_footstep", gain=1.0, max_hear_distance=mhd} + {name="default_sand_footstep", gain=1.0} table.dig = table.dig or - {name="default_dig_crumbly", gain=1.0, max_hear_distance=mhd} + {name="default_dig_crumbly", gain=1.0} table.place = table.place or - {name="default_place_node", gain=1.0, max_hear_distance=mhd} + {name="default_place_node", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -76,13 +74,13 @@ end function mcl_sounds.node_sound_snow_defaults(table) table = table or {} table.footstep = table.footstep or - {name="pedology_snow_soft_footstep", gain=0.7, max_hear_distance=mhd} + {name="pedology_snow_soft_footstep", gain=0.7} table.dug = table.dug or - {name="pedology_snow_soft_footstep", gain=1.0, max_hear_distance=mhd} + {name="pedology_snow_soft_footstep", gain=1.0} table.dig = table.dig or - {name="default_dig_crumbly", gain=1.0, max_hear_distance=mhd} + {name="default_dig_crumbly", gain=1.0} table.place = table.place or - {name="default_place_node", gain=1.0, max_hear_distance=mhd} + {name="default_place_node", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -90,11 +88,11 @@ end function mcl_sounds.node_sound_wood_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_wood_footstep", gain=0.5, max_hear_distance=mhd} + {name="default_wood_footstep", gain=0.5} table.dug = table.dug or - {name="default_wood_footstep", gain=1.0, max_hear_distance=mhd} + {name="default_wood_footstep", gain=1.0} table.dig = table.dig or - {name="default_dig_choppy", gain=1.0, max_hear_distance=mhd} + {name="default_dig_choppy", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -102,13 +100,13 @@ end function mcl_sounds.node_sound_leaves_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_grass_footstep", gain=0.35, max_hear_distance=mhd} + {name="default_grass_footstep", gain=0.35} table.dug = table.dug or - {name="default_grass_footstep", gain=0.85, max_hear_distance=mhd} + {name="default_grass_footstep", gain=0.85} table.dig = table.dig or - {name="default_dig_snappy", gain=0.4, max_hear_distance=mhd} + {name="default_dig_snappy", gain=0.4} table.place = table.place or - {name="default_place_node", gain=1.0, max_hear_distance=mhd} + {name="default_place_node", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -116,11 +114,11 @@ end function mcl_sounds.node_sound_glass_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_glass_footstep", gain=0.5, max_hear_distance=mhd} + {name="default_glass_footstep", gain=0.5} table.dug = table.dug or - {name="default_break_glass", gain=1.0, max_hear_distance=mhd} + {name="default_break_glass", gain=1.0} table.dig = table.dig or - {name="default_dig_cracky", gain=1.0, max_hear_distance=mhd} + {name="default_dig_cracky", gain=1.0} mcl_sounds.node_sound_defaults(table) return table end @@ -128,11 +126,11 @@ end function mcl_sounds.node_sound_water_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_water_footstep", gain = 0.2, max_hear_distance=mhd} + {name = "default_water_footstep", gain = 0.2} table.place = table.place or - {name = "mcl_sounds_place_node_water", gain = 1.0, max_hear_distance=mhd} + {name = "mcl_sounds_place_node_water", gain = 1.0} table.dug = table.dug or - {name = "mcl_sounds_dug_water", gain = 1.0, max_hear_distance=mhd} + {name = "mcl_sounds_dug_water", gain = 1.0} mcl_sounds.node_sound_defaults(table) return table end