From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 21 Dec 2021 09:18:45 +0000 (+0200)
Subject: Vampire in a genocided shape
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81a7157d7daa96ad57fb25e9aa04ca540bf78e45;p=nethack

Vampire in a genocided shape

When you genocided a monster a vampire was shapeshifted into,
the vampire might've stayed in the genocided form.
Always revert back to vampire form if we tried to pick a genocided form.
---

diff --git a/src/mon.c b/src/mon.c
index 5088005ed..bee0e0040 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -3964,6 +3964,10 @@ pickvampshape(struct monst* mon)
         mndx = (!rn2(4) && !uppercase_only) ? PM_FOG_CLOUD : PM_VAMPIRE_BAT;
         break;
     }
+
+    if (g.mvitals[mndx].mvflags & G_GENOD)
+        return mon->cham;
+
     return mndx;
 }