diff --git a/mods/default/README.txt b/mods/default/README.txt index 0a9f8ff7..977594f2 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -184,7 +184,7 @@ Gambit (CC BY-SA 3.0): asl97 (CC BY-SA 3.0): default_ice.png -KevDoy (CC BY-SA 3.0) +KevDoy (CC BY-SA 3.0): heart.png Pithydon (CC BY-SA 3.0) @@ -192,11 +192,11 @@ Pithydon (CC BY-SA 3.0) default_coral_orange.png default_coral_skeleton.png -Ferk (CC0 1.0) +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) +npx (CC BY-SA 3.0): default_rainforest_litter.png default_rainforest_litter_side.png @@ -249,8 +249,6 @@ Mito551 (sounds) (CC BY-SA 3.0): 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 @@ -275,14 +273,14 @@ Metal sounds: 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) +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) +blukotek (CC0 1.0): https://www.freesound.org/people/blukotek/sounds/251660/ default_dig_snappy.ogg @@ -294,3 +292,7 @@ Chests sounds added by sofar, derived of several files mixed together: - 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 + +Ryding (CC0 1.0): +http://freesound.org/people/Ryding/sounds/94337/ + default_snow_footstep.*.ogg diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 87e7483b..4eb1a1c9 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -1,5 +1,3 @@ --- mods/default/functions.lua - -- -- Sounds -- @@ -117,6 +115,21 @@ function default.node_sound_water_defaults(table) return table end +function default.node_sound_snow_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_snow_footstep", gain = 0.2} + table.dig = table.dig or + {name = "default_snow_footstep", gain = 0.3} + table.dug = table.dug or + {name = "default_snow_footstep", gain = 0.3} + table.place = table.place or + {name = "default_place_node", gain = 1.0} + default.node_sound_defaults(table) + return table +end + + -- -- Lavacooling -- @@ -145,8 +158,9 @@ if minetest.settings:get_bool("enable_lavacooling") ~= false then }) end + -- --- optimized helper to put all items in an inventory into a drops list +-- Optimized helper to put all items in an inventory into a drops list -- function default.get_inventory_drops(pos, inventory, drops) @@ -161,11 +175,12 @@ function default.get_inventory_drops(pos, inventory, drops) end end + -- -- Papyrus and cactus growing -- --- wrapping the functions in abm action is necessary to make overriding them possible +-- Wrapping the functions in ABM action is necessary to make overriding them possible function default.grow_cactus(pos, node) if node.param2 >= 4 then @@ -242,7 +257,7 @@ minetest.register_abm({ -- --- dig upwards +-- Dig upwards -- function default.dig_up(pos, node, digger) @@ -386,6 +401,7 @@ function default.register_leafdecay(def) end end + -- -- Convert dirt to something that fits the environment -- @@ -538,7 +554,7 @@ minetest.register_abm({ -- --- NOTICE: This method is not an official part of the API yet! +-- NOTICE: This method is not an official part of the API yet. -- This method may change in future. -- @@ -558,7 +574,7 @@ function default.can_interact_with_node(player, pos) return true end - -- is player wielding the right key? + -- Is player wielding the right key? local item = player:get_wielded_item() if item:get_name() == "default:key" then local key_meta = item:get_meta() diff --git a/mods/default/license.txt b/mods/default/license.txt index 034151f2..a6ec47a3 100644 --- a/mods/default/license.txt +++ b/mods/default/license.txt @@ -176,3 +176,40 @@ rights may limit how you use the material. For more details: http://creativecommons.org/licenses/by/3.0/ + +----------------------- + +CC0 1.0 Universal (CC0 1.0) Public Domain Dedication +Iwan Gabovitch +Ottomaani138 +Ogrebane +blukotek +Sevin7 +Yoyodaman234 +Ryding + +No Copyright + +The person who associated a work with this deed has dedicated the work to the +public domain by waiving all of his or her rights to the work worldwide under +copyright law, including all related and neighboring rights, to the extent +allowed by law. + +You can copy, modify, distribute and perform the work, even for commercial +purposes, all without asking permission. See Other Information below. + +Other Information: + +In no way are the patent or trademark rights of any person affected by CC0, nor +are the rights that other persons may have in the work or in how the work is +used, such as publicity or privacy rights. + +Unless expressly stated otherwise, the person who associated a work with this +deed makes no warranties about the work, and disclaims liability for all uses +of the work, to the fullest extent permitted by applicable law. + +When using or citing the work, you should not imply endorsement by the author +or the affirmer. + +For more details: +https://creativecommons.org/publicdomain/zero/1.0/ diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index e0e75cdf..00756210 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -445,7 +445,7 @@ minetest.register_node("default:dirt_with_snow", { groups = {crumbly = 3, spreading_dirt_type = 1, snowy = 1}, drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, + footstep = {name = "default_snow_footstep", gain = 0.2}, }), }) @@ -525,11 +525,7 @@ minetest.register_node("default:snow", { }, }, groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1, snowy = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }), + sounds = default.node_sound_snow_defaults(), on_construct = function(pos) pos.y = pos.y - 1 @@ -543,11 +539,7 @@ minetest.register_node("default:snowblock", { description = "Snow Block", tiles = {"default_snow.png"}, groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }), + sounds = default.node_sound_snow_defaults(), on_construct = function(pos) pos.y = pos.y - 1 diff --git a/mods/default/sounds/default_snow_footstep.1.ogg b/mods/default/sounds/default_snow_footstep.1.ogg index 3260b915..97cc8252 100644 Binary files a/mods/default/sounds/default_snow_footstep.1.ogg and b/mods/default/sounds/default_snow_footstep.1.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.2.ogg b/mods/default/sounds/default_snow_footstep.2.ogg index 4aac1e7f..97a6baa4 100644 Binary files a/mods/default/sounds/default_snow_footstep.2.ogg and b/mods/default/sounds/default_snow_footstep.2.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.3.ogg b/mods/default/sounds/default_snow_footstep.3.ogg index cf4235b7..bde1f21d 100644 Binary files a/mods/default/sounds/default_snow_footstep.3.ogg and b/mods/default/sounds/default_snow_footstep.3.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.4.ogg b/mods/default/sounds/default_snow_footstep.4.ogg new file mode 100644 index 00000000..8ca6a590 Binary files /dev/null and b/mods/default/sounds/default_snow_footstep.4.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.5.ogg b/mods/default/sounds/default_snow_footstep.5.ogg new file mode 100644 index 00000000..220d60c9 Binary files /dev/null and b/mods/default/sounds/default_snow_footstep.5.ogg differ diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index 48254488..2fdd54b0 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -779,9 +779,5 @@ stairs.register_stair_and_slab( {"default_snow.png"}, "Snow Block Stair", "Snow Block Slab", - default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }) + default.node_sound_snow_defaults() )