mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-14 15:11:05 +01:00
Merge pull request 'Update sounds from MTG' (#3157) from grorp/MineClone2:patch-1 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3157 Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
commit
81daec14a2
41 changed files with 104 additions and 70 deletions
|
@ -95,6 +95,7 @@
|
|||
* anarquimico
|
||||
* TheOnlyJoeEnderman
|
||||
* Ranko Saotome
|
||||
* Gregor Parzefall
|
||||
|
||||
## MineClone5
|
||||
* kay27
|
||||
|
|
|
@ -11,42 +11,22 @@ 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/
|
||||
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/
|
||||
|
||||
default_tool_breaks.ogg by EdgardEdition (CC BY 3.0), http://www.freesound.org/people/EdgardEdition
|
||||
|
||||
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_crumbly.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_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_dug_node.*.ogg
|
||||
default_grass_footstep.*.ogg
|
||||
default_gravel_footstep.*.ogg
|
||||
default_place_node.*.ogg
|
||||
default_place_node_hard.*.ogg
|
||||
default_wood_footstep.*.ogg
|
||||
default_dirt_footstep.*.ogg
|
||||
default_glass_footstep.ogg
|
||||
|
||||
Metal sounds:
|
||||
|
@ -54,35 +34,64 @@ Metal sounds:
|
|||
- 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_metal_footstep.*.ogg - (CC0 1.0) - CC0 1.0
|
||||
- https://freesound.org/people/mypantsfelldown/sounds/398937/
|
||||
default_place_node_metal.*.ogg - Ogrebane - CC0
|
||||
- http://opengameart.org/content/wood-and-metal-sound-effects-volume-2
|
||||
|
||||
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)
|
||||
default_water_footstep.*.ogg
|
||||
|
||||
blukotek (CC0 1.0)
|
||||
blukotek (CC0 1.0):
|
||||
https://www.freesound.org/people/blukotek/sounds/251660/
|
||||
default_dig_snappy.ogg
|
||||
|
||||
sonictechtonic (CC BY 3.0)
|
||||
sonictechtonic (CC BY 3.0):
|
||||
https://www.freesound.org/people/sonictechtonic/sounds/241872/
|
||||
player_damage.ogg
|
||||
|
||||
Voxelands project <http://www.voxelands.com/> (CC BY-SA 3.0)
|
||||
Sheyvan (CC0 1.0):
|
||||
https://freesound.org/people/Sheyvan/sounds/476113/
|
||||
default_dig_choppy.*.ogg
|
||||
|
||||
lolamadeus (CC0 1.0):
|
||||
https://freesound.org/people/lolamadeus/sounds/179341/
|
||||
default_gravel_dig.*.ogg
|
||||
default_gravel_dug.*.ogg
|
||||
|
||||
Benboncan (CC BY 3.0):
|
||||
https://freesound.org/people/Benboncan/sounds/71823/
|
||||
default_dig_cracky.*.ogg
|
||||
|
||||
Erdie (CC BY 3.0):
|
||||
https://freesound.org/people/Erdie/sounds/41579/
|
||||
default_hard_footstep.*.ogg
|
||||
|
||||
worthahep88 (CC0 1.0):
|
||||
https://freesound.org/people/worthahep88/sounds/319224/
|
||||
default_sand_footstep.*.ogg
|
||||
|
||||
dheming (CC BY 3.0):
|
||||
https://freesound.org/people/dheming/sounds/268023/
|
||||
default_ice_dig.*.ogg
|
||||
|
||||
InspectorJ (CC BY 3.0):
|
||||
https://freesound.org/people/InspectorJ/sounds/416967/
|
||||
default_ice_footstep.*.ogg
|
||||
|
||||
Angel_Perez_Grandi (CC BY 3.0):
|
||||
https://freesound.org/people/Angel_Perez_Grandi/sounds/49190/
|
||||
default_ice_dug.ogg
|
||||
|
||||
Voxelands project <http://www.voxelands.com/> (CC BY-SA 3.0):
|
||||
mcl_sounds_place_node_water.ogg
|
||||
mcl_sounds_dug_water.ogg
|
||||
|
||||
(Note: Artists from the Voxelands project include: sdzen, darkrose, sapier,
|
||||
Tom Peter, Telaron, juskiddink)
|
||||
|
||||
Michel Baradari <https://opengameart.org/content/lava-splash> (CC BY 3.0)
|
||||
|
||||
Michel Baradari <https://opengameart.org/content/lava-splash> (CC BY 3.0):
|
||||
default_place_node_lava.ogg
|
||||
|
||||
Adam_N (CC0 1.0):
|
||||
|
@ -90,7 +99,7 @@ Adam_N (CC0 1.0):
|
|||
Source: <https://www.freesound.org/people/Adam_N/sounds/346692/>
|
||||
|
||||
Alecia Shepherd (CC BY-SA 4.0):
|
||||
mcl_sounds_cloth.ogg
|
||||
mcl_sounds_cloth.*.ogg
|
||||
Source: SnowSong sound and music pack <https://opengameart.org/content/snowsong-sound-and-music-pack>
|
||||
|
||||
Unknown authors (WTFPL):
|
||||
|
|
|
@ -11,7 +11,7 @@ function mcl_sounds.node_sound_defaults(table)
|
|||
table.dug = table.dug or
|
||||
{name="default_dug_node", gain=0.25}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_oddly_breakable_by_hand", gain=1.0}
|
||||
{name="default_dig_oddly_breakable_by_hand", gain=0.5}
|
||||
table.place = table.place or
|
||||
{name="default_place_node_hard", gain=1.0}
|
||||
return table
|
||||
|
@ -20,11 +20,11 @@ end
|
|||
function mcl_sounds.node_sound_stone_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_hard_footstep", gain=0.5}
|
||||
{name="default_hard_footstep", gain=0.2}
|
||||
table.dug = table.dug or
|
||||
{name="default_hard_footstep", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_cracky", gain=1.0}
|
||||
{name="default_dig_cracky", gain=0.5}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
@ -32,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}
|
||||
{name="default_metal_footstep", gain=0.2}
|
||||
table.dug = table.dug or
|
||||
{name="default_dug_metal", gain=1.0}
|
||||
{name="default_dug_metal", gain=0.5}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_metal", gain=1.0}
|
||||
{name="default_dig_metal", gain=0.5}
|
||||
table.place = table.place or
|
||||
{name="default_place_node_metal", gain=1.0}
|
||||
{name="default_place_node_metal", gain=0.5}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
@ -46,11 +46,11 @@ end
|
|||
function mcl_sounds.node_sound_dirt_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_dirt_footstep", gain=1.0}
|
||||
{name="default_dirt_footstep", gain=0.25}
|
||||
table.dug = table.dug or
|
||||
{name="default_dirt_footstep", gain=1.5}
|
||||
{name="default_dirt_footstep", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_crumbly", gain=1.0}
|
||||
{name="default_dig_crumbly", gain=0.4}
|
||||
table.place = table.place or
|
||||
{name="default_place_node", gain=1.0}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
|
@ -60,11 +60,25 @@ end
|
|||
function mcl_sounds.node_sound_sand_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_sand_footstep", gain=0.5}
|
||||
{name="default_sand_footstep", gain=0.05}
|
||||
table.dug = table.dug or
|
||||
{name="default_sand_footstep", gain=1.0}
|
||||
{name="default_sand_footstep", gain=0.15}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_crumbly", gain=1.0}
|
||||
{name="default_dig_crumbly", gain=0.4}
|
||||
table.place = table.place or
|
||||
{name="default_place_node", gain=1.0}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
||||
function mcl_sounds.node_sound_gravel_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_gravel_footstep", gain=0.25}
|
||||
table.dug = table.dug or
|
||||
{name="default_gravel_dug", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_gravel_dig", gain=0.35}
|
||||
table.place = table.place or
|
||||
{name="default_place_node", gain=1.0}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
|
@ -78,21 +92,33 @@ function mcl_sounds.node_sound_snow_defaults(table)
|
|||
table.dug = table.dug or
|
||||
{name="pedology_snow_soft_footstep", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_crumbly", gain=1.0}
|
||||
{name="pedology_snow_soft_footstep", gain=1.0}
|
||||
table.place = table.place or
|
||||
{name="default_place_node", gain=1.0}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
||||
function mcl_sounds.node_sound_ice_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_ice_footstep", gain=0.15}
|
||||
table.dug = table.dug or
|
||||
{name="default_ice_dug", gain=0.5}
|
||||
table.dig = table.dig or
|
||||
{name="default_ice_dig", gain=0.5}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
||||
function mcl_sounds.node_sound_wood_defaults(table)
|
||||
table = table or {}
|
||||
table.footstep = table.footstep or
|
||||
{name="default_wood_footstep", gain=0.5}
|
||||
{name="default_wood_footstep", gain=0.15}
|
||||
table.dug = table.dug or
|
||||
{name="default_wood_footstep", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_choppy", gain=1.0}
|
||||
{name="default_dig_choppy", gain=0.4}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
@ -128,11 +154,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}
|
||||
{name="default_glass_footstep", gain=0.3}
|
||||
table.dug = table.dug or
|
||||
{name="default_break_glass", gain=1.0}
|
||||
table.dig = table.dig or
|
||||
{name="default_dig_cracky", gain=1.0}
|
||||
{name="default_dig_cracky", gain=0.5}
|
||||
mcl_sounds.node_sound_defaults(table)
|
||||
return table
|
||||
end
|
||||
|
|
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_choppy.3.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_dig_cracky.3.ogg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dig.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dig.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dig.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dig.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_gravel_dug.3.ogg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dig.3.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dug.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_dug.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.1.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.1.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.2.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.2.ogg
Normal file
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_ice_footstep.3.ogg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
mods/CORE/mcl_sounds/sounds/default_sand_footstep.3.ogg
Normal file
BIN
mods/CORE/mcl_sounds/sounds/default_sand_footstep.3.ogg
Normal file
Binary file not shown.
Binary file not shown.
|
@ -124,7 +124,7 @@ end
|
|||
local default_sounds
|
||||
if minetest.get_modpath("mcl_sounds") then
|
||||
default_sounds = mcl_sounds.node_sound_wood_defaults({
|
||||
footstep = { gain = 0.5, name = "mcl_sounds_cloth" },
|
||||
footstep = mcl_sounds.node_sound_wool_defaults().footstep,
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -1559,7 +1559,7 @@ function mcl_core.register_snowed_node(itemstring_snowed, itemstring_clear, tile
|
|||
end
|
||||
if not sounds then
|
||||
def.sounds = mcl_sounds.node_sound_dirt_defaults({
|
||||
footstep = { name = "pedology_snow_soft_footstep", gain = 0.5 }
|
||||
footstep = mcl_sounds.node_sound_snow_defaults().footstep,
|
||||
})
|
||||
else
|
||||
def.sounds = sounds
|
||||
|
|
|
@ -542,9 +542,7 @@ minetest.register_node("mcl_core:gravel", {
|
|||
{items = {"mcl_core:gravel"}}
|
||||
}
|
||||
},
|
||||
sounds = mcl_sounds.node_sound_dirt_defaults({
|
||||
footstep = {name="default_gravel_footstep", gain=0.45},
|
||||
}),
|
||||
sounds = mcl_sounds.node_sound_gravel_defaults(),
|
||||
_mcl_blast_resistance = 0.6,
|
||||
_mcl_hardness = 0.6,
|
||||
_mcl_silk_touch_drop = true,
|
||||
|
@ -901,7 +899,7 @@ minetest.register_node("mcl_core:ice", {
|
|||
stack_max = 64,
|
||||
groups = {handy=1,pickaxey=1, slippery=3, building_block=1, ice=1},
|
||||
drop = "",
|
||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||
sounds = mcl_sounds.node_sound_ice_defaults(),
|
||||
node_dig_prediction = "mcl_core:water_source",
|
||||
after_dig_node = function(pos, oldnode)
|
||||
mcl_core.melt_ice(pos)
|
||||
|
@ -919,7 +917,7 @@ minetest.register_node("mcl_core:packed_ice", {
|
|||
stack_max = 64,
|
||||
groups = {handy=1,pickaxey=1, slippery=3, building_block=1, ice=1},
|
||||
drop = "",
|
||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||
sounds = mcl_sounds.node_sound_ice_defaults(),
|
||||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_hardness = 0.5,
|
||||
_mcl_silk_touch_drop = true,
|
||||
|
@ -967,7 +965,7 @@ for i=0,3 do
|
|||
stack_max = 64,
|
||||
groups = {handy=1, frosted_ice=1, slippery=3, not_in_creative_inventory=1, ice=1},
|
||||
drop = "",
|
||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||
sounds = mcl_sounds.node_sound_ice_defaults(),
|
||||
on_construct = function(pos)
|
||||
local timer = minetest.get_node_timer(pos)
|
||||
timer:start(1.5)
|
||||
|
|
Loading…
Reference in a new issue