diff --git a/mods/CORE/mcl_sounds/README.txt b/mods/CORE/mcl_sounds/README.txt index 8b94f8468..39cd98606 100644 --- a/mods/CORE/mcl_sounds/README.txt +++ b/mods/CORE/mcl_sounds/README.txt @@ -1,14 +1,17 @@ -License of sounds +Licenses of sounds ----------------- +Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by-sa/3.0/ + +Creative Commons Attribution 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by/3.0/ + Glass breaking sounds (CC BY 3.0): 1: http://www.freesound.org/people/cmusounddesign/sounds/71947/ 2: http://www.freesound.org/people/Tomlija/sounds/97669/ 3: http://www.freesound.org/people/lsprice/sounds/88808/ -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -http://creativecommons.org/licenses/by-sa/3.0/ - default_tool_breaks.ogg by EdgardEdition (CC BY 3.0), http://www.freesound.org/people/EdgardEdition Mito551 (sounds) (CC BY-SA 3.0): @@ -45,3 +48,25 @@ Mito551 (sounds) (CC BY-SA 3.0): default_dirt_footstep.2.ogg default_glass_footstep.ogg +Metal sounds: + default_dig_metal.ogg - yadronoff - CC-BY-3.0 + - https://www.freesound.org/people/yadronoff/sounds/320397/ + default_dug_metal.*.ogg - Iwan Gabovitch - qubodup - CC0 + - http://opengameart.org/users/qubodup + default_metal_footstep.*.ogg - Ottomaani138 - CC0 + - https://www.freesound.org/people/Ottomaani138/sounds/232692/ + default_place_node_metal.*.ogg - Ogrebane - CC0 + - http://opengameart.org/content/wood-and-metal-sound-effects-volume-2 + +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/CORE/mcl_sounds/init.lua b/mods/CORE/mcl_sounds/init.lua index c5ab9860b..fe3549d29 100644 --- a/mods/CORE/mcl_sounds/init.lua +++ b/mods/CORE/mcl_sounds/init.lua @@ -29,8 +29,19 @@ function mcl_sounds.node_sound_stone_defaults(table) return table end --- TODO: Maybe add custom metal sounds -mcl_sounds.node_sound_metal_defaults = mcl_sounds.node_sound_stone_defaults +function mcl_sounds.node_sound_metal_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name="default_metal_footstep", gain=0.5} + table.dug = table.dug or + {name="default_dug_metal", gain=1.0} + table.dig = table.dig or + {name="default_dig_metal", gain=1.0} + table.place = table.place or + {name="default_place_node_metal", gain=1.0} + mcl_sounds.node_sound_defaults(table) + return table +end function mcl_sounds.node_sound_dirt_defaults(table) table = table or {} @@ -91,9 +102,9 @@ function mcl_sounds.node_sound_leaves_defaults(table) table.footstep = table.footstep or {name="default_grass_footstep", gain=0.35} table.dug = table.dug or - {name="default_grass_footstep", gain=0.85} + {name="default_dig_snappy", gain=0.85} table.dig = table.dig or - {name="default_dig_crumbly", gain=0.4} + {name="default_dig_snappy", gain=0.4} table.place = table.place or {name="default_place_node", gain=1.0} mcl_sounds.node_sound_defaults(table) @@ -111,3 +122,11 @@ function mcl_sounds.node_sound_glass_defaults(table) mcl_sounds.node_sound_defaults(table) return table end + +function mcl_sounds.node_sound_water_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_water_footstep", gain = 0.2} + mcl_sounds.node_sound_defaults(table) + return table +end diff --git a/mods/CORE/mcl_sounds/sounds/README.txt b/mods/CORE/mcl_sounds/sounds/README.txt new file mode 100644 index 000000000..8af65a9c5 --- /dev/null +++ b/mods/CORE/mcl_sounds/sounds/README.txt @@ -0,0 +1,300 @@ +Minetest Game mod: default +========================== +See license.txt for license information. + +Authors of source code +---------------------- +Originally by celeron55, Perttu Ahola (LGPL 2.1) +Various Minetest developers and contributors (LGPL 2.1) + +Authors of media (textures, models and sounds) +---------------------------------------------- +Everything not listed in here: +celeron55, Perttu Ahola (CC BY-SA 3.0) + +Cisoun's texture pack (CC BY-SA 3.0): + default_jungletree.png + default_lava.png + default_leaves.png + default_sapling.png + default_bush_sapling.png + default_stone.png + default_tree.png + default_tree_top.png + default_water.png + +Cisoun's conifers mod (CC BY-SA 3.0): + default_pine_needles.png + +Originating from G4JC's Almost MC Texture Pack (CC BY-SA 3.0): + default_torch.png + default_torch_on_ceiling.png + default_torch_on_floor.png + +VanessaE's animated torches (CC BY-SA 3.0): + default_torch_animated.png + default_torch_on_ceiling_animated.png + default_torch_on_floor_animated.png + default_torch_on_floor.png + +RealBadAngel's animated water (CC BY-SA 3.0): + default_water_source_animated.png + default_water_flowing_animated.png + +VanessaE (CC BY-SA 3.0): + default_desert_sand.png + default_desert_stone.png + default_sand.png + default_mese_crystal.png + default_mese_crystal_fragment.png + +Calinou (CC BY-SA 3.0): + default_brick.png + default_papyrus.png + default_mineral_copper.png + default_glass_detail.png + +MirceaKitsune (CC BY-SA 3.0): + character.x + +Jordach (CC BY-SA 3.0): + character.png + +PilzAdam (CC BY-SA 3.0): + default_jungleleaves.png + default_junglesapling.png + default_obsidian_glass.png + default_obsidian_shard.png + default_mineral_gold.png + +jojoa1997 (CC BY-SA 3.0): + default_obsidian.png + +InfinityProject (CC BY-SA 3.0): + default_mineral_diamond.png + +Splizard (CC BY-SA 3.0): + default_pine_sapling.png + +Zeg9 (CC BY-SA 3.0): + default_coal_block.png + +paramat (CC BY-SA 3.0): + wieldhand.png -- Copied from character.png by Jordach (CC BY-SA 3.0) + default_pinetree.png + default_pinetree_top.png + default_pinewood.png + default_acacia_leaves.png + default_acacia_leaves_simple.png + default_acacia_sapling.png + default_acacia_bush_sapling.png + default_acacia_tree.png + default_acacia_tree_top.png + default_acacia_wood.png + default_acacia_bush_stem.png + default_bush_stem.png + default_junglewood.png + default_jungletree_top.png + default_sandstone_brick.png + default_obsidian_brick.png + default_stone_brick.png + default_desert_stone_brick.png + default_sandstone_block.png + default_obsidian_block.png + default_stone_block.png + default_desert_stone_block.png + default_river_water.png + default_river_water_source_animated.png + default_river_water_flowing_animated.png + default_dry_grass.png + default_dry_grass_side.png + default_dry_grass_*.png + default_grass.png + default_grass_side.png + default_mese_block.png + default_silver_sand.png + default_mese_post_light_side.png + default_mese_post_light_side_dark.png + default_mese_post_light_top.png + default_silver_sandstone.png -- Derived from a texture by GreenXenith (CC-BY-SA 3.0) + default_silver_sandstone_brick.png -- Derived from a texture by GreenXenith (CC-BY-SA 3.0) + default_silver_sandstone_block.png -- Derived from a texture by GreenXenith (CC-BY-SA 3.0) + +brunob.santos (CC BY-SA 4.0): + default_desert_cobble.png + +BlockMen (CC BY-SA 3.0): + default_aspen_leaves.png -- Derived from Sofar's texture + default_wood.png + default_clay_brick.png + default_iron_ingot.png + default_gold_ingot.png + default_tool_steelsword.png + default_diamond.png + default_book.png + default_tool_*.png + default_lava_source_animated.png + default_lava_flowing_animated.png + default_stick.png + default_chest_front.png + default_chest_lock.png + default_chest_side.png + default_chest_top.png + default_mineral_mese.png + default_meselamp.png + bubble.png + gui_*.png + +Wuzzy (CC BY-SA 3.0): + default_bookshelf_slot.png (based on default_book.png) + +sofar (CC BY-SA 3.0): + default_book_written.png, based on default_book.png + default_aspen_sapling + default_aspen_tree + default_aspen_tree_top, derived from default_pine_tree_top (by paramat) + default_aspen_wood, derived from default_pine_wood (by paramat) + default_chest_inside + +sofar (WTFPL): + default_gravel.png -- Derived from Gambit's PixelBOX texture pack light gravel + +Neuromancer (CC BY-SA 2.0): + default_cobble.png, based on texture by Brane praefect + default_mossycobble.png, based on texture by Brane praefect + +Neuromancer (CC BY-SA 3.0): + default_dirt.png + default_furnace_*.png + +Gambit (CC BY-SA 3.0): + default_bronze_ingot.png + default_copper_ingot.png + default_copper_lump.png + default_iron_lump.png + default_gold_lump.png + default_clay_lump.png + default_coal.png + default_grass_*.png + default_paper.png + default_diamond_block.png + default_ladder_steel.png + default_sign_wall_wood.png + default_flint.png + default_snow.png + default_snow_side.png + default_snowball.png + default_key.png + default_key_skeleton.png + +asl97 (CC BY-SA 3.0): + default_ice.png + +KevDoy (CC BY-SA 3.0) + heart.png + +Pithydon (CC BY-SA 3.0) + default_coral_brown.png + default_coral_orange.png + default_coral_skeleton.png + +Ferk (CC0 1.0) + default_item_smoke.png + default_item_smoke.ogg, based on sound by http://opengameart.org/users/bart + +npx (CC BY-SA 3.0) + default_rainforest_litter.png + default_rainforest_litter_side.png + +kaeza (CC-BY-SA 3.0): + default_desert_sandstone.png + default_desert_sandstone_brick.png + default_desert_sandstone_block.png + +kilbith (CC BY-SA 3.0): + default_steel_block.png + default_copper_block.png + default_bronze_block.png + default_gold_block.png + default_tin_block.png + default_mineral_tin.png + default_tin_ingot.png + default_tin_lump.png + +Glass breaking sounds (CC BY 3.0): + 1: http://www.freesound.org/people/cmusounddesign/sounds/71947/ + 2: http://www.freesound.org/people/Tomlija/sounds/97669/ + 3: http://www.freesound.org/people/lsprice/sounds/88808/ + +sonictechtonic (CC BY 3.0): +https://www.freesound.org/people/sonictechtonic/sounds/241872/ + player_damage.ogg + +Mito551 (sounds) (CC BY-SA 3.0): + default_dig_choppy.ogg + default_dig_cracky.ogg + default_dig_crumbly.1.ogg + default_dig_crumbly.2.ogg + default_dig_dig_immediate.ogg + default_dig_oddly_breakable_by_hand.ogg + default_dug_node.1.ogg + default_dug_node.2.ogg + default_grass_footstep.1.ogg + default_grass_footstep.2.ogg + default_grass_footstep.3.ogg + default_gravel_footstep.1.ogg + default_gravel_footstep.2.ogg + default_gravel_footstep.3.ogg + default_gravel_footstep.4.ogg + default_grass_footstep.1.ogg + default_place_node.1.ogg + default_place_node.2.ogg + default_place_node.3.ogg + default_place_node_hard.1.ogg + default_place_node_hard.2.ogg + default_snow_footstep.1.ogg + default_snow_footstep.2.ogg + default_hard_footstep.1.ogg + default_hard_footstep.2.ogg + default_hard_footstep.3.ogg + default_sand_footstep.1.ogg + default_sand_footstep.2.ogg + default_wood_footstep.1.ogg + default_wood_footstep.2.ogg + default_dirt_footstep.1.ogg + default_dirt_footstep.2.ogg + default_glass_footstep.ogg + +Metal sounds: + default_dig_metal.ogg - yadronoff - CC-BY-3.0 + - https://www.freesound.org/people/yadronoff/sounds/320397/ + default_dug_metal.*.ogg - Iwan Gabovitch - qubodup - CC0 + - http://opengameart.org/users/qubodup + default_metal_footstep.*.ogg - Ottomaani138 - CC0 + - https://www.freesound.org/people/Ottomaani138/sounds/232692/ + default_place_node_metal.*.ogg - Ogrebane - CC0 + - http://opengameart.org/content/wood-and-metal-sound-effects-volume-2 + +Tool breaking sounds added by sofar: CC-BY-3.0 + default_tool_breaks.* - http://www.freesound.org/people/HerbertBoland/sounds/33206/ + +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 + +Chests sounds added by sofar, derived of several files mixed together: + default_chest_open.ogg + default_chest_close.ogg + - http://www.freesound.org/people/Sevin7/sounds/269722/ CC0 + - http://www.freesound.org/people/Percy%20Duke/sounds/23448/ CC-BY-3.0 + - http://www.freesound.org/people/kingsamas/sounds/135576/ CC-BY-3.0 + - http://www.freesound.org/people/bulbastre/sounds/126887/ CC-BY-3.0 + - http://www.freesound.org/people/Yoyodaman234/sounds/183541/ CC0 + diff --git a/mods/CORE/mcl_sounds/sounds/default_dig_metal.ogg b/mods/CORE/mcl_sounds/sounds/default_dig_metal.ogg new file mode 100644 index 000000000..0b585097a Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_dig_metal.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_dig_snappy.ogg b/mods/CORE/mcl_sounds/sounds/default_dig_snappy.ogg new file mode 100644 index 000000000..3686fcddb Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_dig_snappy.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_dug_metal.1.ogg b/mods/CORE/mcl_sounds/sounds/default_dug_metal.1.ogg new file mode 100644 index 000000000..5d6cb5b1e Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_dug_metal.1.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_dug_metal.2.ogg b/mods/CORE/mcl_sounds/sounds/default_dug_metal.2.ogg new file mode 100644 index 000000000..63567fc05 Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_dug_metal.2.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_metal_footstep.1.ogg b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.1.ogg new file mode 100644 index 000000000..841286bdc Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.1.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_metal_footstep.2.ogg b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.2.ogg new file mode 100644 index 000000000..aa61ed338 Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.2.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_metal_footstep.3.ogg b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.3.ogg new file mode 100644 index 000000000..4cc1ca47a Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_metal_footstep.3.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_place_node_metal.1.ogg b/mods/CORE/mcl_sounds/sounds/default_place_node_metal.1.ogg new file mode 100644 index 000000000..5da085ea2 Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_place_node_metal.1.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_place_node_metal.2.ogg b/mods/CORE/mcl_sounds/sounds/default_place_node_metal.2.ogg new file mode 100644 index 000000000..5ee67fcf6 Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_place_node_metal.2.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_water_footstep.1.ogg b/mods/CORE/mcl_sounds/sounds/default_water_footstep.1.ogg new file mode 100644 index 000000000..63b9744ce Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_water_footstep.1.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_water_footstep.2.ogg b/mods/CORE/mcl_sounds/sounds/default_water_footstep.2.ogg new file mode 100644 index 000000000..8d79c1f4b Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_water_footstep.2.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_water_footstep.3.ogg b/mods/CORE/mcl_sounds/sounds/default_water_footstep.3.ogg new file mode 100644 index 000000000..f8891506d Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_water_footstep.3.ogg differ diff --git a/mods/CORE/mcl_sounds/sounds/default_water_footstep.4.ogg b/mods/CORE/mcl_sounds/sounds/default_water_footstep.4.ogg new file mode 100644 index 000000000..6f1eab824 Binary files /dev/null and b/mods/CORE/mcl_sounds/sounds/default_water_footstep.4.ogg differ diff --git a/mods/ITEMS/mcl_core/nodes.lua b/mods/ITEMS/mcl_core/nodes.lua index 90c934515..f5fe36a0c 100644 --- a/mods/ITEMS/mcl_core/nodes.lua +++ b/mods/ITEMS/mcl_core/nodes.lua @@ -1545,6 +1545,7 @@ minetest.register_node("mcl_core:water_flowing", { animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=2.0} }, }, + sounds = mcl_sounds.node_sound_water_defaults(table), alpha = WATER_ALPHA, paramtype = "light", paramtype2 = "flowingliquid", @@ -1589,6 +1590,7 @@ Water interacts with lava in various ways: backface_culling = false, } }, + sounds = mcl_sounds.node_sound_water_defaults(table), alpha = WATER_ALPHA, paramtype = "light", walkable = false, @@ -1746,7 +1748,7 @@ minetest.register_node("mcl_core:ironblock", { is_ground_content = false, stack_max = 64, groups = {pickaxey=2, building_block=1}, - sounds = mcl_sounds.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 5, }) @@ -1758,7 +1760,7 @@ minetest.register_node("mcl_core:goldblock", { is_ground_content = false, stack_max = 64, groups = {pickaxey=4, building_block=1}, - sounds = mcl_sounds.node_sound_stone_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 5, }) diff --git a/mods/ITEMS/mcl_minecarts/rails.lua b/mods/ITEMS/mcl_minecarts/rails.lua index 39a9262ae..f68a738c9 100644 --- a/mods/ITEMS/mcl_minecarts/rails.lua +++ b/mods/ITEMS/mcl_minecarts/rails.lua @@ -19,7 +19,7 @@ minetest.register_node("mcl_minecarts:rail", { }, stack_max = 64, groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=1,dig_by_water=1,destroy_by_lava_flow=1,transport=1}, - sounds = mcl_sounds.node_sound_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 3.5, _mcl_hardness = 0.7, }) @@ -57,7 +57,7 @@ minetest.register_node("mcl_minecarts:golden_rail", { minetest.get_meta(pos):set_string("cart_acceleration", "0.5") end end, - sounds = mcl_sounds.node_sound_defaults(), + sounds = mcl_sounds.node_sound_metal_defaults(), mesecons = { effector = { action_on = function(pos, node)