Add map_bash_info to fields

data/json/field_type.json

@@ -79,6 +79,14 @@
     "priority": 2,
     "phase": "solid",
     "display_items": false,
+    "bash": {
+      "str_min": 1,
+      "str_max": 3,
+      "sound_vol": 2,
+      "sound_fail_vol": 2,
+      "sound": "hsh!",
+      "msg_succes": "You brush aside some webs."
+    },
     "display_field": true
   },
   {

data/mods/My_Sweet_Cataclysm/sweet_field_type.json

@@ -58,6 +58,15 @@
     "priority": 2,
     "phase": "solid",
     "half_life": "2 h",
+    "bash": {
+      "str_min": 1,
+      "str_max": 3,
+      "sound_vol": 2,
+      "sound_fail_vol": 2,
+      "sound": "shwip",
+      "sound_fail": "shwomp",
+      "msg_succes": "You brush the gum web aside."
+    },
     "display_items": false,
     "display_field": true
   },

doc/JSON_INFO.md

@@ -2971,4 +2971,21 @@ Setting of sprite sheets. Same as `tiles-new` field in `tile_config`. Sprite fil
     "type": "field_type", // this is a field type
     "id": "fd_gum_web", // id of the field
     "immune_mtypes": [ "mon_spider_gum" ], // list of monster immune to this field
+    "bash": {
+      "str_min": 1, // lower bracket of bashing damage required to bash
+      "str_max": 3, // higher bracket
+      "sound_vol": 2, // noise made when succesfully bashing the field
+      "sound_fail_vol": 2, // noise made when failing to bash the field
+      "sound": "shwip", // sound on success
+      "sound_fail": "shwomp", // sound on failure
+      "msg_succes": "You brush the gum web aside.", // message on success
+      "move_cost": 120, // how many moves it costs to succesfully bash that field (default: 100)
+      "items": [                                   // item dropped upon succesfull bashing
+        { "item": "2x4", "count": [ 5, 8 ] },
+        { "item": "nail", "charges": [ 6, 8 ] },
+        { "item": "splinter", "count": [ 3, 6 ] },
+        { "item": "rag", "count": [ 40, 55 ] },
+        { "item": "scrap", "count": [ 10, 20 ] }
+      ]
+    }
   }

src/field_type.cpp

@@ -243,6 +243,8 @@ void field_type::load( const JsonObject &jo, const std::string & )
     optional( jo, was_loaded, "display_items", display_items, true );
     optional( jo, was_loaded, "display_field", display_field, false );
     optional( jo, was_loaded, "wandering_field", wandering_field_id, "fd_null" );
+
+    bash_info.load( jo, "bash", map_bash_info::field );
 }
 
 void field_type::finalize()

src/field_type.h

@@ -15,6 +15,7 @@
 #include "color.h"
 #include "effect.h"
 #include "enums.h"
+#include "mapdata.h"
 #include "type_id.h"
 #include "string_id.h"
 #include "translations.h"
@@ -143,6 +144,7 @@ struct field_type {
         bool has_elec = false;
         bool has_fume = false;
         description_affix desc_affix;
+        map_bash_info bash_info;
 
         // chance, issue, duration, speech
         std::tuple<int, std::string, time_duration, std::string> npc_complain_data;

src/handle_action.cpp

@@ -674,12 +674,28 @@ static void smash()
             crit->use_mech_power( -3 );
         }
     }
