Moving main monster descriptions out of describe.cc and into mon-data.h

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

1 files changed, 24 insertions, 1449 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 420fb02119..1939c36819 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -4592,6 +4592,23 @@ void describe_monsters(int class_described, unsigned char which_mons)
 
     description = ptr_monam( &mons, DESC_CAP_A );
     description += "$$";
+    
+    // Note: Nearly all of the "long" descriptions have moved to 
+    // mon-data.h, in an effort to give them some locality with the
+    // rest of the monster definition data, and to get them out of
+    // the control logic.  The only sorts of descriptions that should
+    // go here are those that require active decisions about what
+    // sort of message to print (eg "It's beautiful" or "It's ugly" 
+    // depending on player class).  And just between you and me: that's
+    // sort of a dumb idea anyway.  So don't add any more of those.
+    //
+    // In my fantasy world, the long descriptions (and monster data)
+    // wouldn't live in a header file, but in a simple text file
+    // that's easier to edit and easy to read.  Even XML would be better
+    // than what we have today.
+    //
+    // -peterb 4/14/07
+    description += mons_longDesc(menv[which_mons].type);
 
     // Now that the player has examined it, he knows it's a mimic.
     if (mons_is_mimic(mons.type))
@@ -4605,232 +4622,14 @@ void describe_monsters(int class_described, unsigned char which_mons)
         // mv: changed ANOTHER_LAVA_THING to SALAMANDER, added stats and
         //     description
         // (missing) case 250 - MONS_PROGRAM_BUG ??? 16jan2000 {dlb}
-    case MONS_KILLER_BEE_LARVA:
-        description += "A small, powerless larva of killer bee.";
-        break;
-
-    case MONS_QUASIT:
-        description += "A small twisted demon with long sharply pointed tail.";
-        break;
-
-    case MONS_ANGEL:
-        description += "A winged holy being of unnatural beauty. "
-            "It has an aura of brilliant white light. ";
-        break;
-
-    case MONS_HUMAN: 
-        // These should only be possible from polymorphing or shapeshifting.
-        description += "A remarkably nondescript person.  How odd!";
-        break;
-
-    case MONS_GIANT_ANT:
-        description += "A black ant with poisonous pincers,"
-            " about the size of a large dog.";
-        break;
-
-    case MONS_SOLDIER_ANT:
-        description += "A giant ant with large mandibles and a vicious sting.";
-        break;
-
-    case MONS_QUEEN_ANT:
-        description += "A bloated insect, covered in thick chitinous armour."
-            "Now you know where all those ants keep coming from!";
-        break;
-
-    case MONS_ANT_LARVA:
-        description += "A baby ant. Isn't it cute?";
-        break;
-
-    case MONS_GIANT_BAT:
-        description += "A huge black bat.";
-        break;
-
-    case MONS_CENTAUR:
-    case MONS_CENTAUR_WARRIOR:
-        description += "A hybrid with the torso of a "
-            "human atop the body of a large horse. ";
-        if (class_described == MONS_CENTAUR_WARRIOR)
-            description += "It looks strong and aggressive. ";
-        break;
-
-    case MONS_YAKTAUR:
-    case MONS_YAKTAUR_CAPTAIN:
-        description += "Like a centaur, but half yak. ";
-        if (class_described == MONS_YAKTAUR_CAPTAIN)
-            description += "It looks very strong and aggressive. ";
-        break;
-
-    case MONS_RED_DEVIL:
-        description += "The Red Devil is slightly shorter than a human, "
-            "but muscular and covered in spikes and horns. Two "
-            "short wings sprout from its shoulders.";
-        break;
 
     case MONS_ROTTING_DEVIL:
-        description += "A hideous decaying form.";
         if (you.species == SP_GHOUL)
             description += "$It smells great!";
         else if (player_can_smell())
             description += "$It stinks.";
         break;
 
