diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-18 15:06:41 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-18 15:06:41 +0000 |
| commit | affffc40c9ee82a5ff215fec96b79b9fa83bde98 (patch) | |
| tree | 4d85e1d8f91773a184f21d530f4f7663a3b09bce /crawl-ref/source/mon-data.h | |
| parent | e253a120359152d05c096d9ea41a2c5220033be7 (diff) | |
| download | crawl-ref-affffc40c9ee82a5ff215fec96b79b9fa83bde98.tar.gz crawl-ref-affffc40c9ee82a5ff215fec96b79b9fa83bde98.zip | |
Fix [1964969]: Rename "merfolk fighter" to "merfolk", as it matches the
defined monster name.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5120 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 4f6ac69ad7..dfd622a46e 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -944,7 +944,7 @@ // merfolk ('m') { - MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk fighter", + MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk", M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS, MR_RES_POISON | MR_RES_COLD, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, |