summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-22 15:07:58 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-22 15:07:58 +0100
commitbc3529421a5b0713eb2c4966b244a93542b62c18 (patch)
tree93ccab51b7da18f5bd091e5575341c81fe8dbc97 /crawl-ref/source/mon-data.h
parent86fe0e02db7ee289be861dcd572be84576de1bd1 (diff)
downloadcrawl-ref-bc3529421a5b0713eb2c4966b244a93542b62c18.tar.gz
crawl-ref-bc3529421a5b0713eb2c4966b244a93542b62c18.zip
Remove rPois and rC from monster merfolk, they can't drown anymore (Mantis 034).
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index e9094329bd..7dff442836 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1097,7 +1097,7 @@ static monsterentry mondata[] = {
{
MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk",
M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 9, 2, 4, 0 },
@@ -1109,7 +1109,7 @@ static monsterentry mondata[] = {
{
MONS_MERMAID, 'm', CYAN, "mermaid",
M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5,
{ {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 2, 3, 0 },
@@ -1121,7 +1121,7 @@ static monsterentry mondata[] = {
{
MONS_SIREN, 'm', LIGHTCYAN, "siren",
M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 12, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7,
{ {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 2, 3, 0 },