-    case MONS_HAIRY_DEVIL:
-        description += "A small humanoid demon covered in brown hair. "
-            "Watch out - it may have fleas!";
-        break;
-
-    case MONS_ICE_DEVIL:
-        description += "A man-sized demon covered in glittering ice.";
-        break;
-
-    case MONS_BLUE_DEVIL:
-        description += "A strange and nasty blue thing. It looks cold.";
-        break;
-
-    case MONS_IRON_DEVIL:
-        description += "A hideous humanoid figure with metal skin.";
-        break;
-
-    case MONS_ETTIN:
-        description += "A large, two headed humanoid. Most often seen "
-            "wielding two weapons, so that the heads will have one less "
-            "thing to bicker about.";
-        break;
-
-    case MONS_FUNGUS:
-        description += "A lumpy grey fungus, "
-            "growing well in the dank underground dungeon.";
-        break;
-
-    case MONS_GOBLIN:
-        description += "A race of short, ugly and unfriendly humanoids.";
-        break;
-
-    case MONS_HOUND:
-        description += "A fearsome hunting dog.";
-        break;
-
-    case MONS_HELL_HOUND:
-        description += "A huge black dog, with glowing red eyes and "
-            "smoke pouring from its fanged mouth.";
-        break;
-
-    case MONS_WAR_DOG:
-        description += "A vicious dog, trained to kill."
-            "Its neck is protected by massive spiked collar.";
-        break;
-
-    case MONS_IMP:
-        description += "A small, ugly minor demon.";
-        break;
-
-    case MONS_JACKAL:
-        description += "A small, dog-like scavenger. Packs of these creatures "
-            "roam the underworld, searching for carrion to devour.";
-        break;
-
-    case MONS_KILLER_BEE:
-        description += "A giant bee, bearing a deadly barb which can sting "
-            "repeatedly.";
-        break;
-
-    case MONS_QUEEN_BEE:
-        description += "Even larger and more dangerous-looking than its "
-            "offspring, this creature wants you out of its hive. Now!";
-        break;
-
-    case MONS_BUMBLEBEE:
-        description += "A very large and fat hairy bee.";
-        break;
-
-    case MONS_MANTICORE:
-        description += "A hideous cross-breed, bearing the features of a "
-            "human and a lion, with great bat-like wings. Its tail "
-            "bristles with spikes, which can be loosed at potential prey.";
-        break;
-
-    case MONS_NECROPHAGE:
-        description += "A vile undead creation of the most unholy necromancy,"
-            " these creatures are made from the decaying corpses "
-            "of humanoid creatures.  They exist to spread disease "
-            "and decay, and gain power from the decaying corpses "
-            "of other beings.";
-        break;
-
-    case MONS_GHOUL:
-        description += "An undead humanoid creature created from the decaying "
-            "corpse by some unholy means of necromancy. It "
-            "exists to spread disease and decay, and gains power"
-            "from the decaying corpses same way as necrophage does.";
-        break;
-
-    case MONS_ORC:
-        description += "An ugly subterranean race, orcs combine the"
-            " worst features of humans, pigs, and several"
-            " other unpleasant creatures.";
-        break;
-
-    case MONS_ORC_KNIGHT:
-        description += "A heavily armoured orc, covered in scars from many "
-            "past battles.";
-        break;
-
-    case MONS_ORC_PRIEST:
-        description += "A servant of the ancient and cruel gods of the orcs,"
-            " dressed in long robe. It continually mumbles strange prayers. "
-            "Hope that they remain unheard.";
-        break;
-
-    case MONS_ORC_HIGH_PRIEST:
-        description += "An exalted servant of the orc god.";
-        break;
-
-    case MONS_ORC_SORCERER:
-        description += "An orc who draws magical power from Hell.";
-        break;
-
-    case MONS_ORC_WARLORD:
-        description += "A very large and strong looking orc.";
-        break;
-
-    case MONS_ORC_WARRIOR:
-        description += "An armoured orc, obviously experienced in the ways of "
-            "hacking other creatures apart.";
-        break;
-
-    case MONS_ORC_WIZARD:
-        description += "While orcs are generally quite stupid, occasionally"
-            " one develops an aptitude for magic.";
-        break;
-
-    case MONS_PHANTOM:
-        description += "A transparent man-like undead spirit.";
-        break;
-
-    case MONS_RAT:
-        description += "Rats which have grown large and aggressive in "
-            "the pestilential dungeon environment.";
-        break;
-
-    case MONS_GREY_RAT:
-        description += "A very large grey rat.";
-        break;
-
-    case MONS_GREEN_RAT:
-        description += "A very large rat, with hair and skin of a "
-            "most peculiar green colour.";
-        break;
-
-    case MONS_ORANGE_RAT:
-        description += "A huge rat, with weird knobbly orange skin."
-            "It glows with unholy energies. ";
-        break;
-
-    case MONS_SCORPION:
-        description += "A giant black scorpion, its body covered in thick"
-            " armour plating, and its tail tipped by a nasty "
-            "venomous sting.";
-        break;
 
 /* ******************************************************************
 // the tunneling worm is no more ...
@@ -4841,231 +4640,11 @@ void describe_monsters(int class_described, unsigned char which_mons)
         break;
 ****************************************************************** */
 
-    case MONS_BRAIN_WORM:
-        description += "A slimy mauve worm with a greatly distended head.";
-        break;
-
-    case MONS_LAVA_WORM:
-        description += "A vicious red worm which swims through molten rock.";
-        break;
-
-    case MONS_SPINY_WORM:
-        description += "A great black worm, its many-segmented body covered "
-            "in spiky plates of chitinous armour. Acidic venom drips "
-            "from its toothy maw.";
-        break;
-
-    case MONS_SWAMP_WORM:
-        description += "A large slimy worm, adept at swimming through the "
-            "muck of this foul swamp.";
-        break;
-
-    case MONS_WORM:
-        description += "A giant worm, with unusually large teeth.";
-        break;
-
-    case MONS_UGLY_THING:
-        description += "An ugly thing. Yuck.";
-        break;
-
-    case MONS_VERY_UGLY_THING:
-        description += "A very ugly thing. Double yuck.";
-        break;
-
-    case MONS_FIRE_VORTEX:
-        description += "A swirling cloud of flame.";
-        break;
-
-    case MONS_SPATIAL_VORTEX:
-        description += "A crazily shifting twist in the fabric of reality.";
-        break;
-
-    case MONS_ABOMINATION_SMALL:
-        description +=
-            "A hideous form, created or summoned by some arcane process.";
-        break;
-
-    case MONS_ABOMINATION_LARGE:
-        description += "A huge and hideous form, created or summoned "
-            "by some arcane process.";
-        break;
-
-    case MONS_YELLOW_WASP:
-        description += "A giant wasp covered with thick plates of yellow "
-            "chitinous armour.";
-        break;
-
-    case MONS_RED_WASP:
-        description += "A huge red wasp with a viciously barbed stinger.";
-        break;
-
-    case MONS_ZOMBIE_SMALL:
-        description += "A corpse raised to undeath by necromancy. ";
-        break;
-    case MONS_ZOMBIE_LARGE:
-        description += "A large corpse raised to undeath by necromancy. ";
-        break;
-
-    case MONS_SIMULACRUM_LARGE:
-    case MONS_SIMULACRUM_SMALL:
-        description += "An ice replica of a monster, that's animated by "
-            "the powers of necromancy. ";
-        break;
-
-    case MONS_CYCLOPS:
-        description += "A giant with one eye in the centre of its forehead."
-            " Despite their lack of binocular vision, cyclopes "
-            "throw boulders with fearsome accuracy.";
-        break;
-
-    case MONS_DRAGON:
-        description += "A great reptilian beast, covered in thick green "
-            "scales and with two huge bat-like wings. Little trails "
-            "of smoke spill from its toothy maw.";
-        break;
-
-    case MONS_GOLDEN_DRAGON:
-        description += "A great dragon covered in shining golden scales. ";
-        break;
-
-    case MONS_ICE_DRAGON:
-        description +=
-            "Like a normal dragon, only white and covered in frost.";
-        break;
-
-    case MONS_IRON_DRAGON:
-        description += "A very heavy and apparently flightless dragon.";
-        break;
-
-    case MONS_MOTTLED_DRAGON:
-        description += "A small dragon with strangely mottled scales.";
-        break;
-
-    case MONS_QUICKSILVER_DRAGON:
-        description += "A long and sinuous dragon, seemingly more neck and "
-            "tail than anything else. Its skin shines like molten mercury, "
-            "and magical energies arc from its pointed snout.";
-        break;
-
-    case MONS_SHADOW_DRAGON:
-        description += "A great shadowy shape, radiating evil and death.";
-        break;
-
-    case MONS_SKELETAL_DRAGON:
-        description += "A huge undead abomination, pieced together from "
-            "the broken bones of many dragons.";
-        break;
-
-    case MONS_STEAM_DRAGON:
-        description += "A relatively small grey dragon, with steam pouring "
-            "from its mouth.";
-        break;
-
-    case MONS_STORM_DRAGON:
-        description += "A huge and very powerful dragon. "
-            "Sparks crackle along its enormous scaly wings.";
-        break;
-
-    case MONS_SWAMP_DRAGON:
-        description += "A slimy dragon, covered in swamp muck. "
-            "Poisonous gasses dribble from its snout.";
-        break;
-
-    case MONS_SERPENT_OF_HELL:
-        description += "A huge red glowing dragon, burning with hellfire. ";
-        break;
-
     case MONS_SWAMP_DRAKE:
