From ce118763bf077263eb91c3085145b9c64a67cb66 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 5 Jan 2020 21:39:41 -0500 Subject: [PATCH 01/18] Added Juice canning recipes Also fixed some missing byproducts in basic juice recipes. --- data/json/recipes/food/canned.json | 237 +++++++++++++++++++++++++++++ data/json/recipes/recipe_food.json | 2 +- 2 files changed, 238 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 4489ec7fd7407..7aed1c5756947 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1297,6 +1297,7 @@ "type": "recipe", "result": "broth_bone", "id_suffix": "canned", + "byproducts": [ [ "juice_pulp", 2 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", @@ -1313,5 +1314,241 @@ ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ], "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] + }, + { + "type": "recipe", + "result": "apple_cider", + "id_suffix": "jarred", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "container": "jar_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "30 m", + "charges": 2, + "autolearn": true, + "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", 2 ], [ "apple", 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", + "difficulty": 4, + "time": "24 m", + "autolearn": true, + "contained": true, + "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", 2 ], [ "apple", 2 ] ] ] + }, + { + "type": "recipe", + "result": "apple_cider", + "id_suffix": "jarred_3l", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "container": "jar_3l_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "40 m", + "charges": 12, + "autolearn": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "oj", + "id_suffix": "jarred", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "container": "jar_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "30 m", + "charges": 2, + "autolearn": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "oj", + "id_suffix": "canned", + "byproducts": [ [ "juice_pulp", 2 ] ], + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 4, + "time": "24 m", + "autolearn": true, + "contained": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "oj", + "id_suffix": "jarred_3l", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "container": "jar_3l_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "40 m", + "charges": 12, + "autolearn": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "cranberry_juice", + "id_suffix": "jarred", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "container": "jar_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "30 m", + "charges": 2, + "autolearn": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "cranberry_juice", + "id_suffix": "canned", + "byproducts": [ [ "juice_pulp", 2 ] ], + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 4, + "time": "24 m", + "autolearn": true, + "contained": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "cranberry_juice", + "id_suffix": "jarred_3l", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "container": "jar_3l_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "40 m", + "charges": 12, + "autolearn": true, + "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 ] ] ] + }, + { + "type": "recipe", + "result": "juice", + "id_suffix": "jarred", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "container": "jar_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "30 m", + "charges": 2, + "autolearn": true, + "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 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + }, + { + "type": "recipe", + "result": "juice", + "id_suffix": "canned", + "byproducts": [ [ "juice_pulp", 2 ] ], + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 4, + "time": "24 m", + "autolearn": true, + "contained": true, + "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 ] ], [ [ "sweet_fruit", 2, "LIST" ] ] ] + }, + { + "type": "recipe", + "result": "juice", + "id_suffix": "jarred_3l", + "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "container": "jar_3l_glass_sealed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 4, + "time": "40 m", + "charges": 12, + "autolearn": true, + "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 ] ], [ [ "sweet_fruit", 12, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 09279e59ea1a3..882698fd011e9 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -1558,7 +1558,7 @@ { "type": "recipe", "result": "oj", - "byproducts": [ [ "juice_pulp" ] ], + "byproducts": [ [ "juice_pulp", 2 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", From c76e108b385eefe20eb2e9f859366780496df05d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 5 Jan 2020 21:54:51 -0500 Subject: [PATCH 02/18] linting --- data/json/recipes/food/canned.json | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 7aed1c5756947..5b5e840e7ccb4 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1347,11 +1347,7 @@ "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], - "qualities": [ - { "id": "CONTAIN", "level": 1 }, - { "id": "HAMMER", "level": 1 }, - { "id": "COOK", "level": 3 } - ], + "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", 2 ], [ "apple", 2 ] ] ] }, @@ -1372,7 +1368,11 @@ "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 ] ], + [ [ "irradiated_apple", 12 ], [ "apple", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1406,11 +1406,7 @@ "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], - "qualities": [ - { "id": "CONTAIN", "level": 1 }, - { "id": "HAMMER", "level": 1 }, - { "id": "COOK", "level": 3 } - ], + "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 ] ] ] }, @@ -1431,7 +1427,11 @@ "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 ] ], + [ [ "irradiated_orange", 12 ], [ "orange", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1450,7 +1450,11 @@ "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 ] ], + [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1465,11 +1469,7 @@ "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], - "qualities": [ - { "id": "CONTAIN", "level": 1 }, - { "id": "HAMMER", "level": 1 }, - { "id": "COOK", "level": 3 } - ], + "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 ] ] ] }, @@ -1490,7 +1490,11 @@ "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 ] ], + [ [ "irradiated_cranberries", 12 ], [ "cranberries", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1524,11 +1528,7 @@ "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], - "qualities": [ - { "id": "CONTAIN", "level": 1 }, - { "id": "HAMMER", "level": 1 }, - { "id": "COOK", "level": 3 } - ], + "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 ] ], [ [ "sweet_fruit", 2, "LIST" ] ] ] }, From a363c175e3631a90d072597a255909189c5977fd Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 5 Jan 2020 22:56:09 -0500 Subject: [PATCH 03/18] Update canned.json --- data/json/recipes/food/canned.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 5b5e840e7ccb4..d28a9801ffd4e 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1297,7 +1297,6 @@ "type": "recipe", "result": "broth_bone", "id_suffix": "canned", - "byproducts": [ [ "juice_pulp", 2 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", @@ -1319,7 +1318,7 @@ "type": "recipe", "result": "apple_cider", "id_suffix": "jarred", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1355,7 +1354,7 @@ "type": "recipe", "result": "apple_cider", "id_suffix": "jarred_3l", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "byproducts": [ [ "water", 10], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1378,7 +1377,7 @@ "type": "recipe", "result": "oj", "id_suffix": "jarred", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1414,7 +1413,7 @@ "type": "recipe", "result": "oj", "id_suffix": "jarred_3l", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1437,7 +1436,7 @@ "type": "recipe", "result": "cranberry_juice", "id_suffix": "jarred", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1477,7 +1476,7 @@ "type": "recipe", "result": "cranberry_juice", "id_suffix": "jarred_3l", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1500,7 +1499,7 @@ "type": "recipe", "result": "juice", "id_suffix": "jarred", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 2 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1536,7 +1535,7 @@ "type": "recipe", "result": "juice", "id_suffix": "jarred_3l", - "byproducts": [ [ [ "water", 10 ] ], [ [ "juice_pulp", 12 ] ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", From ab523d2511fbb3875b33b2c34ec34146fa112b3f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 5 Jan 2020 22:58:55 -0500 Subject: [PATCH 04/18] Update canned.json --- data/json/recipes/food/canned.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index d28a9801ffd4e..c9747cb2aee7f 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1354,7 +1354,7 @@ "type": "recipe", "result": "apple_cider", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10], [ "juice_pulp", 12 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", From 4aa2c95c57f808f1828ab8925c3b210689c79789 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jan 2020 22:28:18 -0500 Subject: [PATCH 05/18] Apple Cider reduce ingredients to pass test --- data/json/recipes/food/canned.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index c9747cb2aee7f..e335a0d289161 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -366,7 +366,7 @@ "components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass", 1 ] ], - [ [ "sweet_fruit", 4, "LIST" ] ], + [ [ "sweet_fruit", 3, "LIST" ] ], [ [ "sugar", 20 ] ] ] }, @@ -697,7 +697,7 @@ [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "sweet_fruit", 2, "LIST" ] ], + [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar", 15 ] ] ] }, @@ -898,7 +898,7 @@ "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], - [ [ "sweet_fruit", 24, "LIST" ] ], + [ [ "sweet_fruit", 12, "LIST" ] ], [ [ "sugar", 180 ] ] ] }, From 382e3e800afdf0d0c2385c7ea97c49607025cf7b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jan 2020 23:57:31 -0500 Subject: [PATCH 06/18] cider ingredients reduction --- data/json/recipes/food/canned.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index e335a0d289161..f59611c824eea 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -899,7 +899,7 @@ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ], - [ [ "sugar", 180 ] ] + [ [ "sugar", 120 ] ] ] }, { @@ -1331,7 +1331,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_apple", 2 ], [ "apple", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, { "type": "recipe", @@ -1348,7 +1348,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_apple", 2 ], [ "apple", 2 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ] ] }, { "type": "recipe", From 142a17b01b77f2c1df41c9e521f62383f8b6f840 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jan 2020 01:27:18 -0500 Subject: [PATCH 07/18] Update canned.json --- data/json/recipes/food/canned.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index f59611c824eea..841d7d0f21f9f 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -898,8 +898,7 @@ "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], - [ [ "sweet_fruit", 12, "LIST" ] ], - [ [ "sugar", 120 ] ] + [ [ "sweet_fruit", 12, "LIST" ] ] ] }, { @@ -1326,7 +1325,6 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "30 m", - "charges": 2, "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], From d53c4e8223ae8f5fd71c12fcc8acf25af8596c8f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jan 2020 09:37:52 -0500 Subject: [PATCH 08/18] Update canned.json --- data/json/recipes/food/canned.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 841d7d0f21f9f..95d35fe6e522e 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -895,11 +895,7 @@ "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], - "components": [ - [ [ "water", 16 ], [ "water_clean", 16 ] ], - [ [ "jar_3l_glass", 1 ] ], - [ [ "sweet_fruit", 12, "LIST" ] ] - ] + "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ] ] }, { "type": "recipe", From 0b9b189eb7972452bddc08d62e755623cb553bad Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jan 2020 17:35:10 -0500 Subject: [PATCH 09/18] Breaking canning and making into two steps Revert if this doesn't fix things --- data/json/recipes/food/canned.json | 43 +++++++++--------------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 95d35fe6e522e..3b68b7fee49a9 100644 --- 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", From 489cbc2b3cd3b25010c7bd17ed83122c331718c0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jan 2020 18:04:40 -0500 Subject: [PATCH 10/18] Revert "Breaking canning and making into two steps" This reverts commit 0b9b189eb7972452bddc08d62e755623cb553bad. --- data/json/recipes/food/canned.json | 43 +++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 3b68b7fee49a9..95d35fe6e522e 100644 --- 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 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1325,12 +1325,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_glass", 1 ] ], [ [ "apple_cider", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ], [ [ "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", @@ -1341,13 +1342,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 ] ], [ [ "apple_cider", 2 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ] ] }, { "type": "recipe", "result": "apple_cider", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1360,7 +1361,11 @@ "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 ] ], [ [ "apple_cider", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_3l_glass", 1 ] ], + [ [ "irradiated_apple", 12 ], [ "apple", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1379,7 +1384,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 ] ], [ [ "oj", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, { "type": "recipe", @@ -1396,13 +1401,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 ] ], [ [ "oj", 2 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ] ] }, { "type": "recipe", "result": "oj", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1415,13 +1420,17 @@ "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 ] ], [ [ "oj", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_3l_glass", 1 ] ], + [ [ "irradiated_orange", 12 ], [ "orange", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", "result": "cranberry_juice", "id_suffix": "jarred", - "byproducts": [ [ "water", 10 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1434,7 +1443,11 @@ "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 ] ], [ [ "cranberry_juice", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_glass", 1 ] ], + [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", @@ -1451,7 +1464,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 ] ], [ [ "cranberry_juice", 2 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ] ] }, { "type": "recipe", @@ -1470,7 +1483,11 @@ "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 ] ], [ [ "cranberry_juice", 12 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_3l_glass", 1 ] ], + [ [ "irradiated_cranberries", 12 ], [ "cranberries", 12 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ] + ] }, { "type": "recipe", From 35aa4c5bcba8808fe87e67c870417091b0ac57bf Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jan 2020 18:11:14 -0500 Subject: [PATCH 11/18] corrected recipe component #s If this fails remove all specific juices. --- data/json/recipes/food/canned.json | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 95d35fe6e522e..1f2b005fdc4ca 100644 --- 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 ], [ "juice_pulp", 4 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1325,13 +1325,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_glass", 1 ] ], [ [ "irradiated_apple", 1 ], [ "apple", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, { "type": "recipe", "result": "apple_cider", "id_suffix": "canned", - "byproducts": [ [ "juice_pulp", 2 ] ], + "byproducts": [ [ "juice_pulp", 4 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", @@ -1342,13 +1342,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 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ] ] }, { "type": "recipe", "result": "apple_cider", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1363,7 +1363,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_3l_glass", 1 ] ], - [ [ "irradiated_apple", 12 ], [ "apple", 12 ] ], + [ [ "irradiated_apple", 24 ], [ "apple", 24 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, @@ -1371,7 +1371,7 @@ "type": "recipe", "result": "oj", "id_suffix": "jarred", - "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 4 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1384,13 +1384,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_glass", 1 ] ], [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, { "type": "recipe", "result": "oj", "id_suffix": "canned", - "byproducts": [ [ "juice_pulp", 2 ] ], + "byproducts": [ [ "juice_pulp", 4 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", @@ -1401,13 +1401,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 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ] ] }, { "type": "recipe", "result": "oj", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1422,7 +1422,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_3l_glass", 1 ] ], - [ [ "irradiated_orange", 12 ], [ "orange", 12 ] ], + [ [ "irradiated_orange", 24 ], [ "orange", 24 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, @@ -1430,7 +1430,7 @@ "type": "recipe", "result": "cranberry_juice", "id_suffix": "jarred", - "byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 4 ] ], "container": "jar_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1445,7 +1445,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_glass", 1 ] ], - [ [ "irradiated_cranberries", 2 ], [ "cranberries", 2 ] ], + [ [ "irradiated_cranberries", 4 ], [ "cranberries", 4 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, @@ -1453,7 +1453,7 @@ "type": "recipe", "result": "cranberry_juice", "id_suffix": "canned", - "byproducts": [ [ "juice_pulp", 2 ] ], + "byproducts": [ [ "juice_pulp", 4 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", @@ -1464,13 +1464,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_cranberries", 2 ], [ "cranberries", 2 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 4 ], [ "cranberries", 4 ] ] ] }, { "type": "recipe", "result": "cranberry_juice", "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ], + "byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ], "container": "jar_3l_glass_sealed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_VEGGI", @@ -1485,7 +1485,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_3l_glass", 1 ] ], - [ [ "irradiated_cranberries", 12 ], [ "cranberries", 12 ] ], + [ [ "irradiated_cranberries", 24 ], [ "cranberries", 24 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, From de609414d7752fcb6762753c333db4124f33b8cd Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 21 Jan 2020 19:42:52 -0500 Subject: [PATCH 12/18] Update canned.json --- data/json/recipes/food/canned.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 1f2b005fdc4ca..4c73726b1d86d 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1445,7 +1445,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_glass", 1 ] ], - [ [ "irradiated_cranberries", 4 ], [ "cranberries", 4 ] ], + [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, @@ -1464,7 +1464,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", 4 ], [ "cranberries", 4 ] ] ] + "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ] ] }, { "type": "recipe", @@ -1485,7 +1485,7 @@ "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "jar_3l_glass", 1 ] ], - [ [ "irradiated_cranberries", 24 ], [ "cranberries", 24 ] ], + [ [ "irradiated_cranberries", 36 ], [ "cranberries", 36 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, From 06b328c8865b28d292bbb4cad56cfecccb84de2e Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 21 Jan 2020 19:50:09 -0500 Subject: [PATCH 13/18] Update data/json/recipes/food/canned.json Co-Authored-By: anothersimulacrum --- data/json/recipes/food/canned.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 4c73726b1d86d..546b9ff7a8f16 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -895,7 +895,7 @@ "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], - "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ] ] + "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 36, "LIST" ] ] ] }, { "type": "recipe", From 5c873ca22340a855047e9064a97fe32854bf93d8 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 21 Jan 2020 19:50:53 -0500 Subject: [PATCH 14/18] Update drink.json --- data/json/items/comestibles/drink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index e3e3de982c868..0050ec3cd83d1 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -705,7 +705,7 @@ "symbol": "~", "quench": 35, "healthy": 2, - "calories": 123, + "calories": 108, "description": "Freshly-squeezed from real oranges! Tasty and nutritious.", "price": 90, "material": "fruit", From 8c719871c48101dc838ade51e5a975f25b0a79ec Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 21 Jan 2020 22:16:09 -0500 Subject: [PATCH 15/18] Book and learned levels --- data/json/items/book/cooking.json | 7 +++++++ data/json/recipes/food/canned.json | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index 15eb923c04cf7..af57de3e03969 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -441,5 +441,12 @@ "intelligence": 12, "time": "35 m", "fun": -1 + }, + { + "id": "preserving_juice", + "type": "BOOK", + "name": { "str": "Drink the Harvest", "str_pl": "copies of Drink the Harvest" }, + "description": "Canning foods doesn't have to stop with jam and pickles. This books provides a plethora of juices that can be preserved.", + "copy-from": "brewing_cookbook" } ] diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 546b9ff7a8f16..fcbdf2fe9a521 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1321,7 +1321,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "30 m", - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "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 ] ] ], @@ -1337,7 +1337,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1357,7 +1357,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "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 ] ] ], @@ -1380,7 +1380,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "autolearn": true, + "book_learn": [ "preserving_juice", 3 ], "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 ] ] ], @@ -1396,7 +1396,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "autolearn": true, + "book_learn": [ "preserving_juice", 3 ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1416,7 +1416,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "autolearn": true, + "book_learn": [ "preserving_juice", 3 ], "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 ] ] ], @@ -1439,7 +1439,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "autolearn": true, + "book_learn": [ "preserving_juice", 4 ], "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 ] ] ], @@ -1459,7 +1459,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "autolearn": true, + "book_learn": [ "preserving_juice", 4 ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1479,7 +1479,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "autolearn": true, + "book_learn": [ "preserving_juice", 4 ], "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 ] ] ], @@ -1502,7 +1502,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "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 ] ] ], @@ -1518,7 +1518,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1538,7 +1538,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "autolearn": true, + "book_learn": [ "preserving_juice", 2 ], "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 ] ] ], From 4a9c2899bfdf6ea48c4d020454829887931446c3 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 21 Jan 2020 22:25:31 -0500 Subject: [PATCH 16/18] Update cooking.json --- data/json/items/book/cooking.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index af57de3e03969..a374706e2e7cc 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -447,6 +447,7 @@ "type": "BOOK", "name": { "str": "Drink the Harvest", "str_pl": "copies of Drink the Harvest" }, "description": "Canning foods doesn't have to stop with jam and pickles. This books provides a plethora of juices that can be preserved.", - "copy-from": "brewing_cookbook" + "copy-from": "brewing_cookbook", + "//": "Later on add mead transforms that don't require distilling to this book that match the source book. Possibly wait til beekeeping is added." } ] From 8b23bda4b46e76a06b67db1bb314f1946bb2e0b5 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 22 Jan 2020 13:31:35 -0500 Subject: [PATCH 17/18] fixes and an itemgroup --- data/json/itemgroups/books.json | 5 ++++- data/json/items/book/cooking.json | 2 +- data/json/recipes/food/canned.json | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 95e747fa4eb8b..5cf0c6c1d4cf0 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -249,6 +249,7 @@ [ "brewing_cookbook", 4 ], [ "computer_science", 8 ], [ "book_icef", 8 ], + [ "preserving_juice", 10 ], { "group": "magazines", "prob": 580 }, [ "atomic_survival", 1 ], [ "recipe_augs", 4 ], @@ -310,7 +311,8 @@ [ "manual_driving", 15 ], [ "manual_survival", 20 ], [ "dnd_handbook", 2 ], - [ "survnote", 3 ] + [ "survnote", 3 ], + [ "preserving_juice", 10 ], ] }, { @@ -489,6 +491,7 @@ "//": "Those rich mansion people have all sorts of weird books.", "items": [ [ "offalcooking", 22 ], + [ "preserving_juice", 16 ], { "group": "novels", "prob": 370 }, { "group": "literature", "prob": 100 }, [ "photo_album", 30 ], diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index 96387b0a68d62..d36d30067492d 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -446,7 +446,7 @@ "id": "preserving_juice", "type": "BOOK", "name": { "str": "Drink the Harvest", "str_pl": "copies of Drink the Harvest" }, - "description": "Canning foods doesn't have to stop with jam and pickles. This books provides a plethora of juices that can be preserved.", + "description": "Canning foods doesn't have to stop with jam and pickles. This books provides a plethora of juices that can be preserved.", "copy-from": "brewing_cookbook", "//": "Later on add mead transforms that don't require distilling to this book that match the source book. Possibly wait til beekeeping is added." }, diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index fcbdf2fe9a521..2316f5df7ca58 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1321,7 +1321,7 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "30 m", - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1337,7 +1337,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1357,7 +1357,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1380,7 +1380,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "book_learn": [ "preserving_juice", 3 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1396,7 +1396,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "book_learn": [ "preserving_juice", 3 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1416,7 +1416,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "book_learn": [ "preserving_juice", 3 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1439,7 +1439,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "book_learn": [ "preserving_juice", 4 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1459,7 +1459,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "book_learn": [ "preserving_juice", 4 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1479,7 +1479,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "book_learn": [ "preserving_juice", 4 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1502,7 +1502,7 @@ "difficulty": 4, "time": "30 m", "charges": 2, - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], @@ -1518,7 +1518,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], @@ -1538,7 +1538,7 @@ "difficulty": 4, "time": "40 m", "charges": 12, - "book_learn": [ "preserving_juice", 2 ], + "book_learn": [ [ "preserving_juice", 2 ] ], "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 ] ] ], From 468ff52d53ef1078b99fb93f781866545ab5e180 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 22 Jan 2020 14:12:06 -0500 Subject: [PATCH 18/18] extraneous comma --- data/json/itemgroups/books.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 5cf0c6c1d4cf0..6e0ea5b64bfb9 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -312,7 +312,7 @@ [ "manual_survival", 20 ], [ "dnd_handbook", 2 ], [ "survnote", 3 ], - [ "preserving_juice", 10 ], + [ "preserving_juice", 10 ] ] }, {