From 48cf3b53148a6da584050afa9f153d73aba5bbeb Mon Sep 17 00:00:00 2001 From: RoyalFox <112293514+RoyalFox2140@users.noreply.github.com> Date: Sat, 28 Oct 2023 00:02:52 -0400 Subject: [PATCH] feat(balance): craftable voltmeter (#3513) * craft voltmeter turned an uncraft into a craft with reversible * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- data/json/recipes/electronic/tools.json | 15 +++++++++++++++ data/json/uncraft/generic.json | 8 -------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/data/json/recipes/electronic/tools.json b/data/json/recipes/electronic/tools.json index 77dd1d448800..ec57bc2aa3ed 100644 --- a/data/json/recipes/electronic/tools.json +++ b/data/json/recipes/electronic/tools.json @@ -809,5 +809,20 @@ "book_learn": [ [ "mag_electronics", 3 ], [ "manual_electronics", 2 ] ], "using": [ [ "soldering_standard", 5 ] ], "components": [ [ [ "wire", 3 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "e_scrap", 1 ] ] ] + }, + { + "type": "recipe", + "result": "voltmeter", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_TOOLS", + "skill_used": "electronics", + "difficulty": 2, + "time": "1 h", + "reversible": true, + "decomp_learn": 0, + "autolearn": [ [ "electronics", 3 ] ], + "book_learn": [ [ "manual_electronics", 1 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "cable", 6 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "e_scrap", 3 ] ] ] } ] diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 32189991d951..10f25e88bac2 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -3509,14 +3509,6 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "voltmeter", 1 ] ], [ [ "glass_tube_small", 2 ] ] ] }, - { - "result": "voltmeter", - "type": "uncraft", - "skill_used": "electronics", - "time": "1 h", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "cable", 6 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "e_scrap", 3 ] ] ] - }, { "result": "microscope", "type": "uncraft",