-        description += "A small and slimy dragon, covered in swamp muck. ";
         if (player_can_smell())
             description += "It smells horrible.";
         break;
 
-    case MONS_DEATH_DRAKE:
-        description += "A small dragon, radiating evil.";
-        break;
-
-    case MONS_FIREDRAKE:
-        description += "A small dragon, puffing clouds of smoke.";
-        break;
-
-    case MONS_TWO_HEADED_OGRE:
-        description += "A huge ogre with two heads on top of a "
-            "bloated ogre body. It is capable of holding a weapon "
-            "in each giant hand.";
-        break;
-
-    case MONS_FIEND:
-        description += "One of the most fearsome denizens of any Hell. "
-            "A huge and powerful demon wreathed in hellfire,"
-            " with great scaly wings.";
-        break;
-
-    case MONS_ICE_FIEND:
-        description += "One of the most terrible denizens of the "
-            "many Hells, the Ice Fiend is a huge icy figure, "
-            "covered in frost and wreathed in freezing air.";
-        break;
-
-    case MONS_SHADOW_FIEND:
-        description += "One of the most terrible denizens of the many Hells, "
-            "this horrible being appears as a great mass of "
-            "writhing shadows which occasionally reveal a huge, "
-            "horned skeleton.";
-        break;
-
-    case MONS_GIANT_SPORE:
-        description += "A volatile floating ball of spores, "
-            "covered in knobbly rhizome growths.";
-        break;
-
-    case MONS_HOBGOBLIN:
-        description += "A larger and stronger relatives of goblins.";
-        break;
-
-    case MONS_ICE_BEAST:
-        description +=
-            "A terrible creature, formed of snow and crystalline ice. "
-            "Its feet leave puddles of icy water on the floor.";
-        break;
-
-    case MONS_KOBOLD:
-        description += "Reputedly the creation of an ancient demon-god, "
-            "kobolds are small goblin-like creatures with canine heads.";
-        break;
-
-    case MONS_BIG_KOBOLD:
-        description += "An unusually large kobold.";
-        break;
-
-    case MONS_KOBOLD_DEMONOLOGIST:
-        description += "A kobold who has learned to summon and direct demons.";
-        break;
-
-    case MONS_LICH:
-        description +=
-            "A wizard who didn't want to die, a Lich is a skeletal,"
-            " desiccated corpse kept alive by a mighty exercise of "
-            "necromancy.  These undead creatures can wield great "
-            "magic and are best avoided by all but the most confident.";
-        break;
-
-    case MONS_ANCIENT_LICH:
-        description += "A lich who has grown mighty over countless years. ";
-        break;
-
-    case MONS_MUMMY:
-        description += "An undead figure covered in "
-            "bandages and embalming fluids, "
-            "compelled to walk by an ancient curse. "
-            "It radiates a malign aura to those who intrude on its domain. ";
-        break;
-
-    case MONS_GUARDIAN_MUMMY:
-        description += "An ancient warrior, embalmed "
-            "and cursed to walk in undeath for eternity.";
-        break;
-
     case MONS_GREATER_MUMMY:
     case MONS_MUMMY_PRIEST:
         description += "The embalmed and undead corpse of an ancient ";
@@ -5081,15 +4660,6 @@ void describe_monsters(int class_described, unsigned char which_mons)
     case MONS_NAGA_WARRIOR:
     case MONS_GUARDIAN_NAGA:
     case MONS_GREATER_NAGA:
-        if (you.species == SP_NAGA)
-            description = "An attractive";
-        else
-            description = "A strange";
-
-        description += " hybrid; human from the chest up,"
-            " with a scaly, muscular torso trailing off like "
-            " that of a snake.  ";
-
         switch (class_described)
         {
         case MONS_GUARDIAN_NAGA:
@@ -5106,586 +4676,32 @@ void describe_monsters(int class_described, unsigned char which_mons)
             description += "It bears scars of many past battles. ";
             break;
         }
