My patches

master
daret 2020-11-23 23:03:00 +01:00
parent a546e1b46b
commit 3b68660e33
3 changed files with 68 additions and 0 deletions

View File

@ -0,0 +1,40 @@
diff --git a/hud.lua b/hud.lua
index bff0dd4..9635342 100644
--- a/hud.lua
+++ b/hud.lua
@@ -78,4 +78,11 @@ minetest.register_on_joinplayer(function(player)
end)
+minetest.register_on_dieplayer(function(player)
+ if not player then return end
+ if water_life.poison_after_death then return end
+ local meta=player:get_meta()
+ meta:set_int("snakepoison",0)
+ water_life.change_hud(player,"poison",0)
+end)
diff --git a/init.lua b/init.lua
index 0e4fd8a..7c32a0b 100644
--- a/init.lua
+++ b/init.lua
@@ -31,6 +31,7 @@ water_life.moskitolifetime = tonumber(minetest.settings:get("water_life_moskitol
water_life.radar_debug = minetest.settings:get_bool("water_life_radar_debug") or false
water_life.muddy_water = minetest.settings:get_bool("water_life_muddy_water") or false
water_life.repeltime = math.floor (720 / (tonumber(minetest.settings:get("time_speed")) or 72)*60) -- the repellent lasts half a minetest day
+water_life.poison_after_death = minetest.settings:get_bool("water_life_poison_after_death") or false
local path = minetest.get_modpath(minetest.get_current_modname())
diff --git a/settingtypes.txt b/settingtypes.txt
index 24bb049..4eb03f3 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -62,3 +62,7 @@ water_life_muddy_water (muddy water in rainforest and savanna biome) bool false
#-
# turn this value to true to see api function debug
water_life_radar_debug (api function debug shown in chat) bool false
+
+#
+# Turn this Value to true, if you want poison to persist after death
+water_life_poison_after_death (Poison stays after death) bool false

View File

@ -0,0 +1,15 @@
diff --git a/3d_armor/api.lua b/3d_armor/api.lua
index 34f0bc6..854f099 100644
--- a/3d_armor/api.lua
+++ b/3d_armor/api.lua
@@ -355,7 +355,10 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili
local level = damage_groups.level or 0
local groupcaps = tool_capabilities.groupcaps or {}
local uses = 0
+ if #groupcaps > 0 then
damage = false
+ end
+ --damage = false
for group, caps in pairs(groupcaps) do
local maxlevel = caps.maxlevel or 0
local diff = maxlevel - level

View File

@ -0,0 +1,13 @@
diff --git a/init.lua b/init.lua
index 3e5ff0d..18f5150 100644
--- a/init.lua
+++ b/init.lua
@@ -230,7 +230,7 @@ local function sprint_step(player, dtime)
local hunger = 30
if starve == "hbhunger" then
hunger = tonumber(hbhunger.hunger[name])
- elseif starve == "hunger_ng" then
+ elseif starve == "hunger_ng" and minetest.is_yes(minetest.settings:get('enable_damage')) then
hunger = hunger_ng.get_hunger_information(name).hunger.exact
end