Merge remote-tracking branch 'upstream/master'

add support for groups lava and water

README.txt

@@ -1,3 +1,13 @@
+As of 2024-08-17, this mod will probably not be updated by me as I lost interest
+in Minetest a long time ago and probably will not be coming back.
+
+If you do want to make any changes, here was my list of TODO items that I never got around to:
+- Update meta stuff (readme, version, mod.conf, etc.)
+- Change settings file to not use do_file and add options for custom messages (with placement of player name(s) anywhere in the message)
+- Add some kind of translation support (may be covered by custom messages)
+- Use the new API features to poperly detect types of death that weren't feasible before
+- Make a small API for registering custom messages for other mods (see dying by corium in technic)
+
   ____             _   _       __  __
  |  _ \  ___  __ _| |_| |__   |  \/  | ___  ___ ___  __ _  __ _  ___  ___
  | | | |/ _ \/ _` | __| '_ \  | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|

init.lua

@@ -42,6 +42,9 @@ local sounds   = {
 -- Translation wrapper
 local S = minetest.get_translator(mname)
 
+-- To translate server-side in server language for irc
+local lang = minetest.settings:get("language") or "fr"
+
 -- Lava death messages
 messages.lava = {
 	"@1 thought lava was cool.",
@@ -61,10 +64,10 @@ messages.water = {
 	"@1 ran out of air.",
 	"@1 tried to impersonate an anchor.",
 	"@1 forgot (s)he was not a fish.",
-	"@1 forgot they needed to breath underwater.",
+	"@1 forgot (s)he needed to breath underwater.",
 	"@1 isn't good at swimming.",
 	"@1 looked for the secret of the Unicorn.",
-	"@1 forgot their scaphander.",
+	"@1 forgot his/her scaphander.",
 	"@1 failed at swimming lessons.",
 	"@1 blew one too many bubbles.",
 }
@@ -110,7 +113,7 @@ messages.other = {
 	"@1 died.",
 	"@1 left this world.",
 	"@1 reached miner's heaven.",
-	"@1 lost him/her life.",
+	"@1 lost his/her life.",
 	"@1 saw the light.",
 	"@1 fell from a bit too high.",
 	"@1 slipped on a banana skin.",
@@ -141,7 +144,7 @@ messages.whacking = {
 
 messages.monsters_whacking = {
 	"@1 got whacked by a @2.",
-	"Darwin said : @1 was less adapted than a @2.",
+	"Darwin said: @1 was less adapted than a @2.",
 	"@1 was transformed into a doormat by a @2.",
 	"@1 thought (s)he was stronger than a @2.",
 	"@1 got kicked up by a @2. Next up...",
@@ -208,7 +211,8 @@ local function broadcast_death(msg)
 	logfilep:write(os.date("[%Y-%m-%d %H:%M:%S] ") .. msg .. "\n")
 	logfilep:close()
 	if irc then
-		irc.say(msg)
+		local tr_msg = minetest.get_translated_string(lang, msg)
+		irc.say(tr_msg)
 	end
 end
 

locale/death_messages.fr.tr

@@ -21,7 +21,7 @@ You=Tu
 @1 forgot (s)he needed to breath underwater.=@1 a oublié qu'il lui fallait respirer sous l'eau.
 @1 isn't good at swimming.=@1 n'est pas bon(ne) en natation.
 @1 looked for the secret of the Unicorn.=@1 a cherché le secret de la licorne.
-@1 forgot their scaphander.=@1 a oublié son scaphandre.
+@1 forgot his/her scaphander.=@1 a oublié son scaphandre.
 @1 failed at swimming lessons.=@1 a raté ses cours de natation.
 @1 blew one too many bubbles.=@1 a expiré une bulle de trop.
 

locale/template.txt

@@ -21,7 +21,7 @@ You=
 @1 forgot (s)he needed to breath underwater.=
 @1 isn't good at swimming.=
 @1 looked for the secret of the Unicorn.=
-@1 forgot their scaphander.=
+@1 forgot his/her scaphander.=
 @1 failed at swimming lessons.=
 @1 blew one too many bubbles.=