From bbe48576ad1b257adaa3111e80b8050240efa63b Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 18 Apr 2023 05:40:35 +0200 Subject: [PATCH] Move hand swing sound back to rp_default --- mods/rp_default/README.txt | 4 ++++ .../sounds/rp_default_swing_hand_air.1.ogg} | Bin .../sounds/rp_default_swing_hand_air.2.ogg} | Bin .../sounds/rp_default_swing_hand_air.3.ogg} | Bin mods/rp_default/tools.lua | 2 +- mods/rp_itemdef_defaults/README.md | 6 ------ mods/rp_itemdef_defaults/init.lua | 11 ----------- 7 files changed, 5 insertions(+), 18 deletions(-) rename mods/{rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.1.ogg => rp_default/sounds/rp_default_swing_hand_air.1.ogg} (100%) rename mods/{rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.2.ogg => rp_default/sounds/rp_default_swing_hand_air.2.ogg} (100%) rename mods/{rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.3.ogg => rp_default/sounds/rp_default_swing_hand_air.3.ogg} (100%) diff --git a/mods/rp_default/README.txt b/mods/rp_default/README.txt index c9a41cbb..54ba9698 100644 --- a/mods/rp_default/README.txt +++ b/mods/rp_default/README.txt @@ -82,6 +82,10 @@ File credits and individual file licenses: * Derived by Wuzzy from sound by ZHRØ * Source: * License: CC0 + * `rp_default_swing_hand_air.*.ogg` + * Derived by Wuzzy from sound by sifujordan + * Source: + * License: CC0 * rp_default_footstep_cactus.*.ogg * rp_default_dig_cactus.*.ogg diff --git a/mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.1.ogg b/mods/rp_default/sounds/rp_default_swing_hand_air.1.ogg similarity index 100% rename from mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.1.ogg rename to mods/rp_default/sounds/rp_default_swing_hand_air.1.ogg diff --git a/mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.2.ogg b/mods/rp_default/sounds/rp_default_swing_hand_air.2.ogg similarity index 100% rename from mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.2.ogg rename to mods/rp_default/sounds/rp_default_swing_hand_air.2.ogg diff --git a/mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.3.ogg b/mods/rp_default/sounds/rp_default_swing_hand_air.3.ogg similarity index 100% rename from mods/rp_itemdef_defaults/sounds/rp_itemdef_defaults_swing_air.3.ogg rename to mods/rp_default/sounds/rp_default_swing_hand_air.3.ogg diff --git a/mods/rp_default/tools.lua b/mods/rp_default/tools.lua index 560833bc..67b0a3fb 100644 --- a/mods/rp_default/tools.lua +++ b/mods/rp_default/tools.lua @@ -20,7 +20,7 @@ local sound_tool_swing_air = { punch_use_air = { name = "rp_default_swing_tool_air", gain = 0.5 }, } local sound_hand = { - punch_use_air = { name = "rp_itemdef_defaults_swing_air", gain = 0.1 }, + punch_use_air = { name = "rp_default_swing_hand_air", gain = 0.1 }, } local creative_digtable = { diff --git a/mods/rp_itemdef_defaults/README.md b/mods/rp_itemdef_defaults/README.md index a5ec1cd4..c3672d55 100644 --- a/mods/rp_itemdef_defaults/README.md +++ b/mods/rp_itemdef_defaults/README.md @@ -10,9 +10,3 @@ mod that adds any item (exception: hand). Mod written by Wuzzy. Licensed under CC0. -Sounds: - -* `rp_default_swing_hand_air.*.ogg` - * Derived by Wuzzy from sound by sifujordan - * Source: - * License: CC0 diff --git a/mods/rp_itemdef_defaults/init.lua b/mods/rp_itemdef_defaults/init.lua index b22584c5..ef39c064 100644 --- a/mods/rp_itemdef_defaults/init.lua +++ b/mods/rp_itemdef_defaults/init.lua @@ -1,14 +1,3 @@ -- Set default stack sizes minetest.nodedef_default.stack_max = 60 minetest.craftitemdef_default.stack_max = 60 - --- Set default item swing sound (when punching air) --- NOTE: To disable this for a particular item, set the `sound` --- table explicitly for the item. -minetest.craftitemdef_default.sound = { - punch_use_air = { name = "rp_itemdef_defaults_swing_air", gain = 0.1 }, -} -minetest.tooldef_default.sound = minetest.craftitemdef_default.sound -minetest.nodedef_default.sound = minetest.craftitemdef_default.sound - -