From f7a7990f1ca3861a2e15fb74185f40c7f94d7893 Mon Sep 17 00:00:00 2001 From: teknomunk Date: Sun, 9 Jun 2024 21:09:07 -0500 Subject: [PATCH] Add setting for damage_enabled --- mods/CORE/mcl_damage/init.lua | 8 +++++--- mods/CORE/mcl_damage/mod.conf | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mods/CORE/mcl_damage/init.lua b/mods/CORE/mcl_damage/init.lua index f6058dbaa..3394a779b 100644 --- a/mods/CORE/mcl_damage/init.lua +++ b/mods/CORE/mcl_damage/init.lua @@ -34,7 +34,9 @@ mcl_damage = { } } -local damage_enabled = minetest.settings:get_bool("enabled_damage",true) +local damage_enabled = vl_tuning.setting("damage_enabled", "bool",{ + default = minetest.settings:get_bool("enabled_damage",true) +}) function mcl_damage.register_modifier(func, priority) table.insert(mcl_damage.modifiers, {func = func, priority = priority or 0}) @@ -142,7 +144,7 @@ function mcl_damage.register_type(name, def) end minetest.register_on_player_hpchange(function(player, hp_change, mt_reason) - if not damage_enabled then return 0 end + if not damage_enabled[1] then return 0 end if hp_change < 0 then if player:get_hp() <= 0 then return 0 @@ -153,7 +155,7 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason) end, true) minetest.register_on_player_hpchange(function(player, hp_change, mt_reason) - if not damage_enabled then return 0 end + if not damage_enabled[1] then return 0 end if player:get_hp() > 0 then if hp_change < 0 then mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason)) diff --git a/mods/CORE/mcl_damage/mod.conf b/mods/CORE/mcl_damage/mod.conf index c7d96395e..a28b2b6a5 100644 --- a/mods/CORE/mcl_damage/mod.conf +++ b/mods/CORE/mcl_damage/mod.conf @@ -1,3 +1,4 @@ name = mcl_damage author = Fleckenstein description = Minecraft-like damage reason system +depends = vl_tuning