Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust the fried seeds recipe and the plants which grow seeds for it #67282

Merged
Merged
27 changes: 16 additions & 11 deletions data/json/items/comestibles/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,15 @@
"color": "green",
"use_action": [ "SEED" ],
"quench": -1,
"calories": 17,
"volume": "250 ml",
"calories": 11,
"description": "Seeds of the cannabis plant. Filled with vitamins, they can be roasted or eaten raw.",
"//": "1 cup of seeds, which grows into multiple hemps per tile.",
"price": 100,
"weight": "2 g",
"weight": "150 g",
"flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ],
"seed_data": { "plant_name": "cannabis", "fruit": "cannabis", "grow": "91 days" },
"milling": { "into": "paste_seed", "conversion_rate": 0.02 },
"volume": "2 ml"
"milling": { "into": "paste_seed", "conversion_rate": 0.02 }
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -533,10 +534,12 @@
"id": "seed_pumpkin",
"copy-from": "seed",
"name": { "str_sp": "pumpkin seeds" },
"weight": "2 g",
"weight": "120 g",
"volume": "250 ml",
"color": "green",
"use_action": [ "SEED" ],
"calories": 17,
"calories": 535,
"//": "this is 1 cup of seeds, which grows into multiple pumpkins per tile.",
"description": "Some raw pumpkin seeds. Could be fried and eaten.",
"price": 100,
"flags": [ "PLANTABLE_SEED" ],
Expand All @@ -548,16 +551,17 @@
"id": "seed_sunflower",
"copy-from": "seed",
"name": { "str_sp": "sunflower seeds" },
"weight": "2 g",
"weight": "140 g",
"volume": "250 ml",
"color": "green",
"use_action": [ "SEED" ],
"calories": 17,
"//": "this is 1 cup of seeds, which grows into multiple sunflowers per tile.",
"calories": 750,
"description": "Some raw sunflower seeds. Could be pressed into oil.",
"price": 100,
"flags": [ "PLANTABLE_SEED" ],
"seed_data": { "plant_name": "sunflower", "fruit": "seed_sunflower", "byproducts": [ "withered" ], "grow": "91 days" },
"milling": { "into": "paste_seed", "conversion_rate": 0.02 },
"volume": "2 ml"
"milling": { "into": "paste_seed", "conversion_rate": 0.02 }
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -851,8 +855,9 @@
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"calories": 78,
"calories": 150,
"description": "Some fried seeds of a sunflower, pumpkin or other plant. Quite nutritious and tasty.",
"//": "4 per cup",
"price": 80,
"price_postapoc": 50,
"material": [ "veggy" ],
Expand Down
5 changes: 3 additions & 2 deletions data/json/recipes/food/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@
"result": "seed_pumpkin",
"type": "recipe",
"copy-from": "seed_extraction_cutting",
"//p": "about 500 seeds per pumpkin, which is 167g, 740kcal raw. Each seed pile is 17 calories, 4 grams.",
"components": [ [ [ "pumpkin", 1 ] ] ],
"byproducts": [ [ "pumpkin_cut", 4 ] ],
"charges": 6
"charges": 2
},
{
"result": "seed_watermelon",
Expand Down Expand Up @@ -418,7 +419,7 @@
"type": "recipe",
"copy-from": "seed_extraction_base",
"components": [ [ [ "sunflower", 1 ] ] ],
"charges": 16
"charges": 4
},
{
"result": "seed_beans",
Expand Down
25 changes: 22 additions & 3 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "fried_seeds",
"charges": 1,
"charges": 5,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_SNACK",
"skill_used": "cooking",
Expand All @@ -2278,8 +2278,27 @@
"autolearn": true,
"batch_time_factors": [ 80, 1 ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [ [ [ "seed_weed", 4 ], [ "seed_pumpkin", 4 ], [ "seed_sunflower", 4 ] ] ]
"tools": [ [ [ "surface_heat", 12, "LIST" ] ], [ [ "frying_oil", 1, "LIST" ] ] ],
"//": "32g x5 total, oil is 15g while seeds are combined 140-150g",
"components": [ [ [ "seed_weed", 1 ], [ "seed_sunflower", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "fried_seeds",
"id_suffix": "pumpkin",
"charges": 4,
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_SNACK",
"skill_used": "cooking",
"difficulty": 1,
"time": "8 m",
"autolearn": true,
"batch_time_factors": [ 80, 1 ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "frying_oil", 1, "LIST" ] ] ],
"//": "32g x4 total, oil is 15g while seeds are combined 120g",
"components": [ [ [ "seed_pumpkin", 1 ] ] ]
},
{
"type": "recipe",
Expand Down