More readability changes and more standardized groups.

3 files changed, 63 insertions, 45 deletions

diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json
index 2bb3214..4a2a851 100644
--- a/json/recipes/food/canned.json
+++ b/json/recipes/food/canned.json
@@ -94,14 +94,14 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "using": [ "sugar_standard", 3 ],
     "tools": [
       [ [ "food_processor", 40 ] ],
       [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ]
     ],
     "components": [
-        [ [ "peanut_unshelled", 12 ] ],
-        [ [ "jar_glass", 1 ] ]
+      [ [ "peanut_unshelled", 12 ] ],
+      [ [ "sugar_standard", 3, "LIST" ] ]
+      [ [ "jar_glass", 1 ] ]
     ]
   },
   {
@@ -118,7 +118,6 @@
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
-    "using": [ "sugar_standard", 4 ],
     "tools": [
       [ [ "food_processor", 40 ] ],
       [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ]
@@ -137,6 +136,7 @@
         [ "walnut_unshelled", 25 ],
         [ "acorns", 25 ]
       ],
+      [ [ "sugar_standard", 4, "LIST" ] ]
       [ [ "jar_glass", 1 ] ]
     ]
   },
@@ -153,9 +153,6 @@
     "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 ] ]
@@ -164,6 +161,7 @@
       [ [ "pine_nuts", 4 ] ],
       [ [ "seasoning_italian", 20 ], [ "wild_herbs", 40 ] ],
       [ [ "salt", 20 ], [ "seasoning_salt", 20 ] ],
+      [ [ "any_butter_or_oil", 8, "LIST" ] ]
       [ [ "jar_glass", 1 ] ]
     ]
   },
@@ -187,7 +185,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [
-      [ [ "surface_heat", 8, "LIST" ] ], [ [ "can_sealer", -1 ] ]
+      [ [ "surface_heat", 8, "LIST" ] ],
+      [ [ "can_sealer", -1 ] ]
     ],
     "components": [
       [
diff --git a/json/recipes/food/other.json b/json/recipes/food/other.json
index 06cbe4a..08d09db 100644
--- a/json/recipes/food/other.json
+++ b/json/recipes/food/other.json
@@ -12,7 +12,10 @@
     "batch_time_factors": [ 80, 1 ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "powder_eggs", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+    "components": [
+      [ [ "powder_eggs", 2 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ]
   },
   {
     "type": "recipe",
diff --git a/json/recipes/food/uncategorized.json b/json/recipes/food/uncategorized.json
index f5544e1..4dd0333 100644
--- a/json/recipes/food/uncategorized.json
+++ b/json/recipes/food/uncategorized.json
@@ -8,7 +8,10 @@
     "difficulty": 1,
     "time": "3 m",
     "autolearn": true,
-    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "qualities": [
+      { "id": "COOK", "level": 2 },
+      { "id": "CUT", "level": 1 }
+    ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "batch_time_factors": [ 80, 1 ],
     "components": [
@@ -26,7 +29,10 @@
     "difficulty": 3,
     "book_learn": [ [ "cookbook_sushi", 3 ] ],
     "time": "20 m",
-    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
+    "qualities": [
+      { "id": "CONTAIN", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "batch_time_factors": [ 80, 1 ],
     "components": [
@@ -47,7 +53,10 @@
     "difficulty": 3,
     "book_learn": [ [ "cookbook_sushi", 3 ] ],
     "time": "20 m",
-    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
+    "qualities": [
+      { "id": "CONTAIN", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "batch_time_factors": [ 80, 1 ],
     "components": [
@@ -68,7 +77,10 @@
     "difficulty": 3,
     "book_learn": [ [ "cookbook_sushi", 3 ] ],
     "time": "20 m",
-    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
+    "qualities": [
+      { "id": "CONTAIN", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "batch_time_factors": [ 80, 1 ],
     "components": [
@@ -108,7 +120,10 @@
     "time": "9 m",
     "autolearn": true,
     "batch_time_factors": [ 80, 1 ],
-    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "qualities": [
+      { "id": "COOK", "level": 2 },
+      { "id": "CUT", "level": 1 }
+    ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
       [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
@@ -148,7 +163,10 @@
     "time": "9 m",
     "autolearn": true,
     "batch_time_factors": [ 80, 1 ],
-    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "qualities": [
+      { "id": "COOK", "level": 2 },
+      { "id": "CUT", "level": 1 }
+    ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
       [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
@@ -395,7 +413,10 @@
     "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 5 ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 2 }
+    ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [ [ "meat_red", 1, "LIST" ] ],
@@ -442,7 +463,10 @@
     "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 5 ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 2 }
+    ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [ [ "meat_red", 1, "LIST" ] ],
@@ -487,7 +511,10 @@
     "time": "6 m",
     "autolearn": true,
     "batch_time_factors": [ 50, 3 ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 2 }
+    ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [
@@ -558,7 +585,10 @@
     "charges": 3,
     "time": "30 m",
     "autolearn": true,
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 2 }
+    ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
       [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ], [ "meat_smoked", 1 ] ],
@@ -592,22 +622,15 @@
     "time": "1 h 10 m",
     "autolearn": true,
     "batch_time_factors": [ 80, 5 ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 1 }
+    ],
     "tools": [ [ [ "char_smoker", 10 ] ] ],
     "components": [
-      [ [ "offal", 4 ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
+      [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
       [ [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
-      [
-        [ "salt_water", 4 ],
-        [ "saline", 8 ],
-        [ "salt", 4 ],
-        [ "chem_saltpetre", 2 ],
-        [ "soysauce", 2 ],
-        [ "seasoning_italian", 4 ],
-        [ "wild_herbs", 4 ],
-        [ "seasoning_salt", 4 ],
-        [ "pepper", 4 ]
-      ]
+      [ [ "salt_preservation", 4, "LIST" ] ]
     ]
   },
   {
@@ -621,21 +644,14 @@
     "time": "10 m",
     "autolearn": true,
     "batch_time_factors": [ 50, 3 ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "qualities": [
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 1 }
+    ],
     "components": [
-      [ [ "offal", 4 ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
+      [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ],
       [ [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ],
-      [
-        [ "salt_water", 4 ],
-        [ "saline", 8 ],
-        [ "salt", 4 ],
-        [ "chem_saltpetre", 2 ],
-        [ "soysauce", 2 ],
-        [ "seasoning_italian", 4 ],
-        [ "wild_herbs", 4 ],
-        [ "seasoning_salt", 4 ],
-        [ "pepper", 4 ]
-      ]
+      [ [ "salt_preservation", 4, "LIST" ] ]
     ]
   }
 ]