Update for the batch cooking revamp in BN 2021-09-16-0506

3 files changed, 41 insertions, 24 deletions

diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json
index 070153d..19b19ed 100644
--- a/json/recipes/food/canned.json
+++ b/json/recipes/food/canned.json
@@ -10,7 +10,7 @@
     "time": "24 m",
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
     "contained": true,
-    "batch_time_factors": [ 83, 5 ],
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [
       { "id": "SAW_M", "level": 1 },
       { "id": "HAMMER", "level": 1 },
@@ -34,7 +34,7 @@
     "time": "1 h",
     "charges": 2,
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
-    "batch_time_factors": [ 80, 4 ],
+    "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 ] ] ]
@@ -53,7 +53,7 @@
     "time": "1 h 10 m",
     "charges": 12,
     "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ],
-    "batch_time_factors": [ 80, 4 ],
+    "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 ] ] ]
@@ -69,7 +69,8 @@
     "difficulty": 4,
     "time": "30 m",
     "charges": 16,
-    "autolearn": true,
+    "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 ] ] ],
     "components": [
@@ -89,7 +90,8 @@
     "difficulty": 4,
     "charges": 16,
     "time": "30 m",
-    "autolearn": true,
+    "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 ] ] ],
     "components": [
@@ -122,6 +124,7 @@
     "charges": 8,
     "time": "20 m",
     "book_learn": [ [ "cookbook_italian", 2 ] ],
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] ] ],
     "components": [
diff --git a/json/recipes/recipe_food.json b/json/recipes/food/uncategorized.json
index b6c36eb..e52b3b3 100644
--- a/json/recipes/recipe_food.json
+++ b/json/recipes/food/uncategorized.json
@@ -10,6 +10,7 @@
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
+    "batch_time_factors": [ 80, 1 ],
     "components": [ [ [ "rice_cooked", 1 ] ], [ [ "tofu", 1 ], [ "dry_tofu", 1 ] ], [ [ "cooking_oil", 1 ] ] ]
   },
   {
@@ -23,7 +24,7 @@
     "time": "20 m",
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
-    "batch_time_factors": [ 25, 2 ],
+    "batch_time_factors": [ 80, 1 ],
     "components": [
       [ [ "tofu", 4 ], [ "dry_tofu", 4 ] ],
       [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -51,7 +52,7 @@
     "time": "20 m",
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
-    "batch_time_factors": [ 25, 2 ],
+    "batch_time_factors": [ 80, 1 ],
     "components": [
       [ [ "meat_red", 4, "LIST" ], [ "dry_meat", 4 ], [ "can_chicken", 4 ] ],
       [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -79,7 +80,7 @@
     "time": "20 m",
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
-    "batch_time_factors": [ 25, 2 ],
+    "batch_time_factors": [ 80, 1 ],
     "components": [
       [ [ "veggy_any_uncooked", 4, "LIST" ] ],
       [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ],
@@ -105,7 +106,7 @@
     "difficulty": 1,
     "time": "6 m",
     "autolearn": true,
-    "batch_time_factors": [ 82, 4 ],
+    "batch_time_factors": [ 80, 1 ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
@@ -123,6 +124,7 @@
     "difficulty": 2,
     "time": "9 m",
     "autolearn": true,
+    "batch_time_factors": [ 80, 1 ],
     "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
@@ -162,6 +164,7 @@
     "difficulty": 2,
     "time": "9 m",
     "autolearn": true,
+    "batch_time_factors": [ 80, 1 ],
     "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
@@ -188,6 +191,7 @@
     "difficulty": 2,
     "time": "20 m",
     "charges": 2,
+    "batch_time_factors": [ 80, 5 ],
     "book_learn": [ [ "cookbook_italian", 2 ] ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -219,6 +223,7 @@
     "time": "12 m",
     "charges": 3,
     "autolearn": true,
+    "batch_time_factors": [ 80, 1 ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
     "components": [
@@ -246,6 +251,7 @@
     "difficulty": 2,
     "time": "20 m",
     "autolearn": true,
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
     "components": [
@@ -282,6 +288,7 @@
     "difficulty": 2,
     "time": "20 m",
     "autolearn": true,
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
     "components": [
@@ -315,6 +322,7 @@
     "skill_used": "cooking",
     "difficulty": 3,
     "time": "20 m",
+    "batch_time_factors": [ 50, 3 ],
     "book_learn": [ [ "cookbook_italian", 2 ] ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -352,6 +360,7 @@
     "skill_used": "cooking",
     "difficulty": 3,
     "time": "30 m",
+    "batch_time_factors": [ 50, 3 ],
     "book_learn": [ [ "cookbook_italian", 3 ] ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
@@ -402,6 +411,7 @@
     "time": "9 m",
     "charges": 2,
     "autolearn": true,
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
@@ -448,6 +458,7 @@
     "time": "8 m",
     "charges": 2,
     "autolearn": true,
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
@@ -492,6 +503,7 @@
     "difficulty": 2,
     "time": "6 m",
     "autolearn": true,
+    "batch_time_factors": [ 50, 3 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
@@ -516,6 +528,7 @@
     "skill_used": "cooking",
     "time": "1 m",
     "autolearn": true,
+    "batch_time_factors": [ 50, 3 ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [
       [
@@ -540,6 +553,7 @@
     "time": "5 m",
     "book_learn": [ [ "family_cookbook", 2 ] ],
     "charges": 6,
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "components": [
@@ -585,6 +599,20 @@
     ]
   },
   {
+    "result": "meal_bone",
+    "type": "recipe",
+    "id_suffix": "with_from_food_processor",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "15 m",
+    "autolearn": true,
+    "batch_time_factors": [ 50, 3 ],
+    "tools": [ [ [ "food_processor", 20 ] ] ],
+    "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ]
+  },
+  {
     "type": "recipe",
     "result": "sausage_wasteland",
     "category": "CC_FOOD",
@@ -594,7 +622,7 @@
     "charges": 2,
     "time": "1 h 10 m",
     "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
+    "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "char_smoker", 10 ] ] ],
     "components": [
@@ -640,19 +668,5 @@
         [ "pepper", 4 ]
       ]
     ]
-  },
-  {
-    "result": "meal_bone",
-    "type": "recipe",
-    "id_suffix": "with_from_food_processor",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "time": "15 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
-    "tools": [ [ [ "food_processor", 20 ] ] ],
-    "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ]
   }
 ]
diff --git a/json/recipes/recipe_other.json b/json/recipes/recipe_others.json
index 429c893..429c893 100644
--- a/json/recipes/recipe_other.json
+++ b/json/recipes/recipe_others.json