Mech updates part 3: grabbing furniture and wielding items (cataclysmbn#2833)

* Mech Update part 3

* Almost forgot the stylin'

* Update grab.cpp

Author: chaosvolt

data/json/monsters/mechsuits.json

@@ -102,7 +102,7 @@
     "id": "mon_mech_lifter",
     "type": "MONSTER",
     "name": { "str": "X-01: 'Jack' Lifting Mech" },
-    "description": "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent acquisition by the US military, it was designed to be piloted by an operator to load and unload heavy material, and for limited combat support roles, it was not deployed before the Cataclysm hit, though there were a few prototypes in the field.  You may be able to hack it to accept you as its pilot.  Like all mech-suits it can act as a UPS from its large battery.",
+    "description": "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent acquisition by the US military, it was designed to be piloted by an operator to load and unload heavy material, and for limited combat support roles, it was not deployed before the Cataclysm hit, though there were a few prototypes in the field.  It lacks any integral weaponry, but the user can fire from the open cockpit, even using the frame to support heavier firearms.  You may be able to hack it to accept you as its pilot.  Like all mech-suits it can act as a UPS from its large battery.",
     "default_faction": "mech_bot",
     "species": [ "ROBOT" ],
     "diff": 5,

src/character.cpp

@@ -3116,10 +3116,6 @@ ret_val<bool> Character::can_wield( const item &it ) const
                                                 it.tname() );
         }
     }
-    if( is_mounted() && mount->has_flag( MF_RIDEABLE_MECH ) &&
-        mount->type->mech_weapon && it.typeId() != mount->type->mech_weapon ) {
-        return ret_val<bool>::make_failure( _( "You cannot wield anything while piloting a mech." ) );
-    }
 
     return ret_val<bool>::make_success();
 }

src/game.cpp

@@ -9584,14 +9584,21 @@ bool game::grabbed_furn_move( const tripoint &dp )
         furniture_contents_weight += contained_item.weight();
     }
     str_req += furniture_contents_weight / 4_kilogram;
