Skip to content

Show "city capacity" and "Max Prosperity" in the sidebar #1522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rneeft wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −9
Draft

Show "city capacity" and "Max Prosperity" in the sidebar #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e410bf7
Show "city capacity" and "Max Prosperity" in the sidebar
rneeft Sep 28, 2025
793b34d
always show font as font_normal_green when has_target == 0
rneeft Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/translation/english.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,6 +1705,8 @@ static translation_string all_strings[] = {
{TR_CONFIG_UI_ANIMATE_TRADE_ROUTES, "Animate trade routes"},
{TR_HOTKEY_NEXT_TRACK, "Next random track"},
{TR_CONFIG_MOVE_LEGION_SOUND_SWAP, "Alternative legion move sound"},
{TR_SIDEBAR_CITY_CAPACITY, "City Capacity"},
{TR_SIDEBAR_MAX_PROSPERITY, "Max Prosperity"},
};

void translation_english(const translation_string **strings, int *num_strings)
Expand Down
2 changes: 2 additions & 0 deletions src/translation/translation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,6 +1699,8 @@ typedef enum {
TR_CONFIG_UI_ANIMATE_TRADE_ROUTES,
TR_HOTKEY_NEXT_TRACK,
TR_CONFIG_MOVE_LEGION_SOUND_SWAP,
TR_SIDEBAR_CITY_CAPACITY,
TR_SIDEBAR_MAX_PROSPERITY,
TRANSLATION_MAX_KEY
} translation_key;

Expand Down
49 changes: 40 additions & 9 deletions src/widget/sidebar/extra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define EXTRA_INFO_HEIGHT_UNEMPLOYMENT 48
#define EXTRA_INFO_HEIGHT_INVASIONS 48
#define EXTRA_INFO_HEIGHT_GODS 64
#define EXTRA_INFO_HEIGHT_RATINGS 176
#define EXTRA_INFO_HEIGHT_RATINGS 256
#define EXTRA_INFO_HEIGHT_REQUESTS_PANEL 48
#define EXTRA_INFO_HEIGHT_REQUESTS_MIN EXTRA_INFO_LINE_SPACE + EXTRA_INFO_HEIGHT_REQUESTS_PANEL

Expand Down Expand Up @@ -109,6 +109,11 @@ static struct {
objective favor;
objective population;
} objectives;
struct
{
objective prosperity;
objective population;
} stats;
struct {
int happy;
int angry;
Expand Down Expand Up @@ -229,6 +234,19 @@ static int calculate_extra_info_height(int available_height)
return height;
}

static void set_extra_info_stats(void)
{
data.stats.population.target = 0;
data.stats.prosperity.target = 0;

if (scenario_criteria_prosperity_enabled()) {
data.stats.prosperity.target = scenario_criteria_prosperity();
}
if (scenario_criteria_population_enabled()) {
data.stats.population.target = scenario_criteria_population();
}
}

static void set_extra_info_objectives(void)
{
data.objectives.culture.target = 0;
Expand Down Expand Up @@ -361,19 +379,22 @@ static int update_extra_info(int is_background)
if (data.info_to_display & SIDEBAR_EXTRA_DISPLAY_RATINGS) {
if (is_background) {
set_extra_info_objectives();
set_extra_info_stats();
}
changed |= update_extra_info_value(city_rating_culture(), &data.objectives.culture.value);
changed |= update_extra_info_value(city_rating_prosperity(), &data.objectives.prosperity.value);
changed |= update_extra_info_value(city_rating_peace(), &data.objectives.peace.value);
changed |= update_extra_info_value(city_rating_favor(), &data.objectives.favor.value);
changed |= update_extra_info_value(city_population(), &data.objectives.population.value);
changed |= update_extra_info_value(city_ratings_prosperity_max(), &data.stats.prosperity.value);
changed |= update_extra_info_value(city_population_total_housing_capacity(), &data.stats.population.value);
}

return changed;
}

static int draw_extra_info_objective(
int x_offset, int y_offset, int text_group, int text_id, objective *obj, int cut_off_at_parenthesis)
int x_offset, int y_offset, int text_group, int text_id, objective *obj, int cut_off_at_parenthesis, int has_target)
{
if (cut_off_at_parenthesis) {
// Exception for Chinese: the string for "population" includes the hotkey " (6)"
Expand All @@ -390,9 +411,16 @@ static int draw_extra_info_objective(
} else {
lang_text_draw(text_group, text_id, x_offset + 11, y_offset, FONT_NORMAL_WHITE);
}
font_t font = obj->value >= obj->target ? FONT_NORMAL_GREEN : FONT_NORMAL_RED;
font_t font = obj->value >= obj->target ? FONT_NORMAL_GREEN : FONT_NORMAL_RED;
if (has_target == 0) {
font = FONT_NORMAL_GREEN;
}

int width = text_draw_number(obj->value, '@', "", x_offset + 11, y_offset + EXTRA_INFO_LINE_SPACE, font, 0);
text_draw_number(obj->target, '(', ")", x_offset + 11 + width, y_offset + EXTRA_INFO_LINE_SPACE, font, 0);

if (has_target) {
text_draw_number(obj->target, '(', ")", x_offset + 11 + width, y_offset + EXTRA_INFO_LINE_SPACE, font, 0);
}
return EXTRA_INFO_LINE_SPACE * 2;
}

Expand Down Expand Up @@ -588,11 +616,14 @@ static void draw_extra_info_panel(void)

data.objectives_y_offset = y_offset;

y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 1, &data.objectives.culture, 0);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 2, &data.objectives.prosperity, 0);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 3, &data.objectives.peace, 0);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 4, &data.objectives.favor, 0);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 4, 6, &data.objectives.population, 1);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 1, &data.objectives.culture, 0,1);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 2, &data.objectives.prosperity, 0,1);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 3, &data.objectives.peace, 0,1);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 53, 4, &data.objectives.favor, 0,1);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, 4, 6, &data.objectives.population, 1,1);
y_offset += EXTRA_INFO_LINE_SPACE;
y_offset += draw_extra_info_objective(data.x_offset, y_offset, CUSTOM_TRANSLATION, TR_SIDEBAR_CITY_CAPACITY, &data.stats.population, 0,0);
y_offset += draw_extra_info_objective(data.x_offset, y_offset, CUSTOM_TRANSLATION, TR_SIDEBAR_MAX_PROSPERITY, &data.stats.prosperity, 0,0);
}

if (data.info_to_display & SIDEBAR_EXTRA_DISPLAY_REQUESTS) {
Expand Down