summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 08:34:11 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 08:34:11 +0530
commitd85ce5fca3ae674e2437783a358dfc3eecd38a3c (patch)
treecb22f120b5c10e18bff5493f7e51d1117fcbb200 /crawl-ref/source/mon-data.h
parent22c9c1dd3fe93c8ccab01eec647fb002877018f8 (diff)
downloadcrawl-ref-d85ce5fca3ae674e2437783a358dfc3eecd38a3c.tar.gz
crawl-ref-d85ce5fca3ae674e2437783a358dfc3eecd38a3c.zip
s/merfolk elementalist/merfolk aquamancer/ (sorear).
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 574a1b916d..7dcf33e759 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1132,13 +1132,13 @@ static monsterentry mondata[] = {
},
{
- MONS_MERFOLK_ELEMENTALIST, 'm', LIGHTGREEN, "merfolk elementalist",
+ MONS_MERFOLK_AQUAMANCER, 'm', LIGHTGREEN, "merfolk aquamancer",
M_WARM_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS,
MR_RES_COLD,
500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4,
{ {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 15, 3, 3, 0 },
- 0, 12, MST_MERFOLK_ELEMENTALIST, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
+ 0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
},