Improve crop farming. (#24291)

Improved crop farming: * Added "water requirement" and "weed susceptibility" plant parameters * Added carrot and sugar beet * Added function to calculate effective plant grow time * Added more berries * Added more seed parameters * Added mushrooms and shrubs * Added temperature dependence to the plant grow time * Added warm_enough_to_safe_plant() function * Updated minimal planting temperature * Updated crops grow * Updated crops interactions * Updated mission with plants * Updated plant grow * Updated plant processing * Updated seed data
CleverRaven · Aug 27, 2018 · 6b3eda6 · 6b3eda6
1 parent 4205ba5
commit 6b3eda6
Show file tree

Hide file tree

Showing 19 changed files with 1,170 additions and 218 deletions.
diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -124,8 +124,17 @@
     "description": "A sandbag, typically used for blocking bullets.",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "CLIMB_SIMPLE", "TRANSPARENT", "MOUNTABLE", "BLOCKSDOOR", "SHORT",
-      "EASY_DECONSTRUCT", "THIN_OBSTACLE", "CLIMBABLE", "PERMEABLE" ],
+    "flags": [
+      "CLIMB_SIMPLE",
+      "TRANSPARENT",
+      "MOUNTABLE",
+      "BLOCKSDOOR",
+      "SHORT",
+      "EASY_DECONSTRUCT",
+      "THIN_OBSTACLE",
+      "CLIMBABLE",
+      "PERMEABLE"
+    ],
     "examine_action": "chainfence",
     "deconstruct": { "items": [ { "item": "bag_canvas", "count": 2 }, { "item": "material_sand", "charges": 20 } ] },
     "bash": {
@@ -1810,6 +1819,240 @@
     "examine_action": "aggie_plant",
     "bash": { "str_min": 4, "str_max": 10, "sound": "crunch.", "sound_fail": "whish." }
   },
+  {
+    "type": "furniture",
+    "id": "f_mushroom_seed",
+    "name": "starting mushroom bed",
+    "symbol": "^",
+    "color": "white",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant"
+  },
+  {
+    "type": "furniture",
+    "id": "f_mushroom_seedling",
+    "name": "weak mushroom bed",
+    "symbol": "#",
+    "color": "white",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant"
+  },
+  {
+    "type": "furniture",
+    "id": "f_mushroom_mature",
+    "name": "mature mushroom bed",
+    "symbol": "#",
+    "color": "white",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant"
+  },
+  {
+    "type": "furniture",
+    "id": "f_mushroom_mature_harvest",
+    "name": "mushroom bed with grown mushrooms",
+    "symbol": "#",
+    "color": "white",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant"
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_blueberry",
+    "name": "blueberry shrub",
+    "symbol": "#",
+    "color": "blue_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_blueberry_harvest",
+    "name": "blueberry shrub with berries",
+    "symbol": "#",
+    "color": "light_blue_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_strawberry",
+    "name": "strawberry shrub",
+    "symbol": "#",
+    "color": "red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_strawberry_harvest",
+    "name": "strawberry shrub with berries",
+    "symbol": "#",
+    "color": "light_red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_cranberry",
+    "name": "cranberry shrub",
+    "symbol": "#",
+    "color": "red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_cranberry_harvest",
+    "name": "cranberry shrub with berries",
+    "symbol": "#",
+    "color": "light_red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_blackberry",
+    "name": "blackberry bush",
+    "symbol": "#",
+    "color": "red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] }, { "item": "stick_long", "count": [ 0, 5 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_blackberry_harvest",
+    "name": "blackberry bush with berries",
+    "symbol": "#",
+    "color": "light_red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] }, { "item": "stick_long", "count": [ 0, 5 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_raspberry",
+    "name": "raspberry bush",
+    "symbol": "#",
+    "color": "red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] }, { "item": "stick_long", "count": [ 0, 5 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_raspberry_harvest",
+    "name": "raspberry bush with berries",
+    "symbol": "#",
+    "color": "light_red_green",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "flags": [ "PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "aggie_plant",
+    "bash": {
+      "str_min": 4,
+      "str_max": 60,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] }, { "item": "stick_long", "count": [ 0, 5 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_fvat_empty",

diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json
@@ -4414,7 +4414,6 @@
     "price": 200,
     "material": "veggy",
     "volume": 1,
-    "charges": 6,
     "fun": -1,
     "flags": [ "SMOKABLE" ],
     "rot_spawn": "GROUP_ROTTING_PLANT"
@@ -6050,7 +6049,6 @@
     "price": 750,
     "material": "veggy",
     "volume": 12,
-    "charges": 8,
     "bashing": 2,
     "fun": -1,
     "rot_spawn": "GROUP_ROTTING_PLANT"