From 4632e71df30dd90ec88bc01aa50e1bfe55859987 Mon Sep 17 00:00:00 2001 From: Dino Date: Sun, 6 Jul 2025 17:12:27 -0400 Subject: [PATCH] #1554 Tell user about goods a unit is carrying --- client/text.c | 6 ++++++ server/cityturn.c | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/client/text.c b/client/text.c index f73caf7030..cb0eec92cc 100644 --- a/client/text.c +++ b/client/text.c @@ -420,6 +420,12 @@ const char *popup_info_text(struct tile *ptile) /* TRANS: on own line immediately following \n, ... */ astr_add_line(&str, _("from %s"), city_name_get(hcity)); } + if (punit->carrying + && unit_can_do_action(punit, ACTION_TRADE_ROUTE)) { + /* TRANS: on own line immediately following \n, from ... */ + astr_add_line(&str, _("carrying %s"), + goods_name_translation(punit->carrying)); + } } else if (owner != nullptr) { struct player_diplstate *ds = player_diplstate_get(plr, owner); diff --git a/server/cityturn.c b/server/cityturn.c index fcf04638d2..d9f3bf4c1f 100644 --- a/server/cityturn.c +++ b/server/cityturn.c @@ -2932,10 +2932,19 @@ static bool city_build_unit(struct player *pplayer, struct city *pcity) } if (punit) { - notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server, - /* TRANS: is finished building . */ - _("%s is finished building %s."), - city_link(pcity), utype_name_translation(utype)); + if (punit->carrying + && unit_can_do_action(punit, ACTION_TRADE_ROUTE)) { + notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server, + /* TRANS: is finished building , carrying . */ + _("%s is finished building %s, carrying %s."), + city_link(pcity), utype_name_translation(utype), + goods_name_translation(punit->carrying)); + } else { + notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server, + /* TRANS: is finished building . */ + _("%s is finished building %s."), + city_link(pcity), utype_name_translation(utype)); + } } /* After we created the unit remove the citizen. This will also -- 2.31.0