Add hydria-based charcoal water purifier (CleverRaven#50083)

993499094 · Jul 21, 2021 · 8b32ca7 · 8b32ca7
1 parent 222079f
commit 8b32ca7
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 6 deletions.
diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -125,15 +125,38 @@
     "price_postapoc": 2000,
     "to_hit": -3,
     "bashing": 3,
-    "material": [ "wood", "plastic" ],
+    "material": [ "plastic" ],
     "symbol": ";",
     "color": "light_gray",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 150 } } ],
-    "initial_charges": 150,
-    "max_charges": 150,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 75 } } ],
+    "initial_charges": 75,
+    "max_charges": 75,
     "charges_per_use": 1,
     "use_action": [ "WATER_PURIFIER" ],
-    "flags": [ "ALLOWS_REMOTE_USE" ]
+    "flags": [ "ALLOWS_REMOTE_USE", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "char_purifier_clay",
+    "type": "TOOL",
+    "name": { "str": "large charcoal water purifier" },
+    "looks_like": "clay_hydria",
+    "description": "Using this item on a container full of water will purify the water using layered charcoal.  Once the charcoal has purified enough water, it will become unusable and can be disassembled and recycled.  Water taken from uncertain sources like a river may be dirty.",
+    "weight": "2300 g",
+    "volume": "15004 ml",
+    "longest_side": "45 cm",
+    "price": 4000,
+    "price_postapoc": 2000,
+    "to_hit": -1,
+    "bashing": 1,
+    "material": [ "clay" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 300 } } ],
+    "initial_charges": 300,
+    "max_charges": 300,
+    "charges_per_use": 1,
+    "use_action": [ "WATER_PURIFIER" ],
+    "flags": [ "ALLOWS_REMOTE_USE", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "char_smoker",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -1933,6 +1933,13 @@
     "activity_level": "LIGHT_EXERCISE",
     "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ] ]
   },
+  {
+    "result": "char_purifier_clay",
+    "type": "uncraft",
+    "time": "5 m",
+    "activity_level": "LIGHT_EXERCISE",
+    "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ] ]
+  },
   {
     "result": "clock",
     "type": "uncraft",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -66,7 +66,15 @@
     "skill_used": "cooking",
     "time": "9 s",
     "autolearn": true,
-    "tools": [ [ [ "water_purifier", 1 ], [ "fake_water_purifier", 1 ], [ "pur_tablets", 1 ], [ "char_purifier", 1 ] ] ],
+    "tools": [
+      [
+        [ "water_purifier", 1 ],
+        [ "fake_water_purifier", 1 ],
+        [ "pur_tablets", 1 ],
+        [ "char_purifier", 1 ],
+        [ "char_purifier_clay", 1 ]
+      ]
+    ],
     "components": [ [ [ "water", 1 ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1266,6 +1266,20 @@
     "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 75 ] ] ],
     "flags": [ "FULL_MAGAZINE" ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "char_purifier_clay",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "survival",
+    "difficulty": 2,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 300 ] ] ],
+    "flags": [ "FULL_MAGAZINE" ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",