diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 18136883b4768..7425f20b8710a 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -466,12 +466,11 @@ "color": "green", "use_action": [ "SEED" ], "quench": -1, - "volume": "250 ml", - "calories": 750, + "weight": "17 g", + "volume": "42 ml", "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.", + "//": "Cannabis doesn't yield seeds without being fertilized, which ruins its THC output, but we don't model that yet.", "price": "1 cent", - "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 } @@ -580,13 +579,12 @@ "id": "seed_pumpkin", "copy-from": "seed", "name": { "str_sp": "pumpkin seeds" }, - "weight": "120 g", - "volume": "250 ml", + "weight": "17 g", + "volume": "42 ml", "color": "green", "use_action": [ "SEED" ], - "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.", + "calories": 65, + "description": "Some raw pumpkin seeds with the shells on. Could be fried and eaten.", "price": 100, "flags": [ "PLANTABLE_SEED" ], "seed_data": { "plant_name": "pumpkin", "fruit": "pumpkin", "seeds": false, "byproducts": [ "withered" ], "grow": "91 days" }, @@ -597,13 +595,12 @@ "id": "seed_sunflower", "copy-from": "seed", "name": { "str_sp": "sunflower seeds" }, - "weight": "140 g", - "volume": "250 ml", + "weight": "25 g", + "volume": "63 ml", "color": "green", "use_action": [ "SEED" ], - "//": "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.", + "calories": 165, + "description": "Some raw sunflower seeds with the shells on. Could be pressed into oil.", "price": "1 cent", "flags": [ "PLANTABLE_SEED" ], "seed_data": { "plant_name": "sunflower", "fruit": "seed_sunflower", "byproducts": [ "withered" ], "grow": "91 days" }, diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 66d7e7a05dbeb..b654ef7d0caf5 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -356,12 +356,12 @@ "tools": [ [ [ "clay_quern", -1 ], [ "rock_quern", -1 ] ] ], "components": [ [ - [ "seed_cotton_boll", 2 ], - [ "seed_pumpkin", 2 ], - [ "seed_sunflower", 2 ], - [ "seed_canola", 2 ], - [ "seed_grapes", 2 ], - [ "seed_weed", 2 ] + [ "seed_cotton_boll", 8 ], + [ "seed_pumpkin", 8 ], + [ "seed_sunflower", 8 ], + [ "seed_canola", 1 ], + [ "seed_grapes", 8 ], + [ "seed_weed", 8 ] ] ] }, diff --git a/data/json/recipes/food/seed.json b/data/json/recipes/food/seed.json index e6b5ef364a973..280d656eba94e 100644 --- a/data/json/recipes/food/seed.json +++ b/data/json/recipes/food/seed.json @@ -37,7 +37,7 @@ "//p": "about 450-500 seeds per pumpkin, which is about a cup. these are fairly small pumpkins.", "components": [ [ [ "pumpkin", 1 ] ] ], "byproducts": [ [ "pumpkin_cut", 4 ] ], - "charges": 1 + "charges": 6 }, { "result": "seed_watermelon", @@ -52,8 +52,8 @@ "type": "recipe", "copy-from": "seed_extraction_cutting", "components": [ [ [ "melon", 1 ] ] ], - "byproducts": [ [ "melon_chunks", 3 ] ], - "charges": 5 + "byproducts": [ [ "melon_chunks", 4 ] ], + "charges": 3 }, { "result": "seed_cucumber", @@ -422,7 +422,7 @@ "type": "recipe", "copy-from": "seed_extraction_base", "components": [ [ [ "sunflower", 1 ] ] ], - "charges": 1 + "charges": 6 }, { "result": "seed_beans", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 3b341e3ac29f8..cd29e7783cd7d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -728,11 +728,11 @@ [ "beech_nuts", 20 ], [ "soybean", 10 ], [ "seed_cotton_boll", 20 ], - [ "seed_pumpkin", 5 ], - [ "seed_sunflower", 5 ], + [ "seed_pumpkin", 20 ], + [ "seed_sunflower", 20 ], [ "seed_canola", 5 ], [ "seed_grapes", 20 ], - [ "seed_weed", 5 ] + [ "seed_weed", 20 ] ] ] }, @@ -769,11 +769,11 @@ [ "beech_nuts", 20 ], [ "soybean", 10 ], [ "seed_cotton_boll", 20 ], - [ "seed_pumpkin", 5 ], - [ "seed_sunflower", 5 ], + [ "seed_pumpkin", 20 ], + [ "seed_sunflower", 20 ], [ "seed_canola", 5 ], [ "seed_grapes", 20 ], - [ "seed_weed", 5 ] + [ "seed_weed", 20 ] ] ] }, @@ -2327,25 +2327,6 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "fried_seeds", - "charges": 5, - "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", 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", @@ -2354,9 +2335,8 @@ "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 ] ] ] + "tools": [ [ [ "surface_heat", 6, "LIST" ] ], [ [ "frying_oil", 1, "LIST" ] ] ], + "components": [ [ [ "seed_weed", 1 ], [ "seed_sunflower", 1 ], [ "seed_pumpkin", 1 ] ] ] }, { "type": "recipe",