minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix suicider color in kill event on the hud (#857)

Browse source
This commit is contained in:
savilli 2021-04-06 17:48:48 +02:00 committed by GitHub
parent 2be9adb890
commit 665ec17c69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mods/ctf/ctf_events/init.lua
View file

@ -10,11 +10,13 @@ ctf_events = {
events = {} events = {}
} }
function ctf_events.post(action, one, two) function ctf_events.post(action, one, one_color, two, two_color)
table.insert(ctf_events.events, 1, { table.insert(ctf_events.events, 1, {
action = action, action = action,
one = one, one = one,
two = two one_color = one_color,
two = two,
two_color = two_color
}) })
while #ctf_events.events > NUM_EVT do while #ctf_events.events > NUM_EVT do
@ -38,17 +40,16 @@ function ctf_events.update_row(i, player, name, tplayer, evt)
-- One -- One
if evt.one then if evt.one then
local tcolor = ctf_colors.get_color(ctf.player(evt.one))
if hud:exists(player, idx) then if hud:exists(player, idx) then
hud:change(player, idx, "text", evt.one) hud:change(player, idx, "text", evt.one)
hud:change(player, idx, "number", tcolor.hex) hud:change(player, idx, "number", evt.one_color.hex)
else else
local tmp = { local tmp = {
hud_elem_type = "text", hud_elem_type = "text",
position = {x = 0, y = 0.8}, position = {x = 0, y = 0.8},
scale = {x = 200, y = 100}, scale = {x = 200, y = 100},
text = evt.one, text = evt.one,
number = tcolor.hex, number = evt.one_color.hex,
offset = {x = 145, y = -y_pos}, offset = {x = 145, y = -y_pos},
alignment = {x = -1, y = 0} alignment = {x = -1, y = 0}
} }
@ -60,17 +61,16 @@ function ctf_events.update_row(i, player, name, tplayer, evt)
-- Two -- Two
if evt.two then if evt.two then
local tcolor = ctf_colors.get_color(ctf.player(evt.two))
if hud:exists(player, idx2) then if hud:exists(player, idx2) then
hud:change(player, idx2, "text", evt.two) hud:change(player, idx2, "text", evt.two)
hud:change(player, idx2, "number", tcolor.hex) hud:change(player, idx2, "number", evt.two_color.hex)
else else
local tmp = { local tmp = {
hud_elem_type = "text", hud_elem_type = "text",
position = {x = 0, y = 0.8}, position = {x = 0, y = 0.8},
scale = {x = 200, y = 100}, scale = {x = 200, y = 100},
text = evt.two, text = evt.two,
number = tcolor.hex, number = evt.two_color.hex,
offset = {x = 175, y = -y_pos}, offset = {x = 175, y = -y_pos},
alignment = {x = 1, y = 0} alignment = {x = 1, y = 0}
} }
@ -121,6 +121,9 @@ function ctf_events.update_all()
end end
ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps) ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
local victim_color = ctf_colors.get_color(ctf.player(victim))
local killer_color = ctf_colors.get_color(ctf.player(killer))
local type = "sword" local type = "sword"
if tool_caps.damage_groups.grenade then if tool_caps.damage_groups.grenade then
@ -139,7 +142,7 @@ ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
victim = victim .. " (Suicide?)" victim = victim .. " (Suicide?)"
end end
ctf_events.post("kill_" .. type, killer, victim) ctf_events.post("kill_" .. type, killer, killer_color, victim, victim_color)
ctf_events.update_all() ctf_events.update_all()
end) end)