maintenance: add mission fire_damage option

Author: dalerank

src/building/building.cpp

@@ -976,6 +976,7 @@ void building_impl::on_tick(bool refresh_only) {
 void building_impl::static_params::load(archive arch) {
     labor_category = arch.r_type<e_labor_category>("labor_category");
     fire_proof = arch.r_bool("fire_proof");
+    fire_risk_update = arch.r_int("fire_risk_update", 50);
     damage_proof = arch.r_bool("damage_proof");
     input_resource = arch.r_type<e_resource>("input_resource");
     input_resource_second = arch.r_type<e_resource>("input_resource_second");

src/building/building.h

@@ -392,6 +392,7 @@ class building_impl {
         static static_params dummy;
         pcstr name;
         bool fire_proof;
+        int8_t fire_risk_update;
         bool damage_proof;
         bool is_draggable;
         xstring meta_id;

src/building/building_house.cpp

@@ -211,7 +211,8 @@ void building_house::bind_dynamic(io_buffer *iob, size_t version) {
 }
 
 int building_house::get_fire_risk(int value) const {
-    if (house_level() == BUILDING_HOUSE_VACANT_LOT && is_vacant_lot()) {
+    const bool is_empty = (house_level() == HOUSE_CRUDE_HUT) && is_vacant_lot();
+    if (is_empty) {
         return 0;
     }
 

src/building/maintenance.cpp

@@ -127,10 +127,6 @@ void building_maintenance_check_fire_collapse(void) {
     int max_id = building_get_highest_id();
 
     buildings_valid_do([&] (building &b) {
-        if (b.fire_proof) {
-            return;
-        }
-
         const model_building *model = model_get_building(b.type);
 
         /////// COLLAPSE
@@ -150,34 +146,21 @@ void building_maintenance_check_fire_collapse(void) {
         }
 
         /////// FIRE
-        int random_building = (b.id + map_random_get(b.tile.grid_offset())) & 7;
-        if (random_building == random_global) {
+        int random_building = (b.id + map_random_get(b.tile)) & 7;
+        if (!b.fire_proof && random_building == random_global) {
             b.fire_risk += model->fire_risk;
-            int expected_fire_risk = 0;
-            auto house = b.dcast_house();
-            if (!house) {
-                expected_fire_risk += 50;
-            } else if (house && house->house_population() <= 0) {
-                expected_fire_risk = 0;
-            } else if (house && house->house_level() <= HOUSE_COMMON_SHANTY) {
-                expected_fire_risk += 100;
-            } else if (house && house->house_level() <= HOUSE_COMMON_MANOR) {
-                expected_fire_risk += 50;
-            } else {
-                expected_fire_risk += 20;
-            }
-
-            if (tutorial_extra_fire_risk()) {
-                expected_fire_risk += 50;
-            }
+            
+            int expected_fire_risk = building_impl::params(b.type).fire_risk_update;
 
+            expected_fire_risk += scenario_additional_fire_damage(b.type);
             expected_fire_risk = b.dcast()->get_fire_risk(expected_fire_risk);
             b.fire_risk += expected_fire_risk;
             //            if (climate == CLIMATE_NORTHERN)
             //                b->fire_risk = 0;
             //            else if (climate == CLIMATE_DESERT)
             //                b->fire_risk += 30;
         }
+
         if (b.fire_risk > 1000) {
             fire_building(&b);
             recalculate_terrain = 1;

src/game/tutorial.cpp

@@ -307,7 +307,8 @@ int tutorial_handle_fire() {
         return 0;
     }
 
-    g_tutorials_flags.tutorial_1.fire = 1;
+    g_tutorials_flags.tutorial_1.fire = true;
+    g_scenario_data.add_fire_damage.clear();
     building_menu_update(tutorial_stage.tutorial_fire);
     post_message(MESSAGE_TUTORIAL_FIRE_IN_THE_VILLAGE);
     return 1;

src/game/tutorial.h

@@ -99,7 +99,6 @@ int tutorial_get_immediate_goal_text();
 
 int tutorial_adjust_request_year(int* year);
 
-int tutorial_extra_fire_risk();
 int tutorial_extra_damage_risk();
 
 int tutorial_handle_fire();

src/scenario/scenario.cpp

@@ -59,15 +59,22 @@ void scenario_load_meta_data(const mission_id_t &missionid) {
         }
 
         g_scenario_data.init_resources.clear();
-        arch.r_array("resources", [&] (archive res) {
-            e_resource resource = arch.r_type<e_resource>("resource");
-            bool allowed = arch.r_bool("allowed");
+        arch.r_objects("resources", [] (pcstr key, archive rarch) {
+            e_resource resource = rarch.r_type<e_resource>("type");
+            bool allowed = rarch.r_bool("allow");
             g_scenario_data.init_resources.push_back({ resource, allowed });
         });
 
+        g_scenario_data.add_fire_damage.clear();
+        arch.r_objects("fire_damage", [&] (pcstr key, archive barch) {
+            e_building_type type = barch.r_type<e_building_type>("type");
+            int8_t value = barch.r_int("value");
+            g_scenario_data.add_fire_damage.push_back({ type, value });
+        });
+
         g_scenario_data.building_stages.clear();
-        arch.r_objects("stages", [](pcstr key, archive stage_arch) {
-            auto buildings = archive::r_array_num<e_building_type>(stage_arch);
+        arch.r_objects("stages", [](pcstr key, archive sarch) {
+            auto buildings = archive::r_array_num<e_building_type>(sarch);
             g_scenario_data.building_stages.push_back({key, buildings});
         });
     });
@@ -125,6 +132,12 @@ bool scenario_is_mission_rank(custom_span<int> missions) {
     return false;
 }
 
+int scenario_additional_fire_damage(e_building_type type) {
+    const auto &dmg = g_scenario_data.add_fire_damage;
+    auto it = std::find_if(dmg.begin(), dmg.end(), [type] (auto &i) { return i.type == type; });
+    return (it != dmg.end()) ? it->value : 0;
+}
+
 int scenario_is_before_mission(int mission) {
     return !g_scenario_data.settings.is_custom && g_scenario_data.settings.campaign_mission_rank < mission;
 }

src/scenario/scenario.h

@@ -156,6 +156,11 @@ struct demand_change_t {
     int is_rise;
 };
 
+struct add_fire_damage_t {
+    e_building_type type;
+    int8_t value;
+};
+
 struct building_stage_t {
     xstring key;
     std::vector<e_building_type> buildings;
@@ -263,7 +268,7 @@ struct scenario_data_t {
 
     bool allowed_buildings[BUILDING_MAX] = { 0 };
     std::vector<resource_allow> init_resources;
-
+    std::vector<add_fire_damage_t> add_fire_damage;
     std::vector<building_stage_t> building_stages;
 
     struct {
@@ -334,39 +339,41 @@ bool scenario_is_mission_rank(const Args ... args) {
     return scenario_is_mission_rank(make_span(values));
 }
 
+int scenario_additional_fire_damage(e_building_type type);
+
 int scenario_is_before_mission(int mission);
 
-int scenario_starting_kingdom(void);
+int scenario_starting_kingdom();
 
-int scenario_starting_personal_savings(void);
+int scenario_starting_personal_savings();
 
-const uint8_t* scenario_name(void);
+const uint8_t* scenario_name();
 
 void scenario_set_name(const uint8_t* name);
 
-int scenario_is_open_play(void);
+int scenario_is_open_play();
 
-int scenario_open_play_id(void);
+int scenario_open_play_id();
 
-int scenario_property_climate(void);
+int scenario_property_climate();
 
-int scenario_property_start_year(void);
+int scenario_property_start_year();
 
 int scenario_property_kingdom_supplies_grain();
 
-int scenario_property_enemy(void);
+int scenario_property_enemy();
 
-int scenario_property_player_rank(void);
+int scenario_property_player_rank();
 
-int scenario_image_id(void);
+int scenario_image_id();
 
-const uint8_t* scenario_subtitle(void);
+const uint8_t* scenario_subtitle();
 
-int scenario_initial_funds(void);
+int scenario_initial_funds();
 
-int scenario_rescue_loan(void);
+int scenario_rescue_loan();
 
-int scenario_property_monuments_is_enabled(void);
+int scenario_property_monuments_is_enabled();
 int scenario_property_monument(int field);
 void scenario_set_monument(int field, int m);
 

src/scripts/buildings.js

@@ -113,6 +113,7 @@ building_house_crude_hut = {
   },
   building_size : 1,
   num_types : 2,
+  fire_risk_update : 100,
   is_draggable : true,
   window_info_height_id : 5,
 }
@@ -123,6 +124,7 @@ building_house_sturdy_hut = {
     minimap: {pack: PACK_GENERAL, id:148},
   },
   building_size : 1,
+  fire_risk_update : 100,
   num_types : 2,
   window_info_height_id : 5,
 }
@@ -133,6 +135,7 @@ building_house_meager_shanty = {
     minimap: {pack: PACK_GENERAL, id:148},
   },
   building_size : 1,
+  fire_risk_update : 100,
   num_types : 2,
   window_info_height_id : 5,
 }
@@ -143,6 +146,7 @@ building_house_common_shanty = {
     minimap: {pack: PACK_GENERAL, id:148},
   },
   building_size : 1,
+  fire_risk_update : 100,
   num_types : 2,
   window_info_height_id : 5,
 }

src/scripts/missions.js

@@ -15,6 +15,13 @@ var mission0 = { // Nubt
 	gods_least_mood : 50,
 	religion_enabled : false,
 	player_rank : 0,
+
+	fire_damage : {
+		house0: { type:BUILDING_HOUSE_CRUDE_HUT, value: +50 },	
+		house1: { type:BUILDING_HOUSE_STURDY_HUT, value: +50 },	
+		house2: { type:BUILDING_HOUSE_STURDY_HUT, value: +50 },	
+	},
+
 	stages : {
 		tutorial_fire: [BUILDING_FIREHOUSE],
 		tutorial_food: [BUILDING_HUNTING_LODGE, BUILDING_GRANARY, BUILDING_BAZAAR],
@@ -371,9 +378,13 @@ var mission9 = { // Abu
 	choice_image1_pos : [192, 144],
 	choice_title : [144, 22],
 
-	resources : [
-				  RESOURCE_GRAIN, RESOURCE_BARLEY, RESOURCE_FLAX, RESOURCE_LETTUCE, RESOURCE_CHICKPEAS
-				],
+	resources : {
+		grain : { type:RESOURCE_GRAIN, allow: true},
+		barley: { type:RESOURCE_BARLEY, allow: true},
+		flax: { type:RESOURCE_FLAX, allow:true},
+		lettuce: { type:RESOURCE_LETTUCE, allow:true},
+		chickpeas: { type:RESOURCE_CHICKPEAS, allow:true},
+	},
 
 	buildings : [
 		         BUILDING_SMALL_STATUE, BUILDING_MEDIUM_STATUE, BUILDING_LARGE_STATUE, BUILDING_GARDENS, BUILDING_PLAZA,