Skip to content

Commit

Permalink
Add placeholder text for mausoleum construction phases
Browse files Browse the repository at this point in the history
Also properly type "mausoleum" in the code
  • Loading branch information
crudelios committed Jul 21, 2023
1 parent 546c00b commit 5f0e0f6
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/building/monument.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static const monument_type hippodrome = {
}
};

static const monument_type oracle_and_small_mausuleum = {
static const monument_type oracle_and_small_mausoleum = {
.phases = 2,
.resources = {
{ [ARCHITECTS] = 1, [RESOURCE_MARBLE] = 2 },
Expand All @@ -108,7 +108,7 @@ static const monument_type large_temple_and_nymphaeum = {
}
};

static const monument_type large_mausuleum = {
static const monument_type large_mausoleum = {
.phases = 3,
.resources = {
{ [ARCHITECTS] = 1, [RESOURCE_STONE] = 8, [RESOURCE_CONCRETE] = 4 },
Expand Down Expand Up @@ -141,7 +141,7 @@ static const monument_type *MONUMENT_TYPES[BUILDING_TYPE_MAX] = {
[BUILDING_GRAND_TEMPLE_MARS] = &grand_temple,
[BUILDING_GRAND_TEMPLE_VENUS] = &grand_temple,
[BUILDING_PANTHEON] = &pantheon,
[BUILDING_ORACLE] = &oracle_and_small_mausuleum,
[BUILDING_ORACLE] = &oracle_and_small_mausoleum,
[BUILDING_LARGE_TEMPLE_CERES] = &large_temple_and_nymphaeum,
[BUILDING_LARGE_TEMPLE_NEPTUNE] = &large_temple_and_nymphaeum,
[BUILDING_LARGE_TEMPLE_MERCURY] = &large_temple_and_nymphaeum,
Expand All @@ -151,8 +151,8 @@ static const monument_type *MONUMENT_TYPES[BUILDING_TYPE_MAX] = {
[BUILDING_COLOSSEUM] = &colosseum,
[BUILDING_HIPPODROME] = &hippodrome,
[BUILDING_NYMPHAEUM] = &large_temple_and_nymphaeum,
[BUILDING_LARGE_MAUSOLEUM] = &large_mausuleum,
[BUILDING_SMALL_MAUSOLEUM] = &oracle_and_small_mausuleum,
[BUILDING_LARGE_MAUSOLEUM] = &large_mausoleum,
[BUILDING_SMALL_MAUSOLEUM] = &oracle_and_small_mausoleum,
[BUILDING_CARAVANSERAI] = &caravanserai,
[BUILDING_CITY_MINT] = &city_mint
};
Expand Down
6 changes: 3 additions & 3 deletions src/city/health.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,10 @@ void city_health_update(void)
}
house_health += b->data.house.num_foods * 15;

int mausuleum_health = building_count_active(BUILDING_SMALL_MAUSOLEUM);
mausuleum_health += building_count_active(BUILDING_LARGE_MAUSOLEUM) * 2;
int mausoleum_health = building_count_active(BUILDING_SMALL_MAUSOLEUM);
mausoleum_health += building_count_active(BUILDING_LARGE_MAUSOLEUM) * 2;

house_health += calc_bound(mausuleum_health, 0, 10);
house_health += calc_bound(mausoleum_health, 0, 10);

int health_cap = (model_get_house(b->subtype.house_level)->food_types && !b->data.house.num_foods) ?
40 : 100;
Expand Down
5 changes: 5 additions & 0 deletions src/translation/english.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,11 @@ static translation_string all_strings[] = {
{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 amongst the living." },
{TR_BUILDING_LARGE_MAUSOLEUM, "Large Mausoleum"},
{TR_BUILDING_LARGE_MAUSOLEUM_DESC, "The polished marble walls and statues of this magnificent structure reflect the great deeds of the patricians who earned the privilege of resting here." },
{TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1, "(Placeholder phase 1)" },
{TR_BUILDING_LARGE_MAUSOLEUM_PHASE_2, "(Plaseholder phase 2)" },
{TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1_TEXT, "Areldir is cnostruction a magnificient phase 1 constrution text." },
{TR_BUILDING_LARGE_MAUSOLEUM_PHASE_2_TEXT, "The second construction phase text is being prepared by Areldir. It will be glorious." },
{TR_BUILDING_LARGE_MAUSOLEUM_CONSTRUCTION_DESC, "Constructing this mausoleum will require material stored in a warehouse, laborers from a work camp, and architects from an architects' guild." },
{TR_FIGURE_TYPE_WATCHMAN, "Watchman" },
{TR_BUILDING_MARS_TEMPLE_MODULE_DESC_NO_MESS, "This temple will collect food for your supply post, once one is constructed." },
{TR_TOOLTIP_BUTTON_ROADBLOCK_PERMISSION_MAINTENANCE, "Toggle prefects and engineers access" },
Expand Down
5 changes: 5 additions & 0 deletions src/translation/translation.h
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,11 @@ typedef enum {
TR_BUILDING_SMALL_MAUSOLEUM_DESC,
TR_BUILDING_LARGE_MAUSOLEUM,
TR_BUILDING_LARGE_MAUSOLEUM_DESC,
TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1,
TR_BUILDING_LARGE_MAUSOLEUM_PHASE_2,
TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1_TEXT,
TR_BUILDING_LARGE_MAUSOLEUM_PHASE_2_TEXT,
TR_BUILDING_LARGE_MAUSOLEUM_CONSTRUCTION_DESC,
TR_FIGURE_TYPE_WATCHMAN,
TR_TOOLTIP_BUTTON_ROADBLOCK_PERMISSION_MAINTENANCE,
TR_TOOLTIP_BUTTON_ROADBLOCK_PERMISSION_PRIEST,
Expand Down
10 changes: 8 additions & 2 deletions src/window/building/culture.c
Original file line number Diff line number Diff line change