From 364a4152ac783cd7ed4b44c223683980fcce7832 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 18 Feb 2020 16:36:22 +0100 Subject: [PATCH] Change fallback armor (un)equip sounds --- mods/ITEMS/mcl_armor/README.txt | 4 ++++ mods/ITEMS/mcl_armor/armor.lua | 2 +- mods/ITEMS/mcl_armor/init.lua | 16 ++++++++++++++++ .../sounds/mcl_armor_equip_generic.ogg | Bin 0 -> 5623 bytes .../sounds/mcl_armor_unequip_generic.ogg | Bin 0 -> 6630 bytes 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg create mode 100644 mods/ITEMS/mcl_armor/sounds/mcl_armor_unequip_generic.ogg diff --git a/mods/ITEMS/mcl_armor/README.txt b/mods/ITEMS/mcl_armor/README.txt index 6e9268c25..5e68b5746 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 d06d5444d..f7c20d0d3 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 42ad8f240..9d4646d99 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 0000000000000000000000000000000000000000..1d3b3de2c78ba8d796f5178313ba273c26209943 GIT binary patch literal 5623 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