Add tea bags, herbal tea bags and adjust drinks recipes (#39989)

CleverRaven · May 3, 2020 · b7091a5 · b7091a5
1 parent ae30117
commit b7091a5
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 10 deletions.
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -243,7 +243,8 @@
       { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "group": "big_canned_food", "prob": 4 }
+      { "group": "big_canned_food", "prob": 4 },
+      { "group": "teabag_box", "prob": 20 }
     ]
   },
   {
@@ -456,7 +457,8 @@
       { "item": "coffee_syrup", "prob": 10 },
       { "item": "fruit_leather", "prob": 25 },
       { "item": "kernels", "prob": 25 },
-      { "item": "pine_nuts", "prob": 5 }
+      { "item": "pine_nuts", "prob": 5 },
+      { "group": "teabag_box", "prob": 10 }
     ]
   },
   {
@@ -777,7 +779,17 @@
       { "item": "restaurantmap", "prob": 5 },
       { "item": "touristmap", "prob": 2 },
       { "item": "noodles_fast", "prob": 30 },
-      { "item": "milkshake_fastfood", "prob": 15 }
+      { "item": "milkshake_fastfood", "prob": 15 },
+      { "group": "teabag_box", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "teabag_box",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "tea_bag", "prob": 20, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 },
+      { "item": "herbal_tea_bag", "prob": 5, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -262,7 +262,8 @@
         "prob": 60
       },
       { "item": "spoon", "count": [ 1, 6 ] },
-      { "item": "ceramic_mug", "count": [ 1, 6 ] }
+      { "item": "ceramic_mug", "count": [ 1, 6 ] },
+      { "group": "teabag_box", "prob": 60 }
     ]
   },
   {

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -85,7 +85,8 @@
       { "item": "tea_raw", "prob": 70 },
       { "item": "ceramic_cup", "prob": 70 },
       { "item": "teapot", "prob": 70 },
-      { "item": "clay_teapot", "prob": 70 }
+      { "item": "clay_teapot", "prob": 70 },
+      { "group": "teabag_box", "prob": 70 }
     ]
   },
   {
@@ -332,7 +333,8 @@
       { "item": "coffee_raw", "prob": 50 },
       { "item": "coffee_syrup", "prob": 15 },
       { "item": "cookies", "prob": 35 },
-      { "item": "tea_raw", "prob": 50 }
+      { "item": "tea_raw", "prob": 50 },
+      { "group": "teabag_box", "prob": 30 }
     ]
   },
   {
@@ -349,7 +351,8 @@
       { "item": "salt", "prob": 15 },
       { "item": "sugar", "prob": 70 },
       { "item": "tea_raw", "prob": 15 },
-      { "item": "wrapper", "prob": 75 }
+      { "item": "wrapper", "prob": 75 },
+      { "group": "teabag_box", "prob": 10 }
     ]
   },
   {
@@ -693,7 +696,8 @@
       { "item": "curry_powder", "prob": 40 },
       { "item": "can_cheese", "prob": 30 },
       { "item": "sauce_red", "prob": 40 },
-      { "item": "sauce_pesto", "prob": 20 }
+      { "item": "sauce_pesto", "prob": 20 },
+      { "group": "teabag_box", "prob": 45 }
     ]
   },
   {

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -721,5 +721,29 @@
     "price_postapoc": 0,
     "flags": [ "TRADER_AVOID" ],
     "volume": "250 ml"
+  },
+  {
+    "id": "tea_bag",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str": "tea bag" },
+    "flags": [ "IRREPLACEABLE_CONSUMABLE", "INEDIBLE" ],
+    "weight": "5 g",
+    "volume": "10 ml",
+    "color": "white",
+    "symbol": "?",
+    "container": "box_tea",
+    "material": "paper",
+    "price": 50,
+    "price_postapoc": 200,
+    "description": "Paper sachet with tea leafs inside.  Put it into boiling water to get your cup of tea."
+  },
+  {
+    "id": "herbal_tea_bag",
+    "type": "COMESTIBLE",
+    "name": { "str": "herbal tea bag" },
+    "copy-from": "tea_bag",
+    "color": "green",
+    "description": "Paper sachet with dried wild herbs inside.  Put it into boiling water to make some healthy warm drink."
   }
 ]
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -1605,5 +1605,20 @@
       }
     ],
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
+  },
+  {
+    "id": "box_tea",
+    "type": "CONTAINER",
+    "category": "container",
+    "name": { "str": "small cardboard box of tea bags", "str_pl": "small cardboard boxes of tea bags" },
+    "description": "A very small cardboard box with tea brand written on it.",
+    "weight": "10 g",
+    "volume": "100 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "material": "cardboard",
+    "symbol": ")",
+    "color": "green",
+    "contains": "100 ml"
   }
 ]
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -1309,7 +1309,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "BOIL", "level": 1 } ],
     "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "tea_raw", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "tea_raw", 1 ], [ "tea_bag", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -1323,7 +1323,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "BOIL", "level": 1 } ],
     "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "wild_herbs", 10 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "wild_herbs", 10 ], [ "herbal_tea_bag", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",