Skip to content

Commit

Permalink
Merge pull request #57124 from TheShadowFerret/ToolsToQualities
Browse files Browse the repository at this point in the history 
Move explicit pliers/multitool requirements to WRENCH 1 requirement
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Apr 26, 2022
2 parents d11f77a + 55a402c commit 3e81ac1
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
3 changes: 1 addition & 2 deletions data/json/recipes/armor/hands.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
},
{
Expand Down
22 changes: 14 additions & 8 deletions data/json/recipes/recipe_others.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand All @@ -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 ] ] ]
},
{
Expand Down
18 changes: 12 additions & 6 deletions data/json/requirements/tailoring.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
},
{
Expand Down
8 changes: 2 additions & 6 deletions data/json/requirements/toolsets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

1 comment on commit 3e81ac1

@Karlington2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I missing something, or did this delete the recipe for the "basic" chain links?

Please sign in to comment.