diff options
author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:26:24 +0530 |
---|---|---|
committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:26:24 +0530 |
commit | 22c9c1dd3fe93c8ccab01eec647fb002877018f8 (patch) | |
tree | 61647db7597a0c8b9055bfdba86ee1ffcaa5fb10 /crawl-ref/source/mon-data.h | |
parent | da206768a436941bf7acfc67f005a518fb90ca7e (diff) | |
download | crawl-ref-22c9c1dd3fe93c8ccab01eec647fb002877018f8.tar.gz crawl-ref-22c9c1dd3fe93c8ccab01eec647fb002877018f8.zip |
Merfolk (water/ice) elementalists join the Shoals guard.
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r-- | crawl-ref/source/mon-data.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index b65b314b65..574a1b916d 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1124,14 +1124,26 @@ static monsterentry mondata[] = { MR_NO_FLAGS, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 14, 5, 3, 0 }, + { 14, 6, 3, 0 }, // Gladiators prefer light armour, and are dodging experts. - 0, 16, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 0, 17, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, ATTACK_ENERGY(6), MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM }, { + MONS_MERFOLK_ELEMENTALIST, 'm', LIGHTGREEN, "merfolk elementalist", + 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, + I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY, + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM +}, + +{ MONS_MERMAID, 'm', CYAN, "mermaid", M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, |