Add growable popcorn and horseradish (#39376)

* Add growable popcorn and horseradish * Adjust horseradish fun value * Fix JSON style * Try to fix comestible tests * Fix calories and vitamins for greens
CleverRaven · Apr 18, 2020 · 074dd18 · 074dd18
1 parent f1bf082
commit 074dd18
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 3 deletions.
diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -32,6 +32,8 @@
       [ "seed_beans", 60 ],
       [ "seed_chili_pepper", 60 ],
       [ "seed_tomato", 60 ],
+      [ "seed_horseradish", 10 ],
+      [ "seed_popcorn", 10 ],
       [ "seed_mustard", 10 ]
     ]
   },
@@ -118,6 +120,8 @@
       [ "seed_lentils", 1 ],
       [ "seed_chili_pepper", 1 ],
       [ "seed_garlic", 1 ],
+      [ "seed_horseradish", 1 ],
+      [ "seed_popcorn", 1 ],
       [ "seed_mustard", 1 ],
       [ "seed_oats", 1 ],
       [ "tomato", 9 ],

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -144,6 +144,7 @@
     "name": { "str": "buttered popcorn", "str_pl": "buttered popcorn" },
     "copy-from": "popcorn",
     "healthy": -1,
+    "calories": 50,
     "description": "Popcorn with a light covering of butter for extra flavor.",
     "material": "junk",
     "fun": 10

diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -421,6 +421,25 @@
     "charges": 4,
     "fun": -15
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "horseradish_root",
+    "name": { "str": "horseradish root" },
+    "weight": "250 g",
+    "color": "brown",
+    "spoils_in": "60 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": 1,
+    "calories": 166,
+    "description": "Large white tapered root of a horseradish plant.  Way too spicy in this form, but can be used for making condiments.",
+    "price": 80,
+    "material": "veggy",
+    "volume": "400 ml",
+    "fun": -12,
+    "flags": [ "FREEZERBURN", "RAW" ],
+    "vitamins": [ [ "vitC", 41 ], [ "calcium", 6 ], [ "iron", 5 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "lettuce",
@@ -504,6 +523,24 @@
     "flags": [ "SMOKABLE", "RAW" ],
     "smoking_result": "dry_veggy"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "popcorn_raw",
+    "name": { "str": "raw popcorn", "str_pl": "raw popcorn" },
+    "weight": "153 g",
+    "color": "light_green",
+    "spoils_in": "5 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 120,
+    "description": "A special variety of corn which could be used for making popcorn, after it's dried.  Unlike normal corn, it's not sweet and is more dry.",
+    "price": 170,
+    "material": "veggy",
+    "volume": "750 ml",
+    "fun": -2,
+    "flags": [ "EATEN_HOT", "RAW" ],
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "potato",
@@ -549,6 +586,26 @@
     "smoking_result": "dry_veggy",
     "vitamins": [ [ "vitA", 58 ], [ "vitC", 12 ], [ "calcium", 3 ], [ "iron", 5 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "horseradish_greens",
+    "name": { "str": "horseradish greens", "str_pl": "horseradish greens" },
+    "weight": "50 g",
+    "color": "light_green",
+    "spoils_in": "6 days 16 hours",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": 1,
+    "calories": 16,
+    "description": "Leaves of a horseradish plant with a sharp, bitter and peppery taste.  They're edible, but not commonly eaten.",
+    "price": 80,
+    "material": "veggy",
+    "volume": "100 ml",
+    "fun": -2,
+    "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ],
+    "smoking_result": "dry_veggy",
+    "vitamins": [ [ "vitA", 7 ], [ "vitC", 30 ], [ "calcium", 2 ], [ "iron", 3 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "raw_dandelion",

diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -749,6 +749,22 @@
     "description": "Some chamomile seeds.",
     "seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" }
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_popcorn",
+    "copy-from": "seed",
+    "name": { "str": "popcorn seeds", "str_pl": "popcorn seeds" },
+    "description": "Some popcorn seeds.",
+    "seed_data": { "plant_name": "popcorn", "fruit": "popcorn_raw", "byproducts": [ "withered" ], "grow": "91 days" }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_horseradish",
+    "copy-from": "seed",
+    "name": { "str": "horseradish seeds", "str_pl": "horseradish seeds" },
+    "description": "Some horseradish seeds.",
+    "seed_data": { "plant_name": "horseradish", "fruit": "horseradish_root", "byproducts": [ "horseradish_greens" ], "grow": "91 days" }
+  },
   {
     "type": "COMESTIBLE",
     "id": "seed_mustard",

diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
@@ -180,6 +180,24 @@
     "price_postapoc": 150,
     "flags": [ "EATEN_HOT" ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "hominy",
+    "name": { "str": "hominy", "str_pl": "hominy" },
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "material": "veggy",
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ],
+    "spoils_in": "2 days",
+    "container": "bowl_plastic",
+    "calories": 120,
+    "volume": "250 ml",
+    "description": "Corn kernels which have been cooked in an alkaline solution and then rinsed, making them better suited for eating or cooking.",
+    "price": 200,
+    "flags": [ "EATEN_HOT" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "cornmeal",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -1284,6 +1284,20 @@
     "batch_time_factors": [ 80, 1 ],
     "components": [ [ [ "popcorn", 1 ] ], [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "popcorn3",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "20 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [ [ "kernels", 1 ] ], [ [ "ghee", 1 ] ], [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "tea",
@@ -3982,7 +3996,7 @@
     "autolearn": true,
     "batch_time_factors": [ 83, 3 ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ],
-    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ] ] ]
+    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ], [ "kernels", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -5741,7 +5755,7 @@
     "autolearn": true,
     "batch_time_factors": [ 83, 3 ],
     "tools": [ [ [ "food_processor", 20 ] ] ],
-    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ] ] ]
+    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ], [ "kernels", 1 ] ] ]
   },
   {
     "result": "flour",
@@ -6061,7 +6075,7 @@
     "autolearn": true,
     "batch_time_factors": [ 83, 3 ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ],
-    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ] ] ]
+    "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ], [ "kernels", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6411,6 +6425,58 @@
     "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ],
     "components": [ [ [ "fiddlehead_boiled", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "hominy",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "30 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
+    "components": [
+      [ [ "kernels", 1 ] ],
+      [ [ "water", 8 ], [ "water_clean", 8 ] ],
+      [ [ "lye_powder", 15 ], [ "material_quicklime", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "kernels",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DRY",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "18 m",
+    "autolearn": true,
+    "charges": 1,
+    "batch_time_factors": [ 67, 5 ],
+    "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ],
+    "components": [ [ [ "popcorn_raw", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "horseradish",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "30 m",
+    "charges": 8,
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
+    "components": [
+      [ [ "horseradish_root", 1 ] ],
+      [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ],
+      [ [ "sugar", 4 ] ],
+      [ [ "water_clean", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "mustard_powder",

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -285,6 +285,7 @@
         [ "veggy_any", 1, "LIST" ],
         [ "sauerkraut", 1 ],
         [ "can_corn", 1 ],
+        [ "hominy", 1 ],
         [ "dry_veggy", 1 ],
         [ "con_milk", 1 ],
         [ "flatbread", 1 ],
@@ -555,6 +556,7 @@
         [ "cattail_stalk", 1 ],
         [ "lettuce", 1 ],
         [ "irradiated_lettuce", 1 ],
+        [ "horseradish_greens", 1 ],
         [ "raw_dandelion", 1 ],
         [ "raw_burdock", 1 ],
         [ "rehydrated_veggy", 1 ],