Merge 1e95abd399 into cffbc33e6d

mesecons_gamecompat/compat_mtg.lua

@@ -14,6 +14,29 @@ minetest.register_alias("mesecons_gamecompat:stone", "default:stone")
 minetest.register_alias("mesecons_gamecompat:steel_ingot", "default:steel_ingot")
 minetest.register_alias("mesecons_gamecompat:steelblock", "default:steelblock")
 minetest.register_alias("mesecons_gamecompat:torch", "default:torch")
+minetest.register_alias("mesecons_gamecompat:water_source", "default:water_source")
+minetest.register_alias("mesecons_gamecompat:river_water_source", "default:river_water_source")
+minetest.register_alias("mesecons_gamecompat:goldblock", "default:goldblock")
+minetest.register_alias("mesecons_gamecompat:copperblock", "default:copperblock")
+minetest.register_alias("mesecons_gamecompat:bronzeblock", "default:bronzeblock")
+minetest.register_alias("mesecons_gamecompat:tinblock", "default:tinblock")
+minetest.register_alias("mesecons_gamecompat:diamondblock", "default:diamondblock")
+minetest.register_alias("mesecons_gamecompat:silver_sandstone_brick", "default:silver_sandstone_brick")
+minetest.register_alias("mesecons_gamecompat:sandstone", "default:sandstone")
+minetest.register_alias("mesecons_gamecompat:silver_sandstone", "default:silver_sandstone")
+minetest.register_alias("mesecons_gamecompat:desert_sandstone", "default:desert_sandstone")
+minetest.register_alias("mesecons_gamecompat:obsidian", "default:obsidian")
+minetest.register_alias("mesecons_gamecompat:obsidian_block", "default:obsidian_block")
+minetest.register_alias("mesecons_gamecompat:obsidianbrick", "default:obsidianbrick")
+minetest.register_alias("mesecons_gamecompat:straw", "farming:straw")
+minetest.register_alias("mesecons_gamecompat:meselamp", "default:meselamp")
+minetest.register_alias("mesecons_gamecompat:coral_skeleton", "default:coral_skeleton")
+minetest.register_alias("mesecons_gamecompat:bones", "bones:bones")
+minetest.register_alias("mesecons_gamecompat:cactus", "default:cactus")
+minetest.register_alias("mesecons_gamecompat:gravel", "default:gravel")
+minetest.register_alias("mesecons_gamecompat:ice", "default:ice")
+minetest.register_alias("mesecons_gamecompat:cave_ice", "default:cave_ice")
+minetest.register_alias("mesecons_gamecompat:vessels_shelf", "vessels:shelf")
 
 if minetest.get_modpath("dye") then
 	for _, color in ipairs(mesecon.dye_colors) do

mesecons_noteblock/README.txt

@@ -2,8 +2,68 @@ Credits of sound files:
 
 Note: Most sounds have not been used verbatim, but tweaked a little to be more suitable for the noteblock mod.
 
