Add thread cutting tool and make nuts & bolts craftable (CleverRaven#…

…69097) * thread cutting set item * thread cutting recipe * nut and bolt recipe * whitespace missing in data/json/recipes/other/parts.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * use tool qualities for thread cutting * formatting * formatting data/json/recipes/other/parts.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * thead cutting set provides THREAD_CUT/TAP qualities lvl 2 * add thread_cutting_set to mechanic spawn * add thead_cutting_set recipe to books * Update data/json/recipes/tools/tools_hand.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * add N&B recipe to fab and mech books * Update data/json/recipes/other/parts.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
bombasticSlacks · Nov 8, 2023 · 012c65b · 012c65b
1 parent cd50878
commit 012c65b
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 1 deletion.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -426,7 +426,8 @@
         ]
       },
       [ "clamp", 10 ],
-      [ "goggles_welding", 80 ]
+      [ "goggles_welding", 80 ],
+      [ "thread_cutting_set", 40 ]
     ]
   },
   {

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -1751,5 +1751,21 @@
     "material": [ "epoxy", "kevlar" ],
     "symbol": "#",
     "color": "light_gray"
+  },
+  {
+    "id": "thread_cutting_set",
+    "type": "TOOL",
+    "name": { "str": "thread cutting set" },
+    "description": "This is a set of a external thread cutting die inserted into a manual grip and an internal thread cutting die used as a drill bit.",
+    "weight": "1500 g",
+    "volume": "750 ml",
+    "longest_side": "40 cm",
+    "price": 2000,
+    "price_postapoc": 250,
+    "to_hit": -1,
+    "material": [ "steel" ],
+    "qualities": [ [ "THREAD_TAP", 2 ], [ "THREAD_CUT", 2 ] ],
+    "symbol": "p",
+    "color": "light_gray"
   }
 ]
diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
@@ -909,5 +909,29 @@
     "proficiencies": [ { "proficiency": "prof_knapping", "time_multiplier": 1.25, "skill_penalty": 0.1 } ],
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "rock_flaking", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "nuts_bolts",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_PARTS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "3 h",
+    "batch_time_factors": [ 25, 2 ],
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 2 ] ],
+    "book_learn": [ [ "textbook_fabrication", 3 ], [ "manual_mechanics", 3 ], [ "manual_fabrication", 3 ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
+    "qualities": [
+      { "id": "ANVIL", "level": 3 },
+      { "id": "HAMMER", "level": 3 },
+      { "id": "SAW_M", "level": 2 },
+      { "id": "DRILL", "level": 2 },
+      { "id": "THREAD_CUT", "level": 2 },
+      { "id": "THREAD_TAP", "level": 2 }
+    ],
+    "tools": [ [ [ "swage", -1 ] ], [ [ "hotcut", -1 ] ] ]
   }
 ]
diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json
@@ -1690,5 +1690,30 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "result": "thread_cutting_set",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "5 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 2 ] ],
+    "book_learn": [ [ "textbook_fabrication", 3 ], [ "manual_mechanics", 3 ], [ "manual_fabrication", 3 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing" }
+    ],
+    "qualities": [
+      { "id": "ANVIL", "level": 3 },
+      { "id": "HAMMER", "level": 3 },
+      { "id": "CHISEL", "level": 3 },
+      { "id": "DRILL", "level": 2 }
+    ],
+    "tools": [ [ [ "casting_mold", -1 ] ], [ [ "hotcut", -1 ] ] ]
   }
 ]
diff --git a/data/json/tool_qualities.json b/data/json/tool_qualities.json
@@ -440,5 +440,15 @@
     "type": "tool_quality",
     "id": "BLOW_HOT_AIR",
     "name": { "str": "hot air blowing" }
+  },
+  {
+    "type": "tool_quality",
+    "id": "THREAD_CUT",
+    "name": { "str": "thread cutting" }
+  },
+  {
+    "type": "tool_quality",
+    "id": "THREAD_TAP",
+    "name": { "str": "thread tapping" }
   }
 ]