diff --git a/mods/ITEMS/mcl_armor/README.txt b/mods/ITEMS/mcl_armor/README.txt index 6e9268c25b..5e68b57464 100644 --- a/mods/ITEMS/mcl_armor/README.txt +++ b/mods/ITEMS/mcl_armor/README.txt @@ -20,6 +20,10 @@ Source: Licensed CC0, by Freesound.org user mtchanary. Source: +* mcl_armor_equip_generic.ogg +* mcl_armor_unequip_generic.ogg +Licensed (CC BY-SA 3.0) by Mito551 + All other sounds licensed CC0 by OpenGameArt.org user artisticdude. Source: diff --git a/mods/ITEMS/mcl_armor/armor.lua b/mods/ITEMS/mcl_armor/armor.lua index d06d5444d6..f7c20d0d38 100644 --- a/mods/ITEMS/mcl_armor/armor.lua +++ b/mods/ITEMS/mcl_armor/armor.lua @@ -232,7 +232,7 @@ armor.play_equip_sound = function(self, player, stack, unequip) local snd = def.sounds and def.sounds["_mcl_armor_"..estr] if not snd then -- Fallback sound - snd = { name = "mcl_armor_"..estr.."_iron" } + snd = { name = "mcl_armor_"..estr.."_generic" } end if snd then minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8}) diff --git a/mods/ITEMS/mcl_armor/init.lua b/mods/ITEMS/mcl_armor/init.lua index 42ad8f2405..9d4646d998 100644 --- a/mods/ITEMS/mcl_armor/init.lua +++ b/mods/ITEMS/mcl_armor/init.lua @@ -41,6 +41,10 @@ minetest.register_tool("mcl_armor:helmet_gold", { inventory_image = "mcl_armor_inv_helmet_gold.png", groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:helmet_diamond",{ @@ -104,6 +108,10 @@ minetest.register_tool("mcl_armor:chestplate_gold", { inventory_image = "mcl_armor_inv_chestplate_gold.png", groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:chestplate_diamond",{ @@ -167,6 +175,10 @@ minetest.register_tool("mcl_armor:leggings_gold", { inventory_image = "mcl_armor_inv_leggings_gold.png", groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:leggings_diamond",{ @@ -229,6 +241,10 @@ minetest.register_tool("mcl_armor:boots_gold", { inventory_image = "mcl_armor_inv_boots_gold.png", groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:boots_diamond",{ diff --git a/mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg b/mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg new file mode 100644 index 0000000000..1d3b3de2c7 Binary files /dev/null and b/mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg differ diff --git a/mods/ITEMS/mcl_armor/sounds/mcl_armor_unequip_generic.ogg b/mods/ITEMS/mcl_armor/sounds/mcl_armor_unequip_generic.ogg new file mode 100644 index 0000000000..c04975d42e Binary files /dev/null and b/mods/ITEMS/mcl_armor/sounds/mcl_armor_unequip_generic.ogg differ