From 11b0d6fa272d114f3decdae02ed454ad6c3a313e Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Tue, 11 Feb 2020 23:47:17 -0800 Subject: [PATCH 01/14] Extracts and Concentrates pt 6 (recipes) all the crafting recipes and deconstruction recipe for the vac oven --- data/json/recipes/other/containers.json | 13 + data/json/recipes/other/tool.json | 261 ++++++++++++++++ data/json/recipes/recipe_deconstruction.json | 8 + .../json/recipes/recipe_medsandchemicals.json | 279 ++++++++++++++++++ 4 files changed, 561 insertions(+) diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json index 64713f696bbf1..b22672d690253 100644 --- a/data/json/recipes/other/containers.json +++ b/data/json/recipes/other/containers.json @@ -12,6 +12,19 @@ "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 40 ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ] }, + { + "type": "recipe", + "result": "eac_flask_buchner", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_CONTAINERS", + "skill_used": "fabrication", + "difficulty": 4, + "time": "30 m", + "book_learn": [ [ "glassblowing_book", 4 ], [ "eac_textbook_extraction", 3 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], + "components": [ [ [ "glass_shard", 80 ] ] ] + }, { "type": "recipe", "result": "clay_canister", diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 1587b8ecaea5f..527516e66b814 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -590,5 +590,266 @@ "time": "45 m", "autolearn": true, "components": [ [ [ "straw_pile", 3 ], [ "birchbark", 5 ] ] ] + }, + { + "type": "recipe", + "result": "eac_extractor_small", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 3 ], + "difficulty": 8, + "time": "16 h", + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "reversible": true, + "using": [ [ "welding_standard", 5 ], [ "blacksmithing_standard", 2 ], [ "steel_standard", 5 ] ], + "qualities": [ + { "id": "HAMMER", "level": 3 }, + { "id": "HAMMER_FINE", "level": 1 }, + { "id": "SAW_M", "level": 2 }, + { "id": "WRENCH", "level": 2 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "DRILL", "level": 2 }, + { "id": "FILE", "level": 2 } + ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ + [ [ "jerrycan_big", 1 ], [ "metal_tank_little", 1 ] ], + [ [ "pipe", 1 ] ], + [ [ "hose", 3 ] ], + [ [ "eac_recovery_pump", 1 ] ], + [ [ "eac_gasket_plastic", 4 ] ], + [ [ "metal_funnel", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_extractor_large", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 4 ], + "difficulty": 8, + "time": "24 h", + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "reversible": true, + "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ], [ "steel_standard", 10 ] ], + "qualities": [ + { "id": "HAMMER", "level": 3 }, + { "id": "HAMMER_FINE", "level": 1 }, + { "id": "SAW_M", "level": 2 }, + { "id": "WRENCH", "level": 2 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "DRILL", "level": 2 }, + { "id": "FILE", "level": 2 } + ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ + [ [ "30gal_drum", 1 ], [ "metal_tank", 1 ] ], + [ [ "pipe", 3 ] ], + [ [ "hose", 10 ] ], + [ [ "eac_recovery_pump", 1 ] ], + [ [ "eac_gasket_plastic", 14 ] ], + [ [ "metal_funnel", 3 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_extractor_ethanol_crude", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 2 ], + "difficulty": 4, + "time": "30 m", + "reversible": true, + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 2 } ], + "components": [ + [ [ "55gal_drum", 1 ] ], + [ [ "pipe", 1 ], [ "stick_long", 1 ], [ "pointy_stick", 1 ] ], + [ [ "water_faucet", 1 ] ], + [ [ "duct_tape", 10 ], [ "eac_gasket_plastic", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_vac_pump", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 2 ], + "difficulty": 4, + "time": "12 h", + "autolearn": false, + "reversible": true, + "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ] ], + "qualities": [ + { "id": "HAMMER", "level": 3 }, + { "id": "HAMMER_FINE", "level": 1 }, + { "id": "SAW_M", "level": 2 }, + { "id": "WRENCH", "level": 2 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "DRILL", "level": 2 }, + { "id": "FILE", "level": 2 } + ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ + [ [ "pipe", 2 ] ], + [ [ "hose", 1 ] ], + [ [ "eac_gasket_plastic", 2 ] ], + [ [ "motor_small", 1 ] ], + [ [ "drivebelt", 1 ], [ "drivebelt_makeshift", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_filter_paper_qualitative", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 3, + "time": "1 m", + "batch_time_factors": [ 75, 4 ], + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 2 ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "paper", 2 ] ] ] + }, + { + "type": "recipe", + "result": "eac_filter_paper_quantitative", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 3, + "time": "1 m", + "batch_time_factors": [ 75, 4 ], + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 2 ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "paper", 2 ] ] ] + }, + { + "type": "recipe", + "result": "eac_recovery_pump", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 2 ], + "difficulty": 4, + "time": "12 h", + "autolearn": false, + "reversible": true, + "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ] ], + "qualities": [ + { "id": "HAMMER", "level": 3 }, + { "id": "HAMMER_FINE", "level": 1 }, + { "id": "SAW_M", "level": 2 }, + { "id": "WRENCH", "level": 2 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "DRILL", "level": 2 }, + { "id": "FILE", "level": 2 } + ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "pipe", 4 ] ], [ [ "hose", 2 ] ], [ [ "eac_gasket_plastic", 2 ] ], [ [ "motor", 1 ] ] ] + }, + { + "type": "recipe", + "result": "eac_gasket_plastic", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "20 m", + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 2 ], [ "textbook_fabrication", 2 ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ], + "components": [ [ [ "plastic_chunk", 1 ] ] ] + }, + { + "type": "recipe", + "result": "eac_vac_oven_small", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 3 ], + "difficulty": 8, + "time": "8 h", + "autolearn": false, + "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "reversible": true, + "using": [ [ "welding_standard", 5 ], [ "blacksmithing_standard", 2 ], [ "steel_standard", 5 ] ], + "qualities": [ + { "id": "HAMMER", "level": 3 }, + { "id": "HAMMER_FINE", "level": 1 }, + { "id": "SAW_M", "level": 2 }, + { "id": "WRENCH", "level": 2 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "DRILL", "level": 2 }, + { "id": "FILE", "level": 2 } + ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ + [ [ "metal_tank", 1 ] ], + [ [ "pipe", 2 ] ], + [ [ "hose", 2 ] ], + [ [ "eac_vac_pump", 1 ] ], + [ [ "eac_gasket_plastic", 2 ] ], + [ [ "element", 3 ] ], + [ [ "sheet_metal", 3 ] ], + [ [ "glass_sheet", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_vac_oven_small_full", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 3 ], + "difficulty": 8, + "time": "30 m", + "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "components": [ + [ [ "paper", 6 ] ], + [ [ "eac_hi_q_crude_oil", 92 ] ], + [ [ "eac_gasket_plastic", 2 ] ], + [ [ "eac_vac_oven_small", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_dab_pen", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "1 m", + "reversible": true, + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], + "components": [ [ [ "element", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] } ] diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index b04d0380c351d..a239709cc5a91 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -76,6 +76,14 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 2 ] ], [ [ "gold_small", 2 ] ] ] }, + { + "result": "eac_vac_oven_small_done", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 1, + "time": "15 m", + "components": [ [ [ "eac_hi_q_shatter", 420 ] ], [ [ "eac_vac_oven_small", 1 ] ] ] + }, { "result": "ear_spool", "type": "uncraft", diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index af04545db9c5f..b4cbcd0fae0e2 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1263,5 +1263,284 @@ "autolearn": true, "qualities": [ { "id": "CHISEL", "level": 2 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "material_rhodonite", 1 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_crude_oil", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 272, + "time": "180 m", + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "tools": [ [ [ "eac_butane_tank", 1 ] ], [ [ "eac_extractor_small_on", -1 ] ] ], + "components": [ + [ [ "eac_gasket_plastic", 3 ] ], + [ [ "eac_filter_paper_qualitative", 1 ] ], + [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "weed", 1816 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_hi_q_crude_oil", + "id_suffix": "using_pipe", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 3, + "batch_time_factors": [ 80, 3 ], + "charges": 1, + "time": "15 m", + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "tools": [ [ [ "eac_butane_can", 1 ], [ "eac_butane_tank", 1 ] ], [ [ "pipe", -1 ] ] ], + "components": [ [ [ "eac_filter_paper_qualitative", 1 ] ], [ [ "eac_filter_paper_quantitative", 1 ] ], [ [ "weed", 8 ] ] ] + }, + { + "type": "recipe", + "result": "eac_lo_q_crude_oil", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 181, + "time": "60 m", + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "tools": [ [ [ "eac_butane_tank", 1 ] ], [ [ "eac_extractor_large_on", -1 ] ] ], + "components": [ + [ [ "eac_gasket_plastic", 3 ] ], + [ [ "eac_filter_paper_qualitative", 1 ] ], + [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "weed", 1816 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_lo_q_crude_oil_ethanol", + "id_suffix": "using_crude_extractor", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 1015, + "time": "120 m", + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "tools": [ + [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], + [ [ "eac_extractor_ethanol_crude", -1 ] ], + [ + [ "funnel", -1 ], + [ "makeshift_funnel", -1 ], + [ "birchbark_funnel", -1 ], + [ "metal_funnel", -1 ], + [ "leather_funnel", -1 ] + ] + ], + "components": [ + [ [ "chem_ethanol", 947 ] ], + [ [ "eac_filter_paper_qualitative", 1 ] ], + [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "weed", 454 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_lo_q_crude_oil_ethanol", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 10, + "time": "4 m", + "batch_time_factors": [ 80, 4 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], + "components": [ [ [ "eac_lo_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_crude_oil_ethanol", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 10, + "time": "4 m", + "batch_time_factors": [ 80, 4 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], + "components": [ [ [ "eac_hi_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_wax", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 2, + "charges": 4, + "time": "45 m", + "batch_time_factors": [ 100, 1 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], + "components": [ [ [ "eac_hi_q_crude_oil", 1 ] ] ] + }, + { + "type": "recipe", + "result": "eac_lo_q_crude_oil_ethanol_filtered", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 196, + "time": "10 m", + "batch_time_factors": [ 80, 4 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FILTER", "level": 2 } ], + "tools": [ [ [ "eac_flask_buchner", -1 ] ], [ [ "eac_vac_pump_on", -1 ] ] ], + "components": [ + [ [ "eac_gasket_plastic", 1 ] ], + [ [ "eac_filter_paper_qualitative", 1 ] ], + [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "eac_lo_q_crude_oil_ethanol", 200 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_hi_q_crude_oil_ethanol_filtered", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 196, + "time": "5 m", + "batch_time_factors": [ 80, 4 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FILTER", "level": 2 } ], + "tools": [ [ [ "eac_flask_buchner", -1 ] ], [ [ "eac_vac_pump_on", -1 ] ] ], + "components": [ + [ [ "eac_gasket_plastic", 1 ] ], + [ [ "eac_filter_paper_qualitative", 1 ] ], + [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "eac_hi_q_crude_oil_ethanol", 200 ] ] + ] + }, + { + "type": "recipe", + "result": "eac_lo_q_crude_oil_filtered", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 25, + "time": "30 m", + "batch_time_factors": [ 80, 4 ], + "byproducts": [ [ "chem_ethanol", 1 ] ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "components": [ [ [ "eac_lo_q_crude_oil_ethanol_filtered", 300 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_crude_oil_filtered", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 27, + "time": "30 m", + "batch_time_factors": [ 80, 4 ], + "byproducts": [ [ "chem_ethanol", 1 ] ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "components": [ [ [ "eac_hi_q_crude_oil_ethanol_filtered", 300 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_distillate_heads", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 600, + "time": "180 m", + "byproducts": [ [ "eac_hi_q_distillate_tails", 300 ] ], + "batch_time_factors": [ 90, 1 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "eac_hi_q_crude_oil_filtered", 100 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_distillate_heads", + "id_suffix": "using lo_q_crude", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 533, + "time": "180 m", + "byproducts": [ [ "eac_hi_q_distillate_tails", 267 ] ], + "batch_time_factors": [ 90, 1 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "eac_lo_q_crude_oil_filtered", 100 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_distillate_heads", + "id_suffix": "using_tails", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 633, + "time": "180 m", + "byproducts": [ [ "eac_hi_q_distillate_tails", 317 ] ], + "batch_time_factors": [ 90, 1 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "eac_hi_q_distillate_tails", 1000 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_distillate", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "cooking", + "difficulty": 6, + "charges": 633, + "time": "180 m", + "byproducts": [ [ "eac_hi_q_distillate_tails", 317 ] ], + "batch_time_factors": [ 90, 1 ], + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "eac_hi_q_distillate_heads", 1000 ] ] ] + }, + { + "type": "recipe", + "result": "eac_hi_q_distillate_cart", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "5 m", + "charges": 50, + "batch_time_factors": [ 80, 1 ], + "reversible": false, + "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ], + "components": [ [ [ "eac_hi_q_distillate", 10 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] } ] From ae3d8e2b4751a7e06efd6bd19eb84a61082e04b6 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:41:43 -0800 Subject: [PATCH 02/14] Update containers.json --- data/json/recipes/other/containers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json index b22672d690253..97c80d9c66326 100644 --- a/data/json/recipes/other/containers.json +++ b/data/json/recipes/other/containers.json @@ -14,13 +14,13 @@ }, { "type": "recipe", - "result": "eac_flask_buchner", + "result": "flask_buchner", "category": "CC_OTHER", "subcategory": "CSC_OTHER_CONTAINERS", "skill_used": "fabrication", "difficulty": 4, "time": "30 m", - "book_learn": [ [ "glassblowing_book", 4 ], [ "eac_textbook_extraction", 3 ] ], + "book_learn": [ [ "glassblowing_book", 4 ], [ "textbook_extraction", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], "components": [ [ [ "glass_shard", 80 ] ] ] From 197f07c44ed7c10b80d0989c655aad4a93e18253 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:47:01 -0800 Subject: [PATCH 03/14] id name clean up --- data/json/recipes/other/tool.json | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 527516e66b814..56ef6933e31e6 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -593,7 +593,7 @@ }, { "type": "recipe", - "result": "eac_extractor_small", + "result": "closed_loop_extractor_small", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -601,7 +601,7 @@ "difficulty": 8, "time": "16 h", "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "book_learn": [ [ "textbook_extraction", 5 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ], [ "blacksmithing_standard", 2 ], [ "steel_standard", 5 ] ], "qualities": [ @@ -621,14 +621,14 @@ [ [ "jerrycan_big", 1 ], [ "metal_tank_little", 1 ] ], [ [ "pipe", 1 ] ], [ [ "hose", 3 ] ], - [ [ "eac_recovery_pump", 1 ] ], - [ [ "eac_gasket_plastic", 4 ] ], + [ [ "recovery_pump", 1 ] ], + [ [ "gasket_plastic", 4 ] ], [ [ "metal_funnel", 1 ] ] ] }, { "type": "recipe", - "result": "eac_extractor_large", + "result": "closed_loop_extractor_large", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -636,7 +636,7 @@ "difficulty": 8, "time": "24 h", "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "book_learn": [ [ "textbook_extraction", 5 ] ], "reversible": true, "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ], [ "steel_standard", 10 ] ], "qualities": [ @@ -656,14 +656,14 @@ [ [ "30gal_drum", 1 ], [ "metal_tank", 1 ] ], [ [ "pipe", 3 ] ], [ [ "hose", 10 ] ], - [ [ "eac_recovery_pump", 1 ] ], - [ [ "eac_gasket_plastic", 14 ] ], + [ [ "recovery_pump", 1 ] ], + [ [ "gasket_plastic", 14 ] ], [ [ "metal_funnel", 3 ] ] ] }, { "type": "recipe", - "result": "eac_extractor_ethanol_crude", + "result": "oil_extractor_crude", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -672,18 +672,18 @@ "time": "30 m", "reversible": true, "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "book_learn": [ [ "textbook_extraction", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 2 } ], "components": [ [ [ "55gal_drum", 1 ] ], [ [ "pipe", 1 ], [ "stick_long", 1 ], [ "pointy_stick", 1 ] ], [ [ "water_faucet", 1 ] ], - [ [ "duct_tape", 10 ], [ "eac_gasket_plastic", 1 ] ] + [ [ "duct_tape", 10 ], [ "gasket_plastic", 1 ] ] ] }, { "type": "recipe", - "result": "eac_vac_pump", + "result": "vac_pump", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -692,7 +692,7 @@ "time": "12 h", "autolearn": false, "reversible": true, - "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "book_learn": [ [ "textbook_extraction", 3 ] ], "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, @@ -710,14 +710,14 @@ "components": [ [ [ "pipe", 2 ] ], [ [ "hose", 1 ] ], - [ [ "eac_gasket_plastic", 2 ] ], + [ [ "gasket_plastic", 2 ] ], [ [ "motor_small", 1 ] ], [ [ "drivebelt", 1 ], [ "drivebelt_makeshift", 1 ] ] ] }, { "type": "recipe", - "result": "eac_filter_paper_qualitative", + "result": "filter_paper_qualitative", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -725,13 +725,13 @@ "time": "1 m", "batch_time_factors": [ 75, 4 ], "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 2 ] ], + "book_learn": [ [ "textbook_extraction", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "paper", 2 ] ] ] }, { "type": "recipe", - "result": "eac_filter_paper_quantitative", + "result": "filter_paper_quantitative", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -739,13 +739,13 @@ "time": "1 m", "batch_time_factors": [ 75, 4 ], "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 2 ] ], + "book_learn": [ [ "textbook_extraction", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "paper", 2 ] ] ] }, { "type": "recipe", - "result": "eac_recovery_pump", + "result": "recovery_pump", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -754,7 +754,7 @@ "time": "12 h", "autolearn": false, "reversible": true, - "book_learn": [ [ "eac_textbook_extraction", 3 ] ], + "book_learn": [ [ "textbook_extraction", 3 ] ], "using": [ [ "welding_standard", 10 ], [ "blacksmithing_standard", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, @@ -769,24 +769,24 @@ { "id": "FILE", "level": 2 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "pipe", 4 ] ], [ [ "hose", 2 ] ], [ [ "eac_gasket_plastic", 2 ] ], [ [ "motor", 1 ] ] ] + "components": [ [ [ "pipe", 4 ] ], [ [ "hose", 2 ] ], [ [ "gasket_plastic", 2 ] ], [ [ "motor", 1 ] ] ] }, { "type": "recipe", - "result": "eac_gasket_plastic", + "result": "gasket_plastic", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 2, "time": "20 m", "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 2 ], [ "textbook_fabrication", 2 ] ], + "book_learn": [ [ "textbook_extraction", 2 ], [ "textbook_fabrication", 2 ] ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ], "components": [ [ [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", - "result": "eac_vac_oven_small", + "result": "vac_oven_small", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -794,7 +794,7 @@ "difficulty": 8, "time": "8 h", "autolearn": false, - "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "book_learn": [ [ "textbook_extraction", 5 ] ], "reversible": true, "using": [ [ "welding_standard", 5 ], [ "blacksmithing_standard", 2 ], [ "steel_standard", 5 ] ], "qualities": [ @@ -814,8 +814,8 @@ [ [ "metal_tank", 1 ] ], [ [ "pipe", 2 ] ], [ [ "hose", 2 ] ], - [ [ "eac_vac_pump", 1 ] ], - [ [ "eac_gasket_plastic", 2 ] ], + [ [ "vac_pump", 1 ] ], + [ [ "gasket_plastic", 2 ] ], [ [ "element", 3 ] ], [ [ "sheet_metal", 3 ] ], [ [ "glass_sheet", 1 ] ] @@ -823,31 +823,31 @@ }, { "type": "recipe", - "result": "eac_vac_oven_small_full", + "result": "vac_oven_small_full", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "mechanics", 3 ], "difficulty": 8, "time": "30 m", - "book_learn": [ [ "eac_textbook_extraction", 5 ] ], + "book_learn": [ [ "textbook_extraction", 5 ] ], "components": [ [ [ "paper", 6 ] ], - [ [ "eac_hi_q_crude_oil", 92 ] ], - [ [ "eac_gasket_plastic", 2 ] ], - [ [ "eac_vac_oven_small", 1 ] ] + [ [ "hi_q_crude_oil", 92 ] ], + [ [ "gasket_plastic", 2 ] ], + [ [ "vac_oven_small", 1 ] ] ] }, { "type": "recipe", - "result": "eac_dab_pen", + "result": "dab_pen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "fabrication", "difficulty": 2, "time": "1 m", "reversible": true, - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "element", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] From fd22ee1a24242b7d78ef4574434f67736ed4eede Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:48:22 -0800 Subject: [PATCH 04/14] Update recipe_deconstruction.json --- data/json/recipes/recipe_deconstruction.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index a239709cc5a91..f67c90e8f1f0c 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -77,12 +77,12 @@ "components": [ [ [ "silver_small", 2 ] ], [ [ "gold_small", 2 ] ] ] }, { - "result": "eac_vac_oven_small_done", + "result": "vac_oven_small_done", "type": "uncraft", "skill_used": "fabrication", "difficulty": 1, "time": "15 m", - "components": [ [ [ "eac_hi_q_shatter", 420 ] ], [ [ "eac_vac_oven_small", 1 ] ] ] + "components": [ [ [ "hi_q_shatter", 420 ] ], [ [ "vac_oven_small", 1 ] ] ] }, { "result": "ear_spool", From c61cc6a8c809aad5bce112120b96fe5797ce9bff Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 01:03:21 -0800 Subject: [PATCH 05/14] changed id names --- .../json/recipes/recipe_medsandchemicals.json | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index b4cbcd0fae0e2..79da0eb9e6772 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1266,25 +1266,25 @@ }, { "type": "recipe", - "result": "eac_hi_q_crude_oil", + "result": "hi_q_crude_oil", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, "charges": 272, "time": "180 m", - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], - "tools": [ [ [ "eac_butane_tank", 1 ] ], [ [ "eac_extractor_small_on", -1 ] ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], + "tools": [ [ [ "butane_tank", 1 ] ], [ [ "closed_loop_extractor_small_on", -1 ] ] ], "components": [ - [ [ "eac_gasket_plastic", 3 ] ], - [ [ "eac_filter_paper_qualitative", 1 ] ], - [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "gasket_plastic", 3 ] ], + [ [ "filter_paper_qualitative", 1 ] ], + [ [ "filter_paper_quantitative", 1 ] ], [ [ "weed", 1816 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_crude_oil", + "result": "hi_q_crude_oil", "id_suffix": "using_pipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", @@ -1293,42 +1293,42 @@ "batch_time_factors": [ 80, 3 ], "charges": 1, "time": "15 m", - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], - "tools": [ [ [ "eac_butane_can", 1 ], [ "eac_butane_tank", 1 ] ], [ [ "pipe", -1 ] ] ], - "components": [ [ [ "eac_filter_paper_qualitative", 1 ] ], [ [ "eac_filter_paper_quantitative", 1 ] ], [ [ "weed", 8 ] ] ] + "book_learn": [ [ "textbook_extraction", 4 ] ], + "tools": [ [ [ "butane_can", 1 ], [ "butane_tank", 1 ] ], [ [ "pipe", -1 ] ] ], + "components": [ [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "weed", 8 ] ] ] }, { "type": "recipe", - "result": "eac_lo_q_crude_oil", + "result": "lo_q_crude_oil", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, "charges": 181, "time": "60 m", - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], - "tools": [ [ [ "eac_butane_tank", 1 ] ], [ [ "eac_extractor_large_on", -1 ] ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], + "tools": [ [ [ "butane_tank", 1 ] ], [ [ "closed_loop_extractor_large_on", -1 ] ] ], "components": [ - [ [ "eac_gasket_plastic", 3 ] ], - [ [ "eac_filter_paper_qualitative", 1 ] ], - [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "gasket_plastic", 3 ] ], + [ [ "filter_paper_qualitative", 1 ] ], + [ [ "filter_paper_quantitative", 1 ] ], [ [ "weed", 1816 ] ] ] }, { "type": "recipe", - "result": "eac_lo_q_crude_oil_ethanol", - "id_suffix": "using_crude_extractor", + "result": "lo_q_crude_oil_ethanol", + "id_suffix": "using_oil_extractor_crude", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, "charges": 1015, "time": "120 m", - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], - [ [ "eac_extractor_ethanol_crude", -1 ] ], + [ [ "oil_extractor_crude", -1 ] ], [ [ "funnel", -1 ], [ "makeshift_funnel", -1 ], @@ -1339,14 +1339,14 @@ ], "components": [ [ [ "chem_ethanol", 947 ] ], - [ [ "eac_filter_paper_qualitative", 1 ] ], - [ [ "eac_filter_paper_quantitative", 1 ] ], + [ [ "filter_paper_qualitative", 1 ] ], + [ [ "filter_paper_quantitative", 1 ] ], [ [ "weed", 454 ] ] ] }, { "type": "recipe", - "result": "eac_lo_q_crude_oil_ethanol", + "result": "lo_q_crude_oil_ethanol", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1354,14 +1354,14 @@ "charges": 10, "time": "4 m", "batch_time_factors": [ 80, 4 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "eac_lo_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] + "components": [ [ [ "lo_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_crude_oil_ethanol", + "result": "hi_q_crude_oil_ethanol", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1369,14 +1369,14 @@ "charges": 10, "time": "4 m", "batch_time_factors": [ 80, 4 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "eac_hi_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] + "components": [ [ [ "hi_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_wax", + "result": "hi_q_wax", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1384,14 +1384,14 @@ "charges": 4, "time": "45 m", "batch_time_factors": [ 100, 1 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "eac_hi_q_crude_oil", 1 ] ] ] + "components": [ [ [ "hi_q_crude_oil", 1 ] ] ] }, { "type": "recipe", - "result": "eac_lo_q_crude_oil_ethanol_filtered", + "result": "lo_q_crude_oil_ethanol_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1399,19 +1399,19 @@ "charges": 196, "time": "10 m", "batch_time_factors": [ 80, 4 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], - "tools": [ [ [ "eac_flask_buchner", -1 ] ], [ [ "eac_vac_pump_on", -1 ] ] ], + "tools": [ [ [ "flask_buchner", -1 ] ], [ [ "vac_pump_on", -1 ] ] ], "components": [ - [ [ "eac_gasket_plastic", 1 ] ], - [ [ "eac_filter_paper_qualitative", 1 ] ], - [ [ "eac_filter_paper_quantitative", 1 ] ], - [ [ "eac_lo_q_crude_oil_ethanol", 200 ] ] + [ [ "gasket_plastic", 1 ] ], + [ [ "filter_paper_qualitative", 1 ] ], + [ [ "filter_paper_quantitative", 1 ] ], + [ [ "lo_q_crude_oil_ethanol", 200 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_crude_oil_ethanol_filtered", + "result": "hi_q_crude_oil_ethanol_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1419,19 +1419,19 @@ "charges": 196, "time": "5 m", "batch_time_factors": [ 80, 4 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], - "tools": [ [ [ "eac_flask_buchner", -1 ] ], [ [ "eac_vac_pump_on", -1 ] ] ], + "tools": [ [ [ "flask_buchner", -1 ] ], [ [ "vac_pump_on", -1 ] ] ], "components": [ - [ [ "eac_gasket_plastic", 1 ] ], - [ [ "eac_filter_paper_qualitative", 1 ] ], - [ [ "eac_filter_paper_quantitative", 1 ] ], - [ [ "eac_hi_q_crude_oil_ethanol", 200 ] ] + [ [ "gasket_plastic", 1 ] ], + [ [ "filter_paper_qualitative", 1 ] ], + [ [ "filter_paper_quantitative", 1 ] ], + [ [ "hi_q_crude_oil_ethanol", 200 ] ] ] }, { "type": "recipe", - "result": "eac_lo_q_crude_oil_filtered", + "result": "lo_q_crude_oil_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1440,14 +1440,14 @@ "time": "30 m", "batch_time_factors": [ 80, 4 ], "byproducts": [ [ "chem_ethanol", 1 ] ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], - "components": [ [ [ "eac_lo_q_crude_oil_ethanol_filtered", 300 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "components": [ [ [ "lo_q_crude_oil_ethanol_filtered", 300 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_crude_oil_filtered", + "result": "hi_q_crude_oil_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", @@ -1456,30 +1456,30 @@ "time": "30 m", "batch_time_factors": [ 80, 4 ], "byproducts": [ [ "chem_ethanol", 1 ] ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], - "components": [ [ [ "eac_hi_q_crude_oil_ethanol_filtered", 300 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "components": [ [ [ "hi_q_crude_oil_ethanol_filtered", 300 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_distillate_heads", + "result": "hi_q_distillate_heads", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, "charges": 600, "time": "180 m", - "byproducts": [ [ "eac_hi_q_distillate_tails", 300 ] ], + "byproducts": [ [ "hi_q_distillate_tails", 300 ] ], "batch_time_factors": [ 90, 1 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], - "components": [ [ [ "eac_hi_q_crude_oil_filtered", 100 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "hi_q_crude_oil_filtered", 100 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_distillate_heads", + "result": "hi_q_distillate_heads", "id_suffix": "using lo_q_crude", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", @@ -1487,16 +1487,16 @@ "difficulty": 6, "charges": 533, "time": "180 m", - "byproducts": [ [ "eac_hi_q_distillate_tails", 267 ] ], + "byproducts": [ [ "hi_q_distillate_tails", 267 ] ], "batch_time_factors": [ 90, 1 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], - "components": [ [ [ "eac_lo_q_crude_oil_filtered", 100 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "lo_q_crude_oil_filtered", 100 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_distillate_heads", + "result": "hi_q_distillate_heads", "id_suffix": "using_tails", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", @@ -1504,32 +1504,32 @@ "difficulty": 6, "charges": 633, "time": "180 m", - "byproducts": [ [ "eac_hi_q_distillate_tails", 317 ] ], + "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], "batch_time_factors": [ 90, 1 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], - "components": [ [ [ "eac_hi_q_distillate_tails", 1000 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "hi_q_distillate_tails", 1000 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_distillate", + "result": "hi_q_distillate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "cooking", "difficulty": 6, "charges": 633, "time": "180 m", - "byproducts": [ [ "eac_hi_q_distillate_tails", 317 ] ], + "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], "batch_time_factors": [ 90, 1 ], - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "eac_vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], - "components": [ [ [ "eac_hi_q_distillate_heads", 1000 ] ] ] + "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "components": [ [ [ "hi_q_distillate_heads", 1000 ] ] ] }, { "type": "recipe", - "result": "eac_hi_q_distillate_cart", + "result": "hi_q_distillate_cart", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", "skill_used": "fabrication", @@ -1541,6 +1541,6 @@ "book_learn": [ [ "eac_textbook_extraction", 4 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ], - "components": [ [ [ "eac_hi_q_distillate", 10 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] + "components": [ [ [ "hi_q_distillate", 10 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] } ] From 2e5341d93d283d576bac8d377071042842b5d445 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 01:12:03 -0800 Subject: [PATCH 06/14] linted tool.json file --- data/json/recipes/other/tool.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 56ef6933e31e6..fbd6944b8a89f 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -831,12 +831,7 @@ "difficulty": 8, "time": "30 m", "book_learn": [ [ "textbook_extraction", 5 ] ], - "components": [ - [ [ "paper", 6 ] ], - [ [ "hi_q_crude_oil", 92 ] ], - [ [ "gasket_plastic", 2 ] ], - [ [ "vac_oven_small", 1 ] ] - ] + "components": [ [ [ "paper", 6 ] ], [ [ "hi_q_crude_oil", 92 ] ], [ [ "gasket_plastic", 2 ] ], [ [ "vac_oven_small", 1 ] ] ] }, { "type": "recipe", From aac755a998feb401447615538d4d9571fa17c3b0 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 21:07:41 -0800 Subject: [PATCH 07/14] removed recipe for buchner flask --- data/json/recipes/other/containers.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json index 97c80d9c66326..64713f696bbf1 100644 --- a/data/json/recipes/other/containers.json +++ b/data/json/recipes/other/containers.json @@ -12,19 +12,6 @@ "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 40 ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ] }, - { - "type": "recipe", - "result": "flask_buchner", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_CONTAINERS", - "skill_used": "fabrication", - "difficulty": 4, - "time": "30 m", - "book_learn": [ [ "glassblowing_book", 4 ], [ "textbook_extraction", 3 ] ], - "qualities": [ { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ], - "components": [ [ [ "glass_shard", 80 ] ] ] - }, { "type": "recipe", "result": "clay_canister", From ae602a5ea1422fc84c462022f7d826f79cc26e1c Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 21:14:46 -0800 Subject: [PATCH 08/14] replaced buchner flask with glass flask in recipes added rag to tools needed in place of two hole stopper --- data/json/recipes/recipe_medsandchemicals.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 79da0eb9e6772..ccfe318adb6d3 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1401,9 +1401,8 @@ "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], - "tools": [ [ [ "flask_buchner", -1 ] ], [ [ "vac_pump_on", -1 ] ] ], + "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ - [ [ "gasket_plastic", 1 ] ], [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "lo_q_crude_oil_ethanol", 200 ] ] @@ -1421,9 +1420,8 @@ "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], - "tools": [ [ [ "flask_buchner", -1 ] ], [ [ "vac_pump_on", -1 ] ] ], + "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ - [ [ "gasket_plastic", 1 ] ], [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "hi_q_crude_oil_ethanol", 200 ] ] From 35a97f9d3b384847e3f93c401d624a3947d3fe27 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Thu, 13 Feb 2020 21:18:30 -0800 Subject: [PATCH 09/14] linted json --- data/json/recipes/recipe_medsandchemicals.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index ccfe318adb6d3..96a57bb7a0a40 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1402,11 +1402,7 @@ "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], - "components": [ - [ [ "filter_paper_qualitative", 1 ] ], - [ [ "filter_paper_quantitative", 1 ] ], - [ [ "lo_q_crude_oil_ethanol", 200 ] ] - ] + "components": [ [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "lo_q_crude_oil_ethanol", 200 ] ] ] }, { "type": "recipe", @@ -1421,11 +1417,7 @@ "book_learn": [ [ "textbook_extraction", 4 ] ], "qualitities": [ { "id": "FILTER", "level": 2 } ], "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], - "components": [ - [ [ "filter_paper_qualitative", 1 ] ], - [ [ "filter_paper_quantitative", 1 ] ], - [ [ "hi_q_crude_oil_ethanol", 200 ] ] - ] + "components": [ [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "hi_q_crude_oil_ethanol", 200 ] ] ] }, { "type": "recipe", From fd0791afe3d646a51767d4ebdb2d48d925c82985 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Fri, 14 Feb 2020 14:03:18 -0800 Subject: [PATCH 10/14] fixed typos --- .../json/recipes/recipe_medsandchemicals.json | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 96a57bb7a0a40..0f1a5c156f0ed 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1355,7 +1355,7 @@ "time": "4 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "lo_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] }, @@ -1370,7 +1370,7 @@ "time": "4 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "hi_q_crude_oil", 1 ] ], [ [ "chem_ethanol", 9 ] ] ] }, @@ -1385,7 +1385,7 @@ "time": "45 m", "batch_time_factors": [ 100, 1 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "hi_q_crude_oil", 1 ] ] ] }, @@ -1400,7 +1400,6 @@ "time": "10 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FILTER", "level": 2 } ], "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "lo_q_crude_oil_ethanol", 200 ] ] ] }, @@ -1415,7 +1414,6 @@ "time": "5 m", "batch_time_factors": [ 80, 4 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FILTER", "level": 2 } ], "tools": [ [ [ "flask_glass", -1 ] ], [ [ "vac_pump_on", -1 ] ], [ [ "rag", -1 ] ] ], "components": [ [ [ "filter_paper_qualitative", 1 ] ], [ [ "filter_paper_quantitative", 1 ] ], [ [ "hi_q_crude_oil_ethanol", 200 ] ] ] }, @@ -1431,8 +1429,8 @@ "batch_time_factors": [ 80, 4 ], "byproducts": [ [ "chem_ethanol", 1 ] ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "qualities": [ { "id": "CONCENTRATE", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "lo_q_crude_oil_ethanol_filtered", 300 ] ] ] }, { @@ -1447,8 +1445,8 @@ "batch_time_factors": [ 80, 4 ], "byproducts": [ [ "chem_ethanol", 1 ] ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "CONCENTRATE", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "rotovap", -1 ] ] ], + "qualities": [ { "id": "CONCENTRATE", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "hi_q_crude_oil_ethanol_filtered", 300 ] ] ] }, { @@ -1463,8 +1461,8 @@ "byproducts": [ [ "hi_q_distillate_tails", 300 ] ], "batch_time_factors": [ 90, 1 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "qualities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "hi_q_crude_oil_filtered", 100 ] ] ] }, { @@ -1480,8 +1478,8 @@ "byproducts": [ [ "hi_q_distillate_tails", 267 ] ], "batch_time_factors": [ 90, 1 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "qualities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "lo_q_crude_oil_filtered", 100 ] ] ] }, { @@ -1497,8 +1495,8 @@ "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], "batch_time_factors": [ 90, 1 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "qualities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "hi_q_distillate_tails", 1000 ] ] ] }, { @@ -1513,8 +1511,8 @@ "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], "batch_time_factors": [ 90, 1 ], "book_learn": [ [ "textbook_extraction", 4 ] ], - "qualitities": [ { "id": "FINE_DISTILL", "level": 1 } ], - "tools": [ [ [ "vac_pump_on", -1 ] ], [ [ "still_lab", -1 ] ] ], + "qualities": [ { "id": "FINE_DISTILL", "level": 1 } ], + "tools": [ [ [ "vac_pump_on", -1 ] ] ], "components": [ [ [ "hi_q_distillate_heads", 1000 ] ] ] }, { From 22929d7d22d0071512a66835804cc648a607594f Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:36:17 -0700 Subject: [PATCH 11/14] changed vac_pump recipe and recovery pump recipe I didn't notice the mechanical pump when i first made this recipe, updated to utilize already existing content --- data/json/recipes/other/tool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index fbd6944b8a89f..afb5298b78ae5 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -711,7 +711,7 @@ [ [ "pipe", 2 ] ], [ [ "hose", 1 ] ], [ [ "gasket_plastic", 2 ] ], - [ [ "motor_small", 1 ] ], + [ [ "well_pump", 1 ] ], [ [ "drivebelt", 1 ], [ "drivebelt_makeshift", 1 ] ] ] }, @@ -769,7 +769,7 @@ { "id": "FILE", "level": 2 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "pipe", 4 ] ], [ [ "hose", 2 ] ], [ [ "gasket_plastic", 2 ] ], [ [ "motor", 1 ] ] ] + "components": [ [ [ "pipe", 4 ] ], [ [ "hose", 2 ] ], [ [ "gasket_plastic", 2 ] ], [ [ "well_pump", 1 ] ] ] }, { "type": "recipe", From bd1476034216145a3690fa52c21b435aa66bc56e Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Sun, 26 Apr 2020 17:50:04 -0700 Subject: [PATCH 12/14] changed recipe slightly moved the heating element from the pen to the actual cartridge --- data/json/recipes/other/tool.json | 2 +- data/json/recipes/recipe_medsandchemicals.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index afb5298b78ae5..be9feed5e0797 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -845,6 +845,6 @@ "book_learn": [ [ "textbook_extraction", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "element", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] + "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] } ] diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 0f1a5c156f0ed..aa9728161adb7 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1529,6 +1529,6 @@ "book_learn": [ [ "eac_textbook_extraction", 4 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ], - "components": [ [ [ "hi_q_distillate", 10 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] + "components": [ [ [ "hi_q_distillate", 10 ] ], [ [ "element", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] } ] From 935003bca4e4be8b65835560bfe616af99acf5c0 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Mon, 27 Apr 2020 00:18:27 -0700 Subject: [PATCH 13/14] fix textbook id --- data/json/recipes/recipe_medsandchemicals.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index f8d86b109d78d..e45bf33c202bb 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1557,7 +1557,7 @@ "charges": 50, "batch_time_factors": [ 80, 1 ], "reversible": false, - "book_learn": [ [ "eac_textbook_extraction", 4 ] ], + "book_learn": [ [ "textbook_extraction", 4 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ], "components": [ [ [ "hi_q_distillate", 10 ] ], [ [ "element", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "glass_shard", 1 ] ] ] From 5740b0ed04c0523fd35fd52f99f06c87553f1f63 Mon Sep 17 00:00:00 2001 From: NastyNate2612 <59994204+NastyNate2612@users.noreply.github.com> Date: Mon, 27 Apr 2020 00:22:58 -0700 Subject: [PATCH 14/14] removed reversible: false flag --- data/json/recipes/recipe_medsandchemicals.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index e45bf33c202bb..fa86f7112768c 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1556,7 +1556,6 @@ "time": "5 m", "charges": 50, "batch_time_factors": [ 80, 1 ], - "reversible": false, "book_learn": [ [ "textbook_extraction", 4 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "syringe", -1 ] ], [ [ "surface_heat", 1, "LIST" ] ] ],