Distinguish sieving and straining in recipes

data/json/itemgroups/SUS/domestic.json

@@ -431,7 +431,7 @@
       { "item": "pot_copper", "prob": 75 },
       { "item": "stock_pot", "prob": 50 },
       { "item": "pot_canning", "prob": 25 },
-      { "item": "colander_steel", "prob": 40 },
+      { "item": "colander_steel", "prob": 80 },
       { "item": "splatter_guard", "prob": 20 },
       { "item": "pan", "count": [ 1, 2 ] },
       { "item": "steel_pan", "prob": 80 },

data/json/items/generic.json

@@ -1063,14 +1063,14 @@
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "steel mesh", "str_pl": "steel meshes" },
-    "description": "A mat of finely-woven steel wire, useful for dryer lint traps and reusable coffee filter baskets.  You could put these on a window to keep mosquitoes and other bugs out, but chain link fencing will do these days.",
+    "description": "A 6-inch square piece of finely-woven steel wire, useful for dryer lint traps and reusable coffee filter baskets.  You could put this on a window to keep mosquitoes and other bugs out if it was larger, but chain link fencing will do these days.",
     "category": "spare_parts",
-    "weight": "318 g",
-    "volume": "500 ml",
+    "//": "Reference tables for calculating steel mesh weight (current one assumes 100 mesh twill weave): http://www.wirecloth.com/mesh-cloth-specification-tables/",
+    "weight": "19 g",
+    "volume": "6 ml",
     "price": 700,
     "price_postapoc": 100,
-    "material": [ "steel" ],
-    "melee_damage": { "bash": 2 }
+    "material": [ "steel" ]
   },
   {
     "type": "GENERIC",

data/json/items/generic/dining_kitchen.json

@@ -1180,6 +1180,7 @@
     "volume": "500 ml",
     "weight": "318 g",
     "symbol": ")",
+    "qualities": [ [ "SIEVE", 2 ], [ "STRAIN", 1 ] ],
     "price": 600,
     "price_postapoc": 5
   },
@@ -1191,6 +1192,7 @@
     "volume": "500 ml",
     "weight": "357 g",
     "symbol": ")",
+    "qualities": [ [ "SIEVE", 2 ], [ "STRAIN", 1 ] ],
     "price": 600,
     "price_postapoc": 5
   },

data/json/items/tool/cooking.json

@@ -894,6 +894,7 @@
     "price_postapoc": 10,
     "material": [ "paper" ],
     "symbol": ";",
+    "qualities": [ [ "SIEVE", 1 ] ],
     "color": "light_gray",
     "melee_damage": { "bash": 1 }
   },
@@ -910,8 +911,24 @@
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
+    "qualities": [ [ "SIEVE", 2 ], [ "STRAIN", 1 ] ],
     "melee_damage": { "bash": 2 }
   },