-        break;
-
-    case MONS_OGRE:
-        description += "A larger, uglier and fatter relative "
-            "of orcs and goblins.";
-        break;
-
-    case MONS_OGRE_MAGE:
-        description += "A rare breed of ogre, skilled in the use of magic.";
-        break;
-
-    case MONS_PLANT:
-        description += "Few plants can grow in the unpleasant dungeon "
-            "environment, but some have managed to adapt and even thrive "
-            "underground in the absence of the sun.";
-        break;
-
-    case MONS_OKLOB_PLANT:
-        description += "A vicious plant, dripping with vitriol.";
-        break;
-
-    case MONS_RAKSHASA:
-    case MONS_RAKSHASA_FAKE:
-        description += "A type of demon who comes to the material world in "
-            "search of power and knowledge. Rakshasas are experts"
-            " in the art of illusion, among other things.";
-        break;
-
-    case MONS_SNAKE:
-        description += "The common dungeon snake. ";
-        break;
-
-    case MONS_BLACK_SNAKE:
-        description += "A large black snake. ";
-        break;
-
-    case MONS_BROWN_SNAKE:
-        description += "A large brown snake.";
-        break;
-
-    case MONS_GREY_SNAKE:
-        description += "A very large grey python.";
-        break;
-
-    case MONS_LAVA_SNAKE:
-        description += "A burning red snake which rears up from pools "
-            "of lava and tries to bite you.";
-        break;
-
-    case MONS_SMALL_SNAKE:
-        description += "The lesser dungeon snake.";
-        break;
-
-    case MONS_YELLOW_SNAKE:
-        description += "A large yellow tubular reptile.";
-        break;
-
-    case MONS_GIANT_NEWT:
-        description += "Several times the size of a normal newt, but still "
-            "not really impressive.";
-        break;
-
-    case MONS_GIANT_GECKO:
-        description += "A lizard with pads on its toes allowing it to cling "
-            "to walls and ceilings.  It's much larger than a normal gecko... "
-            "perhaps it's something in the water?";
-        break;
-
-    case MONS_GIANT_IGUANA:
-    case MONS_GIANT_LIZARD:
-        description += "A huge lizard with great crunching jaws.";
-        break;
-
-    case MONS_GILA_MONSTER:
-        description += "A large lizard with brightly coloured stripes and "
-            "splotches.";
-        break;
-
-    case MONS_KOMODO_DRAGON:
-        description += "An enormous monitor lizard.  It's more than capable "
-            "of preying on large animals.  Bits of fetid and rotting flesh "
-            "from its last few meals are stuck in its teeth.";
-        break;
-
-    case MONS_LINDWURM: 
-        description += "A small serpentine dragon with a pair of strong "
-            "forelimbs.  Its thick scales give off an eerie green glow.";
-        break;
-
-    case MONS_TROLL:
-        description +=
-            "A huge, nasty-looking creature. Its thick and knobbly hide "
-            "seems to heal almost instantly from most wounds.";
-        break;
-
-    case MONS_DEEP_TROLL:
-        description += "A stooped troll.";
-        break;
-
-    case MONS_IRON_TROLL:
-        description +=
-            "A great troll, plated with thick scales of rusty iron.";
-        // you can't see its hide, but think it's thick and kobbly, too :P {dlb}
-        //jmf: I thought its skin *was* the rusty iron. If so, ought to change
-        //     shatter_monsters in spells4.cc.
-        break;
-
-    case MONS_ROCK_TROLL:
-        description +=
-            "An enormous and very nasty-looking humanoid creature. Its "
-            "rocky hide seems to heal almost instantaneously from most wounds.";
-        break;
-
-    case MONS_UNSEEN_HORROR:
-        description +=
-            "These creatures are usually unseen by the eyes of most,"
-            " and those few who have seen them would rather not have.";
+        if (you.species == SP_NAGA)
+            description = "It is particularly attractive";
+        else
+            description = "It is strange and repulsive. ";
         break;
 
     case MONS_VAMPIRE:
-        description += "A powerful undead.";
         if (you.is_undead == US_ALIVE)
             description += " It wants to drink your blood! ";
         break;
 
     case MONS_VAMPIRE_KNIGHT:
-        description +=
-            "A powerful warrior, with skills undiminished by undeath.";
         if (you.is_undead == US_ALIVE)
             description += " It wants to drink your blood! ";
         break;
 
     case MONS_VAMPIRE_MAGE:
-        description += "Undeath has not lessened this powerful mage.";
         if (you.is_undead == US_ALIVE)
             description += " It wants to drink your blood! ";
         break;
 
-    case MONS_WRAITH:
-        description += "This undead spirit appears as a cloud of black mist "
-            "surrounding an insubstantial skeletal form. Its eyes "
-            "burn bright with unholy malevolence.";
-        break;
-
-    case MONS_FREEZING_WRAITH:
-        description += "A cloud of freezing air surrounding an incorporeal "
-            "skeletal form.";
-        break;
-
-    case MONS_SHADOW_WRAITH:
-        description += "A mist-wreathed skeletal shadow hanging in mid-air, "
-            "this creature is almost invisible even to your enhanced sight. ";
-        // assumes: to read this message, has see invis
-        break;
-
-    case MONS_YAK:
-        description += "The common dungeon yak, covered in shaggy yak hair "
-            "and bearing a nasty pair of yak horns.";
-        break;
-
-    case MONS_DEATH_YAK:
-        description += "A larger and beefier relative of the common dungeon "
-            "yak. Its little red eyes gleam with hunger for living flesh.";
-        break;
-
-    case MONS_WYVERN:
-        description += "A dragon-like creature with long sharply pointed tail."
-            " Although smaller and less formidable than true dragons, "
-            "wyverns are nonetheless a foe to be reckoned with.";
-        break;
-
-    case MONS_GIANT_EYEBALL:
-        description += "A giant eyeball, with a captivating stare.";
-        break;
-
-    case MONS_GREAT_ORB_OF_EYES:
-        description += "A levitating ball, covered in malignant eyes.";
-        break;
-
-    case MONS_EYE_OF_DEVASTATION:
-        description += "A huge eyeball, encased in a levitating globe of "
-            "incandescent energy. ";
-        break;
-
-    case MONS_SHINING_EYE:
-        description += "A huge and strangely deformed eyeball, "
-            "pulsating with light. "
-            "Beauty is certainly nowhere to be found " "in this beholder. ";
-        break;
-
-    case MONS_EYE_OF_DRAINING:
-        description +=
-            "These hovering horrors are especially loathed by wizards.";
-        break;
-
-    case MONS_WIGHT:
-        description += "An ancient warrior, kept in a state of undeath "
-            "by its will to live.";
-        break;
-
-    case MONS_WOLF_SPIDER:
-        description += "A large hairy spider with vicious mandibles, "
-            "roaming the dungeon in search of food.";
-        break;
-
-    case MONS_REDBACK:
-        description += "A vicious black spider with a splash of red on its "
-            "swollen abdomen. Its mandibles drip with lethal poison.";
-        break;
-
-    case MONS_SHADOW:
-        description +=
-            "An wisp of unliving shadow, drifting on the edge of vision.";
-        break;
-
-    case MONS_HUNGRY_GHOST:
-        description += "The undead form of someone who died of starvation,"
-            " this creature wants the same thing to happen to you!";
-        break;
-
-    case MONS_BUTTERFLY:
-        description += "A large multicoloured butterfly with beautifully "
-            "patterned wings.";
-        break;
-
-    case MONS_WANDERING_MUSHROOM:
-        description += "A large, fat mushroom.";
-        break;
-
-    case MONS_EFREET:
-        description +=
-            "A huge and muscular figure engulfed in a cloud of searing flame.";
-        break;
-
-    case MONS_GIANT_ORANGE_BRAIN:
-        description += "A huge wrinkled brain, floating just off the floor."
-            " Every now and then it seems to pulsate.";
-        break;
-
-    case MONS_GIANT_BEETLE:
-        description += "A huge black beetle with great crunching mandibles "
-            "and very hard chitinous armour.";
-        break;
-
-    case MONS_BORING_BEETLE:
-        description +=
-            "A large brown beetle with huge, rock-crushing mandibles.";
-        break;
-
-    case MONS_BOULDER_BEETLE:
-        description +=
-            "A huge grey beetle with an almost impenetrable rocky carapace.";
-        break;
-
-    case MONS_FLYING_SKULL:
-        description +=
-            "Unholy magic keeps a disembodied undead skull hovering "
-            "above the floor. It has a nasty set of teeth.";
-        break;
-
-    case MONS_MINOTAUR:
-        description += "A large muscular human with the head of a bull. "
-            "It makes its home in secluded labyrinths.";
-        break;
-
-    case MONS_SLIME_CREATURE:
-        description +=
-            "An icky glob of slime, which slithers along the ground.";
-        break;
-
-    case MONS_HELLION:
-        description += "A frightful demon, covered in roaring hellfire.";
-        break;
-
-    case MONS_TORMENTOR:
-        description += "This malign devil is covered in all manner "
-            "of claws, spines and cruel hooks.";
-        break;
-
     case MONS_REAPER:
