diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index e344b7fe1875c..f4289bc823984 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -1069,8 +1069,7 @@ "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "WRENCH", "level": 1 } ], "components": [ [ [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "gloves_leather", 1 ] ], [ [ "scrap", 4 ] ] ] }, { diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index dcd49e56c5c62..26adff6554f71 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2085,7 +2085,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "wire", 1 ] ] ] }, { @@ -2098,8 +2099,8 @@ "skill_used": "fabrication", "difficulty": 2, "time": "5 m", - "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "wire", 1 ] ] ] }, { @@ -2113,7 +2114,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "lc_wire", 1 ] ] ] }, { @@ -2127,7 +2129,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "mc_wire", 1 ] ] ] }, { @@ -2141,7 +2144,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "hc_wire", 1 ] ] ] }, { @@ -2155,7 +2159,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "ch_wire", 1 ] ] ] }, { @@ -2169,7 +2174,8 @@ "difficulty": 2, "time": "5 m", "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "qt_wire", 1 ] ] ] }, { diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json index ecc41b38d1577..2469e76ec8baa 100644 --- a/data/json/requirements/tailoring.json +++ b/data/json/requirements/tailoring.json @@ -10,42 +10,48 @@ "id": "armor_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "link_sheet", 1 ] ], [ [ "chain_link", 25 ] ] ] }, { "id": "armor_lc_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "lc_link_sheet", 1 ] ], [ [ "lc_chain_link", 25 ] ] ] }, { "id": "armor_mc_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "mc_link_sheet", 1 ] ], [ [ "mc_chain_link", 25 ] ] ] }, { "id": "armor_hc_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "hc_link_sheet", 1 ] ], [ [ "hc_chain_link", 25 ] ] ] }, { "id": "armor_ch_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "ch_link_sheet", 1 ] ], [ [ "ch_chain_link", 25 ] ] ] }, { "id": "armor_qt_chainmail_assembling", "type": "requirement", "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], "components": [ [ [ "qt_link_sheet", 1 ] ], [ [ "qt_chain_link", 25 ] ] ] }, { diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json index 8dda5c5e34c6f..5bfd8d9127e38 100644 --- a/data/json/requirements/toolsets.json +++ b/data/json/requirements/toolsets.json @@ -116,12 +116,8 @@ "id": "chainmail_standard", "type": "requirement", "//": "Construction of chainmail items", - "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "ANVIL", "level": 3 } ], - "tools": [ - [ [ "pliers", -1 ], [ "multitool", -1 ] ], - [ [ "boltcutters", -1 ] ], - [ [ "cordless_drill", 10 ], [ "drill_press_tool", 5 ] ] - ] + "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "ANVIL", "level": 3 }, { "id": "WRENCH", "level": 1 } ], + "tools": [ [ [ "boltcutters", -1 ] ], [ [ "cordless_drill", 10 ], [ "drill_press_tool", 5 ] ] ] }, { "id": "soldering_standard",