diff --git a/mesecons_gamecompat/compat_mtg.lua b/mesecons_gamecompat/compat_mtg.lua index 24af5e0f..1a63f20a 100644 --- a/mesecons_gamecompat/compat_mtg.lua +++ b/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 diff --git a/mesecons_noteblock/README.txt b/mesecons_noteblock/README.txt index e0ad34ca..14520ab0 100644 --- a/mesecons_noteblock/README.txt +++ b/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/ diff --git a/mesecons_noteblock/doc/noteblock/description.html b/mesecons_noteblock/doc/noteblock/description.html index a98c0f93..0ccb0665 100644 --- a/mesecons_noteblock/doc/noteblock/description.html +++ b/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: - - - - + - + + + + + + + + + + + + + + + + + + + + + + +
Block BelowEffect
Glass or Obsidian GlassHi-hat
Any stoneKick
Chest or Locked ChestSnare
Block belowEffect
Any treeCrash
Any wooden planksLite Crash
Any wooden planksLite crash
Any leavesFlute
Any woolGuitar
Any stoneKick
Any sandSticks (dull)
Sandstone or
Desert Sandstone or
Silver Sandstone		Sticks (reverb)
GravelBass guitar
StrawBanjo
CactusDidgeridoo
Obsidian or
Obsidian Block or
Obsidian Brick		Bass drum
Chest or
Locked Chest		Snare
Glass or
Obsidian Glass		Hi-hat
Vessels ShelfGlass
IceChime
Coral Skeleton or
Bones		Wooden xylophone
Tin BlockMetal xylophone
Copper BlockCowbell
Bronze BlockGong
Gold BlockBell
Diamond BlockSquare wave
Silver Sandstone BrickChorus
Coal BlockExplosion sound (fixed pitch)
Lava SourceFire sound (fixed pitch)
Water Source or
River Water Source		Water bubble sound
Mese LampToy piano
Steel BlockPiano (high pitch, one octave higher than normal)
Any other blockPiano (low pitch)
diff --git a/mesecons_noteblock/init.lua b/mesecons_noteblock/init.lua index 847c40be..01e72736 100644 --- a/mesecons_noteblock/init.lua +++ b/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"] diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_banjo.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_banjo.ogg new file mode 100644 index 00000000..62d93d57 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_banjo.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_bass_drum.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_bass_drum.ogg new file mode 100644 index 00000000..c470537e Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_bass_drum.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_bass_guitar.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_bass_guitar.ogg new file mode 100644 index 00000000..48069d8e Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_bass_guitar.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_bell.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_bell.ogg new file mode 100644 index 00000000..6758e2c7 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_bell.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_bubble.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_bubble.ogg new file mode 100644 index 00000000..7a49c45b Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_bubble.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_chime.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_chime.ogg new file mode 100644 index 00000000..4c131263 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_chime.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_chorus.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_chorus.ogg new file mode 100644 index 00000000..0cad9eb9 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_chorus.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_cowbell.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_cowbell.ogg new file mode 100644 index 00000000..32b4c9fb Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_cowbell.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_didgeridoo.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_didgeridoo.ogg new file mode 100644 index 00000000..221cd844 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_didgeridoo.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_flute.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_flute.ogg new file mode 100644 index 00000000..3a8bbc6a Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_flute.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_glass.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_glass.ogg new file mode 100644 index 00000000..81cd3a03 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_glass.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_gong.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_gong.ogg new file mode 100644 index 00000000..bddda506 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_gong.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_guitar.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_guitar.ogg new file mode 100644 index 00000000..1dcd5b83 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_guitar.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg index 0afa7c07..a77e0554 100644 Binary files a/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg and b/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_hit.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_hit.ogg new file mode 100644 index 00000000..cf8a5bfd Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_hit.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_piano_digital.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_piano_digital.ogg new file mode 100644 index 00000000..6461a700 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_piano_digital.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_splash.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_splash.ogg new file mode 100644 index 00000000..b6fee146 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_splash.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_squarewave.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_squarewave.ogg new file mode 100644 index 00000000..b6bc5c44 Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_squarewave.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_sticks.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_sticks.ogg new file mode 100644 index 00000000..55ccdb3a Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_sticks.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_metal.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_metal.ogg new file mode 100644 index 00000000..2d99327f Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_metal.ogg differ diff --git a/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_wood.ogg b/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_wood.ogg new file mode 100644 index 00000000..5598f62d Binary files /dev/null and b/mesecons_noteblock/sounds/mesecons_noteblock_xylophone_wood.ogg differ