Avoid Becca's guard getting stuck and not resetting his routine if the door somehow ended up locked open, ref #381

Author: burner1024

scripts_src/den/dcrebdor.ssl

@@ -175,7 +175,7 @@ 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
+   if is_closing and not obj_is_open(becky_door_obj) then begin
       is_closing = false;
    end
 
@@ -186,17 +186,24 @@ procedure critter_p_proc begin
       end
    end
 
-   // P2: attack if found in room
+   // P2: check room. Attack PC if found, else close and lock the door
    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);
+
+         // defensive: if the door is "locked open", then unlock first, otherwise close fails and the guard gets stuck
+         if (obj_is_locked(becky_door_obj)) then begin
+            obj_unlock(becky_door_obj);
+         end
          obj_close(becky_door_obj);
          // ^ Close does not happen immediately, so we reset is_closing higher up
          obj_lock(becky_door_obj);
+         // After door is closed, move back to home tile and reset
+         set_post_state(post_state_done);
       end
       return;
    end

scripts_src/generic/ziwoddor.ssl

@@ -475,9 +475,6 @@ it through Mapper. After the door has been unlocked, it will remain as such, unl
 the player locks it once more.
 ***************************************************************************************/
 procedure map_enter_p_proc begin
-    /* Set up the door state only when the player enters the map, not on game load */
-    if (is_loading_game) then return;
-
     if (local_var(LVAR_Set_Door_Status) == 0) then begin
       set_local_var(LVAR_Set_Door_Status, 1);
       set_local_var(LVAR_Trapped,TRAPPED_STATUS);
@@ -486,11 +483,20 @@ procedure map_enter_p_proc begin
     // Locked status: locked
     if (LOCKED_STATUS == STATE_ACTIVE) then begin
       // Ensure that we don't have objects "locked open"
-      if obj_is_open(self_obj) then begin
-        obj_close(self_obj);
+      // Some doors, like Rebecca's basement door, have dynamic status. Active when she's alive, inactive when dead.
+      if obj_is_open(self_obj) and obj_is_locked(self_obj) then begin
+        // We don't want to close+re-lock the door on simple game load, that makes gameplay inconsistent.
+        // So we just unlock. (This shouldn't happen anyway, defensive code)
+        if is_loading_game then begin
+          obj_unlock(self_obj);
+        end else begin
+          // But if it's map change, close+lock is justified.
+          // defensive: if the door is "locked open", then unlock first, otherwise close fails
+          obj_unlock(self_obj);
+          obj_close(self_obj);
+          obj_lock(self_obj);
+        end
       end
-      // Ensure locked status
-      obj_lock(self_obj);
     end else begin
       obj_unlock(self_obj);
     end