diff --git a/bl_HUD/hud_log.lua b/bl_HUD/hud_log.lua index 13e1635..0019031 100644 --- a/bl_HUD/hud_log.lua +++ b/bl_HUD/hud_log.lua @@ -63,19 +63,27 @@ end function block_league.hud_log_update(arena, action_img, executor, receiver) - for pl_name, pl_stats in pairs(arena.players) do + for psp_name, _ in pairs(arena.players_and_spectators) do - local panel = panel_lib.get_panel(pl_name, "bl_log") + local panel = panel_lib.get_panel(psp_name, "bl_log") + local executor_color, receiver_color - local executor_color - local receiver_color - - if arena.players[executor].teamID == pl_stats.teamID then - executor_color = "0xabf877" - receiver_color = "0xff8e8e" + if arena.players[psp_name] then + if arena.players[executor].teamID == arena.players[psp_name].teamID then + executor_color = "0xabf877" + receiver_color = "0xff8e8e" + else + executor_color = "0xff8e8e" + receiver_color = "0xabf877" + end else - executor_color = "0xff8e8e" - receiver_color = "0xabf877" + if arena.players[executor].teamID == 1 then + executor_color = "0xf2a05b" + receiver_color = "0x55aef1" + else + executor_color = "0x55aef1" + receiver_color = "0xf2a05b" + end end panel:update(nil, @@ -134,7 +142,7 @@ end function block_league.hud_log_clear(arena) - for pl_name, _ in pairs(arena.players) do + for pl_name, _ in pairs(arena.players_and_spectators) do local panel = panel_lib.get_panel(pl_name, "bl_log") panel:update(nil, diff --git a/bl_arena_lib/arena_manager.lua b/bl_arena_lib/arena_manager.lua index 7897423..7a66bdd 100644 --- a/bl_arena_lib/arena_manager.lua +++ b/bl_arena_lib/arena_manager.lua @@ -188,8 +188,9 @@ end function create_and_show_HUD(arena, p_name, is_spectator) - block_league.scoreboard_create(arena, p_name) block_league.HUD_broadcast_create(p_name) + block_league.scoreboard_create(arena, p_name) + block_league.hud_log_create(p_name) if is_spectator then block_league.HUD_spectate_create(arena, p_name) @@ -199,7 +200,6 @@ function create_and_show_HUD(arena, p_name, is_spectator) block_league.info_panel_create(arena, p_name) block_league.energy_create(arena, p_name) block_league.bullets_hud_create(p_name) - block_league.hud_log_create(p_name) end @@ -207,6 +207,7 @@ end function remove_HUD(p_name, is_spectator) panel_lib.get_panel(p_name, "bl_broadcast"):remove() panel_lib.get_panel(p_name, "bl_scoreboard"):remove() + panel_lib.get_panel(p_name, "bl_log"):remove() if is_spectator then return end @@ -214,7 +215,6 @@ function remove_HUD(p_name, is_spectator) panel_lib.get_panel(p_name, "bl_info_panel"):remove() panel_lib.get_panel(p_name, "bl_bullets"):remove() panel_lib.get_panel(p_name, "bl_energy"):remove() - panel_lib.get_panel(p_name, "bl_log"):remove() block_league.HUD_remove_inputs(p_name) end diff --git a/bl_modes/TD/ball.lua b/bl_modes/TD/ball.lua index ac66a7e..63405d2 100644 --- a/bl_modes/TD/ball.lua +++ b/bl_modes/TD/ball.lua @@ -323,7 +323,7 @@ function add_point(w_name, teamID, arena) block_league.HUD_ball_update(pl_name, S("ENEMY TEAM SCORED..."), "0xff8e8e") end - local scoring_team_color = teamID == 1 and "0xf2a05b" or "0x7ebeee" + local scoring_team_color = teamID == 1 and "0xf2a05b" or "0x55aef1" for sp_name, _ in pairs(arena.spectators) do minetest.sound_play("bl_crowd_cheer", {to_player = sp_name})