allow more recipes to use more kinds of water (#74357)

* allow more recipes to use more kinds of water * more recipes * fix json * fix
CleverRaven · Jun 9, 2024 · 5d0da40 · 5d0da40
1 parent a9db8b3
commit 5d0da40
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 51 deletions.
diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json
@@ -586,7 +586,7 @@
     "autolearn": true,
     "batch_time_factors": [ 75, 4 ],
     "using": [ [ "earthenware_firing", 60 ] ],
-    "components": [ [ [ "clay_lump", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "clay_lump", 1 ] ], [ [ "any_water", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -604,7 +604,7 @@
       [ [ "clay_lump", 1 ] ],
       [ [ "material_sand", 5 ] ],
       [ [ "rock", 1 ], [ "pebble", 10 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+      [ [ "any_water", 1, "LIST" ] ]
     ]
   },
   {
@@ -622,7 +622,7 @@
     "tools": [ [ [ "frame_wood", -1 ], [ "frame_wood_light", -1 ] ] ],
     "batch_time_factors": [ 75, 4 ],
     "components": [
-      [ [ "water", 1 ], [ "water_clean", 1 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "material_soil", 2 ] ],
       [ [ "withered", 2 ], [ "straw_pile", 2 ], [ "feces_cow", 1 ], [ "feces_roach", 4 ], [ "feces_manure", 2 ] ]
     ]
@@ -653,7 +653,7 @@
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
     "batch_time_factors": [ 50, 5 ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "material_soil", 1 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "material_soil", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -681,11 +681,7 @@
     "time": "15 m",
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
-    "components": [
-      [ [ "water", 100 ], [ "water_clean", 100 ] ],
-      [ [ "material_quicklime", 50 ] ],
-      [ [ "material_sand", 150 ], [ "ash", 300 ] ]
-    ]
+    "components": [ [ [ "any_water", 100, "LIST" ] ], [ [ "material_quicklime", 50 ] ], [ [ "material_sand", 150 ], [ "ash", 300 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
@@ -24,7 +24,7 @@
     "time": "45 m",
     "autolearn": true,
     "tools": [ [ [ "brick_kiln", 10 ], [ "kiln", 10 ], [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 1 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 1 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1261,7 +1261,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" } ],
     "using": [ [ "earthenware_firing", 90 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 5 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 5 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
@@ -682,7 +682,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery", "required": false, "time_multiplier": 1.5 } ],
     "using": [ [ "earthenware_firing", 90 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 5 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 5 ] ] ]
   },
   {
     "type": "recipe",
@@ -697,7 +697,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery", "required": false, "time_multiplier": 1.5 } ],
     "using": [ [ "earthenware_firing", 75 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 4 ] ] ]
   },
   {
     "type": "recipe",
@@ -712,7 +712,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "glazing", 1 ], [ "earthenware_firing", 40 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 3 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 3 ] ] ]
   },
   {
     "type": "recipe",
@@ -727,7 +727,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "earthenware_firing", 120 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 8 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 8 ] ] ]
   },
   {
     "type": "recipe",
@@ -792,7 +792,7 @@
     "autolearn": true,
     "using": [ [ "earthenware_firing", 140 ] ],
     "proficiencies": [ { "proficiency": "prof_pottery" } ],
-    "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "clay_lump", 15 ] ] ]
+    "components": [ [ [ "any_water", 2, "LIST" ] ], [ [ "clay_lump", 15 ] ] ]
   },
   {
     "type": "recipe",
@@ -807,7 +807,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 40 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
   },
   {
     "result": "bowl_wood",
@@ -864,7 +864,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 60 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 2 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 2 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -879,7 +879,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 2 ], [ "glazing", 2 ], [ "earthenware_firing", 120 ] ],
-    "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "clay_lump", 10 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [ [ [ "any_water", 2, "LIST" ] ], [ [ "clay_lump", 10 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
   },
   {
     "type": "recipe",
@@ -894,7 +894,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 2 ], [ "glazing", 3 ], [ "earthenware_firing", 160 ] ],
-    "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "clay_lump", 20 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [ [ [ "any_water", 3, "LIST" ] ], [ [ "clay_lump", 20 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
   },
   {
     "type": "recipe",
@@ -909,7 +909,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 2 ], [ "glazing", 1 ], [ "earthenware_firing", 50 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 6 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 6 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
   },
   {
     "result": "keg_steel",
@@ -1458,7 +1458,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" }, { "proficiency": "prof_pottery_glazing" } ],
     "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 40 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 2 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 2 ] ] ]
   },
   {
     "result": "small_biogas_tank",

diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json
@@ -185,10 +185,7 @@
     "time": "1 h",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
-    "components": [
-      [ [ "bone_sturdy", 1, "LIST" ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ]
-    ]
+    "components": [ [ [ "bone_sturdy", 1, "LIST" ] ], [ [ "any_water", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -872,11 +869,7 @@
     "book_learn": [ [ "atomic_survival", 0 ], [ "textbook_survival", 0 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "ANVIL", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knapping" } ],
-    "components": [
-      [ [ "rock", 2 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
-      [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ]
-    ]
+    "components": [ [ [ "rock", 2 ] ], [ [ "any_water", 1, "LIST" ] ], [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json
@@ -1671,7 +1671,7 @@
     "autolearn": true,
     "qualities": [ [ { "id": "SIEVE", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [
-      [ [ "water", 1 ], [ "water_clean", 1 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "clay_lump", 1 ] ],
       [ [ "material_sand", 113 ] ],
       [ [ "2x4", 2 ], [ "stick", 2 ] ],
@@ -1690,7 +1690,7 @@
     "autolearn": true,
     "qualities": [ [ { "id": "SIEVE", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
     "components": [
-      [ [ "water", 32 ], [ "water_clean", 32 ] ],
+      [ [ "any_water", 32, "LIST" ] ],
       [ [ "clay_lump", 32 ] ],
       [ [ "material_sand", 9000 ] ],
       [ [ "2x4", 8 ] ],
@@ -1709,7 +1709,7 @@
     "autolearn": true,
     "qualities": [ [ { "id": "SIEVE", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
     "components": [
-      [ [ "water", 9 ], [ "water_clean", 9 ] ],
+      [ [ "any_water", 9, "LIST" ] ],
       [ [ "clay_lump", 9 ] ],
       [ [ "material_sand", 2532 ] ],
       [ [ "2x4", 8 ] ],
@@ -1728,7 +1728,7 @@
     "autolearn": true,
     "qualities": [ [ { "id": "SIEVE", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [
-      [ [ "water", 5 ], [ "water_clean", 5 ] ],
+      [ [ "any_water", 5, "LIST" ] ],
       [ [ "clay_lump", 5 ] ],
       [ [ "material_sand", 1350 ] ],
       [ [ "2x4", 4 ], [ "stick", 4 ] ],
@@ -1746,11 +1746,7 @@
     "time": "20 h",
     "autolearn": true,
     "tools": [ [ [ "rock", -1 ] ] ],
-    "components": [
-      [ [ "material_sand", 5 ], [ "material_gravel", 5 ] ],
-      [ [ "rock_large", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ]
-    ],
+    "components": [ [ [ "material_sand", 5 ], [ "material_gravel", 5 ] ], [ [ "rock_large", 1 ] ], [ [ "any_water", 1, "LIST" ] ] ],
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ]
   },
   {
@@ -1790,7 +1786,7 @@
       [ [ "rock_large", 4 ] ],
       [ [ "simple_crank", 1 ], [ "foot_crank", 1 ] ],
       [ [ "rope_6", 2 ], [ "rope_30", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "material_sand", 2 ], [ "material_gravel", 2 ] ]
     ]
   },

diff --git a/data/json/recipes/tools/tools_primitive.json b/data/json/recipes/tools/tools_primitive.json
@@ -14,7 +14,7 @@
     "components": [
       [ [ "stick", 1 ], [ "2x4", 1 ] ],
       [ [ "rock", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ],
       [ [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ]
     ]
@@ -164,7 +164,7 @@
     "components": [
       [ [ "stick", 1 ], [ "2x4", 1 ] ],
       [ [ "rock", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ]
     ]
   },
@@ -229,7 +229,7 @@
     "components": [
       [ [ "stick", 1 ], [ "2x4", 1 ] ],
       [ [ "rock_large", 2 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ]
     ]
   },
@@ -246,7 +246,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" } ],
     "using": [ [ "earthenware_firing", 100 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 8 ] ] ]
+    "components": [ [ [ "any_water", 1, "LIST" ] ], [ [ "clay_lump", 8 ] ] ]
   },
   {
     "type": "recipe",
@@ -355,11 +355,7 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "ANVIL", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
-    "components": [
-      [ [ "rock", 1 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "water_sewage", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
-      [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ]
-    ]
+    "components": [ [ [ "rock", 1 ] ], [ [ "any_water", 1, "LIST" ] ], [ [ "material_sand", 1 ], [ "material_gravel", 1 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json
@@ -548,6 +548,22 @@
     "type": "requirement",
     "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
+  {
+    "id": "any_water",
+    "type": "requirement",
+    "//": "Any kind of water, clean or not.",
+    "components": [
+      [
+        [ "water", 1 ],
+        [ "water_clean", 1 ],
+        [ "salt_water", 1 ],
+        [ "water_sewage", 1 ],
+        [ "water_murky", 1 ],
+        [ "water_spring", 1 ],
+        [ "saline", 5 ]
+      ]
+    ]
+  },
   {
     "id": "nails",
     "type": "requirement",

diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json
@@ -11,7 +11,7 @@
     "//": "Forming of shot from raw materials",
     "tools": [
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ], [ "iron_pot", -1 ], [ "pan", -1 ], [ "pot_makeshift", -1 ] ],
-      [ [ "water", 1 ], [ "water_clean", -1 ], [ "salt_water", -1 ], [ "water_sewage", -1 ] ],
+      [ [ "any_water", 1, "LIST" ] ],
       [
         [ "ladle", -1 ],
         [ "ceramic_mug", -1 ],