Add radishes and seeds to the game (#79490)

* feat: changes to support retting. * changes * retting: update to new tripoint * more map flags * add radishes * oops * spelling * fix cannot assign explicit value the same as default * Update data/json/items/comestibles/raw_veggy.json Co-authored-by: Karol1223 <[email protected]> * remove comment * added radish to cooking_components to allow wider use * fix density. * better name and description --------- Co-authored-by: Karol1223 <[email protected]>
CleverRaven · Feb 3, 2025 · 1b8b7d5 · 1b8b7d5
1 parent f72fb5c
commit 1b8b7d5
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 4 deletions.
diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -14,6 +14,7 @@
       [ "seed_sugar_beet", 60 ],
       [ "seed_lettuce", 60 ],
       [ "seed_cabbage", 60 ],
+      [ "seed_radish", 20 ],
       [ "seed_onion", 60 ],
       [ "seed_carrot", 60 ],
       [ "seed_sunflower", 60 ],
@@ -121,6 +122,7 @@
       [ "seed_sugar_beet", 1 ],
       [ "seed_lettuce", 1 ],
       [ "seed_cabbage", 1 ],
+      [ "seed_radish", 1 ],
       [ "seed_onion", 1 ],
       [ "seed_carrot", 1 ],
       [ "seed_watermelon", 1 ],

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -422,6 +422,7 @@
       { "item": "tomato", "prob": 20 },
       { "item": "lettuce", "prob": 15, "count": 5 },
       { "item": "cabbage", "prob": 10, "count": 8 },
+      { "item": "radish_taproot", "prob": 5, "count": 2 },
       { "item": "spinach", "prob": 6, "count": 9 },
       { "item": "cucumber", "prob": 10 },
       { "item": "pumpkin", "prob": 10 },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -889,6 +889,7 @@
       { "item": "lettuce", "prob": 11, "count": 5 },
       { "prob": 5, "group": "irradiated_lettuce_bag_plastic_5" },
       { "item": "cabbage", "prob": 10, "count": 8 },
+      { "item": "radish_taproot", "prob": 5, "count": 2 },
       { "prob": 5, "group": "irradiated_cabbage_bag_plastic_8" },
       { "item": "spinach", "prob": 6, "count": 9 },
       { "item": "tomato", "prob": 9 },

diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -181,6 +181,25 @@
     "smoking_result": "dry_veggy",
     "vitamins": [ [ "vitC", 2 ], [ "calcium", 4 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "radish_taproot",
+    "name": { "str": "handful of radish taproots", "str_pl": "handfuls of radish taproots" },
+    "weight": "100 g",
+    "color": "red",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "looks_like": "carrot",
+    "quench": 2,
+    "calories": 15,
+    "description": "A handful of crunchy red radish taproots.",
+    "price": "104 cent",
+    "price_postapoc": "104 cent",
+    "material": [ "veggy" ],
+    "volume": "325 ml",
+    "flags": [ "SMOKABLE", "RAW" ],
+    "vitamins": [ [ "veggy_allergen", 1 ], [ "vitC", "15 mg" ], [ "iron", "3 mg" ], [ "calcium", "25 mg" ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "spinach",

diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -197,6 +197,17 @@
     "flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ],
     "seed_data": { "plant_name": "cabbage", "fruit": "cabbage_head", "byproducts": [ "withered" ], "grow": "85 days" }
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_radish",
+    "copy-from": "seed",
+    "price": "50 cent",
+    "name": { "str_sp": "radish seeds" },
+    "description": "Some radish seeds.",
+    "flags": [ "PLANTABLE_SEED", "NUTRIENT_OVERRIDE", "INEDIBLE" ],
+    "//": "Wikipedia says 3-4 weeks or 6-7 weeks in the cold",
+    "seed_data": { "plant_name": "radish", "fruit": "radish_taproot", "byproducts": [ "withered" ], "grow": "35 days" }
+  },
   {
     "type": "COMESTIBLE",
     "id": "seed_tomato",

diff --git a/data/json/mapgen/cs_gardening_allotment.json b/data/json/mapgen/cs_gardening_allotment.json
@@ -30,9 +30,9 @@
         "  |333____444_sss_aaa|  ",
         "  |333____444_sss_aaa|  ",
         "  |__________________|  ",
-        "  |aaa____888_aaa_111|  ",
-        "  |aaa____888_aaa_111|  ",
-        "  |aaa____888_aaa_111|  ",
+        "  |aaa____888_rrr_111|  ",
+        "  |aaa____888_rrr_111|  ",
+        "  |aaa____888_rrr_111|  ",
         "  |__________________|  ",
         "  |ggg____SSS_222_666|  ",
         "  |ggg____SSS_222_666|  ",
@@ -86,6 +86,7 @@
         "R": { "item": { "item": "seed_blueberries" }, "furniture": "f_planter_seedling", "chance": 100 },
         "S": { "item": { "item": "seed_strawberries" }, "furniture": "f_planter_seedling", "chance": 100 },
         "s": { "item": { "item": "seed_corn" }, "furniture": "f_planter_seedling", "chance": 100 },
+        "r": { "item": { "item": "seed_radish" }, "furniture": "f_planter_seedling", "chance": 100 },
         "g": { "item": { "item": "seed_cabbage" }, "furniture": "f_planter_seedling", "chance": 100 }
       },
       "items": { "C": { "item": "ga_items_1", "chance": 80 }, "7": { "item": "garden_shed", "chance": 33 } },

diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json
@@ -25,7 +25,8 @@
         [ "young_leaves", 4 ],
         [ "sauerkraut", 2 ],
         [ "grape_leaves", 2 ],
-        [ "cabbage", 2 ]
+        [ "cabbage", 2 ],
+        [ "radish_taproot", 2 ]
       ],
       [
         [ "any_salad_cucumber", 1, "LIST" ],

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -6931,6 +6931,7 @@
         [ "celery", 1 ],
         [ "grape_leaves", 1 ],
         [ "cabbage", 1 ],
+        [ "radish_taproot", 1 ],
         [ "sauerkraut", 1 ],
         [ "any_tomato", 1, "LIST" ],
         [ "pumpkin_cut", 1 ],
@@ -7809,6 +7810,7 @@
         [ "chicory_leaves", 4 ],
         [ "sauerkraut", 2 ],
         [ "grape_leaves", 2 ],
+        [ "radish_taproot", 2 ],
         [ "cabbage", 2 ]
       ],
       [
@@ -8022,6 +8024,7 @@
         [ "veggy_salted", 1 ],
         [ "celery", 1 ],
         [ "grape_leaves", 1 ],
+        [ "radish_taproot", 1 ],
         [ "cabbage", 1 ],
         [ "sauerkraut", 1 ],
         [ "any_tomato", 1, "LIST" ],
@@ -8076,6 +8079,7 @@
         [ "veggy_salted", 1 ],
         [ "celery", 1 ],
         [ "grape_leaves", 1 ],
+        [ "radish_taproot", 1 ],
         [ "cabbage", 1 ],
         [ "sauerkraut", 1 ],
         [ "any_tomato", 1, "LIST" ],
@@ -8870,6 +8874,7 @@
         [ "seed_sugar_beet", 3 ],
         [ "seed_lettuce", 3 ],
         [ "seed_cabbage", 3 ],
+        [ "seed_radish", 3 ],
         [ "seed_tomato", 3 ],
         [ "seed_cotton_boll", 3 ],
         [ "seed_broccoli", 3 ],

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -713,6 +713,7 @@
         [ "veggy_potatolike", 1, "LIST" ],
         [ "celery", 1 ],
         [ "cabbage", 1 ],
+        [ "radish_taproot", 1 ],
         [ "sauerkraut", 1 ],
         [ "powder_eggs", 1 ],
         [ "eggs_bird", 1, "LIST" ],
@@ -1222,6 +1223,7 @@
         [ "plant_sac", 1 ],
         [ "potato", 1 ],
         [ "pumpkin_cut", 1 ],
+        [ "radish_taproot", 1 ],
         [ "raw_dandelion", 1 ],
         [ "raw_burdock", 1 ],
         [ "raw_bamboo", 1 ],