Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-23 03:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Adding new Exhale & Tim Unwin tracks!' (#3511) from add_new_tracks into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3511
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
ancientmarinerdev 2023-03-07 16:08:26 +00:00
commit 6e6aa83fd8
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS.md

@ -205,3 +205,4 @@
* Notch and Jeb for being the major forces behind Minecraft * 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/ * 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) * 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)

8
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 flock_of_one = "Jester-Flock-of-One"
local gift = "Jester-Gift" local gift = "Jester-Gift"
local hailing_forest = "Jester-Hailing_Forest" 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 = { local dimension_to_base_track = {
["overworld"] = {pianowtune, flock_of_one, gift, hailing_forest}, ["overworld"] = {pianowtune, flock_of_one, gift, hailing_forest, lonely_blossom},
["nether"] = {nether_tune}, ["nether"] = {nether_tune, valley_of_ghosts},
["end"] = {end_tune}, ["end"] = {end_tune},
["mining"] = {odd_block}, ["mining"] = {odd_block},
} }
@ -58,6 +60,7 @@ local function stop_music_for_listener_name(listener_name)
local handle = listener.handle local handle = listener.handle
if not handle then return end if not handle then return end
minetest.log("action", "[mcl_music] Stopping music")
minetest.sound_stop(handle) minetest.sound_stop(handle)
listeners[listener_name].handle = nil listeners[listener_name].handle = nil
end end
@ -130,7 +133,6 @@ local function play()
--minetest.log("handle: " .. dump (handle)) --minetest.log("handle: " .. dump (handle))
if is_hp_changed or is_dimension_changed or underground_changed if is_hp_changed or is_dimension_changed or underground_changed
or (dimension == "overworld" and (is_weather_changed or not is_good_weather)) then 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) stop_music_for_listener_name(player_name)
if not listeners[player_name] then if not listeners[player_name] then
listeners[player_name] = {} listeners[player_name] = {}

BIN
mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg Normal file

Binary file not shown.

BIN
mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg Normal file

Binary file not shown.