diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/LICENSE.txt b/mods/ITEMS/REDSTONE/mesecons_noteblock/LICENSE.txt new file mode 100644 index 000000000..ec3fc3964 --- /dev/null +++ b/mods/ITEMS/REDSTONE/mesecons_noteblock/LICENSE.txt @@ -0,0 +1,8 @@ +Licensing information + +* All code: GPLv3 by Mesecons Mod Developer Team, contributors and Wuzzy +* mesecons_noteblock_temp_bass_guitar.ogg: CC0 +* mesecons_noteblock_temp_stick.ogg: CC0 +* Other sounds and data: CC BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/) by Mesecons Mod Developer Team and contributors + +Note: All “temp” sounds are subject to be replaced in later versions. diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua b/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua index 76f46e28b..0aac7dbba 100644 --- a/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua @@ -4,8 +4,8 @@ minetest.register_node("mesecons_noteblock:noteblock", { _doc_items_usagehelp = [[Rightclick the note block to choose the next musical note (there are 24 half notes, or 2 octaves). The intrument played depends on the material of the block below the note block: • Glass: Sticks -• Wood: Crash -• Stone: Hi-hat +• Wood: Bass guitar +• Stone: Bass drum • Sand or gravel: Snare drum • Anything else: Piano]], tiles = {"mesecons_noteblock.png"}, @@ -82,17 +82,17 @@ mesecon.noteblock_play = function (pos, param2) local block_below_name = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name if minetest.get_item_group(block_below_name, "material_glass") ~= 0 then - -- TODO: Sticks and clicks - soundname="mesecons_noteblock_kick" + -- TODO: 24 sticks and clicks + soundname="mesecons_noteblock_temp_stick" elseif minetest.get_item_group(block_below_name, "material_wood") ~= 0 then - -- TODO: Bass guitar - soundname="mesecons_noteblock_crash" + -- TODO: 24 bass guitar sounds + soundname="mesecons_noteblock_temp_bass_guitar" elseif minetest.get_item_group(block_below_name, "material_sand") ~= 0 then - -- TODO: 24 Snare drum sounds - soundname="mesecons_noteblock_snare" + -- TODO: 24 snare drum sounds + soundname="mesecons_noteblock_temp_snare" elseif minetest.get_item_group(block_below_name, "material_stone") ~= 0 then - -- TODO: Bass drum - soundname="mesecons_noteblock_hihat" + -- TODO: 24 bass drum sounds + soundname="mesecons_noteblock_temp_kick" end minetest.sound_play(soundname, {pos = pos, gain = 1.0, max_hear_distance = 48,}) diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg deleted file mode 100644 index d33027a79..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg deleted file mode 100644 index d05a8703a..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg deleted file mode 100644 index 21aecfa6e..000000000 Binary files a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg and /dev/null differ diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_bass_guitar.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_bass_guitar.ogg new file mode 100644 index 000000000..38e304903 Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_bass_guitar.ogg differ diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_kick.ogg similarity index 100% rename from mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg rename to mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_kick.ogg diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_snare.ogg similarity index 100% rename from mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg rename to mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_snare.ogg diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_stick.ogg b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_stick.ogg new file mode 100644 index 000000000..5f52a95df Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_noteblock/sounds/mesecons_noteblock_temp_stick.ogg differ