If there are multiple matches to the "?/" describe command, then

they will be displayed in a menu, which the user can select from.
Menu entries for monsters will be given the same color as the monster,
with the monster's symbol added to the end of the string.

Entering a single character as input to the "?/" describe command lists
all monsters with that display symbol.

Monsters sharing the same display symbol can now have the same string
appended or prepended to their description (implemented to make the
"?/" command have to deal with less special cases).  Currently only
used by nagas with __N_suffix.  Has the side-effect advantage that
the naga subspicies description and the "attractive/repulsive"
description goes before the big block of quoted text, rather than after
it.


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

1 files changed, 54 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 4258190ae1..72c9b7126c 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1,4 +1,21 @@
 %%%%
+__N_suffix
+
+$"The insensible son of Pandu sank down till he reached the Naga kingdom.
+Nagas, furnished with fangs containing virulent venom, bit him by
+thousands. The vegetable poison, mingled in the blood of the son of the
+Wind god, was neutralised by the snake-poison. The serpents had bitten
+all over his frame, except his chest, the skin of which was so tough that
+their fangs could not penetrate it.
+"On regaining consciousness, the son of Kunti burst his bands and began
+to press the snakes down under the ground. A remnant fled for life, and
+going to their king Vasuki, represented, 'O king of snakes, a man drowned
+under the water, bound in chords of shrubs; probably he had drunk poison.
+For when he fell amongst us, he was insensible. But when we began to bite
+him, he regained his senses, and bursting his fetters, commenced laying
+at us. May it please Your Majesty to enquire who is.'"
+	-_The Mahabharata, Sambhava Parva, Section CXXVIII
+%%%%
 &
 
 You feel a lump in the pit of your stomach.  
@@ -95,10 +112,22 @@ Gloorx Vloq
 
 A shadowy figure clothed in profound darkness.
 %%%%
+greater naga
+
+A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
+
+It looks strong an agressive.
+%%%%
 Green Death
 
 A bloated form covered in oozing sores and exhaling clouds of lethal poison.
 %%%%
+guardian naga
+
+A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
+
+These nagas are often used as guardians by powerful creatures.
+%%%%
 Harold
 
 An evil human bounty hunter.
@@ -171,6 +200,10 @@ Orb Guardian
 
 A huge and glowing purple creature, created by the Orb to defend itself.
 %%%%
+pandemonium lord
+
+Powerful demons inhabitting the endless halls of Pandemonium, each is different, with its own set of strengths and weaknesses.
+%%%%
 Pit Fiend
 
 A huge winged fiend with incredibly tough skin.
@@ -894,7 +927,7 @@ stuck in its teeth.
 %%%%
 large skeleton
 
-A skeleton compelled to unlife by the exercise of necromancy.
+A large skeleton compelled to unlife by the exercise of necromancy.
 %%%%
 large zombie
 
@@ -978,21 +1011,18 @@ The embalmed and undead corpse of an ancient servant of darkness.
 naga
 
 A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
+%%%%
+naga mage
 
-"The insensible son of Pandu sank down till he reached the Naga kingdom.
-Nagas, furnished with fangs containing virulent venom, bit him by
-thousands. The vegetable poison, mingled in the blood of the son of the
-Wind god, was neutralised by the snake-poison. The serpents had bitten
-all over his frame, except his chest, the skin of which was so tough that
-their fangs could not penetrate it.
-"On regaining consciousness, the son of Kunti burst his bands and began
-to press the snakes down under the ground. A remnant fled for life, and
-going to their king Vasuki, represented, 'O king of snakes, a man drowned
-under the water, bound in chords of shrubs; probably he had drunk poison.
-For when he fell amongst us, he was insensible. But when we began to bite
-him, he regained his senses, and bursting his fetters, commenced laying
-at us. May it please Your Majesty to enquire who is.'"
-	-_The Mahabharata, Sambhava Parva, Section CXXVIII
+A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
+
+An eldritch nimbus trails its motions.
+%%%%
+naga warrior
+
+A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
+
+It bears scars of many past battles.
 %%%%
 necromancer
 
@@ -1246,6 +1276,14 @@ small snake
 
 The lesser dungeon snake.
 %%%%
+small skeleton
+
+A skeleton compelled to unlife by the exercise of necromancy.
+%%%%
+small zombie
+
+A corpse raised to undeath by necromancy.
+%%%%
 smoke demon
 
 A writhing cloud of smoke hanging in the air.
@@ -1318,7 +1356,7 @@ swamp worm
 
 A large slimy worm, adept at swimming through the muck of this foul swamp.
 %%%%
-tentacled monster
+tentacled monstrosity
 
 A writhing mass of tentacles, all covered in putrid mucus.
 %%%%
@@ -1462,7 +1500,3 @@ ynoxinul
 
 A demon with shiny metallic scales.
 %%%%
-zombie
-
-A corpse raised to undeath by necromancy.
-%%%%