From d7c2da2eeb13064f349e177ff1489a287a38fd6d Mon Sep 17 00:00:00 2001 From: fairyarmadillo <94415528+fairyarmadillo@users.noreply.github.com> Date: Fri, 23 Feb 2024 20:04:32 -0800 Subject: [PATCH] Minor seed count fixes (#71929) * seed fixes * Update seed.json * typo * Update seed.json --- data/json/items/comestibles/raw_veggy.json | 21 ++++- data/json/items/comestibles/seed.json | 29 +++--- data/json/recipes/food/seed.json | 95 ++++++++++---------- data/json/uncraft/comestibles/vegetable.json | 2 +- 4 files changed, 76 insertions(+), 71 deletions(-) diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 977354b2e96a8..14a35b0aae00b 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -474,10 +474,29 @@ "material": [ "garlic" ], "volume": "150 ml", "fun": -18, - "flags": [ "RAW" ], + "flags": [ "RAW", "PLANTABLE_SEED" ], "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 1 ] ], "//": "Who in their right mind would eat an entire garlic bulb raw?" }, + { + "type": "COMESTIBLE", + "id": "garlic_clove", + "name": { "str": "garlic clove" }, + "weight": "3 g", + "color": "white", + "spoils_in": "360 days", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -3, + "calories": 4, + "description": "Cloves of garlic. Useful as a seasoning.", + "price": "8 cent", + "material": [ "garlic" ], + "volume": "25 ml", + "fun": -3, + "flags": [ "NUTRIENT_OVERRIDE" ], + "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" } + }, { "type": "COMESTIBLE", "id": "hops", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 3110696957edb..01221eac2a003 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -377,25 +377,6 @@ "flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ], "seed_data": { "plant_name": "cactus", "fruit": "cactus_pad", "grow": "91 days" } }, - { - "type": "COMESTIBLE", - "id": "garlic_clove", - "name": { "str": "garlic clove" }, - "weight": "3 g", - "color": "white", - "spoils_in": "360 days", - "comestible_type": "FOOD", - "symbol": "%", - "quench": -3, - "calories": 4, - "description": "Cloves of garlic. Useful as a seasoning, or for planting.", - "price": "8 cent", - "material": [ "garlic" ], - "volume": "25 ml", - "fun": -3, - "flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE" ], - "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" } - }, { "type": "COMESTIBLE", "id": "seed_carrot", @@ -895,6 +876,16 @@ "seed_data": { "plant_name": "oats", "fruit": "oat_stalks", "seeds": false, "grow": "65 days" }, "milling": { "into": "null", "recipe": "" } }, + { + "type": "COMESTIBLE", + "id": "seed_garlic_clove", + "copy-from": "garlic", + "name": { "str_sp": "seed garlic" }, + "category": "seeds", + "description": "Several cloves of garlic, ready for planting.", + "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" }, + "extend": { "flags": [ "NUTRIENT_OVERRIDE" ] } + }, { "id": "seed_wheat", "copy-from": "wheat", diff --git a/data/json/recipes/food/seed.json b/data/json/recipes/food/seed.json index 3489a82c8c1fa..fd50fadfffbfa 100644 --- a/data/json/recipes/food/seed.json +++ b/data/json/recipes/food/seed.json @@ -60,14 +60,16 @@ "type": "recipe", "copy-from": "seed_extraction_cutting", "byproducts": [ [ "cucumber_cut", 1 ] ], - "components": [ [ [ "cucumber", 1 ] ] ] + "components": [ [ [ "cucumber", 1 ] ] ], + "charges": 2 }, { "result": "seed_eggplant", "type": "recipe", "copy-from": "seed_extraction_cutting", "byproducts": [ [ "eggplant_cut", 1 ] ], - "components": [ [ [ "eggplant", 1 ] ] ] + "components": [ [ [ "eggplant", 1 ] ] ], + "charges": 2 }, { "result": "seed_oats", @@ -119,7 +121,8 @@ "type": "recipe", "copy-from": "seed_extraction_cutting", "byproducts": [ [ "zucchini_cut", 1 ] ], - "components": [ [ [ "zucchini", 1 ] ] ] + "components": [ [ [ "zucchini", 1 ] ] ], + "charges": 2 }, { "result": "seed_barley", @@ -163,15 +166,13 @@ "result": "seed_salsify_raw", "type": "recipe", "copy-from": "seed_extraction_base", - "components": [ [ [ "salsify_raw", 1 ] ] ], - "charges": 2 + "components": [ [ [ "salsify_raw", 1 ] ] ] }, { "result": "seed_chicory", "type": "recipe", "copy-from": "seed_extraction_base", - "components": [ [ [ "chicory_raw", 1 ] ] ], - "charges": 2 + "components": [ [ [ "chicory_raw", 1 ] ] ] }, { "result": "seed_wildcarrot", @@ -226,7 +227,15 @@ "result": "seed_chili_pepper", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "chili_pepper", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ] ] ], + "charges": 2 + }, + { + "result": "seed_bell_pepper", + "type": "recipe", + "copy-from": "seed_extraction_cutting", + "components": [ [ [ "bell_pepper", 1 ] ] ], + "charges": 2 }, { "result": "seed_wheat", @@ -245,8 +254,7 @@ "result": "seed_bee_balm", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "bee_balm", 1 ] ] ], - "charges": 2 + "components": [ [ [ "bee_balm", 1 ] ] ] }, { "result": "seed_buckwheat", @@ -258,29 +266,34 @@ "result": "buckwheat", "type": "recipe", "id_suffix": "seed_designation", - "copy-from": "seed_extraction_base", + "copy-from": "seed_extraction_designation", "components": [ [ [ "seed_buckwheat", 1 ] ] ] }, { "result": "seed_dogbane", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "dogbane", 1 ] ] ], - "charges": 2 + "components": [ [ [ "dogbane", 1 ] ] ] }, { - "result": "seed_garlic", + "result": "seed_garlic_clove", "type": "recipe", - "copy-from": "seed_extraction_base", - "components": [ [ [ "garlic", 1 ] ] ], - "charges": 8 + "copy-from": "seed_extraction_designation", + "components": [ [ [ "garlic_clove", 6 ] ] ] + }, + { + "result": "garlic_clove", + "type": "recipe", + "id_suffix": "seed_designation", + "copy-from": "seed_extraction_designation", + "components": [ [ [ "seed_garlic_clove", 1 ] ] ], + "charges": 6 }, { "result": "seed_mugwort", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "mugwort", 1 ] ] ], - "charges": 2 + "components": [ [ [ "mugwort", 1 ] ] ] }, { "result": "seed_mushroom", @@ -300,22 +313,20 @@ "result": "seed_raw_dandelion", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "raw_dandelion", 4 ] ] ], + "components": [ [ [ "raw_dandelion", 1 ] ] ], "charges": 2 }, { "result": "seed_raw_burdock", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "raw_burdock", 4 ] ] ], - "charges": 2 + "components": [ [ [ "raw_burdock", 1 ] ] ] }, { "result": "seed_japanese_knotweed", "type": "recipe", "copy-from": "seed_extraction_base", - "components": [ [ [ "japanese_knotweed_stem", 1 ] ] ], - "charges": 2 + "components": [ [ [ "japanese_knotweed_stem", 1 ] ] ] }, { "result": "seed_wild_rice", @@ -334,22 +345,19 @@ "result": "seed_jerusalem_artichoke", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "jerusalem_artichoke", 1 ] ] ], - "charges": 2 + "components": [ [ [ "jerusalem_artichoke", 1 ] ] ] }, { "result": "seed_maianthemum_stellatum", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "m_stellatum_berries", 1 ] ] ], - "charges": 2 + "components": [ [ [ "m_stellatum_berries", 1 ] ] ] }, { "result": "seed_wild_sarsaparilla", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "wild_sarsaparilla_root", 1 ] ] ], - "charges": 2 + "components": [ [ [ "wild_sarsaparilla_root", 1 ] ] ] }, { "result": "seed_mayapple", @@ -367,43 +375,37 @@ "result": "seed_groundnut", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "groundnut", 1 ] ] ], - "charges": 2 + "components": [ [ [ "groundnut", 1 ] ] ] }, { "result": "seed_wild_garlic", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "wild_garlic", 1 ] ] ], - "charges": 2 + "components": [ [ [ "wild_garlic", 1 ] ] ] }, { "result": "seed_rhubarb", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "rhubarb", 4 ] ] ], - "charges": 2 + "components": [ [ [ "rhubarb", 1 ] ] ] }, { "result": "seed_thyme", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "thyme", 1 ] ] ], - "charges": 2 + "components": [ [ [ "thyme", 1 ] ] ] }, { "result": "seed_veggy_wild", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "veggy_wild", 1 ] ] ], - "charges": 2 + "components": [ [ [ "veggy_wild", 1 ] ] ] }, { "result": "seed_wild_herbs", "type": "recipe", "copy-from": "seed_extraction_cutting", - "components": [ [ [ "wild_herbs", 20 ] ] ], - "charges": 2 + "components": [ [ [ "wild_herbs", 10 ] ] ] }, { "result": "seed_potato_raw", @@ -473,13 +475,6 @@ "result": "seed_bottle_gourd", "type": "recipe", "copy-from": "seed_extraction_base", - "components": [ [ [ "raw_bottle_gourd", 1 ] ] ] - }, - { - "result": "seed_eggplant", - "type": "recipe", - "copy-from": "seed_extraction_base", - "components": [ [ [ "eggplant", 1 ] ] ], - "charges": 8 + "components": [ [ [ "raw_bottle_gourd", 3 ] ] ] } ] diff --git a/data/json/uncraft/comestibles/vegetable.json b/data/json/uncraft/comestibles/vegetable.json index 6319fac4e34de..6f55cff36f879 100644 --- a/data/json/uncraft/comestibles/vegetable.json +++ b/data/json/uncraft/comestibles/vegetable.json @@ -76,7 +76,7 @@ "activity_level": "NO_EXERCISE", "time": "30 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "seed_eggplant", 1 ], [ "eggplant_cut", 1 ] ] ] + "components": [ [ [ "seed_eggplant", 2 ], [ "eggplant_cut", 1 ] ] ] }, { "result": "cattlefodder_medium",