more polyself fallout (trunk only)

     When testing the change of "you can't polymorph into that" to
"you can't polymorph into <a monster type>" I noticed that specifying
high priestess told me that I couldn't become a priest (role monster),
but specifying high priest told me that I couldn't become a high priest
(monster as-is).  Aligned priestess and high priestess aren't separate
monsters; the user-specific string to monster name code found the latter
as a rank title rather than as a monster and couldn't find the former
at all.  This adds those two special monst types to the list of variant
spellings and whatnot that are used to augment name to type lookup.
Since they aren't viable candidates for polyself or for genocide I doubt
that any players ever noticed, so I haven't added a fixes entry for this.

diff --git a/src/mondata.c b/src/mondata.c
index 345612b7ca0b8386f614674383b4ece7752e5153..d2f5b03ab90c8ba56c24230b76aaac8c554548fb 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -1,5 +1,4 @@
 /* NetHack 3.5 mondata.c       $Date$  $Revision$ */
-/*     SCCS Id: @(#)mondata.c  3.5     2007/05/16      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -610,6 +609,10 @@ const char *in_str;
                { "gray-elf",           PM_GREY_ELF },
                { "mindflayer",         PM_MIND_FLAYER },
                { "master mindflayer",  PM_MASTER_MIND_FLAYER },
+           /* More alternates; priest and priestess are separate monster
+              types but that isn't the case for {aligned,high} priests */
+               { "aligned priestess",  PM_ALIGNED_PRIEST },
+               { "high priestess",     PM_HIGH_PRIEST },
            /* Inappropriate singularization by -ves check above */
                { "master of thief",    PM_MASTER_OF_THIEVES },
            /* Potential misspellings where we want to avoid falling back