-        description += "A skeletal form wielding a giant scythe. ";
         if (you.is_undead == US_ALIVE)
             description += "It has come for your soul!";
         break;
 
-    case MONS_SOUL_EATER:
-        description +=
-            "This greater demon looks like a shadow gliding through "
-            "the air towards you. It radiates an intense aura of negative power.";
-        break;
-
-    case MONS_BEAST:
-        description += "A weird and hideous cross between beast and human.";
-        break;
-
-    case MONS_GLOWING_SHAPESHIFTER:
-        description += "A shapeshifter who has lost control over its "
-            "transformations, and is constantly changing form.";
-        break;
-
-    case MONS_SHAPESHIFTER:
-        description += "A weird creature with the power to change its form. "
-            "It is very rarely observed alive in its natural state.";
-        break;
-
-    case MONS_GIANT_MITE:
-        description += "A large arachnid with vicious poisoned mouth-parts.";
-        break;
-
-    case MONS_GRIFFON:
-    case MONS_HIPPOGRIFF:
-        description += "A large creature with the hindquarters of a ";
-        if (class_described == MONS_HIPPOGRIFF)
-            description += "horse";
-        else
-            description += "lion";
-        description += " and the wings, head, and talons of a great eagle. ";
-        break;
-
-    case MONS_HYDRA:
-        description +=
-            "A great reptilian beast, distantly related to the dragon."
-            " It has many heads, and the potential to grow many more!";
-        break;
-
-    case MONS_SKELETON_SMALL:   //MONS_SMALL_SKELETON:
-    case MONS_SKELETON_LARGE:   //MONS_LARGE_SKELETON:
-        description +=
-            "A skeleton compelled to unlife by the exercise of necromancy.";
-        break;
-
-    case MONS_SKELETAL_WARRIOR:
-        description += "The vicious and heavily armed skeleton of a humanoid "
-            "creature, animated by unholy power.";
-        break;
-
-    case MONS_HELL_KNIGHT:
-        description += "A heavily armoured warrior, in league with the powers"
-            " of Hell.";
-        break;
-
-    case MONS_WIZARD:
-        description += "An rather eccentric person, dabbling in all sorts of"
-            " arcanities.";
-        break;
-
-    case MONS_NECROMANCER:
-        description +=
-            "A wizard specializing in the practices of necromantic magic.";
-        break;
-
-    case MONS_GNOLL:
-        description +=
-            "A taller and better equipt relative of goblins and orcs.";
-        break;
-
-    case MONS_CLAY_GOLEM:
-        description += "A huge animated clay statue.";
-        break;
-
-    case MONS_WOOD_GOLEM:
-        description += "An animated wooden statue.";
-        break;
-
-    case MONS_STONE_GOLEM:
-        description += "A huge animated stone statue.";
-        break;
-
-    case MONS_IRON_GOLEM:
-        description += "A huge animated metal statue.";
-        break;
-
-    case MONS_CRYSTAL_GOLEM:
-        description += "A huge animated crystal statue.";
-        break;
-
-    case MONS_TOENAIL_GOLEM:
-        description += "A huge animated statue made entirely from toenail "
-            "clippings. Some people just have too much time on their hands.";
-        break;
-
-    case MONS_ELECTRIC_GOLEM:
-        description += "An animated figure made completely of electricity. ";
-        break;
-
-    case MONS_EARTH_ELEMENTAL:
-        description += "A spirit drawn from the elemental plane of earth, "
-            "which exists in this world by inhabiting a lump of earth and rocks.";
-        break;
-
-    case MONS_FIRE_ELEMENTAL:
-        description += "A spirit drawn from the elemental plane of fire, "
-            "which exists in this world as a brilliant column of raging flames.";
-        break;
-
-    case MONS_AIR_ELEMENTAL:
-        description += "A spirit drawn from the elemental plane of air. "
-            "It exists in this world as a swirling vortex of air, "
-            "often dissipating and reforming.";
-        break;
-
-    case MONS_WATER_ELEMENTAL:
-        description += "A spirit drawn from the elemental plane of water. "
-            "It exists on this world as part of a body of water.";
-        break;
-
-    case MONS_SPECTRAL_WARRIOR: // spectre
-        description += "A hideous translucent green undead spirit.";
-        break;
-
-    case MONS_CURSE_TOE:
-        description += "A disembodied toe, hanging in the air and"
-            " radiating an intense field of negative energy.";
-        break;
-
-    case MONS_PULSATING_LUMP:
-        description += "A revolting glob of writhing flesh.";
-        break;
-
-    case MONS_OOZE:
-        description += "A disgusting glob of grey sludge.";
-        break;
-
-    case MONS_BROWN_OOZE:
-        description += "A viscous liquid, flowing along the floor "
-            "in search of organic matter to corrode. ";
-        break;
-
-    case MONS_DEATH_OOZE:
-        description += "A putrid mass of decaying flesh. ";
-        break;
-
-    case MONS_GIANT_AMOEBA:
-        description += "A pulsating lump of protoplasm. ";
-        break;
-
-    case MONS_JELLY:
-        description += "A pulsating mass of acidic protoplasm. It can and "
-            "will eat almost anything, and grows a little each time...";
-        break;
-
-    case MONS_AZURE_JELLY:
-        description += "A frosty blob of bright blue cytoplasm. ";
-        break;
-
-    case MONS_ACID_BLOB:
-        description +=
-            "A lump of sickly green flesh, dripping with lethal acid.";
-        break;
-
-    case MONS_JELLYFISH:
-        description += "A pulsating glob of transparent flesh, waiting just "
-            "below the surface to sting you with its many tentacles.";
-        break;
-
-    case MONS_ROYAL_JELLY:
-        description += "A particularly rich and golden gelatinous thing. ";
-        break;
-
-    case MONS_FIRE_GIANT:
-        description += "A huge ruddy humanoid with bright hair. ";
-        break;
-
-    case MONS_FROST_GIANT:
-        description += "A huge blue humanoid with hoarfrost hair.";
-        break;
-
-    case MONS_HILL_GIANT:
-        description +=
-            "Although one of the smaller giant varieties, this hill giant is still big enough to be dangerous.";
-        break;
-
-    case MONS_STONE_GIANT:
-        description +=
-            "A gigantic humanoid with grey skin almost as hard as rock. "
-            "It carries several boulders - are you up for a game of 'catch'?";
-        break;
-
-    case MONS_TITAN:
-        description += "This lightning-limned humanoid is unusually large "
-            "and powerful, even among giants.";
-        break;
-
-    case MONS_FLAYED_GHOST:
-        description += "A hideous undead creature, with torn skin hanging "
-            "from an emaciated body.";
-        break;
-
-    case MONS_INSUBSTANTIAL_WISP:
-        description += "A thin wisp of floating gas.";
-        break;
-
-    case MONS_VAPOUR:
-        description += "A normally invisible cloud of weird-looking vapour.";
-        break;
-
-    case MONS_DANCING_WEAPON:
-        description += "A weapon dancing in the air. ";
-        break;
-
-    case MONS_ELEPHANT_SLUG:
-        description += "A huge grey slug with folds of wrinkled skin. ";
-        break;
-
-    case MONS_GIANT_SLUG:
-        description += "A huge and disgusting gastropod. ";
-        break;
-
-    case MONS_GIANT_SNAIL:
-        description +=
-            "A huge and disgusting gastropod with light green shell. ";
-        break;
-
-    case MONS_SHEEP:
-        description += "A stupid woolly animal, with murder in its eyes. ";
-        break;
-
-    case MONS_HOG:
-        description += "A large, fat and very ugly pig. ";
-        break;
-
-    case MONS_HELL_HOG:
-        description += "A large, fat and very ugly pig, suckled "
-            "in the pits of Hell. ";
-        break;
-
-    case MONS_GIANT_MOSQUITO:
-        description += "A huge, bloated mosquito. It looks diseased.";
-        break;
-
-    case MONS_GIANT_CENTIPEDE:
-        description += "It has a lot of legs.";
-        break;
-
-    case MONS_GIANT_BLOWFLY:
-        description += "A huge and irritating fly.";
-        break;
-
-    case MONS_GIANT_FROG:
-        description +=
-            "It probably didn't get this big by eating little insects.";
-        break;
-
-    case MONS_GIANT_BROWN_FROG:
-        description += "A very large and vicious-looking carnivorous frog. "
-            "Its knobbly brown skin blends in with the rough rock of your surroundings.";
-        break;
-
-    case MONS_SPINY_FROG:
-        description +=
-            "Although slightly smaller than its cousin, the giant brown"
-            " frog, the spiny frog makes up for lack of size by being"
-            " covered in wickedly barbed spines and spurs.";
-        break;
-
-    case MONS_BLINK_FROG:
-        description +=
-            "A weird-looking frog, constantly blinking in and out of reality.";
-        break;
-
-    case MONS_GIANT_COCKROACH:
-        description += "A large brown cockroach.";
-        break;
-
-    case MONS_PIT_FIEND:
-        description += "A huge winged fiend with incredibly tough skin.";
-        break;
-
-    case MONS_GARGOYLE:
-        description += "A hideous stone statue come to life.";
-        break;
-
-    case MONS_METAL_GARGOYLE:
-        description += "A hideous metal statue come to life.";
-        break;
-
-    case MONS_MOLTEN_GARGOYLE:
-        description += "A hideous melting stone statue come to life.";
-        break;
-
     case MONS_ELF: 
     case MONS_DEEP_ELF_SOLDIER:
     case MONS_DEEP_ELF_FIGHTER:
