summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/descript/monsters.txt
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 17:56:26 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 17:56:38 +0530
commitcfdb6e14f51f38e104444acf22e17706fcda104d (patch)
treecc5b352f27be1e10bf258f72910ecbc8f9744bda /crawl-ref/source/dat/descript/monsters.txt
parentfe97e90bb05bca87d2df81bf3a2d7ded964fd42c (diff)
downloadcrawl-ref-cfdb6e14f51f38e104444acf22e17706fcda104d.tar.gz
crawl-ref-cfdb6e14f51f38e104444acf22e17706fcda104d.zip
Add merfolk javelineers to the Shoals, add descriptions for the three new merfolk types.
Diffstat (limited to 'crawl-ref/source/dat/descript/monsters.txt')
-rw-r--r--crawl-ref/source/dat/descript/monsters.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index da05efc32f..579bbeb6a3 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1048,7 +1048,19 @@ This tall and powerful demon is Mara, Lord of Illusions, mighty among dreamers.
%%%%
merfolk
-Half fish, half man, the merfolk are citizens of both water and land, and they'll fiercely protect their chosen territory.
+Half fish, half man, the merfolk are citizens of both water and land, and fierce protectors of their chosen territory.
+%%%%
+merfolk impaler
+
+A powerfully muscled merfolk warrior, bearing a great trident.
+%%%%
+merfolk aquamancer
+
+A slender merfolk mystic with unusually webby hands. Its form shifts and glistens as if seen through ocean spray.
+%%%%
+merfolk javelineer
+
+A sinewy merfolk fighter with a piercing gaze and a large bundle of javelins.
%%%%
mermaid