-    if( m.get_field( smashp, fd_web ) != nullptr ) {
-        m.remove_field( smashp, fd_web );
-        sounds::sound( smashp, 2, sounds::sound_t::combat, _( "hsh!" ), true, "smash", "web" );
-        add_msg( m_info, _( "You brush aside some webs." ) );
-        u.moves -= 100;
-        return;
+    for( std::pair<const field_type_id, field_entry> &fd_to_smsh : m.field_at( smashp ) ) {
+        const map_bash_info &bash_info = fd_to_smsh.first->bash_info;
+        if( bash_info.str_min == -1 ) {
+            continue;
+        }
+        if( smashskill < bash_info.str_min && one_in( 10 ) ) {
+            add_msg( m_neutral, _( "You don't seem to be damaging the %s." ), fd_to_smsh.first->get_name() );
+            return;
+        } else if( smashskill >= rng( bash_info.str_min, bash_info.str_max ) ) {
+            sounds::sound( smashp, bash_info.sound_vol, sounds::sound_t::combat, bash_info.sound, true, "smash",
+                           "field" );
+            m.remove_field( smashp, fd_to_smsh.first );
+            g->m.spawn_items( smashp, item_group::items_from( bash_info.drop_group, calendar::turn ) );
+            u.mod_moves( - bash_info.fd_bash_move_cost );
+            add_msg( m_info, _( bash_info.field_bash_msg_succes ) );
+            return;
+        } else {
+            sounds::sound( smashp, bash_info.sound_fail_vol, sounds::sound_t::combat, bash_info.sound_fail,
+                           true, "smash",
+                           "field" );
+            return;
+        }
     }
 
     for( const auto &maybe_corpse : m.i_at( smashp ) ) {

src/mapdata.cpp

@@ -198,7 +198,8 @@ map_bash_info::map_bash_info() : str_min( -1 ), str_max( -1 ),
     drop_group( "EMPTY_GROUP" ),
     ter_set( ter_str_id::NULL_ID() ), furn_set( furn_str_id::NULL_ID() ) {}
 
-bool map_bash_info::load( const JsonObject &jsobj, const std::string &member, bool is_furniture )
+bool map_bash_info::load( const JsonObject &jsobj, const std::string &member,
+                          map_object_type obj_type )
 {
     if( !jsobj.has_object( member ) ) {
         return false;
@@ -230,13 +231,19 @@ bool map_bash_info::load( const JsonObject &jsobj, const std::string &member, bo
     j.read( "sound", sound );
     j.read( "sound_fail", sound_fail );
 
-    if( is_furniture ) {
-        furn_set = furn_str_id( j.get_string( "furn_set", "f_null" ) );
-    } else {
-        const std::string ter_set_string = j.get_string( "ter_set" );
-        ter_set = ter_str_id( ter_set_string );
-        ter_set_bashed_from_above = ter_str_id( j.get_string( "ter_set_bashed_from_above",
-                                                ter_set_string ) );
+    switch( obj_type ) {
+        case map_bash_info::furniture:
+            furn_set = furn_str_id( j.get_string( "furn_set", "f_null" ) );
+            break;
+        case map_bash_info::terrain:
+            ter_set = ter_str_id( j.get_string( "ter_set" ) );
+            ter_set_bashed_from_above = ter_str_id( j.get_string( "ter_set_bashed_from_above",
+                                                    ter_set.c_str() ) );
+            break;
+        case map_bash_info::field:
+            assign( j, "move_cost", fd_bash_move_cost, 100 );
+            j.read( "msg_succes", field_bash_msg_succes );
+            break;
     }
 
     if( j.has_member( "items" ) ) {
@@ -1166,7 +1173,7 @@ void ter_t::load( const JsonObject &jo, const std::string &src )
     optional( jo, was_loaded, "transforms_into", transforms_into, ter_str_id::NULL_ID() );
     optional( jo, was_loaded, "roof", roof, ter_str_id::NULL_ID() );
 
-    bash.load( jo, "bash", false );
+    bash.load( jo, "bash", map_bash_info::terrain );
     deconstruct.load( jo, "deconstruct", false );
 }
 
@@ -1269,7 +1276,7 @@ void furn_t::load( const JsonObject &jo, const std::string &src )
     optional( jo, was_loaded, "open", open, string_id_reader<furn_t> {}, furn_str_id::NULL_ID() );
     optional( jo, was_loaded, "close", close, string_id_reader<furn_t> {}, furn_str_id::NULL_ID() );
 
-    bash.load( jo, "bash", true );
+    bash.load( jo, "bash", map_bash_info::furniture );
     deconstruct.load( jo, "deconstruct", true );
 
     if( jo.has_object( "workbench" ) ) {

src/mapdata.h

@@ -39,18 +39,25 @@ struct map_bash_info {
     int sound_vol;          // sound volume of breaking terrain/furniture
     int sound_fail_vol;     // sound volume on fail
     int collapse_radius;    // Radius of the tent supported by this tile
+    int fd_bash_move_cost = 100; // cost to bash a field
     bool destroy_only;      // Only used for destroying, not normally bashable
     bool bash_below;        // This terrain is the roof of the tile below it, try to destroy that too
     std::string drop_group; // item group of items that are dropped when the object is bashed
     translation sound;      // sound made on success ('You hear a "smash!"')
     translation sound_fail; // sound  made on fail
+    std::string field_bash_msg_succes; // message upon successfully bashing a field
     ter_str_id ter_set;    // terrain to set (REQUIRED for terrain))
     ter_str_id ter_set_bashed_from_above; // terrain to set if bashed from above (defaults to ter_set)
     furn_str_id furn_set;   // furniture to set (only used by furniture, not terrain)
     // ids used for the special handling of tents
     std::vector<furn_str_id> tent_centers;
     map_bash_info();
-    bool load( const JsonObject &jsobj, const std::string &member, bool is_furniture );
+    enum map_object_type {
+        furniture = 0,
+        terrain,
+        field
+    };
+    bool load( const JsonObject &jsobj, const std::string &member, map_object_type obj_type );
 };
 struct map_deconstruct_info {
     // Only if true, the terrain/furniture can be deconstructed