Make the royal jelly's name and pronoun come out right now that it's a unique.

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

4 files changed, 23 insertions, 3 deletions

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 5fb8161f46..b66fed64bc 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1196,7 +1196,7 @@ rotting hulk
 
 A shambling undead creature, related to the ghoul.
 %%%%
-royal jelly
+the royal jelly
 
 A particularly rich and golden gelatinous thing.
 %%%%
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index ab6c4d4347..2ef1fbb9f2 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -804,7 +804,7 @@ ENDMAP
 NAME:    slime_pit
 PLACE:   Slime:6
 ORIENT:  encompass
-MONS:    royal jelly
+MONS:    the royal jelly
 MONS:    acid blob
 MONS:    great orb of eyes / nothing
 SUBST:   ' : ' .:1,  ' : ' x:1,  ' = .x
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 04262cb1ee..ea44be5c0f 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2282,7 +2282,7 @@ static monsterentry mondata[] = {
 },
 
 {
-    MONS_ROYAL_JELLY, 'J', YELLOW, "royal jelly",
+    MONS_ROYAL_JELLY, 'J', YELLOW, "the royal jelly",
     M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH
         | M_NO_REGEN | M_UNIQUE,
     MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 77cb23bbdf..8421a7eb0a 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1979,6 +1979,9 @@ static std::string _str_monam(const monsters& mon, description_level_type desc,
             break;
         }
     }
+    else
+    {
+    }
 
     // Some monsters might want the name of a different creature.
     int nametype = mon.type;
@@ -2069,6 +2072,20 @@ static std::string _str_monam(const monsters& mon, description_level_type desc,
         result.insert(1, "n");
     }
 
+    if (mons_is_unique(mon.type) && starts_with(result, "the "))
+    {
+        switch (desc)
+        {
+        case DESC_CAP_THE:
+        case DESC_CAP_A:
+            result = upcase_first(result);
+            break;
+
+        default:
+            break;
+        }
+    }
+
     // All done.
     return result;
 }
@@ -2976,6 +2993,9 @@ const char *mons_pronoun(monster_type mon_type, pronoun_type variant,
         case MONS_ERESHKIGAL:
             gender = GENDER_FEMALE;
             break;
+        case MONS_ROYAL_JELLY:
+            gender = GENDER_NEUTER;
+            break;
         default:
             gender = GENDER_MALE;
             break;