Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-16 16:11:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed and optimized assist death messages.

Browse source 
Still left many log messages, a longer timeout and some unclean parts.
This commit is contained in:
CyberMango 2023-01-05 23:28:44 +02:00
parent ad9beebc70
commit cd63f32cdd
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
mods/HUD/mcl_death_messages/init.lua
View file

@ -1,5 +1,7 @@
local S = minetest.get_translator(minetest.get_current_modname()) local S = minetest.get_translator(minetest.get_current_modname())
ASSIST_TIMEOUT_SEC = 10
mcl_death_messages = { mcl_death_messages = {
assist = {}, assist = {},
messages = { messages = {
@ -181,8 +183,16 @@ local function get_killer_message(obj, messages, reason)
end end
local function get_assist_message(obj, messages, reason) local function get_assist_message(obj, messages, reason)
if messages.assist and mcl_death_messages.assist[obj] then -- Avoid a timing issue if the assist passes its timeout.
return messages._translator(messages.assist, mcl_util.get_object_name(obj), mcl_death_messages.assist[obj].name) local assist_details = mcl_death_messages.assist[obj]
if messages.assist then
print("TODO message.assist exists!")--TODO make this 1 condition again
if assist_details then
print("TODO There is an assist message object!")--TODO
return messages._translator(messages.assist, mcl_util.get_object_name(obj), assist_details.name)
end
else--TODO remove this else
print("TODO There was no assist message!")
end end
end end
@ -224,6 +234,9 @@ mcl_damage.register_on_death(function(obj, reason)
get_fallback_message(obj, messages, reason) get_fallback_message(obj, messages, reason)
if send_to == true then if send_to == true then
if not message or message == "" then
message = "there was not message"
end
minetest.chat_send_all(message) minetest.chat_send_all(message)
else else
minetest.chat_send_player(send_to, message) minetest.chat_send_player(send_to, message)
@ -232,20 +245,22 @@ mcl_damage.register_on_death(function(obj, reason)
end) end)
mcl_damage.register_on_damage(function(obj, damage, reason) mcl_damage.register_on_damage(function(obj, damage, reason)
print("TODO ", reason.type .. " caused damage ")
if obj:get_hp() - damage > 0 then if obj:get_hp() - damage > 0 then
if reason.source then if reason.source then
mcl_death_messages.assist[obj] = {name = mcl_util.get_object_name(reason.source), timeout = 5} print("TODO reason had a source")
else -- To avoid timing issues we cancel the previous job before adding a new one.
mcl_death_messages.assist[obj] = nil if mcl_death_messages.assist[obj] then
end print("TODO job is being caceled")
end mcl_death_messages.assist[obj].job:cancel()
end) end
minetest.register_globalstep(function(dtime) -- Add a new assist object with a timeout job.
for obj, tbl in pairs(mcl_death_messages.assist) do local new_job = minetest.after(ASSIST_TIMEOUT_SEC, function()
tbl.timeout = tbl.timeout - dtime print("TODO in job")
if not obj:is_player() and not obj:get_luaentity() or tbl.timeout > 0 then mcl_death_messages.assist[obj] = nil
mcl_death_messages.assist[obj] = nil end)
mcl_death_messages.assist[obj] = {name = mcl_util.get_object_name(reason.source), job = new_job}
end end
end end
end) end)