Merge pull request #40049 from Rail-Runner/plants3

Add spurge seeds
CleverRaven · May 4, 2020 · 0c4d9b2 · 0c4d9b2
2 parents 2ebad2a + e7e2d87
commit 0c4d9b2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
@@ -94,7 +94,7 @@
         "seasons": [ "spring", "summer", "autumn" ],
         "entries": [
           { "drop": "withered", "base_num": [ 1, 2 ] },
-          { "drop": "seed_flower", "base_num": [ 1, 2 ] },
+          { "drop": "seed_spurge", "base_num": [ 1, 2 ] },
           { "drop": "spurge", "base_num": [ 1, 4 ] }
         ]
       }
@@ -178,11 +178,7 @@
     "harvest_by_season": [
       {
         "seasons": [ "spring", "summer", "autumn" ],
-        "entries": [
-          { "drop": "withered", "base_num": [ 1, 2 ] },
-          { "drop": "seed_flower", "base_num": [ 1, 2 ] },
-          { "drop": "lotus", "base_num": [ 1, 2 ] }
-        ]
+        "entries": [ { "drop": "withered", "base_num": [ 1, 2 ] }, { "drop": "lotus", "base_num": [ 1, 2 ] } ]
       }
     ],
     "//": "Add flower and bud spawns once useful.",

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -33,6 +33,7 @@
       [ "seed_chili_pepper", 60 ],
       [ "seed_tomato", 60 ],
       [ "seed_horseradish", 10 ],
+      [ "seed_spurge", 10 ],
       [ "seed_popcorn", 10 ],
       [ "seed_mustard", 10 ]
     ]

diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
@@ -99,6 +99,7 @@
       [ "seed_weed", 5 ],
       [ "seed_flower", 5 ],
       [ "seed_tobacco", 1 ],
+      [ "seed_spurge", 1 ],
       [ "joint_roach", 5 ],
       [ "pipe", 20 ],
       [ "bag_plastic", 10 ],

diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -749,6 +749,15 @@
     "description": "Some chamomile seeds.",
     "seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" }
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_spurge",
+    "copy-from": "seed",
+    "looks_like": "seed_raw_dandelion",
+    "name": { "str_sp": "spurge seeds" },
+    "description": "Some spurge seeds.",
+    "seed_data": { "plant_name": "spurge", "fruit": "spurge", "byproducts": [ "withered" ], "grow": "91 days" }
+  },
   {
     "type": "COMESTIBLE",
     "id": "seed_popcorn",

diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json
@@ -98,7 +98,7 @@
     "symbol": "%",
     "quench": -1,
     "calories": 9,
-    "description": "A tasty collection of wild herbs including violet, sassafras, mint, clover, purslane, fireweed, and burdock.",
+    "description": "A tasty collection of wild herbs including violet, sassafras, mint, clover, purslane, and fireweed.",
     "price": 190,
     "price_postapoc": 50,
     "material": "veggy",

diff --git a/data/json/mapgen/cs_gardening_allotment.json b/data/json/mapgen/cs_gardening_allotment.json
@@ -11,6 +11,7 @@
       [ "seed_carrot", 10 ],
       [ "seed_pumpkin", 10 ],
       [ "seed_broccoli", 10 ],
+      [ "seed_spurge", 10 ],
       [ "gloves_work", 10 ]
     ]
   },