+### Sounds licensed CC0:
+
+* mesecons_noteblock_chorus.ogg
+	* by freesound.org user random_intruder
+	* Source: https://freesound.org/people/random_intruder/sounds/392172/
+* mesecons_noteblock_banjo.ogg
+	* by freesound.org user AmateurJ
+	* Source: https://freesound.org/people/AmateurJ/sounds/399523/
+* mesecons_noteblock_bass_drum.ogg
+	* by freesound.org user Mattc90
+	* Source: https://freesound.org/people/Mattc90/sounds/264285/
+* mesecons_noteblock_bell.ogg
+	* by opengameart.org user Brandon75689
+	* Source: https://opengameart.org/content/point-bell
+* mesecons_noteblock_chime.ogg
+	* by freesound.org user
+	* Source: https://freesound.org/people/ikonochris/sounds/213380/
+* mesecons_noteblock_cowbell.ogg
+	* by freesound.org user timgormly
+	* Source: https://freesound.org/people/timgormly/sounds/159760/
+* mesecons_noteblock_flute.ogg
+	* by freesound.org user menegass
+	* Source: https://freesound.org/people/menegass/sounds/107307/
+* mesecons_noteblock_glass.ogg
+	* by freesound.org user rubberduck
+	* Source: https://opengameart.org/content/100-cc0-sfx
+* mesecons_noteblock_gong.ogg
+	* by opengameart.org user rubberduck
+	* Source: https://opengameart.org/content/100-cc0-sfx
+* mesecons_noteblock_bass_guitar.ogg
+	* by freesound.org user Vres
+	* Source: https://freesound.org/people/Vres/sounds/133024/
+* mesecons_noteblock_hit.ogg
+	* by freesound.org user rubberduck
+	* Source: https://opengameart.org/content/100-cc0-sfx
+* mesecons_noteblock_piano_digital.ogg
+	* by freesound.org user monotraum
+	* Source: https://freesound.org/people/monotraum/sounds/208889/
+* mesecons_noteblock_bubble.ogg
+	* by freesound.org user rubberduck
+	* Source: https://opengameart.org/content/40-cc0-water-splash-slime-sfx
+* mesecons_noteblock_sticks.ogg
+	* by freesound.org user rubberduck
+	* Source: https://opengameart.org/content/100-cc0-sfx
+* mesecons_noteblock_squarewave.ogg
+	* by Wuzzy
+* mesecons_noteblock_xylophone_metal.ogg
+	* by freesound.org user JappeHallunken
+	* Source: https://freesound.org/people/JappeHallunken/sounds/501300/
+* mesecons_noteblock_xylophone_wood.ogg
+	* by freesound.org user connersaw8
+	* Source: https://freesound.org/people/connersaw8/sounds/125271/
+
+### Sounds licensed CC BY 3.0:
+
+* mesecons_noteblock_bass_guitar.ogg
+	* by freesound.org user Kyster
+	* Source: https://freesound.org/people/Kyster/sounds/117707/
+* mesecons_noteblock_didgeridoo.ogg
+	* by freesound.org user InspectorJ
+	* Source: https://freesound.org/people/InspectorJ/sounds/398272/
 * mesecons_noteblock_litecrash.ogg
-	* License: CC BY 3.0
 	* by freesound.org user ani_music
 	* Source: https://freesound.org/people/ani_music/sounds/219612/
 
@@ -12,4 +72,5 @@ Created by Mesecons authors, licensed CC BY 3.0.
 
 --------------------
 License links:
+* CC0: http://creativecommons.org/publicdomain/zero/1.0/
 * CC BY 3.0: http://creativecommons.org/licenses/by/3.0/

mesecons_noteblock/doc/noteblock/description.html

@@ -1,13 +1,32 @@
-This effector makes a sound if powered and can be used for making music. Normally it makes piano sounds. The sound frequency can be changed by punching the block (only works for piano). There are some special sounds that depend on the block below:
+This effector makes a sound if powered and can be used for making music. Normally it makes piano sounds. The sound frequency can be changed by punching the block. There are some special sounds that depend on the block below:
 <table colspace="5">
-<tr><th>Block Below</th><th>Effect</th></tr>
-<tr><td>Glass or Obsidian Glass</td><td>Hi-hat</td></tr>
-<tr><td>Any stone</td><td>Kick</td></tr>
-<tr><td>Chest or Locked Chest</td><td>Snare</td></tr>
+<tr><th>Block below</th><th>Effect</th></tr>
 <tr><td>Any tree</td><td>Crash</td></tr>
-<tr><td>Any wooden planks</td><td>Lite Crash</td></tr>
+<tr><td>Any wooden planks</td><td>Lite crash</td></tr>
+<tr><td>Any leaves</td><td>Flute</td></tr>
+<tr><td>Any wool</td><td>Guitar</td></tr>
+<tr><td>Any stone</td><td>Kick</td></tr>
+<tr><td>Any sand</td><td>Sticks (dull)</td></tr>
+<tr><td>Sandstone or<br />Desert Sandstone or <br />Silver Sandstone</td><td>Sticks (reverb)</td></tr>
+<tr><td>Gravel</td><td>Bass guitar</td></tr>
+<tr><td>Straw</td><td>Banjo</td></tr>
+<tr><td>Cactus</td><td>Didgeridoo</td></tr>
+<tr><td>Obsidian or<br />Obsidian Block or<br />Obsidian Brick</td><td>Bass drum</td></tr>
+<tr><td>Chest or<br />Locked Chest</td><td>Snare</td></tr>
+<tr><td>Glass or<br />Obsidian Glass</td><td>Hi-hat</td></tr>
+<tr><td>Vessels Shelf</td><td>Glass</td></tr>
+<tr><td>Ice</td><td>Chime</td></tr>
+<tr><td>Coral Skeleton or<br />Bones</td><td>Wooden xylophone</td></tr>
+<tr><td>Tin Block</td><td>Metal xylophone</td></tr>
+<tr><td>Copper Block</td><td>Cowbell</td></tr>
+<tr><td>Bronze Block</td><td>Gong</td></tr>
+<tr><td>Gold Block</td><td>Bell</td></tr>
+<tr><td>Diamond Block</td><td>Square wave</td></tr>
+<tr><td>Silver Sandstone Brick</td><td>Chorus</td></tr>
 <tr><td>Coal Block</td><td>Explosion sound (fixed pitch)</td></tr>
 <tr><td>Lava Source</td><td>Fire sound (fixed pitch)</td></tr>
