diff options
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 817 |
1 files changed, 576 insertions, 241 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 8580b8758b..748296cb60 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1,6 +1,8 @@ #ifndef MONDATA_H #define MONDATA_H +#include "enum.h" + /* This whole file was very generously condensed from its initial ugly form by Wladimir van der Laan ($pellbinder). @@ -104,6 +106,7 @@ { MONS_PROGRAM_BUG, 'B', LIGHTRED, "program bug", M_NO_EXP_GAIN, + MR_NO_FLAGS, 0, 10, MONS_PROGRAM_BUG, MH_NATURAL, -3, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, @@ -115,7 +118,8 @@ // real monsters begin here {dlb}: { MONS_GIANT_ANT, 'a', DARKGREY, "giant ant", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 700, 10, MONS_GIANT_ANT, MH_NATURAL, -3, { 8, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -127,6 +131,7 @@ { MONS_GIANT_BAT, 'b', DARKGREY, "giant bat", M_FLIES | M_SEE_INVIS | M_WARM_BLOOD, + MR_NO_FLAGS, 150, 4, MONS_GIANT_BAT, MH_NATURAL, -1, { 1, 0, 0, 0 }, { 1, 2, 3, 0 }, @@ -138,6 +143,7 @@ { MONS_CENTAUR, 'c', BROWN, "centaur", M_WARM_BLOOD, + MR_NO_FLAGS, 1500, 10, MONS_CENTAUR, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -148,7 +154,8 @@ { MONS_RED_DEVIL, '4', RED, "red devil", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_FLIES, + M_FLIES | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 10, MONS_RED_DEVIL, MH_DEMONIC, -7, { 18, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -159,7 +166,8 @@ { MONS_ETTIN, 'C', BROWN, "ettin", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ETTIN, MH_NATURAL, -3, { 18, 12, 0, 0 }, { 7, 3, 5, 0 }, @@ -170,7 +178,8 @@ { MONS_FUNGUS, 'f', LIGHTGREY, "fungus", - M_NO_EXP_GAIN | M_RES_POISON, + M_NO_EXP_GAIN, + MR_RES_POISON, 0, 10, MONS_FUNGUS, MH_PLANT, 5000, { 0, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -181,7 +190,8 @@ { MONS_GOBLIN, 'g', LIGHTGREY, "goblin", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 400, 10, MONS_GOBLIN, MH_NATURAL, -1, { 4, 0, 0, 0 }, { 1, 2, 4, 0 }, @@ -193,6 +203,7 @@ { MONS_HOUND, 'h', BROWN, "hound", M_SEE_INVIS | M_WARM_BLOOD, + MR_NO_FLAGS, 300, 10, MONS_HOUND, MH_NATURAL, -3, { 6, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -204,7 +215,8 @@ // note: these things regenerate { MONS_IMP, '5', RED, "imp", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_FLIES | M_SEE_INVIS | M_SPEAKS, + M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 13, MONS_IMP, MH_DEMONIC, -9, { 4, 0, 0, 0 }, { 3, 3, 3, 0 }, @@ -216,6 +228,7 @@ { MONS_JACKAL, 'j', YELLOW, "jackal", M_WARM_BLOOD, + MR_NO_FLAGS, 200, 10, MONS_JACKAL, MH_NATURAL, -1, { 3, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -226,7 +239,8 @@ { MONS_KILLER_BEE, 'k', YELLOW, "killer bee", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 150, 11, MONS_KILLER_BEE, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -237,7 +251,8 @@ { MONS_KILLER_BEE_LARVA, 'w', LIGHTGREY, "killer bee larva", - M_ED_POISON | M_NO_SKELETON, + M_NO_SKELETON, + MR_VUL_POISON, 150, 5, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3, { 3, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -249,6 +264,7 @@ { MONS_MANTICORE, 'm', BROWN, "manticore", M_WARM_BLOOD, + MR_NO_FLAGS, 1800, 10, MONS_MANTICORE, MH_NATURAL, -3, { 14, 8, 8, 0 }, { 9, 3, 5, 0 }, @@ -260,7 +276,8 @@ // this thing doesn't have nr. 13 for nothing, has it? ($pellbinder) { MONS_NECROPHAGE, 'n', DARKGREY, "necrophage", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 500, 10, MONS_NECROPHAGE, MH_UNDEAD, -5, { 8, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -271,7 +288,8 @@ { MONS_ORC, 'o', LIGHTRED, "orc", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 600, 10, MONS_ORC, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 1, 4, 6, 0 }, @@ -284,7 +302,8 @@ // dangerous, but still come out at 200+ XP { MONS_PHANTOM, 'p', BLUE, "phantom", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 5, MONS_PHANTOM, MH_UNDEAD, -4, { 10, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -295,7 +314,8 @@ { MONS_QUASIT, 'q', LIGHTGREY, "quasit", - M_RES_POISON | M_RES_FIRE | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 0, 10, MONS_QUASIT, MH_DEMONIC, 50, { 3, 2, 2, 0 }, { 3, 2, 6, 0 }, @@ -307,6 +327,7 @@ { MONS_RAT, 'r', BROWN, "rat", M_WARM_BLOOD, + MR_NO_FLAGS, 200, 10, MONS_RAT, MH_NATURAL, -1, { 3, 0, 0, 0 }, { 1, 1, 3, 0 }, @@ -317,7 +338,8 @@ { MONS_SCORPION, 's', DARKGREY, "scorpion", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 500, 10, MONS_SCORPION, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -331,7 +353,8 @@ // not until it can be reimplemented safely {dlb} { MONS_TUNNELING_WORM, 't', LIGHTRED, "tunneling worm", - M_RES_POISON, + M_NO_FLAGS, + MR_RES_POISON, 0, 10, 19, MH_NATURAL, 5000, { 50, 0, 0, 0 }, { 10, 5, 5, 0 }, @@ -344,6 +367,7 @@ { MONS_UGLY_THING, 'u', BROWN, "ugly thing", M_WARM_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 600, 10, MONS_UGLY_THING, MH_NATURAL, -3, { 12, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -354,7 +378,8 @@ { MONS_FIRE_VORTEX, 'v', RED, "fire vortex", - M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_RES_ELEC | M_LEVITATE | M_CONFUSED, + M_LEVITATE | M_CONFUSED, + MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD | MR_RES_ELEC, 0, 5, MONS_FIRE_VORTEX, MH_NONLIVING, 5000, { 30, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -366,6 +391,7 @@ { MONS_WORM, 'w', LIGHTRED, "worm", M_NO_SKELETON, + MR_NO_FLAGS, 350, 4, MONS_WORM, MH_NATURAL, -2, { 12, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -377,7 +403,8 @@ // random { MONS_ABOMINATION_SMALL, 'x', BLACK, "abomination", - M_NO_FLAGS, + M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ABOMINATION_SMALL, MH_DEMONIC, -5, { 23, 0, 0, 0 }, { 6, 2, 5, 0 }, @@ -388,7 +415,8 @@ { MONS_YELLOW_WASP, 'y', YELLOW, "yellow wasp", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 220, 12, MONS_YELLOW_WASP, MH_NATURAL, -3, { 13, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -400,7 +428,8 @@ // small zombie { MONS_ZOMBIE_SMALL, 'z', BROWN, "", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 6, MONS_ZOMBIE_SMALL, MH_UNDEAD, -1, { 10, 0, 0, 0 }, { 1, 5, 5, 0 }, @@ -411,7 +440,8 @@ { MONS_ANGEL, 'A', WHITE, "Angel", - M_RES_POISON | M_FLIES | M_RES_ELEC | M_SPELLCASTER, + M_FLIES | M_SPELLCASTER, + MR_RES_POISON | MR_RES_ELEC, 0, 10, MONS_ANGEL, MH_HOLY, -8, { 20, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -422,7 +452,8 @@ { MONS_GIANT_BEETLE, 'B', DARKGREY, "giant beetle", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 1000, 10, MONS_GIANT_BEETLE, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 5, 7, 6, 0 }, @@ -433,7 +464,8 @@ { MONS_CYCLOPS, 'C', BROWN, "cyclops", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 2500, 10, MONS_CYCLOPS, MH_NATURAL, -3, { 35, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -444,7 +476,8 @@ { MONS_DRAGON, 'D', GREEN, "dragon", - M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_FLIES, //jmf: warm blood? + M_FLIES, //jmf: warm blood? + MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, 2200, 12, MONS_DRAGON, MH_NATURAL, -4, { 20, 13, 13, 0 }, { 12, 5, 5, 0 }, @@ -457,7 +490,8 @@ // that they wield two weapons... I'm raising their xp modifier. -- bwr { MONS_TWO_HEADED_OGRE, 'O', LIGHTRED, "two-headed ogre", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 1500, 15, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4, { 17, 13, 0, 0 }, { 6, 3, 5, 0 }, @@ -468,7 +502,8 @@ { MONS_FIEND, '1', LIGHTRED, "Fiend", //jmf: was RED, like Balrog - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_FLIES | M_SEE_INVIS, + M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 18, MONS_FIEND, MH_DEMONIC, -12, { 25, 15, 15, 0 }, { 18, 3, 5, 0 }, @@ -479,7 +514,8 @@ { MONS_GIANT_SPORE, 'G', GREEN, "giant spore", - M_RES_POISON | M_LEVITATE, + M_LEVITATE, + MR_RES_POISON, 0, 10, MONS_GIANT_SPORE, MH_NATURAL, -3, { 1, 0, 0, 0 }, { 1, 0, 0, 1 }, @@ -490,7 +526,8 @@ { MONS_HOBGOBLIN, 'g', BROWN, "hobgoblin", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 500, 10, MONS_HOBGOBLIN, MH_NATURAL, -1, { 5, 0, 0, 0 }, { 1, 4, 5, 0 }, @@ -501,7 +538,8 @@ { MONS_ICE_BEAST, 'I', WHITE, "ice beast", - M_RES_POISON | M_ED_FIRE | M_RES_COLD, + M_NO_FLAGS, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 12, MONS_ICE_BEAST, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -512,7 +550,8 @@ { MONS_JELLY, 'J', LIGHTRED, "jelly", - M_RES_POISON | M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS, + M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS, + MR_RES_POISON, 0, 13, MONS_JELLY, MH_NATURAL, -3, { 8, 0, 0, 0 }, { 3, 5, 5, 0 }, @@ -524,6 +563,7 @@ { MONS_KOBOLD, 'K', BROWN, "kobold", M_WARM_BLOOD, + MR_NO_FLAGS, 400, 10, MONS_KOBOLD, MH_NATURAL, -1, { 4, 0, 0, 0 }, { 1, 2, 3, 0 }, @@ -534,7 +574,8 @@ { MONS_LICH, 'L', WHITE, "lich", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 16, MONS_LICH, MH_UNDEAD, -11, { 15, 0, 0, 0 }, { 20, 2, 4, 0 }, @@ -545,7 +586,8 @@ { MONS_MUMMY, 'M', WHITE, "mummy", - M_RES_POISON | M_ED_FIRE | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 10, MONS_MUMMY, MH_UNDEAD, -5, { 20, 0, 0, 0 }, { 3, 5, 3, 0 }, @@ -556,7 +598,8 @@ { MONS_GUARDIAN_NAGA, 'N', LIGHTGREEN, "guardian naga", - M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_RES_POISON, 350, 10, MONS_GUARDIAN_NAGA, MH_NATURAL, -6, { 19, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -567,7 +610,8 @@ { MONS_OGRE, 'O', BROWN, "ogre", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 1300, 10, MONS_OGRE, MH_NATURAL, -3, { 17, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -579,6 +623,7 @@ { MONS_PLANT, 'P', GREEN, "plant", M_NO_EXP_GAIN, + MR_NO_FLAGS, 0, 10, MONS_PLANT, MH_PLANT, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -589,7 +634,8 @@ { MONS_QUEEN_BEE, 'Q', YELLOW, "queen bee", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 200, 14, MONS_QUEEN_BEE, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -600,7 +646,8 @@ { MONS_RAKSHASA, 'R', YELLOW, "rakshasa", - M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_POISON, 0, 15, MONS_RAKSHASA, MH_NATURAL, -10, { 20, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -612,6 +659,7 @@ { MONS_SNAKE, 'S', GREEN, "snake", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 200, 10, MONS_SNAKE, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -622,7 +670,8 @@ { MONS_TROLL, 'T', BROWN, "troll", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 1500, 10, MONS_TROLL, MH_NATURAL, -3, { 20, 15, 15, 0 }, { 7, 3, 5, 0 }, @@ -633,7 +682,8 @@ { MONS_UNSEEN_HORROR, 'x', MAGENTA, "unseen horror", - M_LEVITATE | M_SEE_INVIS | M_RES_ELEC | M_INVIS, + M_LEVITATE | M_SEE_INVIS | M_INVIS, + MR_RES_ELEC, 0, 12, MONS_UNSEEN_HORROR, MH_NATURAL, -3, { 12, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -644,7 +694,8 @@ { MONS_VAMPIRE, 'V', RED, "vampire", - M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 11, MONS_VAMPIRE, MH_UNDEAD, -6, { 22, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -655,7 +706,8 @@ { MONS_WRAITH, 'W', DARKGREY, "wraith", - M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS, + M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 11, MONS_WRAITH, MH_UNDEAD, -7, { 13, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -667,7 +719,8 @@ // Large abom: (the previous one was small) { MONS_ABOMINATION_LARGE, 'X', BLACK, "abomination", - M_NO_FLAGS, + M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ABOMINATION_LARGE, MH_DEMONIC, -7, { 40, 0, 0, 0 }, { 11, 2, 5, 0 }, @@ -678,7 +731,8 @@ { MONS_YAK, 'Y', BROWN, "yak", - M_WARM_BLOOD, + M_WARM_BLOOD, + MR_NO_FLAGS, 1200, 10, MONS_YAK, MH_NATURAL, -3, { 18, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -690,7 +744,8 @@ // big zombie { MONS_ZOMBIE_LARGE, 'Z', BROWN, "", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 6, MONS_ZOMBIE_LARGE, MH_UNDEAD, -1, { 23, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -701,7 +756,8 @@ { MONS_ORC_WARRIOR, 'o', YELLOW, "orc warrior", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ORC, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 4, 4, 6, 0 }, @@ -712,7 +768,8 @@ { MONS_KOBOLD_DEMONOLOGIST, 'K', MAGENTA, "kobold demonologist", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_KOBOLD, MH_NATURAL, -5, { 4, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -723,7 +780,8 @@ { MONS_ORC_WIZARD, 'o', MAGENTA, "orc wizard", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ORC, MH_NATURAL, -5, { 5, 0, 0, 0 }, { 3, 3, 4, 0 }, @@ -734,7 +792,8 @@ { MONS_ORC_KNIGHT, 'o', LIGHTCYAN, "orc knight", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_ORC, MH_NATURAL, -3, { 25, 0, 0, 0 }, { 9, 4, 7, 0 }, @@ -748,7 +807,8 @@ // not until it can be reimplemented safely {dlb} { MONS_WORM_TAIL, '~', LIGHTRED, "worm tail", - M_NO_EXP_GAIN | M_RES_POISON, + M_NO_EXP_GAIN, + MR_RES_POISON, 0, 10, 56, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 10, 5, 5, 0 }, @@ -760,7 +820,8 @@ { MONS_WYVERN, 'D', LIGHTRED, "wyvern", - M_NO_FLAGS, //jmf: warm blood? + M_NO_FLAGS, //jmf: warm blood? + MR_NO_FLAGS, 2000, 10, MONS_WYVERN, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -771,7 +832,8 @@ { MONS_BIG_KOBOLD, 'K', RED, "big kobold", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_BIG_KOBOLD, MH_NATURAL, -3, { 7, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -783,6 +845,7 @@ { MONS_GIANT_EYEBALL, 'G', WHITE, "giant eyeball", M_NO_SKELETON | M_LEVITATE, + MR_NO_FLAGS, 400, 10, MONS_GIANT_EYEBALL, MH_NATURAL, -3, { 0, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -793,7 +856,8 @@ { MONS_WIGHT, 'W', LIGHTGREY, "wight", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_WIGHT, MH_UNDEAD, -4, { 8, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -804,7 +868,8 @@ { MONS_OKLOB_PLANT, 'P', GREEN, "oklob plant", - M_RES_POISON, + M_NO_FLAGS, + MR_RES_POISON, 0, 10, MONS_OKLOB_PLANT, MH_PLANT, -3, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -815,7 +880,8 @@ { MONS_WOLF_SPIDER, 's', BROWN, "wolf spider", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 800, 10, MONS_WOLF_SPIDER, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -826,7 +892,8 @@ { MONS_SHADOW, ' ', BLACK, "shadow", - M_RES_POISON | M_RES_COLD | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_SHADOW, MH_UNDEAD, -5, { 5, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -837,7 +904,8 @@ { MONS_HUNGRY_GHOST, 'p', GREEN, "hungry ghost", - M_RES_POISON | M_RES_COLD | M_SEE_INVIS | M_FLIES, + M_SEE_INVIS | M_FLIES | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_HUNGRY_GHOST, MH_UNDEAD, -4, { 5, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -849,6 +917,7 @@ { MONS_EYE_OF_DRAINING, 'G', LIGHTGREY, "eye of draining", M_NO_SKELETON | M_LEVITATE | M_SEE_INVIS, + MR_NO_FLAGS, 400, 10, MONS_EYE_OF_DRAINING, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -859,7 +928,8 @@ { MONS_BUTTERFLY, 'b', BLACK, "butterfly", - M_FLIES | M_ED_POISON | M_CONFUSED, + M_FLIES | M_CONFUSED, + MR_VUL_POISON, 150, 10, MONS_BUTTERFLY, MH_NATURAL, -3, { 0, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -870,7 +940,8 @@ { MONS_WANDERING_MUSHROOM, 'f', BROWN, "wandering mushroom", - M_RES_POISON, + M_NO_FLAGS, + MR_RES_POISON, 0, 10, MONS_WANDERING_MUSHROOM, MH_PLANT, -3, { 20, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -881,7 +952,8 @@ { MONS_EFREET, 'E', RED, "efreet", - M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_SPELLCASTER | M_LEVITATE, + M_SPELLCASTER | M_LEVITATE | M_EVIL, + MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, 0, 12, MONS_EFREET, MH_DEMONIC, -3, { 12, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -893,6 +965,7 @@ { MONS_BRAIN_WORM, 'w', LIGHTMAGENTA, "brain worm", M_SPELLCASTER, + MR_NO_FLAGS, 150, 10, MONS_BRAIN_WORM, MH_NATURAL, -3, { 0, 0, 0, 0 }, { 5, 3, 3, 0 }, @@ -904,6 +977,7 @@ { MONS_GIANT_ORANGE_BRAIN, 'G', LIGHTRED, "giant orange brain", M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, + MR_NO_FLAGS, 1000, 13, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -914,7 +988,8 @@ { MONS_BOULDER_BEETLE, 'B', LIGHTGREY, "boulder beetle", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 2500, 10, MONS_BOULDER_BEETLE, MH_NATURAL, -3, { 35, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -925,7 +1000,8 @@ { MONS_FLYING_SKULL, 'z', WHITE, "flying skull", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE, + M_LEVITATE, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_FLYING_SKULL, MH_UNDEAD, -3, { 7, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -936,7 +1012,8 @@ { MONS_HELL_HOUND, 'h', DARKGREY, "hell hound", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 10, MONS_HELL_HOUND, MH_DEMONIC, -3, { 13, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -948,6 +1025,7 @@ { MONS_MINOTAUR, 'm', LIGHTRED, "minotaur", M_WARM_BLOOD, + MR_NO_FLAGS, 1500, 10, MONS_MINOTAUR, MH_NATURAL, -3, { 35, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -958,7 +1036,8 @@ { MONS_ICE_DRAGON, 'D', WHITE, "ice dragon", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_FLIES, + M_FLIES, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 2200, 10, MONS_ICE_DRAGON, MH_NATURAL, -3, { 17, 17, 17, 0 }, { 12, 5, 5, 0 }, @@ -969,7 +1048,8 @@ { MONS_SLIME_CREATURE, 'J', GREEN, "slime creature", - M_RES_POISON | M_AMPHIBIOUS, + M_AMPHIBIOUS, + MR_RES_POISON, 0, 5, MONS_SLIME_CREATURE, MH_NATURAL, -3, { 22, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -980,7 +1060,8 @@ { MONS_FREEZING_WRAITH, 'W', LIGHTBLUE, "freezing wraith", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_LEVITATE | M_SEE_INVIS, + M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 10, MONS_FREEZING_WRAITH, MH_UNDEAD, -4, { 19, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -992,7 +1073,8 @@ // fake R - conjured by the R's illusion spell. { MONS_RAKSHASA_FAKE, 'R', YELLOW, "rakshasa", - M_RES_POISON, + M_EVIL, + MR_RES_POISON, 0, 10, MONS_RAKSHASA_FAKE, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 1, 0, 0, 1 }, @@ -1003,7 +1085,8 @@ { MONS_GREAT_ORB_OF_EYES, 'G', LIGHTGREEN, "great orb of eyes", - M_NO_SKELETON | M_RES_POISON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, + M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, + MR_RES_POISON, 900, 13, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, 5000, { 20, 0, 0, 0 }, { 12, 3, 5, 0 }, @@ -1014,7 +1097,8 @@ { MONS_HELLION, '3', BLACK, "hellion", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SPELLCASTER | M_ON_FIRE, + M_SPELLCASTER | M_ON_FIRE | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 11, MONS_HELLION, MH_DEMONIC, -7, { 10, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -1025,7 +1109,8 @@ { MONS_ROTTING_DEVIL, '4', GREEN, "rotting devil", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_ROTTING_DEVIL, MH_DEMONIC, -7, { 8, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1036,7 +1121,8 @@ { MONS_TORMENTOR, '3', YELLOW, "tormentor", - M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES | M_SPEAKS, + M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_FIRE, 0, 10, MONS_TORMENTOR, MH_DEMONIC, -6, { 8, 8, 0, 0 }, { 7, 3, 5, 0 }, @@ -1047,7 +1133,8 @@ { MONS_REAPER, '2', LIGHTGREY, "reaper", - M_RES_POISON | M_RES_COLD | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_REAPER, MH_DEMONIC, 5000, { 32, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -1058,7 +1145,8 @@ { MONS_SOUL_EATER, '2', DARKGREY, "soul eater", - M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS, + M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 12, MONS_SOUL_EATER, MH_DEMONIC, -10, { 25, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -1069,7 +1157,8 @@ { MONS_HAIRY_DEVIL, '4', LIGHTRED, "hairy devil", - M_RES_POISON, + M_EVIL, + MR_RES_POISON, 0, 10, MONS_HAIRY_DEVIL, MH_DEMONIC, -4, { 9, 9, 0, 0 }, { 6, 3, 5, 0 }, @@ -1080,7 +1169,8 @@ { MONS_ICE_DEVIL, '2', WHITE, "ice devil", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 11, MONS_ICE_DEVIL, MH_DEMONIC, -6, { 16, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -1091,7 +1181,8 @@ { MONS_BLUE_DEVIL, '3', BLUE, "blue devil", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_FLIES, + M_FLIES | M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 10, MONS_BLUE_DEVIL, MH_DEMONIC, -5, { 21, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -1103,7 +1194,8 @@ // random { MONS_BEAST, '4', BROWN, "beast", - M_NO_FLAGS, + M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_BEAST, MH_DEMONIC, -3, { 12, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1114,7 +1206,8 @@ { MONS_IRON_DEVIL, '3', CYAN, "iron devil", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD, + M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, 0, 10, MONS_IRON_DEVIL, MH_DEMONIC, -6, { 14, 14, 0, 0 }, { 8, 3, 5, 0 }, @@ -1126,6 +1219,7 @@ { MONS_GLOWING_SHAPESHIFTER, '@', RED, "glowing shapeshifter", M_NO_FLAGS, + MR_NO_FLAGS, 600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6, { 15, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -1137,6 +1231,7 @@ { MONS_SHAPESHIFTER, '@', LIGHTRED, "shapeshifter", M_NO_FLAGS, + MR_NO_FLAGS, 600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -1147,7 +1242,8 @@ { MONS_GIANT_MITE, 's', LIGHTRED, "giant mite", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 350, 10, MONS_GIANT_MITE, MH_NATURAL, -1, { 5, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -1159,6 +1255,7 @@ { MONS_STEAM_DRAGON, 'd', LIGHTGREY, "steam dragon", M_SPELLCASTER | M_FLIES, + MR_NO_FLAGS, 1000, 10, MONS_STEAM_DRAGON, MH_NATURAL, -3, { 12, 0, 0, 0 }, { 4, 5, 5, 0 }, @@ -1170,6 +1267,7 @@ { MONS_VERY_UGLY_THING, 'u', RED, "very ugly thing", M_WARM_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 750, 10, MONS_VERY_UGLY_THING, MH_NATURAL, -3, { 17, 0, 0, 0 }, { 12, 3, 5, 0 }, @@ -1180,7 +1278,8 @@ { MONS_ORC_SORCERER, 'o', DARKGREY, "orc sorcerer", - M_RES_FIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + MR_RES_FIRE, 600, 12, MONS_ORC, MH_NATURAL, -3, { 7, 0, 0, 0 }, { 8, 2, 3, 0 }, @@ -1192,6 +1291,7 @@ { MONS_HIPPOGRIFF, 'H', BROWN, "hippogriff", M_FLIES | M_WARM_BLOOD, + MR_NO_FLAGS, 1000, 10, MONS_HIPPOGRIFF, MH_NATURAL, -3, { 10, 8, 8, 0 }, { 7, 3, 5, 0 }, @@ -1203,6 +1303,7 @@ { MONS_GRIFFON, 'H', YELLOW, "griffon", M_FLIES | M_WARM_BLOOD, + MR_NO_FLAGS, 1800, 10, MONS_GRIFFON, MH_NATURAL, -3, { 18, 10, 10, 0 }, { 12, 3, 5, 0 }, @@ -1213,7 +1314,8 @@ { MONS_HYDRA, 'D', LIGHTGREEN, "hydra", - M_RES_POISON | M_AMPHIBIOUS, // because it likes the swamp -- bwr + M_AMPHIBIOUS, // because it likes the swamp -- bwr + MR_RES_POISON, 1800, 11, MONS_HYDRA, MH_NATURAL, -3, { 18, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -1225,7 +1327,8 @@ // small skeleton { MONS_SKELETON_SMALL, 'z', LIGHTGREY, "", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_SKELETON_SMALL, MH_UNDEAD, -1, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, @@ -1237,7 +1340,8 @@ // large skeleton { MONS_SKELETON_LARGE, 'Z', LIGHTGREY, "", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_SKELETON_LARGE, MH_UNDEAD, -1, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, @@ -1249,7 +1353,8 @@ { MONS_HELL_KNIGHT, '@', RED, "hell knight", - M_RES_FIRE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + MR_RES_FIRE, 550, 10, MONS_HUMAN, MH_NATURAL, -3, { 13, 0, 0, 0 }, { 10, 3, 6, 0 }, @@ -1260,7 +1365,8 @@ { MONS_NECROMANCER, '@', DARKGREY, "necromancer", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 550, 10, MONS_HUMAN, MH_NATURAL, -4, { 6, 0, 0, 0 }, { 10, 2, 4, 0 }, @@ -1271,7 +1377,8 @@ { MONS_WIZARD, '@', MAGENTA, "wizard", - M_RES_ELEC | M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_RES_ELEC, 550, 10, MONS_HUMAN, MH_NATURAL, -4, { 6, 0, 0, 0 }, { 10, 2, 4, 0 }, @@ -1282,7 +1389,8 @@ { MONS_ORC_PRIEST, 'o', LIGHTGREEN, "orc priest", - M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD, + M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 600, 10, MONS_ORC, MH_NATURAL, -4, { 6, 0, 0, 0 }, { 3, 3, 4, 0 }, @@ -1293,7 +1401,8 @@ { MONS_ORC_HIGH_PRIEST, 'o', GREEN, "orc high priest", - M_RES_HELLFIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_PRIEST | M_WARM_BLOOD, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_EVIL, + MR_RES_HELLFIRE, 600, 10, MONS_ORC, MH_NATURAL, -4, { 7, 0, 0, 0 }, { 11, 3, 4, 0 }, @@ -1310,6 +1419,7 @@ { MONS_HUMAN, '@', LIGHTGRAY, "human", M_WARM_BLOOD, + MR_NO_FLAGS, 550, 10, MONS_HUMAN, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -1321,6 +1431,7 @@ { MONS_GNOLL, 'g', YELLOW, "gnoll", M_WARM_BLOOD, + MR_NO_FLAGS, 750, 10, MONS_GNOLL, MH_NATURAL, -3, { 9, 0, 0, 0 }, { 2, 4, 5, 0 }, @@ -1331,7 +1442,8 @@ { MONS_CLAY_GOLEM, '8', BROWN, "clay golem", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS, + M_SEE_INVIS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_CLAY_GOLEM, MH_NONLIVING, 5000, { 11, 11, 0, 0 }, { 8, 7, 3, 0 }, @@ -1342,7 +1454,8 @@ { MONS_WOOD_GOLEM, '8', YELLOW, "wood golem", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_RES_ELEC, + M_NO_FLAGS, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_WOOD_GOLEM, MH_NONLIVING, 5000, { 10, 0, 0, 0 }, { 6, 6, 3, 0 }, @@ -1353,7 +1466,8 @@ { MONS_STONE_GOLEM, '8', LIGHTGREY, "stone golem", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC, + M_NO_FLAGS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_STONE_GOLEM, MH_NONLIVING, 5000, { 28, 0, 0, 0 }, { 12, 7, 4, 0 }, @@ -1364,7 +1478,8 @@ { MONS_IRON_GOLEM, '8', CYAN, "iron golem", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS, + M_SEE_INVIS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_IRON_GOLEM, MH_NONLIVING, 5000, { 35, 0, 0, 0 }, { 15, 7, 4, 0 }, @@ -1375,7 +1490,8 @@ { MONS_CRYSTAL_GOLEM, '8', WHITE, "crystal golem", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS, + M_SEE_INVIS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_CRYSTAL_GOLEM, MH_NONLIVING, 5000, { 40, 0, 0, 0 }, { 13, 7, 4, 0 }, @@ -1386,7 +1502,8 @@ { MONS_TOENAIL_GOLEM, '8', LIGHTGREY, "toenail golem", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC, + M_NO_FLAGS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_TOENAIL_GOLEM, MH_NONLIVING, 5000, { 13, 0, 0, 0 }, { 9, 5, 3, 0 }, @@ -1397,7 +1514,8 @@ { MONS_MOTTLED_DRAGON, 'd', LIGHTMAGENTA, "mottled dragon", - M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES, + M_SPELLCASTER | M_FLIES, + MR_RES_POISON | MR_RES_FIRE, 1100, 10, MONS_MOTTLED_DRAGON, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1408,7 +1526,8 @@ { MONS_EARTH_ELEMENTAL, '#', BROWN, "earth elemental", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC, + M_NO_FLAGS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_EARTH_ELEMENTAL, MH_NONLIVING, 5000, { 40, 0, 0, 0 }, { 6, 5, 5, 0 }, @@ -1419,7 +1538,8 @@ { MONS_FIRE_ELEMENTAL, '#', YELLOW, "fire elemental", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_RES_ELEC | M_FLIES, + M_FLIES, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC, 0, 10, MONS_FIRE_ELEMENTAL, MH_NONLIVING, 5000, { 5, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1430,7 +1550,8 @@ { MONS_AIR_ELEMENTAL, 'v', LIGHTGREY, "air elemental", - M_RES_ELEC | M_RES_POISON | M_LEVITATE | M_SEE_INVIS | M_FLIES, + M_LEVITATE | M_SEE_INVIS | M_FLIES, + MR_RES_ELEC | MR_RES_POISON, 0, 5, MONS_AIR_ELEMENTAL, MH_NONLIVING, 5000, { 15, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1443,7 +1564,8 @@ { MONS_ICE_FIEND, '1', WHITE, "Ice Fiend", - M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_FROZEN, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_FROZEN | M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 10, MONS_ICE_FIEND, MH_DEMONIC, -12, { 25, 25, 0, 0 }, { 18, 3, 5, 0 }, @@ -1454,7 +1576,8 @@ { MONS_SHADOW_FIEND, '1', DARKGREY, "Shadow Fiend", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, + M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_SHADOW_FIEND, MH_DEMONIC, -13, { 25, 15, 15, 0 }, { 18, 3, 5, 0 }, @@ -1465,7 +1588,8 @@ { MONS_BROWN_SNAKE, 'S', BROWN, "brown snake", - M_RES_POISON | M_COLD_BLOOD | M_AMPHIBIOUS, + M_COLD_BLOOD | M_AMPHIBIOUS, + MR_RES_POISON, 300, 10, MONS_BROWN_SNAKE, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -1477,6 +1601,7 @@ { MONS_GIANT_LIZARD, 'l', GREEN, "giant lizard", M_COLD_BLOOD, + MR_NO_FLAGS, 600, 10, MONS_GIANT_LIZARD, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1487,7 +1612,8 @@ { MONS_SPECTRAL_WARRIOR, 'W', LIGHTGREEN, "spectral warrior", - M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS, + M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 13, MONS_SPECTRAL_WARRIOR, MH_UNDEAD, -6, { 18, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -1498,7 +1624,8 @@ { MONS_PULSATING_LUMP, 'J', RED, "pulsating lump", - M_RES_POISON | M_SEE_INVIS, + M_SEE_INVIS, + MR_RES_POISON, 0, 3, MONS_PULSATING_LUMP, MH_NATURAL, -3, { 13, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -1509,7 +1636,8 @@ { MONS_STORM_DRAGON, 'D', LIGHTBLUE, "storm dragon", - M_RES_ELEC | M_RES_COLD | M_SPELLCASTER | M_FLIES, + M_SPELLCASTER | M_FLIES, + MR_RES_ELEC | MR_RES_COLD, 2800, 12, MONS_STORM_DRAGON, MH_NATURAL, -5, { 25, 15, 15, 0 }, { 14, 5, 5, 0 }, @@ -1521,6 +1649,7 @@ { MONS_YAKTAUR, 'c', LIGHTRED, "yaktaur", M_WARM_BLOOD, + MR_NO_FLAGS, 2000, 10, MONS_YAKTAUR, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -1531,7 +1660,8 @@ { MONS_DEATH_YAK, 'Y', DARKGREY, "death yak", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 1500, 10, MONS_DEATH_YAK, MH_NATURAL, -5, { 30, 0, 0, 0 }, { 14, 3, 5, 0 }, @@ -1542,7 +1672,8 @@ { MONS_ROCK_TROLL, 'T', LIGHTGREY, "rock troll", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 2200, 11, MONS_ROCK_TROLL, MH_NATURAL, -4, { 30, 20, 20, 0 }, { 11, 3, 5, 0 }, @@ -1553,7 +1684,8 @@ { MONS_STONE_GIANT, 'C', LIGHTGREY, "stone giant", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 3000, 10, MONS_STONE_GIANT, MH_NATURAL, -4, { 45, 0, 0, 0 }, { 16, 3, 5, 0 }, @@ -1564,7 +1696,8 @@ { MONS_FLAYED_GHOST, 'p', RED, "flayed ghost", - M_RES_POISON | M_FLIES, + M_FLIES | M_EVIL, + MR_RES_POISON, 0, 10, MONS_FLAYED_GHOST, MH_UNDEAD, -4, { 30, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -1575,7 +1708,8 @@ { MONS_BUMBLEBEE, 'k', RED, "bumblebee", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 300, 10, MONS_BUMBLEBEE, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -1586,7 +1720,8 @@ { MONS_REDBACK, 's', RED, "redback", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 1000, 14, MONS_REDBACK, MH_NATURAL, -3, { 18, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1597,7 +1732,8 @@ { MONS_INSUBSTANTIAL_WISP, 'p', LIGHTGREY, "insubstantial wisp", - M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_LEVITATE, + M_LEVITATE, + MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 0, 17, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, 5000, { 12, 0, 0, 0 }, { 6, 1, 2, 0 }, @@ -1608,7 +1744,8 @@ { MONS_VAPOUR, '#', LIGHTGREY, "vapour", - M_RES_ELEC | M_RES_POISON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED, + M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED, + MR_RES_ELEC | MR_RES_POISON, 0, 21, MONS_VAPOUR, MH_NONLIVING, 5000, { 0, 0, 0, 0 }, { 12, 2, 3, 0 }, @@ -1619,7 +1756,8 @@ { MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage", - M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL, + MR_RES_ELEC, 0, 16, MONS_OGRE, MH_NATURAL, -6, { 12, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -1630,7 +1768,8 @@ { MONS_SPINY_WORM, 'w', DARKGREY, "spiny worm", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 1300, 13, MONS_SPINY_WORM, MH_NATURAL, -3, { 32, 0, 0, 0 }, { 12, 3, 5, 0 }, @@ -1643,7 +1782,8 @@ // to examine them. { MONS_DANCING_WEAPON, '(', BLACK, "dancing weapon", - M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE, + M_LEVITATE, + MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_DANCING_WEAPON, MH_NONLIVING, 5000, { 30, 0, 0, 0 }, { 15, 0, 0, 15 }, @@ -1654,7 +1794,8 @@ { MONS_TITAN, 'C', MAGENTA, "titan", - M_RES_ELEC | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_RES_ELEC, 3500, 12, MONS_TITAN, MH_NATURAL, -7, { 55, 0, 0, 0 }, { 20, 3, 5, 0 }, @@ -1665,7 +1806,8 @@ { MONS_GOLDEN_DRAGON, 'D', YELLOW, "golden dragon", - M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 3000, 17, MONS_GOLDEN_DRAGON, MH_NATURAL, -8, { 40, 20, 20, 0 }, { 18, 4, 4, 0 }, @@ -1679,6 +1821,7 @@ { MONS_ELF, 'e', DARKGREY, "elf", M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 3, 3, 3, 0 }, @@ -1694,6 +1837,7 @@ { MONS_LINDWURM, 'd', LIGHTGREEN, "lindwurm", M_NO_FLAGS, + MR_NO_FLAGS, 1000, 11, MONS_LINDWURM, MH_NATURAL, -3, { 20, 10, 10, 0 }, { 9, 3, 5, 0 }, @@ -1704,7 +1848,8 @@ { MONS_ELEPHANT_SLUG, 'm', LIGHTGREY, "elephant slug", - M_ED_POISON | M_NO_SKELETON, + M_NO_SKELETON, + MR_VUL_POISON, 1500, 10, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, { 40, 0, 0, 0 }, { 20, 5, 3, 0 }, @@ -1716,6 +1861,7 @@ { MONS_WAR_DOG, 'h', CYAN, "war dog", M_SEE_INVIS | M_WARM_BLOOD, + MR_NO_FLAGS, 350, 10, MONS_WAR_DOG, MH_NATURAL, -3, { 12, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -1727,6 +1873,7 @@ { MONS_GREY_RAT, 'r', LIGHTGREY, "grey rat", M_WARM_BLOOD, + MR_NO_FLAGS, 250, 10, MONS_GREY_RAT, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 1, 3, 6, 0 }, @@ -1738,6 +1885,7 @@ { MONS_GREEN_RAT, 'r', LIGHTGREEN, "green rat", M_WARM_BLOOD, + MR_NO_FLAGS, 250, 10, MONS_GREEN_RAT, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -1749,6 +1897,7 @@ { MONS_ORANGE_RAT, 'r', LIGHTRED, "orange rat", M_WARM_BLOOD, + MR_NO_FLAGS, 250, 10, MONS_ORANGE_RAT, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -1759,7 +1908,8 @@ { MONS_BLACK_SNAKE, 'S', DARKGREY, "black snake", - M_RES_POISON | M_COLD_BLOOD, + M_COLD_BLOOD, + MR_RES_POISON, 500, 12, MONS_BLACK_SNAKE, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -1771,6 +1921,7 @@ { MONS_SHEEP, 'Y', LIGHTGREY, "sheep", M_WARM_BLOOD, + MR_NO_FLAGS, 1200, 10, MONS_SHEEP, MH_NATURAL, -3, { 13, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -1781,7 +1932,8 @@ { MONS_GHOUL, 'n', RED, "ghoul", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 500, 12, MONS_GHOUL, MH_UNDEAD, -5, { 9, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -1793,6 +1945,7 @@ { MONS_HOG, 'h', LIGHTRED, "hog", M_WARM_BLOOD, + MR_NO_FLAGS, 700, 10, MONS_HOG, MH_NATURAL, -3, { 14, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1803,7 +1956,8 @@ { MONS_GIANT_MOSQUITO, 'y', DARKGREY, "giant mosquito", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 100, 10, MONS_GIANT_MOSQUITO, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -1814,7 +1968,8 @@ { MONS_GIANT_CENTIPEDE, 's', GREEN, "giant centipede", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 350, 10, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3, { 2, 0, 0, 0 }, { 2, 3, 3, 0 }, @@ -1827,7 +1982,8 @@ { MONS_IRON_TROLL, 'T', CYAN, "iron troll", - M_RES_FIRE | M_RES_COLD | M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_RES_FIRE | MR_RES_COLD, 2400, 10, MONS_IRON_TROLL, MH_NATURAL, -5, { 35, 25, 25, 0 }, { 16, 3, 5, 0 }, @@ -1838,7 +1994,8 @@ { MONS_NAGA, 'N', GREEN, "naga", - M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, + M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, + MR_RES_POISON, 750, 10, MONS_NAGA, MH_NATURAL, -6, { 6, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1849,7 +2006,8 @@ { MONS_FIRE_GIANT, 'C', RED, "fire giant", - M_RES_FIRE | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_RES_FIRE, 2400, 11, MONS_FIRE_GIANT, MH_NATURAL, -4, { 30, 0, 0, 0 }, { 16, 3, 6, 0 }, @@ -1860,7 +2018,8 @@ { MONS_FROST_GIANT, 'C', LIGHTBLUE, "frost giant", - M_RES_COLD | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_RES_COLD, 2600, 11, MONS_FROST_GIANT, MH_NATURAL, -4, { 35, 0, 0, 0 }, { 16, 4, 5, 0 }, @@ -1871,7 +2030,8 @@ { MONS_FIREDRAKE, 'd', RED, "firedrake", - M_RES_FIRE | M_FLIES, + M_FLIES, + MR_RES_FIRE, 900, 10, MONS_FIREDRAKE, MH_NATURAL, -3, { 8, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1882,7 +2042,8 @@ { MONS_SHADOW_DRAGON, 'D', DARKGREY, "shadow dragon", - M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + MR_RES_POISON | MR_RES_COLD, 2000, 12, MONS_SHADOW_DRAGON, MH_NATURAL, -5, { 20, 15, 15, 0 }, { 17, 5, 5, 0 }, @@ -1892,7 +2053,8 @@ , { MONS_YELLOW_SNAKE, 'S', YELLOW, "yellow snake", - M_RES_POISON | M_COLD_BLOOD, + M_COLD_BLOOD, + MR_RES_POISON, 400, 10, MONS_YELLOW_SNAKE, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1904,6 +2066,7 @@ { MONS_GREY_SNAKE, 'S', LIGHTGREY, "grey snake", M_COLD_BLOOD, + MR_NO_FLAGS, 600, 10, MONS_GREY_SNAKE, MH_NATURAL, -3, { 30, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -1914,7 +2077,8 @@ { MONS_DEEP_TROLL, 'T', DARKGREY, "deep troll", - M_WARM_BLOOD | M_SEE_INVIS, + M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 1500, 12, MONS_DEEP_TROLL, MH_NATURAL, -3, { 27, 20, 20, 0 }, { 10, 3, 5, 0 }, @@ -1925,7 +2089,8 @@ { MONS_GIANT_BLOWFLY, 'y', LIGHTGREY, "giant blowfly", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 200, 10, MONS_GIANT_BLOWFLY, MH_NATURAL, -3, { 13, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -1936,7 +2101,8 @@ { MONS_RED_WASP, 'y', RED, "red wasp", - M_ED_POISON | M_FLIES, + M_FLIES, + MR_VUL_POISON, 400, 14, MONS_RED_WASP, MH_NATURAL, -3, { 23, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -1947,7 +2113,8 @@ { MONS_SWAMP_DRAGON, 'D', BROWN, "swamp dragon", - M_SPELLCASTER | M_FLIES | M_RES_POISON, + M_SPELLCASTER | M_FLIES, + MR_RES_POISON, 1900, 11, MONS_SWAMP_DRAGON, MH_NATURAL, -3, { 13, 9, 9, 0 }, { 9, 5, 5, 0 }, @@ -1958,7 +2125,8 @@ { MONS_SWAMP_DRAKE, 'd', BROWN, "swamp drake", - M_SPELLCASTER | M_FLIES | M_RES_POISON, + M_SPELLCASTER | M_FLIES | M_EVIL, + MR_RES_POISON, 900, 11, MONS_SWAMP_DRAKE, MH_NATURAL, -3, { 11, 0, 0, 0 }, { 4, 5, 5, 0 }, @@ -1969,7 +2137,8 @@ { MONS_SOLDIER_ANT, 'a', LIGHTGREY, "soldier ant", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 900, 10, MONS_SOLDIER_ANT, MH_NATURAL, -3, { 14, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -1980,7 +2149,8 @@ { MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 1600, 10, MONS_HILL_GIANT, MH_NATURAL, -3, { 30, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -1991,7 +2161,8 @@ { MONS_QUEEN_ANT, 'Q', DARKGREY, "queen ant", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 1200, 10, MONS_QUEEN_ANT, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -2002,7 +2173,8 @@ { MONS_ANT_LARVA, 'w', LIGHTGREY, "ant larva", - M_ED_POISON | M_NO_SKELETON, + M_NO_SKELETON, + MR_VUL_POISON, 350, 5, MONS_ANT_LARVA, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -2015,6 +2187,7 @@ { MONS_GIANT_FROG, 'F', GREEN, "giant frog", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 500, 10, MONS_GIANT_FROG, MH_NATURAL, -3, { 9, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -2026,6 +2199,7 @@ { MONS_GIANT_BROWN_FROG, 'F', BROWN, "giant brown frog", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 890, 10, MONS_GIANT_BROWN_FROG, MH_NATURAL, -3, { 14, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -2036,7 +2210,8 @@ { MONS_SPINY_FROG, 'F', YELLOW, "spiny frog", - M_COLD_BLOOD | M_RES_POISON | M_AMPHIBIOUS, + M_COLD_BLOOD | M_AMPHIBIOUS, + MR_RES_POISON, 1000, 10, MONS_SPINY_FROG, MH_NATURAL, -3, { 26, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -2048,6 +2223,7 @@ { MONS_BLINK_FROG, 'F', LIGHTGREEN, "blink frog", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 800, 12, MONS_BLINK_FROG, MH_NATURAL, -5, { 20, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -2058,6 +2234,7 @@ { MONS_GIANT_COCKROACH, 'a', BROWN, "giant cockroach", M_NO_FLAGS, + MR_NO_FLAGS, 250, 10, MONS_GIANT_COCKROACH, MH_NATURAL, -1, { 2, 0, 0, 0 }, { 1, 3, 4, 0 }, @@ -2068,6 +2245,7 @@ { MONS_SMALL_SNAKE, 'S', LIGHTGREEN, "small snake", M_COLD_BLOOD, + MR_NO_FLAGS, 100, 13, MONS_SMALL_SNAKE, MH_NATURAL, -1, { 2, 0, 0, 0 }, { 1, 2, 3, 0 }, @@ -2078,7 +2256,8 @@ { MONS_WHITE_IMP, '5', WHITE, "white imp", - M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SPEAKS, + M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, + MR_RES_COLD, 0, 10, MONS_WHITE_IMP, MH_DEMONIC, -3, { 4, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -2089,7 +2268,8 @@ { MONS_LEMURE, '5', YELLOW, "lemure", - M_RES_POISON, + M_EVIL, + MR_RES_POISON, 0, 10, MONS_LEMURE, MH_DEMONIC, -3, { 12, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -2100,7 +2280,8 @@ { MONS_UFETUBUS, '5', LIGHTCYAN, "ufetubus", - M_ED_FIRE | M_RES_COLD, + M_EVIL, + MR_VUL_FIRE | MR_RES_COLD, 0, 10, MONS_UFETUBUS, MH_DEMONIC, -3, { 5, 5, 0, 0 }, { 1, 4, 6, 0 }, @@ -2111,7 +2292,8 @@ { MONS_MANES, '5', LIGHTRED, "manes", - M_RES_ELEC | M_RES_FIRE | M_RES_COLD | M_RES_POISON, + M_EVIL, + MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, 0, 10, MONS_MANES, MH_DEMONIC, -3, { 5, 3, 3, 0 }, { 3, 3, 5, 0 }, @@ -2122,7 +2304,8 @@ { MONS_MIDGE, '5', LIGHTGREEN, "midge", - M_RES_POISON | M_FLIES, + M_FLIES | M_EVIL, + MR_RES_POISON, 0, 10, MONS_MIDGE, MH_DEMONIC, -3, { 8, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -2133,7 +2316,8 @@ { MONS_NEQOXEC, '3', MAGENTA, "neqoxec", - M_RES_POISON | M_SPELLCASTER | M_LEVITATE, + M_SPELLCASTER | M_LEVITATE | M_EVIL, + MR_RES_POISON, 0, 12, MONS_NEQOXEC, MH_DEMONIC, -6, { 15, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -2144,7 +2328,8 @@ { MONS_ORANGE_DEMON, '3', LIGHTRED, "orange demon", - M_NO_FLAGS, + M_EVIL, + MR_NO_FLAGS, 0, 12, MONS_ORANGE_DEMON, MH_DEMONIC, -6, { 10, 5, 0, 0 }, { 8, 4, 5, 0 }, @@ -2155,7 +2340,8 @@ { MONS_HELLWING, '3', LIGHTGREY, "hellwing", - M_RES_POISON | M_SPELLCASTER | M_FLIES, + M_SPELLCASTER | M_FLIES | M_EVIL, + MR_RES_POISON, 0, 12, MONS_HELLWING, MH_DEMONIC, -6, { 17, 10, 0, 0 }, { 7, 4, 5, 0 }, @@ -2166,7 +2352,8 @@ { MONS_SMOKE_DEMON, '4', LIGHTGREY, "smoke demon", - M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES, + M_SPELLCASTER | M_FLIES | M_EVIL, + MR_RES_POISON | MR_RES_FIRE, 0, 12, MONS_SMOKE_DEMON, MH_DEMONIC, -6, { 8, 5, 5, 0 }, { 7, 3, 5, 0 }, @@ -2177,7 +2364,8 @@ { MONS_YNOXINUL, '3', CYAN, "ynoxinul", - M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD, 0, 12, MONS_YNOXINUL, MH_DEMONIC, -6, { 12, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -2188,7 +2376,8 @@ { MONS_EXECUTIONER, '1', LIGHTGREY, "Executioner", - M_SPELLCASTER | M_RES_ELEC | M_RES_FIRE | M_RES_COLD | M_RES_POISON | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, 0, 14, MONS_EXECUTIONER, MH_DEMONIC, -9, { 30, 10, 10, 0 }, { 12, 3, 5, 0 }, @@ -2199,7 +2388,8 @@ { MONS_GREEN_DEATH, '1', GREEN, "Green Death", - M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_POISON, 0, 14, MONS_GREEN_DEATH, MH_DEMONIC, -9, { 32, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -2210,7 +2400,8 @@ { MONS_BLUE_DEATH, '1', BLUE, "Blue Death", - M_RES_POISON | M_SPELLCASTER | M_ED_FIRE | M_RES_COLD | M_RES_ELEC | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 14, MONS_BLUE_DEATH, MH_DEMONIC, -9, { 20, 20, 0, 0 }, { 12, 3, 5, 0 }, @@ -2221,7 +2412,8 @@ { MONS_BALRUG, '1', RED, "Balrug", - M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 14, MONS_BALRUG, MH_DEMONIC, -9, { 25, 0, 0, 0 }, { 14, 3, 5, 0 }, @@ -2232,7 +2424,8 @@ { MONS_CACODEMON, '1', YELLOW, "Cacodemon", - M_RES_POISON | M_RES_ELEC | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, + M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_ELEC, 0, 14, MONS_CACODEMON, MH_DEMONIC, -9, { 22, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -2244,7 +2437,8 @@ { MONS_DEMONIC_CRAWLER, '3', DARKGREY, "demonic crawler", - M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_RES_FIRE | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE, 0, 12, MONS_DEMONIC_CRAWLER, MH_DEMONIC, -6, { 13, 13, 13, 13 }, { 9, 3, 5, 0 }, @@ -2255,7 +2449,8 @@ { MONS_SUN_DEMON, '2', YELLOW, "sun demon", - M_RES_ELEC | M_RES_POISON | M_ED_COLD | M_RES_HELLFIRE | M_SEE_INVIS | M_LEVITATE, + M_SEE_INVIS | M_LEVITATE | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_VUL_COLD | MR_RES_HELLFIRE, 0, 14, MONS_SUN_DEMON, MH_DEMONIC, -6, { 30, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -2266,7 +2461,8 @@ { MONS_SHADOW_IMP, '5', DARKGREY, "shadow imp", - M_RES_COLD | M_SPELLCASTER | M_FLIES | M_RES_POISON | M_SPEAKS, + M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, + MR_RES_COLD | MR_RES_POISON, 0, 11, MONS_SHADOW_IMP, MH_DEMONIC, -3, { 6, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -2277,7 +2473,8 @@ { MONS_SHADOW_DEMON, '3', DARKGREY, "shadow demon", - M_RES_POISON | M_RES_COLD | M_SEE_INVIS | M_INVIS, + M_SEE_INVIS | M_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 12, MONS_SHADOW_DEMON, MH_DEMONIC, -7, { 21, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -2288,7 +2485,8 @@ { MONS_LOROCYPROCA, '2', BLUE, "Lorocyproca", - M_RES_POISON | M_RES_COLD | M_RES_FIRE | M_RES_ELEC | M_SEE_INVIS | M_INVIS, + M_SEE_INVIS | M_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC, 0, 12, MONS_LOROCYPROCA, MH_DEMONIC, -7, { 25, 25, 0, 0 }, { 12, 3, 5, 0 }, @@ -2299,7 +2497,8 @@ { MONS_SHADOW_WRAITH, 'W', BLUE, "shadow wraith", - M_RES_POISON | M_LEVITATE | M_SEE_INVIS | M_INVIS, + M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL, + MR_RES_POISON, 0, 15, MONS_SHADOW_WRAITH, MH_UNDEAD, -8, { 20, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -2310,7 +2509,8 @@ { MONS_GIANT_AMOEBA, 'J', BLUE, "giant amoeba", - M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS, + M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS, + MR_RES_POISON, 1000, 10, MONS_GIANT_AMOEBA, MH_NATURAL, -3, { 25, 0, 0, 0 }, { 12, 3, 5, 0 }, @@ -2322,6 +2522,7 @@ { MONS_GIANT_SLUG, 'm', GREEN, "giant slug", M_NO_SKELETON | M_AMPHIBIOUS, + MR_NO_FLAGS, 700, 10, MONS_GIANT_SLUG, MH_NATURAL, -3, { 23, 0, 0, 0 }, { 10, 5, 3, 0 }, @@ -2333,6 +2534,7 @@ { MONS_GIANT_SNAIL, 'm', LIGHTGREEN, "giant snail", M_NO_SKELETON | M_AMPHIBIOUS, + MR_NO_FLAGS, 900, 10, MONS_GIANT_SNAIL, MH_NATURAL, -3, { 18, 0, 0, 0 }, { 14, 5, 3, 0 }, @@ -2343,7 +2545,8 @@ { MONS_SPATIAL_VORTEX, 'v', BLACK, "spatial vortex", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE | M_CONFUSED, + M_LEVITATE | M_CONFUSED, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 5, MONS_SPATIAL_VORTEX, MH_NONLIVING, 5000, { 50, 0, 0, 0 }, { 6, 6, 6, 0 }, @@ -2354,7 +2557,8 @@ { MONS_PIT_FIEND, '1', BROWN, "Pit Fiend", - M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_FLIES | M_SEE_INVIS | M_RES_ELEC, + M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC, 0, 18, MONS_PIT_FIEND, MH_DEMONIC, -12, { 28, 21, 21, 0 }, { 19, 4, 5, 0 }, @@ -2365,7 +2569,8 @@ { MONS_BORING_BEETLE, 'B', BROWN, "boring beetle", - M_ED_POISON, + M_NO_FLAGS, + MR_VUL_POISON, 1300, 10, MONS_BORING_BEETLE, MH_NATURAL, -3, { 26, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -2376,7 +2581,8 @@ { MONS_GARGOYLE, 'g', DARKGREY, "gargoyle", - M_RES_POISON | M_RES_ELEC | M_FLIES, + M_FLIES, + MR_RES_POISON | MR_RES_ELEC, 0, 12, MONS_GARGOYLE, MH_NONLIVING, -6, { 10, 6, 6, 0 }, { 4, 3, 5, 0 }, @@ -2388,7 +2594,8 @@ // only appear in Dis castle { MONS_METAL_GARGOYLE, 'g', CYAN, "metal gargoyle", - M_RES_POISON | M_RES_ELEC | M_FLIES, + M_FLIES, + MR_RES_POISON | MR_RES_ELEC, 0, 12, MONS_METAL_GARGOYLE, MH_NONLIVING, -6, { 19, 10, 10, 0 }, { 8, 3, 5, 0 }, @@ -2400,7 +2607,8 @@ // only appear in Gehenna castle & one minivault { MONS_MOLTEN_GARGOYLE, 'g', RED, "molten gargoyle", - M_RES_POISON | M_RES_ELEC | M_FLIES | M_RES_FIRE, + M_FLIES, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE, 0, 12, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6, { 12, 8, 8, 0 }, { 5, 3, 5, 0 }, @@ -2415,7 +2623,8 @@ { MONS_MNOLEG, '&', LIGHTGREEN, "Mnoleg", - M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS, + M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE, 0, 25, MONS_MNOLEG, MH_DEMONIC, 5000, { 23, 23, 0, 0 }, { 17, 0, 0, 199 }, @@ -2426,7 +2635,8 @@ { MONS_LOM_LOBON, '&', LIGHTBLUE, "Lom Lobon", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS, + M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 25, MONS_LOM_LOBON, MH_DEMONIC, 5000, { 40, 0, 0, 0 }, { 19, 0, 0, 223 }, @@ -2437,7 +2647,8 @@ { MONS_CEREBOV, '&', RED, "Cerebov", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE, 0, 25, MONS_CEREBOV, MH_DEMONIC, -6, { 50, 0, 0, 0 }, { 21, 0, 0, 253 }, @@ -2448,7 +2659,8 @@ { MONS_GLOORX_VLOQ, '&', DARKGREY, "Gloorx Vloq", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS, + M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 25, MONS_GLOORX_VLOQ, MH_DEMONIC, -14, { 20, 0, 0, 0 }, { 16, 0, 0, 234 }, @@ -2458,14 +2670,16 @@ , /* ****************************************************************** -{MONS_MOLLUSC_LORD, 'U', GREEN, "The Mollusc Lord", M_RES_POISON, +{MONS_MOLLUSC_LORD, 'U', GREEN, "The Mollusc Lord", M_NO_FLAGS, + MR_RES_POISON, 0, 25, 255, MH_DEMONIC, -3, {30,0,0,0}, {16,0,0,100}, 10, 10, 10, 7, 93, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_HIGH, 1}, ****************************************************************** */ { MONS_NAGA_MAGE, 'N', LIGHTRED, "naga mage", - M_RES_POISON | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + MR_RES_POISON, 750, 13, MONS_NAGA, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -2476,7 +2690,8 @@ { MONS_NAGA_WARRIOR, 'N', BLUE, "naga warrior", - M_RES_POISON | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, + MR_RES_POISON, 750, 12, MONS_NAGA, MH_NATURAL, -6, { 11, 0, 0, 0 }, { 10, 5, 5, 0 }, @@ -2487,7 +2702,8 @@ { MONS_ORC_WARLORD, 'o', RED, "orc warlord", - M_WARM_BLOOD, + M_WARM_BLOOD | M_EVIL, + MR_NO_FLAGS, 600, 15, MONS_ORC, MH_NATURAL, -3, { 32, 0, 0, 0 }, { 15, 4, 7, 0 }, @@ -2499,6 +2715,7 @@ { MONS_DEEP_ELF_SOLDIER, 'e', CYAN, "deep elf soldier", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 6, 0, 0, 0 }, { 3, 3, 3, 0 }, @@ -2510,6 +2727,7 @@ { MONS_DEEP_ELF_FIGHTER, 'e', LIGHTBLUE, "deep elf fighter", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 9, 0, 0, 0 }, { 6, 3, 3, 0 }, @@ -2521,6 +2739,7 @@ { MONS_DEEP_ELF_KNIGHT, 'e', BLUE, "deep elf knight", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 14, 0, 0, 0 }, { 11, 3, 3, 0 }, @@ -2531,7 +2750,8 @@ { MONS_DEEP_ELF_MAGE, 'e', LIGHTRED, "deep elf mage", - M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_RES_ELEC, 450, 10, MONS_ELF, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 4, 3, 3, 0 }, @@ -2543,6 +2763,7 @@ { MONS_DEEP_ELF_SUMMONER, 'e', YELLOW, "deep elf summoner", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 6, 3, 3, 0 }, @@ -2553,7 +2774,8 @@ { MONS_DEEP_ELF_CONJURER, 'e', LIGHTGREEN, "deep elf conjurer", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_RES_ELEC | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_RES_ELEC, 450, 10, MONS_ELF, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 6, 3, 3, 0 }, @@ -2565,6 +2787,7 @@ { MONS_DEEP_ELF_PRIEST, 'e', LIGHTGREY, "deep elf priest", M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 9, 0, 0, 0 }, { 5, 3, 3, 0 }, @@ -2575,7 +2798,8 @@ { MONS_DEEP_ELF_HIGH_PRIEST, 'e', DARKGREY, "deep elf high priest", - M_SPELLCASTER | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 14, 0, 0, 0 }, { 11, 3, 3, 0 }, @@ -2586,7 +2810,8 @@ { MONS_DEEP_ELF_DEMONOLOGIST, 'e', MAGENTA, "deep elf demonologist", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 12, 0, 0, 0 }, { 12, 3, 3, 0 }, @@ -2597,7 +2822,8 @@ { MONS_DEEP_ELF_ANNIHILATOR, 'e', GREEN, "deep elf annihilator", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_RES_ELEC | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS, + MR_RES_ELEC, 450, 10, MONS_ELF, MH_NATURAL, -6, { 12, 0, 0, 0 }, { 15, 3, 3, 0 }, @@ -2609,6 +2835,7 @@ { MONS_DEEP_ELF_SORCERER, 'e', RED, "deep elf sorcerer", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 12, 0, 0, 0 }, { 14, 3, 3, 0 }, @@ -2619,7 +2846,8 @@ { MONS_DEEP_ELF_DEATH_MAGE, 'e', WHITE, "deep elf death mage", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 450, 10, MONS_ELF, MH_NATURAL, -6, { 12, 0, 0, 0 }, { 15, 3, 3, 0 }, @@ -2630,7 +2858,8 @@ { MONS_BROWN_OOZE, 'J', BROWN, "brown ooze", - M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_POISON, 0, 11, MONS_BROWN_OOZE, MH_NATURAL, -7, { 25, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -2641,7 +2870,8 @@ { MONS_AZURE_JELLY, 'J', LIGHTBLUE, "azure jelly", - M_RES_POISON | M_RES_COLD | M_ED_FIRE | M_RES_ELEC | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_POISON | MR_RES_COLD | MR_VUL_FIRE | MR_RES_ELEC, 0, 11, MONS_AZURE_JELLY, MH_NATURAL, -4, { 12, 12, 12, 12 }, { 15, 3, 5, 0 }, @@ -2652,7 +2882,8 @@ { MONS_DEATH_OOZE, 'J', DARKGREY, "death ooze", - M_RES_POISON | M_RES_COLD | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 13, MONS_DEATH_OOZE, MH_UNDEAD, -8, { 32, 32, 0, 0 }, { 11, 3, 3, 0 }, @@ -2663,7 +2894,8 @@ { MONS_ACID_BLOB, 'J', LIGHTGREEN, "acid blob", - M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_POISON, 0, 12, MONS_ACID_BLOB, MH_NATURAL, -7, { 42, 0, 0, 0 }, { 18, 3, 5, 0 }, @@ -2674,7 +2906,8 @@ { MONS_ROYAL_JELLY, 'J', YELLOW, "royal jelly", - M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_POISON, 0, 20, MONS_ROYAL_JELLY, MH_NATURAL, -7, { 50, 0, 0, 0 }, { 21, 0, 0, 111 }, @@ -2685,7 +2918,8 @@ { MONS_TERENCE, '@', LIGHTCYAN, "Terence", - M_WARM_BLOOD| M_SPEAKS, + M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -3, { 3, 0, 0, 0 }, { 1, 0, 0, 14 }, @@ -2697,6 +2931,7 @@ { MONS_JESSICA, '@', LIGHTGREY, "Jessica", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -3, { 4, 0, 0, 0 }, { 1, 0, 0, 10 }, @@ -2708,6 +2943,7 @@ { MONS_IJYB, 'g', BLUE, "Ijyb", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 5, MONS_GOBLIN, MH_NATURAL, -3, { 4, 0, 0, 0 }, { 3, 0, 0, 28 }, @@ -2719,6 +2955,7 @@ { MONS_SIGMUND, '@', YELLOW, "Sigmund", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 3, 0, 0, 25 }, @@ -2730,6 +2967,7 @@ { MONS_BLORK_THE_ORC, 'o', BROWN, "Blork the orc", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_ORC, MH_NATURAL, -4, { 7, 0, 0, 0 }, { 3, 0, 0, 32 }, @@ -2741,6 +2979,7 @@ { MONS_EDMUND, '@', RED, "Edmund", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -4, { 6, 0, 0, 0 }, { 4, 0, 0, 27 }, @@ -2752,6 +2991,7 @@ { MONS_PSYCHE, '@', LIGHTMAGENTA, "Psyche", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -4, { 7, 0, 0, 0 }, { 5, 0, 0, 24 }, @@ -2762,7 +3002,8 @@ { MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha", - M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS | M_EVIL, + MR_RES_ELEC, 0, 20, MONS_OGRE, MH_NATURAL, -7, { 20, 0, 0, 0 }, { 6, 0, 0, 45 }, @@ -2774,6 +3015,7 @@ { MONS_DONALD, '@', BLUE, "Donald", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 8, 0, 0, 0 }, { 5, 0, 0, 33 }, @@ -2785,6 +3027,7 @@ { MONS_URUG, 'o', RED, "Urug", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_ORC, MH_NATURAL, -5, { 12, 0, 0, 0 }, { 6, 0, 0, 38 }, @@ -2796,6 +3039,7 @@ { MONS_MICHAEL, '@', LIGHTGREY, "Michael", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 9, 0, 0, 0 }, { 6, 0, 0, 36 }, @@ -2807,6 +3051,7 @@ { MONS_JOSEPH, '@', CYAN, "Joseph", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 9, 0, 0, 0 }, { 7, 0, 0, 42 }, @@ -2817,7 +3062,8 @@ { MONS_SNORG, 'T', GREEN, "Snorg", - M_WARM_BLOOD | M_SPEAKS, + M_WARM_BLOOD | M_SPEAKS | M_EVIL, + MR_NO_FLAGS, 0, 20, MONS_TROLL, MH_NATURAL, -6, { 20, 15, 15, 0 }, { 8, 0, 0, 45 }, @@ -2829,6 +3075,7 @@ { MONS_ERICA, '@', MAGENTA, "Erica", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 10, 0, 0, 0 }, { 9, 0, 0, 43 }, @@ -2840,6 +3087,7 @@ { MONS_JOSEPHINE, '@', WHITE, "Josephine", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 11, 0, 0, 0 }, { 9, 0, 0, 47 }, @@ -2851,6 +3099,7 @@ { MONS_HAROLD, '@', LIGHTGREEN, "Harold", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 12, 0, 0, 0 }, { 9, 0, 0, 51 }, @@ -2862,6 +3111,7 @@ { MONS_NORBERT, '@', BROWN, "Norbert", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 14, 0, 0, 0 }, { 10, 0, 0, 53 }, @@ -2873,6 +3123,7 @@ { MONS_JOZEF, '@', LIGHTMAGENTA, "Jozef", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 14, 0, 0, 0 }, { 11, 0, 0, 60 }, @@ -2884,6 +3135,7 @@ { MONS_AGNES, '@', LIGHTBLUE, "Agnes", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 11, 0, 0, 0 }, { 11, 0, 0, 64 }, @@ -2895,6 +3147,7 @@ { MONS_MAUD, '@', RED, "Maud", M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 14, 0, 0, 0 }, { 13, 0, 0, 55 }, @@ -2905,7 +3158,8 @@ { MONS_LOUISE, '@', BLUE, "Louise", - M_SPELLCASTER | M_RES_ELEC | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, + MR_RES_ELEC, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 12, 0, 0, 0 }, { 13, 0, 0, 52 }, @@ -2916,7 +3170,8 @@ { MONS_FRANCIS, '@', YELLOW, "Francis", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 12, 0, 0, 0 }, { 14, 0, 0, 67 }, @@ -2927,7 +3182,8 @@ { MONS_FRANCES, '@', YELLOW, "Frances", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 11, 0, 0, 0 }, { 14, 0, 0, 70 }, @@ -2938,7 +3194,8 @@ { MONS_RUPERT, '@', RED, "Rupert", - M_SPELLCASTER | M_RES_ELEC | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + MR_RES_ELEC, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 13, 0, 0, 0 }, { 16, 0, 0, 80 }, @@ -2950,6 +3207,7 @@ { MONS_WAYNE, '@', YELLOW, "Wayne", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 14, 0, 0, 0 }, { 17, 0, 0, 78 }, @@ -2961,6 +3219,7 @@ { MONS_DUANE, '@', YELLOW, "Duane", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 14, 0, 0, 0 }, { 18, 0, 0, 83 }, @@ -2971,7 +3230,8 @@ { MONS_XTAHUA, 'D', RED, "Xtahua", - M_SPEAKS | M_SEE_INVIS | M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_FLIES, + M_SPEAKS | M_SEE_INVIS | M_FLIES, + MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, 0, 20, MONS_DRAGON, MH_NATURAL, -7, { 29, 17, 17, 0 }, { 19, 0, 0, 133 }, @@ -2982,7 +3242,8 @@ { MONS_NORRIS, '@', LIGHTRED, "Norris", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 16, 0, 0, 0 }, { 20, 0, 0, 95 }, @@ -2993,7 +3254,8 @@ { MONS_ADOLF, '@', DARKGREY, "Adolf", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 17, 0, 0, 0 }, { 21, 0, 0, 105 }, @@ -3005,6 +3267,7 @@ { MONS_MARGERY, '@', RED, "Margery", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, + MR_NO_FLAGS, 0, 20, MONS_HUMAN, MH_NATURAL, -5, { 18, 0, 0, 0 }, { 22, 0, 0, 119 }, @@ -3015,7 +3278,8 @@ { MONS_BORIS, 'L', RED, "Boris", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 23, MONS_LICH, MH_UNDEAD, -11, { 15, 0, 0, 0 }, { 22, 0, 0, 99 }, @@ -3027,7 +3291,8 @@ { MONS_GERYON, '&', GREEN, "Geryon", - M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_NO_FLAGS, 0, 25, MONS_GERYON, MH_DEMONIC, -6, { 30, 0, 0, 0 }, { 15, 0, 0, 240 }, @@ -3038,7 +3303,8 @@ { MONS_DISPATER, '&', MAGENTA, "Dispater", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, 0, 25, MONS_DISPATER, MH_DEMONIC, -10, { 15, 0, 0, 0 }, { 16, 0, 0, 222 }, @@ -3049,7 +3315,8 @@ { MONS_ASMODEUS, '&', LIGHTMAGENTA, "Asmodeus", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE, 0, 25, MONS_ASMODEUS, MH_DEMONIC, -12, { 20, 0, 0, 0 }, { 17, 0, 0, 245 }, @@ -3061,7 +3328,8 @@ // Antaeus is now demonic so that he'll resist torment. -- bwr { MONS_ANTAEUS, 'C', LIGHTCYAN, "Antaeus", - M_RES_ELEC | M_ED_FIRE | M_RES_COLD | M_SPELLCASTER | M_SPEAKS, + M_SPELLCASTER | M_SPEAKS, + MR_RES_ELEC | MR_VUL_FIRE | MR_RES_COLD, 0, 25, MONS_ANTAEUS, MH_DEMONIC, -9, { 30, 0, 0, 0 }, { 22, 0, 0, 250 }, @@ -3072,7 +3340,8 @@ { MONS_ERESHKIGAL, '&', WHITE, "Ereshkigal", - M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS, + M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD, 0, 25, MONS_ERESHKIGAL, MH_DEMONIC, -10, { 20, 0, 0, 0 }, { 18, 0, 0, 238 }, @@ -3083,7 +3352,8 @@ { MONS_ANCIENT_LICH, 'L', DARKGREY, "ancient lich", - M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_RES_FIRE | M_RES_ELEC, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC, 0, 20, MONS_LICH, MH_UNDEAD, -14, { 20, 0, 0, 0 }, { 27, 2, 4, 0 }, @@ -3095,7 +3365,8 @@ { MONS_OOZE, 'J', LIGHTGREY, "ooze", - M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_POISON, 0, 5, MONS_OOZE, MH_NATURAL, -6, { 5, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -3107,6 +3378,7 @@ { MONS_VAULT_GUARD, '@', CYAN, "vault guard", M_WARM_BLOOD | M_SEE_INVIS, + MR_NO_FLAGS, 0, 12, MONS_HUMAN, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 13, 3, 5, 0 }, @@ -3119,7 +3391,8 @@ placed in the Crypt. */ { MONS_CURSE_SKULL, 'z', DARKGREY, "curse skull", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, + M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, 0, 50, MONS_CURSE_SKULL, MH_UNDEAD, 5000, { 0, 0, 0, 0 }, { 13, 0, 0, 66 }, @@ -3130,7 +3403,8 @@ { MONS_VAMPIRE_KNIGHT, 'V', CYAN, "vampire knight", - M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 13, MONS_VAMPIRE, MH_UNDEAD, -6, { 33, 0, 0, 0 }, { 11, 3, 7, 0 }, @@ -3141,7 +3415,8 @@ { MONS_VAMPIRE_MAGE, 'V', MAGENTA, "vampire mage", - M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_FLIES, + M_SPELLCASTER | M_SEE_INVIS | M_FLIES | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 15, MONS_VAMPIRE, MH_UNDEAD, -6, { 22, 0, 0, 0 }, { 8, 3, 4, 0 }, @@ -3153,6 +3428,7 @@ { MONS_SHINING_EYE, 'G', LIGHTMAGENTA, "shining eye", M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, + MR_NO_FLAGS, 0, 14, MONS_SHINING_EYE, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -3164,6 +3440,7 @@ { MONS_ORB_GUARDIAN, 'X', MAGENTA, "Orb Guardian", M_NO_SKELETON | M_SEE_INVIS, + MR_NO_FLAGS, 0, 20, MONS_ORB_GUARDIAN, MH_NATURAL, -6, { 40, 0, 0, 0 }, { 15, 3, 5, 0 }, @@ -3174,7 +3451,8 @@ { MONS_DAEVA, 'A', YELLOW, "Daeva", - M_RES_POISON | M_LEVITATE | M_SPELLCASTER, + M_LEVITATE | M_SPELLCASTER, + MR_RES_POISON, 0, 12, MONS_DAEVA, MH_HOLY, -8, { 25, 0, 0, 0 }, { 12, 3, 5, 0 }, @@ -3186,7 +3464,8 @@ /* spectral thing - similar to zombies/skeletons */ { MONS_SPECTRAL_THING, 'W', GREEN, "", - M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS, + M_LEVITATE | M_SEE_INVIS, + MR_RES_POISON | MR_RES_COLD, 0, 11, MONS_SPECTRAL_THING, MH_UNDEAD, 5000, { 20, 0, 0, 0 }, { 8, 3, 5, 0 }, @@ -3197,7 +3476,8 @@ { MONS_GREATER_NAGA, 'N', RED, "greater naga", - M_RES_POISON | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, + MR_RES_POISON, 750, 10, MONS_NAGA, MH_NATURAL, 5000, { 18, 0, 0, 0 }, { 15, 3, 5, 0 }, @@ -3208,7 +3488,8 @@ { MONS_SKELETAL_DRAGON, 'D', LIGHTGREY, "skeletal dragon", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 12, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4, { 30, 20, 20, 0 }, { 20, 8, 8, 0 }, @@ -3219,7 +3500,8 @@ { MONS_TENTACLED_MONSTROSITY, 'X', GREEN, "tentacled monstrosity", - M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS | M_AMPHIBIOUS, + M_SEE_INVIS | M_AMPHIBIOUS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 0, 10, MONS_TENTACLED_MONSTROSITY, MH_NATURAL, -5, { 22, 17, 13, 19 }, { 25, 3, 5, 0 }, @@ -3231,6 +3513,7 @@ { MONS_SPHINX, 'H', LIGHTGREY, "sphinx", M_FLIES | M_SEE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, + MR_NO_FLAGS, 0, 10, MONS_SPHINX, MH_NATURAL, -3, { 25, 12, 12, 0 }, { 16, 3, 5, 0 }, @@ -3241,7 +3524,8 @@ { MONS_ROTTING_HULK, 'n', BROWN, "rotting hulk", - M_RES_POISON | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 12, MONS_ROTTING_HULK, MH_UNDEAD, -5, { 25, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -3252,7 +3536,8 @@ { MONS_GUARDIAN_MUMMY, 'M', YELLOW, "guardian mummy", - M_RES_POISON | M_RES_COLD | M_SEE_INVIS, + M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 13, MONS_GUARDIAN_MUMMY, MH_UNDEAD, -5, { 30, 0, 0, 0 }, { 7, 5, 3, 0 }, @@ -3263,7 +3548,8 @@ { MONS_GREATER_MUMMY, 'M', DARKGREY, "greater mummy", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 20, MONS_MUMMY, MH_UNDEAD, 5000, { 35, 0, 0, 0 }, { 15, 5, 3, 100 }, @@ -3274,7 +3560,8 @@ { MONS_MUMMY_PRIEST, 'M', RED, "mummy priest", - M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_PRIEST | M_SEE_INVIS, + M_SPELLCASTER | M_PRIEST | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, 0, 16, MONS_MUMMY, MH_UNDEAD, 5000, { 30, 0, 0, 0 }, { 10, 5, 3, 0 }, @@ -3286,6 +3573,7 @@ { MONS_CENTAUR_WARRIOR, 'c', YELLOW, "centaur warrior", M_WARM_BLOOD, + MR_NO_FLAGS, 1500, 12, MONS_CENTAUR, MH_NATURAL, -3, { 16, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -3297,6 +3585,7 @@ { MONS_YAKTAUR_CAPTAIN, 'c', RED, "yaktaur captain", M_WARM_BLOOD, + MR_NO_FLAGS, 2000, 10, MONS_YAKTAUR, MH_NATURAL, -3, { 23, 0, 0, 0 }, { 14, 3, 5, 0 }, @@ -3307,7 +3596,8 @@ { MONS_KILLER_KLOWN, '@', BLACK, "Killer Klown", - M_RES_FIRE | M_RES_COLD | M_RES_POISON | M_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD, + M_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD, + MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, 0, 15, MONS_KILLER_KLOWN, MH_NATURAL, 5000, { 30, 0, 0, 0 }, { 20, 5, 5, 0 }, @@ -3318,7 +3608,8 @@ { MONS_ELECTRIC_GOLEM, '8', LIGHTCYAN, "electric golem", - M_SPELLCASTER | M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS, + MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 0, 10, MONS_ELECTRIC_GOLEM, MH_NONLIVING, 5000, { 12, 12, 12, 12 }, { 15, 7, 4, 0 }, @@ -3329,7 +3620,8 @@ { MONS_BALL_LIGHTNING, '*', LIGHTCYAN, "ball lightning", - M_FLIES | M_RES_ELEC | M_CONFUSED | M_SPELLCASTER, + M_FLIES | M_CONFUSED | M_SPELLCASTER, + MR_RES_ELEC, 0, 20, MONS_BALL_LIGHTNING, MH_NONLIVING, 5000, { 5, 0, 0, 0 }, { 12, 0, 0, 1 }, @@ -3340,7 +3632,8 @@ { MONS_ORB_OF_FIRE, '*', RED, "orb of fire", - M_SPELLCASTER | M_FLIES | M_RES_ELEC | M_RES_FIRE | M_RES_COLD | M_RES_POISON | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, 0, 10, MONS_ORB_OF_FIRE, MH_NONLIVING, 5000, { 0, 0, 0, 0 }, { 30, 0, 0, 150 }, @@ -3352,6 +3645,7 @@ { MONS_QUOKKA, 'r', LIGHTGREY, "quokka", M_WARM_BLOOD, + MR_NO_FLAGS, 300, 10, MONS_QUOKKA, MH_NATURAL, -1, { 5, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -3363,6 +3657,7 @@ { MONS_EYE_OF_DEVASTATION, 'G', YELLOW, "eye of devastation", M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, + MR_NO_FLAGS, 0, 11, MONS_EYE_OF_DEVASTATION, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, @@ -3374,6 +3669,7 @@ { MONS_MOTH_OF_WRATH, 'y', BROWN, "moth of wrath", M_FLIES, + MR_NO_FLAGS, 0, 10, MONS_MOTH_OF_WRATH, MH_NATURAL, -3, { 25, 0, 0, 0 }, { 9, 3, 5, 0 }, @@ -3384,7 +3680,8 @@ { MONS_DEATH_COB, '%', YELLOW, "death cob", - M_RES_POISON | M_RES_COLD | M_SPEAKS, + M_SPEAKS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_DEATH_COB, MH_UNDEAD, -3, { 20, 0, 0, 0 }, { 10, 4, 5, 0 }, @@ -3395,7 +3692,8 @@ { MONS_CURSE_TOE, 'z', DARKGREY, "curse toe", - M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, + M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL, + MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, 0, 60, MONS_CURSE_TOE, MH_UNDEAD, 5000, { 0, 0, 0, 0 }, { 14, 0, 0, 77 }, @@ -3407,7 +3705,8 @@ { // gold mimics are the only mimics that actually use their name -- bwr MONS_GOLD_MIMIC, '$', YELLOW, "pile of gold coins", - M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD, + M_NO_SKELETON, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, { 12, 12, 12, 0 }, { 8, 3, 5, 0 }, @@ -3418,7 +3717,8 @@ { MONS_WEAPON_MIMIC, ')', BLACK, "mimic", - M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD, + M_NO_SKELETON, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, { 17, 17, 17, 0 }, { 8, 3, 5, 0 }, @@ -3429,7 +3729,8 @@ { MONS_ARMOUR_MIMIC, '[', BLACK, "mimic", - M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD, + M_NO_SKELETON, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, { 12, 12, 12, 0 }, { 8, 3, 5, 0 }, @@ -3440,7 +3741,8 @@ { MONS_SCROLL_MIMIC, '?', LIGHTGREY, "mimic", - M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD, + M_NO_SKELETON, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, { 12, 12, 12, 0 }, { 8, 3, 5, 0 }, @@ -3451,7 +3753,8 @@ { MONS_POTION_MIMIC, '!', BLACK, "mimic", - M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD, + M_NO_SKELETON, + MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, { 12, 12, 12, 0 }, { 8, 3, 5, 0 }, @@ -3462,7 +3765,8 @@ { MONS_HELL_HOG, 'h', RED, "hell-hog", - M_SPELLCASTER, + M_SPELLCASTER | M_THICK_SKIN | M_EVIL, + MR_NO_FLAGS, 0, 10, MONS_HELL_HOG, MH_DEMONIC, -3, { 20, 0, 0, 0 }, { 11, 3, 5, 0 }, @@ -3473,7 +3777,8 @@ { MONS_SERPENT_OF_HELL, 'D', RED, "Serpent of Hell", - M_SPELLCASTER | M_RES_POISON | M_RES_HELLFIRE | M_FLIES | M_SEE_INVIS, + M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, + MR_RES_POISON | MR_RES_HELLFIRE, 0, 18, MONS_SERPENT_OF_HELL, MH_DEMONIC, -13, { 35, 15, 15, 0 }, { 20, 4, 4, 0 }, @@ -3485,6 +3790,7 @@ { MONS_BOGGART, 'g', DARKGREY, "boggart", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS, + MR_NO_FLAGS, 0, 14, MONS_BOGGART, MH_NATURAL, -7, { 5, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -3496,6 +3802,7 @@ { MONS_QUICKSILVER_DRAGON, 'D', LIGHTCYAN, "quicksilver dragon", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, + MR_NO_FLAGS, 0, 14, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7, { 45, 0, 0, 0 }, { 16, 3, 5, 0 }, @@ -3506,7 +3813,8 @@ { MONS_IRON_DRAGON, 'D', CYAN, "iron dragon", - M_SPELLCASTER | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SEE_INVIS, + M_SPELLCASTER | M_SEE_INVIS, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 0, 14, MONS_IRON_DRAGON, MH_NATURAL, -7, { 25, 25, 25, 0 }, { 18, 5, 3, 0 }, @@ -3517,7 +3825,8 @@ { MONS_SKELETAL_WARRIOR, 'z', CYAN, "skeletal warrior", - M_SPELLCASTER | M_RES_POISON | M_RES_COLD | M_ACTUAL_SPELLS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL, + MR_RES_POISON | MR_RES_COLD, 0, 10, MONS_SKELETAL_WARRIOR, MH_UNDEAD, -7, { 25, 0, 0, 0 }, { 10, 5, 3, 0 }, @@ -3530,7 +3839,8 @@ /* player ghost - only one per level. stats are stored in ghost struct */ { MONS_PLAYER_GHOST, 'p', DARKGREY, "", - M_RES_POISON | M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES, + M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES, + MR_RES_POISON, 0, 15, MONS_PLAYER_GHOST, MH_UNDEAD, -5, { 5, 0, 0, 0 }, { 4, 2, 3, 0 }, @@ -3542,7 +3852,8 @@ /* random demon in pan - only one per level. stats are stored in ghost struct */ { MONS_PANDEMONIUM_DEMON, '&', BLACK, "&", - M_SPELLCASTER | M_RES_POISON | M_SPEAKS, + M_SPELLCASTER | M_SPEAKS | M_EVIL, + MR_RES_POISON, 0, 14, MONS_PANDEMONIUM_DEMON, MH_DEMONIC, -5, { 5, 0, 0, 0 }, { 4, 2, 3, 0 }, @@ -3554,7 +3865,8 @@ // begin lava monsters {dlb} { MONS_LAVA_WORM, 'w', RED, "lava worm", - M_RES_FIRE | M_ED_COLD, + M_NO_FLAGS, + MR_RES_FIRE | MR_VUL_COLD, 0, 10, MONS_LAVA_WORM, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 6, 3, 5, 0 }, @@ -3565,7 +3877,8 @@ { MONS_LAVA_FISH, ';', RED, "lava fish", - M_RES_FIRE | M_ED_COLD, + M_NO_FLAGS, + MR_RES_FIRE | MR_VUL_COLD, 0, 10, MONS_LAVA_FISH, MH_NATURAL, -3, { 10, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -3576,7 +3889,8 @@ { MONS_LAVA_SNAKE, 'S', RED, "lava snake", - M_RES_FIRE | M_ED_COLD, + M_NO_FLAGS, + MR_RES_FIRE | MR_VUL_COLD, 0, 10, MONS_LAVA_SNAKE, MH_NATURAL, -3, { 7, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -3587,7 +3901,8 @@ { // mv: was another lava thing MONS_SALAMANDER, 'S', LIGHTRED, "salamander", - M_RES_FIRE | M_ED_COLD | M_WARM_BLOOD, + M_WARM_BLOOD, + MR_RES_FIRE | MR_VUL_COLD, 0, 10, MONS_SALAMANDER, MH_NATURAL, -3, { 23, 0, 0, 0 }, { 14, 3, 5, 0 }, @@ -3602,6 +3917,7 @@ { MONS_BIG_FISH, ';', LIGHTGREEN, "big fish", M_COLD_BLOOD, + MR_NO_FLAGS, 0, 10, MONS_BIG_FISH, MH_NATURAL, -3, { 8, 0, 0, 0 }, { 4, 3, 5, 0 }, @@ -3613,6 +3929,7 @@ { MONS_GIANT_GOLDFISH, ';', LIGHTRED, "giant goldfish", M_COLD_BLOOD, + MR_NO_FLAGS, 0, 10, MONS_GIANT_GOLDFISH, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 7, 3, 5, 0 }, @@ -3623,7 +3940,8 @@ { MONS_ELECTRICAL_EEL, ';', LIGHTBLUE, "electrical eel", - M_RES_ELEC | M_COLD_BLOOD, + M_COLD_BLOOD, + MR_RES_ELEC, 0, 10, MONS_ELECTRICAL_EEL, MH_NATURAL, -3, { 0, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -3634,7 +3952,8 @@ { MONS_JELLYFISH, 'J', CYAN, "jellyfish", - M_RES_POISON, + M_NO_FLAGS, + MR_RES_POISON, 0, 10, MONS_JELLYFISH, MH_NATURAL, -3, { 1, 1, 0, 0 }, { 4, 3, 5, 0 }, @@ -3645,7 +3964,8 @@ { MONS_WATER_ELEMENTAL, '{', LIGHTBLUE, "water elemental", - M_RES_POISON | M_ED_FIRE | M_FLIES | M_RES_ELEC, + M_FLIES, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_ELEC, 0, 10, MONS_WATER_ELEMENTAL, MH_NONLIVING, 5000, { 25, 0, 0, 0 }, { 6, 5, 3, 0 }, @@ -3657,6 +3977,7 @@ { MONS_SWAMP_WORM, 'w', BROWN, "swamp worm", M_AMPHIBIOUS, + MR_NO_FLAGS, 0, 10, MONS_SWAMP_WORM, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 5, 5, 5, 0 }, @@ -3679,7 +4000,8 @@ not think it fits into Crawl ... {dlb} #if 0 { MONS_SHUGGOTH, 'A', LIGHTGREEN, "shuggoth", - M_NO_SKELETON | M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS, + MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 1000, 10, MONS_SHUGGOTH, MH_DEMONIC, 300, { 5, 5, 5, 0 }, { 10, 4, 4, 0 }, @@ -3692,6 +4014,7 @@ not think it fits into Crawl ... {dlb} { MONS_WOLF, 'h', LIGHTGREY, "wolf", M_WARM_BLOOD | M_SEE_INVIS, //jmf: until smell exists + MR_NO_FLAGS, 450, 10, MONS_WOLF, MH_NATURAL, -3, { 8, 2, 2, 0 }, { 4, 3, 5, 0 }, @@ -3702,7 +4025,8 @@ not think it fits into Crawl ... {dlb} { MONS_WARG, 'h', DARKGREY, "warg", - M_SEE_INVIS | M_RES_POISON | M_WARM_BLOOD, + M_SEE_INVIS | M_WARM_BLOOD, + MR_RES_POISON, 600, 12, MONS_WARG, MH_NATURAL, -6, { 12, 3, 3, 0 }, { 4, 4, 5, 0 }, @@ -3714,6 +4038,7 @@ not think it fits into Crawl ... {dlb} { MONS_BEAR, 'U', BROWN, "bear", M_WARM_BLOOD, + MR_NO_FLAGS, 2000, 10, MONS_BEAR, MH_NATURAL, -3, { 10, 6, 6, 0 }, { 7, 3, 3, 0 }, @@ -3725,6 +4050,7 @@ not think it fits into Crawl ... {dlb} { MONS_GRIZZLY_BEAR, 'U', LIGHTGREY, "grizzly bear", M_WARM_BLOOD, + MR_NO_FLAGS, 2500, 10, MONS_GRIZZLY_BEAR, MH_NATURAL, -3, { 12, 8, 8, 0 }, { 7, 4, 4, 0 }, @@ -3735,7 +4061,8 @@ not think it fits into Crawl ... {dlb} { MONS_POLAR_BEAR, 'U', WHITE, "polar bear", - M_RES_COLD | M_WARM_BLOOD | M_AMPHIBIOUS, + M_WARM_BLOOD | M_AMPHIBIOUS, + MR_RES_COLD, 2500, 10, MONS_POLAR_BEAR, MH_NATURAL, -3, { 20, 5, 5, 0 }, //jmf: polar bears have very strong jaws & necks { 7, 5, 3, 0 }, @@ -3747,6 +4074,7 @@ not think it fits into Crawl ... {dlb} { MONS_BLACK_BEAR, 'U', DARKGREY, "black bear", M_WARM_BLOOD, + MR_NO_FLAGS, 1800, 10, MONS_BLACK_BEAR, MH_NATURAL, -3, { 4, 4, 4, 0 }, { 6, 3, 3, 0 }, @@ -3758,7 +4086,8 @@ not think it fits into Crawl ... {dlb} // small simulacrum { MONS_SIMULACRUM_SMALL, 'z', WHITE, "", - M_RES_POISON | M_ED_FIRE | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 6, MONS_SIMULACRUM_SMALL, MH_UNDEAD, -1, { 6, 0, 0, 0 }, { 2, 3, 5, 0 }, @@ -3770,7 +4099,8 @@ not think it fits into Crawl ... {dlb} // large simulacrum { MONS_SIMULACRUM_LARGE, 'Z', WHITE, "", - M_RES_POISON | M_ED_FIRE | M_RES_COLD, + M_EVIL, + MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, 0, 6, MONS_SIMULACRUM_LARGE, MH_UNDEAD, -1, { 14, 0, 0, 0 }, { 5, 3, 5, 0 }, @@ -3782,6 +4112,7 @@ not think it fits into Crawl ... {dlb} { MONS_GIANT_NEWT, 'l', LIGHTGREEN, "giant newt", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 150, 10, MONS_GIANT_NEWT, MH_NATURAL, -3, { 3, 0, 0, 0 }, { 1, 1, 2, 0 }, @@ -3793,6 +4124,7 @@ not think it fits into Crawl ... {dlb} { MONS_GIANT_GECKO, 'l', YELLOW, "giant gecko", M_COLD_BLOOD, + MR_NO_FLAGS, 250, 10, MONS_GIANT_GECKO, MH_NATURAL, -3, { 5, 0, 0, 0 }, { 1, 3, 5, 0 }, @@ -3804,6 +4136,7 @@ not think it fits into Crawl ... {dlb} { MONS_GIANT_IGUANA, 'l', BLUE, "giant iguana", M_COLD_BLOOD, + MR_NO_FLAGS, 400, 10, MONS_GIANT_IGUANA, MH_NATURAL, -3, { 15, 0, 0, 0 }, { 3, 3, 5, 0 }, @@ -3816,6 +4149,7 @@ not think it fits into Crawl ... {dlb} // gila monsters colours: lightmagenta, magenta, lightred, red, yellow MONS_GILA_MONSTER, 'l', BLACK, "gila monster", M_COLD_BLOOD, + MR_NO_FLAGS, 500, 10, MONS_GILA_MONSTER, MH_NATURAL, -3, { 20, 0, 0, 0 }, { 5, 4, 4, 0 }, @@ -3827,6 +4161,7 @@ not think it fits into Crawl ... {dlb} { MONS_KOMODO_DRAGON, 'l', BROWN, "komodo dragon", M_COLD_BLOOD | M_AMPHIBIOUS, + MR_NO_FLAGS, 800, 10, MONS_KOMODO_DRAGON, MH_NATURAL, -3, { 30, 0, 0, 0 }, { 8, 3, 5, 0 }, |