diff --git a/games/default/files/default/functions.lua b/games/default/files/default/functions.lua index c6f220516..0554b7f07 100644 --- a/games/default/files/default/functions.lua +++ b/games/default/files/default/functions.lua @@ -132,13 +132,13 @@ end function default.node_wool_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "wool_coat_movement", gain = 0.4} + {name = "default_wool_footstep", gain = 0.4} table.dig = table.dig or - {name = "wool_coat_movement", gain = 0.6} + {name = "default_wool_footstep", gain = 0.6} table.dug = table.dug or - {name = "wool_coat_movement", gain = 0.6} + {name = "default_wool_footstep", gain = 0.6} table.place = table.place or - {name = "default_place_node", gain = 1.0} + {name = "default_wool_footstep", gain = 1.0} return table end diff --git a/games/default/files/default/sounds/wool_coat_movement.ogg b/games/default/files/default/sounds/default_wool_footstep.ogg similarity index 100% rename from games/default/files/default/sounds/wool_coat_movement.ogg rename to games/default/files/default/sounds/default_wool_footstep.ogg diff --git a/games/default/files/hunger/sounds/hunger_eat.1.ogg b/games/default/files/default/sounds/player_eat.1.ogg similarity index 100% rename from games/default/files/hunger/sounds/hunger_eat.1.ogg rename to games/default/files/default/sounds/player_eat.1.ogg diff --git a/games/default/files/hunger/sounds/hunger_eat.2.ogg b/games/default/files/default/sounds/player_eat.2.ogg similarity index 100% rename from games/default/files/hunger/sounds/hunger_eat.2.ogg rename to games/default/files/default/sounds/player_eat.2.ogg diff --git a/games/default/files/hunger/functions.lua b/games/default/files/hunger/functions.lua index 92726b91c..e59c9b434 100644 --- a/games/default/files/hunger/functions.lua +++ b/games/default/files/hunger/functions.lua @@ -171,13 +171,12 @@ end -- food functions local food = hunger.food -function hunger.register_food(name, hunger_change, replace_with_item, poisen, heal, sound) +function hunger.register_food(name, hunger_change, replace_with_item, poisen, heal) food[name] = {} food[name].saturation = hunger_change -- hunger points added food[name].replace = replace_with_item -- what item is given back after eating food[name].poisen = poisen -- time its poisening food[name].healing = heal -- amount of HP - food[name].sound = sound -- special sound that is played when eating end -- Poison player @@ -220,11 +219,11 @@ function hunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing def.saturation = hp_change * 1.3 def.replace = replace_with_item end - local func = hunger.item_eat(def.saturation, def.replace, def.poisen, def.healing, def.sound) + local func = hunger.item_eat(def.saturation, def.replace, def.poisen, def.healing) return func(itemstack, user, pointed_thing) end -function hunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound) +function hunger.item_eat(hunger_change, replace_with_item, poisen, heal) return function(itemstack, user, pointed_thing) if itemstack:take_item() == nil and user == nil then @@ -256,10 +255,6 @@ function hunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound) poisenp(1.0, poisen, 0, user) end - -- eating sound - sound = sound or "hunger_eat" - minetest.sound_play(sound, {to_player = name, gain = 0.5}) - if replace_with_item then if itemstack:is_empty() then itemstack:add_item(replace_with_item)