add dependency on mod thirsty

master
A. Demant 2018-09-06 06:21:11 +02:00
parent e615c1cfa6
commit 7dbae77cd4
2 changed files with 21 additions and 3 deletions

View File

@ -1,3 +1,4 @@
default default
chat2? chat2?
stamina? stamina?
thirsty?

View File

@ -28,6 +28,12 @@ dofile(minetest.get_modpath("death_messages").."/settings.txt")
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
local LANG = minetest.settings:get("language") local LANG = minetest.settings:get("language")
if not (LANG and (LANG ~= "")) then LANG = "en" end if not (LANG and (LANG ~= "")) then LANG = "en" end
-- check if stamina is used and death may occured by exhausting
local mstamina = minetest.get_modpath("stamina")
local lstamina = 100
-- check if thirsty is used and death may occured by exhausting
local mthirsty = minetest.get_modpath("thirsty")
local lthirsty = 100
-- A table of quips for death messages. The first item in each sub table is the -- A table of quips for death messages. The first item in each sub table is the
-- default message used when RANDOM_MESSAGES is disabled. -- default message used when RANDOM_MESSAGES is disabled.
@ -135,6 +141,13 @@ messages.exhausted = {en = {
de = { de = {
" war erschöpft." " war erschöpft."
}} }}
-- thirst
messages.thirst = {en = {
" was too thirsty."
},
de = {
" verdurstete."
}}
-- PVP Messages -- PVP Messages
messages.pvp = {en = { messages.pvp = {en = {
@ -252,12 +265,12 @@ minetest.register_on_dieplayer(function(player,reason)
player_name = "You" player_name = "You"
end end
-- check if stamina is used and death may occured by exhausting
local mstamina = minetest.get_modpath("stamina")
local lstamina = 100
if mstamina ~= nil then if mstamina ~= nil then
lstamina = get_int_attribute(player, "stamina:level") lstamina = get_int_attribute(player, "stamina:level")
end end
if mthirsty ~= nil then
lthirsty = thirsty.get_thirst_factor(player)
end
-- Death by lava -- Death by lava
if node.name == "default:lava_source" then if node.name == "default:lava_source" then
@ -302,6 +315,10 @@ minetest.register_on_dieplayer(function(player,reason)
minetest.chat_send_all( minetest.chat_send_all(
string.char(0x1b).."(c@#00CED1)"..player_name .. string.char(0x1b).."(c@#00CED1)"..player_name ..
string.char(0x1b).."(c@#ff0000)"..get_message("exhausted")) string.char(0x1b).."(c@#ff0000)"..get_message("exhausted"))
elseif lthirsty <= 1 then
minetest.chat_send_all(
string.char(0x1b).."(c@#00CED1)"..player_name ..
string.char(0x1b).."(c@#ff0000)"..get_message("thirst"))
-- Death by something else -- Death by something else
else else
minetest.chat_send_all( minetest.chat_send_all(