@@ -5699,8 +4715,6 @@ void describe_monsters(int class_described, unsigned char which_mons)
     case MONS_DEEP_ELF_ANNIHILATOR:
     case MONS_DEEP_ELF_SORCERER:
     case MONS_DEEP_ELF_DEATH_MAGE:
-        description +=
-            "One of the race of elves which inhabits this dreary cave.$";
         switch (class_described)
         {
 
@@ -5765,202 +4779,6 @@ void describe_monsters(int class_described, unsigned char which_mons)
         }
         break;
 
-    case MONS_WHITE_IMP:
-        description += "A small and mischievous minor demon. ";
-        break;
-
-    case MONS_LEMURE:
-        description += "A vaguely humanoid blob of putrid white flesh. ";
-        break;
-
-    case MONS_UFETUBUS:
-        description += "A chattering and shrieking minor demon. ";
-        break;
-
-    case MONS_MANES:
-        description += "An ugly, twisted little minor demon. ";
-        break;
-
-    case MONS_MIDGE:
-        description += "A small flying demon. ";
-        break;
-
-    case MONS_NEQOXEC:
-        description += "A weirdly shaped demon. ";
-        break;
-
-    case MONS_ORANGE_DEMON:
-        description += "A bright orange demon with a venomous stinger. ";
-        break;
-
-    case MONS_HELLWING:
-        description +=
-            "A hideous skeletal demon, with wings of ancient withered skin. ";
-        break;
-
-    case MONS_SMOKE_DEMON:
-        description += "A writhing cloud of smoke hanging in the air. ";
-        break;
-
-    case MONS_YNOXINUL:
-        description += "A demon with shiny metallic scales. ";
-        break;
-
-    case MONS_EXECUTIONER:
-        description += "A horribly powerful demon. ";
-        break;
-
-    case MONS_GREEN_DEATH:
-        description +=
-            "A bloated form covered in oozing sores and exhaling clouds of lethal poison. ";
-        break;
-
-    case MONS_BLUE_DEATH:
-        description += "A blue greater demon. ";
-        break;
-
-    case MONS_BALRUG:
-        description +=
-            "A huge and very powerful demon, wreathed in fire and shadows. ";
-        break;
-
-    case MONS_CACODEMON:
-        description += "A hideously ugly demon of rage and legendary power. ";
-        break;
-
-    case MONS_DEMONIC_CRAWLER:
-        description += "A long and bloated body, supported by "
-            "dozens of short legs and topped with an evil-looking head. ";
-        break;
-
-    case MONS_SUN_DEMON:
-        description +=
-            "A demonic figure shining with the light and fury of a fallen star.";
-        break;
-
-    case MONS_SHADOW_IMP:
-        description += "A small and shadowy minor demon.";
-        break;
-
-    case MONS_SHADOW_DEMON:
-        description += "A mysterious demonic figure,"
-            " constantly blurring into multiple shadows of itself.";
-        break;
-
-    case MONS_LOROCYPROCA:
-        description += "A tall and gaunt figure, "
-            "draped in long robes which flow as if alive.";
-        break;
-
-    case MONS_GERYON:
-        description +=
-            "A huge and slithery arch-demon, guarding the gates of Hell. ";
-        break;
-
-    case MONS_DISPATER:
-        description += "The lord of the Iron City of Dis. ";
-        break;
-
-    case MONS_ASMODEUS:
-        description +=
-            "One of the arch-demons who dwell in the depths of Hell. ";
-        break;
-
-    case MONS_ANTAEUS:
-        description += "A great titan who lives in the depths of Cocytus. ";
-        break;
-
-    case MONS_ERESHKIGAL:
-        description +=
-            "A fearsome arch-fiend who rules the deathly netherworld of Tartarus. ";
-        break;
-
-    case MONS_VAULT_GUARD:
-        description += "A heavily armed and armoured guardian of the Vaults. ";
-        break;
-
-    case MONS_CURSE_SKULL:
-        description +=
-            "A charred skull floating in the air and rotating slowly. "
-            "Mystic symbols carved into its blackened surface indicate "
-            "its resistance to almost any form of attack. ";
-        break;
-
-    case MONS_ORB_GUARDIAN:
-        description +=
-            "A huge and glowing purple creature, created by the Orb to "
-            "defend itself. ";
-        break;
-
-    case MONS_DAEVA:
-        description +=
-            "A divine agent of the Shining One, it is a towering winged "
-            "figure with an aura of brilliant golden light. ";
-        break;
-
-    case MONS_SPECTRAL_THING:
-        description += "A hideous glowing apparition.";
-        break;
-
-    case MONS_TENTACLED_MONSTROSITY:
-        description +=
-            "A writhing mass of tentacles, all covered in putrid mucous.";
-        break;
-
-    case MONS_SPHINX:
-        description +=
-            "A large creature with a human head, the body of a lion, and "
-            "the wings of a huge bird.";
-        break;
-
-    case MONS_ROTTING_HULK:
-        description += "A shambling undead creature, related to the ghoul.";
-        break;
-
-    case MONS_KILLER_KLOWN:
-        description += "A comical figure full of life and laughter.  It"
-            " looks very happy to see you... but is there a slightly malicious"
-            " cast to its features?  Is that red facepaint or something"
-            " altogether less pleasant?  Join in the fun, and maybe you'll"
-            " find out!";
-        break;
-
-    case MONS_MOTH_OF_WRATH:
-        description += "A huge moth, as violent as it is hairy.";
-        break;
-
-    case MONS_DEATH_COB:
-        description += "A dreadful undead cob of corn.";
-        break;
-
-    case MONS_BOGGART:
-        description +=
-            "A twisted little sprite-goblin. Beware of its magical tricks!";
-        break;
-
-    case MONS_LAVA_FISH:
-        description += "A fish which lives in lava.";
-        break;
-
-    case MONS_BIG_FISH:
-        description += "A fish of unusual size.";
-        break;
-
-    case MONS_GIANT_GOLDFISH:
-        description +=
-            "This is what happens when you give your pet goldfish too much food!";
-        break;
-
-    case MONS_ELECTRICAL_EEL:
-        description +=
-            "A small and slimy eel, crackling with electrical discharge.";
-        break;
-
-    case MONS_TIAMAT:
-        description += "A powerful draconian with mighty wings. $"
-            "Her scales seem to shimmer and change colour as you watch.$";
-        break;
-
     case MONS_DRACONIAN:
     case MONS_RED_DRACONIAN:
     case MONS_WHITE_DRACONIAN:
