diff --git a/CREDITS.md b/CREDITS.md index 12c6e8465..0bf3849fc 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -204,4 +204,5 @@ * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game * Notch and Jeb for being the major forces behind Minecraft * Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/ -* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0) \ No newline at end of file +* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0) +* Exhale & Tim Unwin for some new wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom (License CC BY-SA 4.0) \ No newline at end of file diff --git a/mods/PLAYER/mcl_music/init.lua b/mods/PLAYER/mcl_music/init.lua index 76a2b0ac4..7bd0cfbbf 100644 --- a/mods/PLAYER/mcl_music/init.lua +++ b/mods/PLAYER/mcl_music/init.lua @@ -10,10 +10,12 @@ local odd_block = "Jester-0dd-BL0ck" local flock_of_one = "Jester-Flock-of-One" local gift = "Jester-Gift" local hailing_forest = "Jester-Hailing_Forest" +local lonely_blossom = "exhale_and_tim_unwin-lonely_blossom" +local valley_of_ghosts = "exhale_and_tim_unwin-valley_of_ghosts" local dimension_to_base_track = { - ["overworld"] = {pianowtune, flock_of_one, gift, hailing_forest}, - ["nether"] = {nether_tune}, + ["overworld"] = {pianowtune, flock_of_one, gift, hailing_forest, lonely_blossom}, + ["nether"] = {nether_tune, valley_of_ghosts}, ["end"] = {end_tune}, ["mining"] = {odd_block}, } @@ -58,6 +60,7 @@ local function stop_music_for_listener_name(listener_name) local handle = listener.handle if not handle then return end + minetest.log("action", "[mcl_music] Stopping music") minetest.sound_stop(handle) listeners[listener_name].handle = nil end @@ -130,7 +133,6 @@ local function play() --minetest.log("handle: " .. dump (handle)) if is_hp_changed or is_dimension_changed or underground_changed or (dimension == "overworld" and (is_weather_changed or not is_good_weather)) then - minetest.log("action", "[mcl_music] Stopping music") stop_music_for_listener_name(player_name) if not listeners[player_name] then listeners[player_name] = {} diff --git a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg new file mode 100644 index 000000000..0b76e57c5 Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg new file mode 100644 index 000000000..180b695e0 Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg differ