From f93968d24b82f9d2979d13845b60bd2fd77cd508 Mon Sep 17 00:00:00 2001 From: Areldir <72540647+Areldir@users.noreply.github.com> Date: Wed, 19 Jun 2024 00:48:43 +1000 Subject: [PATCH] Minor UI tweaks --- src/translation/english.c | 19 ++++++++++--------- src/translation/translation.h | 1 + src/window/building/culture.c | 7 +++++-- src/window/building_info.c | 6 +++--- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/translation/english.c b/src/translation/english.c index b01483f308..4e6a9b580a 100644 --- a/src/translation/english.c +++ b/src/translation/english.c @@ -279,8 +279,8 @@ static translation_string all_strings[] = { {TR_BUILDING_GRAND_TEMPLE_PHASE_5, "(Dedicatio)"}, {TR_BUILDING_GRAND_TEMPLE_PHASE_1_TEXT, "Laborers are constructing the podium that will elevate the temple and provide a solid foundation to weather the passage of time." }, {TR_BUILDING_GRAND_TEMPLE_PHASE_2_TEXT, "Artisans are crafting the portico, which will bear the temple's sacrificial altar." }, - {TR_BUILDING_GRAND_TEMPLE_PHASE_3_TEXT, "Masons are crafting the cella, the temple interior that will house the sacred images." }, - {TR_BUILDING_GRAND_TEMPLE_PHASE_4_TEXT, "Work on the temple praecinctum has begun, where worshipers will gather outdoors for public ceremonies." }, + {TR_BUILDING_GRAND_TEMPLE_PHASE_3_TEXT, "Masons are crafting the 'Cella', the temple interior that will house the sacred images." }, + {TR_BUILDING_GRAND_TEMPLE_PHASE_4_TEXT, "Work on the temple 'Praecinctum' has begun, where worshipers will gather outdoors for public ceremonies." }, {TR_BUILDING_GRAND_TEMPLE_PHASE_5_TEXT, "With the temple nearly complete, priests gather to perform the rites of consecration." }, {TR_BUILDING_MENU_TREES, "Trees" }, {TR_BUILDING_MENU_PATHS, "Paths" }, @@ -533,7 +533,7 @@ static translation_string all_strings[] = { {TR_BUILDING_COLOSSEUM_PHASE_2, "(Foundation)" }, {TR_BUILDING_COLOSSEUM_PHASE_3, "(Arcade)" }, {TR_BUILDING_COLOSSEUM_PHASE_4, "(Gallery)" }, - {TR_BUILDING_COLOSSEUM_PHASE_1_TEXT, "Workers are digging the underground hypogeum - tunnels and machinery from which grand spectacles will spring." }, + {TR_BUILDING_COLOSSEUM_PHASE_1_TEXT, "Workers are digging the underground 'Hypogeum', tunnels and machinery from which grand spectacles will spring." }, {TR_BUILDING_COLOSSEUM_PHASE_2_TEXT, "The walls of the Colosseum take shape as tiers of seating for both commoners and emperors are laid." }, {TR_BUILDING_COLOSSEUM_PHASE_3_TEXT, "Graceful arches rise to the heavens, to hold the mighty Colosseum aloft." }, {TR_BUILDING_COLOSSEUM_PHASE_4_TEXT, "As the Colosseum reaches skyward, its walls are clad in gleaming marble and statuary." }, @@ -631,23 +631,24 @@ static translation_string all_strings[] = { {TR_SAVEGAME_NOT_ABLE_TO_SAVE_MESSAGE, "It was not possible to save the game.\nIt may be because the folder where Caesar 3 keeps the savegames requires administrator access.\nPlease either change the Caesar 3 folder to a place which doesn't require administrator access or run Augustus as administrator (not recommended)." }, {TR_BUILDING_COLONNADE, "Colonnade" }, {TR_BUILDING_LARARIUM, "Lararium" }, - {TR_WINDOW_BUILDING_LARARIUM_DESC, "This small shrine is dedicated to the Lares, the ancestral spirits of the Roman people. Small sacrifices and prayers may be made here."}, + {TR_WINDOW_BUILDING_LARARIUM_DESC, "This small shrine is dedicated to the 'Lares', the ancestral spirits of the Roman people. Small sacrifices and prayers may be made here."}, {TR_BUILDING_WATCHTOWER, "Watchtower"}, {TR_BUILDING_WATCHTOWER_DESC, "Archers on the battlements of this tower keep a vigilant watch for invaders, while watchmen patrol the streets below." }, {TR_BUILDING_WATCHTOWER_DESC_NO_SOLDIERS, "This tower needs a sentry from the barracks before it can protect our city."}, {TR_BUILDING_LARGE_TEMPLE_PHASE_1, "(Cella)" }, {TR_BUILDING_LARGE_TEMPLE_PHASE_2, "(Facade)" }, - {TR_BUILDING_LARGE_TEMPLE_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the cella, the interior of this temple that will house the sacred image." }, + {TR_BUILDING_LARGE_TEMPLE_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the 'Cella', the interior of this temple that will house the sacred image." }, {TR_BUILDING_LARGE_TEMPLE_PHASE_2_TEXT, "Skilled artisans are preparing the facade of this temple, carving gleaming marble statues in the image of the deity to be worshiped here." }, + {TR_BUILDING_ORACLE_DESC, "This splendid building is dedicated to all the gods, from the lowliest local spirits to Jupiter himself. Such a pious place is sure to win your city the favor of the divine." }, {TR_BUILDING_ORACLE_PHASE_1, "(Cella)" }, {TR_BUILDING_ORACLE_PHASE_2, "(Facade)" }, - {TR_BUILDING_ORACLE_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the cella, the interior of this oracle that will house the sacred images." }, + {TR_BUILDING_ORACLE_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the 'Cella', the interior of this oracle that will house the sacred images." }, {TR_BUILDING_ORACLE_PHASE_2_TEXT, "Skilled artisans are preparing the facade of this oracle, carving gleaming marble statues in the images of the many gods to be worshiped here." }, {TR_BUILDING_NYMPHAEUM, "Nymphaeum"}, - {TR_BUILDING_NYMPHAEUM_DESC, "This great temple is dedicated to the water nymphs, minor deities of springs, rivers and seas. It promises beauty and plenty to the surrounding land and divine favor to the city." }, + {TR_BUILDING_NYMPHAEUM_DESC, "This splendid building is dedicated to the water nymphs, minor deities of springs, rivers and seas. It promises beauty and plenty to the surrounding land and divine favor to the city." }, {TR_BUILDING_NYMPHAEUM_PHASE_1, "(Cella)" }, {TR_BUILDING_NYMPHAEUM_PHASE_2, "(Facade)" }, - {TR_BUILDING_NYMPHAEUM_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the cella, the interior of this temple that will house the icons of the nymphs and their sacred waters." }, + {TR_BUILDING_NYMPHAEUM_PHASE_1_TEXT, "Masons are crafting the walls and pillars of the 'Cella', the interior of this temple that will house the icons of the nymphs and their sacred waters." }, {TR_BUILDING_NYMPHAEUM_PHASE_2_TEXT, "Skilled artisans are preparing the facade of this temple, carving gleaming marble statues in the images of the water nymphs and adorning the walls with seashells and mosaics of the water." }, {TR_BUILDING_SMALL_MAUSOLEUM, "Small Mausoleum"}, {TR_BUILDING_SMALL_MAUSOLEUM_DESC, "This building is the final resting place of past generations of your city's proud families, and the envy of many among the living." }, @@ -969,7 +970,7 @@ static translation_string all_strings[] = { {TR_BUILDING_CITY_MINT_PHASE_1, "(Foundation)"}, {TR_BUILDING_CITY_MINT_PHASE_2, "(Moneta)"}, {TR_BUILDING_CITY_MINT_PHASE_1_TEXT, "Masons are laying the stonework for a large building in which precious metals shall be melted down and struck into coinage."}, - {TR_BUILDING_CITY_MINT_PHASE_2_TEXT, "Artisans are putting the finishing touches on the Moneta, the place in which coins shall be minted, creating buildings for the storage of unstruck denarii and accommodation for the minters."}, + {TR_BUILDING_CITY_MINT_PHASE_2_TEXT, "Artisans are putting the finishing touches on the 'Moneta', the place in which coins shall be minted, creating buildings for the storage of unstruck denarii and accommodation for the minters."}, {TR_BUILDING_CITY_MINT_DESC, "Here, gold is minted into coin, which fills your city's treasury."}, {TR_BUILDING_CITY_MINT_DESC_ALTERNATIVE, "Here, coin is melted into gold, which can be used for monument construction."}, {TR_BUILDING_CITY_MINT_DESC_NO_PALACE, "Build your palace to also collect personal funds from the city mint."}, diff --git a/src/translation/translation.h b/src/translation/translation.h index 72cf4f2e0b..c86b15969d 100644 --- a/src/translation/translation.h +++ b/src/translation/translation.h @@ -636,6 +636,7 @@ typedef enum { TR_BUILDING_LARGE_TEMPLE_PHASE_2, TR_BUILDING_LARGE_TEMPLE_PHASE_1_TEXT, TR_BUILDING_LARGE_TEMPLE_PHASE_2_TEXT, + TR_BUILDING_ORACLE_DESC, TR_BUILDING_ORACLE_PHASE_1, TR_BUILDING_ORACLE_PHASE_2, TR_BUILDING_ORACLE_PHASE_1_TEXT, diff --git a/src/window/building/culture.c b/src/window/building/culture.c index efba3ba361..f0278da499 100644 --- a/src/window/building/culture.c +++ b/src/window/building/culture.c @@ -649,10 +649,12 @@ void window_building_draw_oracle(building_info_context *c) window_building_play_sound(c, "wavs/oracle.wav"); outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks); lang_text_draw_centered(110, 0, c->x_offset, c->y_offset + 12, 16 * c->width_blocks, FONT_LARGE_BLACK); - window_building_draw_description_at(c, BLOCK_SIZE * c->height_blocks - 248, 110, 1); + window_building_draw_description_at(c, BLOCK_SIZE * c->height_blocks - 148, 110, 1); inner_panel_draw(c->x_offset + 16, c->y_offset + 146, c->width_blocks - 2, 4); window_building_draw_employment(c, 152); window_building_draw_risks(c, c->x_offset + c->width_blocks * BLOCK_SIZE - 76, c->y_offset + 154); + text_draw_multiline(translation_for(TR_BUILDING_ORACLE_DESC), + c->x_offset + 32, c->y_offset + 56, 14 * c->width_blocks, 0, FONT_NORMAL_BLACK, 0); } else { outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks); lang_text_draw_centered(110, 0, c->x_offset, c->y_offset + 12, 16 * c->width_blocks, FONT_LARGE_BLACK); @@ -1310,10 +1312,11 @@ void window_building_draw_nymphaeum(building_info_context *c) text_draw_centered(translation_for(TR_BUILDING_NYMPHAEUM), c->x_offset, c->y_offset + 12, BLOCK_SIZE * c->width_blocks, FONT_LARGE_BLACK, 0); text_draw_multiline(translation_for(TR_BUILDING_NYMPHAEUM_DESC), - c->x_offset + 22, c->y_offset + 56, 14 * c->width_blocks, 0, FONT_NORMAL_BLACK, 0); + c->x_offset + 32, c->y_offset + 56, 14 * c->width_blocks, 0, FONT_NORMAL_BLACK, 0); inner_panel_draw(c->x_offset + 16, c->y_offset + 146, c->width_blocks - 2, 4); window_building_draw_employment(c, 152); window_building_draw_risks(c, c->x_offset + c->width_blocks * BLOCK_SIZE - 76, c->y_offset + 154); + window_building_draw_description_at(c, BLOCK_SIZE * c->height_blocks - 148, 110, 1); } else { outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks); text_draw_centered(translation_for(TR_BUILDING_NYMPHAEUM), diff --git a/src/window/building_info.c b/src/window/building_info.c index 893df0c08a..7cdd8a037b 100644 --- a/src/window/building_info.c +++ b/src/window/building_info.c @@ -183,8 +183,6 @@ static int get_height_id(void) case BUILDING_LARGE_TEMPLE_MERCURY: case BUILDING_LARGE_TEMPLE_MARS: case BUILDING_LARGE_TEMPLE_VENUS: - case BUILDING_ORACLE: - case BUILDING_NYMPHAEUM: case BUILDING_SMALL_MAUSOLEUM: case BUILDING_LARGE_MAUSOLEUM: case BUILDING_ARMOURY: @@ -197,7 +195,9 @@ static int get_height_id(void) case BUILDING_AMPHITHEATER: case BUILDING_ARENA: case BUILDING_CONCRETE_MAKER: - return 5; + case BUILDING_ORACLE: + case BUILDING_NYMPHAEUM: + return 5; case BUILDING_DOCK: case BUILDING_LIGHTHOUSE: