FR #2083661: when polymorphed, unique (and named) monsters now retain their

name (but not spells, yet), and use their old speech text if it makes sense
for them to be able to do so.

Polymorphed monsters now retain some of their old flags, like
MF_CREATED_FRIENDLY and MF_GOT_HALF_XP.

If the Royal Jelly is polymorphed into something else then the Slime:6 vaults
will unlock when that monster is killed.

If the Royal Jelly is banished the player will be given a hint that it's gone
and that the vaults will remain locked.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7970 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 1 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 8762ee968d..d18eea0572 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2069,9 +2069,16 @@ enum monster_flag_type
                                      // holiness, regardless of its actual type;
                                      // currently used for abominations created
                                      // via Twisted Resurrection
-    MF_ENSLAVED_SOUL      = 0x8000   // An undead monster soul enslaved by
+    MF_ENSLAVED_SOUL      = 0x8000,  // An undead monster soul enslaved by
                                      // Yredelemnul's power, or the natural
                                      // monster from whom the soul is taken
+
+    MF_NAME_SUFFIX        = 0x10000, // mname is a suffix.
+    MF_NAME_NO_THE        = 0x20000, // mname is a prefix with no "the"
+                                     // between it and the monster type name.
+    MF_NAME_REPLACE       = 0x30000, // mname entirely replaces normal monster
+                                     // name.
+    MF_NAME_MASK          = 0x30000
 };
 
 // Adding slots breaks saves. YHBW.