+  {
+    "id": "sieve_steel_makeshift",
+    "type": "GENERIC",
+    "category": "tools",
+    "name": { "str": "makeshift sieve" },
+    "description": "Some fine steel mesh attached to a length of thicker steel wire, forming a rigid frame.  Useful for sieving.",
+    "volume": "106 ml",
+    "weight": "170 g",
+    "price": 700,
+    "price_postapoc": 50,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "dark_gray",
+    "qualities": [ [ "SIEVE", 2 ], [ "STRAIN", 1 ] ]
+  },
   {
     "id": "still",
     "type": "TOOL",

data/json/items/tool/toiletries.json

@@ -167,6 +167,7 @@
     "price_postapoc": 2,
     "material": [ "cotton" ],
     "symbol": ",",
+    "qualities": [ [ "SIEVE", 1 ], [ "STRAIN", 2 ] ],
     "color": "white",
     "use_action": [
       { "type": "heal", "move_cost": 200, "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] } },

data/json/obsoletion/obsolete-0.G-recipes.json

@@ -204,5 +204,15 @@
     "result": "xs_k_gambeson_hood",
     "type": "recipe",
     "obsolete": true
+  },
+  {
+    "result": "sieve_steel",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "wire_mesh",
+    "type": "recipe",
+    "obsolete": true
   }
 ]

data/json/recipes/ammo/components.json

@@ -25,8 +25,7 @@
     "time": "15 s",
     "charges": 10,
     "book_learn": [ [ "pocket_firearms", 3 ], [ "manual_gun", 2 ], [ "recipe_bullets", 1 ], [ "textbook_anarch", 0 ] ],
-    "qualities": [ { "id": "FINE_GRIND", "level": 1 } ],
-    "tools": [ [ [ "sieve_steel", -1 ] ] ],
+    "qualities": [ { "id": "FINE_GRIND", "level": 1 }, { "id": "SIEVE", "level": 1 } ],
     "components": [
       [
         [ "gunpowder_shotgun", 10 ],

data/json/recipes/chem/chemicals.json

@@ -17,8 +17,8 @@
       { "proficiency": "prof_intro_chem_synth" },
       { "proficiency": "prof_inorganic_chemistry" }
     ],
-    "qualities": [ { "id": "BOIL", "level": 1 } ],
-    "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ],
+    "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
+    "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ],
     "components": [ [ [ "feces_bird", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
@@ -184,9 +184,10 @@
       { "id": "CHEM", "level": 2 },
       { "id": "HAMMER", "level": 1 },
       { "id": "CONTAIN", "level": 1 },
-      { "id": "SEPARATE", "level": 1 }
+      { "id": "SEPARATE", "level": 1 },
+      { "id": "STRAIN", "level": 2 }
     ],
-    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ],
     "components": [
       [
         [ "lemon", 8 ],

data/json/recipes/chem/drugs.json

@@ -16,8 +16,13 @@
       { "proficiency": "prof_inorganic_chemistry" },
       { "proficiency": "prof_pharmaceutical" }
     ],
-    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SEPARATE", "level": 1 }, { "id": "ANALYSIS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 60, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ],
+    "qualities": [
+      { "id": "CHEM", "level": 2 },
+      { "id": "SEPARATE", "level": 1 },
+      { "id": "ANALYSIS", "level": 1 },
+      { "id": "STRAIN", "level": 2 }
+    ],
+    "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ],
     "components": [
       [ [ "feces_bird", 17 ] ],
       [ [ "formic_acid", 23 ] ],

data/json/recipes/food/brewing.json

@@ -136,7 +136,7 @@
     "batch_time_factors": [ 50, 4 ],
     "autolearn": true,
     "book_learn": [ [ "brewing_cookbook", 6 ] ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "sake_unfiltered", 1 ] ] ]
   },
   {

data/json/recipes/food/canned.json

@@ -1236,8 +1236,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 6, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
@@ -1263,8 +1262,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 1, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
@@ -1286,8 +1284,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 6, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
@@ -1309,8 +1306,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 6, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
@@ -1332,8 +1328,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 1, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
@@ -1355,8 +1350,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 1, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 1u of canning_low_heat.",
@@ -1379,8 +1373,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 6, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 1u of canning_low_heat.",
@@ -1458,8 +1451,7 @@
     "book_learn": [ [ "preserving_juice", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
     "using": [ [ "canning_low_heat", 1, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 1u of canning_low_heat.",
@@ -2520,7 +2512,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
     "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ]
@@ -2542,7 +2534,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_apple", 2 ], [ "apple", 2 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
     "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ]
@@ -2564,7 +2556,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 6 ] ], [ [ "irradiated_apple", 24 ], [ "apple", 24 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
     "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ]
@@ -2586,7 +2578,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
     "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ]
@@ -2608,7 +2600,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
     "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ]
@@ -2630,7 +2622,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 6 ] ], [ [ "irradiated_orange", 24 ], [ "orange", 24 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
     "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ]
@@ -2652,7 +2644,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water_clean", 3 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
     "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ]
@@ -2674,7 +2666,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "water_clean", 2 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
     "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ]
@@ -2696,7 +2688,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "sweet_fruit", 12, "LIST" ] ], [ [ "water_clean", 13 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
     "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ]
@@ -2777,7 +2769,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
     "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ]
@@ -2799,7 +2791,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 1 ] ], [ [ "irradiated_cranberries", 3 ], [ "cranberries", 3 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
     "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ]
@@ -2821,7 +2813,7 @@
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ],
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
-    "tools": [ [ [ "cotton_patchwork", -1 ] ] ],
+    "qualities": [ { "id": "STRAIN", "level": 2 } ],
     "components": [ [ [ "water_clean", 6 ] ], [ [ "irradiated_cranberries", 36 ], [ "cranberries", 36 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
     "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ]