diff options
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index e9094329bd..c0c251c67b 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 }, @@ -4673,6 +4673,32 @@ static monsterentry mondata[] = { }, { + MONS_MARA, 'R', LIGHTRED, "Mara", + M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_SPEAKS | M_UNIQUE, + MR_RES_POISON | MR_RES_ELEC, + 0, 15, MONS_RAKSHASA, MONS_RAKSHASA, MH_DEMONIC, -10, + { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 20, 0, 0, 140 }, + 15, 15, MST_MARA, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, + I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM +}, + +// Illusions of Mara. Only two ever exist at the one time; identical stats to +// Mara. +{ + MONS_MARA_FAKE, 'R', LIGHTRED, "Mara", + M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_SPEAKS, + MR_RES_POISON | MR_RES_ELEC, + 0, 15, MONS_RAKSHASA_FAKE, MONS_RAKSHASA_FAKE, MH_DEMONIC, MAG_IMMUNE, + { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 20, 0, 0, 140 }, + 15, 15, MST_MARA_FAKE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, + I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM +}, + +{ // Snorg can go berserk. MONS_SNORG, 'T', LIGHTGREEN, "Snorg", M_UNIQUE | M_WARM_BLOOD | M_SPEAKS, |