Blacksmithing tongs and cooking tongs are two diffrent things. (#51672)

* Add blacksmithing tongs. The tongs in game wouldn't be able to carry around a four kilo zweihander. They are designed for cooking and flipping food, so they are very lightweight and thing, they would most likely bend under the heat of the hot metal. * Added the need to use blacksmithing (flatjaw) tongs for the Zweihander Not using tongs for smithing is almost impossible. * Change the blacksmithing toolset to include the tongs. I also removed the tongs from the tools on the zweihander. Co-authored-by: Anton Burmistrov <[email protected]> Co-authored-by: Kevin Granade <[email protected]>
CleverRaven · Sep 23, 2021 · 97bf7a9 · 97bf7a9
1 parent 536dfce
commit 97bf7a9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -10,7 +10,7 @@
       [ "swage", 60 ],
       [ "drift", 70 ],
       [ "hotcut", 90 ],
-      [ "tongs", 90 ],
+      [ "metalworking_tongs", 90 ],
       [ "hammer", 90 ],
       [ "sandpaper", 90 ]
     ]

diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -293,7 +293,7 @@
     "id": "tongs",
     "type": "TOOL",
     "name": { "str": "pair of metal tongs", "str_pl": "pairs of metal tongs" },
-    "description": "These are long, metal tongs.  They are commonly used for cooking or in metalworking fabrication recipes.",
+    "description": "These are long, metal tongs.  They are commonly used for cooking.",
     "weight": "540 g",
     "volume": "500 ml",
     "price": 1600,
@@ -306,6 +306,23 @@
     "use_action": [ "HEAT_FOOD" ],
     "flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE" ]
   },
+  {
+    "id": "metalworking_tongs",
+    "type": "TOOL",
+    "name": { "str": "pair of flatjaw tongs", "str_pl": "pairs of flatjaw tongs" },
+    "description": "These are a pair of flatjaw tongs.  They are commonly used for metalworking, fabrication or forging recipes.",
+    "weight": "750 g",
+    "volume": "500 ml",
+    "price": 1600,
+    "price_postapoc": 10,
+    "bashing": 6,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "qualities": [ [ "COOK", 1 ] ],
+    "use_action": [ "HEAT_FOOD" ],
+    "flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE" ]
+  },
   {
     "id": "sandpaper",
     "type": "TOOL",

diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json
@@ -52,6 +52,25 @@
     ],
     "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ], [ "pipe", 3 ], [ "pipe_fittings", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "metalworking_tongs",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "60 m",
+    "autolearn": true,
+    "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
+    "tools": [ [ [ "forge", 150 ], [ "oxy_torch", 30 ] ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing" }
+    ],
+    "components": [ [ [ "steel_lump", 1 ], [ "pipe", 2 ], [ "rebar", 2 ] ], [ [ "nail", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",

diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json
@@ -40,7 +40,7 @@
     "type": "requirement",
     "//": "Includes forging resources as well as tools needed for most blacksmithing",
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
-    "tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ], [ "fake_arc_furnace", 10 ] ], [ [ "tongs", -1 ] ] ]
+    "tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ], [ "fake_arc_furnace", 10 ] ], [ [ "metalworking_tongs", -1 ] ] ]
   },
   {
     "id": "mutagen_production_standard",