From 169b953ce01ea90b3757aeff7a680a64ebe4c5fe Mon Sep 17 00:00:00 2001 From: Zukulini Date: Thu, 18 Feb 2021 01:56:41 -0600 Subject: [PATCH] Milleable corn (#46254) --- data/json/itemgroups/Food/food.json | 2 + data/json/items/comestibles/raw_veggy.json | 46 ++++++++++-- data/json/items/comestibles/veggy_dishes.json | 46 ++++++++++-- data/json/recipes/food/dry.json | 31 ++++++++ data/json/recipes/food/pasta.json | 2 + data/json/recipes/other/other.json | 4 +- data/json/recipes/recipe_food.json | 72 ++++++++++++++++--- .../json/requirements/cooking_components.json | 14 +++- 8 files changed, 193 insertions(+), 24 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 17d8462984bb5..8ed9a6d47d3d8 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -39,6 +39,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 }, @@ -221,6 +222,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 }, diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index b19ded32d195f..cb384ab5531e4 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/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", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index adc2170fc9dc7..0205681ab45c4 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -227,20 +227,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 @@ -667,6 +667,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", @@ -680,6 +701,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", diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index 91593ee23709f..7d18e8d7061fb 100644 --- a/data/json/recipes/food/dry.json +++ b/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, diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json index 2ed02574899ee..bdf3c328df838 100644 --- a/data/json/recipes/food/pasta.json +++ b/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 ], diff --git a/data/json/recipes/other/other.json b/data/json/recipes/other/other.json index f0ed6b762dccb..5db4e4f6aad83 100644 --- a/data/json/recipes/other/other.json +++ b/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 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 197af978fa36f..e032cfc4a730c 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -486,6 +486,19 @@ "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "dry_veggy", 1 ] ], [ [ "water_clean", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "rehydrated_corn_kernels", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "time": "3 m", + "autolearn": true, + "flags": [ "BLIND_HARD" ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "components": [ [ [ "dry_corn", 1 ] ], [ [ "water_clean", 1 ] ] ] + }, { "type": "recipe", "activity_level": "NO_EXERCISE", @@ -678,7 +691,9 @@ [ "irradiated_celery", 3 ], [ "veggy_wild", 3 ], [ "veggy", 3 ], - [ "rehydrated_veggy", 3 ] + [ "rehydrated_veggy", 3 ], + [ "rehydrated_corn_kernels", 3 ], + [ "corn_kernels", 3 ] ], [ [ "lettuce", 2 ], @@ -833,7 +848,9 @@ [ "irradiated_celery", 3 ], [ "veggy_wild", 3 ], [ "veggy", 3 ], - [ "rehydrated_veggy", 3 ] + [ "rehydrated_veggy", 3 ], + [ "rehydrated_corn_kernels", 3 ], + [ "corn_kernels", 3 ] ], [ [ "soysauce", 1 ], [ "horseradish", 1 ], [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ] @@ -2397,6 +2414,7 @@ [ [ "jerky", 2 ], [ "dry_meat", 2 ], [ "meat_smoked", 2 ], [ "dry_fish", 2 ], [ "fish_smoked", 2 ] ], [ [ "dry_veggy", 2 ], + [ "dry_corn", 2 ], [ "dry_fruit", 2 ], [ "dry_mushroom", 2 ], [ "juice_pulp", 4 ], @@ -3989,8 +4007,11 @@ [ "mustard_powder", 20 ], [ "garlic_clove", 6 ], [ "rehydrated_veggy", 1 ], + [ "rehydrated_corn_kernels", 1 ], + [ "corn_kernels", 1 ], [ "dry_mushroom", 1 ], - [ "dry_veggy", 1 ] + [ "dry_veggy", 1 ], + [ "dry_corn", 1 ] ] ] }, @@ -4113,6 +4134,9 @@ [ "veggy_salted", 2 ], [ "rehydrated_veggy", 2 ], [ "dry_veggy", 2 ], + [ "rehydrated_corn_kernels", 2 ], + [ "dry_corn", 2 ], + [ "corn_kernels", 2 ], [ "mushroom", 2 ], [ "dry_mushroom", 2 ], [ "morel_cooked", 2 ], @@ -4149,6 +4173,9 @@ [ "veggy_salted", 2 ], [ "rehydrated_veggy", 2 ], [ "dry_veggy", 2 ], + [ "rehydrated_corn_kernels", 2 ], + [ "dry_corn", 2 ], + [ "corn_kernels", 2 ], [ "mushroom", 2 ], [ "dry_mushroom", 2 ], [ "morel_cooked", 2 ], @@ -4186,11 +4213,14 @@ [ "veggy_wild", 2 ], [ "veggy_salted", 2 ], [ "rehydrated_veggy", 2 ], + [ "rehydrated_corn_kernels", 2 ], + [ "corn_kernels", 2 ], [ "mushroom", 2 ], [ "dry_mushroom", 2 ], [ "morel_cooked", 2 ], [ "mushroom_cooked", 2 ], - [ "dry_veggy", 2 ] + [ "dry_veggy", 2 ], + [ "dry_corn", 2 ] ], [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ], [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], @@ -4220,7 +4250,8 @@ [ "tofu", 2 ], [ "dry_tofu", 2 ], [ "mushroom_cooked", 2 ], - [ "dry_veggy", 2 ] + [ "dry_veggy", 2 ], + [ "dry_corn", 2 ] ], [ [ "sauce_pesto", 1 ], @@ -4268,7 +4299,8 @@ [ "dry_mushroom", 2 ], [ "morel_cooked", 2 ], [ "mushroom_cooked", 2 ], - [ "dry_veggy", 2 ] + [ "dry_veggy", 2 ], + [ "dry_corn", 2 ] ], [ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ], [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ], @@ -4409,7 +4441,8 @@ [ "coffee_syrup", 5 ], [ "cola", 6 ], [ "con_milk", 1 ], - [ "corn", 3 ], + [ "corn_kernels", 3 ], + [ "rehydrated_corn_kernels", 3 ], [ "honey_bottled", 1 ], [ "honey_glassed", 1 ], [ "honeycomb", 1 ], @@ -4630,7 +4663,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 ], [ "kernels", 1 ] ] ] + "components": [ [ [ "dry_corn", 1 ], [ "kernels", 1 ] ] ] }, { "type": "recipe", @@ -4913,6 +4946,8 @@ [ "irradiated_tomato", 1 ], [ "irradiated_broccoli", 1 ], [ "rehydrated_veggy", 1 ], + [ "rehydrated_corn_kernels", 1 ], + [ "corn_kernels", 1 ], [ "morel_cooked", 1 ], [ "mushroom_cooked", 1 ], [ "sauerkraut_onions", 1 ], @@ -5833,6 +5868,8 @@ [ "irradiated_tomato", 1 ], [ "irradiated_broccoli", 1 ], [ "rehydrated_veggy", 1 ], + [ "rehydrated_corn_kernels", 1 ], + [ "corn_kernels", 1 ], [ "morel_cooked", 1 ], [ "mushroom_cooked", 1 ], [ "sauerkraut_onions", 1 ], @@ -6419,7 +6456,20 @@ "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "food_processor", 20 ] ] ], - "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ], [ "kernels", 1 ] ] ] + "components": [ [ [ "dry_corn", 1 ] ] ] + }, + { + "result": "corn_kernels", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "byproducts": [ [ "empty_corn_cob", 1 ] ], + "skill_used": "cooking", + "time": "20 s", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ] ] ] }, { "result": "flour", @@ -6517,7 +6567,7 @@ "components": [ [ [ "can_corn", 1 ], - [ "corn", 1 ], + [ "corn_kernels", 1 ], [ "oats", 1 ], [ "buckwheat", 1 ], [ "wheat", 1 ], @@ -6755,7 +6805,7 @@ "autolearn": true, "batch_time_factors": [ 83, 3 ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mortar_pestle", -1 ] ] ], - "components": [ [ [ "corn", 1 ], [ "irradiated_corn", 1 ], [ "kernels", 1 ] ] ] + "components": [ [ [ "dry_corn", 1 ] ] ] }, { "type": "recipe", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 3068d9ff991ba..62f1e3568fd05 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -382,6 +382,8 @@ [ "can_corn", 1 ], [ "hominy", 1 ], [ "dry_veggy", 1 ], + [ "dry_corn", 1 ], + [ "corn_kernels", 1 ], [ "con_milk", 1 ], [ "flatbread", 1 ], [ "tortilla_corn", 1 ], @@ -447,8 +449,11 @@ [ [ "veggy_wild", 2 ], [ "veggy", 2 ], + [ "corn_kernels", 2 ], [ "rehydrated_veggy", 2 ], + [ "rehydrated_corn_kernels", 2 ], [ "dry_veggy", 2 ], + [ "dry_corn", 2 ], [ "dry_beans", 2 ], [ "can_beans", 2 ], [ "raw_beans", 2 ], @@ -665,6 +670,8 @@ [ "raw_dandelion", 1 ], [ "raw_burdock", 1 ], [ "rehydrated_veggy", 1 ], + [ "rehydrated_corn_kernels", 1 ], + [ "corn_kernels", 1 ], [ "veggy", 1 ], [ "veggy_wild", 1 ], [ "veggy_salted", 1 ], @@ -675,7 +682,7 @@ { "id": "veggy_any_uncooked", "type": "requirement", - "components": [ [ [ "rehydrated_veggy", 1 ], [ "veggy_any_fresh_uncooked", 1, "LIST" ] ] ] + "components": [ [ [ "rehydrated_veggy", 1 ], [ "rehydrated_corn_kernels", 1 ], [ "veggy_any_fresh_uncooked", 1, "LIST" ] ] ] }, { "id": "veggy_any_fresh_uncooked", @@ -691,8 +698,7 @@ [ "cattail_stalk", 1 ], [ "celery", 1 ], [ "irradiated_celery", 1 ], - [ "corn", 1 ], - [ "irradiated_corn", 1 ], + [ "corn_kernels", 1 ], [ "cucumber", 1 ], [ "irradiated_cucumber", 1 ], [ "lettuce", 1 ], @@ -750,6 +756,8 @@ "components": [ [ [ "veggy_any", 1, "LIST" ], + [ "empty_corn_cob", 1 ], + [ "corn", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ],