Merge pull request #82978 from RenechCDDA/planting_window_search

More improvements to planting

Author: Maleclypse

doc/JSON/ITEM.md

@@ -982,6 +982,7 @@ Gun mods can be defined like this:
   { "GROWTH_HARVEST": "2 days" },         // will want at least 91 days (the length of winter) in between some stages. This example would overwinter in the GROWTH_MATURE form.
   { "GROWTH_OVERGROWN": "1 hour" }        // NOTE: GROWTH_OVERGROWN is optional, but if used should be a short duration. Or else it may fail to plant because the overgrown(dead) crops would not 'grow'!
 ],
+"growth_temp": "7 C",                     // (optional, default 10 C). Celsius (C) or milli-Celsius(mC). Temperature required on the days this seed is planted and for every day with a growth stage. If below the required temperature it simply won't be plantable.
 "fruit_div": 2, // (optional, default is 1). Final amount of fruit charges produced is divided by this number. Works only if fruit item is counted by charges.
 "required_terrain_flag": "PLANTABLE" // A tag that terrain and furniture would need to have in order for the seed to be plantable there.
 // Default is "PLANTABLE", and using this will cause any terain the plant is wrown on to turn into dirt once the plant is planted, unless furniture is used.

src/item_factory.cpp

@@ -3440,6 +3440,7 @@ void islot_seed::deserialize( const JsonObject &jo )
     mandatory( jo, was_loaded, "fruit", fruit_id );
     mandatory( jo, was_loaded, "growth_stages", growth_stages,
                pair_reader<flag_id, time_duration> {} );
+    optional( jo, was_loaded, "growth_temp", growth_temp, 10_C );
     optional( jo, was_loaded, "seeds", spawn_seeds, true );
     optional( jo, was_loaded, "byproducts", byproducts );
     optional( jo, was_loaded, "required_terrain_flag", required_terrain_flag,

src/itype.cpp

@@ -290,6 +290,11 @@ const std::vector<std::pair<flag_id, time_duration>> &islot_seed::get_growth_sta
     return growth_stages;
 }
 
+units::temperature islot_seed::get_growth_temp() const
+{
+    return growth_temp;
+}
+
 int islot_armor::avg_env_resist() const
 {
     int acc = 0;

src/itype.h

@@ -1192,11 +1192,14 @@ struct islot_seed {
         islot_seed() = default;
 
         const std::vector<std::pair<flag_id, time_duration>> &get_growth_stages() const;
+        units::temperature get_growth_temp() const;
     private:
         /**
         * What stages of growth does this plant have? How long does each stage of growth last?
         */
         std::vector<std::pair<flag_id, time_duration>> growth_stages;
+        // Temperature needs to be at or above this temp for the plant to be planted/grow.
+        units::temperature growth_temp;
 };
 
 enum condition_type {

src/weather.cpp

@@ -873,6 +873,28 @@ rl_vec2d convert_wind_to_coord( const int angle )
     return rl_vec2d( 0, 0 );
 }
 
+static units::temperature highest_temp_on_day( time_point &base_date, const tripoint_abs_omt &pos,
+        const weather_generator &weather_gen )
+{
+    units::temperature highest_temp = 0_C;
+    // we search a 24 hour period around the base_date, the base_date is exactly in the center
+    const time_duration search_radius = 12_hours;
+    // how long between each check. The performance on this shouldn't be a problem, but if we want more/less granularity this is a simple lever.
+    const time_duration check_interval = 15_minutes;
+
+    // Iterate through the search window, checking temp each check_interval. Highest found value in the entire range is what ends up being returned.
+    time_point check_date = base_date - search_radius;
+    while( check_date <= base_date + search_radius ) {
+        const w_point &w = weather_gen.get_weather( project_to<coords::ms>( pos ), check_date,
+                           g->get_seed() );
+        const units::temperature checked_temp = w.temperature;
+        highest_temp = std::max( highest_temp, checked_temp );
+        check_date = check_date + check_interval;
+    }
+
+    return highest_temp;
+}
+
 bool warm_enough_to_plant( const tripoint_bub_ms &pos, const itype_id &it )
 {
     const tripoint_abs_ms abs = get_map().get_abs( pos );
@@ -883,29 +905,28 @@ bool warm_enough_to_plant( const tripoint_bub_ms &pos, const itype_id &it )
 bool warm_enough_to_plant( const tripoint_abs_omt &pos, const itype_id &it )
 {
     std::map<time_point, units::temperature> planting_times;
-    // initialize the first...
-    time_point check_date = calendar::turn;
-    planting_times[check_date] = get_weather().get_area_temperature( pos );
     bool okay_to_plant = true;
     const std::vector<std::pair<flag_id, time_duration>> &growth_stages = it->seed->get_growth_stages();
-    // and now iterate a copy of the weather into the future to see if they'll be plantable then as well.
+    // we will iterate a copy of the weather into the future to see if they'll be plantable then as well.
     const weather_generator weather_gen = get_weather().get_cur_weather_gen();
+    // initialize the first...
+    time_point check_date = calendar::turn;
+    planting_times[check_date] = highest_temp_on_day( check_date, pos, weather_gen );
     for( const auto &pair : growth_stages ) {
         // TODO: Replace epoch checks with data from a farmer's almanac
         check_date = check_date + pair.second;
-        const w_point &w = weather_gen.get_weather( project_to<coords::ms>( pos ), check_date,
-                           g->get_seed() );
-        planting_times[check_date] = w.temperature;
+        planting_times[check_date] = highest_temp_on_day( check_date, pos, weather_gen );
     }
     for( const std::pair<const time_point, units::temperature> &pair : planting_times ) {
         // This absolutely needs to be a time point.
         add_msg_debug( debugmode::DF_MAP,
-                       "Checking plant time %s, temperature %s F…",
+                       "Checking plant time %s, highest temperature %s…",
                        //NOLINTNEXTLINE(cata-translations-in-debug-messages)
-                       to_string( pair.first ), units::to_fahrenheit( pair.second ) );
-        // semi-appropriate temperature for most plants
-        if( pair.second < units::from_fahrenheit( 50 ) ) {
-            add_msg_debug( debugmode::DF_MAP, "Planting failure!" );
+                       to_string( pair.first ), print_temperature( pair.second, 2 ) );
+        if( pair.second < it->seed->get_growth_temp() ) {
+            add_msg_debug( debugmode::DF_MAP, "Planting failure!  %s needs temperature of %s but found only %s",
+                           it->nname( 1 ), print_temperature( it->seed->get_growth_temp(), 2 ),
+                           print_temperature( pair.second, 2 ) );
             okay_to_plant = false;
             break;
         }