From 3e93e5b692f32b6b5a5ba858db35985fd9d5f8ee Mon Sep 17 00:00:00 2001
From: levkropp <levkropp@protonmail.com>
Date: Fri, 27 Nov 2020 03:26:42 -0500
Subject: [PATCH] Add dandelion and chamomile tea bags and recipes (#43241)

---
 data/json/itemgroups/Food/food.json    |  4 +++-
 data/json/items/comestibles/drink.json |  2 +-
 data/json/items/comestibles/other.json | 19 +++++++++++++--
 data/json/recipes/recipe_food.json     | 32 +++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
index 7c5b8f1af6022..b61e9bc04fb78 100644
--- a/data/json/itemgroups/Food/food.json
+++ b/data/json/itemgroups/Food/food.json
@@ -813,7 +813,9 @@
       { "item": "tea_bag", "prob": 20, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 },
       { "item": "tea_fruit_bag", "prob": 10, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 },
       { "item": "tea_green_bag", "prob": 10, "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 }
+      { "item": "tea_bag_chamomile", "prob": 10, "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 },
+      { "item": "tea_bag_dandelion", "prob": 5, "container-item": "box_tea", "charges-min": 1, "charges-max": 10 }
     ]
   }
 ]
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index eec3dbcd1000b..5f90676653599 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -496,7 +496,7 @@
     "symbol": "~",
     "quench": 44,
     "healthy": 1,
-    "calories": 2,
+    "calories": 9,
     "description": "A healthy beverage made from herbs steeped in boiling water.",
     "price": 100,
     "price_postapoc": 25,
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 54c891c944394..2be0be56898b6 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -826,8 +826,23 @@
     "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."
+    "calories": 9,
+    "description": "A paper sachet with dried wild herbs inside.  Put it into boiling water to make a cup of herbal tea."
+  },
+  {
+    "id": "tea_bag_dandelion",
+    "type": "COMESTIBLE",
+    "name": { "str": "dandelion tea bag" },
+    "copy-from": "tea_bag",
+    "calories": 26,
+    "description": "A paper sachet with dried dandelion roots inside.  Put it into boiling water to make a cup of dandelion tea."
+  },
+  {
+    "id": "tea_bag_chamomile",
+    "type": "COMESTIBLE",
+    "name": { "str": "chamomile tea bag" },
+    "copy-from": "tea_bag",
+    "description": "A paper sachet with dried chamomile inside.  Put it into boiling water to make a cup of chamomile tea."
   },
   {
     "id": "instant_coffee",
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 00d533b4b32d3..0ea0b8b6ae039 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -1544,6 +1544,36 @@
     "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
     "components": [ [ [ "tea_fruit_bag", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "herbal_tea",
+    "id_suffix": "from_tea_bag",
+    "activity_level": "NO_EXERCISE",
+    "copy-from": "tea",
+    "qualities": [ { "id": "BOIL", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
+    "components": [ [ [ "herbal_tea_bag", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "dandelion_tea",
+    "id_suffix": "from_tea_bag",
+    "activity_level": "NO_EXERCISE",
+    "copy-from": "tea",
+    "qualities": [ { "id": "BOIL", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
+    "components": [ [ [ "tea_bag_dandelion", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "chamomile_tea",
+    "id_suffix": "from_tea_bag",
+    "activity_level": "NO_EXERCISE",
+    "copy-from": "tea",
+    "qualities": [ { "id": "BOIL", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
+    "components": [ [ [ "tea_bag_chamomile", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
@@ -1557,7 +1587,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "BOIL", "level": 1 } ],
     "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "wild_herbs", 10 ], [ "herbal_tea_bag", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "wild_herbs", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",