From cbde1e51fc1475e60e247335f4450f14aeeb379b Mon Sep 17 00:00:00 2001
From: Matthew Cline <zelgadis@sourceforge.net>
Date: Fri, 13 Nov 2009 17:08:46 -0800
Subject: Move some monster descrption code to text file

---
 crawl-ref/source/dat/descript/monsters.txt | 18 +++++++++++++++++-
 crawl-ref/source/describe.cc               | 15 ---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index a6d8023c67..c66876c2a4 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -343,6 +343,13 @@ A powerful dragon with mighty wings.  Her scales seem to shimmer and change colo
 Urug
 
 A rude orc.
+{{
+if you.can_smell() then
+    return "\nHe smells terrible."
+else
+    return ""
+end
+}}
 %%%%
 Wayne
 
@@ -620,6 +627,8 @@ A huge grey slug with folds of wrinkled skin.
 elf
 
 One of the race of elves which inhabits this dreary cave.
+
+This one is remarkably plain looking.
 %%%%
 ettin
 
@@ -1408,7 +1417,14 @@ A slimy dragon, covered in swamp muck. Poisonous gasses dribble from its snout.
 swamp drake
 
 A small and slimy dragon, covered in swamp muck.
-%%%%
+{{
+if you.can_smell() then
+    return "\nIt smells terrible."
+else
+    return ""
+end
+}}
+%%%%%
 swamp worm
 
 A large slimy worm, adept at swimming through the muck of this foul swamp.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 426cba067f..90e518cbed 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2806,11 +2806,6 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
         }
         break;
 
-    case MONS_SWAMP_DRAKE:
-        if (player_can_smell())
-            inf.body << "$It smells horrible.$";
-        break;
-
     case MONS_NAGA:
     case MONS_NAGA_MAGE:
     case MONS_NAGA_WARRIOR:
@@ -2834,11 +2829,6 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
             inf.body <<  "$It has come for your soul!$";
         break;
 
-    case MONS_ELF:
-        // These are only possible from polymorphing or shapeshifting.
-        inf.body << "$This one is remarkably plain looking.$";
-        break;
-
     case MONS_DRACONIAN:
     case MONS_RED_DRACONIAN:
     case MONS_WHITE_DRACONIAN:
@@ -2868,11 +2858,6 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
         inf.body << _describe_demon(mons) << "$";
         break;
 
-    case MONS_URUG:
-        if (player_can_smell())
-            inf.body << "$He smells terrible.$";
-        break;
-
     case MONS_PROGRAM_BUG:
         inf.body << "If this monster is a \"program bug\", then it's "
                 "recommended that you save your game and reload.  Please report "
-- 
cgit v1.2.3-54-g00ecf