+<tr><td>Water Source or <br />River Water Source</td><td>Water bubble sound</td></tr>
+<tr><td>Mese Lamp</td><td>Toy piano</td></tr>
 <tr><td>Steel Block</td><td>Piano (high pitch, one octave higher than normal)</td></tr>
 <tr><td>Any other block</td><td>Piano (low pitch)</td></tr>
 </table>

mesecons_noteblock/init.lua

@@ -52,11 +52,34 @@ local soundnames = {
 local node_sounds = {}
 for alias, sound in pairs({
 	["mesecons_gamecompat:lava_source"] = mesecon.sound_name.fire,
+	["mesecons_gamecompat:water_source"] = "mesecons_noteblock_bubble",
+	["mesecons_gamecompat:river_water_source"] = "mesecons_noteblock_bubble",
 	["mesecons_gamecompat:chest"] = "mesecons_noteblock_snare",
 	["mesecons_gamecompat:chest_locked"] = "mesecons_noteblock_snare",
 	["mesecons_gamecompat:coalblock"] = mesecon.sound_name.explode,
+	["mesecons_gamecompat:goldblock"] = "mesecons_noteblock_bell",
+	["mesecons_gamecompat:copperblock"] = "mesecons_noteblock_cowbell",
+	["mesecons_gamecompat:bronzeblock"] = "mesecons_noteblock_gong",
+	["mesecons_gamecompat:tinblock"] = "mesecons_noteblock_xylophone_metal",
+	["mesecons_gamecompat:diamondblock"] = "mesecons_noteblock_squarewave",
+	["mesecons_gamecompat:silver_sandstone_brick"] = "mesecons_noteblock_chorus",
+	["mesecons_gamecompat:sandstone"] = "mesecons_noteblock_sticks",
+	["mesecons_gamecompat:silver_sandstone"] = "mesecons_noteblock_sticks",
+	["mesecons_gamecompat:desert_sandstone"] = "mesecons_noteblock_sticks",
 	["mesecons_gamecompat:glass"] = "mesecons_noteblock_hihat",
 	["mesecons_gamecompat:obsidian_glass"] = "mesecons_noteblock_hihat",
+	["mesecons_gamecompat:obsidian"] = "mesecons_noteblock_bass_drum",
+	["mesecons_gamecompat:obsidian_block"] = "mesecons_noteblock_bass_drum",
+	["mesecons_gamecompat:obsidianbrick"] = "mesecons_noteblock_bass_drum",
+	["mesecons_gamecompat:straw"] = "mesecons_noteblock_banjo",
+	["mesecons_gamecompat:meselamp"] = "mesecons_noteblock_piano_digital",
+	["mesecons_gamecompat:coral_skeleton"] = "mesecons_noteblock_xylophone_wood",
+	["mesecons_gamecompat:bones"] = "mesecons_noteblock_xylophone_wood",
+	["mesecons_gamecompat:cactus"] = "mesecons_noteblock_didgeridoo",
+	["mesecons_gamecompat:gravel"] = "mesecons_noteblock_bass_guitar",
+	["mesecons_gamecompat:ice"] = "mesecons_noteblock_chime",
+	["mesecons_gamecompat:cave_ice"] = "mesecons_noteblock_chime",
+	["mesecons_gamecompat:vessels_shelf"] = "mesecons_noteblock_glass",
 }) do
 	local nodename = minetest.registered_aliases[alias]
 	if nodename then
@@ -68,6 +91,9 @@ local node_sounds_group = {
 	["stone"] = "mesecons_noteblock_kick",
 	["tree"] = "mesecons_noteblock_crash",
 	["wood"] = "mesecons_noteblock_litecrash",
+	["sand"] = "mesecons_noteblock_hit",
+	["wool"] = "mesecons_noteblock_guitar",
+	["leaves"] = "mesecons_noteblock_flute",
 }
 
 local steelblock_nodename = minetest.registered_aliases["mesecons_gamecompat:steelblock"]