Grain farming expansion and seed adjustments

.gitignore

@@ -235,3 +235,7 @@ Gemfile.lock
 
 # VERSION.txt generated by our CMakeLists.txt
 VERSION.txt
+data/json/monsterdrops/zombie_default.json
+data/json/portal_storm_effect_on_condition.json
+data/json/portal_storm_effect_on_condition.json
+data/json/portal_storm_effect_on_condition.json

data/json/construction.json

@@ -7868,6 +7868,19 @@
     "pre_terrain": "t_dirt",
     "post_terrain": "t_rockyobstacle"
   },
+  {
+    "type": "construction",
+    "id": "constr_stooking_spot",
+    "group": "make_stooking_spot",
+    "category": "OTHER",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "0 m",
+    "pre_note": "Mark a spot to stack cut grain for drying outdoors.  Once placed, put unrotten undried grain stalks on the stooking spot and examine it to get started.",
+    "pre_special": "check_empty",
+    "post_flags": [ "keep_items" ],
+    "dark_craftable": true,
+    "post_terrain": "f_stook_empty"
+  },
   {
     "type": "construction",
     "id": "constr_brick_oven_prep",

data/json/construction_group.json

@@ -1039,6 +1039,11 @@
     "id": "make_crafting_spot",
     "name": "Make crafting spot"
   },
+  {
+    "type": "construction_group",
+    "id": "make_stooking_spot",
+    "name": "Make stooking spot"
+  },
   {
     "type": "construction_group",
     "id": "make_gravel_floor",

data/json/flags.json

@@ -2164,5 +2164,15 @@
     "id": "BANK_NOTE_STRAP_SHAPED",
     "type": "json_flag",
     "restriction": "Item must be shaped like a bank note strap"
+  },
+  {
+    "id": "FRESH_GRAIN",
+    "type": "json_flag",
+    "//": "This item is fresh-cut grain, and can be dried in a stook."
+  },
+  {
+    "id": "CUT_HARVEST",
+    "type": "json_flag",
+    "//": "This seed will grow into a plant which needs a grass-cutting tool such as a sickle to harvest."
   }
 ]

data/json/furniture_and_terrain/furniture-domestic_plants.json

@@ -296,5 +296,34 @@
       ]
     },
     "plant_data": { "transform": "f_planter_mature", "base": "f_planter" }
+  },
+  {
+    "type": "furniture",
+    "id": "f_stook_full",
+    "name": "grain stook",
+    "description": "Sheaves of cut grain have been stood upright in a self-supporting A-frame to dry, keeping the seeds off the ground and out of reach of vermin.",
+    "symbol": "#",
+    "color": "brown",
+    "move_cost_mod": 1,
+    "coverage": 40,
+    "deconstruct": { "items": [  ] },
+    "required_str": 3,
+    "flags": [ "SEALED", "TRANSPARENT", "CONTAINER", "EASY_DECONSTRUCT", "DONT_REMOVE_ROTTEN", "FLAMMABLE_ASH" ],
+    "examine_action": "stook_full",
+    "bash": { "str_min": 3, "str_max": 60, "sound": "crunch.", "sound_fail": "whish." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_stook_empty",
+    "name": "stooking spot",
+    "description": "A space has been cleared out here for grain drying.  Place fresh stalks of grain in this spot and examine to set up a stook.",
+    "symbol": "#",
+    "color": "brown",
+    "move_cost_mod": 0,
+    "deconstruct": { "items": [  ] },
+    "max_volume": "10 L",
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "CONTAINER", "EASY_DECONSTRUCT", "NOCOLLIDE" ],
+    "examine_action": "stook_empty"
   }
 ]

data/json/items/comestibles/junkfood.json