@@ -5991,201 +4809,9 @@ void describe_monsters(int class_described, unsigned char which_mons)
         description += describe_demon(mons);
         break;
 
-    // mimics -- I'm not considering these descriptions a bug. -- bwr
-    case MONS_GOLD_MIMIC:
-        description +=
-            "An apparently harmless pile of gold coins hides a nasty "
-            "venomous shapechanging predator.";
-        break;
-
-    case MONS_WEAPON_MIMIC:
-        description +=
-            "An apparently abandoned weapon, actually a vicious little "
-            "beast in disguise.";
-        break;
-
-    case MONS_ARMOUR_MIMIC:
-        description +=
-            "An apparently abandoned suit of finely-made armour, actually "
-            "a vicious little beast in disguise.";
-        break;
-
-    case MONS_SCROLL_MIMIC:
-        description +=
-            "An ancient parchment covered in arcane runes. Did it just twitch?";
-        break;
-
-    case MONS_POTION_MIMIC:
-        description += "A delicious looking magical drink. Go on, pick it up!";
-        break;
-
-    case MONS_BALL_LIGHTNING:
-        description += "An oddity of nature, ball lightning bounces around "
-                      "behaving almost, but not quite, entirely unlike "
-                      "regular lightning. ";
-        break;
-
-    case MONS_ORB_OF_FIRE:
-        description += "A globe of raw primordial fire, capable of "
-                       "impressive pyrotechnics.";
-        break;
-
-    // the quokka is no more ... {dlb}
-    // the quokka is back, without cyberware -- bwr
-    case MONS_QUOKKA:
-        description += "A small marsupial.  Don't call it a rat.";
-        break;
-
-    // uniques
-    case MONS_MNOLEG:           // was: Nemelex Xobeh - and wrong! {dlb}
-        description += "A weirdly glowing figure, "
-            "dancing through the twisted air of Pandemonium. ";
-        break;
-
-    case MONS_LOM_LOBON:        // was: Sif Muna - and wrong! {dlb}
-        description += "An ancient and strangely serene demon. "
-            "It regards you coldly from "
-            "the huge glowing eye in the centre of its forehead. ";
-        break;
-
-    case MONS_CEREBOV:          // was: Okawaru - and wrong! {dlb}
-        description += "A violent and wrathful demon, "
-            "Cerebov appears as a giant human "
-            "covered in shining golden armour "
-            "and wielding a huge twisted sword. ";
-        break;
-
-    case MONS_GLOORX_VLOQ:      // was: Kikubaaqudgha - and wrong! {dlb}
-        description += "A shadowy figure clothed in profound darkness. ";
-        break;
-
-    case MONS_TERENCE:
-        description += "An evil human fighter.";
-        break;
-
-    case MONS_JESSICA:
-        description += "An evil apprentice sorceress.";
-        break;
-
-    case MONS_SIGMUND:
-        description += "An evil and spry old human, whose eyes "
-               "twinkle with madness.  Sigmund wields a nasty looking scythe.";
-        break;
-
-    case MONS_EDMUND:
-        description += "A lightly armoured warrior.";
-        break;
-
-    case MONS_PSYCHE:
-        description += "A fair-haired mage.";
-        break;
-
-    case MONS_DONALD:
-        description += "An adventurer like you, trying to find the Orb.";
-        break;
-
-    case MONS_MICHAEL:
-        description += "A powerful spellcaster, dressed in a long robe.";
-        break;
-
-    case MONS_JOSEPH:
-        description += "Looks like a mercenary.";
-        break;
-
-    case MONS_ERICA:
-        description += "A comely spellweaver.";
-        break;
-
-    case MONS_JOSEPHINE:
-        description += "An ugly elderly figure, dressed in Druidic clothes.";
-        break;
-
-    case MONS_HAROLD:
-        description += "An evil human bounty hunter.";
-        break;
-
-    case MONS_NORBERT:
-        description += "A skilled warrior.";
-        break;
-
-    case MONS_JOZEF:
-        description += "A tall bounty hunter.";
-        break;
-
-    case MONS_AGNES:
-        description += "A lanky warrior.";
-        break;
-
-    case MONS_MAUD:
-        description += "An evil warrior who looks inexplicably like a rodent.";
-        break;
-
-    case MONS_LOUISE:
-        description += "An unusually heavily armoured spellcaster.";
-        break;
-
-    case MONS_FRANCIS:
-        description += "A wizened spellcaster.";
-        break;
-
-    case MONS_FRANCES:
-        description += "A stout warrior, bearing a deep facial scar.";
-        break;
-
-    case MONS_RUPERT:
-        description += "An evil berserker.";
-        break;
-
-    case MONS_WAYNE:
-        description += "A fat, evil dwarf in a stupid looking hat.";
-        break;
-
-    case MONS_DUANE:
-        description += "An evil mercenary with unusually large ears.";
-        break;
-
-    case MONS_NORRIS:
-        description += "A tan, fit and thoroughly evil surfer.";
-        break;
-
-    case MONS_FREDERICK:
-        description += "A svelte fighter-mage, wearing a gold-rimmed monocle.";
-        break;
-
-    case MONS_MARGERY:
-        description += "A lithe spellcaster.";
-        break;
-
-    case MONS_IJYB:
-        description += "A small and twisted goblin, wearing some ugly blue rags.";
-        break;
-
-    case MONS_BLORK_THE_ORC:
-        description += "A particularly fat and ugly orc.";
-        break;
-
-    case MONS_EROLCHA:
-        description += "An especially cunning ogre mage.";
-        break;
-
     case MONS_URUG:
