Merge pull request #40316 from curstwist/tea

add new tea item_groups
CleverRaven · May 8, 2020 · fb94240 · fb94240
2 parents e0500d3 + 1c56e80
commit fb94240
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 2 deletions.
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -89,6 +89,58 @@
       { "group": "teabag_box", "prob": 70 }
     ]
   },
+  {
+    "id": "prepared_teas",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "tea", "prob": 60 },
+      { "item": "bee_balm_tea", "prob": 20 },
+      { "item": "dandelionburdock_tea", "prob": 20, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "dandelion_tea", "prob": 10, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "pine_tea", "prob": 10, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "herbal_tea", "prob": 50 },
+      { "item": "chamomile_tea", "prob": 40 },
+      { "item": "lotus_tea", "prob": 30 },
+      { "item": "spurge_tea", "prob": 20 },
+      { "item": "milk_tea", "prob": 20 },
+      { "item": "chai_tea", "prob": 30 }
+    ]
+  },
+  {
+    "id": "teashop_bulk_teas",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "honey_bottled", "prob": 20 },
+      { "item": "honey_glassed", "prob": 20 },
+      { "item": "con_milk", "prob": 10 },
+      { "item": "tanbark", "prob": 3, "charges-min": 1, "charges-max": 2, "container-item": "jar_3l_glass" },
+      { "item": "bee_balm", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "jar_3l_glass" },
+      { "item": "spurge", "prob": 20, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "lotus", "prob": 20, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "raw_burdock", "prob": 10, "charges-min": 1, "charges-max": 48, "container-item": "jar_3l_glass" },
+      { "item": "chamomile", "prob": 30, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "tea_raw", "prob": 60, "charges-min": 10, "charges-max": 40, "container-item": "jar_glass_sealed" },
+      {
+        "item": "wild_herbs",
+        "prob": 50,
+        "charges-min": 20,
+        "charges-max": 200,
+        "container-item": "jar_glass_sealed"
+      },
+      {
+        "item": "raw_dandelion",
+        "prob": 10,
+        "charges-min": 1,
+        "charges-max": 8,
+        "container-item": "jar_glass_sealed"
+      },
+      { "item": "milk_powder", "prob": 30, "charges-min": 1, "charges-max": 8, "container-item": "jar_glass_sealed" },
+      { "item": "cinnamon", "prob": 20, "charges-min": 1, "charges-max": 200, "container-item": "jar_glass_sealed" },
+      { "item": "sugar", "prob": 40, "charges-min": 10, "charges-max": 142, "container-item": "jar_glass_sealed" }
+    ]
+  },
   {
     "id": "teashop_fridge",
     "type": "item_group",

diff --git a/data/json/mapgen/teashop.json b/data/json/mapgen/teashop.json
@@ -101,8 +101,8 @@
         { "item": "chair_pants", "x": 2, "y": 12, "chance": 30 },
         { "item": "chair_feet", "x": 2, "y": 12, "chance": 30 },
         { "item": "displays", "x": 2, "y": [ 7, 9 ], "chance": 70, "repeat": [ 1, 8 ] },
-        { "item": "displays", "x": [ 5, 7 ], "y": 6, "chance": 70, "repeat": [ 1, 8 ] },
-        { "item": "displays", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 30, "repeat": [ 1, 8 ] },
+        { "item": "prepared_teas", "x": [ 5, 7 ], "y": 6, "chance": 70, "repeat": [ 1, 8 ] },
+        { "item": "teashop_bulk_teas", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 30, "repeat": [ 1, 8 ] },
         { "item": "teashop_kitchen_counter", "x": 2, "y": [ 14, 16 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "teashop_kitchen_counter", "x": [ 5, 6 ], "y": 14, "chance": 80, "repeat": [ 1, 3 ] },
         { "item": "teashop_fridge", "x": 4, "y": 14, "chance": 90, "repeat": [ 1, 8 ] }