@@ -131,69 +131,6 @@
     "//": "Favorite flavor varies.",
     "fun": 12
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "kernels",
-    "name": { "str_sp": "popcorn kernels" },
-    "weight": "32 g",
-    "color": "brown",
-    "container": "bag_plastic",
-    "comestible_type": "FOOD",
-    "symbol": "%",
-    "calories": 120,
-    "description": "Dried kernels from a particular type of corn.  Practically inedible raw, they can be cooked to make a tasty snack.",
-    "price": 100,
-    "price_postapoc": 400,
-    "material": [ "junk" ],
-    "volume": "250 ml",
-    "charges": 8,
-    "flags": [ "EDIBLE_FROZEN" ],
-    "fun": -6
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "popcorn",
-    "name": { "str_sp": "popcorn" },
-    "weight": "8 g",
-    "color": "white",
-    "spoils_in": "360 days",
-    "container": "bag_plastic",
-    "comestible_type": "FOOD",
-    "symbol": "%",
-    "quench": -1,
-    "calories": 30,
-    "description": "Plain, unseasoned popcorn.  Not as tasty as other kinds, but healthier as a result.",
-    "price": 115,
-    "price_postapoc": 25,
-    "material": [ "veggy" ],
-    "volume": "1 L",
-    "charges": 4,
-    "flags": [ "EATEN_HOT", "FREEZERBURN" ],
-    "fun": 4,
-    "vitamins": [ [ "iron", 2 ] ]
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "popcorn2",
-    "name": { "str_sp": "salted popcorn" },
-    "copy-from": "popcorn",
-    "quench": -3,
-    "healthy": -1,
-    "description": "Popcorn with salt added for extra flavor.",
-    "material": [ "junk" ],
-    "fun": 8
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "popcorn3",
-    "name": { "str_sp": "buttered popcorn" },
-    "copy-from": "popcorn",
-    "healthy": -1,
-    "calories": 50,
-    "description": "Popcorn with a light covering of butter for extra flavor.",
-    "material": [ "junk" ],
-    "fun": 10
-  },
   {
     "type": "COMESTIBLE",
     "id": "pretzels",

data/json/items/comestibles/other.json

@@ -15,6 +15,18 @@
     "price": 100,
     "volume": "250 ml"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_bottle_gourd",
+    "name": { "str": "dried bottle gourd" },
+    "copy-from": "dry_lentils",
+    "looks_like": "pumpkin",
+    "comestible_type": "FOOD",
+    "symbol": "6",
+    "description": "A vegetable from the gourd family, bottle gourds were brought to the Americas by the first Native American settlers crossing the Bering strait.  This one has been dried for processing into a watertight container.",
+    "volume": "2500 ml",
+    "flags": [ "INEDIBLE" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "slime_scrap",
@@ -385,22 +397,22 @@
     "name": { "str_sp": "dried beans" },
     "weight": "56 g",
     "color": "light_gray",
-    "spoils_in": "360 days",
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -4,
     "calories": 203,
+    "charges": 6,
     "description": "Dehydrated great northern beans.  Tasty and nutritious when cooked, virtually inedible when dry.",
     "price": 300,
     "price_postapoc": 150,
     "material": [ "bean" ],
     "volume": "250 ml",
     "cooks_like": "beans_cooked",
-    "flags": [ "EDIBLE_FROZEN" ],
-    "charges": 6,
     "vitamins": [ [ "calcium", 56 ], [ "iron", 22 ] ],
-    "fun": -6
+    "petfood": [ "CATTLEFOOD" ],
+    "flags": [ "EDIBLE_FROZEN", "RAW", "INEDIBLE", "CATTLE", "PLANTABLE_SEED" ],
+    "seed_data": { "plant_name": "beans", "fruit": "raw_beans", "seeds": false, "byproducts": [ "withered" ], "grow": "91 days" }
   },
   {
     "type": "COMESTIBLE",
@@ -482,66 +494,70 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "id": "soybean",
-    "name": { "str_sp": "soybeans" },
-    "volume": "250 ml",
-    "weight": "160 g",
+    "name": { "str_sp": "raw soybeans" },
+    "volume": "25 ml",
+    "weight": "16 g",
     "symbol": ".",
     "color": "yellow",
     "healthy": -1,
     "spoils_in": "364 days",
     "calories": 56,
-    "description": "Light brown beans, they have many uses, mildly toxic and not recommended, but you could eat them raw.",
+    "description": "Beige colored beans.  They have many uses, but in their raw form are fairly poisonous to humans.",
+    "price": 90,
+    "price_postapoc": 50,
+    "material": [ "veggy" ],
+    "fun": -5,
+    "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ],
+    "smoking_result": "dry_soybean",
+    "milling": { "into": "paste_nut", "conversion_rate": 0.2 },
+    "seed_data": { "plant_name": "soybean", "fruit": "soybean", "seeds": false, "byproducts": [ "withered", "raw_edamame" ], "grow": "91 days" },
+    "petfood": [ "CATTLEFOOD" ],
+    "flags": [ "EDIBLE_FROZEN", "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW", "INEDIBLE", "CATTLE", "PLANTABLE_SEED" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "id": "dry_soybean",
+    "name": { "str_sp": "dried soybeans" },
+    "volume": "25 ml",
+    "weight": "16 g",
+    "symbol": ".",
+    "color": "yellow",
+    "healthy": -1,
+    "calories": 56,
+    "description": "Beige colored beans, dried until rock hard.  They'll need to be cooked or processed before use.",
     "price": 90,
     "price_postapoc": 50,
     "material": [ "veggy" ],
     "fun": -5,
+    "milling": { "into": "flour_wheat_free", "conversion_rate": 1 },
     "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ],
-    "flags": [ "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ],
+    "seed_data": { "plant_name": "soybean", "fruit": "soybean", "seeds": false, "byproducts": [ "withered", "raw_edamame" ], "grow": "91 days" },
+    "petfood": [ "CATTLEFOOD" ],
     "smoking_result": "soy_nuts",
-    "milling": { "into": "paste_nut", "conversion_rate": 0.2 }
+    "flags": [ "EDIBLE_FROZEN", "SMOKABLE", "NUTRIENT_OVERRIDE", "SMOKED", "RAW", "INEDIBLE", "CATTLE", "PLANTABLE_SEED" ]
   },
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "id": "raw_edamame",
     "name": { "str": "raw edamame" },
-    "volume": "250 ml",
-    "weight": "160 g",
+    "volume": "35 ml",
+    "weight": "24 g",
     "symbol": ".",
     "color": "green",
     "spoils_in": "3 days",
     "calories": 56,
-    "description": "Light green raw edamame still in its pod, you should boil or freeze these, or you could eat them while they are still toxic.",
+    "description": "Raw soybeans still in their pod.  They can be cooked as-is or shelled for further processing, but in their raw form, they're toxic to humans.",
     "price": 150,
     "price_postapoc": 50,
     "material": [ "veggy" ],
-    "use_action": [ "POISON" ],
     "fun": 1,
     "vitamins": [ [ "iron", 26 ], [ "vitC", 16 ], [ "calcium", 6 ] ],
-    "flags": [ "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ],
+    "petfood": [ "CATTLEFOOD" ],
+    "flags": [ "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW", "INEDIBLE", "CATTLE" ],
     "smoking_result": "edamame_roasted"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "dry_lentils",
-    "name": { "str_sp": "dried lentils" },
-    "weight": "132 g",
-    "color": "light_gray",
-    "container": "bag_plastic",
-    "comestible_type": "FOOD",
-    "symbol": ",",
-    "quench": -10,
-    "calories": 230,
-    "description": "A humble but nutrient-rich legume.  Should be cooked prior to consumption.",
-    "price": 20,
-    "price_postapoc": 150,
-    "material": [ "veggy" ],
-    "volume": "250 ml",
-    "flags": [ "EDIBLE_FROZEN" ],
-    "charges": 2,
-    "vitamins": [ [ "calcium", 4 ], [ "iron", 47 ], [ "vitC", 7 ] ],
-    "fun": -10
-  },
   {
     "type": "COMESTIBLE",
     "id": "blood_rice_pudding",
@@ -1120,17 +1136,5 @@
     "symbol": "B",
     "color": "yellow",
     "calories": 0
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "dry_bottle_gourd",
-    "name": { "str": "dried bottle gourd" },
-    "copy-from": "dry_lentils",
-    "looks_like": "pumpkin",
-    "comestible_type": "FOOD",
-    "symbol": "6",
-    "description": "A vegetable from the gourd family, bottle gourds were brought to the Americas by the first Native American settlers crossing the Bering strait.  This one has been dried for processing into a watertight container.",
-    "volume": "2500 ml",
-    "flags": [ "INEDIBLE" ]
   }
 ]

data/json/items/comestibles/raw_fruit.json

@@ -612,18 +612,18 @@
     "name": { "str": "watermelon" },
     "weight": "4518 g",
     "color": "green",
-    "spoils_in": "7 days 12 hours",
+    "spoils_in": "21 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 826,
     "//": "yes, it really does have that much water in it - 4131.7g in this size specifically",
     "calories": 1355,
-    "description": "A deep green melon, bigger than your head.  It is very juicy!  You should find something to slice it up, as any other method of cracking open and eating it would be very messy.",
+    "description": "A deep green melon, bigger than your head.  It is very juicy!  You should be able to take it apart with a knife.",
     "price": 758,
     "price_postapoc": 600,
     "material": [ "fruit" ],
     "volume": "7150 ml",
-    "flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE" ],
+    "flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE", "INEDIBLE" ],
     "smoking_result": "dry_fruit",
     "vitamins": [ [ "vitC", 406 ], [ "calcium", 24 ], [ "iron", 60 ] ],
     "melee_damage": { "bash": 2 }
