Merge pull request #39928 from Night-Pryanik/improvised-lockpicks-rec…

…ipe-tweak Improvised lockpicks recipe tweak
CleverRaven · May 3, 2020 · 2a631eb · 2a631eb
2 parents b7091a5 + ea5f002
commit 2a631eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json
@@ -78,7 +78,7 @@
     "id": "picklocks",
     "type": "TOOL",
     "name": { "str": "locksmith kit" },
-    "description": "This is a locksmith's set of sturdy steel lock picks and torsion wrenches.  It is essential for silently and quickly opening locks, provided you have some mechanical skill.",
+    "description": "This is a locksmith's set of sturdy steel lock picks and torsion wrenches.  It is essential for silently and quickly opening locks, provided you have some lock picking and mechanical skills.",
     "weight": "544 g",
     "volume": "100 ml",
     "price": 20000,

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -466,7 +466,7 @@
     "material": [ "steel", "wood" ],
     "symbol": ";",
     "color": "brown",
-    "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ] ],
+    "qualities": [ [ "HAMMER", 2 ] ],
     "use_action": "HAMMER",
     "flags": [ "NONCONDUCTIVE", "BELT_CLIP" ]
   },
@@ -700,7 +700,7 @@
     "material": [ "stone", "wood" ],
     "symbol": ";",
     "color": "brown",
-    "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ] ],
+    "qualities": [ [ "HAMMER", 2 ] ],
     "use_action": "HAMMER",
     "flags": [ "BELT_CLIP" ]
   },

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1455,11 +1455,23 @@
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_TOOLS",
     "skill_used": "fabrication",
-    "time": "1 m",
+    "time": "10 m",
     "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], { "id": "SAW_M", "level": 2 } ],
     "components": [ [ [ "scrap", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "crude_picklock",
+    "id_suffix": "from wire",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ] ],
+    "components": [ [ [ "wire", 2 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "tripwire",