Allow Illithids with intrinsic flying to enter into and stay in pools/moats.

Much like the Monk with intrinsic water walking commit (0d4dce6), this
commit allows Illithids that have gained intrinsic flying to go for a
swim, and they'll stay at the bottom of the pool if they have a means of
breathing underwater.

There's a fix here as well. I noticed that when flying or having
intrinsic water walking, you couldn't get back out of the water unless
you climbed out to adjacent dry land. That did not feel right, so now
you can use the up command to step up/fly out of the water.

Author: k21971

doc/evilhack-changelog.md

@@ -3415,4 +3415,6 @@ The following changes to date are:
 - Sling bullets can have object properties
 - New spell - critical healing
 - New player race/role combo - giant Healer
+- Allow Illithids with intrinsic flying to enter into and stay
+  in pools/moats
 

src/do.c

@@ -1215,8 +1215,10 @@ dodown()
         if (trap && (uteetering_at_seen_pit(trap) || uescaped_shaft(trap))) {
             dotrap(trap, TOOKPLUNGE);
             return 1;
-        } else if (IS_POOL(levl[u.ux][u.uy].typ) && HWwalking) {
-            /* Monks that have intrinsic water walking but
+        } else if (IS_POOL(levl[u.ux][u.uy].typ)
+                   && (HWwalking || HFlying)) {
+            /* Monks that have intrinsic water walking,
+               or Illithids that have obtained flight, but
                still wish to go for a dip in the pool */
             drown();
             return 1;
@@ -1312,6 +1314,23 @@ doup()
         return 1;
     }
 
+    /* "up" to get out of a pool if you have
+        intrinsic water walking or flying */
+    if (u.uinwater && (HWwalking || HFlying)) {
+        boolean was_underwater = (Underwater && !Is_waterlevel(&u.uz));
+
+        You("%s out of the water.",
+            HWwalking ? "step up" : "fly");
+        u.uinwater = 0;       /* leave the water */
+        if (was_underwater) { /* restore vision */
+            if (See_underwater)
+                vision_reset();
+            docrt();
+            vision_full_recalc = 1;
+        }
+        return 1;
+    }
+
     if ((u.ux != xupstair || u.uy != yupstair)
         && (!xupladder || u.ux != xupladder || u.uy != yupladder)
         && (!sstairs.sx || u.ux != sstairs.sx || u.uy != sstairs.sy

src/hack.c

@@ -2422,7 +2422,7 @@ boolean newspot;             /* true if called by spoteffects */
             still_inwater = TRUE;
         } else if (Levitation) {
             You("pop out of the %s like a cork!", hliquid("water"));
-        } else if (Flying) {
+        } else if (EFlying) { /* extrinsic source only */
             You("fly out of the %s.", hliquid("water"));
         } else if (EWwalking) { /* extrinsic source only */
             You("slowly rise above the surface.");

src/trap.c

@@ -4613,7 +4613,10 @@ drown()
 
     if (!u.uinwater) {
         You("%s into the %s%c",
-            (Is_waterlevel(&u.uz) || HWwalking) ? "plunge" : "fall",
+            (Is_waterlevel(&u.uz)
+             ? "plunge" : HWwalking
+                        ? "step down" : HFlying
+                                      ? "fly down" : "fall"),
             hliquid(!is_sewage(u.ux, u.uy) ? "water" : "sewage"),
             Amphibious || Swimming ? '.' : '!');
         if (!Swimming && !Is_waterlevel(&u.uz))