summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/rltiles/dc-mon.txt
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-12-17 13:40:59 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-12-17 13:40:59 +1000
commitfc4c1660e532790ae84fd2978a086d20a3841f03 (patch)
treed4651e95d282eea896d3d105b5014c4126c8c195 /crawl-ref/source/rltiles/dc-mon.txt
parent630655e6f0b21126c76a7208316da0811845951f (diff)
parent761b088e911386a2860ba50a8a3271739264283c (diff)
downloadcrawl-ref-fc4c1660e532790ae84fd2978a086d20a3841f03.tar.gz
crawl-ref-fc4c1660e532790ae84fd2978a086d20a3841f03.zip
Merge branch 'master' into wizlab
Diffstat (limited to 'crawl-ref/source/rltiles/dc-mon.txt')
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 0b1d2f1a80..b162e9ad2a 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -129,7 +129,7 @@ small_snake MONS_SMALL_SNAKE
snake MONS_SNAKE
black_mamba MONS_BLACK_MAMBA
water_moccasin MONS_WATER_MOCCASIN
-grey_snake MONS_GREY_SNAKE
+anaconda MONS_ANACONDA
lava_snake MONS_LAVA_SNAKE
viper MONS_VIPER
salamander MONS_SALAMANDER
@@ -309,6 +309,7 @@ kirke MONS_KIRKE
louise MONS_LOUISE
margery MONS_MARGERY
maud MONS_MAUD
+maurice MONS_MAURICE
norbert MONS_NORBERT
norris MONS_NORRIS
psyche MONS_PSYCHE
@@ -438,11 +439,14 @@ greater_mummy MONS_GREATER_MUMMY
mummy_priest MONS_MUMMY_PRIEST
## Nagas ('N')
+%sdir dc-mon/unique
+aizul MONS_AIZUL
+%sdir dc-mon
naga MONS_NAGA
-guardian_naga MONS_GUARDIAN_NAGA
naga_mage MONS_NAGA_MAGE
naga_warrior MONS_NAGA_WARRIOR
greater_naga MONS_GREATER_NAGA
+guardian_serpent MONS_GUARDIAN_SERPENT
## Ogres ('O')
%sdir dc-mon/unique
@@ -528,6 +532,7 @@ wandering_mushroom MONS_WANDERING_MUSHROOM
## Goblins ('g')
%sdir dc-mon/unique
ijyb MONS_IJYB
+crazy_yiuf MONS_CRAZY_YIUF
grum MONS_GRUM
%sdir dc-mon
goblin MONS_GOBLIN
@@ -636,3 +641,6 @@ lich TRAN_LICH
dc-misc/unseen_monster MONS_UNKNOWN
dc-misc/unseen_monster MCACHE_START
+%sdir dc-misc
+todo TODO
+error ERROR