Merge pull request #84269 from robclouth/feature/improved-gamepad-input

Author: GuardianDll

data/raw/keybindings.json

@@ -372,6 +372,8 @@ std::string action_ident( action_id act )
             return "toggle_prevent_occlusion";
         case ACTION_ACTIONMENU:
             return "action_menu";
+        case ACTION_INTERACT:
+            return "interact";
         case ACTION_ITEMACTION:
             return "item_action_menu";
         case ACTION_SELECT:
@@ -731,11 +733,60 @@ bool can_interact_at( action_id action, map &here, const tripoint_bub_ms &p )
             return can_examine_at( here, p, true );
         case ACTION_PICKUP:
             return can_pickup_at( here, p );
+        case ACTION_SMASH:
+            return here.is_bashable( p );
+        case ACTION_CHAT: {
+            Creature *c = get_creature_tracker().creature_at( p );
+            return c != nullptr && !c->is_avatar() && get_avatar().sees( here, p );
+        }
         default:
             return false;
     }
+}
+
+action_id handle_interact( map &here, const tripoint_bub_ms &pos )
+{
+    const input_context ctxt = get_default_mode_input_context();
+
+    std::vector<action_id> valid_actions;
+    static const std::vector<action_id> check_actions = {
+        ACTION_EXAMINE,
+        ACTION_PICKUP,
+        ACTION_OPEN,
+        ACTION_CLOSE,
+        ACTION_BUTCHER,
+        ACTION_CHAT,
+        ACTION_MOVE_UP,
+        ACTION_MOVE_DOWN
+    };
+
+    for( action_id act : check_actions ) {
+        if( can_interact_at( act, here, pos ) ) {
+            valid_actions.push_back( act );
+        }
+    }
+
+    if( valid_actions.empty() ) {
+        return ACTION_NULL;
+    }
+
+    if( valid_actions.size() == 1 ) {
+        return valid_actions.front();
+    }
+
+    uilist tmenu;
+    tmenu.settext( _( "Actions for this tile" ) );
+    for( action_id act : valid_actions ) {
+        tmenu.addentry( act, true, hotkey_for_action( act, 1 ),
+                        ctxt.get_action_name( action_ident( act ) ) );
+    }
+
+    tmenu.query();
+    if( tmenu.ret < 0 ) {
+        return ACTION_NULL;
+    }
 
-    return can_interact_at( action, here, p );
+    return static_cast<action_id>( tmenu.ret );
 }
 
 action_id handle_action_menu( map &here )

src/action.cpp

