Allow setting duration for all types of prying, not only for prying nails

doc/JSON_INFO.md

@@ -5196,11 +5196,11 @@ oxytorch: {
 ```
 
 #### `prying`
-(Optional) Data for using with pyring tools
+(Optional) Data for using with prying tools
 ```cpp
 "prying": {
  "result": "furniture_id", // (optional) furniture it will become when done, defaults to f_null
- "duration": "1 seconds", // (optional) time required for prying nails, default is 1 second
+ "duration": "1 seconds", // (optional) time required for prying, default is 1 second
  "message": "You finish prying the door.", // (optional) message that will be displayed when finished prying successfully
  "byproducts": [ // (optional) list of items that will be spawned when finished successfully
   {

src/activity_actor.cpp

@@ -5838,7 +5838,7 @@ time_duration prying_activity_actor::prying_time( const activity_data_common &da
  const item_location &tool, const Character &who )
 {
  const pry_data &pdata = data.prying_data();
- if( pdata.prying_nails ) {
+ if( data.duration() > 1_seconds ) {
  return data.duration();
  }
 

tests/player_activities_test.cpp

@@ -1405,8 +1405,8 @@ TEST_CASE( "prying", "[activity][prying]" )
  const time_duration prying_time = prying_activity_actor::prying_time(
  *ter_test_t_prying3->prying, prying_tool, dummy );
 
- THEN( "prying time is 32 seconds" ) {
- CHECK( prying_time == 32_seconds );
+ THEN( "prying time is 30 seconds" ) {
+ CHECK( prying_time == 30_seconds );
  }
  }
  }