+    int adjusted_str = u.get_str();
+    if( u.is_mounted() ) {
+        auto mons = u.mounted_creature.get();
+        if( mons->has_flag( MF_RIDEABLE_MECH ) && mons->mech_str_addition() != 0 ) {
+            adjusted_str = mons->mech_str_addition();
+        }
+    }
     if( !canmove ) {
         // TODO: What is something?
         add_msg( _( "The %s collides with something." ), furntype.name() );
         u.moves -= 50;
         return true;
         ///\EFFECT_STR determines ability to drag furniture
-    } else if( str_req > u.get_str() &&
-               one_in( std::max( 20 - str_req - u.get_str(), 2 ) ) ) {
+    } else if( str_req > adjusted_str &&
+               one_in( std::max( 20 - str_req - adjusted_str, 2 ) ) ) {
         add_msg( m_bad, _( "You strain yourself trying to move the heavy %s!" ),
                  furntype.name() );
         u.moves -= 100;
@@ -9605,10 +9612,10 @@ bool game::grabbed_furn_move( const tripoint &dp )
 
     u.moves -= str_req * 10;
     // Additional penalty if we can't comfortably move it.
-    if( str_req > u.get_str() ) {
+    if( str_req > adjusted_str ) {
         int move_penalty = std::pow( str_req, 2.0 ) + 100.0;
         if( move_penalty <= 1000 ) {
-            if( u.get_str() >= str_req - 3 ) {
+            if( adjusted_str >= str_req - 3 ) {
                 u.moves -= std::max( 3000, move_penalty * 10 );
                 add_msg( m_bad, _( "The %s is really heavy!" ), furntype.name() );
                 if( one_in( 3 ) ) {

src/grab.cpp

@@ -10,6 +10,7 @@
 #include "map.h"
 #include "messages.h"
 #include "monster.h"
+#include "mtype.h"
 #include "point.h"
 #include "sounds.h"
 #include "vehicle.h"
@@ -154,7 +155,13 @@ bool game::grabbed_veh_move( const tripoint &dp )
     // for smaller vehicles, offroad_str_req_cap sanity-checks our results.
     int str_req = std::min( get_vehicle_str_requirement( grabbed_vehicle ),
                             offroad_str_req_cap( grabbed_vehicle ) );
-    const int str = u.get_str();
+    int str = u.get_str();
+    if( u.is_mounted() ) {
+        auto mons = u.mounted_creature.get();
+        if( mons->has_flag( MF_RIDEABLE_MECH ) && mons->mech_str_addition() != 0 ) {
+            str = mons->mech_str_addition();
+        }
+    }
     add_msg( m_debug, "str_req: %d", str_req );
 
     //final strength check and outcomes

src/handle_action.cpp

@@ -1940,7 +1940,16 @@ bool game::handle_action()
                 if( u.has_active_mutation( trait_SHELL2 ) ) {
                     add_msg( m_info, _( "You can't grab things while you're in your shell." ) );
                 } else if( u.is_mounted() ) {
-                    add_msg( m_info, _( "You can't grab things while you're riding." ) );
+                    auto mon = u.mounted_creature.get();
+                    if( !mon->has_flag( MF_RIDEABLE_MECH ) ) {
+                        add_msg( m_info, _( "You can't grab things while you're riding." ) );
+                        break;
+                    } else if( !mon->type->mech_weapon.is_empty() ) {
+                        add_msg( m_info, _( "Your mech doesn't have hands to grab with." ) );
+                        break;
+                    } else {
+                        grab();
+                    }
                 } else {
                     grab();
                 }

src/monexamine.cpp

@@ -225,10 +225,10 @@ bool monexamine::pet_menu( monster &z )
         }
         amenu.addentry( check_bat, false, 'c', _( "%s battery level is %d%%" ), z.get_name(),
                         static_cast<int>( charge_percent ) );
-        if( you.primary_weapon().is_null() && z.battery_item ) {
+        if( ( you.primary_weapon().is_null() || z.type->mech_weapon.is_empty() ) && z.battery_item ) {
             amenu.addentry( mount, true, 'r', _( "Climb into the mech and take control" ) );
-        } else if( !you.primary_weapon().is_null() ) {
-            amenu.addentry( mount, false, 'r', _( "You cannot pilot the mech whilst wielding something" ) );
+        } else if( !you.primary_weapon().is_null() && !z.type->mech_weapon.is_empty() ) {
+            amenu.addentry( mount, false, 'r', _( "You cannot pilot this mech whilst wielding something" ) );
         } else if( !z.battery_item ) {
             amenu.addentry( mount, false, 'r', _( "This mech has a dead battery and won't turn on" ) );
         }

src/ranged.cpp

@@ -3782,10 +3782,16 @@ bool ranged::gunmode_checks_weapon( avatar &you, const map &m, std::vector<std::
     }
 
     if( gmode->has_flag( flag_MOUNTED_GUN ) ) {
+
+        bool mech_mount = false;
+        if( you.is_mounted() && you.mounted_creature->has_flag( MF_RIDEABLE_MECH ) ) {
+            mech_mount = true;
+        }
+
         const bool v_mountable = static_cast<bool>( m.veh_at( you.pos() ).part_with_feature( "MOUNTABLE",
                                  true ) );
         bool t_mountable = m.has_flag_ter_or_furn( flag_MOUNTABLE, you.pos() );
-        if( !t_mountable && !v_mountable && !( you.get_size() > MS_MEDIUM ) ) {
+        if( !mech_mount && !t_mountable && !v_mountable && !( you.get_size() > MS_MEDIUM ) ) {
             messages.push_back( string_format(
                                     _( "You must stand near acceptable terrain or furniture to fire the %s.  A table, a mound of dirt, a broken window, etc." ),
                                     gmode->tname() ) );