From 51c367ada344b5b913e185b5fed99c88a038a1f8 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Fri, 19 Aug 2022 04:49:27 -0700
Subject: [PATCH] locomotion when plucked from saddle

Reported by entrez.  Revise a recent change that made non-animals who
engulf mounted hero cause dismount first.
---
 src/mhitu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/mhitu.c b/src/mhitu.c
index 77f32c639..54e04fc01 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -1166,9 +1166,16 @@ gulpmu(struct monst *mtmp, struct attack *mattk)
             Strcpy(buf, mon_nam(u.usteed));
             urgent_pline("%s %s forward and plucks you off %s!",
                          Some_Monnam(mtmp),
+                         /* 't', purple 'w' */
                          is_animal(mtmp->data) ? "lunges"
-                           : amorphous(mtmp->data) ? "oozes"
-                             : "surges",
+                           /* 'v', air 'E' */
+                           : is_whirly(mtmp->data) ? "whirls"
+                             /* none (some 'v', already whirling) */
+                             : unsolid(mtmp->data) ? "flows"
+                               /* ochre 'j', Juiblex */
+                               : amorphous(mtmp->data) ? "oozes"
+                                 /* none (all AD_ENGL are already covered) */
+                                 : "surges",
                          buf);
             dismount_steed(DISMOUNT_ENGULFED);
         } else {