Merge pull request #39111 from CountAlex/mustard

Adds mustard plant, mustard powder and mustard recipe.
CleverRaven · Apr 4, 2020 · a949ce9 · a949ce9
2 parents 0558b6b + 42e7a7d
commit a949ce9
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 4 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
@@ -300,5 +300,20 @@
       "sound_fail": "whump.",
       "items": [ { "item": "withered", "count": [ 45, 50 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_mustard",
+    "name": "mustard",
+    "description": "Yellow flower known as Brassica Nigra.  Known for its seeds that can be used for making table mustard.",
+    "symbol": "f",
+    "color": "yellow",
+    "looks_like": "f_dandelion",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "examine_action": "harvest_furn",
+    "harvest_by_season": [ { "seasons": [ "summer", "autumn" ], "entries": [ { "drop": "seed_mustard", "base_num": [ 2, 6 ] } ] } ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
   }
 ]
diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -31,7 +31,8 @@
       [ "seed_flower", 60 ],
       [ "seed_beans", 60 ],
       [ "seed_chili_pepper", 60 ],
-      [ "seed_tomato", 60 ]
+      [ "seed_tomato", 60 ],
+      [ "seed_mustard", 10 ]
     ]
   },
   {
@@ -112,6 +113,7 @@
       [ "seed_lentils", 1 ],
       [ "seed_chili_pepper", 1 ],
       [ "seed_garlic", 1 ],
+      [ "seed_mustard", 1 ],
       [ "tomato", 9 ],
       [ "pumpkin", 6 ],
       [ "broccoli", 9 ],

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -99,7 +99,7 @@
     "comestible_type": "DRINK",
     "container": "condiment_bottle_unsealed",
     "fun": -1,
-    "calories": 5,
+    "calories": 10,
     "spoils_in": 600,
     "charges": 48,
     "phase": "liquid",

diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -745,5 +745,19 @@
     "name": { "str": "chamomile seeds", "str_pl": "chamomile seeds" },
     "description": "Some chamomile seeds.",
     "seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_mustard",
+    "copy-from": "seed",
+    "name": { "str": "mustard seeds", "str_pl": "mustard seeds" },
+    "weight": "2 g",
+    "color": "yellow",
+    "use_action": "SEED",
+    "fun": -3,
+    "description": "Some mustard seeds.  Could be ground into mustard powder.",
+    "price": 100,
+    "charges": 2,
+    "seed_data": { "plant_name": "mustard", "fruit": "seed_mustard", "byproducts": [ "withered" ], "grow": "91 days" }
   }
 ]
diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json
@@ -141,5 +141,13 @@
     "material": [ "veggy" ],
     "volume": "250 ml",
     "price": 0
+  },
+  {
+    "id": "mustard_powder",
+    "copy-from": "spice",
+    "type": "COMESTIBLE",
+    "name": { "str": "mustard powder", "str_pl": "mustard powder" },
+    "description": "A fragnant yellow powder.  Not edible in this form.",
+    "color": "red"
   }
 ]
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -6414,5 +6414,52 @@
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ],
     "components": [ [ [ "fiddlehead_boiled", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "mustard_powder",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "15 m",
+    "autolearn": true,
+    "batch_time_factors": [ 83, 3 ],
+    "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ],
+    "components": [ [ [ "seed_mustard", 4 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "mustard_powder",
+    "category": "CC_FOOD",
+    "id_suffix": "with_from_food_processor",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "5 m 30 s",
+    "autolearn": true,
+    "batch_time_factors": [ 83, 3 ],
+    "tools": [ [ [ "food_processor", 20 ] ] ],
+    "components": [ [ [ "seed_mustard", 4 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "mustard",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "18 m",
+    "charges": 2,
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 } ],
+    "components": [
+      [ [ "mustard_powder", 1 ] ],
+      [ [ "salt", 2 ], [ "seasoning_salt", 2 ] ],
+      [ [ "vinegar", 1 ] ],
+      [ [ "sugar", 1 ] ],
+      [ [ "water_clean", 1 ] ]
+    ]
   }
 ]
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -143,7 +143,8 @@
           "f_lily": 1,
           "f_flower_tulip": 1,
           "f_mutpoppy": 1,
-          "f_sunflower": 1
+          "f_sunflower": 1,
+          "f_mustard": 1
         },
         "f_region_water_plant": { "f_cattails": 15, "f_lilypad": 1, "f_lotus": 5 }
       }
@@ -210,7 +211,8 @@
         "f_dahlia": 3.5,
         "f_datura": 0.2,
         "f_dandelion": 5.0,
-        "f_sunflower": 3.5
+        "f_sunflower": 3.5,
+        "f_mustard": 0.2
       },
       "boosted_other_percent": 50.0
     },