From 8cf6074e63727eda0bdf38d3efff4122cef8f63f Mon Sep 17 00:00:00 2001 From: Vincent Duchauffour Date: Wed, 9 Oct 2024 22:23:07 +0200 Subject: [PATCH] Rewrite log function without CvUtil --- Assets/Python/Core.py | 5 +++-- Assets/Python/Init.py | 2 +- Assets/Python/Modifiers.py | 6 +++--- Assets/Python/Setup.py | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Assets/Python/Core.py b/Assets/Python/Core.py index 5cbcca0a0..27374048c 100644 --- a/Assets/Python/Core.py +++ b/Assets/Python/Core.py @@ -1,3 +1,4 @@ +import sys from CivilizationsData import ( CIV_ADDITIONAL_UNITS, CIV_AI_MODIFIERS, @@ -20,7 +21,6 @@ ) from Consts import INDEPENDENT_CIVS, WORLD_HEIGHT, WORLD_WIDTH, MessageData from CoreTypes import Civ, Scenario -import CvUtil from LocationsData import ( CIV_AREAS, CIV_CAPITAL_LOCATIONS, @@ -2303,7 +2303,8 @@ def message(player_id, text, **settings): def log(message): - CvUtil.pyPrint(message) + message = "RFCE - " + message + "\n" + sys.stdout.write(message) def get_data_from_province_map(plot): diff --git a/Assets/Python/Init.py b/Assets/Python/Init.py index 0d3165632..00caaf72a 100644 --- a/Assets/Python/Init.py +++ b/Assets/Python/Init.py @@ -11,7 +11,7 @@ def init(): init_player_variables() init_provinces() set_province_type_parameters() - log("RFCE: Init.init()") + log("Init.init()") def init_player_variables(): diff --git a/Assets/Python/Modifiers.py b/Assets/Python/Modifiers.py index f678612eb..3604a70a9 100644 --- a/Assets/Python/Modifiers.py +++ b/Assets/Python/Modifiers.py @@ -34,13 +34,13 @@ @handler("GameStart") def setup_gamestart(): - log("RFCE: GameStart") + log("GameStart") setup() @handler("OnLoad") def setup_on_load(): - log("RFCE: OnLoad") + log("OnLoad") setup() @@ -57,7 +57,7 @@ def setup(): set_religion_benefit() set_historical_enemies() set_other_parameters() - log("RFCE: Modifiers.setup()") + log("Modifiers.setup()") def set_modifiers(): diff --git a/Assets/Python/Setup.py b/Assets/Python/Setup.py index f6f4e3082..4302b1317 100644 --- a/Assets/Python/Setup.py +++ b/Assets/Python/Setup.py @@ -22,14 +22,14 @@ @handler("GameStart") def setup_gamestart(): - log("RFCE: GameStart") + log("GameStart") setup() data.setup() @handler("OnLoad") def setup_on_load(): - log("RFCE: OnLoad") + log("OnLoad") setup() @@ -40,7 +40,7 @@ def setup(): update_province_id() update_city_name() update_lake_id() - log("RFCE: Setup.setup()") + log("Setup.setup()") def init_player_maps():