Second Event editor update

CMakeLists.txt

@@ -669,6 +669,7 @@ set(WINDOW_FILES
     ${PROJECT_SOURCE_DIR}/src/window/editor/invasions.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/map.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/model_data.c
+    ${PROJECT_SOURCE_DIR}/src/window/editor/house_model_data.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/price_changes.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/requests.c
     ${PROJECT_SOURCE_DIR}/src/window/editor/scenario_events.c

res/assets/Graphics/ui.xml

@@ -1419,13 +1419,14 @@
 	<image id="rightbracket_white_l" src="rightbracket_white_l"/>
 	<image id="curlybracket_white_left" src="curlybracket_white_left"/>
 	<image id="curlybracket_white_right" src="curlybracket_white_right"/>
-    <image src="Plus_Button_Idle" id="Plus_Button_Idle"/>
-    <image group="this" image="Plus_Button_Idle"/>
-    <image src="Plus_Button_Click"/>
-    <image src="Edit_Button_Idle" id="Edit_Button_Idle"/>
-    <image group="this" image="Edit_Button_Idle"/>
-    <image src="Edit_Button_Click"/>
-    <image src="LandWaypoint" id="LandWaypoint"/>
-    <image src="SeaWaypoint" id="SeaWaypoint"/>
-    <image src="LandWaypoint" id="BorderWaypoint"/>
+  <image id="abstract_caret_symbol" src="abstract_caret_symbol"/>
+  <image src="Plus_Button_Idle" id="Plus_Button_Idle"/>
+  <image group="this" image="Plus_Button_Idle"/>
+  <image src="Plus_Button_Click"/>
+  <image src="Edit_Button_Idle" id="Edit_Button_Idle"/>
+  <image group="this" image="Edit_Button_Idle"/>
+  <image src="Edit_Button_Click"/>
+  <image src="LandWaypoint" id="LandWaypoint"/>
+  <image src="SeaWaypoint" id="SeaWaypoint"/>
+  <image src="LandWaypoint" id="BorderWaypoint"/>
 </assetlist>

src/assets/assets.c

@@ -85,6 +85,7 @@ void assets_init(int force_reload, color_t **main_images, int *main_image_widths
     data.font_lookup[ASSET_FONT_SQ_BRACKET_RIGHT] = assets_get_image_id("UI", "rightbracket_white_l");
     data.font_lookup[ASSET_FONT_CRLY_BRACKET_LEFT] = assets_get_image_id("UI", "curlybracket_white_left");
     data.font_lookup[ASSET_FONT_CRLY_BRACKET_RIGHT] = assets_get_image_id("UI", "curlybracket_white_right");
+    data.font_lookup[ASSET_FONT_ABSTRACT_CARET_SYMBOL] = assets_get_image_id("UI", "abstract_caret_symbol");
 
 }
 

src/assets/assets.h

@@ -49,6 +49,7 @@ typedef enum {
 	ASSET_FONT_SQ_BRACKET_RIGHT,
 	ASSET_FONT_CRLY_BRACKET_LEFT,
 	ASSET_FONT_CRLY_BRACKET_RIGHT,
+    ASSET_FONT_ABSTRACT_CARET_SYMBOL,
 	ASSET_FONT_MAX_KEY
 } asset_font_id;
 

src/building/building.c

@@ -415,7 +415,7 @@ int building_repair_cost(building *b)
 
     if (building_is_house(og_type)) {
         grid_slice *house_slice = map_grid_get_grid_slice_house(b->id, 1);
-        int clear_cost = house_slice->size * (11 + 3); // 10.5 per new house tile + 3 per rubble tile to clear
+        int clear_cost = house_slice->size * (11 + model_get_building(BUILDING_REPAIR_LAND)->cost); // 10.5 per new house tile + cost of repair land per rubble tile to clear
         return clear_cost;
     }
     if (b->type == BUILDING_WAREHOUSE_SPACE) {

src/building/construction_building.c

@@ -92,7 +92,7 @@ int building_construction_prepare_terrain(grid_slice *grid_slice, clear_mode cle
                 break;
         }
         if (map_terrain_is(g_offset, terrain_mask_to_remove)) {
-            total_cost += (cost == COST_FREE) ? 0 : 3; // base cost per tile is 50% more than regular clear
+            total_cost += (cost == COST_FREE) ? 0 : model_get_building(BUILDING_REPAIR_LAND)->cost; // base cost per tile is the cost of repair land
             if (cost != COST_MEASURE) {
                 map_terrain_remove(g_offset, terrain_mask_to_remove);
             }

src/building/construction_building.h

@@ -15,7 +15,7 @@ typedef enum {
     COST_FREE = -1, // perform operation for free
     COST_MEASURE = 0, // measure cost only, do not perform operation
     COST_PROCESS = 1 // perform operation for a cost
-}cost_calculation;
+} cost_calculation;
 /**
  * @brief Places a building of the specified type at the given coordinates
  * CAREFUL: x and y are offset depending on city orientation, can cause problems with exact coordinates given
@@ -47,5 +47,3 @@ int building_construction_fill_vacant_lots(grid_slice *area);
 int building_construction_prepare_terrain(grid_slice *grid_slice, clear_mode clear_mode, cost_calculation cost);
 
 #endif // BUILDING_CONSTRUCTION_BUILDING_H
-
-

src/building/figure.c

@@ -1611,6 +1611,8 @@ static void spawn_figure_barracks(building *b)
         if (city_data.mess_hall.food_stress_cumulative > 20) {
             spawn_delay += city_data.mess_hall.food_stress_cumulative - 20;
         }
+
+        spawn_delay = calc_adjust_with_percentage(spawn_delay, resource_get_data(RESOURCE_TROOPS)->production_per_month);
 
         b->figure_spawn_delay++;
         if (b->figure_spawn_delay > spawn_delay) {

src/building/house_evolution.c

@@ -65,18 +65,12 @@ static int has_required_goods_and_services(building *house, int for_upgrade, int
     // water
     int water = model->water;
     if (!house->has_water_access) {
-        if (water >= 2) {
-            if (level > HOUSE_SMALL_CASA) {
-                ++demands->missing.fountain;
-                return  0;
-            } else if (!house->has_well_access) {
-                ++demands->missing.well;
-                return 0;
-            } else if (level > HOUSE_LARGE_SHACK && !house->has_latrines_access) {
-                return 0;
-            }
-        }
-        if (water == 1 && !house->has_well_access) {
+        if (water > 2) {
+            ++demands->missing.fountain;
+            return 0;
+        } else if (water > 1 && !house->has_latrines_access) {
+            return 0;
+        } if (water == 1 && !house->has_well_access) {
             ++demands->missing.well;
             return 0;
         }
@@ -628,21 +622,19 @@ void building_house_determine_evolve_text(building *house, int worst_desirabilit
         if (!house->has_well_access) {
             house->data.house.evolve_text_id = 1;
             return;
-        } else if (!house->has_latrines_access) {
-            house->data.house.evolve_text_id = 68;
-            return;
         }
     }
 
     if (water == 2 && !house->has_water_access) {
         if (!house->has_latrines_access) {
             house->data.house.evolve_text_id = 67;
             return;
-        } else if (level >= HOUSE_LARGE_CASA) {
-            house->data.house.evolve_text_id = 2;
-            return;
         }
     }
+
+    if (water == 3 && !house->has_water_access) {
+        house->data.house.evolve_text_id = 2;
+    }
 
     // entertainment
     int entertainment = model->entertainment;
@@ -788,14 +780,18 @@ void building_house_determine_evolve_text(building *house, int worst_desirabilit
         if (!house->has_well_access) {
             house->data.house.evolve_text_id = 31;
             return;
-        } else if (!house->has_latrines_access) {
-            house->data.house.evolve_text_id = 68;
-            return;
         }
     }
 
     if (water == 2 && !house->has_water_access) {
-        if (level >= HOUSE_LARGE_CASA && house->has_well_access && house->has_latrines_access) {
+        if (!house->has_latrines_access || !house->has_well_access) {
+            house->data.house.evolve_text_id = 68;        
+            return;
+        }
+    }
+
+    if (water == 3 && !house->has_water_access) {
+        if (house->has_well_access && house->has_latrines_access) {
             house->data.house.evolve_text_id = 32;
             return;
         }