From bc3529421a5b0713eb2c4966b244a93542b62c18 Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Tue, 22 Dec 2009 15:07:58 +0100 Subject: Remove rPois and rC from monster merfolk, they can't drown anymore (Mantis 034). --- crawl-ref/source/mon-data.h | 6 +++--- 1 file 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 }, -- cgit v1.2.3-54-g00ecf