From 8a5051e7464fc686880aa6a07e3387b5dfa60c2d Mon Sep 17 00:00:00 2001
From: Matthew Cline <zelgadis@sourceforge.net>
Date: Fri, 13 Nov 2009 21:43:38 -0800
Subject: Move more monster description code to text file.

---
 crawl-ref/source/dat/descript/monsters.txt | 27 +++++++++++++-
 crawl-ref/source/describe.cc               | 58 ++++++++++++------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index c66876c2a4..4130cc33d9 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1,4 +1,14 @@
 %%%%
+# Only for non-uniques nagas.
+__cap-N_suffix
+{{
+if you.race() == "Naga" then
+    return "It is particularly attractive."
+else
+    return "It is strange and repulsive."
+end
+}}
+%%%%
 __cap-T_suffix
 
 You feel a lump in the pit of your stomach.
@@ -299,6 +309,8 @@ A fair-haired mage, wandering and seemingly half-mad with grief and guilt.
 Purgy
 
 An unusually thin troll.
+
+You feel a lump in the pit of your stomach.
 %%%%
 Roxanne
 
@@ -327,6 +339,8 @@ The bane of all young adventurers, Sigmund combines delusions of greatness with
 Snorg
 
 A hairy troll, angry and mean.
+
+You feel a lump in the pit of your stomach.
 %%%%
 Sonja
 
@@ -1263,7 +1277,18 @@ An enormous and very nasty-looking humanoid creature.  Its rocky hide seems to h
 rotting devil
 
 A hideous decaying form.
-%%%%
+{{
+if you.can_smell() then
+    if you.saprovorous() == 3 then
+        return "\nIt smells great!"
+    else
+        return "\nIt stinks."
+    end
+else
+    return ""
+end
+}}
+%%%%%
 rotting hulk
 
 A shambling undead creature, related to the ghoul.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 90e518cbed..248d59df2c 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2780,12 +2780,16 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
     if (isupper(symbol[0]))
         symbol = "cap-" + symbol;
 
-    std::string symbol_prefix = "__";
-    symbol_prefix += symbol;
-    symbol_prefix += "_prefix";
-    inf.prefix = getLongDescription(symbol_prefix);
+    std::string quote2;
+    if (!mons_is_unique(mons.type))
+    {
+        std::string symbol_prefix = "__";
+        symbol_prefix += symbol;
+        symbol_prefix += "_prefix";
+        inf.prefix = getLongDescription(symbol_prefix);
+        quote2 = getQuoteString(symbol_prefix);
+    }
 
-    std::string quote2 = getQuoteString(symbol_prefix);
     if (!inf.quote.empty() && !quote2.empty())
         inf.quote += "$";
     inf.quote += quote2;
@@ -2796,27 +2800,6 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
     // "It wants to drink your blood!" have something going for them. (jpeg)
     switch (mons.type)
     {
-    case MONS_ROTTING_DEVIL:
-        if (player_can_smell())
-        {
-            if (player_mutation_level(MUT_SAPROVOROUS) == 3)
-                inf.body << "$It smells great!$";
-            else
-                inf.body << "$It stinks.$";
-        }
-        break;
-
-    case MONS_NAGA:
-    case MONS_NAGA_MAGE:
-    case MONS_NAGA_WARRIOR:
-    case MONS_GUARDIAN_NAGA:
-    case MONS_GREATER_NAGA:
-        if (you.species == SP_NAGA)
-            inf.body << "$It is particularly attractive.$";
-        else
-            inf.body << "$It is strange and repulsive.$";
-        break;
-
     case MONS_VAMPIRE:
     case MONS_VAMPIRE_KNIGHT:
     case MONS_VAMPIRE_MAGE:
@@ -2869,6 +2852,19 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
         break;
     }
 
+    if (!mons_is_unique(mons.type))
+    {
+        std::string symbol_suffix = "__";
+        symbol_suffix += symbol;
+        symbol_suffix += "_suffix";
+
+        std::string suffix = getLongDescription(symbol_suffix);
+                    suffix += getLongDescription(symbol_suffix + "_examine");
+
+        if (!suffix.empty())
+            inf.body << "$" << suffix;
+    }
+
     // Get information on resistances, speed, etc.
     std::string result = _monster_stat_description(mons);
     if (!result.empty())
@@ -2888,16 +2884,8 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
                        "or items.$";
     }
 
-    std::string symbol_suffix = "__";
-    symbol_suffix += symbol;
-    symbol_suffix += "_suffix";
-    inf.suffix += getLongDescription(symbol_suffix);
-    inf.suffix += getLongDescription(symbol_suffix + "_examine");
-
-    quote2 = getQuoteString(symbol_suffix);
-    if (!inf.quote.empty() && !quote2.empty())
+    if (!inf.quote.empty())
         inf.quote += "$";
-    inf.quote += quote2;
 
 #if DEBUG_DIAGNOSTICS
     if (mons.can_use_spells())
-- 
cgit v1.2.3-54-g00ecf