Add "autopeek" behaviour to safe mode movement (#82648)

* Add "autopeek" behaviour to safe mode movement

* Fix erroneous bub movement, show alert

* Let player commit to autopeek movement

* Fix IWYU

* Don't autopeek if player already decided to keep hauling

* Add autopeek option, popup, hauling fix

* Fix IWYU and Clang-tidy

* Add ramps support, safety checks

* Remove "auto peek" option from safe mode settings

* Add mention to autopeek in help/movement

---------

Co-authored-by: cafe <[email protected]>

Author: cafeoh

data/core/help.json

@@ -20,7 +20,7 @@
       "Each step will take 100 movement points (or more, depending on the terrain); you will then replenish a variable amount of movement points, depending on many factors (press <press_player_data> to see the exact amount).",
       "To attempt to hit a monster with your weapon, simply move into it.",
       "You may find doors, ('+'); these may be opened with <press_open> or closed with <press_close>.  Some doors are locked.  Locked doors, windows, and some other obstacles can be destroyed by smashing them (<press_smash>, then choose a direction).  Smashing down obstacles is much easier with a good weapon or a strong character.",
-      "There may be times when you want to move more quickly by holding down a movement key.  However, fast movement in this fashion may lead to the player getting into a dangerous situation or even killed before they have a chance to react.  Pressing <press_safemode> will toggle \"safe mode.\"  While this is on, any movement will be ignored if new monsters enter the player's view."
+      "There may be times when you want to move more quickly by holding down a movement key.  However, fast movement in this fashion may quickly put you in a dangerous situation, or even kill you before you've had a chance to react.  Pressing <press_safemode> will toggle \"safe mode.\"  While this is on, the game will stop you from moving further if you've spotted an enemy, and let you step back unnoticed if you weren't running."
     ]
   },
   {

src/avatar_action.cpp

@@ -28,6 +28,7 @@
 #include "game_constants.h"
 #include "game_inventory.h"
 #include "gun_mode.h"
+#include "input_context.h"
 #include "inventory.h"
 #include "item.h"
 #include "item_location.h"
@@ -49,13 +50,16 @@
 #include "output.h"
 #include "pimpl.h"
 #include "player_activity.h"
+#include "popup.h"
 #include "point.h"
 #include "projectile.h"
 #include "ranged.h"
 #include "ret_val.h"
 #include "rng.h"
+#include "string_formatter.h"
 #include "translations.h"
 #include "type_id.h"
+#include "ui_manager.h"
 #include "uilist.h"
 #include "veh_type.h"
 #include "vehicle.h"
@@ -534,7 +538,34 @@ bool avatar_action::move( avatar &you, map &m, const tripoint_rel_ms &d )
         }
         return true;
     }
+
+    const tripoint_abs_ms old_abs_pos = you.pos_abs();
+    const tripoint_abs_ms abs_dest_loc = here.get_abs( dest_loc );
     if( g->walk_move( dest_loc, via_ramp ) ) {
+        // AUTOPEEK: If safe mode would be triggered after the move, look around and move back
+        if( g->safe_mode == SAFE_MODE_ON && !you.is_running() &&
+            you.pos_abs() == abs_dest_loc ) {
+            here.build_map_cache( dest_loc.z() );
+            here.update_visibility_cache( dest_loc.z() );
+            g->mon_info_update();
+            if( !g->check_safe_mode_allowed() && !you.is_hauling() ) {
+                input_context ctxt( "LOOK" );
+                static_popup popup;
+                popup.message( "%s " + colorize( _( "to go back." ), c_light_gray ) +
+                               "\n%s " + colorize( _( "to move anyway." ), c_light_gray ),
+                               ctxt.get_desc( "QUIT" ),
+                               ctxt.get_desc( "CONFIRM" ) ).on_top( true );
+                ui_manager::redraw();
+                // Get bub coords again after build_map_cache
+                const tripoint_bub_ms src_loc = here.get_bub( old_abs_pos );
+                tripoint_bub_ms center( src_loc.x(), src_loc.y(), dest_loc.z() );
+                const look_around_result result = g->look_around( false, center, center, false, false, true );
+                if( result.peek_action != PA_MOVE ) {
+                    g->walk_move( src_loc, via_ramp );
+                }
+                return false; // cancel automove
+            }
+        }
         return true;
     }
     if( g->phasing_move_enchant( dest_loc, you.calculate_by_enchantment( 0,

src/game.cpp

@@ -8228,6 +8228,8 @@ look_around_result game::look_around(
             result.peek_action = PA_BLIND_THROW;
         } else if( action == "throw_blind_wielded" ) {
             result.peek_action = PA_BLIND_THROW_WIELDED;
+        } else if( action == "CONFIRM" && peeking ) {
+            result.peek_action = PA_MOVE;
         } else if( action == "zoom_in" ) {
             center.xy() = lp.xy();
             zoom_in();

src/game.h

@@ -108,6 +108,7 @@ using item_location_filter = std::function<bool ( const item_location & )>;
 enum peek_act : int {
     PA_BLIND_THROW,
     PA_BLIND_THROW_WIELDED,
+    PA_MOVE,
     // obvious future additional value is PA_BLIND_FIRE
 };