Fix Rebecca not noticing her backroom door open. Also the guard will check the backroom if he notices the door open, then lock it. Ref BGforgeNet/Fallout2_Restoration_Project#381

burner1024 · burner1024 · commit 037bffdda3cc · 2026-04-09T21:05:59.000+07:00
diff --git a/data/text/english/dialog/dcrebdor.msg b/data/text/english/dialog/dcrebdor.msg
@@ -48,4 +48,4 @@
 {357}{}{Nice talking to you too... I'll just be heading back over there then.}
 
 # door open
-{375}{}{Oh, shit...}
+{375}{}{Oh, shit...}
diff --git a/data/text/english/dialog/dcrebecc.msg b/data/text/english/dialog/dcrebecc.msg
@@ -253,3 +253,11 @@
 # 29. Still 3(From 28)
 {580}{}{So, you're a coward too? Figures.}
 {581}{}{...}
+
+# 30. Self Initiated: Door tampered with
+# Same as dcrebdor: 230-234
+{1230}{}{Get away from that right now.}
+{1231}{}{Don't touch that again.}
+{1232}{}{Back off!}
+{1233}{}{Leave that alone.}
+{1234}{}{What do you think you're doing?}
diff --git a/scripts_src/den/dcrebdor.ssl b/scripts_src/den/dcrebdor.ssl
@@ -77,25 +77,37 @@ procedure Node005;
                                           ndebug("guard post state == "+x);                                                   \
                                           set_local_var(LVAR_Post_State, x)
 
-#define check_door_open                   the_door := false;                           \
-                                          if (becky_door_obj != 0) then                \
-                                             if ((obj_is_open(becky_door_obj)) and (obj_can_see_obj(self_obj, becky_door_obj))) then     \
-                                                the_door := true
-
 #define wander_tile                       (17267)
 
-#define set_becky_guard                                                                                                    \
-         if (becky_guard_obj == 0) then begin                                                                              \
-            becky_guard_obj := self_obj;                                                                                   \
-         end else if (tile_distance_objs(self_obj, dude_obj) < tile_distance_objs(becky_guard_obj, dude_obj)) then begin   \
-            becky_guard_obj := self_obj;                                                                                   \
-         end
+/** South East */
+#define DIRECTION_SE 2
+/** North West */
+#define DIRECTION_NW 5
+
+
+/**
+ * Door tile
+ */
+#define TILE_DOOR  tile_num(becky_door_obj)
+/**
+ * Tile near basement entry door
+ */
+#define TILE_NEAR_DOOR  tile_num_in_direction(TILE_DOOR, DIRECTION_SE, 1)
+/**
+ * Tile in basement entry room
+ */
+#define TILE_NEAR_BASEMENT_ENTRY  tile_num_in_direction(TILE_DOOR, DIRECTION_NW, 1)
 
 import variable becky_guard_obj;
 import variable becky_door_guard_obj;
 import variable becky_door_obj;
 
 variable the_door;
+/**
+ * Guard is in the process of closing the door
+ */
+variable is_closing = false;
+
 
 /* Imported variables from the Map scripts. These should only be
    pointers and variables that need not be saved. If a variable
@@ -107,6 +119,23 @@ procedure start begin
    becky_door_guard_obj := self_obj;
 end
 
+/**
+ * obj_can_see_obj doesn't work from home tile so we also check distance.
+ * @ret {bool} True if the guard "sees" door open, False otherwise.
+ */
+procedure see_door_open begin
+   variable door_is_open = false;
+   if (becky_door_obj != 0) then begin
+      if (obj_is_open(becky_door_obj)
+         and (obj_can_see_obj(self_obj, becky_door_obj) or (tile_distance_objs(self_obj, becky_door_obj) < 3))
+         )
+      then begin
+         door_is_open := true;
+      end
+   end
+   return door_is_open;
+end
+
 procedure timed_event_p_proc begin
    if (fixed_param == timed_event_door_tamper) then begin
       call Node003;
@@ -144,20 +173,54 @@ procedure map_exit_p_proc begin
 end
 
 procedure critter_p_proc begin
+   variable i_see_open_door = see_door_open;
+   // Guard closed the door, can walk back
+   if is_closing and (not obj_is_open(becky_door_obj)) then begin
+      is_closing = false;
+   end
+
+   // P1: attack
    if (self_can_see_dude) then begin
-      check_door_open;
-      if ((hostile) or (the_door)) then begin
+      if (hostile or (i_see_open_door and (tile_distance_objs(dude_obj, becky_door_obj) < 2))) then begin
          self_attack_dude;
-      end set_becky_guard
+      end
+   end
+
+   // P2: attack if found in room
+   if (self_tile == TILE_NEAR_BASEMENT_ENTRY) then begin
+      if self_can_see_dude and (tile_distance_objs(self_obj, dude_obj) < 2) then begin
+         // Remember that PC was in restricted area. Helps if PC ran downstairs.
+         set_hostile;
+         self_attack_dude;
+      end else begin
+         self_walk_to_tile(TILE_NEAR_DOOR);
+         obj_close(becky_door_obj);
+         // ^ Close does not happen immediately, so we reset is_closing higher up
+         obj_lock(becky_door_obj);
+      end
+      return;
+   end
+
+   // P3: close door
+   if (i_see_open_door) then begin
+      // Guard is in the process of closing the door, skip
+      if is_closing then begin
+         return;
+      end
+      // Noticed open door, run to check
+      is_closing = true;
+      floater(375);
+      self_run_to_tile_force(TILE_NEAR_BASEMENT_ENTRY);
+      return;  // Next run will trigger attack or door close.
+   end
+
+   // P4: watch PC
+   if (self_can_see_dude) then begin
+      set_becky_guard
    end else if (anim_busy(self_obj) == false) then begin
+      // P5: Normal walking around
       if (post_state == post_state_done) then begin
-         check_door_open;
-         if (the_door) then begin
-            if (anim_busy(becky_door_obj) == false) then begin
-               use_obj_on_obj(self_obj, becky_door_obj);
-               display_mstr(375);
-            end
-         end else if (self_tile != local_var(LVAR_Home_Tile)) then begin
+         if (self_tile != local_var(LVAR_Home_Tile)) then begin
             self_walk_to_tile(local_var(LVAR_Home_Tile));
          end else if (self_cur_rot != local_var(LVAR_Home_Rotation)) then begin
             self_rotate(local_var(LVAR_Home_Rotation));
diff --git a/scripts_src/den/dcrebecc.ssl b/scripts_src/den/dcrebecc.ssl
@@ -117,14 +117,14 @@ procedure Node029;
 /* Local variables which do not need to be saved between map changes. */
 variable prev_node;
 import variable becky_guard_obj;
+import variable becky_obj;
 
 procedure start begin
 end
 
 procedure timed_event_p_proc begin
-   if (fixed_param == timed_event_float) then begin
-      if (combat_is_initialized == false) then begin
-      end
+   if (fixed_param == timed_event_door_tamper) then begin
+      floater_rand(1230, 1234);
    end
 end
 
@@ -137,6 +137,7 @@ procedure map_enter_p_proc begin
          set_local_var(LVAR_Home_Rotation, self_cur_rot);
       end
    end
+   becky_obj = self_obj;
 end
 
 procedure map_exit_p_proc begin
diff --git a/scripts_src/den/dcrebgrd.ssl b/scripts_src/den/dcrebgrd.ssl
@@ -51,13 +51,6 @@ import variable becky_guard_obj;
    prepended by LVAR_ */
 #define LVAR_Flags                        (4)
 
-#define set_becky_guard                                                                                                    \
-         if (becky_guard_obj == 0) then begin                                                                              \
-            becky_guard_obj := self_obj;                                                                                   \
-         end else if (tile_distance_objs(self_obj, dude_obj) < tile_distance_objs(becky_guard_obj, dude_obj)) then begin   \
-            becky_guard_obj := self_obj;                                                                                   \
-         end
-
 /* Imported variables from the Map scripts. These should only be
    pointers and variables that need not be saved. If a variable
    Needs to be saved, make it a map variable (MVAR_) */
diff --git a/scripts_src/den/didoor.ssl b/scripts_src/den/didoor.ssl
@@ -3,4 +3,4 @@
 */
 
 #include "../headers/den.h"
-#include "../generic/ziwoddor.ssl"
+#include "../generic/ziwoddor.ssl"
diff --git a/scripts_src/den/direbdor.ssl b/scripts_src/den/direbdor.ssl
@@ -2,6 +2,8 @@
 	Copyright 1998-2003 Interplay Entertainment Corp.  All rights reserved.
 */
 
+#define SCRIPT_REALNAME "direbdor"
+
 import variable becky_guard_obj;
 import variable becky_door_guard_obj;
 import variable becky_obj;
@@ -11,23 +13,6 @@ variable user_of_door;
 
 #define LOCKED_STATUS                   ((STATE_ACTIVE * (becky_dead == false)) + (STATE_INACTIVE * becky_dead))
 
-#define send_tamper_to_guard_who_sees                                                                    \
-         check_guard := 0;                                                                               \
-         if (becky_guard_obj != 0) then begin                                                            \
-            if (obj_can_see_obj(becky_guard_obj, user_of_door)) then begin                               \
-               check_guard := becky_guard_obj;                                                           \
-            end                                                                                          \
-         end else if (becky_obj != 0) then begin                                                         \
-            if (obj_can_see_obj(becky_obj, user_of_door)) then begin                                     \
-               check_guard := becky_obj;                                                                 \
-            end                                                                                          \
-         end                                                                                             \
-         if (becky_door_guard_obj != 0) then begin                                                       \
-            if ((obj_can_see_obj(becky_door_guard_obj, user_of_door)) or (check_guard != 0)) then begin  \
-               check_guard := becky_door_guard_obj;                                                      \
-            end                                                                                          \
-         end
-
 procedure def_use_p_proc;
 procedure def_use_skill_on_p_proc;
 procedure def_map_update_p_proc;
@@ -62,9 +47,38 @@ end
 
 #include "../den/didoor.ssl"
 
+/**
+ * Return the critter who's currently watching Becky's backroom door. The critter will issue a warning.
+ * One of the guards or Becky herself.
+ * @param {ObjectPtr} door_user Critter using the door, usually PC.
+ * @ret {ObjectPtr} Guard critter or 0.
+ */
+procedure get_guard_object(variable door_user) begin
+   if (becky_door_guard_obj != 0) then begin
+      if (obj_can_see_obj(becky_door_guard_obj, door_user)) then begin
+         ndebug("guard = door guard");
+         return becky_door_guard_obj;
+      end
+   end
+   if (becky_guard_obj != 0) then begin
+      if (obj_can_see_obj(becky_guard_obj, door_user)) then begin
+         ndebug("guard = normal guard");
+         return becky_guard_obj;
+      end
+   end
+   if (becky_obj != 0) then begin
+      if (obj_can_see_obj(becky_obj, door_user)) then begin
+         ndebug("guard = Becky");
+         return becky_obj;
+      end
+   end
+   return 0;
+end
+
 procedure test_use_tamper begin
    ndebug("test_use_tamper");
-   send_tamper_to_guard_who_sees
+   check_guard = get_guard_object(user_of_door);
+   ndebug("check_guard = " + check_guard);
    if (check_guard != 0) then begin
       if (user_of_door == dude_obj) then begin
          ndebug("   user_of_door == dude_obj");
@@ -82,7 +96,7 @@ end
 
 procedure test_door_open begin
    if ((obj_is_open(self_obj) == false) and (obj_is_locked(self_obj) == false)) then begin
-      send_tamper_to_guard_who_sees
+      check_guard = get_guard_object(user_of_door);
       if (check_guard != 0) then begin
          if (user_of_door == dude_obj) then begin
             flush_add_timer_event(check_guard, 0, timed_event_attack);
@@ -97,7 +111,7 @@ procedure test_door_open begin
 end
 
 procedure test_use_skill_tamper begin
-   send_tamper_to_guard_who_sees
+   check_guard = get_guard_object(user_of_door);
    ndebug("test_use_skill_tamper");
    if (check_guard != 0) then begin
       if ((action_being_used == SKILL_LOCKPICK) or (action_being_used == SKILL_TRAPS)) then begin
diff --git a/scripts_src/headers/den.h b/scripts_src/headers/den.h
@@ -585,6 +585,17 @@ variable caught_thief;
             end                                                                        \
          end
 
+/**
+ * Set `becky_guard_obj` to current critter if currently unset or closer to PC that current guard obj.
+ */
+#define set_becky_guard \
+   if (becky_guard_obj == 0) then begin \
+      becky_guard_obj := self_obj; \
+   end else if (tile_distance_objs(self_obj, dude_obj) < tile_distance_objs(becky_guard_obj, dude_obj)) then begin \
+      becky_guard_obj := self_obj; \
+   end
+
+
 // gang war start
 #define setup_gang_fight                           gfade_out(ONE_GAME_SECOND);                   \
                                                       set_gangwar(state_gangwar_in_fight);       \
