The final portal exiting Purgatory will not function until Saint Mich…

…ael is killed.

Players have been bypassing Saint Michael and escaping Purgaotry without
having to deal with him, which was never the intent. Now fixed 😁

It's just the final portal from Purgatory to the Castle that is
affected, not the portal between Purgatory and the Sanctum.

doc/evilhack-changelog.md

@@ -3654,4 +3654,6 @@ The following changes to date are:
 - Allow regular/spiked barding to have certain object properties
 - Rename nethack.6 and nethack.txt documents to "evilhack"
 - Change environment variable for options to EVILHACKOPTIONS
+- The final portal exiting Purgatory will not function until Saint
+  Michael is killed
 

include/decl.h

@@ -76,6 +76,8 @@ E struct dgn_topology { /* special dungeon levels for speed */
     d_level d_minetn_level;
     d_level d_sokoend_level;
     d_level d_sokostart_level;
+    d_level d_purgend_level;
+    d_level d_purgstart_level;
 } dungeon_topology;
 /* macros for accessing the dungeon levels by their old names */
 /* clang-format off */
@@ -112,6 +114,8 @@ E struct dgn_topology { /* special dungeon levels for speed */
 #define minetn_level            (dungeon_topology.d_minetn_level)
 #define sokoend_level           (dungeon_topology.d_sokoend_level)
 #define sokostart_level         (dungeon_topology.d_sokostart_level)
+#define purgend_level           (dungeon_topology.d_purgend_level)
+#define purgstart_level         (dungeon_topology.d_purgstart_level)
 /* clang-format on */
 
 E NEARDATA stairway dnstair, upstair; /* stairs up and down */

include/dungeon.h

@@ -137,6 +137,8 @@ typedef struct branch {
 #define Is_minetn_level(x)    (Lcheck(x, &minetn_level))
 #define Is_sokoend_level(x)   (Lcheck(x, &sokoend_level))
 #define Is_sokostart_level(x) (Lcheck(x, &sokostart_level))
+#define Is_purgend_level(x)   (Lcheck(x, &purgend_level))
+#define Is_purgstart_level(x) (Lcheck(x, &purgstart_level))
 
 #define In_sokoban(x) ((x)->dnum == sokoban_dnum)
 #define In_tower(x) ((x)->dnum == tower_dnum)

src/do.c

@@ -1598,6 +1598,14 @@ boolean at_stairs, falling, portal;
         return;
     }
 
+    /* The final portal leaving Purgatory will not function until
+       its ruler is defeated */
+    if (on_level(&u.uz, &purgend_level)
+        && !u.uevent.umichael && portal) {
+        pline("Escape from Purgatory is blocked while Saint Michael still lives.");
+        return;
+    }
+
     /* Prevent the player from accessing either Mine Town or Mines' End
      * unless they have defeated the Goblin King. Using the stairs or
      * falling through a hole or trap door is blocked, but our hero can

src/dungeon.c

@@ -723,6 +723,8 @@ struct level_map {
                   { "minetn", &minetn_level },
                   { "soko1", &sokoend_level },
                   { "soko4", &sokostart_level },
+                  { "purgatory-1", &purgend_level },
+                  { "purgatory-2", &purgstart_level },
                   { X_START, &qstart_level },
                   { X_LOCATE, &qlocate_level },
                   { X_GOAL, &nemesis_level },