From 5250a86f3f00f56b83a3fef44062c1be972aeb3f Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:26:46 +0100
Subject: [PATCH 1/3] clarify which clay containers have a lid, make clay pot
 an open container

---
 data/json/items/containers/containers.json |  6 +++---
 data/json/items/tool/cooking.json          | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
index d5b9a153772ef..1a7a2a2640d47 100644
--- a/data/json/items/containers/containers.json
+++ b/data/json/items/containers/containers.json
@@ -2032,7 +2032,7 @@
     "category": "container",
     "name": { "str": "clay canister" },
     "looks_like": "bowl_clay",
-    "description": "A fragile clay vessel.  It can be used to make crude impact grenades or to store liquid.",
+    "description": "A fragile clay vessel with a waterproofed hide lid.  It can be used to make crude impact grenades or to store liquid.",
     "ascii_picture": "clay_canister",
     "weight": "268 g",
     "volume": "295 ml",
@@ -2088,7 +2088,7 @@
     "category": "container",
     "name": { "str": "clay hydria" },
     "looks_like": "bowl_clay",
-    "description": "A 15-liter clay pot with three handles for carrying and pouring.",
+    "description": "A 15-liter clay pot with three handles for carrying and pouring.  It also has a waterproofed hide lid.",
     "ascii_picture": "clay_hydria",
     "weight": "1955 g",
     "volume": "17700 ml",
@@ -2557,7 +2557,7 @@
     "category": "container",
     "name": { "str": "clay jug" },
     "looks_like": "bowl_clay",
-    "description": "A clay container with a lid, used to hold and pour liquids.",
+    "description": "A clay container with a waterproofed hide lid, used to hold and pour liquids.",
     "ascii_picture": "jug_clay",
     "weight": "400 g",
     "volume": "1180 ml",
diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
index 355e3c83605d4..f30c32033f1d5 100644
--- a/data/json/items/tool/cooking.json
+++ b/data/json/items/tool/cooking.json
@@ -257,7 +257,15 @@
     "material": [ "clay" ],
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [ { "max_contains_volume": "2 L", "max_contains_weight": "2100 g", "watertight": true, "rigid": true } ],
+    "pocket_data": [
+      {
+        "max_contains_volume": "2 L",
+        "max_contains_weight": "2100 g",
+        "open_container": true,
+        "watertight": true,
+        "rigid": true
+      }
+    ],
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
     "use_action": [ "HEAT_ALL_ITEMS" ],
     "flags": [ "ALLOWS_REMOTE_USE" ],

From 1241e5007725a13ec748e42b09ee549fdd10cd8a Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:45:15 +0100
Subject: [PATCH 2/3] add no lid version of the large clay pot, add its
 crafting recipe and make it usable in the new-ish slow sand filter recipe

---
 data/json/items/containers/containers.json   | 17 +++++++++++++++++
 data/json/recipes/tools/containers.json      | 15 +++++++++++++++
 data/json/recipes/tools/tools_primitive.json |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
index 1a7a2a2640d47..6488de39383c2 100644
--- a/data/json/items/containers/containers.json
+++ b/data/json/items/containers/containers.json
@@ -2142,6 +2142,23 @@
     "flags": [ "FRAGILE_MELEE" ],
     "melee_damage": { "bash": 10 }
   },
+  {
+    "id": "clay_watercont_no_lid",
+    "type": "GENERIC",
+    "name": { "str": "large clay pot (no lid)" },
+    "description": "A bulky and heavy clay pot, meant to store water, but can carry other liquids in a pinch.",
+    "copy-from": "clay_watercont",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "open_container": true,
+        "watertight": true,
+        "max_contains_volume": "37500 ml",
+        "max_contains_weight": "50 kg"
+      }
+    ]
+  },
   {
     "id": "cup_plastic",
     "type": "GENERIC",
diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
index fffa5ef36e112..7436d840c1f8c 100644
--- a/data/json/recipes/tools/containers.json
+++ b/data/json/recipes/tools/containers.json
@@ -923,6 +923,21 @@
     "using": [ [ "cordage_short", 2 ], [ "glazing", 3 ], [ "earthenware_firing", 160 ] ],
     "components": [ [ [ "any_water", 3, "LIST" ] ], [ [ "clay_lump", 20 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "clay_watercont_no_lid",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "skills_required": [ "survival", 1 ],
+    "difficulty": 2,
+    "time": "77 m",
+    "autolearn": true,
+    "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
+    "using": [ [ "glazing", 3 ], [ "earthenware_firing", 160 ] ],
+    "components": [ [ [ "any_water", 3, "LIST" ] ], [ [ "clay_lump", 20 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
diff --git a/data/json/recipes/tools/tools_primitive.json b/data/json/recipes/tools/tools_primitive.json
index 7f95c3f8f1e8e..e9a36a49dad54 100644
--- a/data/json/recipes/tools/tools_primitive.json
+++ b/data/json/recipes/tools/tools_primitive.json
@@ -509,7 +509,7 @@
     "//": "Slow sand biofilter: https://wwwnc.cdc.gov/travel/yellowbook/2024/preparing/water-disinfection#:~:text=Figure%202%2D02.%20Emergency%20gravel%20and%20sand%20filter",
     "//1": "Density of sand is around 1.6g/cm^3. Gravel is similar. In a 10 in diameter bucket, 4 in of gravel is about 8 kg and 10 in of sand is about 20 kg.",
     "components": [
-      [ [ "bucket_5gal", 1 ] ],
+      [ [ "bucket_5gal", 1 ], [ "clay_watercont", 1 ], [ "clay_watercont_no_lid", 1 ] ],
       [ [ "material_sand", 2500 ] ],
       [ [ "material_gravel", 1000 ] ],
       [ [ "cotton_patchwork", 4 ], [ "wire_mesh", 4 ] ]

From 4c36dba414d5bc96c7c1e25bea645b2b4749fee2 Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:59:39 +0100
Subject: [PATCH 3/3] Update data/json/items/containers/containers.json

Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
---
 data/json/items/containers/containers.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
index 6488de39383c2..0b84ebc23f80f 100644
--- a/data/json/items/containers/containers.json
+++ b/data/json/items/containers/containers.json
@@ -2145,7 +2145,7 @@
   {
     "id": "clay_watercont_no_lid",
     "type": "GENERIC",
-    "name": { "str": "large clay pot (no lid)" },
+    "name": { "str": "large clay pot (no lid)", "str_pl": "large clay pots (no lid)" },
     "description": "A bulky and heavy clay pot, meant to store water, but can carry other liquids in a pinch.",
     "copy-from": "clay_watercont",
     "pocket_data": [