Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new no-lid variant of large clay pot, make it usable for the slow sand water filter #77463

Merged
merged 3 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions data/json/items/containers/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)", "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": [
{
"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",
Expand Down Expand Up @@ -2557,7 +2574,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",
Expand Down
10 changes: 9 additions & 1 deletion data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/tools/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/tools/tools_primitive.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
Expand Down
Loading