Breaking canning and making into two steps

Revert if this doesn't fix things
Maleclypse · Jan 19, 2020 · 0b9b189 · 0b9b189
1 parent d53c4e8
commit 0b9b189
Showing 1 changed file with 13 additions and 30 deletions.
diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json
@@ -1313,7 +1313,7 @@
     "type": "recipe",
     "result": "apple_cider",
     "id_suffix": "jarred",
-    "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ],
+    "byproducts": [ [ "water", 10 ] ],
     "container": "jar_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1325,13 +1325,12 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "apple_cider", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
     "result": "apple_cider",
     "id_suffix": "canned",
-    "byproducts": [ [ "juice_pulp", 2 ] ],
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
@@ -1342,13 +1341,13 @@
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ] ]
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "apple_cider", 2 ] ] ]
   },
   {
     "type": "recipe",
     "result": "apple_cider",
     "id_suffix": "jarred_3l",
-    "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ],
+    "byproducts": [ [ "water", 10 ] ],
     "container": "jar_3l_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1361,11 +1360,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "irradiated_apple", 12 ], [ "apple", 12 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ]
-    ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "apple_cider", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -1384,7 +1379,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "oj", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -1401,13 +1396,13 @@
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ] ]
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "oj", 2 ] ] ]
   },
   {
     "type": "recipe",
     "result": "oj",
     "id_suffix": "jarred_3l",
-    "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ],
+    "byproducts": [ [ "water", 10 ] ],
     "container": "jar_3l_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1420,17 +1415,13 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "irradiated_orange", 12 ], [ "orange", 12 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ]
-    ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "oj", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
     "result": "cranberry_juice",
     "id_suffix": "jarred",
-    "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ],
+    "byproducts": [ [ "water", 10 ] ],
     "container": "jar_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1443,11 +1434,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ]
-    ]
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "cranberry_juice", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -1464,7 +1451,7 @@
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ] ]
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "cranberry_juice", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -1483,11 +1470,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "irradiated_cranberries", 12 ], [ "cranberries", 12 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ]
-    ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "cranberry_juice", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",