From 74ad2481bd7aab139d71c505bd2b1d156177b1c6 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sat, 2 May 2026 22:47:41 +0900 Subject: [PATCH 1/4] extra_logging spaces and fix to player_died --- exp_scenario/module/control/extra_logging.lua | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/exp_scenario/module/control/extra_logging.lua b/exp_scenario/module/control/extra_logging.lua index aaacd3d1f0..5241204b4a 100644 --- a/exp_scenario/module/control/extra_logging.lua +++ b/exp_scenario/module/control/extra_logging.lua @@ -25,9 +25,9 @@ local function on_cargo_pod_finished_ascending(event) if event.launched_by_rocket then local force = event.cargo_pod.force if force.rockets_launched >= config.rocket_launch_display_rate and force.rockets_launched % config.rocket_launch_display_rate == 0 then - add_log_line("[ROCKET]", force.rockets_launched, "rockets launched") + add_log_line("[ROCKET] ", force.rockets_launched, " rockets launched") elseif config.rocket_launch_display[force.rockets_launched] then - add_log_line("[ROCKET]", force.rockets_launched, "rockets launched") + add_log_line("[ROCKET] ", force.rockets_launched, " rockets launched") end end end @@ -37,10 +37,13 @@ local function on_pre_player_died(event) local player = assert(game.get_player(event.player_index)) local cause = event.cause if cause then - local by_player = event.cause.player - add_log_line("[DEATH]", player.name, "died because of", by_player and by_player.name or event.cause.name) + if cause.type == "character" then + add_log_line("[DEATH] ", player.name, " died because of ", (cause.player and cause.player.name) or cause.name) + else + add_log_line("[DEATH] ", player.name, " died because of ", cause.name) + end else - add_log_line("[DEATH]", player.name, "died because of unknown reason") + add_log_line("[DEATH] ", player.name, " died because of unknown reason") end end @@ -52,22 +55,22 @@ local function on_research_finished(event) local inf_research_level = config_res.inf_res[config_res.mod_set][event.research.name] if inf_research_level and event.research.level >= inf_research_level then - add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " at level ", event.research.level - 1, "has been researched\n" } + add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " at level ", event.research.level - 1, " has been researched\n" } else - add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, "has been researched\n" } + add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " has been researched\n" } end end --- @param event EventData.on_player_joined_game local function on_player_joined_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[JOIN]", player.name, "joined the game") + add_log_line("[JOIN] ", player.name, " joined the game") end --- @param event EventData.on_player_left_game local function on_player_left_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[LEAVE]", game.players[event.player_index].name, config.disconnect_reason[event.reason]) + add_log_line("[LEAVE] ", player.name, " left the game: ", config.disconnect_reason[event.reason]) end local e = defines.events From 0ad412fab0ea972a98bb9079bf1b7266ff0d749b Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sun, 3 May 2026 22:57:55 +0900 Subject: [PATCH 2/4] Update extra_logging.lua --- exp_scenario/module/control/extra_logging.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/exp_scenario/module/control/extra_logging.lua b/exp_scenario/module/control/extra_logging.lua index 5241204b4a..9434b143dc 100644 --- a/exp_scenario/module/control/extra_logging.lua +++ b/exp_scenario/module/control/extra_logging.lua @@ -25,9 +25,9 @@ local function on_cargo_pod_finished_ascending(event) if event.launched_by_rocket then local force = event.cargo_pod.force if force.rockets_launched >= config.rocket_launch_display_rate and force.rockets_launched % config.rocket_launch_display_rate == 0 then - add_log_line("[ROCKET] ", force.rockets_launched, " rockets launched") + add_log_line("[ROCKET]", force.rockets_launched, "rockets launched") elseif config.rocket_launch_display[force.rockets_launched] then - add_log_line("[ROCKET] ", force.rockets_launched, " rockets launched") + add_log_line("[ROCKET]", force.rockets_launched, "rockets launched") end end end @@ -38,12 +38,12 @@ local function on_pre_player_died(event) local cause = event.cause if cause then if cause.type == "character" then - add_log_line("[DEATH] ", player.name, " died because of ", (cause.player and cause.player.name) or cause.name) + add_log_line("[DEATH]", player.name, "died because of", (cause.player and cause.player.name) or cause.name) else - add_log_line("[DEATH] ", player.name, " died because of ", cause.name) + add_log_line("[DEATH]", player.name, "died because of", cause.name) end else - add_log_line("[DEATH] ", player.name, " died because of unknown reason") + add_log_line("[DEATH]", player.name, "died because of unknown reason") end end @@ -55,22 +55,22 @@ local function on_research_finished(event) local inf_research_level = config_res.inf_res[config_res.mod_set][event.research.name] if inf_research_level and event.research.level >= inf_research_level then - add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " at level ", event.research.level - 1, " has been researched\n" } + add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, "at level", event.research.level - 1, "has been researched\n" } else - add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " has been researched\n" } + add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, "has been researched\n" } end end --- @param event EventData.on_player_joined_game local function on_player_joined_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[JOIN] ", player.name, " joined the game") + add_log_line("[JOIN]", player.name, "joined the game") end --- @param event EventData.on_player_left_game local function on_player_left_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[LEAVE] ", player.name, " left the game: ", config.disconnect_reason[event.reason]) + add_log_line("[LEAVE]", player.name, "left the game: ", config.disconnect_reason[event.reason]) end local e = defines.events From 688027fc3b5a55089fd88369c3c3e68fbd337207 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sun, 3 May 2026 23:08:12 +0900 Subject: [PATCH 3/4] Update extra_logging.lua --- exp_scenario/module/control/extra_logging.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exp_scenario/module/control/extra_logging.lua b/exp_scenario/module/control/extra_logging.lua index 9434b143dc..5a99a47229 100644 --- a/exp_scenario/module/control/extra_logging.lua +++ b/exp_scenario/module/control/extra_logging.lua @@ -55,9 +55,9 @@ local function on_research_finished(event) local inf_research_level = config_res.inf_res[config_res.mod_set][event.research.name] if inf_research_level and event.research.level >= inf_research_level then - add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, "at level", event.research.level - 1, "has been researched\n" } + add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " at level ", event.research.level - 1, " has been researched\n" } else - add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, "has been researched\n" } + add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " has been researched\n" } end end @@ -70,7 +70,7 @@ end --- @param event EventData.on_player_left_game local function on_player_left_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[LEAVE]", player.name, "left the game: ", config.disconnect_reason[event.reason]) + add_log_line("[LEAVE]", player.name, "left the game:", config.disconnect_reason[event.reason]) end local e = defines.events From 5274de430950b6f5b68e997f990b4194fa9a0499 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Mon, 4 May 2026 23:51:27 +0900 Subject: [PATCH 4/4] Update extra_logging.lua --- exp_scenario/module/control/extra_logging.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exp_scenario/module/control/extra_logging.lua b/exp_scenario/module/control/extra_logging.lua index 5a99a47229..4a9da9dbab 100644 --- a/exp_scenario/module/control/extra_logging.lua +++ b/exp_scenario/module/control/extra_logging.lua @@ -70,7 +70,7 @@ end --- @param event EventData.on_player_left_game local function on_player_left_game(event) local player = assert(game.get_player(event.player_index)) - add_log_line("[LEAVE]", player.name, "left the game:", config.disconnect_reason[event.reason]) + add_log_line("[LEAVE]", player.name, config.disconnect_reason[event.reason]) end local e = defines.events