@@ -658,15 +658,15 @@
     "spoils_in": "7 days 12 hours",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "quench": 20,
+    "quench": 100,
     "calories": 187,
-    "description": "A large and very sweet orange fruit.  Technically a berry, like all melons are.  You should find something to slice it up, as any other method of cracking open and eating it would be very messy.",
+    "description": "A large and very sweet orange fruit.  Technically a berry, like all melons are.  You should be able to take it apart with a knife.",
     "price": 217,
     "price_postapoc": 100,
     "material": [ "fruit" ],
     "volume": "1100 ml",
-    "flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE" ],
-    "fun": 1,
+    "flags": [ "EATEN_COLD", "SMOKABLE", "INEDIBLE" ],
+    "fun": 4,
     "smoking_result": "dry_fruit",
     "vitamins": [ [ "vitC", 225 ], [ "calcium", 3 ], [ "iron", 6 ] ],
     "melee_damage": { "bash": 1 }
@@ -675,20 +675,20 @@
     "type": "COMESTIBLE",
     "id": "melon_chunks",
     "name": { "str": "handful of cantaloupe melon chunks", "str_pl": "handfuls of cantaloupe melon chunks" },
-    "weight": "160 g",
-    "color": "brown",
+    "weight": "138 g",
+    "color": "light_red",
     "spoils_in": "3 days",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "quench": 8,
-    "calories": 54,
+    "quench": 25,
+    "calories": 47,
     "description": "A handful of cantaloupe melon chunks.  A great snack by itself or in a fruit salad.",
-    "price": 139,
-    "price_postapoc": 60,
+    "price": 21,
+    "price_postapoc": 25,
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 4,
-    "flags": [ "SMOKABLE" ],
+    "flags": [ "SMOKABLE", "EATEN_COLD" ],
     "smoking_result": "dry_fruit",
     "vitamins": [ [ "vitC", 65 ], [ "calcium", 1 ], [ "iron", 1 ] ]
   },