Milleable corn

data/json/itemgroups/Food/food.json

@@ -38,6 +38,7 @@
       { "item": "dry_meat", "prob": 10 },
       { "item": "dry_fish", "prob": 10 },
       { "item": "dry_veggy", "prob": 10 },
+      { "item": "dry_corn", "prob": 1 },
       { "item": "dry_fruit", "prob": 10 },
       { "item": "oatmeal", "prob": 40 },
       { "item": "fruit_leather", "prob": 15 },
@@ -212,6 +213,7 @@
       { "item": "dry_meat", "prob": 10 },
       { "item": "dry_fish", "prob": 10 },
       { "item": "dry_veggy", "prob": 10 },
+      { "item": "dry_corn", "prob": 1 },
       { "item": "dry_fruit", "prob": 10 },
       { "item": "oatmeal", "prob": 40 },
       { "item": "toastem", "prob": 30 },

data/json/items/comestibles/raw_veggy.json

@@ -209,24 +209,62 @@
   {
     "type": "COMESTIBLE",
     "id": "corn",
-    "name": { "str_sp": "corn" },
-    "weight": "153 g",
+    "name": { "str": "corn cob" },
+    "weight": "690 g",
     "color": "light_green",
     "spoils_in": "5 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
     "calories": 132,
-    "description": "Delicious golden kernels.",
+    "description": "A corn cob full of delicious golden kernels.  You can eat them on the cob or shell it for cooking.",
     "price": 170,
     "//": "Thinking this is a single ear here.",
     "price_postapoc": 50,
     "material": [ "veggy" ],
     "volume": "750 ml",
+    "flags": [ "EATEN_HOT", "RAW" ],
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ],
+    "use_action": { "type": "transform", "target": "empty_corn_cob", "moves": 500 }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "corn_kernels",
+    "name": { "str_sp": "corn kernels" },
+    "weight": "210 g",
+    "color": "yellow",
+    "spoils_in": "5 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": 1,
+    "calories": 132,
+    "description": "Delicious golden kernels.",
+    "price": 200,
+    "price_postapoc": 60,
+    "material": [ "veggy" ],
+    "volume": "285 ml",
     "flags": [ "EATEN_HOT", "SMOKABLE", "RAW" ],
-    "smoking_result": "dry_veggy",
+    "smoking_result": "dry_corn",
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "empty_corn_cob",
+    "name": { "str_sp": "empty corn cob" },
+    "weight": "480 g",
+    "color": "yellow",
+    "spoils_in": "5 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": 1,
+    "description": "An empty corn cob.  It may seem useless, but it can be used to make stock, a delicious jelly, or as fuel.",
+    "price": 1,
+    "price_postapoc": 1,
+    "material": [ "veggy" ],
+    "volume": "465 ml",
+    "fun": -8,
+    "flags": [ "RAW" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "cotton_boll",

data/json/items/comestibles/veggy_dishes.json

@@ -226,20 +226,20 @@
     "type": "COMESTIBLE",
     "id": "cornmeal",
     "name": { "str_sp": "cornmeal" },
-    "weight": "19 g",
+    "weight": "60 g",
     "color": "yellow",
     "spoils_in": "360 days",
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -1,
-    "calories": 47,
-    "vitamins": [ [ "iron", 3 ] ],
+    "calories": 44,
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ],
     "description": "This yellow cornmeal is useful for baking.",
     "price": 450,
     "price_postapoc": 25,
     "material": [ "veggy", "powder" ],
-    "volume": "250 ml",
+    "volume": "1070 ml",
     "flags": [ "EDIBLE_FROZEN" ],
     "charges": 10,
     "fun": -5
@@ -643,6 +643,27 @@
     "flags": [ "EDIBLE_FROZEN" ],
     "charges": 2
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_corn",
+    "name": { "str_sp": "dehydrated corn kernels" },
+    "weight": "180 g",
+    "color": "yellow",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -10,
+    "healthy": 1,
+    "calories": 132,
+    "description": "A handful of dried corn kernels.",
+    "price": 60,
+    "price_postapoc": 50,
+    "material": [ "veggy" ],
+    "milling": { "into": "cornmeal", "conversion_rate": 3 },
+    "volume": "255 ml",
+    "flags": [ "EDIBLE_FROZEN", "RAW" ],
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ],
+    "fun": -10
+  },
   {
     "type": "COMESTIBLE",
     "id": "rehydrated_veggy",
@@ -656,6 +677,23 @@
     "delete": { "flags": [ "RAW" ] },
     "fun": 2
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "rehydrated_corn_kernels",
+    "name": { "str_sp": "rehydrated corn kernels" },
+    "copy-from": "veggy",
+    "weight": "70 g",
+    "color": "yellow",
+    "spoils_in": "1 day",
+    "description": "Reconstituted corn kernels; much more enjoyable to eat now that they have been rehydrated.",
+    "price": 900,
+    "price_postapoc": 50,
+    "smoking_result": "dry_corn",
+    "volume": "95 ml",
+    "delete": { "flags": [ "RAW" ] },
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ],
+    "fun": 2
+  },
   {
     "type": "COMESTIBLE",
     "id": "veggy_salad",

data/json/recipes/food/dry.json

@@ -240,6 +240,37 @@
       [ [ "veggy_any_fresh_uncooked", 1, "LIST" ], [ "dandelion_cooked", 1 ], [ "burdock_cooked", 1 ], [ "wild_herbs", 40 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "dry_corn",
+    "charges": 1,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DRY",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "18 m",
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ],
+    "components": [ [ [ "corn_kernels", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "dry_corn",
+    "charges": 1,
+    "category": "CC_FOOD",
+    "id_suffix": "frozen_ingredients",
+    "subcategory": "CSC_FOOD_DRY",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "20 m",
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
+    "components": [ [ [ "corn_kernels", 1 ] ] ]
+  },
   {
     "result": "dry_veggy_tainted",
     "charges": 1,

data/json/recipes/food/pasta.json

@@ -112,7 +112,9 @@
         [ "veggy", 2 ],
         [ "veggy_wild", 2 ],
         [ "rehydrated_veggy", 2 ],
+        [ "rehydrated_corn_kernels", 2 ],
         [ "dry_veggy", 2 ],
+        [ "dry_corn", 2 ],
         [ "mushroom", 2 ],
         [ "mushroom_cooked", 2 ],
         [ "morel_cooked", 2 ],

data/json/recipes/other/other.json

@@ -15,8 +15,8 @@
         [ "fish", 1 ],
         [ "dry_meat", 1 ],
         [ "dry_fish", 1 ],
-        [ "corn", 1 ],
-        [ "irradiated_corn", 1 ],
+        [ "corn_kernels", 1 ],
+        [ "rehydrated_corn_kernels", 1 ],
         [ "irradiated_carrot", 1 ],
         [ "carrot", 1 ],
         [ "bread", 1 ],