Allow Rebecca to watch her basement door too, ref #381

Author: burner1024

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...}

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?}

scripts_src/den/dcrebdor.ssl

@@ -84,18 +84,19 @@ procedure Node005;
 /** North West */
 #define DIRECTION_NW 5
 
-/**
- * Tile near basement entry door
- */
-#define TILE_NEAR_DOOR  tile_num_in_direction(tile_num(becky_door_obj), DIRECTION_SE, 1)
+
 /**
  * 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_num(becky_door_obj), DIRECTION_NW, 1)
+#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;

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

scripts_src/den/didoor.ssl

@@ -3,4 +3,4 @@
 */
 
 #include "../headers/den.h"
-#include "../generic/ziwoddor.ssl"
+#include "../generic/ziwoddor.ssl"

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"
 
+/**
+ * Set `check_guard` to one of the guards or Becky herself.
+ * Almost never Becky, though.
+ * @param {ObjectPtr} door_user Critter using the door
+ * @ret {ObjectPtr} who 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