Lock picking overhaul

data/json/items/book/lockpick.json

@@ -0,0 +1,19 @@
+[
+  {
+    "id": "book_lockpick",
+    "type": "BOOK",
+    "name": { "str": "MIT Guide to Lockpicking", "str_pl": "copies of MIT Guide to Lockpicking" },
+    "description": "A home-made booklet with large black-and-white pictures of several types of modern locks and general information on how to crack them open.",
+    "weight": "400 g",
+    "volume": "500 ml",
+    "price": 100,
+    "price_postapoc": 5000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "green",
+    "skill": "lockpick",
+    "max_level": 2,
+    "intelligence": 8,
+    "time": "20 m"
+  }
+]

data/json/professions.json

@@ -384,6 +384,7 @@
       { "level": 2, "name": "gun" },
       { "level": 2, "name": "rifle" },
       { "level": 2, "name": "melee" },
+      { "level": 2, "name": "lockpick" },
       { "level": 2, "name": "cutting" },
       { "level": 1, "name": "bashing" }
     ],
@@ -607,7 +608,8 @@
       { "level": 1, "name": "stabbing" },
       { "level": 1, "name": "unarmed" },
       { "level": 1, "name": "dodge" },
-      { "level": 1, "name": "barter" }
+      { "level": 1, "name": "barter" },
+      { "level": 1, "name": "lockpick" }
     ],
     "items": {
       "both": {
@@ -783,6 +785,7 @@
       { "level": 2, "name": "cutting" },
       { "level": 2, "name": "melee" },
       { "level": 2, "name": "dodge" },
+      { "level": 2, "name": "lockpick" },
       { "level": 1, "name": "firstaid" },
       { "level": 1, "name": "swimming" },
       { "level": 1, "name": "survival" }
@@ -1005,7 +1008,8 @@
       { "level": 2, "name": "fabrication" },
       { "level": 2, "name": "cooking" },
       { "level": 2, "name": "firstaid" },
-      { "level": 2, "name": "swimming" }
+      { "level": 2, "name": "swimming" },
+      { "level": 1, "name": "lockpick" }
     ],
     "items": {
       "both": {
@@ -1483,7 +1487,7 @@
     "name": { "male": "Handy Man", "female": "Handy Woman" },
     "description": "You used to work at a local hardware store, and you did a lot of home renovations yourself.  Now you look out at the horizon of a ruined world, and wonder - are your meager skills, and the few supplies you grabbed on the way out, sufficient to help it rebuild?",
     "points": 1,
-    "skills": [ { "level": 2, "name": "fabrication" } ],
+    "skills": [ { "level": 2, "name": "fabrication" }, { "level": 1, "name": "lockpick" } ],
     "items": {
       "both": {
         "items": [ "tank_top", "socks", "boots_steel", "pants", "multitool", "wristwatch" ],
@@ -1661,7 +1665,7 @@
     "description": "You have done many high profile heists, but your gains mean nothing in this world.  All you have left are the tools of your trade and your impeccable style.",
     "points": 4,
     "CBMs": [ "bio_batteries", "bio_lockpick", "bio_fingerhack", "bio_power_storage_mkII" ],
-    "skills": [ { "level": 1, "name": "gun" }, { "level": 1, "name": "smg" } ],
+    "skills": [ { "level": 1, "name": "gun" }, { "level": 1, "name": "smg" }, { "level": 3, "name": "lockpick" } ],
     "items": {
       "both": {
         "items": [ "waistcoat", "pants", "dress_shirt", "socks", "dress_shoes", "knit_scarf", "gold_watch", "smart_phone" ],
@@ -2417,7 +2421,7 @@
     "name": "Convict",
     "description": "The Cataclysm gave you a chance to escape, but freedom comes with a steep price.",
     "points": 0,
-    "skills": [ { "level": 1, "name": "melee" } ],
+    "skills": [ { "level": 1, "name": "melee" }, { "level": 1, "name": "lockpick" } ],
     "items": {
       "both": [ "striped_shirt", "striped_pants", "sneakers", "socks", "glass_shiv" ],
       "male": [ "briefs" ],
@@ -2508,6 +2512,7 @@
     "name": "Burglar",
     "description": "You thought this would be your lucky break.  Does it count as breaking and entering if everyone in town is undead?",
     "points": 3,
+    "skills": [ { "level": 4, "name": "lockpick" } ],
     "//": "A ski mask would fit the stereotype better, but wool allergy breaks this.",
     "items": {
       "both": [
@@ -3390,7 +3395,12 @@
     "name": "Survivalist Jr.",
     "description": "Your parents were crazy preppers who thought some \"Cataclysm\" was coming, and insisted on preparing you for it.  Turns out they were right.  You didn't get a chance to thank them.  The only thing you can do for them now is what they always hoped you would do in the dark days ahead: survive.",
     "points": 3,
-    "skills": [ { "level": 1, "name": "survival" }, { "level": 1, "name": "fabrication" }, { "level": 1, "name": "firstaid" } ],
+    "skills": [
+      { "level": 1, "name": "survival" },
+      { "level": 1, "name": "fabrication" },
+      { "level": 1, "name": "firstaid" },
+      { "level": 1, "name": "lockpick" }
+    ],
     "items": {
       "both": {
         "items": [

data/json/skills.json

@@ -276,6 +276,14 @@
     "display_category": "display_melee",
     "companion_skill_practice": [ { "skill": "hunting", "weight": 10 }, { "skill": "combat", "weight": 10 } ]
   },
+  {
+    "type": "skill",
+    "ident": "lockpick",
+    "name": { "str": "lock picking" },
+    "description": "Your skill in picking all sorts of locks which require physical keys - from simple pin tumbler locks to intricate disc tumbler locks.  Skill increases chance and decreases time required to successfully pick the lock.",
+    "companion_survival_rank_factor": 1,
+    "display_category": "display_interaction"
+  },
   {
     "type": "skill",
     "ident": "weapon",

src/iexamine.cpp

@@ -110,6 +110,7 @@ static const skill_id skill_cooking( "cooking" );
 static const skill_id skill_electronics( "electronics" );
 static const skill_id skill_fabrication( "fabrication" );
 static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_lockpick( "lockpick" );
 static const skill_id skill_mechanics( "mechanics" );
 static const skill_id skill_survival( "survival" );
 
@@ -1310,20 +1311,21 @@ void iexamine::gunsafe_ml( player &p, const tripoint &examp )
         return;
     }
 
-    p.practice( skill_mechanics, 1 );
+    p.practice( skill_lockpick, 1 );
 
     ///\EFFECT_DEX speeds up lock picking gun safe
     ///\EFFECT_MECHANICS speeds up lock picking gun safe
     p.moves -= std::max( 0, to_turns<int>( 10_minutes - time_duration::from_minutes( pick_quality ) )
-                         - ( p.dex_cur + p.get_skill_level( skill_mechanics ) ) * 5 );
+                         - ( p.dex_cur + p.get_skill_level( skill_lockpick ) ) * 5 );
 
     ///\EFFECT_DEX increases chance of lock picking gun safe
     ///\EFFECT_MECHANICS increases chance of lock picking gun safe
-    int pick_roll = ( dice( 2, p.get_skill_level( skill_mechanics ) ) + dice( 2,
-                      p.dex_cur ) ) * pick_quality;
+    int pick_roll = std::pow( 1.5, p.get_skill_level( skill_lockpick ) ) *
+                    ( std::pow( 1.3, p.get_skill_level( skill_mechanics ) ) + pick_quality ) +
+                    p.dex_cur / 4;
     int door_roll = dice( 4, 30 );
     if( pick_roll >= door_roll ) {
-        p.practice( skill_mechanics, 1 );
+        p.practice( skill_lockpick, 1 );
         add_msg( _( "You successfully unlock the gun safe." ) );
         g->m.furn_set( examp, furn_str_id( "f_safe_o" ) );
     } else if( door_roll > ( 3 * pick_roll ) ) {

src/iuse_actor.cpp

@@ -103,6 +103,7 @@ static const bionic_id bio_syringe( "bio_syringe" );
 
 static const skill_id skill_fabrication( "fabrication" );
 static const skill_id skill_firstaid( "firstaid" );
+static const skill_id skill_lockpick( "lockpick" );
 static const skill_id skill_mechanics( "mechanics" );
 static const skill_id skill_survival( "survival" );
 
@@ -1105,22 +1106,24 @@ int pick_lock_actor::use( player &p, item &it, bool, const tripoint & ) const
     } else {
         return 0;
     }
-    p.practice( skill_mechanics, 1 );
+    p.practice( skill_lockpick, 1 );
 
     /** @EFFECT_DEX speeds up door lock picking */
     /** @EFFECT_MECHANICS speeds up door lock picking */
     p.moves -= std::max( 0, to_turns<int>( 10_minutes - time_duration::from_minutes( pick_quality ) )
-                         - ( p.dex_cur + p.get_skill_level( skill_mechanics ) ) * 5 );
+                         - ( p.dex_cur + p.get_skill_level( skill_lockpick ) ) * 5 );
 
     bool destroy = false;
 
     /** @EFFECT_DEX improves chances of successfully picking door lock, reduces chances of bad outcomes */
     /** @EFFECT_MECHANICS improves chances of successfully picking door lock, reduces chances of bad outcomes */
-    int pick_roll = ( dice( 2, p.get_skill_level( skill_mechanics ) ) + dice( 2,
-                      p.dex_cur ) - it.damage_level( 4 ) / 2 ) * pick_quality;
+    int pick_roll = std::pow( 1.5, p.get_skill_level( skill_lockpick ) ) *
+                    ( std::pow( 1.3, p.get_skill_level( skill_mechanics ) ) +
+                      pick_quality - it.damage() / 2000 ) +
+                    p.dex_cur / 4;
     int door_roll = dice( 4, 30 );
     if( pick_roll >= door_roll ) {
-        p.practice( skill_mechanics, 1 );
+        p.practice( skill_lockpick, 1 );
         p.add_msg_if_player( m_good, open_message );
         g->m.ter_set( pnt, new_type );
     } else if( door_roll > ( 1.5 * pick_roll ) ) {