Make several recipes more readable.

Also use more standardized recipe component groups.

2 files changed, 94 insertions, 15 deletions

diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json
index 19b19ed..2bb3214 100644
--- a/json/recipes/food/canned.json
+++ b/json/recipes/food/canned.json
@@ -17,8 +17,16 @@
       { "id": "CUT", "level": 1 },
       { "id": "COOK", "level": 3 }
     ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ], [ "bone_human", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [ [ "can_sealer", -1 ] ]
+    ],
+    "components": [
+      [ [ "can_medium_unsealed", 1 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "bone", 20 ], [ "bone_human", 20 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -36,8 +44,15 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_glass", 1 ] ], [ [ "bone", 20 ], [ "bone_human", 20 ] ], [ [ "water", 12 ], [ "water_clean", 12 ] ] ]
+    "tools": [
+      [ [ "surface_heat", 100, "LIST" ] ],
+      [ [ "pot_canning", -1 ] ]
+    ],
+    "components": [
+      [ [ "jar_glass", 1 ] ],
+      [ [ "bone", 20 ], [ "bone_human", 20 ] ],
+      [ [ "water", 12 ], [ "water_clean", 12 ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -55,8 +70,15 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone", 120 ], [ "bone_human", 120 ] ] ]
+    "tools": [
+      [ [ "surface_heat", 200, "LIST" ] ],
+      [ [ "pot_canning", -1 ] ]
+    ],
+    "components": [
+      [ [ "jar_3l_glass", 1 ] ],
+      [ [ "water", 22 ], [ "water_clean", 22 ] ],
+      [ [ "bone", 120 ], [ "bone_human", 120 ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -72,12 +94,15 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "food_processor", 40 ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
+    "using": [ "sugar_standard", 3 ],
+    "tools": [
+      [ [ "food_processor", 40 ] ],
+      [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ]
+    ],
     "components": [
         [ [ "peanut_unshelled", 12 ] ],
-        [ [ "sugar", 40 ], [ "honey_bottled", 4 ], [ "honey_glassed", 4 ] ],
         [ [ "jar_glass", 1 ] ]
-        ]
+    ]
   },
   {
     "type": "recipe",
@@ -93,7 +118,11 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "food_processor", 40 ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
+    "using": [ "sugar_standard", 4 ],
+    "tools": [
+      [ [ "food_processor", 40 ] ],
+      [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ]
+    ],
     "components": [
       [
         [ "pine_nuts", 25 ],
@@ -108,7 +137,6 @@
         [ "walnut_unshelled", 25 ],
         [ "acorns", 25 ]
       ],
-      [ [ "sugar", 50 ], [ "honeycomb", 5 ], [ "honey_bottled", 5 ], [ "honey_glassed", 5 ], [ "syrup", 5 ] ],
       [ [ "jar_glass", 1 ] ]
     ]
   },
@@ -125,14 +153,60 @@
     "time": "20 m",
     "book_learn": [ [ "cookbook_italian", 2 ] ],
     "batch_time_factors": [ 80, 5 ],
+    "using": [
+      [ "any_butter_or_oil", 8 ]
+    ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
+    "tools": [
+      [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ]
+    ],
     "components": [
-      [ [ "cooking_oil", 8 ], [ "cooking_oil2", 8 ] ],
       [ [ "pine_nuts", 4 ] ],
       [ [ "seasoning_italian", 20 ], [ "wild_herbs", 40 ] ],
       [ [ "salt", 20 ], [ "seasoning_salt", 20 ] ],
       [ [ "jar_glass", 1 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "result": "chili",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "20 m",
+    "charges": 2,
+    "batch_time_factors": [ 80, 5 ],
+    "book_learn": [ [ "cookbook_italian", 2 ], [ "manual_canning", 3 ] ],
+    "contained": true,
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [
+      [ [ "surface_heat", 8, "LIST" ] ], [ [ "can_sealer", -1 ] ]
+    ],
+    "components": [
+      [
+        [ "veggy", 2 ],
+        [ "veggy_wild", 2 ],
+        [ "veggy_salted", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "dry_veggy", 2 ]
+      ],
+      [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ],
+      [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
+      [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
+      [ [ "scrap", 1 ] ]
+    ]
   }
 ]
diff --git a/json/recipes/other/containers.json b/json/recipes/other/containers.json
index 86caaec..4bf1c95 100644
--- a/json/recipes/other/containers.json
+++ b/json/recipes/other/containers.json
@@ -9,8 +9,13 @@
     "time": "30 m",
     "count": 2,
     "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "using": [
+      [ "blacksmithing_standard", 1 ],
+      [ "steel_tiny", 1 ]
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
+    "tools": [
+      [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ]
+    ]
   }
 ]