diff --git a/src/building/monument.c b/src/building/monument.c index a092b0d9dc..2f4521955d 100644 --- a/src/building/monument.c +++ b/src/building/monument.c @@ -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 }, @@ -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 }, @@ -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, @@ -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 }; diff --git a/src/city/health.c b/src/city/health.c index 678b2a58a8..637325c8eb 100644 --- a/src/city/health.c +++ b/src/city/health.c @@ -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; diff --git a/src/translation/english.c b/src/translation/english.c index 63729b9787..d651a5484c 100644 --- a/src/translation/english.c +++ b/src/translation/english.c @@ -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" }, diff --git a/src/translation/translation.h b/src/translation/translation.h index 1b5e8d7070..7426f36963 100644 --- a/src/translation/translation.h +++ b/src/translation/translation.h @@ -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, diff --git a/src/window/building/culture.c b/src/window/building/culture.c index cd2281b412..423550a19f 100644 --- a/src/window/building/culture.c +++ b/src/window/building/culture.c @@ -524,6 +524,12 @@ static void window_building_draw_monument_small_temple_construction_process(buil TR_BUILDING_SMALL_TEMPLE_PHASE_1_TEXT, TR_BUILDING_SMALL_TEMPLE_CONSTRUCTION_DESC); } +static void window_building_draw_monument_large_mausoleum_construction_process(building_info_context *c) +{ + window_building_draw_monument_construction_process(c, TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1, + TR_BUILDING_LARGE_MAUSOLEUM_PHASE_1_TEXT, TR_BUILDING_LARGE_MAUSOLEUM_CONSTRUCTION_DESC); +} + static void window_building_draw_monument_temple_construction_process(building_info_context *c) { window_building_draw_monument_construction_process(c, TR_BUILDING_GRAND_TEMPLE_PHASE_1, @@ -1240,7 +1246,7 @@ void window_building_draw_large_mausoleum(building_info_context *c) { c->help_id = 67; building *b = building_get(c->building_id); - if (b->monument.phase <= 0) { + if (b->monument.phase == MONUMENT_FINISHED) { window_building_play_sound(c, "wavs/oracle.wav"); outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks); text_draw_centered(translation_for(TR_BUILDING_LARGE_MAUSOLEUM), @@ -1253,7 +1259,7 @@ void window_building_draw_large_mausoleum(building_info_context *c) outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks); text_draw_centered(translation_for(TR_BUILDING_LARGE_MAUSOLEUM), c->x_offset, c->y_offset + 12, BLOCK_SIZE * c->width_blocks, FONT_LARGE_BLACK, 0); - window_building_draw_monument_small_temple_construction_process(c); + window_building_draw_monument_large_mausoleum_construction_process(c); } }