Ajoute de nouveaux messages et support de mobs + corrections

- Avec correction la personnalisation du mod pour le serveur NALC.

LICENSE.txt

@@ -1,9 +1,3 @@
-
-
-    Home / Licenses
-
-GPL v3
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -678,35 +672,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-Copy license text to clipboard
-How to apply this license
-
-Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
-
-Note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.
-Source
-Required
-
-    Disclose Source
-    License and copyright notice
-    State Changes
-
-Permitted
-
-    Commercial Use
-    Distribution
-    Modification
-    Patent Grant
-    Private Use
-
-Forbidden
-
-    Hold Liable
-    Sublicensing
-
-About Terms of Service
-
-If you have questions or issues, it is always best to consult a legal professional.
-This site is licensed under the Creative Commons Attribution 3.0 Unported License.
-Demystified with <3 by GitHub, Inc.

README.md

@@ -1,12 +0,0 @@
-Death Messages        
-==============
-
-A Minetest mod which sends a chat message when a player dies.
-
-Version: 0.1.2 beta
-
-License of source code: 
-GPL v3
-
-See LICENSE.txt for full legal text
-

README.txt

@@ -0,0 +1,17 @@
+  ____             _   _       __  __
+ |  _ \  ___  __ _| |_| |__   |  \/  | ___  ___ ___  __ _  __ _  ___  ___
+ | | | |/ _ \/ _` | __| '_ \  | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|
+ | |_| |  __/ (_| | |_| | | | | |  | |  __/\__ \__ \ (_| | (_| |  __/\__ \
+ |____/ \___|\__,_|\__|_| |_| |_|  |_|\___||___/___/\__,_|\__, |\___||___/
+                                                          |___/
+
+A Minetest mod which sends a chat message when a player dies.
+
+Version: 0.1.3
+License: GPL v3 (see LICENSE.txt)
+
+Dependencies:
+none
+
+Please report bugs at the github issue tracker:
+https://github.com/4Evergreen4/death_messages/issues/

description.txt

@@ -0,0 +1 @@
+A Minetest mod which sends a chat message when a player dies.

init.lua

@@ -1,12 +1,31 @@
+--[[
+death_messages - A Minetest mod which sends a chat message when a player dies.
+Copyright (C) 2016  EvergreenTree
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--]]
+
 -----------------------------------------------------------------------------------------------
-local title	= "Death Messages"
+local title = "Death Messages"
 local version = "0.1.2"
-local mname	= "death_messages"
+local mname = "death_messages"
 -----------------------------------------------------------------------------------------------
 dofile(minetest.get_modpath("death_messages").."/settings.txt")
 -----------------------------------------------------------------------------------------------
 
--- A table of quips for death messages
+-- A table of quips for death messages.  The first item in each sub table is the
+-- default message used when RANDOM_MESSAGES is disabled.
 local messages = {}
 
 -- Another one to avoid double death messages
@@ -22,11 +41,11 @@ local sounds   = {
 
 -- Lava death messages
 messages.lava = {
-	"%s thought lava was cool. / %s pensait que la lave etait cool.",
+	"%s thought lava was cool. / %s pensait que la lave était cool.",
-	"%s felt an urgent need to touch lava. / %s s'est senti oblige de toucher la lave.",
+	"%s felt an urgent need to touch lava. / %s s'est senti obligé de toucher la lave.",
-	"%s fell in lava. / %s  est tombe dans la lave.",
+	"%s fell in lava. / %s  est tombé dans la lave.",
 	"%s died in lava. / %s  est mort(e) dans de la lave.",
-	"%s didn't know lava was very hot. / %s ne savait pas que la lave etait vraiment chaude.",
+	"%s didn't know lava was very hot. / %s ne savait pas que la lave était vraiment chaude.",
 	"%s destroyed Sauron's ring. / %s a detruit l'anneau de Sauron.",
 	"%s melted into a ball of fire. / %s est devenu une boule de feu",
 	"%s couldn't resist that warm glow of lava. / %s n'a pas pu se retenir face a cette chaude lueur de lave.",
@@ -35,43 +54,43 @@ messages.lava = {
 
 -- Drowning death messages
 messages.water = {
-	"%s lacked oxygen. / %s a manque d'air.",
+	"%s lacked oxygen. / %s a manqué d'air.",
 	"%s ran out of air. / %s n'avait plus d'air.",
-	"%s tried to impersonate an anchor. / %s a essaye d'usurper l'identite d'une ancre.",
+	"%s tried to impersonate an anchor. / %s a essayé d'usurper l'identité d'une ancre.",
-	"%s forgot they were not a fish. / %s a oublie qu'il/elle n'etait pas un poisson.",
+	"%s forgot they were not a fish. / %s a oublié qu'il/elle n'était pas un poisson.",
-	"%s forgot they needed to breath underwater. / %s a oublie qu'il lui fallait respirer sous l'eau.",
+	"%s forgot they needed to breath underwater. / %s a oublié qu'il lui fallait respirer sous l'eau.",
 	"%s isn't good at swimming. / %s n'est pas bon(ne) en natation.",
-	"%s looked for the secret of the Unicorn. / %s a cherche le secret de la licorne.",
+	"%s looked for the secret of the Unicorn. / %s a cherché le secret de la licorne.",
-	"%s forgot their scaphander. / %s a oublie son scaphandre.",
+	"%s forgot their scaphander. / %s a oublié son scaphandre.",
-	"%s failed at swimming lessons. / %s a rate ses cours de natation.",
+	"%s failed at swimming lessons. / %s a raté ses cours de natation.",
 	"%s blew one too many bubbles. / %s a expiré une bulle de trop.",
 }
 
 -- Burning death messages
 messages.fire = {
 	"%s was a bit too hot. / %s a eu un peu trop chaud.",
-	"%s was too close to the fire. / %s a ete trop pres du feu.",
+	"%s was too close to the fire. / %s a été trop près du feu.",
 	"%s just got roasted. / %s vient de se faire rotir.",
-	"%s got burnt. / %s a ete carbonise.",
+	"%s got burnt. / %s a été carbonisé.",
 	"%s thought they were the human torch. / %s s'est prit pour la torche.",
-	"%s started a fire. / %s a allume le feu.",
+	"%s started a fire. / %s a allumé le feu.",
 	"%s burned to a crisp. / %s a brulé comme une chips.",
 	"%s got a little too warm. / %s a eu un peu trop chaud.",
-	"%s got too close to the camp fire. / %s s'est approche(e) trop pres du feu de camp.",
+	"%s got too close to the camp fire. / %s s'est approché(e) trop près du feu de camp.",
-	"%s just got roasted, hotdog style. / %s vient de se faire rotir facon hotdog.",
+	"%s just got roasted, hotdog style. / %s vient de se faire rôtir façon hotdog.",
-	"%s was set aflame. More light that way. / %s s'est embrase(e). Ca fait plus de lumiere.",
+	"%s was set aflame. More light that way. / %s s'est embrasé(e). Ça fait plus de lumière.",
 }
 
 -- Acid death messages
 messages.acid = {
 	"%s has now parts of them missing. / %s a desormais des parties en moins.",
 	"%s discovered that acid is fun. / %s a decouvert que l'acide, c'est fun.",
-	"%s put their head where it melted. / %s a mis sa tete la ou elle a fondu.",
+	"%s put their head where it melted. / %s a mis sa tête là ou elle a fondu.",
 	"%s discovered that their body in acid, it's like sugar in water. / %s a decouvert que son corps dans l'acide, c'est comme du sucre dans de l'eau.",
 	"%s thought they were swimming in apple juice. / %s a cru qu'il/elle se baignait dans du jus de pomme.",
-	"%s gave their body to make an infusion / %s a donne son corps pour faire une infusion.",
+	"%s gave their body to make an infusion / %s a donné son corps pour faire une infusion.",
 	"%s drowned into the wrong liquid. / %s a bu la mauvaise tasse.",
-	"%s tried to test their body's solubility in acid. / %s a voulu tester la solubilite de son corps dans l'acide."
+	"%s tried to test their body's solubility in acid. / %s a voulu tester la solubilité de son corps dans l'acide."
 }
 
 -- Quicksands death messages
@@ -84,72 +103,98 @@ messages.sand = {
 
 -- Other death messages
 messages.other = {
-	"%s did something fatal to them. / %s a fait quelque chose qui lui a ete fatal.",
+	"%s did something fatal to them. / %s a fait quelque chose qui lui a été fatal.",
 	"%s died. / %s est mort(e).",
 	"%s left this world. / %s n'est plus de ce monde.",
 	"%s reached miner's heaven. / %s a rejoint le paradis des mineurs.",
 	"%s lost their life. / %s a perdu la vie.",
-	"%s saw the light. / %s a vu la lumiere.",
+	"%s saw the light. / %s a vu la lumière.",
-	"%s fell from a bit too high. / %s est tombe d'un peu trop haut.",
+	"%s fell from a bit too high. / %s est tombé(e) d'un peu trop haut.",
-	"%s slipped on a banana skin. / %s a glisse sur une peau de banane.",
+	"%s slipped on a banana skin. / %s a glissé sur une peau de banane.",
 	"%s wanted to test their super powers. / %s a voulu tester ses super pouvoirs.",
-	"%s gave up on life. / %s a decide de mourir.",
+	"%s gave up on life. / %s a decidé de mourir.",
 	"%s is somewhat dead now. / %s est plus ou moins mort(e) maintenant.",
 	"%s passed out -permanently. / %s s'est evanoui(e) -pour toujours.",
+	"%s died under very mysterious conditions. / %s est mort(e) dans des conditions bien mystérieuses.",
 }
 
 -- Whacking death messages
 messages.whacking = {
-	"%s got whacked by %s. / %s s'est pris une raclee de la part de %s.",
+	"%s got whacked by %s. / %s s'est pris une raclée de la part de %s.",
-	"%s's grave was dug by %s. / La tombe de %s a ete creusee par %s.",
+	"%s's grave was dug by %s. / La tombe de %s a été creusée par %s.",
 	"%s got recycled by %s. / %s s'est fait recycler par %s.",
-	"%s surely annoyed %s. / %s embetait surement %s."
+	"%s surely annoyed %s. / %s embetait sûrement %s.",
+	"%s can't have any more offspring because of %s. / %s ne pourra plus avoir de descendance à cause de %s.",
+	"%s got beaten up by %s. / %s s'est fait rosser par %s.",
+	"%s had his suffering cut short by %s. / %s s'est vu abréger ses souffrances par %s.",
+	"%s died in excruciating pain because of %s's fault. / %s est mort(e) dans d'atroces souffrances par la faute de %s.",
+	"%s spent his last moments in the company of %s. / %s a vécu ses derniers instants en compagnie de %s.",
+	"%s's lineage was extinguished by %s. / La lignée de %s s'est éteinte à cause de %s.",
+	"%s wasn't as strong as %s. / %s a été moins fort(e) que %s.",
 	-- Need to fill
 }
 
 messages.monsters_whacking = {
-	"%s got whacked by a %s. / %s s'est pris une raclee de la part d'un %s.",
+	"%s got whacked by a %s. / %s s'est pris une raclée de la part d'un %s.",
-	"Darwin said : %s was less adapted than a %s. / Darwin a dit : %s etait moins adapte qu'un %s.",
+	"Darwin said : %s was less adapted than a %s. / Darwin a dit : %s était moins adapté qu'un %s.",
 	"%s was transformed into a doormat by a %s. / %s s'est fait transformer en paillasson par un %s.",
+	"%s thought (s)he was stronger than a %s. / %s s'est cru plus fort(e) qu'un %s.",
+	"%s got kicked up by a %s. Next up... / %s s'est fait dégager par un %s. Au suivant...",
+	"%s felt well that he/she could not do anything against a %s. / %s sentait bien qu'il/elle ne pouvait pas faire le poids contre un %s.",
+	"%s versus %s? It's going bad! / %s contre un %s ? Ça tourne mal !",
+	"%s got a memorable spanking from %s. / %s a reçu une fessé mémorable de la part d'un %s.",
+	"%s thought to be able to tame a %s? History shows he was wrong. / %s croyait pouvoir dompter un %s ? L'histoire montre qu'il a eu tort.",
+	"%s didn't have the right reflex in front of a %s. / %s n'a pas eu le bon réflexe fasse à un %s.",
+	"But what did %s imagine versus a %s? Rest her soul. / Mais que s'est imaginé %s fasse à un %s ? Paix à son âme.",
+	"%s got shipped off to the afterlife in a hurry by a %s. / %s s'est fait expédier dans l'au-delà vite fait bien fait par un %s.",
+	"%s's attempt to reason with a %s didn't exactly pay off. / La tentative de %s pour raisonner un %s n'a pas vraiment porté ses fruits.",
+	"%s was severely shattered by a dirty %s. / %s s'est fait sévèrement éclater par une saleté de %s.",
 	-- Need to fill
 }
 
 -- Monsters
 
 local monsters = {
-	["mobs:fireball"] = "dungeon master",
+	["mobs_monster:fireball"] = "dungeon master",
-	["mobs:dungeon_master"] = "dungeon master",
+	["mobs_monster:dungeon_master"] = "dungeon master",
-	["mobs:spider"] = "spider",
+	["mobs_monster:spider"] = "spider",
-	["mobs:sand_monster"] = "sand monster",
+	["mobs_monster:sand_monster"] = "sand monster",
-	["mobs:cow"] = "cow",
+	["mobs_animal:cow"] = "cow",
-	["mobs:creeper"] = "creeper",
+	["creeper:creeper"] = "creeper",
-	["mobs:dog"] = "dog",
+	["pmobs:dog"] = "dog",
-	["mobs:greenbig"] = "big green slim",
+	["slimes:greenbig"] = "big green slim",
-	["mobs:greenmedium"] = "medium green slim",
+	["slimes:greenmedium"] = "medium green slim",
-	["mobs:greensmall"] = "small green slim",
+	["slimes:greensmall"] = "small green slim",
-	["mobs:lavabig"] = "big lava slim",
+	["slimes:lavabig"] = "big lava slim",
-	["mobs:lavamedium"] = "medium lava slim",
+	["slimes:lavamedium"] = "medium lava slim",
-	["mobs:lavasmall"] = "small lava slim",
+	["slimes:lavasmall"] = "small lava slim",
-	["mobs:yeti"] = "yeti",
+	["pmobs:yeti"] = "yeti",
-	["mobs:snowball"] = "yeti",
+	["pmobs:snowball"] = "yeti",
-	["mobs:npc"] = "npc",
+	["pmobs:npc"] = "npc",
-	["mobs:npc_female"] = "female npc",
+	["pmobs:npc_female"] = "female npc",
-	["mobs:oerkki"] = "oerkki",
+	["mobs_monster:oerkki"] = "oerkki",
-	["mobs:stone_monster"] = "stone monster",
+	["mobs_monster:stone_monster"] = "stone monster",
-	["mobs:dirt_monster"] = "dirt monster",
+	["mobs_monster:dirt_monster"] = "dirt monster",
-	["mobs:goat"] = "goat",
+	["mobs_animal:goat"] = "goat",
-	["mobs:wolf"] = "wolf",
+	["pmobs:wolf"] = "wolf",
-	["mobs:tree_monster"] = "tree monster",
+	["mobs_monster:tree_monster"] = "tree monster",
-	["mobs:mese_arrow"] = "mese monster",
+	["mobs_monster:mese_arrow"] = "mese monster",
-	["mobs:zombie"] = "zombie",
+	["zombie:zombie"] = "zombie",
-	["mobs:minotaur"] = "minotaur",
+	["mobs_monster:minotaur"] = "minotaur",
-	["mobs:pumba"] = "warthog",
+	["mobs_animal:pumba"] = "warthog",
 	["tsm_pyramids:mummy"] = "mummy",
-	["mobs:shark_lg"] = "large shark",
+	["mobs_sharks:shark_lg"] = "large shark",
-	["mobs:shark_md"] = "medium shark",
+	["mobs_sharks:shark_md"] = "medium shark",
-	["mobs:pumpking"] = "pumpking",
+	["mobs_sharks:shark_sm"] = "small shark",
-	["mobs:pumpboom"] = "pumpboom",
+	["mobs_crocs:crocodile"] = "crocodile",
-	["mobs:mese_dragon"] = "mese_dragon",
+	["mobs_crocs:crocodile_float"] = "crocodile",
+	["mobs_crocs:crocodile_swim"] = "crocodile",
+	["mobs_monster:lava_flan"] = "lava flan",
+	["mobs_animal:bee"] = "bee",
+	["mobs_animal:bunny"] = "evil bunny",
+--	["mobs:pumpking"] = "pumpking",
+--	["mobs:pumpboom"] = "pumpboom",
+--	["mobs:mese_dragon"] = "mese_dragon",
 }
 
 local function broadcast_death(msg)
@@ -166,7 +211,6 @@ local function sound_play_all(dead)
 	for _, p in ipairs(minetest.get_connected_players()) do
 		local player_name = p:get_player_name()
 		if player_name and player_name ~= dead then
-			--			minetest.sound_play("death_messages_people_1",{to_player=player_name, gain=soundset.get_gain(player_name,"other")})
 			minetest.sound_play("death_messages_people_1",{to_player=player_name, gain=1})
 		end
 	end
@@ -184,9 +228,8 @@ minetest.register_on_punchplayer(function(player, hitter, time,
 			death_message = string.format(messages.monsters_whacking[math.random(1, #messages.monsters_whacking)], player_name, entity_name, player_name, entity_name)
 		end
 		broadcast_death(death_message)
-		--		minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player:get_player_name(),gain=soundset.get_gain(player:get_player_name(),"other")})
+		minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player_name,gain=1})
-				minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player:get_player_name(),gain=1})
+		sound_play_all(player_name)
-		sound_play_all(player:get_player_name())
 		whacked[player_name] = true
 	end
 end)
@@ -200,10 +243,21 @@ minetest.register_on_respawnplayer(function(player)
 	whacked[player:get_player_name()] = nil
 end)
 
-if RANDOM_MESSAGES == true then
+local function get_message(mtype)
-	minetest.register_on_dieplayer(function(player)
+	if RANDOM_MESSAGES then
+		return messages[mtype][math.random(1, #messages[mtype])]
+	else
+		return messages[mtype][1] -- 1 is the index for the non-random message
+	end
+end
+
+local function find_node(pos, name)
+	return minetest.find_node_near(pos, 1, name, true)
+end
+
+minetest.register_on_dieplayer(
+	function(player)
 		local player_name = player:get_player_name()
-		local node = minetest.registered_nodes[minetest.get_node(player:getpos()).name]
 		if minetest.is_singleplayer() then
 			player_name = "You"
 		end
@@ -213,64 +267,34 @@ if RANDOM_MESSAGES == true then
 		if not whacked[player_name] then
 
 			-- Death by lava
-			if node.groups.lava ~= nil then
+			if find_node(player:get_pos(), "group:lava") then
-				death_message = messages.lava[math.random(1,#messages.lava)]
+				death_message = get_message("lava")
-			-- Death by acid
+				-- Death by acid
-			elseif node.groups.acid ~= nil then
+			elseif find_node(player:get_pos(), "group:acid") then
-				death_message = messages.acid[math.random(1,#messages.acid)]
+				death_message = get_message("acid")
-			-- Death by drowning
+				-- Death by drowning
-			elseif player:get_breath() == 0 and node.groups.water then
+			elseif player:get_breath() == 0 and find_node(player:get_pos(), "group:water") then
-				death_message = messages.water[math.random(1,#messages.water)]
+				death_message = get_message("water")
-			-- Death by fire
+				-- Death by fire
-			elseif node.name == "fire:basic_flame" then
+			elseif find_node(player:get_pos(), "fire:basic_flame") then
-				death_message = messages.fire[math.random(1,#messages.fire)]
+				death_message = get_message("fire")
-			-- Death in quicksand
+				-- Death in quicksand
-			elseif player:get_breath() == 0 and node.name == "default:sand_source" or node.name == "default:sand_flowing" then
+			elseif player:get_breath() == 0 and find_node(player:get_pos(), {"nalc:sand_source", "nalc:sand_flowing"}) then
-				death_message = messages.sand[math.random(1,#messages.sand)]
+				death_message = get_message("sand")
-			-- Death by something else
+				-- Death by something else
 			else
-				death_message = messages.other[math.random(1,#messages.other)]
+				death_message = get_message("other")
 			end
 
 			-- Actually tell something
 			death_message = string.format(death_message, player_name, player_name)
 			broadcast_death(death_message)
-			--			minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player_name,gain=soundset.get_gain(player_name, "other")})
+			minetest.sound_play(sounds[math.random(1,#sounds)], {to_player=player_name,gain=1})
-						minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player_name,gain=1})
 			sound_play_all(player_name)
 			whacked[player_name] = true
 		end
 	end)
 
-else
-	-- Should we keep that part?
-	minetest.register_on_dieplayer(function(player)
-		local player_name = player:get_player_name()
-		local node = minetest.registered_nodes[minetest.get_node(player:getpos()).name]
-		if minetest.is_singleplayer() then
-			player_name = "You"
-		end
-		if not whacked[player_name] then
-			-- Death by lava
-			if node.groups.lava ~= nil then
-				minetest.chat_send_all(player_name .. " melted into a ball of fire")
-			-- Death by drowning
-			elseif player:get_breath() == 0 then
-				minetest.chat_send_all(player_name .. " ran out of air.")
-			-- Death by fire
-			elseif node.name == "fire:basic_flame" then
-				minetest.chat_send_all(player_name .. " burned to a crisp.")
-			-- Death by something else
-			else
-				minetest.chat_send_all(player_name .. " died.")
-			end
-		end
-		--		minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player:get_player_name(),gain=soundset.get_gain(player:get_player_name(),"other")})
-				minetest.sound_play(sounds[math.random(1,#sounds)],{to_player=player:get_player_name(),gain=1})
-		sound_play_all(player:get_player_name())
-	end)
-end
-
 -----------------------------------------------------------------------------------------------
 minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
 -----------------------------------------------------------------------------------------------

mod.conf

@@ -0,0 +1 @@
+name = death_messages