Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

More death messages, more reliable

objects
Wuzzy 2019-03-08 20:22:01 +01:00
parent db8d7af245
commit 20576431e1
12 changed files with 148 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ENTITIES/mobs_mc/ender_dragon.lua
View File

@ -124,7 +124,7 @@ mobs:register_arrow("mobs_mc:roar_of_the_dragon2", {
for _,obj in ipairs(objects) do
local name = self.name
if name~="mobs_mc:roar_of_the_dragon2" and name ~= "mobs_mc:enderdragon" then
obj:set_hp(obj:get_hp()-0.05)
obj:set_hp(obj:get_hp()-5)
if (obj:get_hp() <= 0) then
if (not obj:is_player()) and name ~= self.object:get_luaentity().name then
obj:remove()

2
mods/ENTITIES/mobs_mc/wither.lua
View File

@ -94,7 +94,7 @@ mobs:register_arrow("mobs_mc:roar_of_the_dragon", {
for _,obj in ipairs(objects) do
local name = self.name
if name~="mobs_mc:roar_of_the_dragon" and name ~= "mobs_mc:wither" then
obj:set_hp(obj:get_hp()-0.05)
obj:set_hp(obj:get_hp()-5)
if (obj:get_hp() <= 0) then
if (not obj:is_player()) and name ~= self.object:get_luaentity().name then
obj:remove()

170
mods/HUD/mcl_death_messages/init.lua
View File

@ -28,9 +28,6 @@ local msgs = {
S("%s drowned."),
S("%s ran out of oxygen."),
},
["starve"] = {
S("%s starved."),
},
["murder"] = {
S("%s was killed by %s."),
},
@ -42,13 +39,13 @@ local msgs = {
S("%s was killed by a fireball from a blaze."),
},
["fire_charge"] = {
S("%s was hit by a fire charge."),
S("%s was burned by a fire charge."),
},
["ghast_fireball"] = {
S("A ghast scared %s to death."),
S("%s has been fireballed by a ghast."),
},
["fall_damage"] = {
["fall"] = {
S("%s fell from a high cliff."),
S("%s took fatal fall damage."),
S("%s fell victim to gravity."),
@ -117,132 +114,123 @@ end
local last_damages = { }
minetest.register_on_dieplayer(function(player)
minetest.register_on_dieplayer(function(player, reason)
-- Death message
local message = minetest.settings:get_bool("mcl_showDeathMessages")
if message == nil then message = true end
if message == nil then
message = true
end
if message then
local name = player:get_player_name()
if not name then
return
end
local node = minetest.registered_nodes[minetest.get_node(player:get_pos()).name]
local msg
if reason.type == "node_damage" then
local pos = player:get_pos()
-- Check multiple nodes because players occupy multiple nodes
-- (we add one additional node because the check may fail if the player was
-- just barely touching the node with the head)
local posses = { pos, {x=pos.x,y=pos.y+1,z=pos.z}, {x=pos.x,y=pos.y+2,z=pos.z}}
for p=1, #posses do
local node = minetest.registered_nodes[minetest.get_node(posses[p]).name]
-- Lava
if minetest.get_item_group(node.name, "lava") ~= 0 then
msg = dmsg("lava", name)
-- Drowning
elseif player:get_breath() == 0 then
msg = dmsg("drown", name)
break
-- Fire
elseif minetest.get_item_group(node.name, "fire") ~= 0 then
msg = dmsg("fire", name)
-- Other
else
-- Killed by entity
if last_damages[name] then
-- Mob
if last_damages[name].hittertype == "mob" then
if last_damages[name].hittername then
msg = dmsg("murder", name, last_damages[name].hittername)
else
msg = mmsg(last_damages[name].hittersubtype, name)
end
-- Player
elseif last_damages[name].hittertype == "player" then
if last_damages[name].hittername == name then
-- Workaround when player somehow punches self. Caused by creeper explosions in mobs mod.
-- FIXME: Remove when self-punching is no longer buggy.
msg = dmsg("other", name)
else
msg = dmsg("murder", name, last_damages[name].hittername)
end
-- Arrow
elseif last_damages[name].hittertype == "arrow" then
if last_damages[name].shooter == nil then
msg = dmsg("arrow", name)
elseif last_damages[name].shooter:is_player() then
msg = dmsg("arrow_name", name, last_damages[name].shooter:get_player_name())
elseif last_damages[name].shooter:get_luaentity()._cmi_is_mob then
if last_damages[name].shooter:get_luaentity().nametag ~= "" then
msg = dmsg("arrow_name", name, last_damages[name].shooter:get_player_name())
else
msg = dmsg("arrow", name)
end
else
msg = dmsg("arrow", name)
end
-- Fireball
elseif last_damages[name].hittertype == "blaze_fireball" then
msg = dmsg("blaze_fireball", name)
elseif last_damages[name].hittertype == "ghast_fireball" then
msg = dmsg("ghast_fireball", name)
elseif last_damages[name].hittertype == "fire_charge" then
msg = dmsg("fire_charge", name)
-- Custom death message
elseif last_damages[name].custom then
msg = last_damages[name].message
end
-- Other reason
else
msg = dmsg("other", name)
break
end
end
if msg then
minetest.chat_send_all(msg)
end
end
end)
local start_damage_reset_countdown = function (player)
minetest.after(1, function(playername)
last_damages[playername] = nil
end, player:get_player_name())
end
minetest.register_on_punchplayer(function(player, hitter)
if not player or not player:is_player() or not hitter then
return
end
local msg
elseif reason.type == "drown" then
msg = dmsg("drown", name)
elseif reason.type == "punch" then
-- Punches
local hitter = reason.object
local hittername, hittertype, hittersubtype, shooter
-- Unknown hitter
if hitter == nil then
msg = dmsg("murder_any")
-- Player
if hitter:is_player() then
elseif hitter:is_player() then
hittername = hitter:get_player_name()
hittertype = "player"
if hittername ~= nil then
msg = dmsg("murder", name, hittername)
else
msg = dmsg("murder_any", name)
end
-- Mob (according to Common Mob Interface)
elseif hitter:get_luaentity()._cmi_is_mob then
if hitter:get_luaentity().nametag and hitter:get_luaentity().nametag ~= "" then
hittername = hitter:get_luaentity().nametag
end
hittertype = "mob"
hittersubtype = hitter:get_luaentity().name
if hittername then
msg = dmsg("murder", name, hittername)
elseif hittersubtype ~= nil and hittersubtype ~= "" then
msg = mmsg(hittersubtype, name)
else
msg = dmsg("murder_any", name)
end
-- Arrow
elseif hitter:get_luaentity().name == "mcl_bows:arrow_entity" or hitter:get_luaentity().name == "mobs_mc:arrow_entity" then
hittertype = "arrow"
local shooter
if hitter:get_luaentity()._shooter then
shooter = hitter:get_luaentity()._shooter
end
if shooter == nil then
msg = dmsg("arrow", name)
elseif shooter:is_player() then
msg = dmsg("arrow_name", name, shooter:get_player_name())
elseif shooter:get_luaentity()._cmi_is_mob then
if shooter:get_luaentity().nametag ~= "" then
msg = dmsg("arrow_name", name, shooter:get_player_name())
else
msg = dmsg("arrow", name)
end
else
msg = dmsg("arrow", name)
end
-- Blaze fireball
elseif hitter:get_luaentity().name == "mobs_mc:blaze_fireball" then
if hitter:get_luaentity()._shot_from_dispenser then
hittertype = "fire_charge"
msg = dmsg("fire_charge", name)
else
hittertype = "blaze_fireball"
msg = dmsg("blaze_fireball", name)
end
-- Ghast fireball
elseif hitter:get_luaentity().name == "mobs_monster:fireball" then
hittertype = "ghast_fireball"
else
return
msg = dmsg("ghast_fireball", name)
end
-- Falling
elseif reason.type == "fall" then
msg = dmsg("fall", name)
-- Other
elseif reason.type == "set_hp" then
if last_damages[name] and last_damages[name].custom then
msg = last_damages[name].message
end
end
if not msg then
msg = dmsg("other", name)
end
minetest.chat_send_all(msg)
end
last_damages[player:get_player_name()] = { shooter = shooter, hittername = hittername, hittertype = hittertype, hittersubtype = hittersubtype }
start_damage_reset_countdown(player)
end)
-- To be called BEFORE damaging a player. If the player died, then message will be used as the death message.
local start_damage_reset_countdown = function (player)
minetest.after(1, function(playername)
-- FIXME: Fix race condition with many damages in quick succession
if last_damages[playername] and last_damages[playername].custom then
last_damages[playername] = nil
end
end, player:get_player_name())
end
-- To be called BEFORE damaging a player via set_hp. The next time the player dies due to a set_hp,
-- the message will be shown. This must happen within one second, otherwise it won't work.
function mcl_death_messages.player_damage(player, message)
last_damages[player:get_player_name()] = { custom = true, message = message }
start_damage_reset_countdown(player)

2
mods/ITEMS/mcl_nether/depends.txt
View File

@ -2,6 +2,6 @@ mcl_core
mcl_sounds
mcl_util
walkover
mcl_death_messages
mcl_death_messages?
doc_items
doc?

4
mods/ITEMS/mcl_nether/init.lua
View File

@ -1,5 +1,7 @@
local S = minetest.get_translator("mcl_nether")
local mod_death_messages = minetest.get_modpath("mcl_death_messages")
minetest.register_node("mcl_nether:glowstone", {
description = S("Glowstone"),
_doc_items_longdesc = S("Glowstone is a naturally-glowing block which is home to the Nether."),
@ -91,7 +93,9 @@ minetest.register_node("mcl_nether:magma", {
on_walk_over = function(loc, nodeiamon, player)
-- Hurt players standing on top of this block
if player:get_hp() > 0 then
if mod_death_messages then
mcl_death_messages.player_damage(player, string.format("%s stood too long on a magma block.", player:get_player_name()))
end
player:set_hp(player:get_hp() - 1)
end
end,

5
mods/ITEMS/mcl_throwing/init.lua
View File

@ -1,6 +1,7 @@
mcl_throwing = {}
local S = minetest.get_translator("mcl_throwing")
local mod_death_messages = minetest.get_modpath("mcl_death_messages")
--
-- Snowballs and other throwable items
@ -267,6 +268,10 @@ local pearl_on_step = function(self, dtime)
local oldpos = player:get_pos()
-- Teleport and hurt player
player:set_pos(telepos)
if mod_death_messages then
mcl_death_messages.player_damage(player, S("@1 used the ender pearl too often.", player:get_player_name()))
end
-- TODO: Deal as fall damage
player:set_hp(player:get_hp() - 5)
-- 5% chance to spawn endermite at the player's origin

1
mods/MISC/mcl_commands/depends.txt Normal file
View File

@ -0,0 +1 @@
mcl_death_messages?

20
mods/MISC/mcl_commands/init.lua
View File

@ -2,6 +2,8 @@ local minecraftaliases = true
local S = minetest.get_translator("mcl_commands")
local mod_death_messages = minetest.get_modpath("mcl_death_messages")
local function handle_kill_command(suspect, victim)
if minetest.settings:get_bool("enable_damage") == false then
return false, S("Players can't be killed right now, damage has been disabled.")
@ -16,17 +18,29 @@ local function handle_kill_command(suspect, victim)
return false, S("@1 is already dead", victim)
end
end
if not suspect == victim then
minetest.log("action", S("@1 killed @2", suspect, victim))
end
-- If player holds a totem of undying, destroy it before killing,
-- so it doesn't rescue the player.
local wield = victimref:get_wielded_item()
if wield:get_name() == "mobs_mc:totem" then
victimref:set_wielded_item("")
end
if mod_death_messages then
local msg
if suspect == victim then
msg = S("@1 committed suicide.", victim)
else
msg = S("@1 was killed by @2.", victim, suspect)
end
mcl_death_messages.player_damage(victimref, msg)
end
-- DIE!
victimref:set_hp(0)
-- Log
if not suspect == victim then
minetest.log("action", string.format("%s killed %s using /kill", suspect, victim))
else
minetest.log("action", string.format("%s committed suicide using /kill", victim))
end
return true
end

2
mods/PLAYER/mcl_hunger/depends.txt
View File

@ -1,2 +1,2 @@
hudbars
intllib?
mcl_death_messages?

7
mods/PLAYER/mcl_hunger/hunger.lua
View File

@ -1,3 +1,6 @@
local S = minetest.get_translator("mcl_hunger")
local mod_death_messages = minetest.get_modpath("mcl_death_messages")
-- wrapper for minetest.item_eat (this way we make sure other mods can't break this one)
local org_eat = minetest.do_item_eat
minetest.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing)
@ -110,7 +113,11 @@ local function poisonp(tick, time, time_left, damage, exhaustion, name)
end
-- Deal damage and exhaust player
-- TODO: Introduce fatal poison at higher difficulties
if player:get_hp()-damage > 0 then
if mod_death_messages then
mcl_death_messages.player_damage(player, S("@1 succumbed to the poison."), name)
end
player:set_hp(player:get_hp()-damage)
end

13
mods/PLAYER/mcl_hunger/init.lua
View File

@ -1,10 +1,5 @@
local S
if (minetest.get_modpath("intllib")) then
S = intllib.Getter()
else
S = function ( s ) return s end
end
local S = minetest.get_translator("mcl_hunger")
local mod_death_messages = minetest.get_modpath("mcl_death_messages")
mcl_hunger = {}
@ -172,7 +167,11 @@ minetest.register_globalstep(function(dtime)
mcl_hunger.update_exhaustion_hud(player, mcl_hunger.get_exhaustion(player))
elseif h == 0 then
-- Damage hungry player down to 1 HP
-- TODO: Allow starvation at higher difficulty levels
if hp-1 > 0 then
if mod_death_messages then
mcl_death_messages.player_damage(player, S("@1 starved to death."), name)
end
player:set_hp(hp-1)
end
end

6
mods/PLAYER/mcl_playerplus/init.lua
View File

@ -1,3 +1,5 @@
local S = minetest.get_translator("mcl_playerplus")
-- Internal player state
local mcl_playerplus_internal = {}
@ -118,7 +120,7 @@ minetest.register_globalstep(function(dtime)
-- Check privilege, too
and (not minetest.check_player_privs(name, {noclip = true})) then
if player:get_hp() > 0 then
mcl_death_messages.player_damage(player, string.format("%s suffocated to death.", name))
mcl_death_messages.player_damage(player, S("@1 suffocated to death.", name))
player:set_hp(player:get_hp() - 1)
end
end
@ -134,7 +136,7 @@ minetest.register_globalstep(function(dtime)
local dist_feet = vector.distance({x=pos.x, y=pos.y-1, z=pos.z}, near)
if dist < 1.1 or dist_feet < 1.1 then
if player:get_hp() > 0 then
mcl_death_messages.player_damage(player, string.format("%s was prickled by a cactus.", name))
mcl_death_messages.player_damage(player, S("@1 was prickled to death by a cactus.", name))
player:set_hp(player:get_hp() - 1)
end
end