From 3fa52ead793c36ab8cb1621b1c24c28cdb5cb79d Mon Sep 17 00:00:00 2001
From: Zukulini <dragon.fuego.yo@gmail.com>
Date: Tue, 22 Dec 2020 22:48:47 -0600
Subject: [PATCH] Added irradiated corn kernels and empty cob

---
 .../items/comestibles/irradiated_veggy.json   | 20 ++++++++++++++++
 data/json/recipes/food/pasta.json             |  1 +
 data/json/recipes/recipe_food.json            | 23 ++++++++++++++++---
 .../json/requirements/cooking_components.json | 12 +++-------
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json
index de23b9feba006..f0cf13353af7d 100644
--- a/data/json/items/comestibles/irradiated_veggy.json
+++ b/data/json/items/comestibles/irradiated_veggy.json
@@ -135,6 +135,26 @@
     "material": [ "veggy" ],
     "volume": "250 ml"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "irradiated_corn_kernels",
+    "copy-from": "corn_kernels",
+    "name": { "str_sp": "irradiated corn kernels" },
+    "description": "Irradiated corn kernels will remain edible nearly forever.  Sterilized using radiation, so they're safe to eat.",
+    "proportional": { "price": 2.0 },
+    "spoils_in": "0 hours",
+    "container": "bag_plastic"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "irradiated_empty_corn_cob",
+    "copy-from": "empty_corn_cob",
+    "name": { "str_sp": "irradiated empty corn cob" },
+    "description": "An irradiated empty corn cob will remain edible nearly forever... though you may not want to eat this one.",
+    "proportional": { "price": 2.0 },
+    "spoils_in": "0 hours",
+    "container": "bag_plastic"
+  },
   {
     "type": "COMESTIBLE",
     "id": "irradiated_rhubarb",
diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json
index 881ff7efe0b6a..bcc92759b4ac8 100644
--- a/data/json/recipes/food/pasta.json
+++ b/data/json/recipes/food/pasta.json
@@ -113,6 +113,7 @@
         [ "veggy_wild", 2 ],
         [ "rehydrated_veggy", 2 ],
         [ "rehydrated_corn", 2 ],
+        [ "irradiated_corn_kernels", 2 ],
         [ "dry_veggy", 2 ],
         [ "dry_corn", 2 ],
         [ "mushroom", 2 ],
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index e011eb9cd12da..7aeb88518b455 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -673,7 +673,8 @@
         [ "veggy", 3 ],
         [ "rehydrated_veggy", 3 ],
         [ "rehydrated_corn", 3 ],
-        [ "corn_kernels", 3 ]
+        [ "corn_kernels", 3 ],
+        [ "irradiated_corn_kernels", 3 ]
       ],
       [
         [ "lettuce", 2 ],
@@ -830,7 +831,8 @@
         [ "veggy", 3 ],
         [ "rehydrated_veggy", 3 ],
         [ "rehydrated_corn", 3 ],
-        [ "corn_kernels", 3 ]
+        [ "corn_kernels", 3 ],
+        [ "irradiated_corn_kernels", 3 ]
       ],
       [ [ "soysauce", 1 ], [ "horseradish", 1 ], [ "salt", 1 ], [ "seasoning_salt", 1 ] ]
     ]
@@ -4892,6 +4894,7 @@
         [ "rehydrated_veggy", 1 ],
         [ "rehydrated_corn", 1 ],
         [ "corn_kernels", 1 ],
+        [ "irradiated_corn_kernels", 1 ],
         [ "morel_cooked", 1 ],
         [ "mushroom_cooked", 1 ],
         [ "sauerkraut_onions", 1 ],
@@ -5796,6 +5799,7 @@
         [ "rehydrated_veggy", 1 ],
         [ "rehydrated_corn", 1 ],
         [ "corn_kernels", 1 ],
+        [ "irradiated_corn_kernels", 1 ],
         [ "morel_cooked", 1 ],
         [ "mushroom_cooked", 1 ],
         [ "sauerkraut_onions", 1 ],
@@ -6394,7 +6398,20 @@
     "time": "20 s",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ] ] ]
+    "components": [ [ [ "corn", 1 ] ] ]
+  },
+  {
+    "result": "irradiated_corn_kernels",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "byproducts": [ [ "irradiated_empty_corn_cob", 1 ] ],
+    "skill_used": "cooking",
+    "time": "20 s",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "irradiated_corn", 1 ] ] ]
   },
   {
     "result": "flour",
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
index 42b2462aea42b..fcbba3c1e4558 100644
--- a/data/json/requirements/cooking_components.json
+++ b/data/json/requirements/cooking_components.json
@@ -367,7 +367,6 @@
         [ "hominy", 1 ],
         [ "dry_veggy", 1 ],
         [ "dry_corn", 1 ],
-        [ "corn_kernels", 1 ],
         [ "con_milk", 1 ],
         [ "flatbread", 1 ],
         [ "tortilla_corn", 1 ],
@@ -665,14 +664,7 @@
   {
     "id": "veggy_any_uncooked",
     "type": "requirement",
-    "components": [
-      [
-        [ "rehydrated_veggy", 1 ],
-        [ "rehydrated_corn", 1 ],
-        [ "corn_kernels", 1 ],
-        [ "veggy_any_fresh_uncooked", 1, "LIST" ]
-      ]
-    ]
+    "components": [ [ [ "rehydrated_veggy", 1 ], [ "rehydrated_corn", 1 ], [ "veggy_any_fresh_uncooked", 1, "LIST" ] ] ]
   },
   {
     "id": "veggy_any_fresh_uncooked",
@@ -710,6 +702,8 @@
         [ "veggy_wild", 1 ],
         [ "zucchini", 1 ],
         [ "irradiated_zucchini", 1 ],
+        [ "corn_kernels", 1 ],
+        [ "irradiated_corn_kernels", 1 ],
         [ "carrot_wild", 1 ],
         [ "spinach", 1 ]
       ]