@@ -314,7 +314,7 @@ enum action_id : int {
     ACTION_ZOOM_OUT,
     /** Zoom view out */
     ACTION_ZOOM_IN,
-    /** Open the action menu */
+    /** Open the the action menu */
     ACTION_ACTIONMENU,
     /** Open the item uses menu */
     ACTION_ITEMACTION,
@@ -353,6 +353,8 @@ enum action_id : int {
     ACTION_DISPLAY_NPC_ATTACK_POTENTIAL,
     /** Toggle timing of the game hours */
     ACTION_TOGGLE_HOUR_TIMER,
+    /** Interact with the current or nearby tile */
+    ACTION_INTERACT,
     /** Not an action, serves as count of enumerated actions */
     NUM_ACTIONS
     /**@}*/
@@ -603,6 +605,17 @@ point_rel_ms get_delta_from_movement_action( action_id act, iso_rotate rot );
  */
 action_id handle_action_menu( map &here );
 
+/**
+ * Show a context-sensitive action menu for a specific tile.
+ *
+ * If only one action is possible, it is returned immediately.
+ * If multiple actions are possible, a menu is shown.
+ *
+ * @param pos The tile to perform actions on.
+ * @returns action_id ID of action requested by user, or ACTION_NULL.
+ */
+action_id handle_interact( map &here, const tripoint_bub_ms &pos );
+
 /**
  * Show in-game main menu
  *

src/action.h

@@ -46,6 +46,7 @@
 #include "flexbuffer_json.h"
 #include "game.h"
 #include "input.h"
+#include "sdl_gamepad.h"
 #include "item.h"
 #include "item_factory.h"
 #include "itype.h"
@@ -1943,6 +1944,18 @@ void cata_tiles::draw( const point &dest, const tripoint_bub_ms &center, int wid
         }
     }
 
+    // Draw gamepad direction indicator
+    if( gamepad::is_active() ) {
+        gamepad::direction dir = gamepad::get_left_stick_direction();
+        if( dir != gamepad::direction::NONE ) {
+            tripoint offset = gamepad::direction_to_offset( dir );
+            tripoint_bub_ms indicator_pos = you.pos_bub() + tripoint_rel_ms( offset.x, offset.y, 0 );
+            draw_from_id_string( "cursor", TILE_CATEGORY::NONE, empty_string,
+                                 tripoint_bub_ms( indicator_pos.xy(), center.z() ),
+                                 0, 0, lit_level::LIT, false );
+        }
+    }
+
     printErrorIf( SDL_RenderSetClipRect( renderer.get(), nullptr ) != 0,
                   "SDL_RenderSetClipRect failed" );
 }

src/cata_tiles.cpp

@@ -2556,6 +2556,7 @@ input_context get_default_mode_input_context()
     ctxt.register_action( "loot" );
     ctxt.register_action( "examine" );
     ctxt.register_action( "examine_and_pickup" );
+    ctxt.register_action( "interact", to_translation( "Interact with tile" ) );
     ctxt.register_action( "advinv" );
     ctxt.register_action( "pickup" );
     ctxt.register_action( "pickup_all" );
@@ -5040,39 +5041,50 @@ void game::moving_vehicle_dismount( const tripoint_bub_ms &dest_loc )
     }
 }
 
-void game::control_vehicle()
+void game::control_vehicle( const std::optional<tripoint_bub_ms> &p )
 {
     map &here = get_map();
 
-    if( vehicle *remote_veh = remoteveh() ) { // remote controls have priority
-        for( const vpart_reference &vpr : remote_veh->get_avail_parts( "REMOTE_CONTROLS" ) ) {
-            remote_veh->interact_with( &here, vpr.pos_bub( here ) );
-            return;
+    if( !p && !here.veh_at( u.pos_bub() ) ) {
+        if( vehicle *remote_veh = remoteveh() ) { // remote controls have priority
+            for( const vpart_reference &vpr : remote_veh->get_avail_parts( "REMOTE_CONTROLS" ) ) {
+                remote_veh->interact_with( &here, vpr.pos_bub( here ) );
+                return;
+            }
         }
     }
+
     vehicle *veh = nullptr;
     bool controls_ok = false;
     bool reins_ok = false;
-    if( const optional_vpart_position vp = here.veh_at( u.pos_bub() ) ) {
+    const tripoint_bub_ms player_pos = u.pos_bub();
+    const tripoint_bub_ms target_pos = p.value_or( player_pos );
+
+    if( const optional_vpart_position vp = here.veh_at( target_pos ) ) {
         veh = &vp->vehicle();
         const int controls_idx = veh->avail_part_with_feature( vp->mount_pos(), "CONTROLS" );
         const int reins_idx = veh->avail_part_with_feature( vp->mount_pos(), "CONTROL_ANIMAL" );
         controls_ok = controls_idx >= 0; // controls available to "drive"
         reins_ok = reins_idx >= 0 // reins + animal available to "drive"
                    && veh->has_engine_type( fuel_type_animal, false )
                    && veh->get_harnessed_animal( here );
-        if( veh->player_in_control( here, u ) ) {
-            // player already "driving" - offer ways to leave
-            if( controls_ok ) {
-                veh->interact_with( &here, u.pos_bub() );
-            } else if( reins_idx >= 0 ) {
-                u.controlling_vehicle = false;
-                add_msg( m_info, _( "You let go of the reins." ) );
-            }
-        } else if( u.in_vehicle && ( controls_ok || reins_ok ) ) {
-            // player not driving but has controls or reins on tile
+
+        if( target_pos == player_pos ) {
+            if( veh->player_in_control( here, u ) ) {
+                // player already "driving" - offer ways to leave
+                if( controls_ok ) {
+                    veh->interact_with( &here, u.pos_bub() );
+                } else if( reins_idx >= 0 ) {
+                    u.controlling_vehicle = false;
+                    add_msg( m_info, _( "You let go of the reins." ) );
+                }
+                return;
+            }
+        }
+
+        if( controls_ok || reins_ok ) {
             if( veh->is_locked ) {
-                veh->interact_with( &here, u.pos_bub() );
+                veh->interact_with( &here, target_pos );
                 return; // interact_with offers to hotwire
             }
             if( !veh->handle_potential_theft( u ) ) {
@@ -5112,13 +5124,27 @@ void game::control_vehicle()
             } else {
                 veh->start_engines( here, &u, true );
             }
+            // Success!
+            if( u.controlling_vehicle ) {
+                for( const tripoint_abs_ms &target : veh->get_points() ) {
+                    u.memorize_clear_decoration( target, "vp_" );
+                    here.memory_cache_dec_set_dirty( here.get_bub( target ), true );
+                }
+                veh->is_following = false;
+                veh->is_patrolling = false;
+                veh->autopilot_on = false;
+                veh->is_autodriving = false;
+            }
+            return;
         }
     }
-    if( !controls_ok && !reins_ok ) { // no controls or reins under player position, search nearby
+
+    if( !p ) {
+        // Fallback search nearby if no target point provided and no controls at player position
         int num_valid_controls = 0;
         std::optional<tripoint_bub_ms> vehicle_position;
         std::optional<vpart_reference> vehicle_controls;
-        for( const tripoint_bub_ms &elem : here.points_in_radius( get_player_character().pos_bub(), 1 ) ) {
+        for( const tripoint_bub_ms &elem : here.points_in_radius( u.pos_bub(), 1 ) ) {
             if( const optional_vpart_position vp = here.veh_at( elem ) ) {
                 const std::optional<vpart_reference> controls = vp.value().part_with_feature( "CONTROLS", true );
                 if( controls ) {
@@ -5149,18 +5175,18 @@ void game::control_vehicle()
                 return;
             }
         }
-        // If we hit neither of those, there's only one set of vehicle controls, which should already have been found.
         if( vehicle_controls ) {
             veh = &vehicle_controls->vehicle();
             if( !veh->handle_potential_theft( u ) ) {
                 return;
             }
             veh->interact_with( &here, *vehicle_position );
         }
+    } else {
+        add_msg( _( "No vehicle controls found there." ) );
     }
-    if( u.controlling_vehicle ) {
-        // If we reached here, we gained control of a vehicle.
-        // Clear the map memory for the area covered by the vehicle to eliminate ghost vehicles.
+
+    if( u.controlling_vehicle && veh ) {
         for( const tripoint_abs_ms &target : veh->get_points() ) {
             u.memorize_clear_decoration( target, "vp_" );
             here.memory_cache_dec_set_dirty( here.get_bub( target ), true );
@@ -7605,9 +7631,13 @@ void game::insert_item()
     game_menus::inv::insert_items( item_loc );
 }
 
-void game::unload_container()
+void game::unload_container( const std::optional<tripoint_bub_ms> &p )
 {
-    if( const std::optional<tripoint_bub_ms> pnt = choose_adjacent( _( "Unload where?" ) ) ) {
+    std::optional<tripoint_bub_ms> pnt = p;
+    if( !pnt ) {
+        pnt = choose_adjacent( _( "Unload where?" ) );
+    }
+    if( pnt ) {
         u.drop( game_menus::inv::unload_container(), *pnt );
     }
 }
@@ -7723,7 +7753,7 @@ static void add_disassemblables( uilist &menu,
     }
 }
 
-void game::butcher()
+void game::butcher( const std::optional<tripoint_bub_ms> &p )
 {
     map &here = get_map();
 
@@ -7733,14 +7763,16 @@ void game::butcher()
         return;
     }
 
+    const tripoint_bub_ms pos = p.value_or( u.pos_bub() );
+
     const int factor = u.max_quality( qual_BUTCHER, PICKUP_RANGE );
     const int factorD = u.max_quality( qual_CUT_FINE, PICKUP_RANGE );
     const std::string no_knife_msg = _( "You don't have a butchering tool." );
     const std::string no_corpse_msg = _( "There are no corpses here to butcher." );
 
     //You can't butcher on sealed terrain- you have to smash/shovel/etc it open first
-    if( here.has_flag( ter_furn_flag::TFLAG_SEALED, u.pos_bub() ) ) {
-        if( here.sees_some_items( u.pos_bub(), u ) ) {
+    if( here.has_flag( ter_furn_flag::TFLAG_SEALED, pos ) ) {
+        if( here.sees_some_items( pos, u ) ) {
             add_msg( m_info, _( "You can't access the items here." ) );
         } else if( factor > INT_MIN || factorD > INT_MIN ) {
             add_msg( m_info, no_corpse_msg );
@@ -7755,7 +7787,7 @@ void game::butcher()
     std::vector<map_stack::iterator> corpses;
     std::vector<map_stack::iterator> disassembles;
     std::vector<map_stack::iterator> salvageables;
-    map_stack items = here.i_at( u.pos_bub() );
+    map_stack items = here.i_at( pos );
     const inventory &crafting_inv = u.crafting_inventory();
 
     // TODO: Properly handle different material whitelists
@@ -7962,7 +7994,7 @@ void game::butcher()
                     if( bt.has_value() ) {
                         std::vector<butchery_data> bd;
                         for( map_stack::iterator &it : corpses ) {
-                            item_location corpse_loc = item_location( map_cursor( u.pos_abs() ), &*it );
+                            item_location corpse_loc = item_location( map_cursor( pos ), &*it );
                             bd.emplace_back( corpse_loc, bt.value() );
                         }
                         u.assign_activity( butchery_activity_actor( bd ) );
@@ -7983,7 +8015,7 @@ void game::butcher()
         case BUTCHER_CORPSE: {
             const std::optional<butcher_type> bt = butcher_submenu( corpses, indexer_index );
             if( bt.has_value() ) {
-                item_location corpse_loc = item_location( map_cursor( u.pos_abs() ), &*corpses[indexer_index] );
+                item_location corpse_loc = item_location( map_cursor( pos ), &*corpses[indexer_index] );
                 butchery_data bd( corpse_loc, bt.value() );
                 u.assign_activity( butchery_activity_actor( bd ) );
             }
@@ -7992,7 +8024,7 @@ void game::butcher()
         case BUTCHER_DISASSEMBLE: {
             // Pick index of first item in the disassembly stack
             item *const target = &*disassembly_stacks[indexer_index].first;
-            u.disassemble( item_location( map_cursor( u.pos_abs() ), target ), true );
+            u.disassemble( item_location( map_cursor( pos ), target ), true );
         }
         break;
         case BUTCHER_SALVAGE: {
@@ -8001,7 +8033,7 @@ void game::butcher()
             } else {
                 // Pick index of first item in the salvage stack
                 item *const target = &*salvage_stacks[indexer_index].first;
-                item_location item_loc( map_cursor( u.pos_abs() ), target );
+                item_location item_loc( map_cursor( pos ), target );
                 salvage_iuse->try_to_cut_up( u, *salvage_tool, item_loc );
             }
         }

src/game.cpp

@@ -961,7 +961,8 @@ class game
         bool grabbed_move( const tripoint_rel_ms &dp, bool via_ramp );
         bool grabbed_veh_move( const tripoint_rel_ms &dp );
 
-        void control_vehicle(); // Use vehicle controls  '^'
+        void control_vehicle( const std::optional<tripoint_bub_ms> &p =
+                                  std::nullopt ); // Use vehicle controls  '^'
         // Examine nearby terrain 'e', with or without picking up items
         void examine( const tripoint_bub_ms &p, bool with_pickup = false );
         void examine( bool with_pickup = true );
@@ -972,10 +973,11 @@ class game
         // Pick up items from all nearby tiles
         void pickup_all();
 
-        void unload_container(); // Unload a container w/ direction  'd'
+        void unload_container( const std::optional<tripoint_bub_ms> &p =
+                                   std::nullopt ); // Unload a container w/ direction  'd'
         void drop_in_direction( const tripoint_bub_ms &pnt ); // Drop w/ direction  'D'
 
-        void butcher(); // Butcher a corpse  'B'
+        void butcher( const std::optional<tripoint_bub_ms> &p = std::nullopt ); // Butcher a corpse  'B'
 
         void reload( item_location &loc, bool prompt = false, bool empty = true );
     public:
@@ -1016,10 +1018,9 @@ class game
                                     std::vector<std::string> *harmful_stuff = nullptr ) const;
         // Pick up items from the given point
         void pickup( const tripoint_bub_ms &p );
+        void chat( const std::optional<tripoint_bub_ms> &p = std::nullopt ); // Talk to a nearby NPC  'C'
     private:
 
-        void chat(); // Talk to a nearby NPC  'C'
-
         // Internal methods to show "look around" info
         void print_fields_info( const tripoint_bub_ms &lp, const catacurses::window &w_look, int column,
                                 int &line );