From ace0efbbfa5816a702dd3c1ebb8d941b11d9e43b Mon Sep 17 00:00:00 2001 From: Secret-Cisco <77130566+Secret-Cisco@users.noreply.github.com> Date: Sat, 11 Sep 2021 12:20:37 -0400 Subject: [PATCH] Restores unavailable saltworks blueprints and recipes (#50664) * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Fixed missing recipes and blueprints Added { "id": "kitchen" } to saltpan building to allow its food prep recipes to work. Added {"id":"saltworks_recipes_2"} to brewery building to allow crafting and further upgrading. * Marked brewing recipes as a WIP All the brewery recipes currently result in liquids that get dumped in a puddle inside the camp storage zone. This seemed more convenient than deleting the recipes entirely. * Removed huge methanol byproduct from moonshine mash Methanol wouldn't be produced at that stage and that was way too much because of a JSON error. Removed entirely do to it being the only alcohol byproduct. * Rename gin mash Renamed and described the two gin mashes to more clearly and accurately reflect their usage. * Wrote comment for saltworks recipes --- data/json/items/comestibles/brewing.json | 8 +++---- .../json/recipes/basecamps/recipe_groups.json | 21 ++++++++++--------- .../recipe_modular_saltworks_log.json | 4 ++-- .../recipe_modular_saltworks_metal.json | 4 ++-- .../recipe_modular_saltworks_migo_resin.json | 4 ++-- ...recipe_modular_saltworks_rammed_earth.json | 4 ++-- .../recipe_modular_saltworks_stone.json | 4 ++-- .../recipe_modular_saltworks_wad.json | 4 ++-- .../recipe_modular_saltworks_wood.json | 4 ++-- data/json/recipes/food/brewing.json | 1 - data/json/recipes/food/distill.json | 2 ++ 11 files changed, 31 insertions(+), 29 deletions(-) diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index 7ddb049604049..e20ab1cfcb8a5 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -70,8 +70,8 @@ { "type": "COMESTIBLE", "id": "brew_gin", - "name": { "str": "fermenting gin mash", "str_pl": "fermenting gin mashes" }, - "description": "Undistilled gin mash. Distilling it will produce gin.", + "name": { "str": "gin mash", "str_pl": "gin mashes" }, + "description": "Unfermented gin mash. Fermenting it will produce gin.", "weight": "33 g", "color": "brown", "container": "bottle_glass", @@ -91,8 +91,8 @@ { "type": "COMESTIBLE", "id": "gin_mash", - "name": { "str": "gin mash", "str_pl": "gin mashes" }, - "description": "Gin mash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.", + "name": { "str": "gin wash", "str_pl": "gin washes" }, + "description": "Gin wash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.", "weight": "33 g", "color": "yellow", "addiction_type": "alcohol", diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index f67103d4c4572..75976c7ee4681 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -200,13 +200,14 @@ "type": "recipe_group", "id": "saltworks_recipes_2", "building_type": "COOK", + "//": "You can make the recipes work by adding a container like canning but it's a huge pain because of pockets and inconsistency in liquid volumes", "recipes": [ - { "id": "brew_fruit_wine", "description": " Brew: Fruit Wine Must" }, - { "id": "brew_mead", "description": " Brew: Spiced Wine Must" }, - { "id": "brew_dandelion_wine", "description": " Brew: Dandelion Wine Must" }, - { "id": "brew_burdock_wine", "description": " Brew: Burdock Wine Must" }, - { "id": "brew_pine_wine", "description": " Brew: Pine Wine Must" }, - { "id": "brew_hb_beer", "description": " Brew: Beer" } + { "id": "brew_fruit_wine", "description": " WIP Brew: Fruit Wine Must" }, + { "id": "brew_mead", "description": " WIP Brew: Spiced Wine Must" }, + { "id": "brew_dandelion_wine", "description": " WIP Brew: Dandelion Wine Must" }, + { "id": "brew_burdock_wine", "description": " WIP Brew: Burdock Wine Must" }, + { "id": "brew_pine_wine", "description": " WIP Brew: Pine Wine Must" }, + { "id": "brew_hb_beer", "description": " WIP Brew: Beer" } ] }, { @@ -214,10 +215,10 @@ "id": "saltworks_recipes_3", "building_type": "COOK", "recipes": [ - { "id": "brandy", "description": " Distill: Brandy" }, - { "id": "gin_from_mash", "description": " Distill: Gin" }, - { "id": "vodka_from_wash", "description": " Distill: Vodka" }, - { "id": "rum", "description": " Distill: Rum" } + { "id": "brandy", "description": " WIP Distill: Brandy" }, + { "id": "gin_from_mash", "description": " WIP Distill: Gin" }, + { "id": "vodka_from_wash", "description": " WIP Distill: Vodka" }, + { "id": "rum", "description": " WIP Distill: Rum" } ] }, { diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json index 96bf66e263b1c..bb5f876cae8ac 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_log_northeast", "blueprint_name": "NE log wall saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "3 d 14 h 40 m", @@ -84,7 +84,7 @@ "construction_blueprint": "fbmsw_brewery0_log_southwest", "blueprint_name": "SW log wall brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "4 d 5 h 30 m", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json index a976cbf4b22c3..5fc21d706961f 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_metal_northeast", "blueprint_name": "NE metal wall saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "2 d 20 h 40 m", @@ -80,7 +80,7 @@ "construction_blueprint": "fbmsw_brewery0_metal_southwest", "blueprint_name": "SW metal wall brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "3 d 2 h 30 m", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json index f11540b31b76d..88dc2e9e3c441 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_migo_resin_northeast", "blueprint_name": "NE migo resin saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "1 d 19 h 25 m", @@ -66,7 +66,7 @@ "construction_blueprint": "fbmsw_brewery0_migo_resin_southwest", "blueprint_name": "SW migo resin brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "2 d 3 h", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json index b8f51d35183af..b17874bdb4203 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_rammed_earth_northeast", "blueprint_name": "NE rammed earth saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "6 d 5 h 10 m", @@ -90,7 +90,7 @@ "construction_blueprint": "fbmsw_brewery0_rammed_earth_southwest", "blueprint_name": "SW rammed earth brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "6 d 17 h 45 m", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json index 4e408c3d07679..fb9c5baf4da2d 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_rock_northeast", "blueprint_name": "NE stone wall saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "5 d 8 h 40 m", @@ -84,7 +84,7 @@ "construction_blueprint": "fbmsw_brewery0_rock_southwest", "blueprint_name": "SW stone wall brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "5 d 17 h 30 m", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json index 6f447b921ac84..2014ad98f206e 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_wad_northeast", "blueprint_name": "NE wattle and daub saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "2 d 8 h 15 m", @@ -79,7 +79,7 @@ "construction_blueprint": "fbmsw_brewery0_wad_southwest", "blueprint_name": "SW wattle and daub brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "2 d 16 h 40 m", diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json index 4d92fe49a2d6c..a37efcb99a6ce 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json @@ -11,7 +11,7 @@ "construction_blueprint": "fbmsw_saltpan_wood_northeast", "blueprint_name": "NE wood panel saltpan", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "saltworks_recipes_1" } ], + "blueprint_provides": [ { "id": "fbmsw_northeast" }, { "id": "Salt_Pan" }, { "id": "kitchen" }, { "id": "saltworks_recipes_1" } ], "blueprint_excludes": [ { "id": "fbmsw_northeast" } ], "blueprint_needs": { "time": "3 d 1 h 20 m", @@ -67,7 +67,7 @@ "construction_blueprint": "fbmsw_brewery0_wood_southwest", "blueprint_name": "SW wood panel brewery", "blueprint_requires": [ { "id": "fbmsw_0" } ], - "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "brewery" } ], + "blueprint_provides": [ { "id": "fbmsw_southwest" }, { "id": "saltworks_recipes_2" }, { "id": "brewery" } ], "blueprint_excludes": [ { "id": "fbmsw_southwest" } ], "blueprint_needs": { "time": "3 d 15 h 30 m", diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 89494b0c430d1..5b7926bbaf72f 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -139,7 +139,6 @@ "result": "brew_moonshine", "id_suffix": "pumpkin", "result_mult": 15, - "byproducts": [ [ "chem_methanol", 275 ] ], "category": "CC_FOOD", "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", diff --git a/data/json/recipes/food/distill.json b/data/json/recipes/food/distill.json index 5a3efebdee0c7..36da42785b2fd 100644 --- a/data/json/recipes/food/distill.json +++ b/data/json/recipes/food/distill.json @@ -81,6 +81,8 @@ "type": "recipe", "activity_level": "NO_EXERCISE", "result": "moonshine", + "//": "should produce 12-15% foreshot with significant methanol", + "//2": "1 unit of methanol in the JSON is 250 units in game", "category": "CC_FOOD", "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking",