summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/rltiles/dc-mon.txt
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-15 17:35:58 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-15 17:40:12 +0100
commit11b086105f15c5bfaf429b9715b02ad65c7c0539 (patch)
tree29427a93702a941205c6735c5ba63ec5e98349da /crawl-ref/source/rltiles/dc-mon.txt
parent27a4db5c21d92e71ea158d8f0f9f8c9eec9c2770 (diff)
downloadcrawl-ref-11b086105f15c5bfaf429b9715b02ad65c7c0539.tar.gz
crawl-ref-11b086105f15c5bfaf429b9715b02ad65c7c0539.zip
Add tiles for the new merfolk monsters.
The plain merfolk is only used for the corpse tile but I decided to add it anyway, especially as I'm considering using that for the base merfolk and the current fighter one for the impaler.
Diffstat (limited to 'crawl-ref/source/rltiles/dc-mon.txt')
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 6556218d27..ba9a1893e6 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -611,8 +611,14 @@ boggart MONS_BOGGART
ilsuiw MONS_ILSUIW
ilsuiw_water MONS_ILSUIW_WATER
%sdir dc-mon
-merfolk_fighter MONS_MERFOLK_FIGHTER
-merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER
+merfolk_fighter MONS_MERFOLK
+merfolk_fighter_water MONS_MERFOLK_WATER
+merfolk_javelineer MONS_MERFOLK_JAVELINEER
+merfolk_javelineer_water MONS_MERFOLK_JAVELINEER_WATER
+merfolk_impaler MONS_MERFOLK_IMPALER
+merfolk_impaler_water MONS_MERFOLK_IMPALER_WATER
+merfolk_aquamancer MONS_MERFOLK_AQUAMANCER
+merfolk_aquamancer_water MONS_MERFOLK_AQUAMANCER_WATER
mermaid MONS_MERMAID
mermaid_water MONS_MERMAID_WATER
siren MONS_SIREN