From 931f087a152bc3d9bacff15dbfd978ecb5e9c0cd Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 20 Jan 2024 19:10:42 -0600 Subject: [PATCH 1/3] Commit for remote --- data/json/obsoletion/recipes.json | 15 -- data/json/recipes/electronic/cbms.json | 278 +++++++++++++++++++++++++ data/json/uncraft/cbm/cbm.json | 258 ++++++++++++++++++++++- data/json/uncraft/generic.json | 63 ------ 4 files changed, 527 insertions(+), 87 deletions(-) diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json index 231ba41cdd5a..e4a864b6eef3 100644 --- a/data/json/obsoletion/recipes.json +++ b/data/json/obsoletion/recipes.json @@ -678,11 +678,6 @@ "result": "bio_ground_sonaruncraft", "obsolete": true }, - { - "type": "recipe", - "result": "bio_laser", - "obsolete": true - }, { "type": "recipe", "result": "bio_metabolicsuncraft", @@ -693,16 +688,6 @@ "result": "bio_nanobotsuncraft", "obsolete": true }, - { - "type": "recipe", - "result": "bio_power_armor_interface", - "obsolete": true - }, - { - "type": "recipe", - "result": "bio_power_armor_interface_mkII", - "obsolete": true - }, { "type": "recipe", "result": "bio_recycleruncraft", diff --git a/data/json/recipes/electronic/cbms.json b/data/json/recipes/electronic/cbms.json index 6cfe7645925e..6e77858875d0 100644 --- a/data/json/recipes/electronic/cbms.json +++ b/data/json/recipes/electronic/cbms.json @@ -160,6 +160,56 @@ [ [ "pouch_autoclave", 1 ] ] ] }, + { + "type": "recipe", + "result": "bio_blood_anal", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 7 ] ], + "difficulty": 9, + "time": "4 h", + "book_learn": [ [ "recipe_lab_elec", 8 ], [ "recipe_augs", 8 ] ], + "//": "nanomaterial needed due to medical interface", + "using": [ [ "soldering_standard", 20 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "nanomaterial", 5 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "processor", 2 ] ], + [ [ "cable", 4 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_cable", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "mechanics", 3 ] ], + "difficulty": 7, + "time": "4 h", + "book_learn": [ [ "recipe_lab_elec", 7 ], [ "recipe_augs", 7 ] ], + "//": "Additional metalworking for cable connector and housing", + "using": [ [ "soldering_standard", 40 ], [ "welding_standard", 20 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "power_supply", 2 ] ], + [ [ "processor", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 8 ] ], + [ [ "alloy_sheet", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, { "type": "recipe", "result": "bio_climate", @@ -267,6 +317,184 @@ [ [ "pouch_autoclave", 1 ] ] ] }, + { + "type": "recipe", + "result": "bio_infolink", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "computer", 5 ] ], + "difficulty": 8, + "time": "4 h", + "book_learn": [ [ "recipe_lab_elec", 8 ], [ "recipe_augs", 8 ] ], + "//": "computer use needed due to working with neural interface", + "using": [ [ "soldering_standard", 20 ], [ "coding_standard", 500 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "memory_module", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "amplifier", 1 ] ], + [ [ "transponder", 1 ] ], + [ [ "receiver", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_laser", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ "firstaid", 5 ], + "difficulty": 7, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 6 ] ], + "using": [ [ "soldering_standard", 80 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "components": [ + [ [ "lens", 2 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 1 ] ], + [ [ "processor", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "cable", 12 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_lighter", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ "firstaid", 5 ], + "difficulty": 6, + "time": "4 h", + "book_learn": [ [ "recipe_lab_elec", 5 ], [ "recipe_augs", 5 ] ], + "using": [ [ "soldering_standard", 20 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "element", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "circuit", 1 ] ], + [ [ "cable", 6 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_memory", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "computer", 5 ] ], + "difficulty": 9, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 8 ], [ "recipe_augs", 8 ] ], + "//": "computer use needed due to working with neural interface", + "using": [ [ "soldering_standard", 20 ], [ "coding_standard", 500 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "memory_module", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_nanobots", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 7 ] ], + "difficulty": 10, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 9 ], [ "recipe_mil_augs", 9 ] ], + "//": "nanomaterial needed due to medical interface, extra for repair nanites", + "using": [ [ "soldering_standard", 20 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "nanomaterial", 25 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "processor", 2 ] ], + [ [ "cable", 4 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "plut_cell", 3 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_power_armor_interface", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "mechanics", 5 ], [ "computer", 3 ] ], + "difficulty": 9, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 8 ], [ "recipe_mil_augs", 8 ] ], + "//": "Additional metalworking for assembling component housing and connectors, computer due to neural interface", + "using": [ [ "soldering_standard", 100 ], [ "welding_standard", 50 ], [ "coding_standard", 500 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "memory_module", 1 ] ], + [ [ "amplifier", 5 ] ], + [ [ "scrap", 4 ] ], + [ [ "cable", 14 ] ], + [ [ "circuit", 2 ] ], + [ [ "plut_cell", 2 ] ], + [ [ "alloy_sheet", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bio_power_armor_interface_mkII", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "mechanics", 5 ], [ "computer", 3 ] ], + "difficulty": 10, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 9 ], [ "recipe_mil_augs", 9 ] ], + "//": "Additional metalworking for assembling component housing and connectors, computer due to neural interface, nanomaterial due to advanced circuitry", + "using": [ [ "soldering_standard", 100 ], [ "welding_standard", 50 ], [ "coding_standard", 500 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "nanomaterial", 10 ] ], + [ [ "memory_module", 1 ] ], + [ [ "amplifier", 6 ] ], + [ [ "scrap", 4 ] ], + [ [ "cable", 16 ] ], + [ [ "circuit", 3 ] ], + [ [ "plut_cell", 5 ] ], + [ [ "alloy_sheet", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, { "type": "recipe", "result": "bio_power_storage", @@ -340,6 +568,31 @@ [ [ "pouch_autoclave", 1 ] ] ] }, + { + "type": "recipe", + "result": "bio_shotgun", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 5 ], [ "shotgun", 3 ] ], + "difficulty": 6, + "time": "4 h", + "book_learn": [ [ "recipe_lab_elec", 5 ], [ "recipe_mil_augs", 5 ] ], + "using": [ [ "soldering_standard", 40 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "components": [ + [ [ "masterkey", 1 ] ], + [ [ "canister_empty", 1 ] ], + [ [ "processor", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "motor_tiny", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, { "type": "recipe", "result": "bio_sunglasses", @@ -364,6 +617,31 @@ [ [ "pouch_autoclave", 1 ] ] ] }, + { + "type": "recipe", + "result": "bio_synaptic_regen", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ [ "firstaid", 7 ], [ "computer", 5 ] ], + "difficulty": 10, + "time": "6 h", + "book_learn": [ [ "recipe_lab_elec", 9 ], [ "recipe_augs", 9 ] ], + "//": "nanomaterial needed due to medical interface, computer use due to working with neural interface", + "using": [ [ "soldering_standard", 20 ], [ "coding_standard", 500 ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], + "components": [ + [ [ "nanomaterial", 5 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ], + [ [ "water", 8 ], [ "water_clean", 8 ] ], + [ [ "pouch_autoclave", 1 ] ] + ] + }, { "type": "recipe", "result": "bio_syringe", diff --git a/data/json/uncraft/cbm/cbm.json b/data/json/uncraft/cbm/cbm.json index 6ea5a20552a4..da42828db03a 100644 --- a/data/json/uncraft/cbm/cbm.json +++ b/data/json/uncraft/cbm/cbm.json @@ -68,13 +68,14 @@ "difficulty": 9, "time": "50 m", "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "//": "Uses components of UPS bionic for now, a recipe for it could use added components that explain why it's more efficient", "components": [ - [ [ "power_supply", 4 ] ], - [ [ "amplifier", 3 ] ], + [ [ "memory_module", 1 ] ], + [ [ "amplifier", 5 ] ], [ [ "scrap", 4 ] ], - [ [ "cable", 10 ] ], + [ [ "cable", 14 ] ], [ [ "circuit", 2 ] ], + [ [ "plut_cell", 2 ] ], + [ [ "alloy_sheet", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] }, @@ -86,11 +87,14 @@ "time": "50 m", "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], "components": [ - [ [ "power_supply", 4 ] ], - [ [ "amplifier", 3 ] ], + [ [ "nanomaterial", 10 ] ], + [ [ "memory_module", 1 ] ], + [ [ "amplifier", 6 ] ], [ [ "scrap", 4 ] ], - [ [ "cable", 10 ] ], - [ [ "circuit", 2 ] ], + [ [ "cable", 16 ] ], + [ [ "circuit", 3 ] ], + [ [ "plut_cell", 5 ] ], + [ [ "alloy_sheet", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] }, @@ -145,5 +149,241 @@ [ [ "alloy_sheet", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] - } + }, + { + "result": "bio_blood_filter", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "result": "bio_digestion", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "result": "bio_face_mask", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "result": "bio_ground_sonar", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "result": "bio_metabolics", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "type": "uncraft", + "result": "bio_nanobots", + "skill_used": "electronics", + "difficulty": 10, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "nanomaterial", 25 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "processor", 2 ] ], + [ [ "cable", 4 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "plut_cell", 3 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "result": "bio_recycler", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ [ [ "burnt_out_bionic", 1 ] ] ] + }, + { + "type": "uncraft", + "result": "bio_blood_anal", + "skill_used": "electronics", + "difficulty": 9, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "nanomaterial", 5 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "processor", 2 ] ], + [ [ "cable", 4 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_cable", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "power_supply", 2 ] ], + [ [ "processor", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 8 ] ], + [ [ "alloy_sheet", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_infolink", + "skill_used": "electronics", + "difficulty": 8, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "memory_module", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "amplifier", 1 ] ], + [ [ "transponder", 1 ] ], + [ [ "receiver", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_laser", + "skill_used": "electronics", + "difficulty": 7, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "lens", 2 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 1 ] ], + [ [ "processor", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "cable", 12 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_lighter", + "skill_used": "electronics", + "difficulty": 6, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "element", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "circuit", 1 ] ], + [ [ "cable", 6 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_memory", + "skill_used": "electronics", + "difficulty": 9, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "memory_module", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_shotgun", + "skill_used": "electronics", + "difficulty": 6, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "masterkey", 1 ] ], + [ [ "canister_empty", 1 ] ], + [ [ "processor", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "motor_tiny", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "bio_synaptic_regen", + "skill_used": "electronics", + "difficulty": 10, + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "components": [ + [ [ "nanomaterial", 5 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "cable", 2 ] ], + [ [ "plastic_chunk", 1 ] ], + [ [ "burnt_out_bionic", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "", + "skill_used": "electronics", + "difficulty": , + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + + }, + { + "type": "uncraft", + "result": "", + "skill_used": "electronics", + "difficulty": , + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + + }, + { + "type": "uncraft", + "result": "", + "skill_used": "electronics", + "difficulty": , + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + + }, + { + "type": "uncraft", + "result": "", + "skill_used": "electronics", + "difficulty": , + "time": "50 m", + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + + }, + ] diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index c4908c76222b..a96a142d7ab1 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -475,69 +475,6 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "lens", 2 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "scrap", 1 ] ] ] }, - { - "result": "bio_blood_filter", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_digestion", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_face_mask", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_ground_sonar", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_metabolics", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_nanobots", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "result": "bio_recycler", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 7, - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, { "result": "blade", "type": "uncraft", From 05b70df11847eb1445b509b9ab079f71dc15f722 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 20 Jan 2024 19:19:22 -0600 Subject: [PATCH 2/3] Finishing touches --- data/json/recipes/electronic/cbms.json | 90 +++++++++++++++++--------- data/json/uncraft/cbm/cbm.json | 46 +------------ 2 files changed, 62 insertions(+), 74 deletions(-) diff --git a/data/json/recipes/electronic/cbms.json b/data/json/recipes/electronic/cbms.json index 6e77858875d0..b7ef4861b190 100644 --- a/data/json/recipes/electronic/cbms.json +++ b/data/json/recipes/electronic/cbms.json @@ -22,7 +22,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -50,7 +51,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -78,7 +80,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -106,7 +109,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -134,7 +138,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -158,7 +163,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -183,7 +189,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -208,7 +215,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -237,7 +245,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -264,7 +273,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -291,7 +301,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -315,7 +326,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -341,7 +353,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -366,7 +379,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -389,7 +403,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -412,7 +427,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -438,7 +454,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -465,7 +482,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -493,7 +511,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -516,7 +535,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -539,7 +559,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -566,7 +587,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -591,7 +613,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -615,7 +638,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -640,7 +664,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -667,7 +692,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -691,7 +717,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -718,7 +745,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -742,7 +770,8 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] }, { "type": "recipe", @@ -768,6 +797,7 @@ [ [ "burnt_out_bionic", 1 ] ], [ [ "water", 8 ], [ "water_clean", 8 ] ], [ [ "pouch_autoclave", 1 ] ] - ] + ], + "flags": [ "SECRET" ] } ] diff --git a/data/json/uncraft/cbm/cbm.json b/data/json/uncraft/cbm/cbm.json index da42828db03a..ca01a288a5b9 100644 --- a/data/json/uncraft/cbm/cbm.json +++ b/data/json/uncraft/cbm/cbm.json @@ -309,12 +309,7 @@ "difficulty": 9, "time": "50 m", "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "components": [ - [ [ "memory_module", 1 ] ], - [ [ "cable", 2 ] ], - [ [ "plastic_chunk", 1 ] ], - [ [ "burnt_out_bionic", 1 ] ] - ] + "components": [ [ [ "memory_module", 1 ] ], [ [ "cable", 2 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] }, { "type": "uncraft", @@ -348,42 +343,5 @@ [ [ "plastic_chunk", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "type": "uncraft", - "result": "", - "skill_used": "electronics", - "difficulty": , - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - - }, - { - "type": "uncraft", - "result": "", - "skill_used": "electronics", - "difficulty": , - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - - }, - { - "type": "uncraft", - "result": "", - "skill_used": "electronics", - "difficulty": , - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - - }, - { - "type": "uncraft", - "result": "", - "skill_used": "electronics", - "difficulty": , - "time": "50 m", - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - - }, - + } ] From f76c77493d1a4049b3fd54d4c2a1d8065ab4554a Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Mon, 22 Jan 2024 12:21:46 -0600 Subject: [PATCH 3/3] Remove two recipes per feedback --- data/json/obsoletion/recipes.json | 5 +++ data/json/recipes/electronic/cbms.json | 56 -------------------------- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json index e4a864b6eef3..511d3cf0a905 100644 --- a/data/json/obsoletion/recipes.json +++ b/data/json/obsoletion/recipes.json @@ -688,6 +688,11 @@ "result": "bio_nanobotsuncraft", "obsolete": true }, + { + "type": "recipe", + "result": "bio_power_armor_interface_mkII", + "obsolete": true + }, { "type": "recipe", "result": "bio_recycleruncraft", diff --git a/data/json/recipes/electronic/cbms.json b/data/json/recipes/electronic/cbms.json index b7ef4861b190..3ac7ba1dd9c6 100644 --- a/data/json/recipes/electronic/cbms.json +++ b/data/json/recipes/electronic/cbms.json @@ -430,33 +430,6 @@ ], "flags": [ "SECRET" ] }, - { - "type": "recipe", - "result": "bio_nanobots", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_CBMS", - "skill_used": "electronics", - "skills_required": [ [ "firstaid", 7 ] ], - "difficulty": 10, - "time": "6 h", - "book_learn": [ [ "recipe_lab_elec", 9 ], [ "recipe_mil_augs", 9 ] ], - "//": "nanomaterial needed due to medical interface, extra for repair nanites", - "using": [ [ "soldering_standard", 20 ] ], - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], - "components": [ - [ [ "nanomaterial", 25 ] ], - [ [ "self_monitoring_module", 1 ] ], - [ [ "processor", 2 ] ], - [ [ "cable", 4 ] ], - [ [ "plastic_chunk", 1 ] ], - [ [ "plut_cell", 3 ] ], - [ [ "burnt_out_bionic", 1 ] ], - [ [ "water", 8 ], [ "water_clean", 8 ] ], - [ [ "pouch_autoclave", 1 ] ] - ], - "flags": [ "SECRET" ] - }, { "type": "recipe", "result": "bio_power_armor_interface", @@ -485,35 +458,6 @@ ], "flags": [ "SECRET" ] }, - { - "type": "recipe", - "result": "bio_power_armor_interface_mkII", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_CBMS", - "skill_used": "electronics", - "skills_required": [ [ "firstaid", 5 ], [ "mechanics", 5 ], [ "computer", 3 ] ], - "difficulty": 10, - "time": "6 h", - "book_learn": [ [ "recipe_lab_elec", 9 ], [ "recipe_mil_augs", 9 ] ], - "//": "Additional metalworking for assembling component housing and connectors, computer due to neural interface, nanomaterial due to advanced circuitry", - "using": [ [ "soldering_standard", 100 ], [ "welding_standard", 50 ], [ "coding_standard", 500 ] ], - "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], - "tools": [ [ [ "autoclave", 5000 ], [ "fake_autoclave", -1 ] ] ], - "components": [ - [ [ "nanomaterial", 10 ] ], - [ [ "memory_module", 1 ] ], - [ [ "amplifier", 6 ] ], - [ [ "scrap", 4 ] ], - [ [ "cable", 16 ] ], - [ [ "circuit", 3 ] ], - [ [ "plut_cell", 5 ] ], - [ [ "alloy_sheet", 1 ] ], - [ [ "burnt_out_bionic", 1 ] ], - [ [ "water", 8 ], [ "water_clean", 8 ] ], - [ [ "pouch_autoclave", 1 ] ] - ], - "flags": [ "SECRET" ] - }, { "type": "recipe", "result": "bio_power_storage",