From 09a73482568afd17845512a2c80e1ef4578fd370 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 12 Jan 2023 00:33:26 +0000 Subject: [PATCH 1/2] Give an option for players to disable the in game music --- mods/PLAYER/mcl_music/init.lua | 26 ++++++++++++++++---------- settingtypes.txt | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/mods/PLAYER/mcl_music/init.lua b/mods/PLAYER/mcl_music/init.lua index 05215059c..64114976d 100644 --- a/mods/PLAYER/mcl_music/init.lua +++ b/mods/PLAYER/mcl_music/init.lua @@ -1,6 +1,8 @@ local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) +local music_disabled = minetest.settings:get_bool("mcl_music_disable", false) + local pianowtune = "diminixed-pianowtune01" local end_tune = "diminixed-ambientwip" local nether_tune = "horizonchris96-traitor" @@ -99,15 +101,19 @@ local function play() minetest.after(7, play) end -minetest.after(15, play) +if not music_disabled then + minetest.log("action", "[mcl_music] Music is activated") + minetest.after(15, play) -minetest.register_on_joinplayer(function(player, last_login) - local player_name = player:get_player_name() - stop_music_for_listener_name(player_name) -end) - -minetest.register_on_respawnplayer(function(player) - local player_name = player:get_player_name() - stop_music_for_listener_name(player_name) -end) + minetest.register_on_joinplayer(function(player, last_login) + local player_name = player:get_player_name() + stop_music_for_listener_name(player_name) + end) + minetest.register_on_respawnplayer(function(player) + local player_name = player:get_player_name() + stop_music_for_listener_name(player_name) + end) +else + minetest.log("action", "[mcl_music] Music is deactivated") +end \ No newline at end of file diff --git a/settingtypes.txt b/settingtypes.txt index 25ac943ea..e7a42b351 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -139,6 +139,9 @@ mcl_mob_active_range (Active mob range) int 48 0 256 # Enable flame sound. flame_sound (Flame sound) bool true +# Disable the in game music. +mcl_music_disable (Disable in game music) bool false + [Graphics] # How many vertical animation frames the fire texture (fire_basic_flame_animated.png) has. # This may vary depending on the texture pack you use. From ce485e89cd5b7dab05f8d4ce86412ae9da1cccc9 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 12 Jan 2023 23:33:39 +0000 Subject: [PATCH 2/2] In game music review feedback fix --- mods/PLAYER/mcl_music/init.lua | 8 ++++---- settingtypes.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/PLAYER/mcl_music/init.lua b/mods/PLAYER/mcl_music/init.lua index 64114976d..07e851f26 100644 --- a/mods/PLAYER/mcl_music/init.lua +++ b/mods/PLAYER/mcl_music/init.lua @@ -1,7 +1,7 @@ local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) -local music_disabled = minetest.settings:get_bool("mcl_music_disable", false) +local music_enabled = minetest.settings:get_bool("mcl_game_music", true) local pianowtune = "diminixed-pianowtune01" local end_tune = "diminixed-ambientwip" @@ -101,8 +101,8 @@ local function play() minetest.after(7, play) end -if not music_disabled then - minetest.log("action", "[mcl_music] Music is activated") +if music_enabled then + minetest.log("action", "[mcl_music] In game music is activated") minetest.after(15, play) minetest.register_on_joinplayer(function(player, last_login) @@ -115,5 +115,5 @@ if not music_disabled then stop_music_for_listener_name(player_name) end) else - minetest.log("action", "[mcl_music] Music is deactivated") + minetest.log("action", "[mcl_music] In game music is deactivated") end \ No newline at end of file diff --git a/settingtypes.txt b/settingtypes.txt index e7a42b351..58fad1dc3 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -139,8 +139,8 @@ mcl_mob_active_range (Active mob range) int 48 0 256 # Enable flame sound. flame_sound (Flame sound) bool true -# Disable the in game music. -mcl_music_disable (Disable in game music) bool false +# Enable the in game music. +mcl_game_music (Enable in game music) bool true [Graphics] # How many vertical animation frames the fire texture (fire_basic_flame_animated.png) has.