-        description += "A rude";
         if (player_can_smell())
-            description += ", smelly";
-        description += " orc.";
-        break;
-
-    case MONS_SNORG:
-        description += "A hairy troll.";
-        break;
-
-    case MONS_XTAHUA:
-        description += "An ancient and mighty dragon.";
-        break;
-
-    case MONS_BORIS:
-        description +=
-            "An ancient lich. The air around his shrouded form crackles with evil energy. ";
+            description += "He smells terrible.";
         break;
 
     case MONS_SHUGGOTH:
@@ -6194,64 +4820,15 @@ void describe_monsters(int class_described, unsigned char which_mons)
             "its umbrage at being transported to this backwater dimension. ";
         break;
 
-    case MONS_WOLF:
-        description += "A large and strong grey canine.";
-        break;
-
-    case MONS_WARG:
-        description += "A particularly large and evil looking wolf, usually "
-            "found in the company of orcs.";
-        break;
-
-    case MONS_BEAR:
-        description += "The common dungeon bear.";
-        break;
-
-    case MONS_GRIZZLY_BEAR:
-        description += "A large, nasty bear with grey fur.";
-        break;
-
-    case MONS_POLAR_BEAR:
-        description += "A large and very strong bear covered in glistening "
-            "white fur. ";
-        break;
-
-    case MONS_BLACK_BEAR:
-        description += "A small black bear.";
-        break;
-
-    case MONS_SALAMANDER:   // mv: was ANOTHER_LAVA_THING
-        description += "A strange half-human half-snake creature "
-            "covered in thick red scales and thorns.";
-        break;
-
-    case MONS_ORANGE_STATUE:
-        description += "An intricately carved statue of glittering orange "
-            "crystal. Its eyes fix on yours with a piercing gaze.";
-        break;
-
-    case MONS_SILVER_STATUE:
-        description += "A beautiful statue of silver. Its eyes "
-            "glow with an otherworldly radiance.";
-        break;
-
-    case MONS_ICE_STATUE:
-        description += "An imposing statue carved in glistening ice. "
-            "Freezing vapours swirl about it.";
-        break;
-
-    case MONS_MURRAY:
-        description += "A demonic skull rolling along the dungeon floor.";
-        break;
-
     case MONS_PROGRAM_BUG:
-    default:
         description += "If this monster is a \"program bug\", then it's "
             "recommended that you save your game and reload.  Please report "
             "monsters who masquerade as program bugs or run around the "
             "dungeon without a proper description to the authorities.";
         break;
         // onocentaur - donkey
+    default:
+        break;
     }
 
 #if DEBUG_DIAGNOSTICS
@@ -6301,9 +4878,7 @@ void describe_monsters(int class_described, unsigned char which_mons)
             description += info;
         }
     }
-
 #endif
-
     print_description(description);
 
     if (getch() == 0)